Fix ruff issues

Author: ix-56h

src/server/models.py

@@ -13,14 +13,14 @@
 
 class PatternType(str, Enum):
     """Enumeration for pattern types used in file filtering."""
-    
+
     INCLUDE = "include"
     EXCLUDE = "exclude"
 
 
 class IngestRequest(BaseModel):
     """Request model for the /api/ingest endpoint.
-    
+
     Attributes
     ----------
     input_text : str
@@ -33,32 +33,34 @@ class IngestRequest(BaseModel):
         Glob/regex pattern string for file filtering.
     token : str | None
         GitHub personal access token (PAT) for accessing private repositories.
+
     """
-    
+
     input_text: str = Field(..., description="Git repository URL or slug to ingest")
     max_file_size: int = Field(..., ge=0, le=500, description="File size slider position (0-500)")
     pattern_type: PatternType = Field(default=PatternType.EXCLUDE, description="Pattern type for file filtering")
     pattern: str = Field(default="", description="Glob/regex pattern for file filtering")
     token: str | None = Field(default=None, description="GitHub PAT for private repositories")
-    
-    @field_validator('input_text')
+
+    @field_validator("input_text")
     @classmethod
-    def validate_input_text(cls, v):
+    def validate_input_text(cls, v: str) -> str:
         """Validate that input_text is not empty."""
         if not v.strip():
-            raise ValueError('input_text cannot be empty')
+            err = "input_text cannot be empty"
+            raise ValueError(err)
         return v.strip()
-    
-    @field_validator('pattern')
+
+    @field_validator("pattern")
     @classmethod
-    def validate_pattern(cls, v):
+    def validate_pattern(cls, v: str) -> str:
         """Validate pattern field."""
         return v.strip() if v else ""
 
 
 class IngestSuccessResponse(BaseModel):
     """Success response model for the /api/ingest endpoint.
-    
+
     Attributes
     ----------
     result : Literal[True]
@@ -81,8 +83,9 @@ class IngestSuccessResponse(BaseModel):
         The pattern used for filtering.
     token : str | None
         The token used (if any).
+
     """
-    
+
     result: Literal[True] = True
     repo_url: str = Field(..., description="Original repository URL")
     short_repo_url: str = Field(..., description="Short repository URL (user/repo)")
@@ -97,7 +100,7 @@ class IngestSuccessResponse(BaseModel):
 
 class IngestErrorResponse(BaseModel):
     """Error response model for the /api/ingest endpoint.
-    
+
     Attributes
     ----------
     error : str
@@ -112,8 +115,9 @@ class IngestErrorResponse(BaseModel):
         The pattern that was used.
     token : str | None
         The token that was used (if any).
+
     """
-    
+
     error: str = Field(..., description="Error message")
     repo_url: str = Field(..., description="Repository URL that failed")
     default_file_size: int = Field(..., description="File size slider position used")

src/server/query_processor.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, cast
+from typing import Any, cast
 
 from gitingest.clone import clone_repo
 from gitingest.ingestion import ingest_query
@@ -15,13 +15,8 @@
 )
 from server.server_utils import Colors, log_slider_to_size
 
-if TYPE_CHECKING:
-    from fastapi import Request
-    from starlette.templating import _TemplateResponse
-
 
 async def process_query(
-    request: Request,
     *,
     input_text: str,
     slider_position: int,
@@ -37,8 +32,6 @@ async def process_query(
 
     Parameters
     ----------
-    request : Request
-        The HTTP request object.
     input_text : str
         Input text provided by the user, typically a Git repository URL or slug.
     slider_position : int

src/server/routers/ingest.py

@@ -1,55 +1,57 @@
-from fastapi import APIRouter, Request, Form, HTTPException
+"""Ingest endpoint for the API."""
+
+from fastapi import APIRouter
 from fastapi.responses import JSONResponse
-from typing import Optional
+
+from server.form_types import IntForm, OptStrForm, StrForm
+from server.models import IngestErrorResponse, IngestRequest, IngestSuccessResponse, PatternType
 from server.query_processor import process_query
 from server.server_utils import limiter
-from server.models import IngestRequest, IngestSuccessResponse, IngestErrorResponse, IngestResponse, PatternType
 
 router = APIRouter()
 
-@router.post("/api/ingest", 
-             responses={
-                 200: {"model": IngestSuccessResponse, "description": "Successful ingestion"},
-                 400: {"model": IngestErrorResponse, "description": "Bad request or processing error"},
-                 500: {"model": IngestErrorResponse, "description": "Internal server error"}
-             })
+
+@router.post(
+    "/api/ingest",
+    responses={
+        200: {"model": IngestSuccessResponse, "description": "Successful ingestion"},
+        400: {"model": IngestErrorResponse, "description": "Bad request or processing error"},
+        500: {"model": IngestErrorResponse, "description": "Internal server error"},
+    },
+)
 @limiter.limit("10/minute")
 async def api_ingest(
-    request: Request,
-    input_text: str = Form(...),
-    max_file_size: int = Form(...),
-    pattern_type: str = Form("exclude"),
-    pattern: str = Form(""),
-    token: Optional[str] = Form(None),
-):
+    *,
+    input_text: StrForm,
+    max_file_size: IntForm,
+    pattern_type: StrForm = "exclude",
+    pattern: StrForm = "",
+    token: OptStrForm = None,
+) -> JSONResponse:
     """Ingest a Git repository and return processed content.
-    
+
     This endpoint processes a Git repository by cloning it, analyzing its structure,
     and returning a summary with the repository's content. The response includes
     file tree structure, processed content, and metadata about the ingestion.
-    
+
     Parameters
     ----------
-    input_text : str
+    input_text : StrForm
         Git repository URL or slug to ingest
-    max_file_size : int
+    max_file_size : IntForm
         Maximum file size slider position (0-500) for filtering files
-    pattern_type : str
+    pattern_type : StrForm
         Type of pattern to use for file filtering ("include" or "exclude")
-    pattern : str
+    pattern : StrForm
         Glob/regex pattern string for file filtering
-    token : str | None
+    token : OptStrForm
         GitHub personal access token (PAT) for accessing private repositories
-        
+
     Returns
     -------
     JSONResponse
         Success response with ingestion results or error response with appropriate HTTP status code
-        
-    Raises
-    ------
-    HTTPException
-        If validation fails or processing encounters an error
+
     """
     try:
         # Validate input using Pydantic model
@@ -58,19 +60,18 @@ async def api_ingest(
             max_file_size=max_file_size,
             pattern_type=PatternType(pattern_type),
             pattern=pattern,
-            token=token
+            token=token,
         )
-        
+
         context = await process_query(
-            request,
             input_text=ingest_request.input_text,
             slider_position=ingest_request.max_file_size,
-            pattern_type=ingest_request.pattern_type.value,
+            pattern_type=ingest_request.pattern_type,
             pattern=ingest_request.pattern,
             is_index=True,
             token=ingest_request.token,
         )
-        
+
         if "error" in context:
             # Return structured error response with 400 status code
             error_response = IngestErrorResponse(
@@ -79,13 +80,13 @@ async def api_ingest(
                 default_file_size=context.get("default_file_size", max_file_size),
                 pattern_type=context.get("pattern_type", pattern_type),
                 pattern=context.get("pattern", pattern),
-                token=token
+                token=token,
             )
             return JSONResponse(
                 status_code=400,
-                content=error_response.model_dump()
+                content=error_response.model_dump(),
             )
-        
+
         # Return structured success response with 200 status code
         success_response = IngestSuccessResponse(
             result=True,
@@ -97,39 +98,39 @@ async def api_ingest(
             default_file_size=context["default_file_size"],
             pattern_type=context["pattern_type"],
             pattern=context["pattern"],
-            token=context.get("token")
+            token=context.get("token"),
         )
         return JSONResponse(
             status_code=200,
-            content=success_response.model_dump()
+            content=success_response.model_dump(),
         )
-        
+
     except ValueError as ve:
         # Handle validation errors with 400 status code
         error_response = IngestErrorResponse(
-            error=f"Validation error: {str(ve)}",
+            error=f"Validation error: {ve!s}",
             repo_url=input_text,
             default_file_size=max_file_size,
             pattern_type=pattern_type,
             pattern=pattern,
-            token=token
+            token=token,
         )
         return JSONResponse(
             status_code=400,
-            content=error_response.model_dump()
+            content=error_response.model_dump(),
         )
-        
+
     except Exception as exc:
         # Handle unexpected errors with 500 status code
         error_response = IngestErrorResponse(
-            error=f"Internal server error: {str(exc)}",
+            error=f"Internal server error: {exc!s}",
             repo_url=input_text,
             default_file_size=max_file_size,
             pattern_type=pattern_type,
             pattern=pattern,
-            token=token
+            token=token,
         )
         return JSONResponse(
             status_code=500,
-            content=error_response.model_dump()
-        )
+            content=error_response.model_dump(),
+        )