scanoss 1.39.0__tar.gz → 1.40.0__tar.gz

{scanoss-1.39.0/src/scanoss.egg-info → scanoss-1.40.0}/PKG-INFO

@@ -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 → scanoss-1.40.0}/src/scanoss/__init__.py

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

{scanoss-1.39.0 → scanoss-1.40.0}/src/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-1.40.0/src/scanoss/data/build_date.txt

@@ -0,0 +1 @@
+date: 20251029142146, utime: 1761747706

{scanoss-1.39.0 → scanoss-1.40.0}/src/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-1.39.0 → scanoss-1.40.0}/src/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 → scanoss-1.40.0/src/scanoss.egg-info}/PKG-INFO

@@ -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/src/scanoss/data/build_date.txt

@@ -1 +0,0 @@
-date: 20251027150435, utime: 1761577475