cycode 3.25.2.dev1__py3-none-any.whl → 3.25.2.dev2__py3-none-any.whl

cycode/cli/utils/task_timer.py

@@ -1,11 +1,11 @@
 from _thread import interrupt_main
+from collections.abc import Callable
 from threading import Event, Thread
 from types import TracebackType
-from typing import Callable, Optional
 
 
 class FunctionContext:
-    def __init__(self, function: Callable, args: Optional[list] = None, kwargs: Optional[dict] = None) -> None:
+    def __init__(self, function: Callable, args: list | None = None, kwargs: dict | None = None) -> None:
         self.function = function
         self.args = args or []
         self.kwargs = kwargs or {}
@@ -54,7 +54,7 @@ class TimeoutAfter:
                                    the default option is to interrupt main thread
     """
 
-    def __init__(self, timeout: int, quit_function: Optional[FunctionContext] = None) -> None:
+    def __init__(self, timeout: int, quit_function: FunctionContext | None = None) -> None:
         self.timeout = timeout
         self._quit_function = quit_function or FunctionContext(function=self.timeout_function)
         self.timer = TimerThread(timeout, quit_function=self._quit_function)
@@ -64,7 +64,7 @@ class TimeoutAfter:
             self.timer.start()
 
     def __exit__(
-        self, exc_type: Optional[type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
+        self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None:
         if self.timeout:
             self.timer.stop()

cycode/cli/utils/trust_store.py

@@ -1,21 +1,12 @@
-import sys
-
 from cycode import config
 from cycode.cli import consts
 from cycode.logger import get_logger
 
 logger = get_logger('Trust Store')
 
-# truststore requires Python 3.10+, so on 3.9 the OS trust store is unavailable
-_MIN_PYTHON_VERSION = (3, 10)
-
 _installed = False
 
 
-def is_supported() -> bool:
-    return sys.version_info >= _MIN_PYTHON_VERSION
-
-
 def is_enabled() -> bool:
     return config.get_val_as_bool(consts.ENABLE_TRUSTSTORE_ENV_VAR_NAME)
 
@@ -45,14 +36,6 @@ def install() -> bool:
         )
         return False
 
-    if not is_supported():
-        logger.warning(
-            'OS trust store requires Python %s+, using the bundled CA store (certifi). Current version: %s',
-            '.'.join(map(str, _MIN_PYTHON_VERSION)),
-            '.'.join(map(str, sys.version_info[:3])),
-        )
-        return False
-
     try:
         import truststore
 

cycode/cli/utils/url_utils.py

@@ -1,4 +1,3 @@
-from typing import Optional
 from urllib.parse import urlparse, urlunparse
 
 from cycode.logger import get_logger
@@ -6,7 +5,7 @@ from cycode.logger import get_logger
 logger = get_logger('URL Utils')
 
 
-def sanitize_repository_url(url: Optional[str]) -> Optional[str]:
+def sanitize_repository_url(url: str | None) -> str | None:
     """Remove credentials (username, password, tokens) from repository URL.
 
     This function sanitizes repository URLs to prevent sending PAT tokens or other

cycode/cli/utils/version_checker.py

@@ -2,7 +2,6 @@ import os
 import re
 import time
 from pathlib import Path
-from typing import Optional
 
 from cycode.cli.console import console
 from cycode.cli.user_settings.configuration_manager import ConfigurationManager
@@ -19,7 +18,7 @@ def _compare_versions(
     current_is_pre: bool,
     latest_is_pre: bool,
     latest_version: str,
-) -> Optional[str]:
+) -> str | None:
     """Compare version numbers and determine if an update is needed.
 
     Implements version comparison logic with special handling for pre-release versions:
@@ -43,7 +42,7 @@ def _compare_versions(
         return None
 
     # Compare version numbers
-    for current, latest in zip(current_parts, latest_parts):
+    for current, latest in zip(current_parts, latest_parts, strict=False):
         if latest > current:
             return latest_version
         if current > latest:
@@ -78,7 +77,7 @@ class VersionChecker(CycodeClientBase):
         config_dir = configuration_manager.global_config_file_manager.get_config_directory_path()
         self.cache_file = Path(config_dir) / '.version_check'
 
-    def get_latest_version(self) -> Optional[str]:
+    def get_latest_version(self) -> str | None:
         """Fetch the latest version of the package from PyPI.
 
         Makes an HTTP request to PyPI's JSON API to get the latest version information.
@@ -160,7 +159,7 @@ class VersionChecker(CycodeClientBase):
         except Exception as e:
             logger.debug('Failed to update version check cache file: %s', {'file': self.cache_file}, exc_info=e)
 
-    def check_for_update(self, current_version: str, use_cache: bool = True) -> Optional[str]:
+    def check_for_update(self, current_version: str, use_cache: bool = True) -> str | None:
         """Check if an update is available for the current version.
 
         Respects the update check frequency (daily/weekly) based on the version type

cycode/cli/utils/yaml_utils.py

@@ -15,7 +15,7 @@ def _deep_update(source: dict[Hashable, Any], overrides: dict[Hashable, Any]) ->
         if isinstance(value, dict) and value:
             source[key] = _deep_update(source.get(key, {}), value)
         else:
-            source[key] = overrides[key]
+            source[key] = value
 
     return source
 

cycode/config.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from typing import Optional
 from urllib.parse import urlparse
 
 from cycode.cli import consts
@@ -26,7 +25,7 @@ def get_val_as_bool(key: str, default: bool = False) -> bool:
     return configuration[key].lower() in {'true', '1', 'yes', 'y', 'on', 'enabled'}
 
 
-def get_val_as_int(key: str) -> Optional[int]:
+def get_val_as_int(key: str) -> int | None:
     val = configuration.get(key)
     if not val:
         return None

cycode/cyclient/ai_security_manager_client.py

@@ -1,6 +1,6 @@
 """Client for AI Security Manager service."""
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode.cli.exceptions.custom_exceptions import HttpUnauthorizedError
 from cycode.cyclient.cycode_client_base import CycodeClientBase
@@ -32,7 +32,7 @@ class AISecurityManagerClient:
             return f'{service_name}/{path}'
         return path
 
-    def create_conversation(self, payload: 'AIHookPayload') -> Optional[str]:
+    def create_conversation(self, payload: 'AIHookPayload') -> str | None:
         """Creates an AI conversation from hook payload."""
         conversation_id = payload.conversation_id
         if not conversation_id:
@@ -63,10 +63,10 @@ class AISecurityManagerClient:
         payload: 'AIHookPayload',
         event_type: 'AiHookEventType',
         outcome: 'AIHookOutcome',
-        scan_id: Optional[str] = None,
-        block_reason: Optional['BlockReason'] = None,
-        error_message: Optional[str] = None,
-        file_path: Optional[str] = None,
+        scan_id: str | None = None,
+        block_reason: 'BlockReason | None' = None,
+        error_message: str | None = None,
+        file_path: str | None = None,
     ) -> None:
         """Create an AI hook event from hook payload."""
         conversation_id = payload.conversation_id
@@ -95,7 +95,7 @@ class AISecurityManagerClient:
             logger.debug('Failed to create AI hook event', exc_info=e)
             # Don't fail the hook if tracking fails
 
-    def get_resolved_guardrails(self) -> Optional[dict]:
+    def get_resolved_guardrails(self) -> dict | None:
         """Fetch the tenant's resolved guardrail config (per-agent modes + sensitive-path globs)."""
         try:
             response = self.client.get(self._build_endpoint_path(self._RESOLVED_GUARDRAILS_PATH))
@@ -106,16 +106,16 @@ class AISecurityManagerClient:
 
     def report_session_context(
         self,
-        hostname: Optional[str] = None,
-        platform_name: Optional[str] = None,
-        os_version: Optional[str] = None,
-        serial_number: Optional[str] = None,
-        last_login_user: Optional[str] = None,
-        config_files: Optional[list[dict]] = None,
-        enabled_plugins: Optional[dict] = None,
-        skill_files: Optional[list[dict]] = None,
-        user_email: Optional[str] = None,
-    ) -> Optional[SessionContextResponse]:
+        hostname: str | None = None,
+        platform_name: str | None = None,
+        os_version: str | None = None,
+        serial_number: str | None = None,
+        last_login_user: str | None = None,
+        config_files: list[dict] | None = None,
+        enabled_plugins: dict | None = None,
+        skill_files: list[dict] | None = None,
+        user_email: str | None = None,
+    ) -> SessionContextResponse | None:
         """Report session context to the backend. Returns None when the report was not accepted."""
         body: dict = {
             'hostname': hostname,

cycode/cyclient/auth_client.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from requests import Request, Response
 
 from cycode.cli.exceptions.custom_exceptions import HttpUnauthorizedError, RequestHttpError
@@ -24,7 +22,7 @@ class AuthClient:
         response = self.cycode_client.post(url_path=path, body=body)
         return self.parse_start_session_response(response)
 
-    def get_api_token(self, session_id: str, code_verifier: str) -> Optional[models.ApiTokenGenerationPollingResponse]:
+    def get_api_token(self, session_id: str, code_verifier: str) -> models.ApiTokenGenerationPollingResponse | None:
         path = f'{self.AUTH_CONTROLLER_PATH}/token'
         body = {'session_id': session_id, 'code_verifier': code_verifier}
         try:
@@ -40,7 +38,7 @@ class AuthClient:
         return models.AuthenticationSessionSchema().load(response.json())
 
     @staticmethod
-    def parse_api_token_polling_response(response: Response) -> Optional[models.ApiTokenGenerationPollingResponse]:
+    def parse_api_token_polling_response(response: Response) -> models.ApiTokenGenerationPollingResponse | None:
         try:
             return models.ApiTokenGenerationPollingResponseSchema().load(response.json())
         except Exception:

cycode/cyclient/base_token_auth_client.py

@@ -2,7 +2,7 @@ import secrets
 import time
 from abc import ABC, abstractmethod
 from threading import Lock
-from typing import Any, Optional
+from typing import Any
 
 import arrow
 from requests import Response
@@ -97,7 +97,7 @@ class BaseTokenAuthClient(CycodeClient, ABC):
         jwt_creator = self._create_jwt_creator()
         self._credentials_manager.update_access_token(self._access_token, self._expires_in.timestamp(), jwt_creator)
 
-    def get_request_headers(self, additional_headers: Optional[dict] = None, without_auth: bool = False) -> dict:
+    def get_request_headers(self, additional_headers: dict | None = None, without_auth: bool = False) -> dict:
         headers = super().get_request_headers(additional_headers=additional_headers)
 
         if not without_auth:

cycode/cyclient/client_creator.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from cycode.cyclient.ai_security_manager_client import AISecurityManagerClient
 from cycode.cyclient.ai_security_manager_service_config import (
     DefaultAISecurityManagerServiceConfig,
@@ -17,7 +15,7 @@ from cycode.cyclient.scan_config_base import DefaultScanConfig, DevScanConfig
 
 
 def create_scan_client(
-    client_id: str, client_secret: Optional[str] = None, hide_response_log: bool = False, id_token: Optional[str] = None
+    client_id: str, client_secret: str | None = None, hide_response_log: bool = False, id_token: str | None = None
 ) -> ScanClient:
     if dev_mode:
         client = CycodeDevBasedClient(DEV_CYCODE_API_URL)
@@ -33,7 +31,7 @@ def create_scan_client(
 
 
 def create_report_client(
-    client_id: str, client_secret: Optional[str] = None, _: bool = False, id_token: Optional[str] = None
+    client_id: str, client_secret: str | None = None, _: bool = False, id_token: str | None = None
 ) -> ReportClient:
     if dev_mode:
         client = CycodeDevBasedClient(DEV_CYCODE_API_URL)
@@ -45,7 +43,7 @@ def create_report_client(
 
 
 def create_import_sbom_client(
-    client_id: str, client_secret: Optional[str] = None, _: bool = False, id_token: Optional[str] = None
+    client_id: str, client_secret: str | None = None, _: bool = False, id_token: str | None = None
 ) -> ImportSbomClient:
     if dev_mode:
         client = CycodeDevBasedClient(DEV_CYCODE_API_URL)
@@ -57,7 +55,7 @@ def create_import_sbom_client(
 
 
 def create_ai_security_manager_client(
-    client_id: str, client_secret: Optional[str] = None, _: bool = False, id_token: Optional[str] = None
+    client_id: str, client_secret: str | None = None, _: bool = False, id_token: str | None = None
 ) -> AISecurityManagerClient:
     if dev_mode:
         client = CycodeDevBasedClient(DEV_CYCODE_API_URL)

cycode/cyclient/cycode_client_base.py

@@ -2,8 +2,9 @@ import functools
 import os
 import platform
 import ssl
+from collections.abc import Callable
 from io import BytesIO
-from typing import TYPE_CHECKING, Callable, ClassVar, Optional
+from typing import TYPE_CHECKING, ClassVar
 
 import requests
 from requests import Response, exceptions
@@ -114,7 +115,7 @@ def _should_retry_exception(exception: BaseException) -> bool:
 class UploadProgressTracker:
     """File-like wrapper that tracks bytes read during upload and fires a progress callback."""
 
-    def __init__(self, data: bytes, callback: Optional[Callable[[int, int], None]]) -> None:
+    def __init__(self, data: bytes, callback: Callable[[int, int], None] | None) -> None:
         self._io = BytesIO(data)
         self._callback = callback
         self.bytes_read = 0
@@ -146,13 +147,13 @@ class CycodeClientBase:
     def enrich_user_agent(user_agent_suffix: str) -> None:
         CycodeClientBase.MANDATORY_HEADERS['User-Agent'] += f' {user_agent_suffix}'
 
-    def post(self, url_path: str, body: Optional[dict] = None, headers: Optional[dict] = None, **kwargs) -> Response:
+    def post(self, url_path: str, body: dict | None = None, headers: dict | None = None, **kwargs) -> Response:
         return self._execute(method='post', endpoint=url_path, json=body, headers=headers, **kwargs)
 
-    def put(self, url_path: str, body: Optional[dict] = None, headers: Optional[dict] = None, **kwargs) -> Response:
+    def put(self, url_path: str, body: dict | None = None, headers: dict | None = None, **kwargs) -> Response:
         return self._execute(method='put', endpoint=url_path, json=body, headers=headers, **kwargs)
 
-    def get(self, url_path: str, headers: Optional[dict] = None, **kwargs) -> Response:
+    def get(self, url_path: str, headers: dict | None = None, **kwargs) -> Response:
         return self._execute(method='get', endpoint=url_path, headers=headers, **kwargs)
 
     def post_multipart(
@@ -160,7 +161,7 @@ class CycodeClientBase:
         url_path: str,
         form_fields: dict,
         files: dict,
-        on_upload_progress: Optional[Callable[[int, int], None]] = None,
+        on_upload_progress: Callable[[int, int], None] | None = None,
         hide_response_content_log: bool = False,
     ) -> Response:
         """POST a multipart form body with optional upload progress tracking and retry."""
@@ -191,7 +192,7 @@ class CycodeClientBase:
         url: str,
         body: bytes,
         content_type: str,
-        on_upload_progress: Optional[Callable[[int, int], None]],
+        on_upload_progress: Callable[[int, int], None] | None,
         hide_response_content_log: bool,
     ) -> Response:
         # Wrap the body in a fresh tracker each attempt so bytes_read starts from zero.
@@ -227,7 +228,7 @@ class CycodeClientBase:
         self,
         method: str,
         endpoint: str,
-        headers: Optional[dict] = None,
+        headers: dict | None = None,
         without_auth: bool = False,
         hide_response_content_log: bool = False,
         **kwargs,
@@ -253,7 +254,7 @@ class CycodeClientBase:
         except Exception as e:
             self._handle_exception(e)
 
-    def get_request_headers(self, additional_headers: Optional[dict] = None, **kwargs) -> dict[str, str]:
+    def get_request_headers(self, additional_headers: dict | None = None, **kwargs) -> dict[str, str]:
         if additional_headers is None:
             return self.MANDATORY_HEADERS.copy()
         return {**self.MANDATORY_HEADERS, **additional_headers}

cycode/cyclient/cycode_dev_based_client.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from cycode.cyclient.config import dev_tenant_id
 from cycode.cyclient.cycode_client_base import CycodeClientBase
 
@@ -12,7 +10,7 @@ class CycodeDevBasedClient(CycodeClientBase):
     def __init__(self, api_url: str) -> None:
         super().__init__(api_url)
 
-    def get_request_headers(self, additional_headers: Optional[dict] = None, **_) -> dict[str, str]:
+    def get_request_headers(self, additional_headers: dict | None = None, **_) -> dict[str, str]:
         headers = super().get_request_headers(additional_headers=additional_headers)
         headers['X-Tenant-Id'] = dev_tenant_id
 

cycode/cyclient/headers.py

@@ -1,5 +1,4 @@
 import platform
-from typing import Optional
 from uuid import uuid4
 
 from cycode import __version__
@@ -25,7 +24,7 @@ def get_cli_user_agent() -> str:
 
 
 class _CorrelationId:
-    _id: Optional[str] = None
+    _id: str | None = None
 
     def get_correlation_id(self) -> str:
         """Get correlation ID.

cycode/cyclient/import_sbom_client.py

@@ -1,6 +1,5 @@
 import dataclasses
 from pathlib import Path
-from typing import Optional
 
 from requests import Response
 
@@ -15,8 +14,8 @@ class ImportSbomParameters:
     Name: str
     Vendor: str
     BusinessImpact: BusinessImpactOption
-    Labels: Optional[list[str]]
-    Owners: Optional[list[str]]
+    Labels: list[str] | None
+    Owners: list[str] | None
 
     def _owners_to_ids(self) -> list[str]:
         return []
@@ -71,7 +70,7 @@ class ImportSbomClient:
         member_details = self.parse_requested_member_details_response(response)
 
         if not member_details.items:
-            raise Exception(
+            raise Exception(  # noqa: TRY002
                 f"Failed to find user with email '{email}'. Verify this email is registered to Cycode platform"
             )
         return member_details.items.pop(0).external_id

cycode/cyclient/models.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from marshmallow import EXCLUDE, Schema, fields, missing, post_load
 
@@ -13,8 +13,8 @@ class Detection(Schema):
         message: str,
         detection_details: dict,
         detection_rule_id: str,
-        severity: Optional[str] = None,
-        id: Optional[str] = None,
+        severity: str | None = None,
+        id: str | None = None,
     ) -> None:
         super().__init__()
         self.id = id
@@ -62,7 +62,7 @@ class DetectionSchema(Schema):
 
 
 class DetectionsPerFile(Schema):
-    def __init__(self, file_name: str, detections: list[Detection], commit_id: Optional[str] = None) -> None:
+    def __init__(self, file_name: str, detections: list[Detection], commit_id: str | None = None) -> None:
         super().__init__()
         self.file_name = file_name
         self.detections = detections
@@ -74,10 +74,10 @@ class ZippedFileScanResult(Schema):
         self,
         did_detect: bool,
         detections_per_file: list[DetectionsPerFile],
-        report_url: Optional[str] = None,
-        scan_id: Optional[str] = None,
-        err: Optional[str] = None,
-        verdict: Optional[str] = None,
+        report_url: str | None = None,
+        scan_id: str | None = None,
+        err: str | None = None,
+        verdict: str | None = None,
     ) -> None:
         super().__init__()
         self.did_detect = did_detect
@@ -92,9 +92,9 @@ class ScanResult(Schema):
     def __init__(
         self,
         did_detect: bool,
-        scan_id: Optional[str] = None,
-        detections: Optional[list[Detection]] = None,
-        err: Optional[str] = None,
+        scan_id: str | None = None,
+        detections: list[Detection] | None = None,
+        err: str | None = None,
     ) -> None:
         super().__init__()
         self.did_detect = did_detect
@@ -138,7 +138,7 @@ class UploadLinkResponseSchema(Schema):
 
 
 class ScanInitializationResponse(Schema):
-    def __init__(self, scan_id: Optional[str] = None, err: Optional[str] = None) -> None:
+    def __init__(self, scan_id: str | None = None, err: str | None = None) -> None:
         super().__init__()
         self.scan_id = scan_id
         self.err = err
@@ -159,13 +159,13 @@ class ScanInitializationResponseSchema(Schema):
 class ScanDetailsResponse(Schema):
     def __init__(
         self,
-        id: Optional[str] = None,
-        scan_status: Optional[str] = None,
-        results_count: Optional[int] = None,
-        metadata: Optional[str] = None,
-        message: Optional[str] = None,
-        scan_update_at: Optional[str] = None,
-        err: Optional[str] = None,
+        id: str | None = None,
+        scan_status: str | None = None,
+        results_count: int | None = None,
+        metadata: str | None = None,
+        message: str | None = None,
+        scan_update_at: str | None = None,
+        err: str | None = None,
     ) -> None:
         super().__init__()
         self.id = id
@@ -389,9 +389,9 @@ class SbomReportStorageDetailsSchema(Schema):
 class ReportExecution:
     id: int
     status: str
-    error_message: Optional[str] = None
-    status_message: Optional[str] = None
-    storage_details: Optional[SbomReportStorageDetails] = None
+    error_message: str | None = None
+    status_message: str | None = None
+    storage_details: SbomReportStorageDetails | None = None
 
 
 class ReportExecutionSchema(Schema):
@@ -445,7 +445,7 @@ class MemberSchema(Schema):
 class MemberDetails:
     items: list[Member]
     page_size: int
-    next_page_token: Optional[str]
+    next_page_token: str | None
 
 
 class RequestedMemberDetailsResultSchema(Schema):
@@ -481,11 +481,11 @@ class ClassificationDataSchema(Schema):
 class DetectionRule:
     classification_data: list[ClassificationData]
     detection_rule_id: str
-    custom_remediation_guidelines: Optional[str] = None
-    remediation_guidelines: Optional[str] = None
-    description: Optional[str] = None
-    policy_name: Optional[str] = None
-    display_name: Optional[str] = None
+    custom_remediation_guidelines: str | None = None
+    remediation_guidelines: str | None = None
+    description: str | None = None
+    policy_name: str | None = None
+    display_name: str | None = None
 
 
 class DetectionRuleSchema(Schema):
@@ -509,7 +509,7 @@ class DetectionRuleSchema(Schema):
 class ScanResultsSyncFlow:
     id: str
     detection_messages: list[dict]
-    verdict: Optional[str] = None
+    verdict: str | None = None
 
 
 class ScanResultsSyncFlowSchema(Schema):
@@ -594,7 +594,7 @@ class McpServerAuthorizationStatus(str, Enum):
 
 
 class McpServerAuthorizationStatusField(fields.Field):
-    def _serialize(self, value: Optional[McpServerAuthorizationStatus], *_, **__) -> Optional[str]:
+    def _serialize(self, value: McpServerAuthorizationStatus | None, *_, **__) -> str | None:
         return value.value if value is not None else None
 
     def deserialize(self, value: object, *_, **__) -> McpServerAuthorizationStatus:
@@ -603,8 +603,8 @@ class McpServerAuthorizationStatusField(fields.Field):
 
 @dataclass
 class McpServerStatus:
-    alias: Optional[str] = None
-    normalized_id: Optional[str] = None
+    alias: str | None = None
+    normalized_id: str | None = None
     status: McpServerAuthorizationStatus = McpServerAuthorizationStatus.UNREVIEWED
 
 
@@ -624,7 +624,7 @@ class McpServerStatusSchema(Schema):
 @dataclass
 class SessionContextResponse:
     # None when the response carries no (or malformed) MCP server statuses.
-    mcp_servers: Optional[list[McpServerStatus]] = None
+    mcp_servers: list[McpServerStatus] | None = None
 
 
 class SessionContextResponseSchema(Schema):

cycode/cyclient/report_client.py

@@ -1,6 +1,5 @@
 import dataclasses
 import json
-from typing import Optional
 
 from requests import Response
 
@@ -45,7 +44,7 @@ class ReportClient:
         self.client = client
 
     def request_sbom_report_execution(
-        self, params: ReportParameters, zip_file: InMemoryZip = None, repository_url: Optional[str] = None
+        self, params: ReportParameters, zip_file: InMemoryZip = None, repository_url: str | None = None
     ) -> models.ReportExecution:
         report_type = 'zipped-file' if zip_file else 'repository-url'
         url_path = f'{self.SERVICE_NAME}/{self.CREATE_SBOM_REPORT_REQUEST_PATH}'.format(report_type=report_type)

cycode/cyclient/scan_client.py

@@ -1,6 +1,7 @@
 import json
+from collections.abc import Callable
 from copy import deepcopy
-from typing import TYPE_CHECKING, Callable, Optional, Union
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 import requests
@@ -119,7 +120,7 @@ class ScanClient:
         scan_parameters: dict,
         is_git_diff: bool = False,
         is_commit_range: bool = False,
-        on_upload_progress: Optional[Callable[[int, int], None]] = None,
+        on_upload_progress: Callable[[int, int], None] | None = None,
     ) -> models.ScanInitializationResponse:
         response = self.scan_cycode_client.post_multipart(
             url_path=self.get_zipped_file_scan_async_url_path(scan_type),
@@ -145,7 +146,7 @@ class ScanClient:
         url: str,
         fields: dict[str, str],
         zip_file: 'InMemoryZip',
-        on_upload_progress: Optional[Callable[[int, int], None]] = None,
+        on_upload_progress: Callable[[int, int], None] | None = None,
     ) -> None:
         all_files = {key: (None, value) for key, value in fields.items()}
         all_files['file'] = ('multiple_files_scan.zip', zip_file.read(), 'application/octet-stream')
@@ -315,7 +316,7 @@ class ScanClient:
     def parse_detection_rules_response(response: Response) -> list[models.DetectionRule]:
         return models.DetectionRuleSchema().load(response.json(), many=True)
 
-    def get_detection_rules(self, detection_rules_ids: Union[set[str], list[str]]) -> list[models.DetectionRule]:
+    def get_detection_rules(self, detection_rules_ids: set[str] | list[str]) -> list[models.DetectionRule]:
         response = self.scan_cycode_client.get(
             url_path=self.get_detection_rules_path(),
             params={'ids': detection_rules_ids},
@@ -372,7 +373,7 @@ class ScanClient:
         correct_scan_type = self.scan_config.get_async_scan_type(scan_type)
         return f'{self.get_scan_service_url_path(scan_type)}/{correct_scan_type}/configuration'
 
-    def get_scan_configuration(self, scan_type: str, remote_url: Optional[str] = None) -> models.ScanConfiguration:
+    def get_scan_configuration(self, scan_type: str, remote_url: str | None = None) -> models.ScanConfiguration:
         params = {}
         if remote_url:
             params['remote_url'] = remote_url
@@ -385,8 +386,8 @@ class ScanClient:
         return models.ScanConfigurationSchema().load(response.json())
 
     def get_scan_configuration_safe(
-        self, scan_type: str, remote_url: Optional[str] = None
-    ) -> Optional['models.ScanConfiguration']:
+        self, scan_type: str, remote_url: str | None = None
+    ) -> 'models.ScanConfiguration | None':
         try:
             return self.get_scan_configuration(scan_type, remote_url)
         except RequestHttpError as e: