scanoss 1.25.0__tar.gz → 1.25.1__tar.gz

{scanoss-1.25.0/src/scanoss.egg-info → scanoss-1.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scanoss
-Version: 1.25.0
+Version: 1.25.1
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS

{scanoss-1.25.0 → scanoss-1.25.1}/src/scanoss/__init__.py

@@ -22,4 +22,4 @@ SPDX-License-Identifier: MIT
   THE SOFTWARE.
 """
 
-__version__ = '1.25.0'
+__version__ = '1.25.1'

scanoss-1.25.1/src/scanoss/data/build_date.txt

@@ -0,0 +1 @@
+date: 20250612124028, utime: 1749732028

{scanoss-1.25.0 → scanoss-1.25.1}/src/scanoss/inspection/copyleft.py

@@ -23,7 +23,8 @@ SPDX-License-Identifier: MIT
 """
 
 import json
-from typing import Dict, Any
+from typing import Any, Dict
+
 from .policy_check import PolicyCheck, PolicyStatus
 
 
@@ -33,7 +34,7 @@ class Copyleft(PolicyCheck):
     Inspects components for copyleft licenses
     """
 
-    def __init__(
+    def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
         trace: bool = True,
@@ -158,6 +159,30 @@ class Copyleft(PolicyCheck):
         self.print_debug(f'Copyleft components: {filtered_components}')
         return filtered_components
 
+    def _get_components(self):
+        """
+        Extract and process components from results and their dependencies.
+
+        This method performs the following steps:
+        1. Validates that `self.results` is loaded. Returns `None` if not.
+        2. Extracts file, snippet, and dependency components into a dictionary.
+        3. Converts components to a list and processes their licenses.
+
+        :return: A list of processed components with license data, or `None` if `self.results` is not set.
+        """
+        if self.results is None:
+            return None
+
+        components: dict = {}
+        # Extract component and license data from file and dependency results. Both helpers mutate `components`
+        self._get_components_data(self.results, components)
+        self._get_dependencies_data(self.results, components)
+        # Convert to list and process licenses
+        results_list = list(components.values())
+        for component in results_list:
+            component['licenses'] = list(component['licenses'].values())
+        return results_list
+
     def run(self):
         """
         Run the copyleft license inspection process.

{scanoss-1.25.0 → scanoss-1.25.1}/src/scanoss/inspection/policy_check.py

@@ -166,6 +166,30 @@ class PolicyCheck(ScanossBase):
         """
         pass
 
+    @abstractmethod
+    def _get_components(self):
+        """
+        Retrieve and process components from the preloaded results.
+
+        This method performs the following steps:
+        1. Checks if the results have been previously loaded (self.results).
+        2. Extracts and processes components from the loaded results.
+
+        :return: A list of processed components, or None if an error occurred during any step.
+
+        Possible reasons for returning None include:
+        - Results not loaded (self.results is None)
+        - Failure to extract components from the results
+
+        Note:
+        - This method assumes that the results have been previously loaded and stored in self.results.
+        - Implementations must extract components (e.g. via `_get_components_data`,
+          `_get_dependencies_data`, or other helpers).
+        - If `self.results` is `None`, simply return `None`.
+        """
+    pass
+
+
     def _append_component(
         self, components: Dict[str, Any], new_component: Dict[str, Any], id: str, status: str
     ) -> Dict[str, Any]:
@@ -223,6 +247,9 @@ class PolicyCheck(ScanossBase):
                 if not component_id:
                     self.print_debug(f'WARNING: Result missing id. Skipping: {c}')
                     continue
+                ## Skip dependency
+                if component_id == ComponentID.DEPENDENCY.value:
+                    continue
                 status = c.get('status')
                 if not status:
                     self.print_debug(f'WARNING: Result missing status. Skipping: {c}')
@@ -280,33 +307,6 @@ class PolicyCheck(ScanossBase):
         # End of result loop
         return components
 
-    def _get_components_from_results(self, results: Dict[str, Any]) -> list or None:
-        """
-        Process the results dictionary to extract and format component information.
-
-        This function iterates through the results dictionary, identifying components from
-        different sources (files, snippets, and dependencies). It consolidates this information
-        into a list of unique components, each with its associated licenses and other details.
-
-        :param results: A dictionary containing the raw results of a component scan
-        :return: A list of dictionaries, each representing a unique component with its details
-        """
-        if results is None:
-            self.print_stderr('ERROR: Results cannot be empty')
-            return None
-        
-        components = {}
-        # Extract file and snippet components
-        components = self._get_components_data(results, components)
-        # Extract dependency components
-        components = self._get_dependencies_data(results, components)
-        # Convert to list and process licenses
-        results_list = list(components.values())
-        for component in results_list:
-            component['licenses'] = list(component['licenses'].values())
-
-        return results_list
-
     def generate_table(self, headers, rows, centered_columns=None):
         """
         Generate a Markdown table.
@@ -411,29 +411,6 @@ class PolicyCheck(ScanossBase):
                 self.print_stderr(f'ERROR: Problem parsing input JSON: {e}')
         return None
 
-    def _get_components(self):
-        """
-        Retrieve and process components from the preloaded results.
-
-        This method performs the following steps:
-        1. Checks if the results have been previously loaded (self.results).
-        2. Extracts and processes components from the loaded results.
-
-        :return: A list of processed components, or None if an error occurred during any step.
-                 Possible reasons for returning None include:
-                 - Results not loaded (self.results is None)
-                 - Failure to extract components from the results
-
-        Note:
-        - This method assumes that the results have been previously loaded and stored in self.results.
-        - If results is None, the method returns None without performing any further operations.
-        - The actual processing of components is delegated to the _get_components_from_results method.
-        """
-        if self.results is None:
-            return None
-        components = self._get_components_from_results(self.results)
-        return components
-
 #
 # End of PolicyCheck Class
 #

{scanoss-1.25.0 → scanoss-1.25.1}/src/scanoss/inspection/undeclared_component.py

@@ -23,7 +23,8 @@ SPDX-License-Identifier: MIT
 """
 
 import json
-from typing import Dict, Any
+from typing import Any, Dict
+
 from .policy_check import PolicyCheck, PolicyStatus
 
 
@@ -33,7 +34,7 @@ class UndeclaredComponent(PolicyCheck):
     Inspects for undeclared components
     """
 
-    def __init__(
+    def __init__( # noqa: PLR0913
         self,
         debug: bool = False,
         trace: bool = True,
@@ -73,7 +74,7 @@ class UndeclaredComponent(PolicyCheck):
         :return: List of undeclared components
         """
         if components is None:
-            self.print_debug(f'WARNING: No components provided!')
+            self.print_debug('WARNING: No components provided!')
             return None
         undeclared_components = []
         for component in components:
@@ -87,25 +88,35 @@ class UndeclaredComponent(PolicyCheck):
         """
         Get a summary of the undeclared components.
 
+        :param components: List of all components
+        :return: Component summary markdown
+        """
+
+        """
+        Get a summary of the undeclared components.
+
         :param components: List of all components
         :return: Component summary markdown
         """
         if len(components) > 0:
+            json_content = json.dumps(self._generate_scanoss_file(components), indent=2)
+
             if self.sbom_format == 'settings':
-                json_str = (
-                    json.dumps(self._generate_scanoss_file(components), indent=2)
-                    .replace('\n', '\\n')
-                    .replace('"', '\\"')
+                return (
+                    f'{len(components)} undeclared component(s) were found.\n'
+                    f'Add the following snippet into your `scanoss.json` file\n'
+                    f'{{code:json}}\n'
+                    f'{json_content}\n'
+                    f'{{code}}\n'
                 )
-                return f'{len(components)} undeclared component(s) were found.\nAdd the following snippet into your `scanoss.json` file\n{{code:json}}\n{json.dumps(self._generate_scanoss_file(components), indent=2)}\n{{code}}\n'
             else:
-                json_str = (
-                    json.dumps(self._generate_scanoss_file(components), indent=2)
-                    .replace('\n', '\\n')
-                    .replace('"', '\\"')
+                return (
+                    f'{len(components)} undeclared component(s) were found.\n'
+                    f'Add the following snippet into your `sbom.json` file\n'
+                    f'{{code:json}}\n'
+                    f'{json_content}\n'
+                    f'{{code}}\n'
                 )
-                return f'{len(components)} undeclared component(s) were found.\nAdd the following snippet into your `sbom.json` file\n{{code:json}}\n{json.dumps(self._generate_scanoss_file(components), indent=2)}\n{{code}}\n'
-
         return f'{len(components)} undeclared component(s) were found.\\n'
 
     def _get_summary(self, components: list) -> str:
@@ -190,7 +201,7 @@ class UndeclaredComponent(PolicyCheck):
         """
         unique_components = {}
         if components is None:
-            self.print_stderr(f'WARNING: No components provided!')
+            self.print_stderr('WARNING: No components provided!')
             return []
 
         for component in components:
@@ -225,6 +236,29 @@ class UndeclaredComponent(PolicyCheck):
 
         return sbom
 
+    def _get_components(self):
+        """
+        Extract and process components from file results only.
+
+        This method performs the following steps:
+        1. Validates if `self.results` is loaded. Returns `None` if not loaded.
+        2. Extracts file and snippet components into a dictionary.
+        3. Converts the components dictionary into a list of components.
+        4. Processes the licenses for each component by converting them into a list.
+
+        :return: A list of processed components with their licenses, or `None` if `self.results` is not set.
+        """
+        if self.results is None:
+            return None
+        components: dict = {}
+        # Extract file and snippet components
+        components = self._get_components_data(self.results, components)
+        # Convert to list and process licenses
+        results_list = list(components.values())
+        for component in results_list:
+            component['licenses'] = list(component['licenses'].values())
+        return results_list
+
     def run(self):
         """
         Run the undeclared component inspection process.

{scanoss-1.25.0 → scanoss-1.25.1/src/scanoss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scanoss
-Version: 1.25.0
+Version: 1.25.1
 Summary: Simple Python library to leverage the SCANOSS APIs
 Home-page: https://scanoss.com
 Author: SCANOSS

{scanoss-1.25.0 → scanoss-1.25.1}/tests/test_policy_inspect.py

@@ -179,7 +179,7 @@ class MyTestCase(unittest.TestCase):
         status, results = undeclared.run()
         details = json.loads(results['details'])
         summary = results['summary']
-        expected_summary_output = """5 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
         Add the following snippet into your `sbom.json` file 
         ```json 
         {
@@ -189,17 +189,11 @@ class MyTestCase(unittest.TestCase):
                   },
                   {
                     "purl": "pkg:github/scanoss/wfp"
-                  },
-                  {
-                    "purl": "pkg:npm/%40electron/rebuild"
-                  },
-                  {
-                    "purl": "pkg:npm/%40emotion/react"
                   }
             ]
         }```
         """
-        self.assertEqual(len(details['components']), 5)
+        self.assertEqual(len(details['components']), 3)
         self.assertEqual(
             re.sub(r'\s|\\(?!`)|\\(?=`)', '', summary), re.sub(r'\s|\\(?!`)|\\(?=`)', '', expected_summary_output)
         )
@@ -222,11 +216,9 @@ class MyTestCase(unittest.TestCase):
              | - | - | - | 
              | pkg:github/scanoss/scanner.c | 1.3.3 | BSD-2-Clause - GPL-2.0-only | 
              | pkg:github/scanoss/scanner.c | 1.1.4 | GPL-2.0-only | 
-             | pkg:github/scanoss/wfp | 6afc1f6 | Zlib - GPL-2.0-only | 
-             | pkg:npm/%40electron/rebuild | 3.7.0 | MIT | 
-             | pkg:npm/%40emotion/react | 11.13.3 | MIT | """
+             | pkg:github/scanoss/wfp | 6afc1f6 | Zlib - GPL-2.0-only |  """
 
-        expected_summary_output = """5 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
            Add the following snippet into your `sbom.json` file 
            ```json 
                {
@@ -236,13 +228,7 @@ class MyTestCase(unittest.TestCase):
                   },
                   {
                     "purl": "pkg:github/scanoss/wfp"
-                  },
-                  {
-                    "purl": "pkg:npm/%40electron/rebuild"
-                  },
-                  {
-                    "purl": "pkg:npm/%40emotion/react"
-                  }           
+                  }         
                 ]             
                }```
            """
@@ -273,11 +259,9 @@ class MyTestCase(unittest.TestCase):
                | - | - | - | 
                | pkg:github/scanoss/scanner.c | 1.3.3 | BSD-2-Clause - GPL-2.0-only | 
                | pkg:github/scanoss/scanner.c | 1.1.4 | GPL-2.0-only | 
-               | pkg:github/scanoss/wfp | 6afc1f6 | Zlib - GPL-2.0-only | 
-               | pkg:npm/%40electron/rebuild | 3.7.0 | MIT | 
-               | pkg:npm/%40emotion/react | 11.13.3 | MIT | """
+               | pkg:github/scanoss/wfp | 6afc1f6 | Zlib - GPL-2.0-only | """
 
-        expected_summary_output = """5 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
             Add the following snippet into your `scanoss.json` file
             
             ```json
@@ -289,12 +273,6 @@ class MyTestCase(unittest.TestCase):
                   },
                   {
                     "purl": "pkg:github/scanoss/wfp"
-                  },
-                  {
-                    "purl": "pkg:npm/%40electron/rebuild"
-                  },
-                  {
-                    "purl": "pkg:npm/%40emotion/react"
                   }
                 ]
               }
@@ -322,7 +300,7 @@ class MyTestCase(unittest.TestCase):
         status, results = undeclared.run()
         details = json.loads(results['details'])
         summary = results['summary']
-        expected_summary_output = """5 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
                 Add the following snippet into your `scanoss.json` file
 
                 ```json
@@ -334,19 +312,13 @@ class MyTestCase(unittest.TestCase):
                       },
                       {
                         "purl": "pkg:github/scanoss/wfp"
-                      },
-                      {
-                        "purl": "pkg:npm/%40electron/rebuild"
-                      },
-                      {
-                        "purl": "pkg:npm/%40emotion/react"
                       }
                     ]
                   }
                 }
                 ```"""
         self.assertEqual(status, 0)
-        self.assertEqual(len(details['components']), 5)
+        self.assertEqual(len(details['components']), 3)
         self.assertEqual(
             re.sub(r'\s|\\(?!`)|\\(?=`)', '', summary), re.sub(r'\s|\\(?!`)|\\(?=`)', '', expected_summary_output)
         )
@@ -363,10 +335,8 @@ class MyTestCase(unittest.TestCase):
 |pkg:github/scanoss/scanner.c|1.3.3|BSD-2-Clause - GPL-2.0-only|
 |pkg:github/scanoss/scanner.c|1.1.4|GPL-2.0-only|
 |pkg:github/scanoss/wfp|6afc1f6|Zlib - GPL-2.0-only|
-|pkg:npm/%40electron/rebuild|3.7.0|MIT|
-|pkg:npm/%40emotion/react|11.13.3|MIT|
 """
-        expected_summary_output = """5 undeclared component(s) were found.
+        expected_summary_output = """3 undeclared component(s) were found.
 Add the following snippet into your `scanoss.json` file
 {code:json}
 {
@@ -377,12 +347,6 @@ Add the following snippet into your `scanoss.json` file
       },
       {
         "purl": "pkg:github/scanoss/wfp"
-      },
-      {
-        "purl": "pkg:npm/%40electron/rebuild"
-      },
-      {
-        "purl": "pkg:npm/%40emotion/react"
       }
     ]
   }

scanoss-1.25.0/src/scanoss/data/build_date.txt

@@ -1 +0,0 @@
-date: 20250610161304, utime: 1749571984