ruff fixes

Author: omerr-cycode

cycode/cli/app.py

@@ -9,7 +9,7 @@
 from typer.completion import install_callback, show_callback
 
 from cycode import __version__
-from cycode.cli.apps import ai_remediation, auth, configure, ignore, report, scan, status, report_import
+from cycode.cli.apps import ai_remediation, auth, configure, ignore, report, report_import, scan, status
 
 if sys.version_info >= (3, 10):
     from cycode.cli.apps import mcp

cycode/cli/apps/report_import/__init__.py

@@ -1,7 +1,7 @@
 import typer
 
-from cycode.cli.apps.report_import.sbom import sbom_command
 from cycode.cli.apps.report_import.report_import_command import report_import_command
+from cycode.cli.apps.report_import.sbom import sbom_command
 
 app = typer.Typer(name='import', no_args_is_help=True)
 app.callback(short_help='Import report. You`ll need to specify which report type to import.')(report_import_command)

cycode/cli/apps/report_import/sbom/sbom_command.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Annotated, Optional, List
+from typing import Annotated, Optional
 
 import typer
 
@@ -32,21 +32,21 @@ def sbom_command(
         str, typer.Option('--vendor', '-v', help='Vendor Name.', case_sensitive=False, show_default=False)
     ],
     labels: Annotated[
-        Optional[List[str]],
+        Optional[list[str]],
         typer.Option(
             '--label', '-l', help='Label, can be specified multiple times.', case_sensitive=False, show_default=False
         ),
-    ] = [],
+    ] = None,
     owners: Annotated[
-        Optional[List[str]],
+        Optional[list[str]],
         typer.Option(
             '--owner',
             '-o',
             help='Email address of a user in Cycode platform, can be specified multiple times.',
             case_sensitive=True,
             show_default=False,
         ),
-    ] = [],
+    ] = None,
     business_impact: Annotated[
         BusinessImpactOption,
         typer.Option(

cycode/cli/utils/get_api_client.py

@@ -8,9 +8,9 @@
 if TYPE_CHECKING:
     import typer
 
+    from cycode.cyclient.import_sbom_client import ImportSbomClient
     from cycode.cyclient.report_client import ReportClient
     from cycode.cyclient.scan_client import ScanClient
-    from cycode.cyclient.import_sbom_client import ImportSbomClient
 
 
 def _get_cycode_client(

cycode/cyclient/import_sbom_client.py

@@ -1,24 +1,24 @@
 import dataclasses
-from typing import List, Optional
 from pathlib import Path
+from typing import Optional
+
 from requests import Response
-from urllib.parse import quote
 
 from cycode.cli.cli_types import BusinessImpactOption
-from cycode.cli.exceptions.custom_exceptions import CycodeError, RequestHttpError
-from cycode.cyclient.cycode_client_base import CycodeClientBase
+from cycode.cli.exceptions.custom_exceptions import RequestHttpError
 from cycode.cyclient import models
+from cycode.cyclient.cycode_client_base import CycodeClientBase
 
 
 @dataclasses.dataclass
 class ImportSbomParameters:
     Name: str
     Vendor: str
     BusinessImpact: BusinessImpactOption
-    Labels: Optional[List[str]]
-    Owners: Optional[List[str]]
+    Labels: Optional[list[str]]
+    Owners: Optional[list[str]]
 
-    def _owners_to_ids(self) -> List[str]:
+    def _owners_to_ids(self) -> list[str]:
         return []
 
     def to_request_form(self) -> dict:
@@ -49,18 +49,20 @@ def request_sbom_import_execution(self, params: ImportSbomParameters, file_path:
 
         form_data = params.to_request_form()
 
-        request_args = {
-            'url_path': self.IMPORT_SBOM_REQUEST_PATH,
-            'data': form_data,
-            'files': {'File': open(file_path.absolute(), 'rb')},
-        }
+        with open(file_path.absolute(), 'rb') as f:
+
+            request_args = {
+                'url_path': self.IMPORT_SBOM_REQUEST_PATH,
+                'data': form_data,
+                'files': {'File': f},
+            }
 
-        response = self.client.post(**request_args)
+            response = self.client.post(**request_args)
 
         if response.status_code != 201:
             raise RequestHttpError(response.status_code, response.text, response)
 
-    def get_owners_user_ids(self, owners: List[str]) -> List[str]:
+    def get_owners_user_ids(self, owners: list[str]) -> list[str]:
         return [self._get_user_id_by_email(owner) for owner in owners]
 
     def _get_user_id_by_email(self, email: str) -> str:

tests/cli/commands/import/test_import_sbom.py

@@ -1,15 +1,16 @@
 import tempfile
-import pytest
-import responses
 from pathlib import Path
 from typing import TYPE_CHECKING
+
+import pytest
+import responses
 from typer.testing import CliRunner
 
 from cycode.cli.app import app
 from cycode.cli.cli_types import BusinessImpactOption
 from cycode.cyclient.client_creator import create_import_sbom_client
 from cycode.cyclient.import_sbom_client import ImportSbomClient, ImportSbomParameters
-from tests.conftest import CLI_ENV_VARS, _CLIENT_ID, _CLIENT_SECRET
+from tests.conftest import _CLIENT_ID, _CLIENT_SECRET, CLI_ENV_VARS
 from tests.cyclient.mocked_responses import import_sbom_client as mocked_import_sbom
 
 if TYPE_CHECKING:
@@ -21,7 +22,7 @@ def import_sbom_client() -> ImportSbomClient:
     return create_import_sbom_client(_CLIENT_ID, _CLIENT_SECRET, False)
 
 
-def _validate_called_endpoint(calls: responses.CallList, path: str, expected_count: int = 1):
+def _validate_called_endpoint(calls: responses.CallList, path: str, expected_count: int = 1) -> None:
     # Verify the import request was made
     import_calls = [c for c in calls if path in c.request.url]
     assert len(import_calls) == expected_count
@@ -149,7 +150,7 @@ def test_sbom_command_with_all_options(
     def test_sbom_command_file_not_exists(self, mocker: 'MockerFixture') -> None:
         from uuid import uuid4
 
-        non_existent_file = f'/tmp/{uuid4}'
+        non_existent_file = str(uuid4())
 
         args = [
             'import',