[SP-2874] fix: adapt for new components request

Author: matiasdaloia

src/scanoss/components.py

@@ -95,7 +95,7 @@ def __init__(  # noqa: PLR0913, PLR0915
         )
         self.cdx = CycloneDx(debug=self.debug)
 
-    def load_comps(self, json_file: Optional[str] = None, purls: Optional[List[str]] = None)-> Optional[dict]:
+    def load_comps(self, json_file: Optional[str] = None, purls: Optional[List[str]] = None) -> Optional[dict]:
         """
         Load the specified components and return a dictionary
 
@@ -105,8 +105,9 @@ def load_comps(self, json_file: Optional[str] = None, purls: Optional[List[str]]
         """
         return self.load_purls(json_file, purls, 'components')
 
-    def load_purls(self, json_file: Optional[str] = None, purls: Optional[List[str]] = None, field:str = 'purls'
-                   ) -> Optional[dict]:
+    def load_purls(
+        self, json_file: Optional[str] = None, purls: Optional[List[str]] = None, field: str = 'purls'
+    ) -> Optional[dict]:
         """
         Load the specified purls and return a dictionary
 
@@ -122,7 +123,7 @@ def load_purls(self, json_file: Optional[str] = None, purls: Optional[List[str]]
                 return None
 
             if self.cdx.is_cyclonedx_json(json.dumps(result.data)):
-                purl_request = self.cdx.get_purls_request_from_cdx(result.data)
+                purl_request = self.cdx.get_purls_request_from_cdx(result.data, field)
             else:
                 purl_request = result.data
         elif purls:

src/scanoss/cyclonedx.py

@@ -411,12 +411,13 @@ def is_cyclonedx_json(self, json_string: str) -> bool:
             self.print_stderr(f'ERROR: Problem parsing input JSON: {e}')
             return False
 
-    def get_purls_request_from_cdx(self, cdx_dict: dict) -> dict:
+    def get_purls_request_from_cdx(self, cdx_dict: dict, field: str = 'purls') -> dict:
         """
         Get the list of PURL requests (purl + requirement) from the given CDX dictionary
 
         Args:
             cdx_dict (dict): CDX dictionary to parse
+            field (str): Field to extract from the CDX dictionary
         Returns:
             list[dict]: List of PURL requests (purl + requirement)
         """
@@ -428,8 +429,10 @@ def get_purls_request_from_cdx(self, cdx_dict: dict) -> dict:
                 parsed_purls.append({'purl': component.get('purl'), 'requirement': version})
             else:
                 parsed_purls.append({'purl': component.get('purl')})
-        purl_request = {'purls': parsed_purls}
+        purl_request = {field: parsed_purls}
         return purl_request
+
+
 #
 # End of CycloneDX Class
 #