fix errors

Author: filipchristiansen

src/server/routers/ingest.py

@@ -1,23 +1,19 @@
 """Ingest endpoint for the API."""
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-from uuid import UUID  # noqa: TC003 (typing-only-standard-library-import) needed for type checking (pydantic)
+from typing import Union
+from uuid import UUID
 
 from fastapi import APIRouter, HTTPException, Request, status
 from fastapi.responses import FileResponse, JSONResponse, RedirectResponse
 from prometheus_client import Counter
 
 from gitingest.config import TMP_BASE_PATH
 from gitingest.utils.s3_utils import get_s3_url_for_ingest_id, is_s3_enabled
+from server.models import IngestRequest
 from server.routers_utils import COMMON_INGEST_RESPONSES, _perform_ingestion
 from server.server_config import MAX_DISPLAY_SIZE
 from server.server_utils import limiter
 
-if TYPE_CHECKING:
-    from server.models import IngestRequest
-
 ingest_counter = Counter("gitingest_ingest_total", "Number of ingests", ["status", "url"])
 
 router = APIRouter()
@@ -99,7 +95,9 @@ async def api_ingest_get(
 
 
 @router.get("/api/download/file/{ingest_id}", response_model=None)
-async def download_ingest(ingest_id: UUID) -> RedirectResponse | FileResponse:
+async def download_ingest(
+    ingest_id: UUID,
+) -> Union[RedirectResponse, FileResponse]:  # noqa: FA100 (future-rewritable-type-annotation) (pydantic)
     """Download the first text file produced for an ingest ID.
 
     **This endpoint retrieves the first ``*.txt`` file produced during the ingestion process**

tests/conftest.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import json
+import uuid
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Dict
 from unittest.mock import AsyncMock
@@ -41,7 +42,7 @@ def sample_query() -> IngestionQuery:
         repo_name="test_repo",
         local_path=Path("/tmp/test_repo").resolve(),
         slug="test_user/test_repo",
-        id="id",
+        id=uuid.uuid4(),
         branch="main",
         max_file_size=1_000_000,
         ignore_patterns={"*.pyc", "__pycache__", ".git"},

tests/test_flow_integration.py

@@ -50,7 +50,7 @@ async def test_remote_repository_analysis(request: pytest.FixtureRequest) -> Non
     client = request.getfixturevalue("test_client")
     form_data = {
         "input_text": "https://github.com/octocat/Hello-World",
-        "max_file_size": "243",
+        "max_file_size": 243,
         "pattern_type": "exclude",
         "pattern": "",
         "token": "",
@@ -75,7 +75,7 @@ async def test_invalid_repository_url(request: pytest.FixtureRequest) -> None:
     client = request.getfixturevalue("test_client")
     form_data = {
         "input_text": "https://github.com/nonexistent/repo",
-        "max_file_size": "243",
+        "max_file_size": 243,
         "pattern_type": "exclude",
         "pattern": "",
         "token": "",
@@ -97,7 +97,7 @@ async def test_large_repository(request: pytest.FixtureRequest) -> None:
     # TODO: ingesting a large repo take too much time (eg: godotengine/godot repository)
     form_data = {
         "input_text": "https://github.com/octocat/hello-world",
-        "max_file_size": "10",
+        "max_file_size": 10,
         "pattern_type": "exclude",
         "pattern": "",
         "token": "",
@@ -122,7 +122,7 @@ async def test_concurrent_requests(request: pytest.FixtureRequest) -> None:
     def make_request() -> None:
         form_data = {
             "input_text": "https://github.com/octocat/hello-world",
-            "max_file_size": "243",
+            "max_file_size": 243,
             "pattern_type": "exclude",
             "pattern": "",
             "token": "",
@@ -149,7 +149,7 @@ async def test_large_file_handling(request: pytest.FixtureRequest) -> None:
     client = request.getfixturevalue("test_client")
     form_data = {
         "input_text": "https://github.com/octocat/Hello-World",
-        "max_file_size": "1",
+        "max_file_size": 1,
         "pattern_type": "exclude",
         "pattern": "",
         "token": "",
@@ -172,7 +172,7 @@ async def test_repository_with_patterns(request: pytest.FixtureRequest) -> None:
     client = request.getfixturevalue("test_client")
     form_data = {
         "input_text": "https://github.com/octocat/Hello-World",
-        "max_file_size": "243",
+        "max_file_size": 243,
         "pattern_type": "include",
         "pattern": "*.md",
         "token": "",