kodit 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

kodit/cli.py

@@ -19,8 +19,14 @@ from kodit.config import (
     with_session,
 )
 from kodit.domain.errors import EmptySourceError
-from kodit.domain.services.source_service import SourceService
-from kodit.domain.value_objects import MultiSearchRequest, SnippetSearchFilters
+from kodit.domain.services.index_query_service import IndexQueryService
+from kodit.domain.value_objects import (
+    MultiSearchRequest,
+    MultiSearchResult,
+    SnippetSearchFilters,
+)
+from kodit.infrastructure.indexing.fusion_service import ReciprocalRankFusionService
+from kodit.infrastructure.sqlalchemy.index_repository import SqlAlchemyIndexRepository
 from kodit.infrastructure.ui.progress import (
     create_lazy_progress_callback,
     create_multi_stage_progress_callback,
@@ -73,30 +79,28 @@ async def index(
 ) -> None:
     """List indexes, or index data sources."""
     log = structlog.get_logger(__name__)
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
+    )
+    index_query_service = IndexQueryService(
+        index_repository=SqlAlchemyIndexRepository(session=session),
+        fusion_service=ReciprocalRankFusionService(),
     )
 
     if auto_index:
         log.info("Auto-indexing configuration", config=app_context.auto_indexing)
-        auto_sources = app_context.auto_indexing.sources
-        if not auto_sources:
+        if not app_context.auto_indexing or not app_context.auto_indexing.sources:
             click.echo("No auto-index sources configured.")
             return
-
+        auto_sources = app_context.auto_indexing.sources
         click.echo(f"Auto-indexing {len(auto_sources)} configured sources...")
         sources = [source.uri for source in auto_sources]
 
     if not sources:
         log_event("kodit.cli.index.list")
         # No source specified, list all indexes
-        indexes = await service.list_indexes()
+        indexes = await index_query_service.list_indexes()
         headers: list[str | Cell] = [
             "ID",
             "Created At",
@@ -109,8 +113,8 @@ async def index(
                 index.id,
                 index.created_at,
                 index.updated_at,
-                index.source,
-                index.num_snippets,
+                index.source.working_copy.remote_uri,
+                len(index.source.working_copy.files),
             ]
             for index in indexes
         ]
@@ -127,14 +131,12 @@ async def index(
 
         # Create a lazy progress callback that only shows progress when needed
         progress_callback = create_lazy_progress_callback()
-        s = await source_service.create(source, progress_callback)
-
-        index = await service.create_index(s.id)
+        index = await service.create_index_from_uri(source, progress_callback)
 
         # Create a new progress callback for the indexing operations
         indexing_progress_callback = create_multi_stage_progress_callback()
         try:
-            await service.run_index(index.id, indexing_progress_callback)
+            await service.run_index(index, indexing_progress_callback)
         except EmptySourceError as e:
             log.exception("Empty source error", error=e)
             msg = f"""{e}. This could mean:
@@ -219,6 +221,7 @@ def _parse_filters(
 @click.option(
     "--source-repo", help="Filter by source repository (e.g., github.com/example/repo)"
 )
+@click.option("--output-format", default="text", help="Format to display snippets in")
 @with_app_context
 @with_session
 async def code(  # noqa: PLR0913
@@ -231,20 +234,16 @@ async def code(  # noqa: PLR0913
     created_after: str | None,
     created_before: str | None,
     source_repo: str | None,
+    output_format: str,
 ) -> None:
     """Search for snippets using semantic code search.
 
     This works best if your query is code.
     """
     log_event("kodit.cli.search.code")
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
     )
 
     filters = _parse_filters(
@@ -259,8 +258,10 @@ async def code(  # noqa: PLR0913
         click.echo("No snippets found")
         return
 
-    for snippet in snippets:
-        click.echo(str(snippet))
+    if output_format == "text":
+        click.echo(MultiSearchResult.to_string(snippets))
+    elif output_format == "json":
+        click.echo(MultiSearchResult.to_jsonlines(snippets))
 
 
 @search.command()
@@ -279,6 +280,7 @@ async def code(  # noqa: PLR0913
 @click.option(
     "--source-repo", help="Filter by source repository (e.g., github.com/example/repo)"
 )
+@click.option("--output-format", default="text", help="Format to display snippets in")
 @with_app_context
 @with_session
 async def keyword(  # noqa: PLR0913
@@ -291,17 +293,13 @@ async def keyword(  # noqa: PLR0913
     created_after: str | None,
     created_before: str | None,
     source_repo: str | None,
+    output_format: str,
 ) -> None:
     """Search for snippets using keyword search."""
     log_event("kodit.cli.search.keyword")
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
     )
 
     filters = _parse_filters(
@@ -316,8 +314,10 @@ async def keyword(  # noqa: PLR0913
         click.echo("No snippets found")
         return
 
-    for snippet in snippets:
-        click.echo(str(snippet))
+    if output_format == "text":
+        click.echo(MultiSearchResult.to_string(snippets))
+    elif output_format == "json":
+        click.echo(MultiSearchResult.to_jsonlines(snippets))
 
 
 @search.command()
@@ -336,6 +336,7 @@ async def keyword(  # noqa: PLR0913
 @click.option(
     "--source-repo", help="Filter by source repository (e.g., github.com/example/repo)"
 )
+@click.option("--output-format", default="text", help="Format to display snippets in")
 @with_app_context
 @with_session
 async def text(  # noqa: PLR0913
@@ -348,20 +349,16 @@ async def text(  # noqa: PLR0913
     created_after: str | None,
     created_before: str | None,
     source_repo: str | None,
+    output_format: str,
 ) -> None:
     """Search for snippets using semantic text search.
 
     This works best if your query is text.
     """
     log_event("kodit.cli.search.text")
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
     )
 
     filters = _parse_filters(
@@ -376,8 +373,10 @@ async def text(  # noqa: PLR0913
         click.echo("No snippets found")
         return
 
-    for snippet in snippets:
-        click.echo(str(snippet))
+    if output_format == "text":
+        click.echo(MultiSearchResult.to_string(snippets))
+    elif output_format == "json":
+        click.echo(MultiSearchResult.to_jsonlines(snippets))
 
 
 @search.command()
@@ -398,6 +397,7 @@ async def text(  # noqa: PLR0913
 @click.option(
     "--source-repo", help="Filter by source repository (e.g., github.com/example/repo)"
 )
+@click.option("--output-format", default="text", help="Format to display snippets in")
 @with_app_context
 @with_session
 async def hybrid(  # noqa: PLR0913
@@ -412,17 +412,13 @@ async def hybrid(  # noqa: PLR0913
     created_after: str | None,
     created_before: str | None,
     source_repo: str | None,
+    output_format: str,
 ) -> None:
     """Search for snippets using hybrid search."""
     log_event("kodit.cli.search.hybrid")
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
     )
 
     # Parse keywords into a list of strings
@@ -446,8 +442,10 @@ async def hybrid(  # noqa: PLR0913
         click.echo("No snippets found")
         return
 
-    for snippet in snippets:
-        click.echo(str(snippet))
+    if output_format == "text":
+        click.echo(MultiSearchResult.to_string(snippets))
+    elif output_format == "json":
+        click.echo(MultiSearchResult.to_jsonlines(snippets))
 
 
 @cli.group()
@@ -458,6 +456,7 @@ def show() -> None:
 @show.command()
 @click.option("--by-path", help="File or directory path to search for snippets")
 @click.option("--by-source", help="Source URI to filter snippets by")
+@click.option("--output-format", default="text", help="Format to display snippets in")
 @with_app_context
 @with_session
 async def snippets(
@@ -465,21 +464,19 @@ async def snippets(
     app_context: AppContext,
     by_path: str | None,
     by_source: str | None,
+    output_format: str,
 ) -> None:
     """Show snippets with optional filtering by path or source."""
     log_event("kodit.cli.show.snippets")
-    source_service = SourceService(
-        clone_dir=app_context.get_clone_dir(),
-        session_factory=lambda: session,
-    )
     service = create_code_indexing_application_service(
         app_context=app_context,
         session=session,
-        source_service=source_service,
     )
     snippets = await service.list_snippets(file_path=by_path, source_uri=by_source)
-    for snippet in snippets:
-        click.echo(str(snippet))
+    if output_format == "text":
+        click.echo(MultiSearchResult.to_string(snippets))
+    elif output_format == "json":
+        click.echo(MultiSearchResult.to_jsonlines(snippets))
 
 
 @cli.command()