scanoss 1.39.0__py3-none-any.whl → 1.40.0__py3-none-any.whl

scanoss/__init__.py

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

scanoss/cli.py

@@ -796,7 +796,6 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         help='Timeout (in seconds) for API communication (optional - default 300 sec)',
     )
 
-
     # ==============================================================================
     # GitLab Integration Parser
     # ==============================================================================
@@ -830,11 +829,7 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
 
     # Input file argument - SCANOSS scan results in JSON format
     p_gl_inspect_matches.add_argument(
-        '-i',
-        '--input',
-        required=True,
-        type=str,
-        help='Path to SCANOSS scan results file (JSON format) to analyze'
+        '-i', '--input', required=True, type=str, help='Path to SCANOSS scan results file (JSON format) to analyze'
     )
 
     # Line range prefix for GitLab file navigation
@@ -844,7 +839,7 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         '--line-range-prefix',
         required=True,
         type=str,
-        help='Base URL prefix for GitLab file links with line ranges (e.g., https://gitlab.com/org/project/-/blob/main)'
+        help='Base URL prefix for GitLab file links with line ranges (e.g., https://gitlab.com/org/project/-/blob/main)',
     )
 
     # Output file argument - where to save the generated Markdown report
@@ -853,7 +848,7 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         '-o',
         required=False,
         type=str,
-        help='Output file path for the generated Markdown report (default: stdout)'
+        help='Output file path for the generated Markdown report (default: stdout)',
     )
 
     # TODO Move to the command call def location
@@ -1189,6 +1184,7 @@ def setup_args() -> None:  # noqa: PLR0912, PLR0915
         c_search,
         c_versions,
         c_licenses,
+        p_folder_scan,
     ]:
         p.add_argument('--grpc', action='store_true', default=True, help='Use gRPC (default)')
         p.add_argument('--rest', action='store_true', dest='rest', help='Use REST instead of gRPC')
@@ -1975,7 +1971,7 @@ def inspect_dep_track_project_violations(parser, args):
         sys.exit(1)
 
 
-def inspect_gitlab_matches(parser,args):
+def inspect_gitlab_matches(parser, args):
     """
     Handle GitLab matches the summary inspection command.
 
@@ -2038,6 +2034,7 @@ def inspect_gitlab_matches(parser,args):
             traceback.print_exc()
         sys.exit(1)
 
+
 # =============================================================================
 # END INSPECT COMMAND HANDLERS
 # =============================================================================
@@ -2673,6 +2670,7 @@ def folder_hashing_scan(parser, args):
             depth=args.depth,
             recursive_threshold=args.recursive_threshold,
             min_accepted_score=args.min_accepted_score,
+            use_grpc=args.grpc,
         )
 
         if scanner.scan():

scanoss/data/build_date.txt

@@ -1 +1 @@
-date: 20251027150435, utime: 1761577475
+date: 20251029142146, utime: 1761747706

scanoss/scanners/scanner_hfh.py

@@ -63,6 +63,7 @@ class ScannerHFH:
         depth: int = DEFAULT_HFH_DEPTH,
         recursive_threshold: float = DEFAULT_HFH_RECURSIVE_THRESHOLD,
         min_accepted_score: float = DEFAULT_HFH_MIN_ACCEPTED_SCORE,
+        use_grpc: bool = False,
     ):
         """
         Initialize the ScannerHFH.
@@ -107,6 +108,7 @@ class ScannerHFH:
         self.rank_threshold = rank_threshold
         self.recursive_threshold = recursive_threshold
         self.min_accepted_score = min_accepted_score
+        self.use_grpc = use_grpc
 
     def scan(self) -> Optional[Dict]:
         """
@@ -134,7 +136,7 @@ class ScannerHFH:
         spinner_thread.start()
 
         try:
-            response = self.client.folder_hash_scan(hfh_request)
+            response = self.client.folder_hash_scan(hfh_request, self.use_grpc)
             if response:
                 self.scan_results = response
         finally:

scanoss/scanossgrpc.py

@@ -426,21 +426,24 @@ class ScanossGrpc(ScanossBase):
             use_grpc=use_grpc,
         )
 
-    def folder_hash_scan(self, request: Dict) -> Optional[Dict]:
+    def folder_hash_scan(self, request: Dict, use_grpc: Optional[bool] = None) -> Optional[Dict]:
         """
         Client function to call the rpc for Folder Hashing Scan
 
         Args:
             request (Dict): Folder Hash Request
+            use_grpc (Optional[bool]): Whether to use gRPC or REST API
 
         Returns:
             Optional[Dict]: Folder Hash Response, or None if the request was not succesfull
         """
-        return self._call_rpc(
+        return self._call_api(
+            'scanning.FolderHashScan',
             self.scanning_stub.FolderHashScan,
             request,
             HFHRequest,
             'Sending folder hash scan data (rqId: {rqId})...',
+            use_grpc=use_grpc,
         )
 
     def _call_api(

{scanoss-1.39.0.dist-info → scanoss-1.40.0.dist-info}/METADATA

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

{scanoss-1.39.0.dist-info → scanoss-1.40.0.dist-info}/RECORD

@@ -6,8 +6,8 @@ protoc_gen_swagger/options/annotations_pb2_grpc.py,sha256=KZOW9Ciio-f9iL42FuLFnS
 protoc_gen_swagger/options/openapiv2_pb2.py,sha256=w0xDs63uyrWGgzRaQZXfJpfI7Jpyvh-i9ay_uzOR-aM,16475
 protoc_gen_swagger/options/openapiv2_pb2.pyi,sha256=hYOV6uQ2yqhP89042_V3GuAsvoBBiXf5CGuYmnFnfv4,54665
 protoc_gen_swagger/options/openapiv2_pb2_grpc.py,sha256=sje9Nh3yE7CHCUWZwtjTgwsKB4GvyGz5vOrGTnRXJfc,917
-scanoss/__init__.py,sha256=q6qrK1ovnkPF_j1UjeGsMzCShu2ZJ4lwVjxJWcnkEro,1146
-scanoss/cli.py,sha256=u8t-F5TubEY7XnMtOdpQyf8hHQTWgJV6NLSAbO70KZY,103272
+scanoss/__init__.py,sha256=6IaHKZDhDx8hxXCPX8B5ueipZk0jEM6bGl8Vn_6-az8,1146
+scanoss/cli.py,sha256=fw0iCF4CuIEwy8BIyBlgxFBlVESV30kYGy1uS74sP0E,103298
 scanoss/components.py,sha256=NFyt_w3aoMotr_ZaFU-ng00_89sruc0kgY7ERnJXkmM,15891
 scanoss/constants.py,sha256=GHLTaLNVxXdTXRj7ngRK4u4S653pHzM8qFy4JFLa0wQ,450
 scanoss/cryptography.py,sha256=lOoD_dW16ARQxYiYyb5R8S7gx0FqWIsnGkKfsB0nGaU,10627
@@ -23,7 +23,7 @@ scanoss/scanner.py,sha256=-RCxLX0EepUebK8jQKvlMxFEQrCc8SwEjxznoWjadkg,45510
 scanoss/scanoss_settings.py,sha256=W8uFQ6uRIqtE-DXXA56bO8I4GsbJ-aA1c84hQ_qBel4,12161
 scanoss/scanossapi.py,sha256=U3IytJXA0mQHYsylzjwCuFakuhD_dJhstY37NmyvtB8,13243
 scanoss/scanossbase.py,sha256=Dkpwxa8NH8XN1iRl03NM_Mkvby0JQ4qfvCiiUrJ5ul0,3163
-scanoss/scanossgrpc.py,sha256=6s5TH2i3XB4xaXylmxFu7chlVlYjCZE_DpvRkiiaoHk,41541
+scanoss/scanossgrpc.py,sha256=9UuVPUjBLUhqim_tSntyoRZW-OAtiz5iP_VjjNr5RPY,41715
 scanoss/scanpostprocessor.py,sha256=-JsThlxrU70r92GHykTMERnicdd-6jmwNsE4PH0MN2o,11063
 scanoss/scantype.py,sha256=gFmyVmKQpHWogN2iCmMj032e_sZo4T92xS3_EH5B3Tc,1310
 scanoss/spdxlite.py,sha256=4JMxmyNmvcL6fjScihk8toWfSuQ-Pj1gzaT3SIn1fXA,29425
@@ -65,7 +65,7 @@ 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=pmm0MSiXkdf8e4rCIIDRcsNRixR2vGvD1Xak4l-wdwI,16550
 scanoss/api/vulnerabilities/v2/scanoss_vulnerabilities_pb2_grpc.py,sha256=BNxT5kUKQ-mgtOt5QYBM1Qrg5LNDqSpWKpfEZquIlsM,19127
-scanoss/data/build_date.txt,sha256=E98VubnEloGNCDN8aqw3fIG_fDuiNX2rH1wNr9RiqVk,40
+scanoss/data/build_date.txt,sha256=EsAP44xbRYCL6Rg23-wKXjV_HwKJKnffQXg6uFnmiCY,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
@@ -88,7 +88,7 @@ scanoss/scanners/__init__.py,sha256=D4C0lWLuNp8k_BjQZEc07WZcUgAvriVwQWOk063b0ZU,
 scanoss/scanners/container_scanner.py,sha256=fOrb64owrstX7LnTuxiIan059YgLeKXeBS6g2QaCyq0,16346
 scanoss/scanners/folder_hasher.py,sha256=PD1tghOrra3KtfsZJUbqKOmIBF-0Tg14FcBCKkqGUis,12873
 scanoss/scanners/scanner_config.py,sha256=egG7cw3S2akU-D9M1aLE5jLrfz_c8e7_DIotMnnpM84,2601
-scanoss/scanners/scanner_hfh.py,sha256=M2PB4wDTi4LD1DwuAVfWiqQkjOImSpNok7vgo5H_Spg,9190
+scanoss/scanners/scanner_hfh.py,sha256=xrWxRB0SOq5FJbil3lXnBk6z_on7jxr2itPBj2kb0RA,9270
 scanoss/services/dependency_track_service.py,sha256=JIpqev4I-x_ZajMxD5W2Y3OAUvEJ_4nstzAPV90vfP8,5070
 scanoss/utils/__init__.py,sha256=0hjb5ktavp7utJzFhGMPImPaZiHWgilM2HwvTp5lXJE,1122
 scanoss/utils/abstract_presenter.py,sha256=teiDTxBj5jBMCk2T8i4l1BJPf_u4zBLWrtCTFHSSECM,3148
@@ -96,9 +96,9 @@ scanoss/utils/crc64.py,sha256=TMrwQimSdE6imhFOUL7oAG6Kxu-8qMpGWMuMg8QpSVs,3169
 scanoss/utils/file.py,sha256=62cA9a17TU9ZvfA3FY5HY4-QOajJeSrc8S6xLA_f-3M,2980
 scanoss/utils/scanoss_scan_results_utils.py,sha256=ho9-DKefHFJlVZkw4gXOmMI-mgPIbV9Y2ftkI83fC1k,1727
 scanoss/utils/simhash.py,sha256=6iu8DOcecPAY36SZjCOzrrLMT9oIE7-gI6QuYwUQ7B0,5793
-scanoss-1.39.0.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
-scanoss-1.39.0.dist-info/METADATA,sha256=SfWyYWos1ELzQhh1fOPEPCrv2ZzlyEIRUrQ-k26Qg1k,6181
-scanoss-1.39.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scanoss-1.39.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
-scanoss-1.39.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
-scanoss-1.39.0.dist-info/RECORD,,
+scanoss-1.40.0.dist-info/licenses/LICENSE,sha256=LLUaXoiyOroIbr5ubAyrxBOwSRLTm35ETO2FmLpy8QQ,1074
+scanoss-1.40.0.dist-info/METADATA,sha256=ZX_JjQXpdybrkeUWvaqxN8UhZyVs3-zlByU3UWkcRAU,6181
+scanoss-1.40.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scanoss-1.40.0.dist-info/entry_points.txt,sha256=Uy28xnaDL5KQ7V77sZD5VLDXPNxYYzSr5tsqtiXVzAs,48
+scanoss-1.40.0.dist-info/top_level.txt,sha256=V11PrQ6Pnrc-nDF9xnisnJ8e6-i7HqSIKVNqduRWcL8,27
+scanoss-1.40.0.dist-info/RECORD,,