Skip to content

fix(packages): revert get_all_packages #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tngraf merged 1 commit into from
Aug 20, 2026
Merged

fix(packages): revert get_all_packages #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions sw360/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __get_packages_filtered(
:type page_size: int
:param sort: sort order for the package
:type sort: SortParam
:return: list of packages
:return: response from API
:rtype: list of JSON package objects
:raises SW360Error: if there is a negative HTTP response
"""
Expand All @@ -51,12 +51,7 @@ def __get_packages_filtered(
else:
resp = self.api_get(full_url)

if (resp and
"_embedded" in resp and
"sw360:packages" in resp["_embedded"]):
return resp["_embedded"]["sw360:packages"]

return []
return resp

def get_package(self, package_id: str) -> Optional[Dict[str, Any]]:
"""Get information of about a package
Expand Down Expand Up @@ -109,7 +104,13 @@ def get_packages_by_name(
else:
sort = PackageSortColumn.NAME.asc()

return self.__get_packages_filtered(url_with_param, page, page_size, sort)
resp = self.__get_packages_filtered(url_with_param, page, page_size,
sort)

if resp and ("_embedded" in resp) and ("sw360:packages" in resp["_embedded"]):
return resp["_embedded"]["sw360:packages"]

return []

def get_all_packages(
self, name: str = "", version: str = "", purl: str = "",
Expand Down Expand Up @@ -167,9 +168,14 @@ def get_all_packages(
else:
sort = PackageSortColumn.NAME.asc()

return self.__get_packages_filtered(url_with_param, page, page_size,
resp = self.__get_packages_filtered(url_with_param, page, page_size,
sort)

if page == -1 and resp and ("_embedded" in resp) and ("sw360:packages" in resp["_embedded"]):
return resp["_embedded"]["sw360:packages"]

return resp

def get_packages_by_packagemanager(
self, manager: str, page: int = -1, page_size: int = -1,
sort: Optional[SortParam] = None
Expand Down Expand Up @@ -204,9 +210,14 @@ def get_packages_by_packagemanager(
else:
sort = PackageSortColumn.NAME.asc()

return self.__get_packages_filtered(url_with_param, page, page_size,
resp = self.__get_packages_filtered(url_with_param, page, page_size,
sort)

if page == -1 and resp and ("_embedded" in resp) and ("sw360:packages" in resp["_embedded"]):
return resp["_embedded"]["sw360:packages"]

return resp

def create_new_package(self, name: str, version: str, purl: str,
package_type: str, package_details: Dict[str, Any] = {}) -> Optional[Dict[str, Any]]:
"""Create a new package
Expand Down
10 changes: 6 additions & 4 deletions tests/test_sw360_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ def test_get_all_packages_with_fields_and_all_details2(self) -> None:
packages = lib.get_all_packages(name="cli-support", version="2.0.0", all_details=True, page=2, page_size=6, sort=PackageSortColumn.NAME.desc()) # noqa
self.assertIsNotNone(packages)
self.assertTrue(len(packages) > 0)
self.assertEqual("Tethys.Logging", packages[0]["name"])
self.assertEqual("1.3.0", packages[0]["version"])
pkgs = packages["_embedded"]["sw360:packages"]
self.assertEqual("Tethys.Logging", pkgs[0]["name"])
self.assertEqual("1.3.0", pkgs[0]["version"])

@responses.activate
def test_get_packages_by_name(self) -> None:
Expand Down Expand Up @@ -231,8 +232,9 @@ def test_get_packages_by_packagemanager_with_details(self) -> None:
packages = lib.get_packages_by_packagemanager("nuget", page=1, page_size=5, sort=PackageSortColumn.NAME.desc())
self.assertIsNotNone(packages)
self.assertTrue(len(packages) > 0)
self.assertEqual("john", packages[0]["name"])
self.assertEqual("2.2.2", packages[0]["version"])
pkgs = packages["_embedded"]["sw360:packages"]
self.assertEqual("john", pkgs[0]["name"])
self.assertEqual("2.2.2", pkgs[0]["version"])

@responses.activate
def test_create_new_package(self) -> None:
Expand Down
Loading