kodit 0.1.6__tar.gz → 0.1.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kodit
-Version: 0.1.6
+Version: 0.1.7
 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.6 → kodit-0.1.7}/docs/_index.md

@@ -57,10 +57,9 @@ pip install kodit
 Kodit has two key parts. A configuration CLI to manage what gets indexed and an MCP
 server to expose your code to an AI coding assistant.
 
-1. Add a source: `kodit sources create /path/to/your/code`
-2. Create an index on that source: `kodit indexes create 1`
-3. Test retrieval on your index: `kodit retrieve "test"`
-4. Start an MCP server: `kodit serve`
+1. Add an index: `kodit index /path/to/your/code`
+2. Test retrieval on your index: `kodit retrieve "test"`
+3. Start an MCP server: `kodit serve`
 
 Now browse to your AI coding assistant and add the MCP server. You will also need to
 tell your assistant to use this server in coding tasks, otherwise it won't get called!

{kodit-0.1.6 → kodit-0.1.7}/src/kodit/_version.py

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

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

@@ -8,7 +8,7 @@ from typing import Any
 import click
 import structlog
 import uvicorn
-from pytable_formatter import Table
+from pytable_formatter import Cell, Table
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from kodit.config import (
@@ -84,110 +84,59 @@ def cli(  # noqa: PLR0913
     ctx.obj = config
 
 
-@cli.group()
-def sources() -> None:
-    """Manage code sources."""
-
-
-@sources.command(name="list")
-@with_app_context
-@with_session
-async def list_sources(session: AsyncSession, app_context: AppContext) -> None:
-    """List all code sources."""
-    repository = SourceRepository(session)
-    service = SourceService(app_context.get_clone_dir(), repository)
-    sources = await service.list_sources()
-
-    # Define headers and data
-    headers = ["ID", "Created At", "URI"]
-    data = [[source.id, source.created_at, source.uri] for source in sources]
-
-    # Create and display the table
-    table = Table(headers=headers, data=data)
-    click.echo(table)
-
-
-@sources.command(name="create")
-@click.argument("uri")
-@with_app_context
-@with_session
-async def create_source(
-    session: AsyncSession, app_context: AppContext, uri: str
-) -> None:
-    """Add a new code source."""
-    repository = SourceRepository(session)
-    service = SourceService(app_context.get_clone_dir(), repository)
-    source = await service.create(uri)
-    click.echo(f"Source created: {source.id}")
-
-
-@cli.group()
-def indexes() -> None:
-    """Manage indexes."""
-
-
-@indexes.command(name="create")
-@click.argument("source_id")
+@cli.command()
+@click.argument("sources", nargs=-1)
 @with_app_context
 @with_session
-async def create_index(
-    session: AsyncSession, app_context: AppContext, source_id: int
+async def index(
+    session: AsyncSession,
+    app_context: AppContext,
+    sources: list[str],
 ) -> None:
-    """Create an index for a source."""
+    """List indexes, or index data sources."""
     source_repository = SourceRepository(session)
     source_service = SourceService(app_context.get_clone_dir(), source_repository)
     repository = IndexRepository(session)
     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, app_context: AppContext) -> None:
-    """List all indexes."""
-    source_repository = SourceRepository(session)
-    source_service = SourceService(app_context.get_clone_dir(), source_repository)
-    repository = IndexRepository(session)
-    service = IndexService(repository, source_service, app_context.get_data_dir())
-    indexes = await service.list_indexes()
-
-    # Define headers and data
-    headers = [
-        "ID",
-        "Created At",
-        "Updated At",
-        "Num Snippets",
-    ]
-    data = [
-        [
-            index.id,
-            index.created_at,
-            index.updated_at,
-            index.num_snippets,
+    if not sources:
+        # No source specified, list all indexes
+        indexes = await service.list_indexes()
+        headers: list[str | Cell] = [
+            "ID",
+            "Created At",
+            "Updated At",
+            "Source",
+            "Num Snippets",
         ]
-        for index in indexes
-    ]
-
-    # Create and display the table
-    table = Table(headers=headers, data=data)
-    click.echo(table)
-
-
-@indexes.command(name="run")
-@click.argument("index_id")
-@with_app_context
-@with_session
-async def run_index(
-    session: AsyncSession, app_context: AppContext, index_id: int
-) -> None:
-    """Run an index."""
-    source_repository = SourceRepository(session)
-    source_service = SourceService(app_context.get_clone_dir(), source_repository)
-    repository = IndexRepository(session)
-    service = IndexService(repository, source_service, app_context.get_data_dir())
-    await service.run(index_id)
+        data = [
+            [
+                index.id,
+                index.created_at,
+                index.updated_at,
+                index.source,
+                index.num_snippets,
+            ]
+            for index in indexes
+        ]
+        click.echo(Table(headers=headers, data=data))
+        return
+    # Handle source indexing
+    for source in sources:
+        if source.startswith("https://"):
+            msg = "Web or git indexing is not implemented yet"
+            raise click.UsageError(msg)
+        if source.startswith("git"):
+            msg = "Git indexing is not implemented yet"
+            raise click.UsageError(msg)
+        if Path(source).is_file():
+            msg = "File indexing is not implemented yet"
+            raise click.UsageError(msg)
+
+        # Index directory
+        s = await source_service.create(source)
+        index = await service.create(s.id)
+        await service.run(index.id)
 
 
 @cli.command()

{kodit-0.1.6 → kodit-0.1.7}/src/kodit/indexing/repository.py

@@ -82,7 +82,7 @@ class IndexRepository:
         result = await self.session.execute(query)
         return list(result.scalars())
 
-    async def list_indexes(self) -> list[Index]:
+    async def list_indexes(self) -> list[tuple[Index, Source]]:
         """List all indexes.
 
         Returns:
@@ -90,9 +90,11 @@ class IndexRepository:
             and counts of files and snippets.
 
         """
-        query = select(Index).limit(10)
+        query = select(Index, Source).join(
+            Source, Index.source_id == Source.id, full=True
+        )
         result = await self.session.execute(query)
-        return list(result.scalars())
+        return list(result.tuples())
 
     async def num_snippets_for_index(self, index_id: int) -> int:
         """Get the number of snippets for an index."""

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

@@ -33,6 +33,7 @@ class IndexView(pydantic.BaseModel):
     id: int
     created_at: datetime
     updated_at: datetime | None = None
+    source: str | None = None
     num_snippets: int | None = None
 
 
@@ -105,8 +106,9 @@ class IndexService:
                 created_at=index.created_at,
                 updated_at=index.updated_at,
                 num_snippets=await self.repository.num_snippets_for_index(index.id),
+                source=source.uri,
             )
-            for index in indexes
+            for index, source in indexes
         ]
 
     async def run(self, index_id: int) -> None:

{kodit-0.1.6 → kodit-0.1.7}/tests/kodit/cli_test.py

@@ -37,9 +37,7 @@ def test_version_command(runner: CliRunner, default_cli_args: list[str]) -> None
 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"]
-    )
+    result = runner.invoke(cli, [*default_cli_args, "--log-level", "DEBUG", "index"])
     assert result.exit_code == 0
     assert result.output.count("debug") > 10  # The db spits out lots of debug messages
 
@@ -47,7 +45,7 @@ def test_cli_vars_work(runner: CliRunner, default_cli_args: list[str]) -> None:
 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"])
+    result = runner.invoke(cli, [*default_cli_args, "index"])
     assert result.exit_code == 0
     assert result.output.count("debug") > 10  # The db spits out lots of debug messages
 
@@ -57,9 +55,7 @@ def test_dotenv_file_works(runner: CliRunner, default_cli_args: list[str]) -> No
     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"]
-        )
+        result = runner.invoke(cli, [*default_cli_args, "--env-file", f.name, "index"])
         assert result.exit_code == 0
         assert (
             result.output.count("debug") > 10
@@ -69,7 +65,7 @@ def test_dotenv_file_works(runner: CliRunner, default_cli_args: list[str]) -> No
 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"]
+        cli, [*default_cli_args, "--env-file", "nonexistent.env", "index"]
     )
     assert result.exit_code == 2
     assert "does not exist" in result.output

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

@@ -24,14 +24,9 @@ echo "print('Hello, world!')" > $tmp_dir/test.py
 # Test version command
 $prefix kodit version
 
-# Test sources commands
-$prefix kodit sources list
-$prefix kodit sources create $tmp_dir
-
-# Test indexes commands
-$prefix kodit indexes list
-$prefix kodit indexes create 1
-$prefix kodit indexes run 1
+# Test index command
+$prefix kodit index $tmp_dir
+$prefix kodit index
 
 # Test retrieve command
 $prefix kodit retrieve "Hello"