kodit 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

kodit/infrastructure/api/v1/routers/commits.py

@@ -3,12 +3,20 @@
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi.responses import RedirectResponse
 
+from kodit.domain.enrichments.development.development import ENRICHMENT_TYPE_DEVELOPMENT
+from kodit.domain.enrichments.development.snippet.snippet import (
+    ENRICHMENT_SUBTYPE_SNIPPET,
+)
+from kodit.domain.entities.git import GitFile
 from kodit.infrastructure.api.middleware.auth import api_key_auth
 from kodit.infrastructure.api.v1.dependencies import (
     GitCommitRepositoryDep,
+    GitFileRepositoryDep,
     ServerFactoryDep,
 )
+from kodit.infrastructure.api.v1.query_params import PaginationParamsDep
 from kodit.infrastructure.api.v1.schemas.commit import (
     CommitAttributes,
     CommitData,
@@ -23,17 +31,18 @@ from kodit.infrastructure.api.v1.schemas.commit import (
     FileResponse,
 )
 from kodit.infrastructure.api.v1.schemas.enrichment import (
+    EnrichmentAssociationData,
     EnrichmentAttributes,
     EnrichmentData,
     EnrichmentListResponse,
+    EnrichmentRelationships,
 )
-from kodit.infrastructure.api.v1.schemas.snippet import (
-    EnrichmentSchema,
-    GitFileSchema,
-    SnippetAttributes,
-    SnippetContentSchema,
-    SnippetData,
-    SnippetListResponse,
+from kodit.infrastructure.sqlalchemy.query import (
+    EnrichmentAssociationQueryBuilder,
+    EnrichmentQueryBuilder,
+    FilterOperator,
+    GitFileQueryBuilder,
+    QueryBuilder,
 )
 
 router = APIRouter(
@@ -49,12 +58,19 @@ router = APIRouter(
 
 @router.get("/{repo_id}/commits", summary="List repository commits")
 async def list_repository_commits(
-    repo_id: str, git_commit_repository: GitCommitRepositoryDep
+    repo_id: str,
+    git_commit_repository: GitCommitRepositoryDep,
+    pagination_params: PaginationParamsDep,
 ) -> CommitListResponse:
     """List all commits for a repository."""
     try:
         # Get all commits for the repository directly from commit repository
-        commits = await git_commit_repository.get_by_repo_id(int(repo_id))
+        commits = await git_commit_repository.find(
+            QueryBuilder()
+            .filter("repo_id", FilterOperator.EQ, int(repo_id))
+            .paginate(pagination_params)
+            .sort("date", descending=True)
+        )
     except ValueError as e:
         raise HTTPException(status_code=404, detail="Repository not found") from e
 
@@ -89,7 +105,7 @@ async def get_repository_commit(
     """Get a specific commit for a repository."""
     try:
         # Get the specific commit directly from commit repository
-        commit = await git_commit_repository.get_by_sha(commit_sha)
+        commit = await git_commit_repository.get(commit_sha)
     except ValueError as e:
         raise HTTPException(status_code=404, detail="Commit not found") from e
 
@@ -112,19 +128,17 @@ async def get_repository_commit(
 async def list_commit_files(
     repo_id: str,  # noqa: ARG001
     commit_sha: str,
-    git_commit_repository: GitCommitRepositoryDep,
+    git_file_repository: GitFileRepositoryDep,
+    pagination: PaginationParamsDep,
 ) -> FileListResponse:
     """List all files in a specific commit."""
-    try:
-        # Get the specific commit directly from commit repository
-        commit = await git_commit_repository.get_by_sha(commit_sha)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail="Commit not found") from e
-
+    files = await git_file_repository.find(
+        GitFileQueryBuilder().for_commit_sha(commit_sha).paginate(pagination)
+    )
     return FileListResponse(
         data=[
             FileData(
-                type="file",
+                type=GitFile.__name__,
                 id=file.blob_sha,
                 attributes=FileAttributes(
                     blob_sha=file.blob_sha,
@@ -134,7 +148,7 @@ async def list_commit_files(
                     extension=file.extension,
                 ),
             )
-            for file in commit.files
+            for file in files
         ]
     )
 
@@ -148,20 +162,17 @@ async def get_commit_file(
     repo_id: str,  # noqa: ARG001
     commit_sha: str,
     blob_sha: str,
-    git_commit_repository: GitCommitRepositoryDep,
+    git_file_repository: GitFileRepositoryDep,
 ) -> FileResponse:
     """Get a specific file from a commit."""
-    try:
-        # Get the specific commit directly from commit repository
-        commit = await git_commit_repository.get_by_sha(commit_sha)
-    except ValueError as e:
-        raise HTTPException(status_code=404, detail="Commit not found") from e
-
-    # Find the specific file
-    file = next((f for f in commit.files if f.blob_sha == blob_sha), None)
-    if not file:
+    files = await git_file_repository.find(
+        GitFileQueryBuilder().for_commit_sha(commit_sha).for_blob_sha(blob_sha)
+    )
+    if not files:
         raise HTTPException(status_code=404, detail="File not found")
-
+    if len(files) > 1:
+        raise HTTPException(status_code=422, detail="Multiple files found")
+    file = files[0]
     return FileResponse(
         data=FileData(
             type="file",
@@ -185,45 +196,11 @@ async def get_commit_file(
 async def list_commit_snippets(
     repo_id: str,
     commit_sha: str,
-    server_factory: ServerFactoryDep,
-) -> SnippetListResponse:
+) -> RedirectResponse:
     """List all snippets in a specific commit."""
-    _ = repo_id  # Required by FastAPI route path but not used in function
-    snippet_repository = server_factory.snippet_v2_repository()
-    snippets = await snippet_repository.get_snippets_for_commit(commit_sha)
-
-    return SnippetListResponse(
-        data=[
-            SnippetData(
-                type="snippet",
-                id=snippet.sha,
-                attributes=SnippetAttributes(
-                    created_at=snippet.created_at,
-                    updated_at=snippet.updated_at,
-                    derives_from=[
-                        GitFileSchema(
-                            blob_sha=file.blob_sha,
-                            path=file.path,
-                            mime_type=file.mime_type,
-                            size=file.size,
-                        )
-                        for file in snippet.derives_from
-                    ],
-                    content=SnippetContentSchema(
-                        value=snippet.content,
-                        language=snippet.extension,
-                    ),
-                    enrichments=[
-                        EnrichmentSchema(
-                            type=enrichment.type.value,
-                            content=enrichment.content,
-                        )
-                        for enrichment in snippet.enrichments
-                    ],
-                ),
-            )
-            for snippet in snippets
-        ]
+    return RedirectResponse(
+        status_code=308,
+        url=f"/api/v1/repositories/{repo_id}/commits/{commit_sha}/enrichments?enrichment_type={ENRICHMENT_TYPE_DEVELOPMENT}&enrichment_subtype={ENRICHMENT_SUBTYPE_SNIPPET}",
     )
 
 
@@ -247,14 +224,12 @@ async def list_commit_embeddings(
 ) -> EmbeddingListResponse:
     """List all embeddings for snippets in a specific commit."""
     _ = repo_id  # Required by FastAPI route path but not used in function
-    snippet_repository = server_factory.snippet_v2_repository()
-    snippets = await snippet_repository.get_snippets_for_commit(commit_sha)
 
-    if not snippets:
-        return EmbeddingListResponse(data=[])
+    enrichment_query_service = server_factory.enrichment_query_service()
+    snippets = await enrichment_query_service.get_all_snippets_for_commit(commit_sha)
 
     # Get snippet SHAs
-    snippet_shas = [snippet.sha for snippet in snippets]
+    snippet_shas = [str(snippet.id) for snippet in snippets]
 
     # Get embeddings for all snippets in the commit
     embedding_repository = server_factory.embedding_repository()
@@ -285,15 +260,18 @@ async def list_commit_enrichments(
     repo_id: str,  # noqa: ARG001
     commit_sha: str,
     server_factory: ServerFactoryDep,
+    pagination_params: PaginationParamsDep,
+    enrichment_type: str | None = None,
 ) -> EnrichmentListResponse:
     """List all enrichments for a specific commit."""
     # TODO(Phil): Should use repo too, it's confusing to the user when they specify the
     # wrong commit and another repo. It's like they are seeing results from the other
     # repo.
-    enrichment_v2_repository = server_factory.enrichment_v2_repository()
-    enrichments = await enrichment_v2_repository.enrichments_for_entity_type(
-        entity_type="git_commit",
-        entity_ids=[commit_sha],
+    enrichment_query_service = server_factory.enrichment_query_service()
+    enrichments = await enrichment_query_service.all_enrichments_for_commit(
+        commit_sha=commit_sha,
+        pagination=pagination_params,
+        enrichment_type=enrichment_type,
     )
 
     return EnrichmentListResponse(
@@ -308,8 +286,17 @@ async def list_commit_enrichments(
                     created_at=enrichment.created_at,
                     updated_at=enrichment.updated_at,
                 ),
+                relationships=EnrichmentRelationships(
+                    associations=[
+                        EnrichmentAssociationData(
+                            id=association.entity_id,
+                            type=association.entity_type,
+                        )
+                        for association in associations
+                    ],
+                ),
             )
-            for enrichment in enrichments
+            for enrichment, associations in enrichments.items()
         ]
     )
 
@@ -327,9 +314,26 @@ async def delete_all_commit_enrichments(
 ) -> None:
     """Delete all enrichments for a specific commit."""
     enrichment_v2_repository = server_factory.enrichment_v2_repository()
-    await enrichment_v2_repository.bulk_delete_enrichments(
-        entity_type="git_commit",
-        entity_ids=[commit_sha],
+    enrichment_association_repository = (
+        server_factory.enrichment_association_repository()
+    )
+    associations = await enrichment_association_repository.find(
+        EnrichmentAssociationQueryBuilder().for_commit(commit_sha)
+    )
+    enrichments = await enrichment_v2_repository.find(
+        EnrichmentQueryBuilder().for_ids(
+            enrichment_ids=[association.enrichment_id for association in associations]
+        )
+    )
+    await enrichment_association_repository.delete_by_query(
+        EnrichmentAssociationQueryBuilder().for_enrichments(enrichments)
+    )
+    await enrichment_v2_repository.delete_by_query(
+        EnrichmentQueryBuilder().for_ids(
+            enrichment_ids=[
+                enrichment.id for enrichment in enrichments if enrichment.id
+            ]
+        )
     )
 
 
@@ -346,7 +350,9 @@ async def delete_commit_enrichment(
     server_factory: ServerFactoryDep,
 ) -> None:
     """Delete a specific enrichment for a commit."""
-    enrichment_v2_repository = server_factory.enrichment_v2_repository()
-    deleted = await enrichment_v2_repository.delete_enrichment(enrichment_id)
-    if not deleted:
-        raise HTTPException(status_code=404, detail="Enrichment not found")
+    try:
+        enrichment_v2_repository = server_factory.enrichment_v2_repository()
+        enrichment = await enrichment_v2_repository.get(enrichment_id)
+        await enrichment_v2_repository.delete(enrichment)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail="Enrichment not found") from e

kodit/infrastructure/api/v1/routers/repositories.py

@@ -1,6 +1,8 @@
 """Repository management router for the REST API."""
 
-from fastapi import APIRouter, Depends, HTTPException
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, HTTPException, Query
 
 from kodit.domain.tracking.trackable import Trackable, TrackableReferenceType
 from kodit.infrastructure.api.middleware.auth import api_key_auth
@@ -13,6 +15,7 @@ from kodit.infrastructure.api.v1.dependencies import (
     GitTagRepositoryDep,
     TaskStatusQueryServiceDep,
 )
+from kodit.infrastructure.api.v1.query_params import PaginationParamsDep
 from kodit.infrastructure.api.v1.schemas.enrichment import (
     EnrichmentAttributes,
     EnrichmentData,
@@ -38,6 +41,7 @@ from kodit.infrastructure.api.v1.schemas.task_status import (
     TaskStatusData,
     TaskStatusListResponse,
 )
+from kodit.infrastructure.sqlalchemy.query import FilterOperator, QueryBuilder
 
 router = APIRouter(
     prefix="/api/v1/repositories",
@@ -60,7 +64,7 @@ async def list_repositories(
     git_repository: GitRepositoryDep,
 ) -> RepositoryListResponse:
     """List all cloned repositories."""
-    repos = await git_repository.get_all()
+    repos = await git_repository.find(QueryBuilder())
     return RepositoryListResponse(
         data=[RepositoryData.from_git_repo(repo) for repo in repos]
     )
@@ -99,36 +103,47 @@ async def get_repository(
     git_branch_repository: GitBranchRepositoryDep,
 ) -> RepositoryDetailsResponse:
     """Get repository details including branches and recent commits."""
-    repo = await git_repository.get_by_id(int(repo_id))
+    repo = await git_repository.get(int(repo_id))
     if not repo:
         raise HTTPException(status_code=404, detail="Repository not found")
 
+    # Get branches for the repository using the branch repository
+    repo_branches = await git_branch_repository.find(
+        QueryBuilder().filter("repo_id", FilterOperator.EQ, int(repo_id))
+    )
+
     # Get all commits for this repository from the commit repository
-    repo_commits = await git_commit_repository.get_by_repo_id(int(repo_id))
+    repo_commits = await git_commit_repository.find(
+        QueryBuilder().filter("repo_id", FilterOperator.EQ, int(repo_id))
+    )
     commits_by_sha = {commit.commit_sha: commit for commit in repo_commits}
 
     # Get recent commits from the tracking branch's head commit
     recent_commits = []
-    if repo.tracking_branch and repo.tracking_branch.head_commit:
+    # Get the tracking branch from the branch repository
+    tracking_branch = next(
+        (b for b in repo_branches if b.name == repo.tracking_config.name), None
+    )
+    if tracking_branch and tracking_branch.head_commit_sha:
         # For simplicity, just show the head commit and traverse back if needed
-        current_commit = repo.tracking_branch.head_commit
-        recent_commits = [current_commit]
-
-        # Traverse parent commits for more recent commits (up to 10)
-        current_sha = current_commit.parent_commit_sha
-        while current_sha and len(recent_commits) < 10:
-            parent_commit = commits_by_sha.get(current_sha)
-            if parent_commit:
-                recent_commits.append(parent_commit)
-                current_sha = parent_commit.parent_commit_sha
-            else:
-                break
+        current_commit = commits_by_sha.get(tracking_branch.head_commit_sha)
+        if current_commit:
+            recent_commits = [current_commit]
+
+            # Traverse parent commits for more recent commits (up to 10)
+            current_sha = current_commit.parent_commit_sha
+            while current_sha and len(recent_commits) < 10:
+                parent_commit = commits_by_sha.get(current_sha)
+                if parent_commit:
+                    recent_commits.append(parent_commit)
+                    current_sha = parent_commit.parent_commit_sha
+                else:
+                    break
 
     # Get commit count for the repository using the commit repository
-    commit_count = await git_commit_repository.count_by_repo_id(int(repo_id))
-
-    # Get branches for the repository using the branch repository
-    repo_branches = await git_branch_repository.get_by_repo_id(int(repo_id))
+    commit_count = await git_commit_repository.count(
+        QueryBuilder().filter("repo_id", FilterOperator.EQ, int(repo_id))
+    )
 
     # Get commit counts for all branches using the commit repository
     branch_data = []
@@ -140,9 +155,7 @@ async def get_repository(
         branch_data.append(
             RepositoryBranchData(
                 name=branch.name,
-                is_default=branch.name == repo.tracking_branch.name
-                if repo.tracking_branch
-                else False,
+                is_default=branch.name == repo.tracking_config.name,
                 commit_count=branch_commit_count,
             )
         )
@@ -208,7 +221,7 @@ async def list_repository_tags(
     git_tag_repository: GitTagRepositoryDep,
 ) -> TagListResponse:
     """List all tags for a repository."""
-    repo = await git_repository.get_by_id(int(repo_id))
+    repo = await git_repository.get(int(repo_id))
     if not repo:
         raise HTTPException(status_code=404, detail="Repository not found")
 
@@ -222,7 +235,7 @@ async def list_repository_tags(
                 id=tag.id,
                 attributes=TagAttributes(
                     name=tag.name,
-                    target_commit_sha=tag.target_commit.commit_sha,
+                    target_commit_sha=tag.target_commit_sha,
                     is_version_tag=tag.is_version_tag,
                 ),
             )
@@ -243,7 +256,7 @@ async def get_repository_tag(
     git_tag_repository: GitTagRepositoryDep,
 ) -> TagResponse:
     """Get a specific tag for a repository."""
-    repo = await git_repository.get_by_id(int(repo_id))
+    repo = await git_repository.get(int(repo_id))
     if not repo:
         raise HTTPException(status_code=404, detail="Repository not found")
 
@@ -259,7 +272,7 @@ async def get_repository_tag(
             id=tag.id,
             attributes=TagAttributes(
                 name=tag.name,
-                target_commit_sha=tag.target_commit.commit_sha,
+                target_commit_sha=tag.target_commit_sha,
                 is_version_tag=tag.is_version_tag,
             ),
         )
@@ -275,10 +288,16 @@ async def list_repository_enrichments(  # noqa: PLR0913
     repo_id: str,
     git_repository: GitRepositoryDep,
     enrichment_query_service: EnrichmentQueryServiceDep,
+    pagination: PaginationParamsDep,
     ref_type: str = "branch",
     ref_name: str | None = None,
     enrichment_type: str | None = None,
-    limit: int = 10,
+    max_commits_to_check: Annotated[
+        int,
+        Query(
+            description="Number of recent commits to search for recent enriched commits"
+        ),
+    ] = 10,
 ) -> EnrichmentListResponse:
     """List the most recent enrichments for a repository.
 
@@ -289,7 +308,7 @@ async def list_repository_enrichments(  # noqa: PLR0913
     - limit: Maximum number of enrichments to return. Defaults to 10.
     """
     # Get repository
-    repo = await git_repository.get_by_id(int(repo_id))
+    repo = await git_repository.get(int(repo_id))
     if not repo:
         raise HTTPException(status_code=404, detail="Repository not found")
 
@@ -297,11 +316,7 @@ async def list_repository_enrichments(  # noqa: PLR0913
     if ref_name is None:
         if ref_type == "branch":
             # Default to tracking branch
-            if not repo.tracking_branch:
-                raise HTTPException(
-                    status_code=400, detail="No tracking branch configured"
-                )
-            ref_name = repo.tracking_branch.name
+            ref_name = repo.tracking_config.name
         else:
             raise HTTPException(
                 status_code=400,
@@ -326,7 +341,7 @@ async def list_repository_enrichments(  # noqa: PLR0913
     enriched_commit = await enrichment_query_service.find_latest_enriched_commit(
         trackable=trackable,
         enrichment_type=enrichment_type,
-        max_commits_to_check=limit * 10,  # Check more commits to find enriched ones
+        max_commits_to_check=max_commits_to_check,
     )
 
     # If no enriched commit found, return empty list
@@ -334,9 +349,10 @@ async def list_repository_enrichments(  # noqa: PLR0913
         return EnrichmentListResponse(data=[])
 
     # Get enrichments for the commit
-    enrichments = await enrichment_query_service.get_enrichments_for_commit(
+    enrichments = await enrichment_query_service.all_enrichments_for_commit(
         commit_sha=enriched_commit,
         enrichment_type=enrichment_type,
+        pagination=pagination,
     )
 
     # Map enrichments to API response format

kodit/infrastructure/api/v1/routers/search.py

@@ -78,7 +78,7 @@ async def search_snippets(
                     ),
                     enrichments=[
                         EnrichmentSchema(
-                            type=enrichment.type.value,
+                            type=enrichment.type,
                             content=enrichment.content,
                         )
                         for enrichment in result.snippet.enrichments

kodit/infrastructure/api/v1/schemas/enrichment.py

@@ -15,12 +15,26 @@ class EnrichmentAttributes(BaseModel):
     updated_at: datetime | None
 
 
+class EnrichmentAssociationData(BaseModel):
+    """Enrichment association data for JSON-API spec."""
+
+    id: str
+    type: str
+
+
+class EnrichmentRelationships(BaseModel):
+    """Enrichment relationships for JSON-API spec."""
+
+    associations: list[EnrichmentAssociationData] | None = None
+
+
 class EnrichmentData(BaseModel):
     """Enrichment data following JSON-API spec."""
 
     type: str = "enrichment"
     id: str
     attributes: EnrichmentAttributes
+    relationships: EnrichmentRelationships | None = None
 
 
 class EnrichmentListResponse(BaseModel):

kodit/infrastructure/api/v1/schemas/repository.py

@@ -30,7 +30,7 @@ class RepositoryAttributes(BaseModel):
             created_at=repo.created_at,
             updated_at=repo.updated_at,
             last_scanned_at=repo.last_scanned_at,
-            tracking_branch=repo.tracking_branch.name if repo.tracking_branch else None,
+            tracking_branch=repo.tracking_config.name,
             num_commits=repo.num_commits,
             num_branches=repo.num_branches,
             num_tags=repo.num_tags,

kodit/infrastructure/slicing/api_doc_extractor.py

@@ -39,7 +39,6 @@ class APIDocExtractor:
         self,
         files: list[GitFile],
         language: str,
-        commit_sha: str,
         include_private: bool = False,  # noqa: FBT001, FBT002
     ) -> list[APIDocEnrichment]:
         """Extract API documentation enrichments from files.
@@ -93,7 +92,6 @@ class APIDocExtractor:
         )
 
         enrichment = APIDocEnrichment(
-            entity_id=commit_sha,
             language=language,
             content=markdown_content,
         )