feat: fix lint issues and tests

Author: matiasdaloia

src/scanoss/cli.py

@@ -66,11 +66,6 @@
 from .threadeddependencies import SCOPE
 from .utils.file import validate_json_file
 
-DEFAULT_POST_SIZE = 32
-DEFAULT_TIMEOUT = 180
-MIN_TIMEOUT_VALUE = 5
-DEFAULT_RETRY = 5
-PYTHON3_OR_LATER = 3
 HEADER_PARTS_COUNT = 2
 
 
@@ -589,9 +584,9 @@ def setup_args() -> None:  # noqa: PLR0915
     # Global Scan/Fingerprint filter options
     for p in [p_scan, p_wfp]:
         p.add_argument('--obfuscate', action='store_true', help='Obfuscate fingerprints')
-        p.add_argument('--all-extensions', action='store_true', help='Fingerprint all file extensions')
-        p.add_argument('--all-folders', action='store_true', help='Fingerprint all folders')
-        p.add_argument('--all-hidden', action='store_true', help='Fingerprint all hidden files/folders')
+        p.add_argument('--all-extensions', action='store_true', help='Fingerprint all file extensions/types...')
+        p.add_argument('--all-folders', action='store_true', help='Fingerprint all folders...')
+        p.add_argument('--all-hidden', action='store_true', help='Fingerprint all hidden files/folders...')
         p.add_argument('--hpsm', '-H', action='store_true', help='Use High Precision Snippet Matching algorithm.')
         p.add_argument('--skip-snippets', '-S', action='store_true', help='Skip the generation of snippets')
         p.add_argument('--skip-extension', '-E', type=str, action='append', help='File Extension to skip.')
@@ -1282,7 +1277,7 @@ def get_pac_file(pac: str):
         if pac == 'auto':
             pac_file = pypac.get_pac()  # try to determine the PAC file
         elif pac.startswith('file://'):
-            pac_local = pac.strip('file://')
+            pac_local = pac[7:]  # Remove 'file://' prefix (7 characters)
             if not os.path.exists(pac_local):
                 print_stderr(f'Error: PAC file does not exist: {pac_local}.')
                 sys.exit(1)

src/scanoss/scanossgrpc.py

@@ -57,10 +57,7 @@
 from .api.components.v2.scanoss_components_pb2_grpc import ComponentsStub
 from .api.cryptography.v2.scanoss_cryptography_pb2 import AlgorithmResponse
 from .api.cryptography.v2.scanoss_cryptography_pb2_grpc import CryptographyStub
-from .api.dependencies.v2.scanoss_dependencies_pb2 import (
-    DependencyRequest,
-    DependencyResponse,
-)
+from .api.dependencies.v2.scanoss_dependencies_pb2 import DependencyRequest
 from .api.dependencies.v2.scanoss_dependencies_pb2_grpc import DependenciesStub
 from .api.provenance.v2.scanoss_provenance_pb2 import ProvenanceResponse
 from .api.scanning.v2.scanoss_scanning_pb2 import HFHRequest
@@ -77,6 +74,7 @@
 
 MAX_CONCURRENT_REQUESTS = 5
 
+
 class ScanossGrpcError(Exception):
     """
     Custom exception for SCANOSS gRPC errors
@@ -139,7 +137,6 @@ def __init__(  # noqa: PLR0913, PLR0915
         self.req_headers = req_headers
         self.metadata = []
 
-
         if self.api_key:
             self.metadata.append(('x-api-key', api_key))  # Set API key if we have one
         if ver_details:
@@ -528,9 +525,6 @@ def _check_status_response(self, status_response: StatusResponse, request_id: st
         :return: True if successful, False otherwise
         """
 
-        SUCCEDED_WITH_WARNINGS_STATUS_CODE = 2
-        FAILED_STATUS_CODE = 3
-
         if not status_response:
             self.print_stderr(f'Warning: No status response supplied (rqId: {request_id}). Assuming it was ok.')
             return True
@@ -601,18 +595,20 @@ def get_provenance_json(self, purls: dict) -> dict:
 
     def load_generic_headers(self):
         """
-           Adds custom headers from req_headers to metadata.
+        Adds custom headers from req_headers to metadata.
 
-           If x-api-key is present and no URL is configured (directly or via
-           environment), sets URL to the premium endpoint (DEFAULT_URL2).
-           """
+        If x-api-key is present and no URL is configured (directly or via
+        environment), sets URL to the premium endpoint (DEFAULT_URL2).
+        """
         if self.req_headers:  # Load generic headers
             for key, value in self.req_headers.items():
-                if key == 'x-api-key': # Set premium URL if x-api-key header is set
+                if key == 'x-api-key':  # Set premium URL if x-api-key header is set
                     if not self.url and not os.environ.get('SCANOSS_GRPC_URL'):
                         self.url = DEFAULT_URL2  # API key specific and no alternative URL, so use the default premium
                     self.api_key = value
                 self.metadata.append((key, value))
+
+
 #
 # End of ScanossGrpc Class
 #

tests/test_file_filters.py

@@ -197,16 +197,15 @@ def test_get_filtered_files_from_files(self):
             os.path.join(self.test_dir, 'file1.js'),
             os.path.join(self.test_dir, 'file2.css'),  # Should be skipped
             os.path.join(self.test_dir, 'dir1/file3.py'),
-            os.path.join(self.test_dir, 'dir1/__pycache__/file4.py'),
+            os.path.join(self.test_dir, 'dir1/__pycache__/file4.py'), # Should be skipped
         ]
         self.create_files(files)
 
-        filtered_files = self.file_filters.get_filtered_files_from_files(files)
+        filtered_files = self.file_filters.get_filtered_files_from_files(files, self.test_dir)
 
         expected_files = [
-            os.path.relpath(os.path.join(self.test_dir, 'file1.js'), os.getcwd()),
-            os.path.relpath(os.path.join(self.test_dir, 'dir1', 'file3.py'), os.getcwd()),
-            os.path.relpath(os.path.join(self.test_dir, 'dir1', '__pycache__', 'file4.py'), os.getcwd()),
+            'file1.js',
+            'dir1/file3.py',
         ]
         self.assertEqual(sorted(filtered_files), sorted(expected_files))