cycode 3.18.1.dev9__tar.gz → 3.18.1.dev12__tar.gz

{cycode-3.18.1.dev9 → cycode-3.18.1.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cycode
-Version: 3.18.1.dev9
+Version: 3.18.1.dev12
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 License-Expression: MIT
 License-File: LICENCE
@@ -24,8 +24,8 @@ Requires-Dist: anyio (>=4.0.0,<4.13.0)
 Requires-Dist: arrow (>=1.0.0,<1.5.0)
 Requires-Dist: click (>=8.1.0,<8.2.0)
 Requires-Dist: colorama (>=0.4.3,<0.5.0)
-Requires-Dist: gitpython (>=3.1.50,<3.2.0)
-Requires-Dist: marshmallow (>=3.15.0,<4.0.0)
+Requires-Dist: gitpython (>=3.1.51,<3.2.0)
+Requires-Dist: marshmallow (>=4.0.1,<4.1.0)
 Requires-Dist: mcp (>=1.28.1,<2.0.0) ; python_version >= "3.10"
 Requires-Dist: patch-ng (==1.19.1)
 Requires-Dist: pathvalidate (>=3.3.1,<4.0.0)
@@ -33,7 +33,7 @@ Requires-Dist: pydantic (>=2.11.5,<3.0.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
 Requires-Dist: requests (>=2.32.4,<3.0)
-Requires-Dist: rich (>=13.9.4,<14)
+Requires-Dist: rich (>=15.0.0,<16.0.0)
 Requires-Dist: tenacity (>=9.1.2,<9.2.0)
 Requires-Dist: tomli (>=2.0.0,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tomli-w (>=1.0.0,<2.0.0)

{cycode-3.18.1.dev9 → cycode-3.18.1.dev12}/cycode/__init__.py

@@ -5,4 +5,4 @@ import time as _time
 # end-to-end scan duration from the moment the user actually triggered it.
 _BOOT_WALL: float = _time.time()
 
-__version__ = '3.18.1.dev9'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '3.18.1.dev12'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-3.18.1.dev9 → cycode-3.18.1.dev12}/cycode/cli/apps/scan/commit_range_scanner.py

@@ -27,7 +27,7 @@ from cycode.cli.files_collector.commit_range_documents import (
     get_diff_file_content,
     get_diff_file_path,
     get_pre_commit_modified_documents,
-    get_safe_head_reference_for_diff,
+    get_staged_diff_index,
     parse_commit_range,
 )
 from cycode.cli.files_collector.documents_walk_ignore import filter_documents_with_cycodeignore
@@ -360,8 +360,7 @@ def _scan_sca_pre_commit(ctx: typer.Context, repo_path: str) -> None:
 def _scan_secret_pre_commit(ctx: typer.Context, repo_path: str) -> None:
     progress_bar = ctx.obj['progress_bar']
     repo = git_proxy.get_repo(repo_path)
-    head_reference = get_safe_head_reference_for_diff(repo)
-    diff_index = repo.index.diff(head_reference, create_patch=True, R=True)
+    _, diff_index = get_staged_diff_index(repo)
 
     progress_bar.set_section_length(ScanProgressBarSection.PREPARE_LOCAL_FILES, len(diff_index))
 

{cycode-3.18.1.dev9 → cycode-3.18.1.dev12}/cycode/cli/files_collector/commit_range_documents.py

@@ -15,7 +15,7 @@ from cycode.cli.utils.progress_bar import ScanProgressBarSection
 from cycode.logger import get_logger
 
 if TYPE_CHECKING:
-    from git import Diff, Repo
+    from git import Diff, DiffIndex, Repo
 
     from cycode.cli.utils.progress_bar import BaseProgressBar, ProgressBarSection
 
@@ -47,6 +47,23 @@ def get_safe_head_reference_for_diff(repo: 'Repo') -> str:
         return consts.GIT_EMPTY_TREE_OBJECT
 
 
+def get_staged_diff_index(repo: 'Repo') -> tuple[str, 'DiffIndex']:
+    """Diff the index against HEAD, or against the empty tree in repositories with no commits.
+
+    GitPython only inverts the `R` flag for HEAD, so `R` must be off for the empty tree to keep
+    staged content showing up as added lines in both cases.
+
+    Args:
+        repo: Git repository object
+
+    Returns:
+        The reference that was diffed against, and the resulting diff index
+    """
+    head_reference = get_safe_head_reference_for_diff(repo)
+    reverse = head_reference == consts.GIT_HEAD_COMMIT_REV
+    return head_reference, repo.index.diff(head_reference, create_patch=True, R=reverse)
+
+
 def _does_reach_to_max_commits_to_scan_limit(commit_ids: list[str], max_commits_count: Optional[int]) -> bool:
     if max_commits_count is None:
         return False
@@ -411,8 +428,7 @@ def get_pre_commit_modified_documents(
     diff_documents = []
 
     repo = git_proxy.get_repo(repo_path)
-    head_reference = get_safe_head_reference_for_diff(repo)
-    diff_index = repo.index.diff(head_reference, create_patch=True, R=True)
+    head_reference, diff_index = get_staged_diff_index(repo)
     progress_bar.set_section_length(progress_bar_section, len(diff_index))
     for diff in diff_index:
         progress_bar.update(progress_bar_section)

{cycode-3.18.1.dev9 → cycode-3.18.1.dev12}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dynamic = ["dependencies"]
-version = "3.18.1.dev9"
+version = "3.18.1.dev12"
 
 [project.scripts]
 cycode = "cycode.cli.app:app"
@@ -36,13 +36,15 @@ requires-poetry = ">=2.0"
 click = ">=8.1.0,<8.2.0"
 colorama = ">=0.4.3,<0.5.0"
 pyyaml = ">=6.0,<7.0"
-marshmallow = ">=3.15.0,<4.0.0"
-gitpython = ">=3.1.50,<3.2.0"
+# capped while we support Python 3.9
+marshmallow = ">=4.0.1,<4.1.0"
+# floor required by get_staged_diff_index()
+gitpython = ">=3.1.51,<3.2.0"
 arrow = ">=1.0.0,<1.5.0"
 requests = ">=2.32.4,<3.0"
 urllib3 = ">=2.4.0,<3.0.0"
 pyjwt = ">=2.8.0,<3.0"
-rich = ">=13.9.4, <14"
+rich = ">=15.0.0,<16.0.0"
 patch-ng = "1.19.1"
 typer = "^0.15.3"
 tenacity = ">=9.1.2,<9.2.0"