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

cycode/cli/files_collector/sca/npm/workspace/files.py

@@ -3,7 +3,6 @@
 import json
 import os
 from pathlib import Path
-from typing import Optional
 
 from cycode.cli.utils.path_utils import get_absolute_path
 from cycode.logger import get_logger
@@ -17,7 +16,7 @@ def resolved_path(path: object) -> str:
     return os.path.realpath(get_absolute_path(str(path)))
 
 
-def file_stamp(path: Path) -> Optional[FileStamp]:
+def file_stamp(path: Path) -> FileStamp | None:
     try:
         stat_result = path.stat()
     except OSError:
@@ -26,7 +25,7 @@ def file_stamp(path: Path) -> Optional[FileStamp]:
     return str(path), stat_result.st_mtime_ns, stat_result.st_size
 
 
-def read_json_object(path: Path) -> Optional[dict]:
+def read_json_object(path: Path) -> dict | None:
     try:
         content = json.loads(path.read_text(encoding='UTF-8'))
     except FileNotFoundError:

cycode/cli/files_collector/sca/npm/workspace/globs.py

@@ -72,8 +72,7 @@ def _split_workspace_patterns(declared: list) -> _WorkspacePatterns:
         stripped = entry.strip()
         is_excluded = stripped.startswith(_NEGATION_PREFIX)
         normalized = (stripped[1:] if is_excluded else stripped).strip()
-        if normalized.startswith('./'):
-            normalized = normalized[2:]
+        normalized = normalized.removeprefix('./')
 
         normalized = normalized.rstrip('/')
         if not normalized:

cycode/cli/files_collector/sca/npm/workspace/resolvers.py

@@ -9,7 +9,6 @@ import json
 import re
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Optional
 
 import yaml
 
@@ -38,17 +37,16 @@ _YARN_WORKSPACE_PROTOCOL = re.compile(r'@workspace:([^"\',\s]+)')
 _BUN_LOCKFILE_WORKSPACES_SECTION = 'workspaces'
 _TRAILING_COMMA = re.compile(r',(\s*[}\]])')
 
-_member_names_cache: dict[FileStamp, Optional[frozenset[str]]] = {}
+_member_names_cache: dict[FileStamp, frozenset[str] | None] = {}
 
 
 def clear_cache() -> None:
     _member_names_cache.clear()
 
 
-def _normalize_member_path(member_path: str) -> Optional[str]:
+def _normalize_member_path(member_path: str) -> str | None:
     normalized = member_path.strip()
-    if normalized.startswith('./'):
-        normalized = normalized[2:]
+    normalized = normalized.removeprefix('./')
 
     normalized = normalized.rstrip('/')
     if not normalized or normalized == _PNPM_LOCKFILE_ROOT_IMPORTER:
@@ -57,7 +55,7 @@ def _normalize_member_path(member_path: str) -> Optional[str]:
     return normalized
 
 
-def _npm_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
+def _npm_lockfile_member_names(lock_file: Path) -> frozenset | None:
     content = read_json_object(lock_file)
     packages = content.get(_LOCKFILE_PACKAGES_SECTION) if content is not None else None
     if not isinstance(packages, dict):
@@ -96,7 +94,7 @@ def _read_pnpm_importers_section(lock_file: Path) -> str:
     return '\n'.join(section)
 
 
-def _pnpm_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
+def _pnpm_lockfile_member_names(lock_file: Path) -> frozenset | None:
     section = _read_pnpm_importers_section(lock_file)
     if not section:
         return None
@@ -124,7 +122,7 @@ def _pnpm_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
     return frozenset(member_names) or None
 
 
-def _bun_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
+def _bun_lockfile_member_names(lock_file: Path) -> frozenset | None:
     """bun.lock is JSON with trailing commas, and names its members under "workspaces"."""
     try:
         text = lock_file.read_text(encoding='UTF-8')
@@ -151,7 +149,7 @@ def _bun_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
     return frozenset(member_names)
 
 
-def _yarn_lockfile_member_names(lock_file: Path) -> Optional[frozenset]:
+def _yarn_lockfile_member_names(lock_file: Path) -> frozenset | None:
     """Yarn berry records every member as "<name>@workspace:<path>"; classic yarn records nothing."""
     try:
         text = lock_file.read_text(encoding='UTF-8', errors='replace')
@@ -201,7 +199,7 @@ class WorkspaceMemberResolver(ABC):
         """
         return False
 
-    def resolve(self, lock_file: Path) -> Optional[frozenset]:
+    def resolve(self, lock_file: Path) -> frozenset | None:
         """Member paths this lockfile resolves, or None when it cannot name them.
 
         Caches on the file's identity so one scan parses each root lockfile once.
@@ -218,14 +216,14 @@ class WorkspaceMemberResolver(ABC):
         return member_names
 
     @abstractmethod
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]: ...
+    def _read_member_names(self, lock_file: Path) -> frozenset | None: ...
 
 
 class NpmLockfileResolver(WorkspaceMemberResolver):
     package_manager = NPM_PACKAGE_MANAGER
     lock_file_names = (NPM_LOCK_FILE_NAME, NPM_SHRINKWRAP_FILE_NAME)
 
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]:
+    def _read_member_names(self, lock_file: Path) -> frozenset | None:
         return _npm_lockfile_member_names(lock_file)
 
 
@@ -233,7 +231,7 @@ class PnpmLockfileResolver(WorkspaceMemberResolver):
     package_manager = PNPM_PACKAGE_MANAGER
     lock_file_names = (PNPM_LOCK_FILE_NAME,)
 
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]:
+    def _read_member_names(self, lock_file: Path) -> frozenset | None:
         return _pnpm_lockfile_member_names(lock_file)
 
 
@@ -244,7 +242,7 @@ class YarnLockfileResolver(WorkspaceMemberResolver):
     lock_file_names = (YARN_LOCK_FILE_NAME,)
     may_use_workspace_globs = True
 
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]:
+    def _read_member_names(self, lock_file: Path) -> frozenset | None:
         return _yarn_lockfile_member_names(lock_file)
 
 
@@ -254,7 +252,7 @@ class BunLockfileResolver(WorkspaceMemberResolver):
     package_manager = BUN_PACKAGE_MANAGER
     lock_file_names = (BUN_LOCK_FILE_NAME,)
 
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]:
+    def _read_member_names(self, lock_file: Path) -> frozenset | None:
         return _bun_lockfile_member_names(lock_file)
 
 
@@ -275,7 +273,7 @@ class OpaqueLockfileResolver(WorkspaceMemberResolver):
     def lock_file_names(self) -> tuple:
         return self._lock_file_names
 
-    def _read_member_names(self, lock_file: Path) -> Optional[frozenset]:
+    def _read_member_names(self, lock_file: Path) -> frozenset | None:
         return None
 
 

cycode/cli/files_collector/sca/php/restore_composer_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -21,7 +20,7 @@ class RestoreComposerDependencies(BaseRestoreDependencies):
     def is_project(self, document: Document) -> bool:
         return Path(document.path).name == COMPOSER_MANIFEST_FILE_NAME
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / COMPOSER_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/python/restore_pip_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -18,7 +17,7 @@ _POETRY_TOOL_SECTION = '[tool.poetry]'
 _UV_TOOL_SECTION = '[tool.uv]'
 
 
-def _indicates_plain_pip(pyproject_content: Optional[str]) -> bool:
+def _indicates_plain_pip(pyproject_content: str | None) -> bool:
     """Return True if pyproject.toml content signals a plain-pip project (no Poetry, no uv)."""
     if not pyproject_content:
         return False
@@ -44,7 +43,7 @@ class RestorePipDependencies(BaseRestoreDependencies):
 
         return _indicates_plain_pip(document.content)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / PIP_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/python/restore_pipenv_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -21,7 +20,7 @@ class RestorePipenvDependencies(BaseRestoreDependencies):
     def is_project(self, document: Document) -> bool:
         return Path(document.path).name == PIPENV_MANIFEST_FILE_NAME
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / PIPENV_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/python/restore_poetry_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -17,7 +16,7 @@ POETRY_LOCK_FILE_NAME = 'poetry.lock'
 _POETRY_TOOL_SECTION = '[tool.poetry]'
 
 
-def _indicates_poetry(pyproject_content: Optional[str]) -> bool:
+def _indicates_poetry(pyproject_content: str | None) -> bool:
     """Return True if pyproject.toml content signals that this project uses Poetry."""
     if not pyproject_content:
         return False
@@ -38,7 +37,7 @@ class RestorePoetryDependencies(BaseRestoreDependencies):
 
         return _indicates_poetry(document.content)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / POETRY_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/python/restore_uv_dependencies.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import typer
 
@@ -16,7 +15,7 @@ UV_LOCK_FILE_NAME = 'uv.lock'
 _UV_TOOL_SECTION = '[tool.uv]'
 
 
-def _indicates_uv(pyproject_content: Optional[str]) -> bool:
+def _indicates_uv(pyproject_content: str | None) -> bool:
     """Return True if pyproject.toml content signals that this project uses UV."""
     if not pyproject_content:
         return False
@@ -37,7 +36,7 @@ class RestoreUvDependencies(BaseRestoreDependencies):
 
         return _indicates_uv(document.content)
 
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+    def try_restore_dependencies(self, document: Document) -> Document | None:
         manifest_dir = self.get_manifest_dir(document)
         lockfile_path = Path(manifest_dir) / UV_LOCK_FILE_NAME if manifest_dir else None
 

cycode/cli/files_collector/sca/sca_file_collector.py

@@ -1,5 +1,5 @@
 import os
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import typer
 
@@ -39,7 +39,7 @@ logger = get_logger('SCA File Collector')
 
 
 def _add_ecosystem_related_files_if_exists(
-    documents: list[Document], repo: Optional['Repo'] = None, commit_rev: Optional[str] = None
+    documents: list[Document], repo: 'Repo | None' = None, commit_rev: str | None = None
 ) -> None:
     documents_to_add: list[Document] = []
     for doc in documents:
@@ -81,7 +81,7 @@ def perform_sca_pre_commit_scan_actions(
 
 
 def _get_doc_ecosystem_related_project_files(
-    doc: Document, documents: list[Document], ecosystem: str, commit_rev: Optional[str], repo: Optional['Repo']
+    doc: Document, documents: list[Document], ecosystem: str, commit_rev: str | None, repo: 'Repo | None'
 ) -> list[Document]:
     documents_to_add: list[Document] = []
     for ecosystem_project_file in consts.PROJECT_FILES_BY_ECOSYSTEM_MAP.get(ecosystem):
@@ -102,7 +102,7 @@ def _is_project_file_exists_in_documents(documents: list[Document], file: str) -
     return any(doc for doc in documents if file == doc.path)
 
 
-def _get_project_file_ecosystem(document: Document) -> Optional[str]:
+def _get_project_file_ecosystem(document: Document) -> str | None:
     for ecosystem, project_files in consts.PROJECT_FILES_BY_ECOSYSTEM_MAP.items():
         for project_file in project_files:
             if document.path.endswith(project_file):
@@ -118,7 +118,7 @@ def _try_restore_dependencies(
     ctx: typer.Context,
     restore_dependencies: 'BaseRestoreDependencies',
     document: Document,
-) -> Optional[Document]:
+) -> Document | None:
     if not restore_dependencies.is_project(document):
         return None
 

cycode/cli/files_collector/zip_documents.py

@@ -1,6 +1,5 @@
 import timeit
 from pathlib import Path
-from typing import Optional
 
 from cycode.cli import consts
 from cycode.cli.exceptions import custom_exceptions
@@ -20,7 +19,7 @@ def _validate_zip_file_size(scan_type: str, zip_file_size: int) -> None:
 def zip_documents(
     scan_type: str,
     documents: list[Document],
-    zip_file: Optional[InMemoryZip] = None,
+    zip_file: InMemoryZip | None = None,
 ) -> InMemoryZip:
     if zip_file is None:
         zip_file = InMemoryZip()

cycode/cli/models.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 from cycode.cyclient.models import Detection
 
@@ -10,8 +10,8 @@ class Document:
         path: str,
         content: str,
         is_git_diff_format: bool = False,
-        unique_id: Optional[str] = None,
-        absolute_path: Optional[str] = None,
+        unique_id: str | None = None,
+        absolute_path: str | None = None,
     ) -> None:
         self.path = path
         self.content = content
@@ -48,25 +48,25 @@ CliErrors = dict[type[BaseException], CliError]
 class CliResult(NamedTuple):
     success: bool
     message: str
-    data: Optional[dict[str, any]] = None
+    data: dict[str, any] | None = None
 
 
 class LocalScanResult(NamedTuple):
     scan_id: str
-    report_url: Optional[str]
+    report_url: str | None
     document_detections: list[DocumentDetections]
     issue_detected: bool
     detections_count: int
     relevant_detections_count: int
-    verdict: Optional[str] = None
+    verdict: str | None = None
 
 
 @dataclass
 class ResourceChange:
-    module_address: Optional[str]
+    module_address: str | None
     resource_type: str
     name: str
-    index: Optional[int]
+    index: int | None
     actions: list[str]
     values: dict[str, str]
 

cycode/cli/printers/console_printer.py

@@ -1,5 +1,5 @@
 import io
-from typing import TYPE_CHECKING, ClassVar, Optional
+from typing import TYPE_CHECKING, ClassVar
 
 import typer
 from rich.console import Console
@@ -35,18 +35,18 @@ class ConsolePrinter:
     def __init__(
         self,
         ctx: typer.Context,
-        console_override: Optional['Console'] = None,
-        console_err_override: Optional['Console'] = None,
-        output_type_override: Optional[str] = None,
+        console_override: 'Console | None' = None,
+        console_err_override: 'Console | None' = None,
+        output_type_override: str | None = None,
     ) -> None:
         self.ctx = ctx
         self.console = console_override or console
         self.console_err = console_err_override or console_err
         self.output_type = output_type_override or self.ctx.obj.get('output')
 
-        self.export_type: Optional[str] = None
-        self.export_file: Optional[Path] = None
-        self.console_record: Optional[ConsolePrinter] = None
+        self.export_type: str | None = None
+        self.export_file: Path | None = None
+        self.console_record: ConsolePrinter | None = None
 
     @property
     def scan_type(self) -> str:
@@ -87,7 +87,7 @@ class ConsolePrinter:
     def print_scan_results(
         self,
         local_scan_results: list['LocalScanResult'],
-        errors: Optional[dict[str, 'CliError']] = None,
+        errors: dict[str, 'CliError'] | None = None,
     ) -> None:
         if self.console_record:
             self.console_record.print_scan_results(local_scan_results, errors)
@@ -103,7 +103,7 @@ class ConsolePrinter:
             self.console_record.print_error(error)
         self.printer.print_error(error)
 
-    def print_exception(self, e: Optional[BaseException] = None, force_print: bool = False) -> None:
+    def print_exception(self, e: BaseException | None = None, force_print: bool = False) -> None:
         """Print traceback message in stderr if verbose mode is set."""
         if force_print or self.ctx.obj.get('verbose', False):
             if self.console_record:

cycode/cli/printers/json_printer.py

@@ -1,5 +1,5 @@
 import json
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode.cli.models import CliError, CliResult
 from cycode.cli.printers.printer_base import PrinterBase
@@ -21,7 +21,7 @@ class JsonPrinter(PrinterBase):
         self.console.print_json(self.get_data_json(result))
 
     def print_scan_results(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         scan_ids = []
         report_urls = []

cycode/cli/printers/printer_base.py

@@ -1,7 +1,7 @@
 import sys
 from abc import ABC, abstractmethod
 from collections import defaultdict
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 import typer
 
@@ -51,7 +51,7 @@ class PrinterBase(ABC):
 
     @abstractmethod
     def print_scan_results(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         pass
 
@@ -63,7 +63,7 @@ class PrinterBase(ABC):
     def print_error(self, error: CliError) -> None:
         pass
 
-    def print_exception(self, e: Optional[BaseException] = None) -> None:
+    def print_exception(self, e: BaseException | None = None) -> None:
         """We are printing it in stderr so, we don't care about supporting JSON and TABLE outputs.
 
         Note:

cycode/cli/printers/rich_printer.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from rich.console import Group
 from rich.panel import Panel
@@ -26,7 +26,7 @@ class RichPrinter(TextPrinter):
     MAX_PATH_LENGTH = 60
 
     def print_scan_results(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         if not errors and all(result.issue_detected == 0 for result in local_scan_results):
             self.console.print(self.NO_DETECTIONS_MESSAGE)

cycode/cli/printers/tables/table.py

@@ -1,5 +1,5 @@
 import urllib.parse
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from rich.markup import escape
 from rich.table import Table as RichTable
@@ -11,7 +11,7 @@ if TYPE_CHECKING:
 class Table:
     """Helper class to manage columns and their values in the right order and only if the column should be presented."""
 
-    def __init__(self, column_infos: Optional[list['ColumnInfo']] = None) -> None:
+    def __init__(self, column_infos: list['ColumnInfo'] | None = None) -> None:
         self._group_separator_indexes: set[int] = set()
 
         self._columns: dict[ColumnInfo, list[str]] = {}
@@ -26,7 +26,7 @@ class Table:
         if column in self._columns:
             self._columns[column].append(value)
 
-    def add_cell(self, column: 'ColumnInfo', value: str, color: Optional[str] = None) -> None:
+    def add_cell(self, column: 'ColumnInfo', value: str, color: str | None = None) -> None:
         if color:
             value = f'[{color}]{value}[/]'
 
@@ -49,7 +49,7 @@ class Table:
 
     def get_rows(self) -> list[str]:
         column_values = [self._columns[column_info] for column_info in self._get_ordered_columns()]
-        return list(zip(*column_values))
+        return list(zip(*column_values, strict=False))
 
     def get_table(self) -> 'RichTable':
         table = RichTable(expand=True, highlight=True)

cycode/cli/printers/tables/table_models.py

@@ -1,4 +1,4 @@
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 
 class ColumnInfoBuilder:
@@ -14,7 +14,7 @@ class ColumnInfoBuilder:
 class ColumnInfo(NamedTuple):
     name: str
     index: int  # Represents the order of the columns, starting from the left
-    column_opts: Optional[dict] = None
+    column_opts: dict | None = None
 
     def __hash__(self) -> int:
         return hash((self.name, self.index))

cycode/cli/printers/tables/table_printer_base.py

@@ -1,5 +1,5 @@
 import abc
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode.cli.models import CliError, CliResult
 from cycode.cli.printers.printer_base import PrinterBase
@@ -22,7 +22,7 @@ class TablePrinterBase(PrinterBase, abc.ABC):
         self.text_printer.print_error(error)
 
     def print_scan_results(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         if not errors and all(result.issue_detected == 0 for result in local_scan_results):
             self.console.print(self.NO_DETECTIONS_MESSAGE)

cycode/cli/printers/text_printer.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode.cli import consts
 from cycode.cli.cli_types import SeverityOption
@@ -32,7 +32,7 @@ class TextPrinter(PrinterBase):
         self.console.print(f'[red]Error: {error.message}[/]', highlight=False)
 
     def print_scan_results(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         if not errors and all(result.issue_detected == 0 for result in local_scan_results):
             self.console.print(self.NO_DETECTIONS_MESSAGE)
@@ -97,7 +97,7 @@ class TextPrinter(PrinterBase):
         )
 
     def print_report_urls_and_errors(
-        self, local_scan_results: list['LocalScanResult'], errors: Optional[dict[str, 'CliError']] = None
+        self, local_scan_results: list['LocalScanResult'], errors: dict[str, 'CliError'] | None = None
     ) -> None:
         report_urls = [scan_result.report_url for scan_result in local_scan_results if scan_result.report_url]
 
@@ -110,7 +110,7 @@ class TextPrinter(PrinterBase):
             self.console.print(f'- {scan_id}: ', end='')
             self.print_error(error)
 
-    def print_report_urls(self, report_urls: list[str], aggregation_report_url: Optional[str] = None) -> None:
+    def print_report_urls(self, report_urls: list[str], aggregation_report_url: str | None = None) -> None:
         if not report_urls and not aggregation_report_url:
             return
 

cycode/cli/printers/utils/code_snippet_syntax.py

@@ -14,7 +14,7 @@ if TYPE_CHECKING:
 
 def _get_code_segment_start_line(detection_line: int, lines_to_display_before: int) -> int:
     start_line = detection_line - lines_to_display_before
-    return 0 if start_line < 0 else start_line
+    return max(start_line, 0)
 
 
 def get_detection_line(scan_type: str, detection: 'Detection') -> int:

cycode/cli/printers/utils/detection_data.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from cycode.cli import consts
 
@@ -7,7 +7,7 @@ if TYPE_CHECKING:
     from cycode.cyclient.models import Detection
 
 
-def get_cwe_cve_link(cwe_cve: Optional[str]) -> Optional[str]:
+def get_cwe_cve_link(cwe_cve: str | None) -> str | None:
     if not cwe_cve:
         return None
 
@@ -63,7 +63,7 @@ def get_detection_clickable_cwe_cve(scan_type: str, detection: 'Detection') -> s
     return ''
 
 
-def get_detection_cwe_cve(scan_type: str, detection: 'Detection') -> Optional[str]:
+def get_detection_cwe_cve(scan_type: str, detection: 'Detection') -> str | None:
     if scan_type == consts.SCA_SCAN_TYPE:
         return detection.detection_details.get('vulnerability_id')
     if scan_type == consts.SAST_SCAN_TYPE:

cycode/cli/printers/utils/sca_ossf.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 _MAINTAINED_CHECK_NAME = 'maintained'
 
@@ -7,15 +7,15 @@ def _get_ossf_details(detection_details: dict) -> dict:
     return detection_details.get('ossf') or {}
 
 
-def get_ossf_score(detection_details: dict) -> Optional[Any]:
+def get_ossf_score(detection_details: dict) -> Any | None:
     return _get_ossf_details(detection_details).get('score')
 
 
-def get_ossf_report_url(detection_details: dict) -> Optional[str]:
+def get_ossf_report_url(detection_details: dict) -> str | None:
     return _get_ossf_details(detection_details).get('scorecard_report_url')
 
 
-def get_maintained_score(detection_details: dict) -> Optional[Any]:
+def get_maintained_score(detection_details: dict) -> Any | None:
     for check in _get_ossf_details(detection_details).get('checks') or []:
         if str(check.get('name', '')).lower() == _MAINTAINED_CHECK_NAME:
             return check.get('score')

cycode/cli/printers/utils/sca_policy_details.py

@@ -1,4 +1,5 @@
-from typing import TYPE_CHECKING, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING
 
 from cycode.cli.consts import (
     LICENSE_COMPLIANCE_POLICY_ID,