xai-review 0.37.0__py3-none-any.whl → 0.38.0__py3-none-any.whl

ai_review/services/vcs/factory.py

@@ -1,6 +1,7 @@
 from ai_review.config import settings
 from ai_review.libs.constants.vcs_provider import VCSProvider
-from ai_review.services.vcs.bitbucket.client import BitbucketVCSClient
+from ai_review.services.vcs.bitbucket_cloud.client import BitbucketCloudVCSClient
+from ai_review.services.vcs.bitbucket_server.client import BitbucketServerVCSClient
 from ai_review.services.vcs.gitea.client import GiteaVCSClient
 from ai_review.services.vcs.github.client import GitHubVCSClient
 from ai_review.services.vcs.gitlab.client import GitLabVCSClient
@@ -15,7 +16,9 @@ def get_vcs_client() -> VCSClientProtocol:
             return GitLabVCSClient()
         case VCSProvider.GITHUB:
             return GitHubVCSClient()
-        case VCSProvider.BITBUCKET:
-            return BitbucketVCSClient()
+        case VCSProvider.BITBUCKET_CLOUD:
+            return BitbucketCloudVCSClient()
+        case VCSProvider.BITBUCKET_SERVER:
+            return BitbucketServerVCSClient()
         case _:
             raise ValueError(f"Unsupported VCS provider: {settings.vcs.provider}")

ai_review/tests/fixtures/clients/bitbucket_cloud.py

@@ -0,0 +1,207 @@
+import pytest
+from pydantic import HttpUrl, SecretStr
+
+from ai_review.clients.bitbucket_cloud.pr.schema.comments import (
+    BitbucketCloudPRCommentSchema,
+    BitbucketCloudCommentContentSchema,
+    BitbucketCloudCommentInlineSchema,
+    BitbucketCloudGetPRCommentsResponseSchema,
+    BitbucketCloudCreatePRCommentRequestSchema,
+    BitbucketCloudCreatePRCommentResponseSchema,
+)
+from ai_review.clients.bitbucket_cloud.pr.schema.files import (
+    BitbucketCloudGetPRFilesResponseSchema,
+    BitbucketCloudPRFileSchema,
+    BitbucketCloudPRFilePathSchema,
+)
+from ai_review.clients.bitbucket_cloud.pr.schema.pull_request import (
+    BitbucketCloudUserSchema,
+    BitbucketCloudBranchSchema,
+    BitbucketCloudCommitSchema,
+    BitbucketCloudRepositorySchema,
+    BitbucketCloudPRLocationSchema,
+    BitbucketCloudGetPRResponseSchema,
+)
+from ai_review.clients.bitbucket_cloud.pr.types import BitbucketCloudPullRequestsHTTPClientProtocol
+from ai_review.config import settings
+from ai_review.libs.config.vcs.base import BitbucketCloudVCSConfig
+from ai_review.libs.config.vcs.bitbucket_cloud import (
+    BitbucketCloudPipelineConfig,
+    BitbucketCloudHTTPClientConfig
+)
+from ai_review.libs.constants.vcs_provider import VCSProvider
+from ai_review.services.vcs.bitbucket_cloud.client import BitbucketCloudVCSClient
+
+
+class FakeBitbucketCloudPullRequestsHTTPClient(BitbucketCloudPullRequestsHTTPClientProtocol):
+    def __init__(self):
+        self.calls: list[tuple[str, dict]] = []
+
+    async def get_pull_request(
+            self,
+            workspace: str,
+            repo_slug: str,
+            pull_request_id: str
+    ) -> BitbucketCloudGetPRResponseSchema:
+        self.calls.append(
+            (
+                "get_pull_request",
+                {"workspace": workspace, "repo_slug": repo_slug, "pull_request_id": pull_request_id}
+            )
+        )
+        return BitbucketCloudGetPRResponseSchema(
+            id=1,
+            title="Fake Bitbucket PR",
+            description="This is a fake PR for testing",
+            state="OPEN",
+            author=BitbucketCloudUserSchema(uuid="u1", display_name="Tester", nickname="tester"),
+            source=BitbucketCloudPRLocationSchema(
+                commit=BitbucketCloudCommitSchema(hash="def456"),
+                branch=BitbucketCloudBranchSchema(name="feature/test"),
+                repository=BitbucketCloudRepositorySchema(uuid="r1", full_name="workspace/repo"),
+            ),
+            destination=BitbucketCloudPRLocationSchema(
+                commit=BitbucketCloudCommitSchema(hash="abc123"),
+                branch=BitbucketCloudBranchSchema(name="main"),
+                repository=BitbucketCloudRepositorySchema(uuid="r1", full_name="workspace/repo"),
+            ),
+            reviewers=[BitbucketCloudUserSchema(uuid="u2", display_name="Reviewer", nickname="reviewer")],
+            participants=[BitbucketCloudUserSchema(uuid="u3", display_name="Participant", nickname="participant")],
+        )
+
+    async def get_files(
+            self,
+            workspace: str,
+            repo_slug: str,
+            pull_request_id: str
+    ) -> BitbucketCloudGetPRFilesResponseSchema:
+        self.calls.append(
+            (
+                "get_files",
+                {"workspace": workspace, "repo_slug": repo_slug, "pull_request_id": pull_request_id}
+            )
+        )
+        return BitbucketCloudGetPRFilesResponseSchema(
+            size=2,
+            page=1,
+            page_len=100,
+            next=None,
+            values=[
+                BitbucketCloudPRFileSchema(
+                    new=BitbucketCloudPRFilePathSchema(path="app/main.py"),
+                    old=None,
+                    status="modified",
+                    lines_added=10,
+                    lines_removed=2,
+                ),
+                BitbucketCloudPRFileSchema(
+                    new=BitbucketCloudPRFilePathSchema(path="utils/helper.py"),
+                    old=None,
+                    status="added",
+                    lines_added=5,
+                    lines_removed=0,
+                ),
+            ],
+        )
+
+    async def get_comments(
+            self,
+            workspace: str,
+            repo_slug: str,
+            pull_request_id: str
+    ) -> BitbucketCloudGetPRCommentsResponseSchema:
+        self.calls.append(
+            (
+                "get_comments",
+                {"workspace": workspace, "repo_slug": repo_slug, "pull_request_id": pull_request_id}
+            )
+        )
+        return BitbucketCloudGetPRCommentsResponseSchema(
+            size=2,
+            page=1,
+            next=None,
+            values=[
+                BitbucketCloudPRCommentSchema(
+                    id=1,
+                    inline=None,
+                    content=BitbucketCloudCommentContentSchema(raw="General comment"),
+                ),
+                BitbucketCloudPRCommentSchema(
+                    id=2,
+                    inline=BitbucketCloudCommentInlineSchema(path="file.py", to_line=5),
+                    content=BitbucketCloudCommentContentSchema(raw="Inline comment"),
+                ),
+            ],
+            page_len=100,
+        )
+
+    async def create_comment(
+            self,
+            workspace: str,
+            repo_slug: str,
+            pull_request_id: str,
+            request: BitbucketCloudCreatePRCommentRequestSchema
+    ) -> BitbucketCloudCreatePRCommentResponseSchema:
+        self.calls.append(
+            (
+                "create_comment",
+                {
+                    "workspace": workspace,
+                    "repo_slug": repo_slug,
+                    "pull_request_id": pull_request_id,
+                    **request.model_dump(by_alias=True)
+                }
+            )
+        )
+        return BitbucketCloudCreatePRCommentResponseSchema(
+            id=10,
+            content=request.content,
+            inline=request.inline,
+        )
+
+
+class FakeBitbucketCloudHTTPClient:
+    def __init__(self, pull_requests_client: BitbucketCloudPullRequestsHTTPClientProtocol):
+        self.pr = pull_requests_client
+
+
+@pytest.fixture
+def fake_bitbucket_cloud_pull_requests_http_client() -> FakeBitbucketCloudPullRequestsHTTPClient:
+    return FakeBitbucketCloudPullRequestsHTTPClient()
+
+
+@pytest.fixture
+def fake_bitbucket_cloud_http_client(
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient
+) -> FakeBitbucketCloudHTTPClient:
+    return FakeBitbucketCloudHTTPClient(pull_requests_client=fake_bitbucket_cloud_pull_requests_http_client)
+
+
+@pytest.fixture
+def bitbucket_cloud_vcs_client(
+        monkeypatch: pytest.MonkeyPatch,
+        fake_bitbucket_cloud_http_client: FakeBitbucketCloudHTTPClient
+) -> BitbucketCloudVCSClient:
+    monkeypatch.setattr(
+        "ai_review.services.vcs.bitbucket_cloud.client.get_bitbucket_cloud_http_client",
+        lambda: fake_bitbucket_cloud_http_client,
+    )
+    return BitbucketCloudVCSClient()
+
+
+@pytest.fixture
+def bitbucket_cloud_http_client_config(monkeypatch: pytest.MonkeyPatch):
+    fake_config = BitbucketCloudVCSConfig(
+        provider=VCSProvider.BITBUCKET_CLOUD,
+        pipeline=BitbucketCloudPipelineConfig(
+            workspace="workspace",
+            repo_slug="repo",
+            pull_request_id="123",
+        ),
+        http_client=BitbucketCloudHTTPClientConfig(
+            timeout=10,
+            api_url=HttpUrl("https://api.bitbucket.org/2.0"),
+            api_token=SecretStr("fake-token"),
+        )
+    )
+    monkeypatch.setattr(settings, "vcs", fake_config)

ai_review/tests/fixtures/clients/bitbucket_server.py

@@ -0,0 +1,265 @@
+import pytest
+from pydantic import HttpUrl, SecretStr
+
+from ai_review.clients.bitbucket_server.pr.schema.changes import (
+    BitbucketServerChangeSchema,
+    BitbucketServerChangePathSchema,
+    BitbucketServerGetPRChangesResponseSchema,
+)
+from ai_review.clients.bitbucket_server.pr.schema.comments import (
+    BitbucketServerCommentSchema,
+    BitbucketServerCommentAnchorSchema,
+    BitbucketServerGetPRCommentsResponseSchema,
+    BitbucketServerCreatePRCommentRequestSchema,
+    BitbucketServerCreatePRCommentResponseSchema,
+)
+from ai_review.clients.bitbucket_server.pr.schema.pull_request import (
+    BitbucketServerRefSchema,
+    BitbucketServerUserSchema,
+    BitbucketServerProjectSchema,
+    BitbucketServerRepositorySchema,
+    BitbucketServerParticipantSchema,
+    BitbucketServerGetPRResponseSchema,
+)
+from ai_review.clients.bitbucket_server.pr.types import BitbucketServerPullRequestsHTTPClientProtocol
+from ai_review.config import settings
+from ai_review.libs.config.vcs.base import BitbucketServerVCSConfig
+from ai_review.libs.config.vcs.bitbucket_server import BitbucketServerPipelineConfig, BitbucketServerHTTPClientConfig
+from ai_review.libs.constants.vcs_provider import VCSProvider
+from ai_review.services.vcs.bitbucket_server.client import BitbucketServerVCSClient
+
+
+class FakeBitbucketServerPullRequestsHTTPClient(BitbucketServerPullRequestsHTTPClientProtocol):
+    def __init__(self):
+        self.calls: list[tuple[str, dict]] = []
+
+    async def get_pull_request(
+            self,
+            project_key: str,
+            repo_slug: str,
+            pull_request_id: int
+    ) -> BitbucketServerGetPRResponseSchema:
+        self.calls.append(
+            (
+                "get_pull_request",
+                {
+                    "project_key": project_key,
+                    "repo_slug": repo_slug,
+                    "pull_request_id": pull_request_id
+                }
+            )
+        )
+        return BitbucketServerGetPRResponseSchema(
+            id=1,
+            version=1,
+            title="Fake Bitbucket Server PR",
+            description="PR for testing server client",
+            state="OPEN",
+            open=True,
+            locked=False,
+            author=BitbucketServerParticipantSchema(
+                user=BitbucketServerUserSchema(
+                    id=100,
+                    name="author",
+                    slug="author",
+                    display_name="Author User",
+                ),
+                role="AUTHOR",
+            ),
+            reviewers=[
+                BitbucketServerParticipantSchema(
+                    user=BitbucketServerUserSchema(
+                        id=101,
+                        name="reviewer",
+                        slug="reviewer",
+                        display_name="Reviewer User",
+                    ),
+                    role="REVIEWER",
+                )
+            ],
+            from_ref=BitbucketServerRefSchema(
+                id="refs/heads/feature/test",
+                display_id="feature/test",
+                latest_commit="def456",
+                repository=BitbucketServerRepositorySchema(
+                    slug="repo",
+                    name="Repo Name",
+                    project=BitbucketServerProjectSchema(key="PRJ"),
+                ),
+            ),
+            to_ref=BitbucketServerRefSchema(
+                id="refs/heads/main",
+                display_id="main",
+                latest_commit="abc123",
+                repository=BitbucketServerRepositorySchema(
+                    slug="repo",
+                    name="Repo Name",
+                    project=BitbucketServerProjectSchema(key="PRJ"),
+                ),
+            ),
+            created_date=1690000000,
+            updated_date=1690000100,
+            links={},
+        )
+
+    async def get_changes(
+            self,
+            project_key: str,
+            repo_slug: str,
+            pull_request_id: int
+    ) -> BitbucketServerGetPRChangesResponseSchema:
+        self.calls.append(
+            (
+                "get_changes", {
+                    "project_key": project_key,
+                    "repo_slug": repo_slug,
+                    "pull_request_id": pull_request_id
+                }
+            )
+        )
+        return BitbucketServerGetPRChangesResponseSchema(
+            size=1,
+            start=0,
+            limit=100,
+            is_last_page=True,
+            next_page_start=None,
+            values=[
+                BitbucketServerChangeSchema(
+                    path=BitbucketServerChangePathSchema(to_string="src/main.py"),
+                    type="MODIFY",
+                    src_path=None,
+                    node_type="FILE",
+                    executable=False,
+                )
+            ],
+        )
+
+    async def get_comments(
+            self,
+            project_key: str,
+            repo_slug: str,
+            pull_request_id: int
+    ) -> BitbucketServerGetPRCommentsResponseSchema:
+        self.calls.append(
+            (
+                "get_comments",
+                {"project_key": project_key, "repo_slug": repo_slug, "pull_request_id": pull_request_id}
+            )
+        )
+        return BitbucketServerGetPRCommentsResponseSchema(
+            size=2,
+            start=0,
+            limit=100,
+            is_last_page=True,
+            next_page_start=None,
+            values=[
+                BitbucketServerCommentSchema(
+                    id=1,
+                    text="General comment",
+                    author=BitbucketServerUserSchema(
+                        id=100,
+                        name="user1",
+                        slug="user1",
+                        display_name="User One",
+                    ),
+                    anchor=None,
+                    comments=[],
+                    created_date=1690000000,
+                    updated_date=1690000000,
+                ),
+                BitbucketServerCommentSchema(
+                    id=2,
+                    text="Inline comment",
+                    author=BitbucketServerUserSchema(
+                        id=101,
+                        name="user2",
+                        slug="user2",
+                        display_name="User Two",
+                    ),
+                    anchor=BitbucketServerCommentAnchorSchema(path="src/main.py", line=5, line_type="ADDED"),
+                    comments=[],
+                    created_date=1690000001,
+                    updated_date=1690000001,
+                ),
+            ],
+        )
+
+    async def create_comment(
+            self,
+            project_key: str,
+            repo_slug: str,
+            pull_request_id: int,
+            request: BitbucketServerCreatePRCommentRequestSchema
+    ) -> BitbucketServerCreatePRCommentResponseSchema:
+        self.calls.append(
+            (
+                "create_comment",
+                {
+                    "project_key": project_key,
+                    "repo_slug": repo_slug,
+                    "pull_request_id": pull_request_id,
+                    **request.model_dump(by_alias=True)
+                }
+            )
+        )
+        return BitbucketServerCreatePRCommentResponseSchema(
+            id=10,
+            text=request.text,
+            author=BitbucketServerUserSchema(
+                id=999,
+                name="bot",
+                slug="bot",
+                display_name="Automation Bot",
+            ),
+            anchor=request.anchor,
+            comments=[],
+            created_date=1690000200,
+            updated_date=1690000200,
+        )
+
+
+class FakeBitbucketServerHTTPClient:
+    def __init__(self, pull_requests_client: BitbucketServerPullRequestsHTTPClientProtocol):
+        self.pr = pull_requests_client
+
+
+@pytest.fixture
+def fake_bitbucket_server_pull_requests_http_client() -> FakeBitbucketServerPullRequestsHTTPClient:
+    return FakeBitbucketServerPullRequestsHTTPClient()
+
+
+@pytest.fixture
+def fake_bitbucket_server_http_client(
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient
+) -> FakeBitbucketServerHTTPClient:
+    return FakeBitbucketServerHTTPClient(pull_requests_client=fake_bitbucket_server_pull_requests_http_client)
+
+
+@pytest.fixture
+def bitbucket_server_vcs_client(
+        monkeypatch: pytest.MonkeyPatch,
+        fake_bitbucket_server_http_client: FakeBitbucketServerHTTPClient
+) -> BitbucketServerVCSClient:
+    monkeypatch.setattr(
+        "ai_review.services.vcs.bitbucket_server.client.get_bitbucket_server_http_client",
+        lambda: fake_bitbucket_server_http_client,
+    )
+    return BitbucketServerVCSClient()
+
+
+@pytest.fixture
+def bitbucket_server_http_client_config(monkeypatch: pytest.MonkeyPatch):
+    fake_config = BitbucketServerVCSConfig(
+        provider=VCSProvider.BITBUCKET_SERVER,
+        pipeline=BitbucketServerPipelineConfig(
+            project_key="PRJ",
+            repo_slug="repo",
+            pull_request_id=1,
+        ),
+        http_client=BitbucketServerHTTPClientConfig(
+            timeout=10,
+            api_url=HttpUrl("https://bitbucket.server.local/rest/api/1.0"),
+            api_token=SecretStr("fake-token"),
+        ),
+    )
+    monkeypatch.setattr(settings, "vcs", fake_config)

ai_review/tests/suites/clients/bitbucket_cloud/test_client.py

@@ -0,0 +1,14 @@
+import pytest
+from httpx import AsyncClient
+
+from ai_review.clients.bitbucket_cloud.client import get_bitbucket_cloud_http_client, BitbucketCloudHTTPClient
+from ai_review.clients.bitbucket_cloud.pr.client import BitbucketCloudPullRequestsHTTPClient
+
+
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
+def test_get_bitbucket_cloud_http_client_builds_ok():
+    bitbucket_http_client = get_bitbucket_cloud_http_client()
+
+    assert isinstance(bitbucket_http_client, BitbucketCloudHTTPClient)
+    assert isinstance(bitbucket_http_client.pr, BitbucketCloudPullRequestsHTTPClient)
+    assert isinstance(bitbucket_http_client.pr.client, AsyncClient)

ai_review/tests/suites/clients/bitbucket_cloud/test_tools.py

@@ -0,0 +1,31 @@
+from httpx import Response, Request
+
+from ai_review.clients.bitbucket_cloud.tools import bitbucket_cloud_has_next_page
+
+
+def make_response(data: dict) -> Response:
+    return Response(
+        json=data,
+        request=Request("GET", "http://bitbucket.test"),
+        status_code=200,
+    )
+
+
+def test_bitbucket_cloud_has_next_page_true():
+    resp = make_response({"next": "https://api.bitbucket.org/2.0/repositories/test/repo?page=2"})
+    assert bitbucket_cloud_has_next_page(resp) is True
+
+
+def test_bitbucket_cloud_has_next_page_false_none():
+    resp = make_response({"next": None})
+    assert bitbucket_cloud_has_next_page(resp) is False
+
+
+def test_bitbucket_cloud_has_next_page_false_missing():
+    resp = make_response({})
+    assert bitbucket_cloud_has_next_page(resp) is False
+
+
+def test_bitbucket_cloud_has_next_page_false_empty_string():
+    resp = make_response({"next": ""})
+    assert bitbucket_cloud_has_next_page(resp) is False

ai_review/tests/suites/clients/bitbucket_server/test_client.py

@@ -0,0 +1,14 @@
+import pytest
+from httpx import AsyncClient
+
+from ai_review.clients.bitbucket_server.client import get_bitbucket_server_http_client, BitbucketServerHTTPClient
+from ai_review.clients.bitbucket_server.pr.client import BitbucketServerPullRequestsHTTPClient
+
+
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+def test_get_bitbucket_server_http_client_builds_ok():
+    bitbucket_server_http_client = get_bitbucket_server_http_client()
+
+    assert isinstance(bitbucket_server_http_client, BitbucketServerHTTPClient)
+    assert isinstance(bitbucket_server_http_client.pr, BitbucketServerPullRequestsHTTPClient)
+    assert isinstance(bitbucket_server_http_client.pr.client, AsyncClient)

ai_review/tests/suites/clients/bitbucket_server/test_tools.py

@@ -0,0 +1,38 @@
+import json
+
+from httpx import Response, Request
+
+from ai_review.clients.bitbucket_server.tools import bitbucket_server_has_next_page
+
+
+def make_response(data: dict) -> Response:
+    """Helper to create a fake HTTPX Response with given JSON data."""
+    return Response(
+        status_code=200,
+        content=json.dumps(data).encode(),
+        request=Request("GET", "http://bitbucket-server.test"),
+    )
+
+
+def test_bitbucket_server_has_next_page_true_when_not_last():
+    """Should return True if isLastPage=False (i.e., more pages exist)."""
+    resp = make_response({"isLastPage": False})
+    assert bitbucket_server_has_next_page(resp) is True
+
+
+def test_bitbucket_server_has_next_page_false_when_last_page():
+    """Should return False if isLastPage=True (last page reached)."""
+    resp = make_response({"isLastPage": True})
+    assert bitbucket_server_has_next_page(resp) is False
+
+
+def test_bitbucket_server_has_next_page_false_when_missing():
+    """Should default to False if isLastPage key is missing (treated as last page)."""
+    resp = make_response({})
+    assert bitbucket_server_has_next_page(resp) is False
+
+
+def test_bitbucket_server_has_next_page_false_when_invalid_type():
+    """Should handle invalid non-bool values gracefully."""
+    resp = make_response({"isLastPage": "not-a-bool"})
+    assert bitbucket_server_has_next_page(resp) is False