cycode 3.25.1.dev6__py3-none-any.whl → 3.25.2.dev2__py3-none-any.whl

cycode/cli/user_settings/config_file_manager.py

@@ -1,6 +1,6 @@
 import os
 from collections.abc import Hashable
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any, Union
 
 from cycode.cli.consts import CYCODE_CONFIGURATION_DIRECTORY
 from cycode.cli.user_settings.base_file_manager import BaseFileManager
@@ -30,26 +30,26 @@ class ConfigFileManager(BaseFileManager):
     def __init__(self, path: Union['Path', str]) -> None:
         self.path = path
 
-    def get_api_url(self) -> Optional[Any]:
+    def get_api_url(self) -> Any | None:
         return self._get_value_from_environment_section(self.API_URL_FIELD_NAME)
 
-    def get_app_url(self) -> Optional[Any]:
+    def get_app_url(self) -> Any | None:
         return self._get_value_from_environment_section(self.APP_URL_FIELD_NAME)
 
-    def get_verbose_flag(self) -> Optional[Any]:
+    def get_verbose_flag(self) -> Any | None:
         return self._get_value_from_environment_section(self.VERBOSE_FIELD_NAME)
 
     def get_exclusions_by_scan_type(self, scan_type: str) -> dict[Hashable, Any]:
         exclusions_section = self._get_section(self.EXCLUSIONS_SECTION_NAME)
         return exclusions_section.get(scan_type, {})
 
-    def get_max_commits(self, command_scan_type: str) -> Optional[Any]:
+    def get_max_commits(self, command_scan_type: str) -> Any | None:
         return self._get_value_from_command_scan_type_configuration(command_scan_type, self.MAX_COMMITS_FIELD_NAME)
 
-    def get_command_timeout(self, command_scan_type: str) -> Optional[Any]:
+    def get_command_timeout(self, command_scan_type: str) -> Any | None:
         return self._get_value_from_command_scan_type_configuration(command_scan_type, self.COMMAND_TIMEOUT_FIELD_NAME)
 
-    def get_exclude_detections_in_deleted_lines(self, command_scan_type: str) -> Optional[Any]:
+    def get_exclude_detections_in_deleted_lines(self, command_scan_type: str) -> Any | None:
         return self._get_value_from_command_scan_type_configuration(
             command_scan_type, self.EXCLUDE_DETECTIONS_IN_DELETED_LINES
         )
@@ -62,7 +62,7 @@ class ConfigFileManager(BaseFileManager):
         update_data = {self.ENVIRONMENT_SECTION_NAME: {self.APP_URL_FIELD_NAME: app_url}}
         self.write_content_to_file(update_data)
 
-    def get_installation_id(self) -> Optional[str]:
+    def get_installation_id(self) -> str | None:
         return self._get_value_from_environment_section(self.INSTALLATION_ID_FIELD_NAME)
 
     def update_installation_id(self, installation_id: str) -> None:
@@ -103,7 +103,7 @@ class ConfigFileManager(BaseFileManager):
         scan_type_exclusions = self.get_exclusions_by_scan_type(scan_type)
         return scan_type_exclusions.get(exclusion_type, [])
 
-    def _get_value_from_environment_section(self, field_name: str) -> Optional[Any]:
+    def _get_value_from_environment_section(self, field_name: str) -> Any | None:
         environment_section = self._get_section(self.ENVIRONMENT_SECTION_NAME)
         return environment_section.get(field_name)
 
@@ -111,7 +111,7 @@ class ConfigFileManager(BaseFileManager):
         scan_section = self._get_section(self.SCAN_SECTION_NAME)
         return scan_section.get(command_scan_type, {})
 
-    def _get_value_from_command_scan_type_configuration(self, command_scan_type: str, field_name: str) -> Optional[Any]:
+    def _get_value_from_command_scan_type_configuration(self, command_scan_type: str, field_name: str) -> Any | None:
         command_scan_type_configuration = self._get_scan_configuration_by_scan_type(command_scan_type)
         return command_scan_type_configuration.get(field_name)
 

cycode/cli/user_settings/configuration_manager.py

@@ -1,7 +1,7 @@
 import os
 from functools import cache
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 from uuid import uuid4
 
 from cycode.cli import consts
@@ -59,10 +59,10 @@ class ConfigurationManager:
         verbose_flag_global_config = self.global_config_file_manager.get_verbose_flag()
         return verbose_flag_env_var or verbose_flag_local_config or verbose_flag_global_config
 
-    def get_api_url_from_environment_variables(self) -> Optional[str]:
+    def get_api_url_from_environment_variables(self) -> str | None:
         return self._get_value_from_environment_variables(consts.CYCODE_API_URL_ENV_VAR_NAME)
 
-    def get_app_url_from_environment_variables(self) -> Optional[str]:
+    def get_app_url_from_environment_variables(self) -> str | None:
         return self._get_value_from_environment_variables(consts.CYCODE_APP_URL_ENV_VAR_NAME)
 
     def get_verbose_flag_from_environment_variables(self) -> bool:
@@ -94,13 +94,13 @@ class ConfigurationManager:
 
         return installation_id
 
-    def get_last_reported_activation_version(self, client: str) -> Optional[str]:
+    def get_last_reported_activation_version(self, client: str) -> str | None:
         return self.global_config_file_manager.get_last_reported_activation_versions().get(client)
 
     def update_last_reported_activation_version(self, client: str, version: str) -> None:
         self.global_config_file_manager.update_last_reported_activation_version(client, version)
 
-    def get_config_file_manager(self, scope: Optional[str] = None) -> ConfigFileManager:
+    def get_config_file_manager(self, scope: str | None = None) -> ConfigFileManager:
         if scope == 'local':
             return self.local_config_file_manager
 
@@ -223,5 +223,5 @@ class ConfigurationManager:
         return consts.DEFAULT_EXCLUDE_DETECTIONS_IN_DELETED_LINES
 
     @staticmethod
-    def _get_value_from_environment_variables(env_var_name: str, default: Optional[Any] = None) -> Optional[Any]:
+    def _get_value_from_environment_variables(env_var_name: str, default: Any | None = None) -> Any | None:
         return os.getenv(env_var_name, default)

cycode/cli/user_settings/credentials_manager.py

@@ -1,6 +1,5 @@
 import os
 from pathlib import Path
-from typing import Optional
 
 from cycode.cli.config import (
     CYCODE_CLIENT_ID_ENV_VAR_NAME,
@@ -36,19 +35,19 @@ class CredentialsManager(BaseFileManager):
         client_secret = os.getenv(CYCODE_CLIENT_SECRET_ENV_VAR_NAME)
         return client_id, client_secret
 
-    def get_credentials_from_file(self) -> tuple[Optional[str], Optional[str]]:
+    def get_credentials_from_file(self) -> tuple[str | None, str | None]:
         file_content = self.read_file()
         client_id = file_content.get(self.CLIENT_ID_FIELD_NAME)
         client_secret = file_content.get(self.CLIENT_SECRET_FIELD_NAME)
         return client_id, client_secret
 
-    def get_oidc_credentials_from_file(self) -> tuple[Optional[str], Optional[str]]:
+    def get_oidc_credentials_from_file(self) -> tuple[str | None, str | None]:
         file_content = self.read_file()
         client_id = file_content.get(self.CLIENT_ID_FIELD_NAME)
         id_token = file_content.get(self.ID_TOKEN_FIELD_NAME)
         return client_id, id_token
 
-    def get_oidc_credentials(self) -> tuple[Optional[str], Optional[str]]:
+    def get_oidc_credentials(self) -> tuple[str | None, str | None]:
         client_id = os.getenv(CYCODE_CLIENT_ID_ENV_VAR_NAME)
         id_token = os.getenv(CYCODE_ID_TOKEN_ENV_VAR_NAME)
 
@@ -65,7 +64,7 @@ class CredentialsManager(BaseFileManager):
         file_content_to_update = {self.CLIENT_ID_FIELD_NAME: client_id, self.CLIENT_SECRET_FIELD_NAME: client_secret}
         self.write_content_to_file(file_content_to_update)
 
-    def get_access_token(self) -> tuple[Optional[str], Optional[float], Optional[JwtCreator]]:
+    def get_access_token(self) -> tuple[str | None, float | None, JwtCreator | None]:
         file_content = self.read_file()
 
         access_token = file_content.get(self.ACCESS_TOKEN_FIELD_NAME)
@@ -79,7 +78,7 @@ class CredentialsManager(BaseFileManager):
         return access_token, expires_in, creator
 
     def update_access_token(
-        self, access_token: Optional[str], expires_in: Optional[float], creator: Optional[JwtCreator]
+        self, access_token: str | None, expires_in: float | None, creator: JwtCreator | None
     ) -> None:
         file_content_to_update = {
             self.ACCESS_TOKEN_FIELD_NAME: access_token,

cycode/cli/utils/get_api_client.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Union
 
 import click
 
@@ -21,10 +21,10 @@ if TYPE_CHECKING:
 
 def _get_cycode_client(
     create_client_func: callable,
-    client_id: Optional[str],
-    client_secret: Optional[str],
+    client_id: str | None,
+    client_secret: str | None,
     hide_response_log: bool,
-    id_token: Optional[str] = None,
+    id_token: str | None = None,
 ) -> Union['ScanClient', 'ReportClient', 'ImportSbomClient', 'AISecurityManagerClient']:
     if client_id and id_token:
         return create_client_func(client_id, None, hide_response_log, id_token)
@@ -80,6 +80,6 @@ def _get_configured_credentials() -> tuple[str, str]:
     return credentials_manager.get_credentials()
 
 
-def _get_configured_oidc_credentials() -> tuple[Optional[str], Optional[str]]:
+def _get_configured_oidc_credentials() -> tuple[str | None, str | None]:
     credentials_manager = CredentialsManager()
     return credentials_manager.get_oidc_credentials()

cycode/cli/utils/git_proxy.py

@@ -1,7 +1,7 @@
 import types
 from abc import ABC, abstractmethod
 from functools import cache
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 _GIT_ERROR_MESSAGE = """
 Cycode CLI needs the Git executable to be installed on the system.
@@ -21,7 +21,7 @@ class GitProxyError(Exception):
 
 # GitPython runs `git version` on import, so it is imported on first use rather than at CLI startup
 @cache
-def _import_git() -> Optional[types.ModuleType]:
+def _import_git() -> types.ModuleType | None:
     try:
         import git
     except ImportError:
@@ -31,7 +31,7 @@ def _import_git() -> Optional[types.ModuleType]:
 
 class _AbstractGitProxy(ABC):
     @abstractmethod
-    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo': ...
+    def get_repo(self, path: 'PathLike | None' = None, *args, **kwargs) -> 'Repo': ...
 
     @abstractmethod
     def get_null_tree(self) -> object: ...
@@ -44,7 +44,7 @@ class _AbstractGitProxy(ABC):
 
 
 class _DummyGitProxy(_AbstractGitProxy):
-    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+    def get_repo(self, path: 'PathLike | None' = None, *args, **kwargs) -> 'Repo':
         raise RuntimeError(_GIT_ERROR_MESSAGE)
 
     def get_null_tree(self) -> object:
@@ -61,7 +61,7 @@ class _GitProxy(_AbstractGitProxy):
     def __init__(self, git_module: types.ModuleType) -> None:
         self._git = git_module
 
-    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+    def get_repo(self, path: 'PathLike | None' = None, *args, **kwargs) -> 'Repo':
         return self._git.Repo(path, *args, **kwargs)
 
     def get_null_tree(self) -> object:
@@ -74,7 +74,7 @@ class _GitProxy(_AbstractGitProxy):
         return self._git.GitCommandError
 
 
-def get_git_proxy(git_module: Optional[types.ModuleType]) -> _AbstractGitProxy:
+def get_git_proxy(git_module: types.ModuleType | None) -> _AbstractGitProxy:
     return _GitProxy(git_module) if git_module else _DummyGitProxy()
 
 
@@ -82,7 +82,7 @@ class GitProxyManager(_AbstractGitProxy):
     """We are using this manager for easy unit testing and mocking of the git module."""
 
     def __init__(self) -> None:
-        self._git_proxy: Optional[_AbstractGitProxy] = None
+        self._git_proxy: _AbstractGitProxy | None = None
 
     def _get_git_proxy(self) -> _AbstractGitProxy:
         if self._git_proxy is None:
@@ -95,7 +95,7 @@ class GitProxyManager(_AbstractGitProxy):
     def _set_git_proxy(self) -> None:
         self._git_proxy = _GitProxy(_import_git())
 
-    def get_repo(self, path: Optional['PathLike'] = None, *args, **kwargs) -> 'Repo':
+    def get_repo(self, path: 'PathLike | None' = None, *args, **kwargs) -> 'Repo':
         return self._get_git_proxy().get_repo(path, *args, **kwargs)
 
     def get_null_tree(self) -> object:

cycode/cli/utils/host_info.py

@@ -7,15 +7,15 @@ import subprocess
 import sys
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from cycode.cli.consts import CYCODE_CONFIGURATION_DIRECTORY
 from cycode.logger import get_logger
 
 logger = get_logger('HOST INFO')
 
-pythoncom: Optional[Any] = None
-win32com_client: Optional[Any] = None
+pythoncom: Any | None = None
+win32com_client: Any | None = None
 if sys.platform == 'win32':
     try:
         import pythoncom
@@ -30,31 +30,22 @@ _DEVICE_ID_CACHE_FILE_NAME = 'device-id'
 _PLATFORM_NAMES = {'Darwin': 'macOS', 'Windows': 'Windows', 'Linux': 'Linux'}
 
 
-def _run(command: list, timeout: int = _SUBPROCESS_TIMEOUT_SEC) -> Optional[str]:
+def _run(command: list, timeout: int = _SUBPROCESS_TIMEOUT_SEC) -> str | None:
     """Run a command and return its stripped stdout. Never raises; returns None on any error."""
     try:
-        result = subprocess.run(command, capture_output=True, text=True, timeout=timeout)  # noqa: S603
+        result = subprocess.run(command, capture_output=True, text=True, timeout=timeout, check=False)  # noqa: S603
         return result.stdout.strip() or None
     except Exception as e:
         logger.debug('Failed to run command %s', command, exc_info=e)
         return None
 
 
-def _read_text_file(path: str) -> Optional[str]:
-    """Read and strip a text file. Never raises; returns None if it can't be read."""
-    try:
-        with open(path) as text_file:
-            return text_file.read().strip() or None
-    except OSError:
-        return None
-
-
 def is_64bit() -> bool:
     """Whether the running Python interpreter is 64-bit (not the OS)."""
     return sys.maxsize > 2**32
 
 
-def get_hostname() -> Optional[str]:
+def get_hostname() -> str | None:
     try:
         return socket.gethostname() or None
     except Exception as e:
@@ -62,7 +53,7 @@ def get_hostname() -> Optional[str]:
         return None
 
 
-def get_platform_name() -> Optional[str]:
+def get_platform_name() -> str | None:
     try:
         system = platform.system()
         return _PLATFORM_NAMES.get(system, system or None)
@@ -71,7 +62,7 @@ def get_platform_name() -> Optional[str]:
         return None
 
 
-def get_os_version() -> Optional[str]:
+def get_os_version() -> str | None:
     try:
         system = platform.system()
         if system == 'Darwin':
@@ -86,26 +77,18 @@ def get_os_version() -> Optional[str]:
         return None
 
 
-def _get_linux_os_version() -> Optional[str]:
-    freedesktop_os_release = getattr(platform, 'freedesktop_os_release', None)  # Python 3.10+
-    if freedesktop_os_release is not None:
-        try:
-            version_id = freedesktop_os_release().get('VERSION_ID')
-            if version_id:
-                return version_id
-        except OSError:
-            pass
-
-    os_release = _read_text_file('/etc/os-release')  # Python 3.9 fallback: parse manually
-    if os_release:
-        for line in os_release.splitlines():
-            if line.startswith('VERSION_ID='):
-                return line.split('=', 1)[1].strip().strip('"') or None
+def _get_linux_os_version() -> str | None:
+    try:
+        version_id = platform.freedesktop_os_release().get('VERSION_ID')
+        if version_id:
+            return version_id
+    except OSError:
+        pass
 
     return platform.release() or None
 
 
-def get_last_login_user() -> Optional[str]:
+def get_last_login_user() -> str | None:
     try:
         return getpass.getuser() or None
     except Exception as e:
@@ -113,7 +96,7 @@ def get_last_login_user() -> Optional[str]:
         return None
 
 
-def get_serial_number() -> Optional[str]:
+def get_serial_number() -> str | None:
     # The serial is immutable hardware info, but resolving it shells out (ioreg/WMI)
     # and this runs in a fresh process per AI hook event - cache it on disk.
     cached = _read_serial_number_cache()
@@ -126,7 +109,7 @@ def get_serial_number() -> Optional[str]:
     return serial
 
 
-def _resolve_serial_number() -> Optional[str]:
+def _resolve_serial_number() -> str | None:
     try:
         system = platform.system()
         if system == 'Darwin':
@@ -142,7 +125,7 @@ def _serial_number_cache_path() -> Path:
     return Path.home() / CYCODE_CONFIGURATION_DIRECTORY / _DEVICE_ID_CACHE_FILE_NAME
 
 
-def _read_serial_number_cache() -> Optional[str]:
+def _read_serial_number_cache() -> str | None:
     try:
         return _serial_number_cache_path().read_text(encoding='utf-8').strip() or None
     except Exception:
@@ -170,7 +153,7 @@ def _write_serial_number_cache(serial: str) -> None:
         logger.debug('Failed to cache serial number', exc_info=e)
 
 
-def _get_macos_serial_number() -> Optional[str]:
+def _get_macos_serial_number() -> str | None:
     output = _run(['ioreg', '-c', 'IOPlatformExpertDevice', '-d', '2'])
     if not output:
         return None
@@ -178,7 +161,7 @@ def _get_macos_serial_number() -> Optional[str]:
     return match.group(1) if match else None
 
 
-def _get_windows_serial_number() -> Optional[str]:
+def _get_windows_serial_number() -> str | None:
     """Read the OEM serial over WMI."""
     if pythoncom is None or win32com_client is None:
         return None

cycode/cli/utils/ignore_utils.py

@@ -43,8 +43,6 @@ from os import PathLike
 from typing import (
     Any,
     BinaryIO,
-    Optional,
-    Union,
 )
 
 
@@ -205,9 +203,9 @@ class Pattern:
 class IgnoreFilter:
     def __init__(
         self,
-        patterns: Iterable[Union[str, bytes]],
+        patterns: Iterable[str | bytes],
         ignore_case: bool = False,
-        path: Optional[Union[PathLike, str]] = None,
+        path: PathLike | str | None = None,
     ) -> None:
         if hasattr(path, '__fspath__'):
             path = path.__fspath__()
@@ -227,13 +225,13 @@ class IgnoreFilter:
             d['path'] = path
         return d
 
-    def append_pattern(self, pattern: Union[str, bytes]) -> None:
+    def append_pattern(self, pattern: str | bytes) -> None:
         """Add a pattern to the set."""
         if isinstance(pattern, str):
             pattern = bytes(pattern, 'utf-8')
         self._patterns.append(Pattern(pattern, self._ignore_case))
 
-    def find_matching(self, path: Union[bytes, str]) -> Iterable[Pattern]:
+    def find_matching(self, path: bytes | str) -> Iterable[Pattern]:
         """Yield all matching patterns for path.
 
         Args:
@@ -248,7 +246,7 @@ class IgnoreFilter:
             if pattern.match(path):
                 yield pattern
 
-    def is_ignored(self, path: Union[bytes, str]) -> Optional[bool]:
+    def is_ignored(self, path: bytes | str) -> bool | None:
         """Check whether a path is ignored.
 
         For directories, include a trailing slash.
@@ -264,7 +262,7 @@ class IgnoreFilter:
         return status
 
     @classmethod
-    def from_path(cls, path: Union[PathLike, str], ignore_case: bool = False) -> 'IgnoreFilter':
+    def from_path(cls, path: PathLike | str, ignore_case: bool = False) -> 'IgnoreFilter':
         if hasattr(path, '__fspath__'):
             path = path.__fspath__()
         with open(path, 'rb') as f:
@@ -284,7 +282,7 @@ class IgnoreFilterManager:
         self,
         path: str,
         global_filters: list[IgnoreFilter],
-        ignore_file_name: Optional[str] = None,
+        ignore_file_name: str | None = None,
         ignore_case: bool = False,
     ) -> None:
         if hasattr(path, '__fspath__'):
@@ -317,14 +315,14 @@ class IgnoreFilterManager:
         return self._top_path
 
     @property
-    def ignore_file_name(self) -> Optional[str]:
+    def ignore_file_name(self) -> str | None:
         return self._ignore_file_name
 
     @property
     def ignore_case(self) -> bool:
         return self._ignore_case
 
-    def _load_path(self, path: str) -> Optional[IgnoreFilter]:
+    def _load_path(self, path: str) -> IgnoreFilter | None:
         try:
             return self._path_filters[path]
         except KeyError:
@@ -370,7 +368,7 @@ class IgnoreFilterManager:
                 filters.insert(0, (i, ignore_filter))
         return iter(matches)
 
-    def is_ignored(self, path: str) -> Optional[bool]:
+    def is_ignored(self, path: str) -> bool | None:
         """Check whether a path is ignored.
 
         Args:
@@ -425,9 +423,9 @@ class IgnoreFilterManager:
     def build(
         cls,
         path: str,
-        global_ignore_file_paths: Optional[Iterable[str]] = None,
-        global_patterns: Optional[Iterable[Union[str, bytes]]] = None,
-        ignore_file_name: Optional[str] = None,
+        global_ignore_file_paths: Iterable[str] | None = None,
+        global_patterns: Iterable[str | bytes] | None = None,
+        ignore_file_name: str | None = None,
         ignore_case: bool = False,
     ) -> 'IgnoreFilterManager':
         """Create a IgnoreFilterManager from patterns and paths.

cycode/cli/utils/jwt_utils.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 import jwt
 
 _JWT_PAYLOAD_POSSIBLE_USER_ID_FIELD_NAMES = ('userId', 'internalId', 'token-user-id')
 
 
-def decode_jwt_unverified(token: str) -> Optional[dict]:
+def decode_jwt_unverified(token: str) -> dict | None:
     """Return JWT claims without signature verification, or None if the token is unreadable."""
     try:
         return jwt.decode(token, options={'verify_signature': False})
@@ -13,7 +11,7 @@ def decode_jwt_unverified(token: str) -> Optional[dict]:
         return None
 
 
-def get_user_and_tenant_ids_from_access_token(access_token: str) -> tuple[Optional[str], Optional[str]]:
+def get_user_and_tenant_ids_from_access_token(access_token: str) -> tuple[str | None, str | None]:
     payload = jwt.decode(access_token, options={'verify_signature': False})
 
     user_id = None

cycode/cli/utils/path_utils.py

@@ -3,7 +3,7 @@ import os
 import tempfile
 from functools import cache
 from pathlib import PurePath, PurePosixPath, PureWindowsPath
-from typing import TYPE_CHECKING, AnyStr, Optional, Union
+from typing import TYPE_CHECKING, AnyStr, Union
 
 import typer
 
@@ -31,7 +31,7 @@ def get_absolute_path(path: str) -> str:
     return os.path.abspath(path)
 
 
-def _get_starting_chunk(filename: str, length: int = 1024) -> Optional[bytes]:
+def _get_starting_chunk(filename: str, length: int = 1024) -> bytes | None:
     # We are using our own implementation of get_starting_chunk
     # because the original one from binaryornot uses print()...
 
@@ -79,7 +79,7 @@ def join_paths(path: str, filename: str) -> str:
     return os.path.join(path, filename)
 
 
-def get_file_content(file_path: Union[str, 'PathLike']) -> Optional[AnyStr]:
+def get_file_content(file_path: Union[str, 'PathLike']) -> AnyStr | None:
     try:
         with open(file_path, encoding='UTF-8') as f:
             return f.read()
@@ -115,7 +115,7 @@ def quarantine_corrupt_file(filename: str) -> None:
         logger.warning('Failed to quarantine corrupt file, %s', {'filename': filename}, exc_info=e)
 
 
-def load_json(txt: str) -> Optional[dict]:
+def load_json(txt: str) -> dict | None:
     try:
         return json.loads(txt)
     except json.JSONDecodeError:
@@ -152,7 +152,7 @@ def concat_unique_id(filename: str, unique_id: str) -> str:
     return str(PurePosixPath(unique_id, *_to_relative_posix_parts(filename)))
 
 
-def _as_scan_root(value: object) -> Optional[str]:
+def _as_scan_root(value: object) -> str | None:
     if isinstance(value, (str, os.PathLike)):
         return os.fspath(value) or None
 
@@ -181,7 +181,7 @@ def get_scan_roots_from_context(ctx: typer.Context) -> tuple[str, ...]:
     return tuple(dict.fromkeys(scan_roots))
 
 
-def get_path_from_context(ctx: typer.Context) -> Optional[str]:
+def get_path_from_context(ctx: typer.Context) -> str | None:
     scan_roots = get_scan_roots_from_context(ctx)
     return scan_roots[0] if scan_roots else None
 

cycode/cli/utils/progress_bar.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from enum import auto
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn, TimeElapsedColumn
 
@@ -109,7 +109,7 @@ class BaseProgressBar(ABC):
     def update(self, section: 'ProgressBarSection') -> None: ...
 
     @abstractmethod
-    def update_right_side_label(self, label: Optional[str] = None) -> None: ...
+    def update_right_side_label(self, label: str | None = None) -> None: ...
 
 
 class DummyProgressBar(BaseProgressBar):
@@ -128,7 +128,7 @@ class DummyProgressBar(BaseProgressBar):
     def update(self, section: 'ProgressBarSection') -> None:
         pass
 
-    def update_right_side_label(self, label: Optional[str] = None) -> None:
+    def update_right_side_label(self, label: str | None = None) -> None:
         pass
 
 
@@ -240,7 +240,7 @@ class CompositeProgressBar(BaseProgressBar):
         self._increment_progress(section)
         self._maybe_update_current_section()
 
-    def update_right_side_label(self, label: Optional[str] = None) -> None:
+    def update_right_side_label(self, label: str | None = None) -> None:
         self._current_right_side_label = f'({label})' if label else ''
         self._progress_bar_update()
 

cycode/cli/utils/scan_batch.py

@@ -1,6 +1,7 @@
 import os
+from collections.abc import Callable
 from multiprocessing.pool import ThreadPool
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 
 from cycode.cli import consts
 from cycode.cli.models import Document

cycode/cli/utils/scan_utils.py

@@ -1,5 +1,5 @@
 import os
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 from uuid import UUID, uuid4
 
 import typer
@@ -26,7 +26,7 @@ def is_scan_failed(ctx: typer.Context) -> bool:
 
 
 def is_cycodeignore_allowed_by_scan_config(ctx: typer.Context) -> bool:
-    scan_config: Optional[ScanConfiguration] = ctx.obj.get('scan_config')
+    scan_config: ScanConfiguration | None = ctx.obj.get('scan_config')
     return scan_config.is_cycode_ignore_allowed if scan_config else True
 
 

cycode/cli/utils/shell_executor.py

@@ -1,6 +1,5 @@
 import subprocess
 import time
-from typing import Optional, Union
 
 import click
 import typer
@@ -14,11 +13,11 @@ logger = get_logger('SHELL')
 
 
 def shell(
-    command: Union[str, list[str]],
+    command: str | list[str],
     timeout: int = _SUBPROCESS_DEFAULT_TIMEOUT_SEC,
-    working_directory: Optional[str] = None,
+    working_directory: str | None = None,
     silent_exc_info: bool = False,
-) -> Optional[str]:
+) -> str | None:
     logger.debug('Executing shell command: %s', command)
 
     try: