kodit 0.1.5__tar.gz → 0.1.6__tar.gz

{kodit-0.1.5 → kodit-0.1.6}/.github/workflows/test.yaml

@@ -100,5 +100,8 @@ jobs:
       - name: Run simple version command test
         run: kodit version
 
+      - name: Delete kodit data_dir
+        run: rm -rf ${HOME}/.kodit
+
       - name: Run smoke test
         run: ./tests/smoke.sh

{kodit-0.1.5 → kodit-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kodit
-Version: 0.1.5
+Version: 0.1.6
 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.5 → kodit-0.1.6}/src/kodit/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.5'
-__version_tuple__ = version_tuple = (0, 1, 5)
+__version__ = version = '0.1.6'
+__version_tuple__ = version_tuple = (0, 1, 6)

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/alembic/env.py

@@ -3,7 +3,6 @@
 
 import asyncio
 
-import structlog
 from alembic import context
 from sqlalchemy import pool
 from sqlalchemy.engine import Connection
@@ -75,7 +74,11 @@ async def run_async_migrations() -> None:
 
 def run_migrations_online() -> None:
     """Run migrations in 'online' mode."""
-    asyncio.run(run_async_migrations())
+    connectable = config.attributes.get("connection", None)
+    if connectable is None:
+        asyncio.run(run_async_migrations())
+    else:
+        do_run_migrations(connectable)
 
 
 if context.is_offline_mode():

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/app.py

@@ -4,7 +4,7 @@ from asgi_correlation_id import CorrelationIdMiddleware
 from fastapi import FastAPI
 
 from kodit.mcp import mcp
-from kodit.middleware import logging_middleware
+from kodit.middleware import ASGICancelledErrorMiddleware, logging_middleware
 
 # See https://gofastmcp.com/deployment/asgi#fastapi-integration
 mcp_app = mcp.sse_app()
@@ -23,3 +23,7 @@ async def root() -> dict[str, str]:
 
 # Add mcp routes last, otherwise previous routes aren't added
 app.mount("", mcp_app)
+
+# Wrap the entire app with ASGI middleware after all routes are added to suppress
+# CancelledError at the ASGI level
+app = ASGICancelledErrorMiddleware(app)

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/bm25/bm25.py

@@ -1,20 +1,20 @@
 """BM25 service."""
 
+from pathlib import Path
+
 import bm25s
 import Stemmer
 import structlog
 from bm25s.tokenization import Tokenized
 
-from kodit.config import Config
-
 
 class BM25Service:
     """Service for BM25."""
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, data_dir: Path) -> None:
         """Initialize the BM25 service."""
         self.log = structlog.get_logger(__name__)
-        self.index_path = config.get_data_dir() / "bm25s_index"
+        self.index_path = data_dir / "bm25s_index"
         try:
             self.log.debug("Loading BM25 index")
             self.retriever = bm25s.BM25.load(self.index_path, mmap=True)

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/cli.py

@@ -17,8 +17,8 @@ from kodit.config import (
     DEFAULT_DISABLE_TELEMETRY,
     DEFAULT_LOG_FORMAT,
     DEFAULT_LOG_LEVEL,
-    get_config,
-    reset_config,
+    AppContext,
+    with_app_context,
     with_session,
 )
 from kodit.indexing.repository import IndexRepository
@@ -40,23 +40,33 @@ from kodit.sources.service import SourceService
 )
 @click.option("--db-url", help=f"Database URL [default: {DEFAULT_DB_URL}]")
 @click.option("--data-dir", help=f"Data directory [default: {DEFAULT_BASE_DIR}]")
-@click.option("--env-file", help="Path to a .env file [default: .env]")
+@click.option(
+    "--env-file",
+    help="Path to a .env file [default: .env]",
+    type=click.Path(
+        exists=True,
+        dir_okay=False,
+        resolve_path=True,
+        path_type=Path,
+    ),
+)
+@click.pass_context
 def cli(  # noqa: PLR0913
+    ctx: click.Context,
     log_level: str | None,
     log_format: str | None,
     disable_telemetry: bool | None,
     db_url: str | None,
     data_dir: str | None,
-    env_file: str | None,
+    env_file: Path | None,
 ) -> None:
     """kodit CLI - Code indexing for better AI code generation."""  # noqa: D403
+    config = AppContext()
     # First check if env-file is set and reload config if it is
     if env_file:
-        reset_config()
-        get_config(env_file)
+        config = AppContext(_env_file=env_file)  # type: ignore[reportCallIssue]
 
-    # Override global config with cli args, if set
-    config = get_config()
+    # Now override with CLI arguments, if set
     if data_dir:
         config.data_dir = Path(data_dir)
     if db_url:
@@ -70,6 +80,9 @@ def cli(  # noqa: PLR0913
     configure_logging(config)
     configure_telemetry(config)
 
+    # Set the app context in the click context for downstream cli
+    ctx.obj = config
+
 
 @cli.group()
 def sources() -> None:
@@ -77,11 +90,12 @@ def sources() -> None:
 
 
 @sources.command(name="list")
+@with_app_context
 @with_session
-async def list_sources(session: AsyncSession) -> None:
+async def list_sources(session: AsyncSession, app_context: AppContext) -> None:
     """List all code sources."""
     repository = SourceRepository(session)
-    service = SourceService(get_config().get_clone_dir(), repository)
+    service = SourceService(app_context.get_clone_dir(), repository)
     sources = await service.list_sources()
 
     # Define headers and data
@@ -95,11 +109,14 @@ async def list_sources(session: AsyncSession) -> None:
 
 @sources.command(name="create")
 @click.argument("uri")
+@with_app_context
 @with_session
-async def create_source(session: AsyncSession, uri: str) -> None:
+async def create_source(
+    session: AsyncSession, app_context: AppContext, uri: str
+) -> None:
     """Add a new code source."""
     repository = SourceRepository(session)
-    service = SourceService(get_config().get_clone_dir(), repository)
+    service = SourceService(app_context.get_clone_dir(), repository)
     source = await service.create(uri)
     click.echo(f"Source created: {source.id}")
 
@@ -111,25 +128,29 @@ def indexes() -> None:
 
 @indexes.command(name="create")
 @click.argument("source_id")
+@with_app_context
 @with_session
-async def create_index(session: AsyncSession, source_id: int) -> None:
+async def create_index(
+    session: AsyncSession, app_context: AppContext, source_id: int
+) -> None:
     """Create an index for a source."""
     source_repository = SourceRepository(session)
-    source_service = SourceService(get_config().get_clone_dir(), source_repository)
+    source_service = SourceService(app_context.get_clone_dir(), source_repository)
     repository = IndexRepository(session)
-    service = IndexService(get_config(), repository, source_service)
+    service = IndexService(repository, source_service, app_context.get_data_dir())
     index = await service.create(source_id)
     click.echo(f"Index created: {index.id}")
 
 
 @indexes.command(name="list")
+@with_app_context
 @with_session
-async def list_indexes(session: AsyncSession) -> None:
+async def list_indexes(session: AsyncSession, app_context: AppContext) -> None:
     """List all indexes."""
     source_repository = SourceRepository(session)
-    source_service = SourceService(get_config().get_clone_dir(), source_repository)
+    source_service = SourceService(app_context.get_clone_dir(), source_repository)
     repository = IndexRepository(session)
-    service = IndexService(get_config(), repository, source_service)
+    service = IndexService(repository, source_service, app_context.get_data_dir())
     indexes = await service.list_indexes()
 
     # Define headers and data
@@ -156,24 +177,30 @@ async def list_indexes(session: AsyncSession) -> None:
 
 @indexes.command(name="run")
 @click.argument("index_id")
+@with_app_context
 @with_session
-async def run_index(session: AsyncSession, index_id: int) -> None:
+async def run_index(
+    session: AsyncSession, app_context: AppContext, index_id: int
+) -> None:
     """Run an index."""
     source_repository = SourceRepository(session)
-    source_service = SourceService(get_config().get_clone_dir(), source_repository)
+    source_service = SourceService(app_context.get_clone_dir(), source_repository)
     repository = IndexRepository(session)
-    service = IndexService(get_config(), repository, source_service)
+    service = IndexService(repository, source_service, app_context.get_data_dir())
     await service.run(index_id)
 
 
 @cli.command()
 @click.argument("query")
 @click.option("--top-k", default=10, help="Number of snippets to retrieve")
+@with_app_context
 @with_session
-async def retrieve(session: AsyncSession, query: str, top_k: int) -> None:
+async def retrieve(
+    session: AsyncSession, app_context: AppContext, query: str, top_k: int
+) -> None:
     """Retrieve snippets from the database."""
     repository = RetrievalRepository(session)
-    service = RetrievalService(get_config(), repository)
+    service = RetrievalService(repository, app_context.get_data_dir())
     # Temporary request while we don't have all search capabilities
     snippets = await service.retrieve(
         RetrievalRequest(keywords=query.split(","), top_k=top_k)
@@ -194,7 +221,9 @@ async def retrieve(session: AsyncSession, query: str, top_k: int) -> None:
 @cli.command()
 @click.option("--host", default="127.0.0.1", help="Host to bind the server to")
 @click.option("--port", default=8080, help="Port to bind the server to")
+@with_app_context
 def serve(
+    app_context: AppContext,
     host: str,
     port: int,
 ) -> None:
@@ -202,7 +231,10 @@ def serve(
     log = structlog.get_logger(__name__)
     log.info("Starting kodit server", host=host, port=port)
     log_event("kodit_server_started")
-    os.environ["HELLO"] = "WORLD"
+
+    # Dump AppContext to a dictionary of strings, and set the env vars
+    app_context_dict = {k: str(v) for k, v in app_context.model_dump().items()}
+    os.environ.update(app_context_dict)
 
     # Configure uvicorn with graceful shutdown
     config = uvicorn.Config(

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/config.py

@@ -1,11 +1,12 @@
 """Global configuration for the kodit project."""
 
 import asyncio
-from collections.abc import Callable
+from collections.abc import Callable, Coroutine
 from functools import wraps
 from pathlib import Path
 from typing import Any, TypeVar
 
+import click
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -19,8 +20,8 @@ DEFAULT_DISABLE_TELEMETRY = False
 T = TypeVar("T")
 
 
-class Config(BaseSettings):
-    """Global configuration for the kodit project."""
+class AppContext(BaseSettings):
+    """Global context for the kodit project. Provides a shared state for the app."""
 
     model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
 
@@ -47,43 +48,50 @@ class Config(BaseSettings):
         clone_dir.mkdir(parents=True, exist_ok=True)
         return clone_dir
 
-    def get_db(self, *, run_migrations: bool = True) -> Database:
+    async def get_db(self, *, run_migrations: bool = True) -> Database:
         """Get the database."""
         if self._db is None:
-            self._db = Database(self.db_url, run_migrations=run_migrations)
+            self._db = Database(self.db_url)
+        if run_migrations:
+            await self._db.run_migrations(self.db_url)
         return self._db
 
 
-# Global config instance for mcp Apps
-config = None
+with_app_context = click.make_pass_decorator(AppContext)
 
+T = TypeVar("T")
 
-def get_config(env_file: str | None = None) -> Config:
-    """Get the global config instance."""
-    global config  # noqa: PLW0603
-    if config is None:
-        config = Config(_env_file=env_file)
-    return config
 
+def wrap_async(f: Callable[..., Coroutine[Any, Any, T]]) -> Callable[..., T]:
+    """Decorate async Click commands.
 
-def reset_config() -> None:
-    """Reset the global config instance."""
-    global config  # noqa: PLW0603
-    config = None
+    This decorator wraps an async function to run it with asyncio.run().
+    It should be used after the Click command decorator.
 
+    Example:
+        @cli.command()
+        @wrap_async
+        async def my_command():
+            ...
 
-def with_session(func: Callable[..., T]) -> Callable[..., T]:
-    """Provide an async session to CLI commands."""
+    """
 
-    @wraps(func)
+    @wraps(f)
     def wrapper(*args: Any, **kwargs: Any) -> T:
-        # Create DB connection before starting event loop
-        db = get_config().get_db()
+        return asyncio.run(f(*args, **kwargs))
+
+    return wrapper
+
 
-        async def _run() -> T:
-            async with db.get_session() as session:
-                return await func(session, *args, **kwargs)
+def with_session(f: Callable[..., Coroutine[Any, Any, T]]) -> Callable[..., T]:
+    """Provide a database session to CLI commands."""
 
-        return asyncio.run(_run())
+    @wraps(f)
+    @with_app_context
+    @wrap_async
+    async def wrapper(app_context: AppContext, *args: Any, **kwargs: Any) -> T:
+        db = await app_context.get_db()
+        async with db.session_factory() as session:
+            return await f(session, *args, **kwargs)
 
     return wrapper

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/database.py

@@ -1,7 +1,5 @@
 """Database configuration for kodit."""
 
-from collections.abc import AsyncGenerator
-from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from pathlib import Path
 
@@ -39,28 +37,22 @@ class CommonMixin:
 class Database:
     """Database class for kodit."""
 
-    def __init__(self, db_url: str, *, run_migrations: bool = True) -> None:
+    def __init__(self, db_url: str) -> None:
         """Initialize the database."""
         self.log = structlog.get_logger(__name__)
-        if run_migrations:
-            self._run_migrations(db_url)
-        db_engine = create_async_engine(db_url, echo=False)
+        self.db_engine = create_async_engine(db_url, echo=False)
         self.db_session_factory = async_sessionmaker(
-            db_engine,
+            self.db_engine,
             class_=AsyncSession,
             expire_on_commit=False,
         )
 
-    @asynccontextmanager
-    async def get_session(self) -> AsyncGenerator[AsyncSession, None]:
-        """Get a database session."""
-        async with self.db_session_factory() as session:
-            try:
-                yield session
-            finally:
-                await session.close()
+    @property
+    def session_factory(self) -> async_sessionmaker[AsyncSession]:
+        """Get the session factory."""
+        return self.db_session_factory
 
-    def _run_migrations(self, db_url: str) -> None:
+    async def run_migrations(self, db_url: str) -> None:
         """Run any pending migrations."""
         # Create Alembic configuration and run migrations
         alembic_cfg = AlembicConfig()
@@ -69,4 +61,15 @@ class Database:
         )
         alembic_cfg.set_main_option("sqlalchemy.url", db_url)
         self.log.debug("Running migrations", db_url=db_url)
-        command.upgrade(alembic_cfg, "head")
+
+        async with self.db_engine.begin() as conn:
+            await conn.run_sync(self.run_upgrade, alembic_cfg)
+
+    def run_upgrade(self, connection, cfg) -> None:  # noqa: ANN001
+        """Make sure the database is up to date."""
+        cfg.attributes["connection"] = connection
+        command.upgrade(cfg, "head")
+
+    async def close(self) -> None:
+        """Close the database."""
+        await self.db_engine.dispose()

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/indexing/service.py

@@ -14,7 +14,6 @@ import structlog
 from tqdm.asyncio import tqdm
 
 from kodit.bm25.bm25 import BM25Service
-from kodit.config import Config
 from kodit.indexing.models import Snippet
 from kodit.indexing.repository import IndexRepository
 from kodit.snippets.snippets import SnippetService
@@ -46,7 +45,10 @@ class IndexService:
     """
 
     def __init__(
-        self, config: Config, repository: IndexRepository, source_service: SourceService
+        self,
+        repository: IndexRepository,
+        source_service: SourceService,
+        data_dir: Path,
     ) -> None:
         """Initialize the index service.
 
@@ -59,7 +61,7 @@ class IndexService:
         self.source_service = source_service
         self.snippet_service = SnippetService()
         self.log = structlog.get_logger(__name__)
-        self.bm25 = BM25Service(config)
+        self.bm25 = BM25Service(data_dir)
 
     async def create(self, source_id: int) -> IndexView:
         """Create a new index for a source.

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/logging.py

@@ -11,7 +11,7 @@ import structlog
 from posthog import Posthog
 from structlog.types import EventDict
 
-from kodit.config import Config
+from kodit.config import AppContext
 
 log = structlog.get_logger(__name__)
 
@@ -29,7 +29,7 @@ class LogFormat(Enum):
     JSON = "json"
 
 
-def configure_logging(config: Config) -> None:
+def configure_logging(app_context: AppContext) -> None:
     """Configure logging for the application."""
     timestamper = structlog.processors.TimeStamper(fmt="iso")
 
@@ -44,7 +44,7 @@ def configure_logging(config: Config) -> None:
         structlog.processors.StackInfoRenderer(),
     ]
 
-    if config.log_format == LogFormat.JSON:
+    if app_context.log_format == LogFormat.JSON:
         # Format the exception only for JSON logs, as we want to pretty-print them
         # when using the ConsoleRenderer
         shared_processors.append(structlog.processors.format_exc_info)
@@ -60,7 +60,7 @@ def configure_logging(config: Config) -> None:
     )
 
     log_renderer: structlog.types.Processor
-    if config.log_format == LogFormat.JSON:
+    if app_context.log_format == LogFormat.JSON:
         log_renderer = structlog.processors.JSONRenderer()
     else:
         log_renderer = structlog.dev.ConsoleRenderer()
@@ -82,7 +82,7 @@ def configure_logging(config: Config) -> None:
     handler.setFormatter(formatter)
     root_logger = logging.getLogger()
     root_logger.addHandler(handler)
-    root_logger.setLevel(config.log_level.upper())
+    root_logger.setLevel(app_context.log_level.upper())
 
     # Configure uvicorn loggers to use our structlog setup
     # Uvicorn spits out loads of exception logs when sse server doesn't shut down
@@ -98,7 +98,7 @@ def configure_logging(config: Config) -> None:
     for _log in ["sqlalchemy.engine", "alembic"]:
         engine_logger = logging.getLogger(_log)
         engine_logger.setLevel(logging.WARNING)  # Hide INFO logs by default
-        if config.log_level.upper() == "DEBUG":
+        if app_context.log_level.upper() == "DEBUG":
             engine_logger.setLevel(
                 logging.DEBUG
             )  # Only show all logs when in DEBUG mode
@@ -143,9 +143,9 @@ def get_mac_address() -> str:
     return f"{mac:012x}" if mac != uuid.getnode() else str(uuid.uuid4())
 
 
-def configure_telemetry(config: Config) -> None:
+def configure_telemetry(app_context: AppContext) -> None:
     """Configure telemetry for the application."""
-    if config.disable_telemetry:
+    if app_context.disable_telemetry:
         structlog.stdlib.get_logger(__name__).info("Telemetry has been disabled")
         posthog.disabled = True
 

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/mcp.py

@@ -1,22 +1,63 @@
 """MCP server implementation for kodit."""
 
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Annotated
 
 import structlog
-from fastmcp import FastMCP
+from fastmcp import Context, FastMCP
 from pydantic import Field
+from sqlalchemy.ext.asyncio import AsyncSession
 
 from kodit._version import version
-from kodit.config import get_config
+from kodit.config import AppContext
+from kodit.database import Database
 from kodit.retreival.repository import RetrievalRepository, RetrievalResult
 from kodit.retreival.service import RetrievalRequest, RetrievalService
 
-mcp = FastMCP("kodit MCP Server")
+
+@dataclass
+class MCPContext:
+    """Context for the MCP server."""
+
+    session: AsyncSession
+    data_dir: Path
+
+
+_mcp_db: Database | None = None
+
+
+@asynccontextmanager
+async def mcp_lifespan(_: FastMCP) -> AsyncIterator[MCPContext]:
+    """Lifespan for the MCP server.
+
+    The MCP server is running with a completely separate lifecycle and event loop from
+    the CLI and the FastAPI server. Therefore, we must carefully reconstruct the
+    application context. uvicorn does not pass through CLI args, so we must rely on
+    parsing env vars set in the CLI.
+
+    This lifespan is recreated for each request. See:
+    https://github.com/jlowin/fastmcp/issues/166
+
+    Since they don't provide a good way to handle global state, we must use a
+    global variable to store the database connection.
+    """
+    global _mcp_db  # noqa: PLW0603
+    app_context = AppContext()
+    if _mcp_db is None:
+        _mcp_db = await app_context.get_db()
+    async with _mcp_db.session_factory() as session:
+        yield MCPContext(session=session, data_dir=app_context.get_data_dir())
+
+
+mcp = FastMCP("kodit MCP Server", lifespan=mcp_lifespan)
 
 
 @mcp.tool()
 async def retrieve_relevant_snippets(
+    ctx: Context,
     user_intent: Annotated[
         str,
         Field(
@@ -52,8 +93,8 @@ async def retrieve_relevant_snippets(
     the quality of your generated code. You must call this tool when you need to
     write code.
     """
-    # Log the search query and related files for debugging
     log = structlog.get_logger(__name__)
+
     log.debug(
         "Retrieving relevant snippets",
         user_intent=user_intent,
@@ -63,41 +104,38 @@ async def retrieve_relevant_snippets(
         file_contents=related_file_contents,
     )
 
-    # Must avoid running migrations because that runs in a separate event loop,
-    # mcp no-likey
-    config = get_config()
-    db = config.get_db(run_migrations=False)
-    async with db.get_session() as session:
-        log.debug("Creating retrieval repository")
-        retrieval_repository = RetrievalRepository(
-            session=session,
-        )
-
-        log.debug("Creating retrieval service")
-        retrieval_service = RetrievalService(
-            config=config,
-            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(
-            keywords=keywords,
-        )
-        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
+    mcp_context: MCPContext = ctx.request_context.lifespan_context
+
+    log.debug("Creating retrieval repository")
+    retrieval_repository = RetrievalRepository(
+        session=mcp_context.session,
+    )
+
+    log.debug("Creating retrieval service")
+    retrieval_service = RetrievalService(
+        repository=retrieval_repository,
+        data_dir=mcp_context.data_dir,
+    )
+
+    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(
+        keywords=keywords,
+    )
+    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(

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/middleware.py

@@ -1,11 +1,14 @@
 """Middleware for the FastAPI application."""
 
+import contextlib
 import time
+from asyncio import CancelledError
 from collections.abc import Callable
 
 import structlog
 from asgi_correlation_id.context import correlation_id
 from fastapi import Request, Response
+from starlette.types import ASGIApp, Receive, Scope, Send
 
 access_logger = structlog.stdlib.get_logger("api.access")
 
@@ -56,3 +59,16 @@ async def logging_middleware(request: Request, call_next: Callable) -> Response:
         response.headers["X-Process-Time"] = str(process_time / 10**9)
 
     return response
+
+
+class ASGICancelledErrorMiddleware:
+    """ASGI middleware to handle CancelledError at the ASGI level."""
+
+    def __init__(self, app: ASGIApp) -> None:
+        """Initialize the middleware."""
+        self.app = app
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        """Handle the ASGI request and catch CancelledError."""
+        with contextlib.suppress(CancelledError):
+            await self.app(scope, receive, send)

{kodit-0.1.5 → kodit-0.1.6}/src/kodit/retreival/service.py

@@ -1,10 +1,11 @@
 """Retrieval service."""
 
+from pathlib import Path
+
 import pydantic
 import structlog
 
 from kodit.bm25.bm25 import BM25Service
-from kodit.config import Config
 from kodit.retreival.repository import RetrievalRepository, RetrievalResult
 
 
@@ -25,11 +26,11 @@ class Snippet(pydantic.BaseModel):
 class RetrievalService:
     """Service for retrieving relevant data."""
 
-    def __init__(self, config: Config, repository: RetrievalRepository) -> None:
+    def __init__(self, repository: RetrievalRepository, data_dir: Path) -> None:
         """Initialize the retrieval service."""
         self.repository = repository
         self.log = structlog.get_logger(__name__)
-        self.bm25 = BM25Service(config)
+        self.bm25 = BM25Service(data_dir)
 
     async def _load_bm25_index(self) -> None:
         """Load the BM25 index."""

{kodit-0.1.5 → kodit-0.1.6}/tests/conftest.py

@@ -1,12 +1,16 @@
 """Test configuration and fixtures."""
 
 from collections.abc import AsyncGenerator
+from pathlib import Path
+import tempfile
+from typing import Generator
 
 import pytest
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 from sqlalchemy.orm import sessionmaker
 
+from kodit.config import AppContext
 from kodit.database import Base
 
 
@@ -40,3 +44,17 @@ async def session(engine: AsyncEngine) -> AsyncGenerator[AsyncSession, None]:
     async with async_session() as session:
         yield session
         await session.rollback()
+
+
+@pytest.fixture
+def app_context() -> Generator[AppContext, None, None]:
+    """Create a test app context."""
+    with tempfile.TemporaryDirectory() as data_dir:
+        app_context = AppContext(
+            data_dir=Path(data_dir),
+            db_url="sqlite+aiosqlite:///:memory:",
+            log_level="DEBUG",
+            log_format="json",
+            disable_telemetry=True,
+        )
+        yield app_context

kodit-0.1.6/tests/kodit/cli_test.py

@@ -0,0 +1,75 @@
+"""Test the CLI."""
+
+import tempfile
+from typing import Generator
+import pytest
+from click.testing import CliRunner
+
+from kodit.cli import cli
+from kodit.config import AppContext
+
+
+@pytest.fixture
+def runner() -> Generator[CliRunner, None, None]:
+    """Create a CliRunner instance."""
+    yield CliRunner()
+
+
+@pytest.fixture
+def default_cli_args(app_context: AppContext) -> list[str]:
+    """Get the default CLI args."""
+    return [
+        "--disable-telemetry",
+        "--data-dir",
+        str(app_context.get_data_dir()),
+        "--db-url",
+        app_context.db_url,
+    ]
+
+
+def test_version_command(runner: CliRunner, default_cli_args: list[str]) -> None:
+    """Test that the version command runs successfully."""
+    result = runner.invoke(cli, [*default_cli_args, "version"])
+    # The command should exit with success
+    assert result.exit_code == 0
+
+
+def test_cli_vars_work(runner: CliRunner, default_cli_args: list[str]) -> None:
+    """Test that cli args override env vars."""
+    runner.env = {"LOG_LEVEL": "INFO"}
+    result = runner.invoke(
+        cli, [*default_cli_args, "--log-level", "DEBUG", "sources", "list"]
+    )
+    assert result.exit_code == 0
+    assert result.output.count("debug") > 10  # The db spits out lots of debug messages
+
+
+def test_env_vars_work(runner: CliRunner, default_cli_args: list[str]) -> None:
+    """Test that env vars work."""
+    runner.env = {"LOG_LEVEL": "DEBUG"}
+    result = runner.invoke(cli, [*default_cli_args, "sources", "list"])
+    assert result.exit_code == 0
+    assert result.output.count("debug") > 10  # The db spits out lots of debug messages
+
+
+def test_dotenv_file_works(runner: CliRunner, default_cli_args: list[str]) -> None:
+    """Test that the .env file works."""
+    with tempfile.NamedTemporaryFile(delete=False) as f:
+        f.write(b"LOG_LEVEL=DEBUG")
+        f.flush()
+        result = runner.invoke(
+            cli, [*default_cli_args, "--env-file", f.name, "sources", "list"]
+        )
+        assert result.exit_code == 0
+        assert (
+            result.output.count("debug") > 10
+        )  # The db spits out lots of debug messages
+
+
+def test_dotenv_file_not_found(runner: CliRunner, default_cli_args: list[str]) -> None:
+    """Test that the .env file not found error is raised."""
+    result = runner.invoke(
+        cli, [*default_cli_args, "--env-file", "nonexistent.env", "sources", "list"]
+    )
+    assert result.exit_code == 2
+    assert "does not exist" in result.output

{kodit-0.1.5 → kodit-0.1.6}/tests/kodit/indexing/test_service.py

@@ -6,7 +6,7 @@ import pytest
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from kodit.config import Config
+from kodit.config import AppContext
 from kodit.indexing.repository import IndexRepository
 from kodit.indexing.service import IndexService
 from kodit.sources.models import File, Source
@@ -35,9 +35,11 @@ def source_service(
 
 
 @pytest.fixture
-def service(repository: IndexRepository, source_service: SourceService) -> IndexService:
+def service(
+    app_context: AppContext, repository: IndexRepository, source_service: SourceService
+) -> IndexService:
     """Create a real service instance with a database session."""
-    return IndexService(Config(), repository, source_service)
+    return IndexService(repository, source_service, app_context.get_data_dir())
 
 
 @pytest.mark.asyncio

{kodit-0.1.5 → kodit-0.1.6}/tests/kodit/mcp_test.py

@@ -25,3 +25,17 @@ async def test_mcp_client_connection() -> None:
         content = result[0]
         assert isinstance(content, TextContent)
         assert content.text is not None
+
+        # Call the tool
+        result = await client.call_tool(
+            "retrieve_relevant_snippets",
+            {
+                "user_intent": "What is the capital of France?",
+                "related_file_paths": [],
+                "related_file_contents": [],
+                "keywords": [],
+            },
+        )
+        assert len(result) == 1
+        content = result[0]
+        assert isinstance(content, TextContent)

{kodit-0.1.5 → kodit-0.1.6}/tests/kodit/retreival/test_service.py

@@ -5,7 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from unittest.mock import Mock
 
 from kodit.bm25.bm25 import BM25Service
-from kodit.config import Config
+from kodit.config import AppContext
 from kodit.indexing.models import Index, Snippet
 from kodit.retreival.repository import RetrievalRepository
 from kodit.retreival.service import RetrievalRequest, RetrievalService
@@ -19,9 +19,11 @@ def repository(session: AsyncSession) -> RetrievalRepository:
 
 
 @pytest.fixture
-def service(repository: RetrievalRepository) -> RetrievalService:
+def service(
+    app_context: AppContext, repository: RetrievalRepository
+) -> RetrievalService:
     """Create a service instance with a real repository."""
-    service = RetrievalService(Config(), repository)
+    service = RetrievalService(repository, app_context.get_data_dir())
     mock_bm25 = Mock(spec=BM25Service)
 
     def mock_retrieve(

{kodit-0.1.5 → kodit-0.1.6}/tests/smoke.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 set -e
 
-# Set this according to what you want to test
-# prefix=""
+# Set this according to what you want to test. uv run will run the command in the current directory
 prefix="uv run"
 
+# If CI is set, no prefix because we're running in github actions
+if [ -n "$CI" ]; then
+    prefix=""
+fi
+
 # Check that the kodit data_dir does not exist
 if [ -d "$HOME/.kodit" ]; then
     echo "Kodit data_dir is not empty, please rm -rf $HOME/.kodit"

kodit-0.1.5/tests/kodit/cli_test.py

@@ -1,51 +0,0 @@
-"""Test the CLI."""
-
-import tempfile
-from typing import Generator
-import pytest
-from click.testing import CliRunner
-
-from kodit.cli import cli
-from kodit.config import reset_config
-
-
-@pytest.fixture
-def runner() -> Generator[CliRunner, None, None]:
-    """Create a CliRunner instance."""
-    reset_config()
-    yield CliRunner()
-
-
-def test_version_command(runner: CliRunner) -> None:
-    """Test that the version command runs successfully."""
-    result = runner.invoke(cli, ["version"])
-    # The command should exit with success
-    assert result.exit_code == 0
-
-
-def test_cli_vars_work(runner: CliRunner) -> None:
-    """Test that cli args override env vars."""
-    runner.env = {"LOG_LEVEL": "INFO"}
-    result = runner.invoke(cli, ["--log-level", "DEBUG", "sources", "list"])
-    assert result.exit_code == 0
-    assert result.output.count("debug") > 10  # The db spits out lots of debug messages
-
-
-def test_env_vars_work(runner: CliRunner) -> None:
-    """Test that env vars work."""
-    runner.env = {"LOG_LEVEL": "DEBUG"}
-    result = runner.invoke(cli, ["sources", "list"])
-    assert result.exit_code == 0
-    assert result.output.count("debug") > 10  # The db spits out lots of debug messages
-
-
-def test_dotenv_file_works(runner: CliRunner) -> None:
-    """Test that the .env file works."""
-    with tempfile.NamedTemporaryFile(delete=False) as f:
-        f.write(b"LOG_LEVEL=DEBUG")
-        f.flush()
-        result = runner.invoke(cli, ["--env-file", f.name, "sources", "list"])
-        assert result.exit_code == 0
-        assert (
-            result.output.count("debug") > 10
-        )  # The db spits out lots of debug messages