kodit 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

kodit/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.2'
-__version_tuple__ = version_tuple = (0, 1, 2)
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)

kodit/cli.py

@@ -104,7 +104,6 @@ async def list_indexes(session: AsyncSession) -> None:
         "ID",
         "Created At",
         "Updated At",
-        "Source URI",
         "Num Snippets",
     ]
     data = [
@@ -112,7 +111,6 @@ async def list_indexes(session: AsyncSession) -> None:
             index.id,
             index.created_at,
             index.updated_at,
-            index.source_uri,
             index.num_snippets,
         ]
         for index in indexes

kodit/database.py

@@ -2,8 +2,10 @@
 
 import asyncio
 from collections.abc import AsyncGenerator, Callable
+from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from functools import wraps
+from pathlib import Path
 from typing import Any, TypeVar
 
 from alembic import command
@@ -17,6 +19,7 @@ from sqlalchemy.ext.asyncio import (
 )
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+from kodit import alembic
 from kodit.config import DATA_DIR
 
 # Constants
@@ -52,6 +55,7 @@ class CommonMixin:
     )
 
 
+@asynccontextmanager
 async def get_session() -> AsyncGenerator[AsyncSession, None]:
     """Get a database session."""
     async with async_session_factory() as session:
@@ -82,6 +86,6 @@ def configure_database() -> None:
     """Configure the database by initializing it and running any pending migrations."""
     # Create Alembic configuration and run migrations
     alembic_cfg = Config()
-    alembic_cfg.set_main_option("script_location", "src/kodit/alembic")
+    alembic_cfg.set_main_option("script_location", str(Path(alembic.__file__).parent))
     alembic_cfg.set_main_option("sqlalchemy.url", DB_URL)
     command.upgrade(alembic_cfg, "head")

kodit/indexing/service.py

@@ -37,7 +37,6 @@ class IndexView(pydantic.BaseModel):
     id: int
     created_at: datetime
     updated_at: datetime | None = None
-    source_uri: str | None = None
     num_snippets: int | None = None
 
 

kodit/mcp.py

@@ -7,14 +7,21 @@ import structlog
 from mcp.server.fastmcp import FastMCP
 from pydantic import Field
 
+from kodit.database import get_session
+from kodit.retreival.repository import RetrievalRepository, RetrievalResult
+from kodit.retreival.service import RetrievalRequest, RetrievalService
+
 mcp = FastMCP("kodit MCP Server")
 
 
 @mcp.tool()
 async def retrieve_relevant_snippets(
-    search_query: Annotated[
+    user_intent: Annotated[
         str,
-        Field(description="Describe the user's intent in a few sentences."),
+        Field(
+            description="Think about what the user wants to achieve. Describe the "
+            "user's intent in one sentence."
+        ),
     ],
     related_file_paths: Annotated[
         list[Path],
@@ -30,6 +37,12 @@ async def retrieve_relevant_snippets(
             "user's intent."
         ),
     ],
+    keywords: Annotated[
+        list[str],
+        Field(
+            description="A list of keywords that are relevant to the desired outcome."
+        ),
+    ],
 ) -> str:
     """Retrieve relevant snippets from various sources.
 
@@ -42,10 +55,56 @@ async def retrieve_relevant_snippets(
     log = structlog.get_logger(__name__)
     log.debug(
         "Retrieving relevant snippets",
-        search_query=search_query,
+        user_intent=user_intent,
+        keywords=keywords,
         file_count=len(related_file_paths),
         file_paths=related_file_paths,
         file_contents=related_file_contents,
     )
 
-    return "Retrieved"
+    async with get_session() as session:
+        log.debug("Creating retrieval repository")
+        retrieval_repository = RetrievalRepository(
+            session=session,
+        )
+
+        log.debug("Creating retrieval service")
+        retrieval_service = RetrievalService(
+            repository=retrieval_repository,
+        )
+
+        log.debug("Fusing input")
+        input_query = input_fusion(
+            user_intent=user_intent,
+            related_file_paths=related_file_paths,
+            related_file_contents=related_file_contents,
+            keywords=keywords,
+        )
+        log.debug("Input", input_query=input_query)
+        retrieval_request = RetrievalRequest(
+            query=input_query,
+        )
+        log.debug("Retrieving snippets")
+        snippets = await retrieval_service.retrieve(request=retrieval_request)
+
+        log.debug("Fusing output")
+        output = output_fusion(snippets=snippets)
+
+        log.debug("Output", output=output)
+        return output
+
+
+def input_fusion(
+    user_intent: str,  # noqa: ARG001
+    related_file_paths: list[Path],  # noqa: ARG001
+    related_file_contents: list[str],  # noqa: ARG001
+    keywords: list[str],
+) -> str:
+    """Fuse the search query and related file contents into a single query."""
+    # Since this is a dummy implementation, we just return the first keyword
+    return keywords[0] if len(keywords) > 0 else ""
+
+
+def output_fusion(snippets: list[RetrievalResult]) -> str:
+    """Fuse the snippets into a single output."""
+    return "\n\n".join(f"{snippet.uri}\n{snippet.content}" for snippet in snippets)

{kodit-0.1.2.dist-info → kodit-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kodit
-Version: 0.1.2
+Version: 0.1.4
 Summary: Code indexing for better AI code generation
 Project-URL: Homepage, https://docs.helixml.tech/kodit/
 Project-URL: Documentation, https://docs.helixml.tech/kodit/

{kodit-0.1.2.dist-info → kodit-0.1.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 kodit/.gitignore,sha256=ztkjgRwL9Uud1OEi36hGQeDGk3OLK1NfDEO8YqGYy8o,11
 kodit/__init__.py,sha256=aEKHYninUq1yh6jaNfvJBYg-6fenpN132nJt1UU6Jxs,59
-kodit/_version.py,sha256=bSmADqydH8nBu-J4lG8UVuR7hnU_zcwhnSav2oQ0W0A,511
+kodit/_version.py,sha256=hcPkC9vIGgfrKK6ft7ysLT7iOCjpFmCBmyKLmXiaZ1g,511
 kodit/app.py,sha256=FBAeeOz2CICvVN_27iMq9wEF9y8d1IDl0WmkEnM_M_U,699
-kodit/cli.py,sha256=2hNz05I6vryhkGqwMXlg_GKVAzhMmS_v8H2Nl6oxBZ4,5696
+kodit/cli.py,sha256=C8fos0wkUH3AJAf_yVBDEYKAgqNfGbKQiVBCGRqZITQ,5644
 kodit/config.py,sha256=Wq9MlxOnOA3p9mgIzsq-s7N57_GFVIOMML-4GFINmqE,104
-kodit/database.py,sha256=QGfqcDVAhSed67-ubMZyjsNR4shh6DmMFCdKg6H54yc,2391
+kodit/database.py,sha256=4gkgf3d8ZBrW5ZXQ6yO16f3jFXSbqa6UiPBz1g_teJE,2521
 kodit/logging.py,sha256=dQr4YXVH8_B52V0wXbBrn_HvH4QpO-fsi0C3JPWzn0Y,5022
-kodit/mcp.py,sha256=Sg7Waes9Z7HYzdglspG92dGhTVtb1lEaEKW-vlaUCXg,1488
+kodit/mcp.py,sha256=Fi5e8r-6Ec3sHSe7jlIHpnUPsG0-t-Cw7_rwbKtcRAk,3521
 kodit/middleware.py,sha256=NHLrqq20ZtPTE9esX9HD3z7EKi56_QTFxBlkdq0JDzQ,2138
 kodit/sse.py,sha256=UgwXJUeFq5D5S9KYKVVg4m6P0-_QHnJOCRRQB8XNR-M,2259
 kodit/alembic/README,sha256=ISVtAOvqvKk_5ThM5ioJE-lMkvf9IbknFUFVU_vPma4,58
@@ -18,7 +18,7 @@ kodit/alembic/versions/__init__.py,sha256=9-lHzptItTzq_fomdIRBegQNm4Znx6pVjwD4Mi
 kodit/indexing/__init__.py,sha256=cPyi2Iej3G1JFWlWr7X80_UrsMaTu5W5rBwgif1B3xo,75
 kodit/indexing/models.py,sha256=sZIhGwvL4Dw0QTWFxrjfWctSLkAoDT6fv5DlGz8-Fr8,1258
 kodit/indexing/repository.py,sha256=GeRpgRNOZunEKtzkkqkJWlOaR8cpGMX4rI_puDdB8WY,4006
-kodit/indexing/service.py,sha256=COiOCNmZN0QKgazXB4dEpHnL1pi002td6n7PRo0d17I,4985
+kodit/indexing/service.py,sha256=jdQMOsm8kYTlNybxSs2xisRxZRQISlmRQDfLtoqkpjg,4951
 kodit/retreival/__init__.py,sha256=33PhJU-3gtsqYq6A1UkaLNKbev_Zee9Lq6dYC59-CsA,69
 kodit/retreival/repository.py,sha256=WJQiePfeuwnj8Vy6dqF4bhNhsWqH9VspjN2zlvYQWvY,2273
 kodit/retreival/service.py,sha256=Iy9IBLhohQmypeOs0hDEjgr1hsr0xtaiMqjIzykFWrY,727
@@ -26,8 +26,8 @@ kodit/sources/__init__.py,sha256=1NTZyPdjThVQpZO1Mp1ColVsS7sqYanOVLqnoqV9Ipo,83
 kodit/sources/models.py,sha256=xb42CaNDO1CUB8SIW-xXMrB6Ji8cFw-yeJ550xBEg9Q,2398
 kodit/sources/repository.py,sha256=mGJrHWH6Uo8YABdoojHFbzaf_jW-2ywJpAHIa1gnc3U,3401
 kodit/sources/service.py,sha256=khrz3UH6hNTYwXMFosGc46trcb8Sm0dTPwvptbgRgwM,6722
-kodit-0.1.2.dist-info/METADATA,sha256=6HY81RDuu6MXJkq_1sCrcVU2C5zsrElYMbnouji2npY,2019
-kodit-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kodit-0.1.2.dist-info/entry_points.txt,sha256=hoTn-1aKyTItjnY91fnO-rV5uaWQLQ-Vi7V5et2IbHY,40
-kodit-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-kodit-0.1.2.dist-info/RECORD,,
+kodit-0.1.4.dist-info/METADATA,sha256=QOoPAs68hrp4m_RYvCamYIrznlMIl79faJeq2Rzn-zw,2019
+kodit-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kodit-0.1.4.dist-info/entry_points.txt,sha256=hoTn-1aKyTItjnY91fnO-rV5uaWQLQ-Vi7V5et2IbHY,40
+kodit-0.1.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+kodit-0.1.4.dist-info/RECORD,,