sw360 1.12.0.dev2__tar.gz → 1.12.0.dev3__tar.gz

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sw360
-Version: 1.12.0.dev2
+Version: 1.12.0.dev3
 Summary: Python interface to the SW360 software component catalogue
 License: MIT
 License-File: LICENSES/MIT.txt

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "sw360"
-version = "1.12.0.dev2"
+version = "1.12.0.dev3"
 description = "Python interface to the SW360 software component catalogue"
 authors = ["Thomas Graf <thomas.graf@siemens.com>",
 "Gernot Hillier <gernot.hillier@siemens.com>"]

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/sw360/__init__.py

@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: MIT
 # -------------------------------------------------------------------------------
 
-__version__ = (1, 12, 0, "dev2")
+__version__ = (1, 12, 0, "dev3")
 
 from .base import SW360Response
 from .sorting import (BaseSortMixin, ProjectSortColumn, ReleaseSortColumn,

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/sw360/components.py

@@ -37,7 +37,7 @@ class ComponentsMixin(BaseMixin):
         :type page_size: int
         :param sort: sort order for the components (Sort by name if `None`)
         :type sort: SortParam
-        :return: list of components
+        :return: response from API
         :rtype: list of JSON component objects
         :raises SW360Error: if there is a negative HTTP response
         """
@@ -55,12 +55,7 @@ class ComponentsMixin(BaseMixin):
         else:
             resp = self.api_get(full_url)
 
-        if (resp and
-            "_embedded" in resp and
-                "sw360:components" in resp["_embedded"]):
-            return resp["_embedded"]["sw360:components"]
-
-        return []
+        return resp
 
     def get_all_components(
         self, fields: str = "", page: int = -1, page_size: int = -1,
@@ -99,8 +94,16 @@ class ComponentsMixin(BaseMixin):
         if sort is None:
             sort = ComponentSortColumn.NAME.asc()
 
-        return self.__get_components_filtered(url_with_param, page, page_size,
+        resp = self.__get_components_filtered(url_with_param, page, page_size,
                                               sort)
+        if (resp and
+            "_embedded" in resp and
+                "sw360:components" in resp["_embedded"]):
+            if page == -1:
+                return resp["_embedded"]["sw360:components"]
+            return resp
+
+        return []
 
     def get_components_by_type(
         self, component_type: str, page: int = -1, page_size: int = -1,
@@ -135,9 +138,14 @@ class ComponentsMixin(BaseMixin):
         if sort is None:
             sort = ComponentSortColumn.NAME.asc()
 
-        return self.__get_components_filtered(url_with_param, page, page_size,
+        resp = self.__get_components_filtered(url_with_param, page, page_size,
                                               sort)
 
+        if resp and ("_embedded" in resp) and ("sw360:components" in resp["_embedded"]):
+            return resp["_embedded"]["sw360:components"]
+
+        return []
+
     def get_component(self, component_id: str) -> Optional[Dict[str, Any]]:
         """Get information of about a component
 
@@ -175,7 +183,7 @@ class ComponentsMixin(BaseMixin):
     def get_component_by_name(
         self, component_name: str, page: int = -1, page_size: int = -1,
         sort: Optional[SortParam] = None
-    ) -> Dict[str, Any]:
+    ) -> Optional[Dict[str, Any]]:
         """Get information of about a component
 
         API endpoint: GET /components?name=
@@ -206,9 +214,11 @@ class ComponentsMixin(BaseMixin):
             else:
                 sort = ComponentSortColumn.NAME.asc()
 
-        return self.__get_components_filtered(url_with_param, page, page_size,
+        resp = self.__get_components_filtered(url_with_param, page, page_size,
                                               sort)
 
+        return resp
+
     def get_components_by_external_id(self, ext_id_name: str, ext_id_value: str = "") -> List[Dict[str, Any]]:
         """Get components by external id. `ext_id_value` can be left blank to
         search for all components with `ext_id_name`.

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/sw360/packages.py

@@ -33,7 +33,7 @@ class PackagesMixin(BaseMixin):
         :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
         """
@@ -51,12 +51,7 @@ class PackagesMixin(BaseMixin):
         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
@@ -109,7 +104,13 @@ class PackagesMixin(BaseMixin):
             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 = "",
@@ -167,9 +168,14 @@ class PackagesMixin(BaseMixin):
                 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
@@ -204,9 +210,14 @@ class PackagesMixin(BaseMixin):
             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

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/sw360/project.py

@@ -127,7 +127,7 @@ class ProjectMixin(BaseMixin):
     def get_projects(
         self, all_details: bool = False, page: int = -1, page_size: int = -1,
         sort: Optional[SortParam] = None
-    ) -> List[Dict[str, Any]]:
+    ) -> Optional[Dict[str, Any]]:
         """Get all projects
 
         API endpoint: GET /projects
@@ -150,13 +150,25 @@ class ProjectMixin(BaseMixin):
 
         if all_details:
             params["allDetails"] = "true"
-        url_with_param = self._add_params(fullbase_url, params)
 
         if sort is None:
             sort = ProjectSortColumn.NAME.asc()
 
-        return self.__get_projects_filtered(url_with_param, page, page_size,
-                                            sort)
+        if self.is_above_version_18():
+            params["luceneSearch"] = "true"
+
+        url_with_param = self._add_params(fullbase_url, params)
+
+        if page > -1 and page_size > -1:
+            url_with_param = self._add_pagination(url_with_param, page,
+                                                  page_size, sort)
+
+        if self.is_above_version_18() and page_size == -1:
+            resp = self.api_get_all(url_with_param, sort)
+        else:
+            resp = self.api_get(url_with_param)
+
+        return resp
 
     def get_projects_by_type(
         self, project_type: str, page: int = -1, page_size: int = -1,
@@ -206,7 +218,14 @@ class ProjectMixin(BaseMixin):
         if not all_projects:
             return resp
 
-        projects: List[Dict[str, Any]] = all_projects
+        if "_embedded" not in all_projects:
+            return resp
+
+        if "sw360:projects" not in all_projects["_embedded"]:
+            return resp
+
+        projects: List[Dict[str, Any]] = all_projects["_embedded"]["sw360:projects"]
+
         if not projects:
             return resp
 

{sw360-1.12.0.dev2 → sw360-1.12.0.dev3}/sw360/releases.py

@@ -35,7 +35,7 @@ class ReleasesMixin(BaseMixin):
         :type page_size: int
         :param sort: sort order for the releases
         :type sort: SortParam
-        :return: list of releases
+        :return: response from API
         :rtype: list of JSON release objects
         :raises SW360Error: if there is a negative HTTP response
         """
@@ -53,12 +53,7 @@ class ReleasesMixin(BaseMixin):
         else:
             resp = self.api_get(full_url)
 
-        if (resp and
-            "_embedded" in resp and
-                "sw360:releases" in resp["_embedded"]):
-            return resp["_embedded"]["sw360:releases"]
-
-        return []
+        return resp
 
     def get_release(self, release_id: str) -> Optional[Dict[str, Any]]:
         """Get information of about a release
@@ -128,9 +123,14 @@ class ReleasesMixin(BaseMixin):
             else:
                 sort = ReleaseSortColumn.VERSION.desc()
 
-        return self.__get_releases_filtered(url_with_param, page, page_size,
+        resp = self.__get_releases_filtered(url_with_param, page, page_size,
                                             sort)
 
+        if resp and ("_embedded" in resp) and ("sw360:releases" in resp["_embedded"]):
+            return resp["_embedded"]["sw360:releases"]
+
+        return []
+
     # return type List[Dict[str, Any]] | Optional[Dict[str, Any]] for Python 3.11 is good,
     # Union[List[Dict[str, Any]], Optional[Dict[str, Any]]] for lower Python versions is not good
     def get_all_releases(
@@ -175,9 +175,14 @@ class ReleasesMixin(BaseMixin):
         if sort is None:
             sort = ReleaseSortColumn.NAME.asc()
 
-        return self.__get_releases_filtered(url_with_param, page, page_size,
+        resp = self.__get_releases_filtered(url_with_param, page, page_size,
                                             sort)
 
+        if page == -1 and resp and ("_embedded" in resp) and ("sw360:releases" in resp["_embedded"]):
+            return resp["_embedded"]["sw360:releases"]
+
+        return resp
+
     def get_releases_by_external_id(self, ext_id_name: str, ext_id_value: str = "") -> List[Dict[str, Any]]:
         """Get releases by external id. `ext_id_value` can be left blank to
         search for all releases with `ext_id_name`.