xai-review 0.28.0__tar.gz → 0.29.0__tar.gz

{xai_review-0.28.0/xai_review.egg-info → xai_review-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xai-review
-Version: 0.28.0
+Version: 0.29.0
 Summary: AI-powered code review tool
 Author-email: Nikita Filonov <nikita.filonov@example.com>
 Maintainer-email: Nikita Filonov <nikita.filonov@example.com>
@@ -211,7 +211,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Nikita-Filonov/ai-review@v0.28.0
+      - uses: Nikita-Filonov/ai-review@v0.29.0
         with:
           review-command: ${{ inputs.review-command }}
         env:

{xai_review-0.28.0 → xai_review-0.29.0}/README.md

@@ -177,7 +177,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Nikita-Filonov/ai-review@v0.28.0
+      - uses: Nikita-Filonov/ai-review@v0.29.0
         with:
           review-command: ${{ inputs.review-command }}
         env:

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/clients/gitlab/mr/schema/discussions.py

@@ -1,21 +1,13 @@
 from pydantic import BaseModel, RootModel, Field
 
 from ai_review.clients.gitlab.mr.schema.notes import GitLabNoteSchema
-
-
-class GitLabDiscussionPositionSchema(BaseModel):
-    position_type: str = "text"
-    base_sha: str
-    head_sha: str
-    start_sha: str
-    new_path: str
-    new_line: int
+from ai_review.clients.gitlab.mr.schema.position import GitLabPositionSchema
 
 
 class GitLabDiscussionSchema(BaseModel):
     id: str
     notes: list[GitLabNoteSchema]
-    position: GitLabDiscussionPositionSchema | None = None
+    position: GitLabPositionSchema | None = None
 
 
 class GitLabGetMRDiscussionsQuerySchema(BaseModel):
@@ -29,7 +21,7 @@ class GitLabGetMRDiscussionsResponseSchema(RootModel[list[GitLabDiscussionSchema
 
 class GitLabCreateMRDiscussionRequestSchema(BaseModel):
     body: str
-    position: GitLabDiscussionPositionSchema
+    position: GitLabPositionSchema
 
 
 class GitLabCreateMRDiscussionResponseSchema(BaseModel):

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/clients/gitlab/mr/schema/notes.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, RootModel
 
+from ai_review.clients.gitlab.mr.schema.position import GitLabPositionSchema
 from ai_review.clients.gitlab.mr.schema.user import GitLabUserSchema
 
 
@@ -7,6 +8,7 @@ class GitLabNoteSchema(BaseModel):
     id: int
     body: str
     author: GitLabUserSchema | None = None
+    position: GitLabPositionSchema | None = None
 
 
 class GitLabGetMRNotesQuerySchema(BaseModel):

xai_review-0.29.0/ai_review/clients/gitlab/mr/schema/position.py

@@ -0,0 +1,13 @@
+from pydantic import BaseModel
+
+
+class GitLabPositionSchema(BaseModel):
+    position_type: str | None = "text"
+    base_sha: str | None = None
+    head_sha: str | None = None
+    start_sha: str | None = None
+    old_path: str | None = None
+    new_path: str | None = None
+    old_line: int | None = None
+    new_line: int | None = None
+    line_range: dict | None = None

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/libs/asynchronous/gather.py

@@ -2,6 +2,9 @@ import asyncio
 from typing import Awaitable, Iterable, TypeVar
 
 from ai_review.config import settings
+from ai_review.libs.logger import get_logger
+
+logger = get_logger("GATHER")
 
 T = TypeVar("T")
 
@@ -11,7 +14,11 @@ async def bounded_gather(coroutines: Iterable[Awaitable[T]]) -> tuple[T, ...]:
 
     async def wrap(coro: Awaitable[T]) -> T:
         async with sem:
-            return await coro
+            try:
+                return await coro
+            except Exception as error:
+                logger.warning(f"Task failed: {type(error).__name__}: {error}")
+                return error
 
     results = await asyncio.gather(*(wrap(coroutine) for coroutine in coroutines), return_exceptions=True)
     return tuple(results)

xai_review-0.29.0/ai_review/services/git/service.py

@@ -0,0 +1,66 @@
+import subprocess
+from pathlib import Path
+
+from ai_review.libs.logger import get_logger
+from ai_review.services.git.types import GitServiceProtocol
+
+logger = get_logger("GIT_SERVICE")
+
+
+class GitService(GitServiceProtocol):
+    def __init__(self, repo_dir: str = "."):
+        self.repo_dir = Path(repo_dir)
+
+    def run_git(self, *args: str) -> str:
+        cmd = ["git", *args]
+        logger.debug(f"Running git command: {' '.join(cmd)} (cwd={self.repo_dir})")
+
+        try:
+            result = subprocess.run(
+                cmd,
+                cwd=self.repo_dir,
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            if result.stderr.strip():
+                logger.debug(f"Git stderr: {result.stderr.strip()}")
+            return result.stdout
+        except subprocess.CalledProcessError as error:
+            logger.warning(
+                f"Git command failed (exit={error.returncode}): {' '.join(cmd)}\n"
+                f"stderr: {error.stderr.strip()}"
+            )
+            raise
+
+    def get_diff(self, base_sha: str, head_sha: str, unified: int = 3) -> str:
+        return self.run_git("diff", f"--unified={unified}", base_sha, head_sha)
+
+    def get_diff_for_file(self, base_sha: str, head_sha: str, file: str, unified: int = 3) -> str:
+        if not file:
+            logger.warning(f"Skipping git diff for empty filename (base={base_sha}, head={head_sha})")
+            return ""
+
+        logger.debug(f"Generating diff for {file} between {base_sha}..{head_sha}")
+        output = self.run_git("diff", f"--unified={unified}", base_sha, head_sha, "--", file)
+        if not output.strip():
+            logger.info(f"No diff found for {file} (possibly deleted or not tracked)")
+
+        return output
+
+    def get_changed_files(self, base_sha: str, head_sha: str) -> list[str]:
+        output = self.run_git("diff", "--name-only", base_sha, head_sha)
+        files = [line.strip() for line in output.splitlines() if line.strip()]
+        logger.debug(f"Changed files between {base_sha}..{head_sha}: {files}")
+        return files
+
+    def get_file_at_commit(self, file_path: str, sha: str) -> str | None:
+        if not file_path:
+            logger.warning(f"Skipping git show for empty file_path at {sha}")
+            return None
+
+        try:
+            return self.run_git("show", f"{sha}:{file_path}")
+        except subprocess.CalledProcessError as e:
+            logger.warning(f"File '{file_path}' not found in commit {sha}: {e.stderr.strip()}")
+            return None

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/services/vcs/bitbucket/adapter.py

@@ -13,11 +13,14 @@ def get_review_comment_from_bitbucket_pr_comment(comment: BitbucketPRCommentSche
         username=user.nickname if user else "",
     )
 
+    file = comment.inline.path if comment.inline and comment.inline.path else None
+    line = comment.inline.to_line if comment.inline else None
+
     return ReviewCommentSchema(
         id=comment.id,
         body=comment.content.raw or "",
-        file=comment.inline.path if comment.inline else None,
-        line=comment.inline.to_line if comment.inline else None,
+        file=file,
+        line=line,
         author=author,
         parent_id=parent_id,
         thread_id=thread_id,

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/services/vcs/bitbucket/client.py

@@ -207,22 +207,33 @@ class BitbucketVCSClient(VCSClientProtocol):
         try:
             comments = await self.get_inline_comments()
 
-            threads: dict[str | int, list[ReviewCommentSchema]] = defaultdict(list)
+            threads_by_id: dict[str | int, list[ReviewCommentSchema]] = defaultdict(list)
             for comment in comments:
-                threads[comment.thread_id].append(comment)
+                if not comment.file:
+                    continue
 
-            logger.info(f"Built {len(threads)} inline threads for {self.pull_request_ref}")
+                threads_by_id[comment.thread_id].append(comment)
 
-            return [
-                ReviewThreadSchema(
-                    id=thread_id,
-                    kind=ThreadKind.INLINE,
-                    file=thread[0].file,
-                    line=thread[0].line,
-                    comments=sorted(thread, key=lambda c: int(c.id)),
+            logger.info(f"Built {len(threads_by_id)} inline threads for {self.pull_request_ref}")
+
+            threads: list[ReviewThreadSchema] = []
+            for thread_id, thread in threads_by_id.items():
+                file = thread[0].file
+                line = thread[0].line
+                if not file:
+                    continue
+
+                threads.append(
+                    ReviewThreadSchema(
+                        id=thread_id,
+                        kind=ThreadKind.INLINE,
+                        file=file,
+                        line=line,
+                        comments=sorted(thread, key=lambda t: int(t.id)),
+                    )
                 )
-                for thread_id, thread in threads.items()
-            ]
+
+            return threads
         except Exception as error:
             logger.exception(f"Failed to fetch inline threads for {self.pull_request_ref}: {error}")
             return []

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/services/vcs/gitlab/adapter.py

@@ -16,11 +16,13 @@ def get_review_comment_from_gitlab_note(
         note: GitLabNoteSchema,
         discussion: GitLabDiscussionSchema
 ) -> ReviewCommentSchema:
+    position = note.position or discussion.position
+
     return ReviewCommentSchema(
         id=note.id,
         body=note.body or "",
-        file=discussion.position.new_path if discussion.position else None,
-        line=discussion.position.new_line if discussion.position else None,
+        file=position.new_path if position else None,
+        line=position.new_line if position else None,
         author=get_user_from_gitlab_user(note.author),
         thread_id=discussion.id,
     )

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/services/vcs/gitlab/client.py

@@ -1,8 +1,6 @@
 from ai_review.clients.gitlab.client import get_gitlab_http_client
-from ai_review.clients.gitlab.mr.schema.discussions import (
-    GitLabDiscussionPositionSchema,
-    GitLabCreateMRDiscussionRequestSchema,
-)
+from ai_review.clients.gitlab.mr.schema.discussions import GitLabCreateMRDiscussionRequestSchema
+from ai_review.clients.gitlab.mr.schema.position import GitLabPositionSchema
 from ai_review.config import settings
 from ai_review.libs.logger import get_logger
 from ai_review.services.vcs.gitlab.adapter import get_user_from_gitlab_user, get_review_comment_from_gitlab_note
@@ -135,7 +133,7 @@ class GitLabVCSClient(VCSClientProtocol):
 
             request = GitLabCreateMRDiscussionRequestSchema(
                 body=message,
-                position=GitLabDiscussionPositionSchema(
+                position=GitLabPositionSchema(
                     position_type="text",
                     base_sha=response.diff_refs.base_sha,
                     head_sha=response.diff_refs.head_sha,
@@ -191,19 +189,28 @@ class GitLabVCSClient(VCSClientProtocol):
             )
             logger.info(f"Fetched inline threads for MR {self.merge_request_ref}")
 
-            threads = [
-                ReviewThreadSchema(
-                    id=discussion.id,
-                    kind=ThreadKind.INLINE,
-                    file=discussion.position.new_path if discussion.position else None,
-                    line=discussion.position.new_line if discussion.position else None,
-                    comments=[
-                        get_review_comment_from_gitlab_note(note, discussion)
-                        for note in discussion.notes
-                    ]
+            threads: list[ReviewThreadSchema] = []
+            for discussion in response.root:
+                if not discussion.notes:
+                    continue
+
+                position = discussion.position or (
+                    discussion.notes[0].position if discussion.notes else None
                 )
-                for discussion in response.root if discussion.notes
-            ]
+
+                threads.append(
+                    ReviewThreadSchema(
+                        id=discussion.id,
+                        kind=ThreadKind.INLINE,
+                        file=position.new_path if position else None,
+                        line=position.new_line if position else None,
+                        comments=[
+                            get_review_comment_from_gitlab_note(note, discussion)
+                            for note in discussion.notes
+                        ],
+                    )
+                )
+
             logger.info(f"Built {len(threads)} inline threads for MR {self.merge_request_ref}")
             return threads
         except Exception as error:

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/tests/fixtures/clients/gitlab.py

@@ -12,13 +12,14 @@ from ai_review.clients.gitlab.mr.schema.discussions import (
     GitLabGetMRDiscussionsResponseSchema,
     GitLabCreateMRDiscussionRequestSchema,
     GitLabCreateMRDiscussionResponseSchema,
-    GitLabCreateMRDiscussionReplyResponseSchema, GitLabDiscussionPositionSchema,
+    GitLabCreateMRDiscussionReplyResponseSchema,
 )
 from ai_review.clients.gitlab.mr.schema.notes import (
     GitLabNoteSchema,
     GitLabGetMRNotesResponseSchema,
     GitLabCreateMRNoteResponseSchema,
 )
+from ai_review.clients.gitlab.mr.schema.position import GitLabPositionSchema
 from ai_review.clients.gitlab.mr.types import GitLabMergeRequestsHTTPClientProtocol
 from ai_review.config import settings
 from ai_review.libs.config.vcs.base import GitLabVCSConfig
@@ -81,17 +82,42 @@ class FakeGitLabMergeRequestsHTTPClient(GitLabMergeRequestsHTTPClientProtocol):
                 GitLabDiscussionSchema(
                     id="discussion-1",
                     notes=[
-                        GitLabNoteSchema(id=10, body="Inline comment A"),
-                        GitLabNoteSchema(id=11, body="Inline comment B"),
+                        GitLabNoteSchema(
+                            id=10,
+                            body="Inline comment A",
+                            position=GitLabPositionSchema(
+                                base_sha="abc123",
+                                head_sha="def456",
+                                start_sha="ghi789",
+                                new_path="src/app.py",
+                                new_line=12,
+                            ),
+                        ),
+                        GitLabNoteSchema(
+                            id=11,
+                            body="Inline comment B",
+                            position=GitLabPositionSchema(
+                                base_sha="abc123",
+                                head_sha="def456",
+                                start_sha="ghi789",
+                                new_path="src/app.py",
+                                new_line=14,
+                            ),
+                        ),
                     ],
-                    position=GitLabDiscussionPositionSchema(
+                    position=GitLabPositionSchema(
                         base_sha="abc123",
                         head_sha="def456",
                         start_sha="ghi789",
                         new_path="src/app.py",
                         new_line=12,
                     ),
-                )
+                ),
+                GitLabDiscussionSchema(
+                    id="discussion-2",
+                    notes=[GitLabNoteSchema(id=20, body="Outdated diff comment", position=None)],
+                    position=None,
+                ),
             ]
         )
 

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/tests/suites/services/vcs/gitlab/test_adapter.py

@@ -1,8 +1,6 @@
-from ai_review.clients.gitlab.mr.schema.discussions import (
-    GitLabDiscussionSchema,
-    GitLabDiscussionPositionSchema,
-)
+from ai_review.clients.gitlab.mr.schema.discussions import GitLabDiscussionSchema
 from ai_review.clients.gitlab.mr.schema.notes import GitLabNoteSchema
+from ai_review.clients.gitlab.mr.schema.position import GitLabPositionSchema
 from ai_review.clients.gitlab.mr.schema.user import GitLabUserSchema
 from ai_review.services.vcs.gitlab.adapter import get_review_comment_from_gitlab_note
 from ai_review.services.vcs.types import ReviewCommentSchema, UserSchema
@@ -18,7 +16,7 @@ def test_maps_all_fields_correctly():
     discussion = GitLabDiscussionSchema(
         id="42",
         notes=[note],
-        position=GitLabDiscussionPositionSchema(
+        position=GitLabPositionSchema(
             base_sha="AAA000",
             head_sha="BBB111",
             start_sha="CCC222",
@@ -48,7 +46,7 @@ def test_maps_with_missing_author():
     discussion = GitLabDiscussionSchema(
         id="7",
         notes=[note],
-        position=GitLabDiscussionPositionSchema(
+        position=GitLabPositionSchema(
             base_sha="AAA000",
             head_sha="BBB111",
             start_sha="CCC222",
@@ -103,3 +101,34 @@ def test_maps_with_empty_body_and_defaults():
     assert result.line is None
     assert result.thread_id == "100"
     assert isinstance(result.author, UserSchema)
+
+
+def test_maps_with_note_position_fallback():
+    """Should use note.position when discussion.position is missing."""
+    note = GitLabNoteSchema(
+        id=77,
+        body="Inline note with its own position",
+        author=GitLabUserSchema(id=2, name="Carol", username="carol"),
+        position=GitLabPositionSchema(
+            base_sha="aaa",
+            head_sha="bbb",
+            start_sha="ccc",
+            new_path="module/utils.py",
+            new_line=42,
+        ),
+    )
+    discussion = GitLabDiscussionSchema(
+        id="200",
+        notes=[note],
+        position=None,
+    )
+
+    result = get_review_comment_from_gitlab_note(note, discussion)
+
+    assert isinstance(result, ReviewCommentSchema)
+    assert result.id == 77
+    assert result.file == "module/utils.py"
+    assert result.line == 42
+    assert result.thread_id == "200"
+    assert result.body == "Inline note with its own position"
+    assert result.author.name == "Carol"

{xai_review-0.28.0 → xai_review-0.29.0}/ai_review/tests/suites/services/vcs/gitlab/test_client.py

@@ -71,14 +71,20 @@ async def test_get_inline_comments_returns_expected_list(
         gitlab_vcs_client: GitLabVCSClient,
         fake_gitlab_merge_requests_http_client: FakeGitLabMergeRequestsHTTPClient,
 ):
-    """Should return inline comments from MR discussions."""
+    """Should return inline comments from MR discussions (including ones without position)."""
     comments = await gitlab_vcs_client.get_inline_comments()
 
     assert all(isinstance(c, ReviewCommentSchema) for c in comments)
-    assert len(comments) == 2
+    assert len(comments) == 3
 
     first = comments[0]
     assert first.body == "Inline comment A"
+    assert first.file == "src/app.py"
+    assert first.line == 12
+
+    last = comments[-1]
+    assert last.file is None
+    assert last.line is None
 
     called_methods = [name for name, _ in fake_gitlab_merge_requests_http_client.calls]
     assert called_methods == ["get_discussions"]
@@ -183,19 +189,25 @@ async def test_get_inline_threads_returns_valid_schema(
         gitlab_vcs_client: GitLabVCSClient,
         fake_gitlab_merge_requests_http_client: FakeGitLabMergeRequestsHTTPClient,
 ):
-    """Should transform GitLab discussions into inline threads with proper fields."""
+    """Should transform GitLab discussions into inline threads, including those without position."""
     threads = await gitlab_vcs_client.get_inline_threads()
 
-    assert all(isinstance(t, ReviewThreadSchema) for t in threads)
-    assert len(threads) == 1
+    assert all(isinstance(thread, ReviewThreadSchema) for thread in threads)
+    assert len(threads) == 2
 
-    thread = threads[0]
-    assert thread.id == "discussion-1"
-    assert thread.kind == ThreadKind.INLINE
-    assert thread.file == "src/app.py"
-    assert thread.line == 12
-    assert len(thread.comments) == 2
-    assert isinstance(thread.comments[0], ReviewCommentSchema)
+    first_thread = threads[0]
+    assert first_thread.id == "discussion-1"
+    assert first_thread.kind == ThreadKind.INLINE
+    assert first_thread.file == "src/app.py"
+    assert first_thread.line == 12
+    assert len(first_thread.comments) == 2
+    assert isinstance(first_thread.comments[0], ReviewCommentSchema)
+
+    second_thread = threads[1]
+    assert second_thread.id == "discussion-2"
+    assert second_thread.file is None
+    assert second_thread.line is None
+    assert len(second_thread.comments) == 1
 
     called = [name for name, _ in fake_gitlab_merge_requests_http_client.calls]
     assert "get_discussions" in called

{xai_review-0.28.0 → xai_review-0.29.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "xai-review"
 readme = { file = "README.md", content-type = "text/markdown" }
-version = "0.28.0"
+version = "0.29.0"
 license = { text = "Apache-2.0" }
 authors = [
     { name = "Nikita Filonov", email = "nikita.filonov@example.com" }

{xai_review-0.28.0 → xai_review-0.29.0/xai_review.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xai-review
-Version: 0.28.0
+Version: 0.29.0
 Summary: AI-powered code review tool
 Author-email: Nikita Filonov <nikita.filonov@example.com>
 Maintainer-email: Nikita Filonov <nikita.filonov@example.com>
@@ -211,7 +211,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: Nikita-Filonov/ai-review@v0.28.0
+      - uses: Nikita-Filonov/ai-review@v0.29.0
         with:
           review-command: ${{ inputs.review-command }}
         env:

{xai_review-0.28.0 → xai_review-0.29.0}/xai_review.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ ai_review/clients/gitlab/mr/schema/__init__.py
 ai_review/clients/gitlab/mr/schema/changes.py
 ai_review/clients/gitlab/mr/schema/discussions.py
 ai_review/clients/gitlab/mr/schema/notes.py
+ai_review/clients/gitlab/mr/schema/position.py
 ai_review/clients/gitlab/mr/schema/user.py
 ai_review/clients/ollama/__init__.py
 ai_review/clients/ollama/client.py

xai_review-0.28.0/ai_review/services/git/service.py

@@ -1,35 +0,0 @@
-import subprocess
-from pathlib import Path
-
-from ai_review.services.git.types import GitServiceProtocol
-
-
-class GitService(GitServiceProtocol):
-    def __init__(self, repo_dir: str = "."):
-        self.repo_dir = Path(repo_dir)
-
-    def run_git(self, *args: str) -> str:
-        result = subprocess.run(
-            ["git", *args],
-            cwd=self.repo_dir,
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        return result.stdout
-
-    def get_diff(self, base_sha: str, head_sha: str, unified: int = 3) -> str:
-        return self.run_git("diff", f"--unified={unified}", base_sha, head_sha)
-
-    def get_diff_for_file(self, base_sha: str, head_sha: str, file: str, unified: int = 3) -> str:
-        return self.run_git("diff", f"--unified={unified}", base_sha, head_sha, "--", file)
-
-    def get_changed_files(self, base_sha: str, head_sha: str) -> list[str]:
-        output = self.run_git("diff", "--name-only", base_sha, head_sha)
-        return [line.strip() for line in output.splitlines() if line.strip()]
-
-    def get_file_at_commit(self, file_path: str, sha: str) -> str | None:
-        try:
-            return self.run_git("show", f"{sha}:{file_path}")
-        except subprocess.CalledProcessError:
-            return None