scanoss 1.26.0__py3-none-any.whl → 1.26.2__py3-none-any.whl

scanoss/__init__.py

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

scanoss/data/build_date.txt

@@ -1 +1 @@
-date: 20250620142757, utime: 1750429677
+date: 20250624181246, utime: 1750788766

scanoss/inspection/component_summary.py

@@ -35,12 +35,18 @@ class ComponentSummary(InspectBase):
         :param components: List of all components
         :return: Dict with license summary information
         """
+        # A component is considered unique by its combination of PURL (Package URL) and license
+        component_licenses = self._group_components_by_license(scan_components)
+        total_components = len(component_licenses)
+        # Get undeclared components
+        undeclared_components = len([c for c in component_licenses if c['status'] == 'pending'])
+
         components: list = []
-        undeclared_components = 0
-        total_components = 0
+        total_undeclared_files = 0
+        total_files_detected = 0
         for component in scan_components:
-            total_components += component['count']
-            undeclared_components += component['undeclared']
+            total_files_detected += component['count']
+            total_undeclared_files += component['undeclared']
             components.append({
                 'purl': component['purl'],
                 'version': component['version'],
@@ -50,10 +56,13 @@ class ComponentSummary(InspectBase):
             })
         ## End for loop components
         return {
-            'components': components,
-            'total': total_components,
-            'undeclared': undeclared_components,
-            'declared': total_components - undeclared_components,
+            "components": component_licenses,
+            'totalComponents': total_components,
+            'undeclaredComponents': undeclared_components,
+            'declaredComponents': total_components - undeclared_components,
+            'totalFilesDetected': total_files_detected,
+            'totalFilesUndeclared': total_undeclared_files,
+            'totalFilesDeclared': total_files_detected - total_undeclared_files,
         }
 
     def _get_components(self):

scanoss/inspection/copyleft.py

@@ -78,12 +78,14 @@ class Copyleft(PolicyCheck):
         :param components: List of components with copyleft licenses
         :return: Dictionary with formatted JSON details and summary
         """
+        # A component is considered unique by its combination of PURL (Package URL) and license
+        component_licenses = self._group_components_by_license(components)
         details = {}
         if len(components) > 0:
             details = {'components': components}
         return {
             'details': f'{json.dumps(details, indent=2)}\n',
-            'summary': f'{len(components)} component(s) with copyleft licenses were found.\n',
+            'summary': f'{len(component_licenses)} component(s) with copyleft licenses were found.\n',
         }
 
     def _markdown(self, components: list) -> Dict[str, Any]:
@@ -93,24 +95,24 @@ class Copyleft(PolicyCheck):
         :param components: List of components with copyleft licenses
         :return: Dictionary with formatted Markdown details and summary
         """
-        headers = ['Component', 'Version', 'License', 'URL', 'Copyleft']
+        # A component is considered unique by its combination of PURL (Package URL) and license
+        component_licenses = self._group_components_by_license(components)
+        headers = ['Component', 'License', 'URL', 'Copyleft']
         centered_columns = [1, 4]
         rows: [[]] = []
-        for component in components:
-            for lic in component['licenses']:
+        for comp_lic_item in component_licenses:
                 row = [
-                    component['purl'],
-                    component['version'],
-                    lic['spdxid'],
-                    lic['url'],
-                    'YES' if lic['copyleft'] else 'NO',
+                    comp_lic_item['purl'],
+                    comp_lic_item['spdxid'],
+                    comp_lic_item['url'],
+                    'YES' if comp_lic_item['copyleft'] else 'NO',
                 ]
                 rows.append(row)
             # End license loop
         # End component loop
         return {
             'details': f'### Copyleft licenses\n{self.generate_table(headers, rows, centered_columns)}\n',
-            'summary': f'{len(components)} component(s) with copyleft licenses were found.\n',
+            'summary': f'{len(component_licenses)} component(s) with copyleft licenses were found.\n',
         }
 
     def _jira_markdown(self, components: list) -> Dict[str, Any]:
@@ -120,24 +122,24 @@ class Copyleft(PolicyCheck):
         :param components: List of components with copyleft licenses
         :return: Dictionary with formatted Markdown details and summary
         """
-        headers = ['Component', 'Version', 'License', 'URL', 'Copyleft']
+        # A component is considered unique by its combination of PURL (Package URL) and license
+        component_licenses = self._group_components_by_license(components)
+        headers = ['Component', 'License', 'URL', 'Copyleft']
         centered_columns = [1, 4]
         rows: [[]] = []
-        for component in components:
-            for lic in component['licenses']:
+        for comp_lic_item in component_licenses:
                 row = [
-                    component['purl'],
-                    component['version'],
-                    lic['spdxid'],
-                    lic['url'],
-                    'YES' if lic['copyleft'] else 'NO',
+                    comp_lic_item['purl'],
+                    comp_lic_item['spdxid'],
+                    comp_lic_item['url'],
+                    'YES' if comp_lic_item['copyleft'] else 'NO',
                 ]
                 rows.append(row)
             # End license loop
         # End component loop
         return {
             'details': f'{self.generate_jira_table(headers, rows, centered_columns)}',
-            'summary': f'{len(components)} component(s) with copyleft licenses were found.\n',
+            'summary': f'{len(component_licenses)} component(s) with copyleft licenses were found.\n',
         }
 
     def _filter_components_with_copyleft_licenses(self, components: list) -> list:
@@ -161,7 +163,6 @@ class Copyleft(PolicyCheck):
                     lic.pop('count', None)  # None is default value if key doesn't exist
 
                 filtered_component['licenses'] = copyleft_licenses
-                del filtered_component['status']
                 filtered_components.append(filtered_component)
         # End component loop
         self.print_debug(f'Copyleft components: {filtered_components}')

scanoss/inspection/inspect_base.py

@@ -372,6 +372,57 @@ class InspectBase(ScanossBase):
         self.print_debug("No priority sources found, returning all licenses as list")
         return licenses_data
 
+    def _group_components_by_license(self,components):
+        """
+        Groups components by their unique component-license pairs.
+
+        This method processes a list of components and creates unique entries for each
+        component-license combination. If a component has multiple licenses, it will create
+        separate entries for each license.
+
+        Args:
+            components: A list of component dictionaries. Each component should have:
+                - purl: Package URL identifying the component
+                - licenses: List of license dictionaries, each containing:
+                    - spdxid: SPDX identifier for the license (optional)
+
+        Returns:
+            list: A list of dictionaries, each containing:
+                - purl: The component's package URL
+                - license: The SPDX identifier of the license (or 'Unknown' if not provided)
+        """
+        component_licenses: dict = {}
+        for component in components:
+            purl = component.get('purl', '')
+            status = component.get('status', '')
+            licenses = component.get('licenses', [])
+
+            # Component without license
+            if not licenses:
+                key = f'{purl}-unknown'
+                component_licenses[key] = {
+                    'purl': purl,
+                    'spdxid': 'unknown',
+                    'status': status,
+                    'copyleft': False,
+                    'url': '-',
+                }
+                continue
+
+            # Iterate over licenses component licenses
+            for lic in licenses:
+                spdxid = lic.get('spdxid', 'unknown')
+                if spdxid not in component_licenses:
+                    key = f'{purl}-{spdxid}'
+                    component_licenses[key] = {
+                        'purl': purl,
+                        'spdxid': spdxid,
+                        'status': status,
+                        'copyleft': lic['copyleft'],
+                        'url': lic['url'],
+                    }
+        return list(component_licenses.values())
+
 
 #
 # End of PolicyCheck Class

scanoss/inspection/license_summary.py

@@ -23,7 +23,6 @@ SPDX-License-Identifier: MIT
 """
 
 import json
-from typing import Any, Dict
 
 from .inspect_base import InspectBase
 
@@ -73,35 +72,6 @@ class LicenseSummary(InspectBase):
         self.exclude = exclude
         self.explicit = explicit
 
-    def _validate_license(self, license_data: Dict[str, Any]) -> bool:
-        """
-        Validate that a license has all required fields.
-
-        :param license_data: Dictionary containing license information
-        :return: True if license is valid, False otherwise
-        """
-        for field in self.REQUIRED_LICENSE_FIELDS:
-            value = license_data.get(field)
-            if value is None:
-                self.print_debug(f'WARNING: {field} is empty in license: {license_data}')
-                return False
-        return True
-
-    def _append_license(self, licenses: dict, new_license) -> None:
-        """Add or update a license in the licenses' dictionary."""
-        spdxid = new_license.get("spdxid")
-        url = new_license.get("url")
-        copyleft = new_license.get("copyleft")
-        if spdxid not in licenses:
-            licenses[spdxid] = {
-                'spdxid': spdxid,
-                'url': url,
-                'copyleft':copyleft,
-                'count': new_license.get("count"),
-            }
-        else:
-            licenses[spdxid]['count'] += new_license.get("count")
-
     def _get_licenses_summary_from_components(self, components: list)-> dict:
         """
         Get a license summary from detected components.
@@ -109,27 +79,35 @@ class LicenseSummary(InspectBase):
         :param components: List of all components
         :return: Dict with license summary information
         """
+        # A component is considered unique by its combination of PURL (Package URL) and license
+        component_licenses = self._group_components_by_license(components)
+        license_component_count = {}
+        # Count license per component
+        for lic in component_licenses:
+            if lic['spdxid'] not in license_component_count:
+                license_component_count[lic['spdxid']] = 1
+            else:
+                license_component_count[lic['spdxid']] += 1
         licenses:dict = {}
-        licenses_with_copyleft = 0
-        total_licenses = 0
-        for component in components:
-            component_licenses =  component.get("licenses", [])
-            for lic in component_licenses:
-                if not self._validate_license(lic):
-                    continue
-                copyleft = lic.get("copyleft")
-                ## Increment counters
-                total_licenses += lic.get("count")
-                if copyleft:
-                    licenses_with_copyleft += lic.get("count")
-                ## Add license
-                self._append_license(licenses, lic)
+        for comp_lic in component_licenses:
+            spdxid = comp_lic.get("spdxid")
+            url = comp_lic.get("url")
+            copyleft = comp_lic.get("copyleft")
+            if spdxid not in licenses:
+                licenses[spdxid] = {
+                    'spdxid': spdxid,
+                    'url': url,
+                    'copyleft': copyleft,
+                    'componentCount': license_component_count.get(spdxid, 0), # Append component count to license
+                }
             ## End for loop licenses
         ## End for loop components
+        detected_licenses = list(licenses.values())
+        licenses_with_copyleft = [lic for lic in detected_licenses if lic['copyleft']]
         return {
-                 'licenses': list(licenses.values()),
-                 'total': total_licenses,
-                 'copyleft': licenses_with_copyleft
+                 'licenses': detected_licenses,
+                 'detectedLicenses': len(detected_licenses), # Count unique licenses. SPDXID is considered unique
+                 'detectedLicensesWithCopyleft': len(licenses_with_copyleft),
                }
 
 

scanoss/inspection/undeclared_component.py

@@ -80,7 +80,6 @@ class UndeclaredComponent(PolicyCheck):
         for component in components:
             if component['status'] == 'pending':
                 # Remove unused keys
-                del component['status']
                 del component['count']
                 del component['declared']
                 del component['undeclared']
@@ -177,7 +176,7 @@ class UndeclaredComponent(PolicyCheck):
         # TODO look at using SpdxLite license name lookup method
         component_licenses = self._group_components_by_license(components)
         for component in component_licenses:
-            rows.append([component.get('purl'), component.get('license')])
+            rows.append([component.get('purl'), component.get('spdxid')])
         return {
             'details': f'### Undeclared components\n{self.generate_table(headers, rows)}\n',
             'summary': self._get_summary(component_licenses),
@@ -195,7 +194,7 @@ class UndeclaredComponent(PolicyCheck):
         # TODO look at using SpdxLite license name lookup method
         component_licenses = self._group_components_by_license(components)
         for component in component_licenses:
-            rows.append([component.get('purl'), component.get('license')])
+            rows.append([component.get('purl'), component.get('spdxid')])
         return {
             'details': f'{self.generate_jira_table(headers, rows)}',
             'summary': self._get_jira_summary(component_licenses),
@@ -265,36 +264,6 @@ class UndeclaredComponent(PolicyCheck):
         # Convert to list and process licenses
         return self._convert_components_to_list(components)
 
-    def _group_components_by_license(self,components):
-        """
-        Groups components by their unique component-license pairs.
-
-        This method processes a list of components and creates unique entries for each
-        component-license combination. If a component has multiple licenses, it will create
-        separate entries for each license.
-
-        Args:
-            components: A list of component dictionaries. Each component should have:
-                - purl: Package URL identifying the component
-                - licenses: List of license dictionaries, each containing:
-                    - spdxid: SPDX identifier for the license (optional)
-
-        Returns:
-            list: A list of dictionaries, each containing:
-                - purl: The component's package URL
-                - license: The SPDX identifier of the license (or 'Unknown' if not provided)
-        """
-        component_licenses: dict = {}
-        for component in components:
-            for lic in component['licenses']:
-                spdxid = lic.get('spdxid', 'Unknown')
-                key = f'{component["purl"]}-{spdxid}'
-                component_licenses[key] = {
-                    'purl': component['purl'],
-                    'license': spdxid,
-                }
-        return list(component_licenses.values())
-
     def run(self):
         """
         Run the undeclared component inspection process.

{scanoss-1.26.0.dist-info → scanoss-1.26.2.dist-info}/METADATA

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

{scanoss-1.26.0.dist-info → scanoss-1.26.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ protoc_gen_swagger/options/annotations_pb2.py,sha256=b25EDD6gssUWnFby9gxgcpLIROT
 protoc_gen_swagger/options/annotations_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 protoc_gen_swagger/options/openapiv2_pb2.py,sha256=vYElGp8E1vGHszvWqX97zNG9GFJ7u2QcdK9ouq0XdyI,14939
 protoc_gen_swagger/options/openapiv2_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
-scanoss/__init__.py,sha256=hpFJV75fvMqM81JQ_5NLWJnNyG498vCtV_hWttywCao,1146
+scanoss/__init__.py,sha256=xDDQJcWC9AfGANHfK3qAJabNjabXJyODs8piC_PNc6U,1146
 scanoss/cli.py,sha256=yjK4oawNzecarQYYlkElOiHFDDAZx_zKdSXf_gQvqXk,72678
 scanoss/components.py,sha256=b0R9DdKuXqyQiw5nZZwjQ6NJXBr1U9gyx1RI2FP9ozA,14511
 scanoss/constants.py,sha256=FWCZG8gQputKwV7XwvW1GuwDXL4wDLQyVRGdwygg578,320
@@ -57,17 +57,17 @@ scanoss/api/vulnerabilities/__init__.py,sha256=IFrDk_DTJgKSZmmU-nuLXuq_s8sQZlrSC
 scanoss/api/vulnerabilities/v2/__init__.py,sha256=IFrDk_DTJgKSZmmU-nuLXuq_s8sQZlrSCHhIDMJT4r0,1122
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2.py,sha256=CFhF80av8tenGvn9AIsGEtRJPuV2dC_syA5JLZb2lDw,5464
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2_grpc.py,sha256=HlS4k4Zmx6RIAqaO9I96jD-eyF5yU6Xx04pVm7pdqOg,6864
-scanoss/data/build_date.txt,sha256=35_MQhM0yl3QDm4UJRvKeRtlQPWALTKWb429m0XN5go,40
+scanoss/data/build_date.txt,sha256=JZiS5Od8jOg1I9NAinAP5k79mVNoARNi3bvCVs5X7XU,40
 scanoss/data/scanoss-settings-schema.json,sha256=ClkRYAkjAN0Sk704G8BE_Ok006oQ6YnIGmX84CF8h9w,8798
 scanoss/data/spdx-exceptions.json,sha256=s7UTYxC7jqQXr11YBlIWYCNwN6lRDFTR33Y8rpN_dA4,17953
 scanoss/data/spdx-licenses.json,sha256=A6Z0q82gaTLtnopBfzeIVZjJFxkdRW1g2TuumQc-lII,228794
 scanoss/inspection/__init__.py,sha256=D4C0lWLuNp8k_BjQZEc07WZcUgAvriVwQWOk063b0ZU,1122
-scanoss/inspection/component_summary.py,sha256=gSLTsyGVZ4R1-Pqo7-mcb4AbdGjcNVhHs_Jm5_GdFGU,3443
-scanoss/inspection/copyleft.py,sha256=oM9xSRovDI4TPansDKg2Qa_omo09nr78-vAYcEgxyJY,8854
-scanoss/inspection/inspect_base.py,sha256=Q943VydELN1fzV4tNQQZGBlOd4T_v8chCDoOoJgHRMM,16086
-scanoss/inspection/license_summary.py,sha256=bq81K8N40b9CaZGawBku_Kxcz31lLhHW173v7NJ4S4s,6305
+scanoss/inspection/component_summary.py,sha256=h1l3rF6NnoK0wMkS4ib6rDfcza2aqunyoMDbN2lw2G4,4049
+scanoss/inspection/copyleft.py,sha256=iCArNWZo5TOX7K68e-YD_6mQNRDOE9V35UoSMs23_qY,9236
+scanoss/inspection/inspect_base.py,sha256=wnE2KdATJFC2HqcPUTaKXUnM-3hBK0GZ98-wJE0VE-c,18170
+scanoss/inspection/license_summary.py,sha256=T3I8E6ljqYF0ngIcY3Ke2WaNeCzrdpN0RQ02RG_3Thk,5763
 scanoss/inspection/policy_check.py,sha256=NS39dvePZbpusGRnEUKN9JFiMdSyva0msFE6On6bK8Q,8329
-scanoss/inspection/undeclared_component.py,sha256=4mo1CMBho_I-58j5H0x8A-9ZGVvrGsNzBDel48LZ8Z0,12866
+scanoss/inspection/undeclared_component.py,sha256=qjc30agrIXU_07CJCgLvvFT-sQvJa1Hb0lS1UjM6aj8,11495
 scanoss/inspection/utils/license_utils.py,sha256=Zb6QLmVJb86lKCwZyBsmwakyAtY1SXa54kUyyKmWMqA,5093
 scanoss/scanners/__init__.py,sha256=D4C0lWLuNp8k_BjQZEc07WZcUgAvriVwQWOk063b0ZU,1122
 scanoss/scanners/container_scanner.py,sha256=leP4roes6B9B95F49mJ0P_F8WcKCQkvJgk9azWyJrjg,16294
@@ -79,9 +79,9 @@ scanoss/utils/abstract_presenter.py,sha256=teiDTxBj5jBMCk2T8i4l1BJPf_u4zBLWrtCTF
 scanoss/utils/crc64.py,sha256=TMrwQimSdE6imhFOUL7oAG6Kxu-8qMpGWMuMg8QpSVs,3169
 scanoss/utils/file.py,sha256=62cA9a17TU9ZvfA3FY5HY4-QOajJeSrc8S6xLA_f-3M,2980
 scanoss/utils/simhash.py,sha256=6iu8DOcecPAY36SZjCOzrrLMT9oIE7-gI6QuYwUQ7B0,5793
-scanoss-1.26.0.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
-scanoss-1.26.0.dist-info/METADATA,sha256=cj8e2LBPd_4muBEw4dz9d-YMP9bJM9zfKD-SR_iKZmc,6060
-scanoss-1.26.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scanoss-1.26.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
-scanoss-1.26.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
-scanoss-1.26.0.dist-info/RECORD,,
+scanoss-1.26.2.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
+scanoss-1.26.2.dist-info/METADATA,sha256=ReKdCqWwRMsZl2IHLb2VpX7wxJPHfF4sXafR4uT94ak,6060
+scanoss-1.26.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scanoss-1.26.2.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
+scanoss-1.26.2.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
+scanoss-1.26.2.dist-info/RECORD,,