fix: clean query processor return types, remove deprecated fields, better handling for few errors

Author: ix-56h

src/server/models.py

@@ -55,7 +55,7 @@ def validate_input_text(cls, v: str) -> str:
     @classmethod
     def validate_pattern(cls, v: str) -> str:
         """Validate pattern field."""
-        return v.strip() if v else ""
+        return v.strip()
 
 
 class IngestSuccessResponse(BaseModel):
@@ -73,7 +73,7 @@ class IngestSuccessResponse(BaseModel):
         File tree structure of the repository.
     content : str
         Processed content from the repository files.
-    default_file_size : int
+    default_max_file_size : int
         The file size slider position used.
     pattern_type : str
         The pattern type used for filtering.
@@ -87,7 +87,7 @@ class IngestSuccessResponse(BaseModel):
     summary: str = Field(..., description="Ingestion summary with token estimates")
     tree: str = Field(..., description="File tree structure")
     content: str = Field(..., description="Processed file content")
-    default_file_size: int = Field(..., description="File size slider position used")
+    default_max_file_size: int = Field(..., description="File size slider position used")
     pattern_type: str = Field(..., description="Pattern type used")
     pattern: str = Field(..., description="Pattern used")
 

src/server/query_processor.py

@@ -3,15 +3,15 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Any, cast
+from typing import cast
 
 from gitingest.clone import clone_repo
 from gitingest.ingestion import ingest_query
 from gitingest.query_parser import IngestionQuery, parse_query
 from gitingest.utils.git_utils import validate_github_token
+from server.models import IngestErrorResponse, IngestResponse, IngestSuccessResponse
 from server.server_config import (
-    DEFAULT_FILE_SIZE_KB,
-    EXAMPLE_REPOS,
+    DEFAULT_MAX_FILE_SIZE_KB,
     MAX_DISPLAY_SIZE,
 )
 from server.server_utils import Colors, log_slider_to_size
@@ -23,7 +23,7 @@ async def process_query(
     pattern_type: str = "exclude",
     pattern: str = "",
     token: str | None = None,
-) -> dict[str, Any]:
+) -> IngestResponse:
     """Process a query by parsing input, cloning a repository, and generating a summary.
 
     Handle user input, process Git repository data, and prepare
@@ -44,8 +44,8 @@ async def process_query(
 
     Returns
     -------
-    dict[str, Any]
-        A dictionary containing the processed results or an error message.
+    IngestResponse
+        A union type, corresponding to IngestErrorResponse or IngestSuccessResponse
 
     Raises
     ------
@@ -68,16 +68,8 @@ async def process_query(
 
     max_file_size = log_slider_to_size(slider_position)
 
-    context = {
-        "repo_url": input_text,
-        "examples": EXAMPLE_REPOS,
-        "default_file_size": slider_position,
-        "pattern_type": pattern_type,
-        "pattern": pattern,
-        "token": token,
-    }
-
     query: IngestionQuery | None = None
+    short_repo_url = ""
 
     try:
         query = await parse_query(
@@ -91,7 +83,7 @@ async def process_query(
         query.ensure_url()
 
         # Sets the "<user>/<repo>" for the page title
-        context["short_repo_url"] = f"{query.user_name}/{query.repo_name}"
+        short_repo_url = f"{query.user_name}/{query.repo_name}"
 
         clone_config = query.extract_clone_config()
         await clone_repo(clone_config, token=token)
@@ -110,10 +102,10 @@ async def process_query(
             print(f"{Colors.BROWN}WARN{Colors.END}: {Colors.RED}<-  {Colors.END}", end="")
             print(f"{Colors.RED}{exc}{Colors.END}")
 
-        context["error"] = f"Error: {exc}"
-        if "405" in str(exc):
-            context["error_message"] = "Repository not found. Please make sure it is public."
-        return context
+        return IngestErrorResponse(
+            error="Repository not found. Please make sure it is public." if "405" in str(exc) else "",
+            repo_url=short_repo_url,
+        )
 
     if len(content) > MAX_DISPLAY_SIZE:
         content = (
@@ -132,16 +124,17 @@ async def process_query(
         summary=summary,
     )
 
-    context.update(
-        {
-            "summary": summary,
-            "tree": tree,
-            "content": content,
-        },
+    return IngestSuccessResponse(
+        repo_url=input_text,
+        short_repo_url=short_repo_url,
+        summary=summary,
+        tree=tree,
+        content=content,
+        default_max_file_size=slider_position,
+        pattern_type=pattern_type,
+        pattern=pattern,
     )
 
-    return context
-
 
 def _print_query(url: str, max_file_size: int, pattern_type: str, pattern: str) -> None:
     """Print a formatted summary of the query details for debugging.
@@ -159,7 +152,7 @@ def _print_query(url: str, max_file_size: int, pattern_type: str, pattern: str)
 
     """
     print(f"{Colors.WHITE}{url:<20}{Colors.END}", end="")
-    if int(max_file_size / 1024) != DEFAULT_FILE_SIZE_KB:
+    if int(max_file_size / 1024) != DEFAULT_MAX_FILE_SIZE_KB:
         print(
             f" | {Colors.YELLOW}Size: {int(max_file_size / 1024)}kb{Colors.END}",
             end="",

src/server/routers/dynamic.py

@@ -34,6 +34,6 @@ async def catch_all(request: Request, full_path: str) -> HTMLResponse:
         {
             "request": request,
             "repo_url": full_path,
-            "default_file_size": 243,
+            "default_max_file_size": 243,
         },
     )

src/server/routers/index.py

@@ -32,6 +32,6 @@ async def home(request: Request) -> HTMLResponse:
         {
             "request": request,
             "examples": EXAMPLE_REPOS,
-            "default_file_size": 243,
+            "default_max_file_size": 243,
         },
     )

src/server/routers/ingest.py

@@ -65,38 +65,25 @@ async def api_ingest(
             token=token,
         )
 
-        context = await process_query(
+        result = await process_query(
             input_text=ingest_request.input_text,
             slider_position=ingest_request.max_file_size,
             pattern_type=ingest_request.pattern_type,
             pattern=ingest_request.pattern,
             token=ingest_request.token,
         )
-        if "error" in context:
+
+        if isinstance(result, IngestErrorResponse):
             # Return structured error response with 400 status code
-            error_response = IngestErrorResponse(
-                error=context["error"],
-                repo_url=context.get("repo_url", input_text),
-            )
             return JSONResponse(
                 status_code=status.HTTP_400_BAD_REQUEST,
-                content=error_response.model_dump(),
+                content=result.model_dump(),
             )
 
         # Return structured success response with 200 status code
-        success_response = IngestSuccessResponse(
-            repo_url=context["repo_url"],
-            short_repo_url=context["short_repo_url"],
-            summary=context["summary"],
-            tree=context["tree"],
-            content=context["content"],
-            default_file_size=context["default_file_size"],
-            pattern_type=context["pattern_type"],
-            pattern=context["pattern"],
-        )
         return JSONResponse(
             status_code=status.HTTP_200_OK,
-            content=success_response.model_dump(),
+            content=result.model_dump(),
         )
 
     except ValueError as ve:

src/server/server_config.py

@@ -7,7 +7,7 @@
 MAX_DISPLAY_SIZE: int = 300_000
 DELETE_REPO_AFTER: int = 60 * 60  # In seconds (1 hour)
 
-DEFAULT_FILE_SIZE_KB: int = 50  # Default maximum file size to include in the digest
+DEFAULT_MAX_FILE_SIZE_KB: int = 50  # Default maximum file size to include in the digest
 
 # Slider configuration (if updated, update the logSliderToSize function in src/static/js/utils.js)
 MAX_FILE_SIZE_KB: int = 100 * 1024  # 100 MB

src/server/templates/components/git_form.jinja

@@ -112,7 +112,7 @@
                            min="0"
                            max="500"
                            required
-                           value="{{ default_file_size }}"
+                           value="{{ default_max_file_size }}"
                            class="w-full h-3 bg-[#FAFAFA] bg-no-repeat bg-[length:50%_100%] bg-[#ebdbb7] appearance-none border-[3px] border-gray-900 rounded-sm focus:outline-none bg-gradient-to-r from-[#FE4A60] to-[#FE4A60] [&::-webkit-slider-thumb]:w-5 [&::-webkit-slider-thumb]:h-7 [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:bg-white [&::-webkit-slider-thumb]:rounded-sm [&::-webkit-slider-thumb]:cursor-pointer [&::-webkit-slider-thumb]:border-solid [&::-webkit-slider-thumb]:border-[3px] [&::-webkit-slider-thumb]:border-gray-900 [&::-webkit-slider-thumb]:shadow-[3px_3px_0_#000]">
                 </div>
                 <!-- PAT checkbox with PAT field below -->