ai-cr 3.2.0__tar.gz → 3.2.2__tar.gz

{ai_cr-3.2.0 → ai_cr-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ai-cr
-Version: 3.2.0
+Version: 3.2.2
 Summary: AI code review tool that works with any language model provider. It detects issues in GitHub pull requests or local changes—instantly, reliably, and without vendor lock-in.
 License: MIT
 Keywords: static code analysis,code review,code quality,ai,coding,assistant,llm,github,automation,devops,developer tools,github actions,workflows,git

{ai_cr-3.2.0 → ai_cr-3.2.2}/gito/core.py

@@ -121,85 +121,88 @@ def get_diff(
     if review_subject_is_index(what):
         what = None  # working copy
     if use_merge_base:
-        if review_subject_is_index(what):
-            try:
-                current_ref = repo.active_branch.name
-            except TypeError:
-                # In detached HEAD state, use HEAD directly
-                current_ref = "HEAD"
-                logging.info(
-                    "Detected detached HEAD state, using HEAD as current reference"
-                )
-        else:
-            current_ref = what
-        merge_base = repo.merge_base(current_ref or repo.active_branch.name, against)[0]
-        logging.info(
-            f"Merge base({ui.green(current_ref)},{ui.yellow(against)})"
-            f" --> {ui.cyan(merge_base.hexsha)}"
-        )
-        # if branch is already an ancestor of "against", merge_base == branch ⇒ it’s been merged
-        if merge_base.hexsha == repo.commit(current_ref or repo.active_branch.name).hexsha:
-            # @todo: check case: reviewing working copy index in main branch #103
-            logging.info(
-                f"Branch is already merged. ({ui.green(current_ref)} vs {ui.yellow(against)})"
-            )
-            merge_sha = repo.git.log(
-                '--merges',
-                '--ancestry-path',
-                f'{current_ref}..{against}',
-                '-n',
-                '1',
-                '--pretty=format:%H'
-            ).strip()
-            if merge_sha:
-                logging.info(f"Merge commit is {ui.cyan(merge_sha)}")
-                merge_commit = repo.commit(merge_sha)
-
-                other_merge_parent = None
-                for parent in merge_commit.parents:
-                    logging.info(f"Checking merge parent: {parent.hexsha[:8]}")
-                    if parent.hexsha == merge_base.hexsha:
-                        logging.info(f"merge parent is {ui.cyan(parent.hexsha[:8])}, skipping")
-                        continue
-                    if not commit_in_branch(repo, parent, against):
-                        logging.warning(f"merge parent is not in {against}, skipping")
-                        continue
-                    logging.info(f"Found other merge parent: {ui.cyan(parent.hexsha[:8])}")
-                    other_merge_parent = parent
-                    break
-                if other_merge_parent:
-                    first_common_ancestor = repo.merge_base(other_merge_parent, merge_base)[0]
-                    # for gito remote (feature_branch vs origin/main)
-                    # the same merge base appears in first_common_ancestor again
-                    if first_common_ancestor.hexsha == merge_base.hexsha:
-                        if merge_base.parents:
-                            first_common_ancestor = repo.merge_base(
-                                other_merge_parent, merge_base.parents[0]
-                            )[0]
-                        else:
-                            logging.error(
-                                "merge_base has no parents, "
-                                "using merge_base as first_common_ancestor"
-                            )
+        try:
+            if review_subject_is_index(what):
+                try:
+                    current_ref = repo.active_branch.name
+                except TypeError:
+                    # In detached HEAD state, use HEAD directly
+                    current_ref = "HEAD"
                     logging.info(
-                        f"{what} will be compared to "
-                        f"first common ancestor of {what} and {against}: "
-                        f"{ui.cyan(first_common_ancestor.hexsha[:8])}"
+                        "Detected detached HEAD state, using HEAD as current reference"
                     )
-                    against = first_common_ancestor.hexsha
-                else:
-                    logging.error(f"Can't find other merge parent for {merge_sha}")
             else:
-                logging.warning(
-                    f"No merge‐commit found for {current_ref!r}→{against!r}; "
-                    "falling back to merge‐base diff"
-                )
-        else:
-            # normal case: branch not yet merged
-            against = merge_base.hexsha
+                current_ref = what
+            merge_base = repo.merge_base(current_ref or repo.active_branch.name, against)[0]
             logging.info(
-                f"Using merge base: {ui.cyan(merge_base.hexsha[:8])} ({merge_base.summary})"
+                f"Merge base({ui.green(current_ref)},{ui.yellow(against)})"
+                f" --> {ui.cyan(merge_base.hexsha)}"
             )
+            # if branch is already an ancestor of "against", merge_base == branch ⇒ it’s been merged
+            if merge_base.hexsha == repo.commit(current_ref or repo.active_branch.name).hexsha:
+                # @todo: check case: reviewing working copy index in main branch #103
+                logging.info(
+                    f"Branch is already merged. ({ui.green(current_ref)} vs {ui.yellow(against)})"
+                )
+                merge_sha = repo.git.log(
+                    '--merges',
+                    '--ancestry-path',
+                    f'{current_ref}..{against}',
+                    '-n',
+                    '1',
+                    '--pretty=format:%H'
+                ).strip()
+                if merge_sha:
+                    logging.info(f"Merge commit is {ui.cyan(merge_sha)}")
+                    merge_commit = repo.commit(merge_sha)
+
+                    other_merge_parent = None
+                    for parent in merge_commit.parents:
+                        logging.info(f"Checking merge parent: {parent.hexsha[:8]}")
+                        if parent.hexsha == merge_base.hexsha:
+                            logging.info(f"merge parent is {ui.cyan(parent.hexsha[:8])}, skipping")
+                            continue
+                        if not commit_in_branch(repo, parent, against):
+                            logging.warning(f"merge parent is not in {against}, skipping")
+                            continue
+                        logging.info(f"Found other merge parent: {ui.cyan(parent.hexsha[:8])}")
+                        other_merge_parent = parent
+                        break
+                    if other_merge_parent:
+                        first_common_ancestor = repo.merge_base(other_merge_parent, merge_base)[0]
+                        # for gito remote (feature_branch vs origin/main)
+                        # the same merge base appears in first_common_ancestor again
+                        if first_common_ancestor.hexsha == merge_base.hexsha:
+                            if merge_base.parents:
+                                first_common_ancestor = repo.merge_base(
+                                    other_merge_parent, merge_base.parents[0]
+                                )[0]
+                            else:
+                                logging.error(
+                                    "merge_base has no parents, "
+                                    "using merge_base as first_common_ancestor"
+                                )
+                        logging.info(
+                            f"{what} will be compared to "
+                            f"first common ancestor of {what} and {against}: "
+                            f"{ui.cyan(first_common_ancestor.hexsha[:8])}"
+                        )
+                        against = first_common_ancestor.hexsha
+                    else:
+                        logging.error(f"Can't find other merge parent for {merge_sha}")
+                else:
+                    logging.warning(
+                        f"No merge‐commit found for {current_ref!r}→{against!r}; "
+                        "falling back to merge‐base diff"
+                    )
+            else:
+                # normal case: branch not yet merged
+                against = merge_base.hexsha
+                logging.info(
+                    f"Using merge base: {ui.cyan(merge_base.hexsha[:8])} ({merge_base.summary})"
+                )
+        except Exception as e:
+            logging.error(f"Error finding merge base: {e}")
     logging.info(
         f"Making diff: {ui.green(what or 'INDEX')} vs {ui.yellow(against)}"
     )

{ai_cr-3.2.0 → ai_cr-3.2.2}/gito/report_struct.py

@@ -12,7 +12,7 @@ import textwrap
 
 from .constants import JSON_REPORT_FILE_NAME, HTML_TEXT_ICON, HTML_CR_COMMENT_MARKER
 from .project_config import ProjectConfig
-from .utils import syntax_hint, block_wrap_lr, max_line_len, remove_html_comments
+from .utils import syntax_hint, block_wrap_lr, max_line_len, remove_html_comments, filter_kwargs
 
 
 @dataclass
@@ -40,7 +40,7 @@ class Issue:
 
     def __post_init__(self):
         self.affected_lines = [
-            Issue.AffectedCode(**dict(file=self.file) | i)
+            Issue.AffectedCode(**filter_kwargs(Issue.AffectedCode, dict(file=self.file) | i))
             for i in self.affected_lines
         ]
 
@@ -63,7 +63,7 @@ class Report:
         MARKDOWN = "md"
         CLI = "cli"
 
-    issues: dict[str, list[Issue]] = field(default_factory=dict)
+    issues: dict[str, list[Issue | dict]] = field(default_factory=dict)
     summary: str = field(default="")
     number_of_processed_files: int = field(default=0)
     total_issues: int = field(init=False)
@@ -84,10 +84,10 @@ class Report:
         for file in self.issues.keys():
             self.issues[file] = [
                 Issue(
-                    **{
+                    **filter_kwargs(Issue, {
                         "id": (issue_id := issue_id + 1),
                         "file": file,
-                    } | issue
+                    } | issue)
                 )
                 for issue in self.issues[file]
             ]

{ai_cr-3.2.0 → ai_cr-3.2.2}/gito/utils.py

@@ -1,6 +1,8 @@
+import logging
 import re
 import sys
 import os
+from dataclasses import fields
 from pathlib import Path
 import importlib.metadata
 from typing import Optional
@@ -240,3 +242,26 @@ def remove_html_comments(text):
     Removes all HTML comments (<!-- ... -->) from the input text.
     """
     return re.sub(r'<!--.*?-->\s*', '', text, flags=re.DOTALL)
+
+
+def filter_kwargs(cls, kwargs, log_warnings=True):
+    """
+    Filters the keyword arguments to only include those that are fields of the given dataclass.
+    Args:
+        cls: The dataclass type to filter against.
+        kwargs: A dictionary of keyword arguments.
+        log_warnings: If True, logs warnings for fields not in the dataclass.
+    Returns:
+        A dictionary containing only the fields that are defined in the dataclass.
+    """
+    cls_fields = {f.name for f in fields(cls)}
+    filtered = {}
+    for k, v in kwargs.items():
+        if k in cls_fields:
+            filtered[k] = v
+        else:
+            if log_warnings:
+                logging.warning(
+                    f"Warning: field '{k}' not in {cls.__name__}, dropping."
+                )
+    return filtered

{ai_cr-3.2.0 → ai_cr-3.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ai-cr"
-version = "3.2.0"
+version = "3.2.2"
 description = "AI code review tool that works with any language model provider. It detects issues in GitHub pull requests or local changes—instantly, reliably, and without vendor lock-in."
 authors = ["Nayjest <mail@vitaliy.in>"]
 readme = "README.md"