Continue GC code review and cleanup

tests/ui/conftest.py

@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-import asyncio
-from collections.abc import AsyncGenerator, Callable
-from datetime import UTC, datetime
+from collections.abc import AsyncGenerator
+from collections.abc import Awaitable
+from collections.abc import Callable
+from datetime import UTC
+from datetime import datetime
 from pathlib import Path
-from typing import Awaitable
 from uuid import UUID
 
 import pytest
@@ -16,45 +17,52 @@ from fastapi.testclient import TestClient
 from sqlmodel import delete
 
 from transcription.app import create_app
-from transcription.config import Settings, SqliteSettings
-from transcription.db import create_all, initialize_database_runtime, session_scope
-from transcription.db.models import (
-    Document,
-    DocumentPerson,
-    Job,
-    JobSource,
-    JobSourceStatus,
-    JobStatus,
-    Person,
-    Source,
-)
+from transcription.config import Settings
+from transcription.config import SqliteSettings
+from transcription.db import session as db_session_module
+from transcription.db import session_scope
+from transcription.db.models import Document
+from transcription.db.models import DocumentPerson
+from transcription.db.models import Job
+from transcription.db.models import JobSource
+from transcription.db.models import JobSourceStatus
+from transcription.db.models import JobStatus
+from transcription.db.models import Person
+from transcription.db.models import Source
 
 
 @pytest.fixture(scope="session")
-def app_client(tmp_path_factory: pytest.TempPathFactory) -> AsyncGenerator[tuple[FastAPI, TestClient], None]:
+def app_client(tmp_path_factory: pytest.TempPathFactory) -> AsyncGenerator[tuple[FastAPI, TestClient]]:
     """Provide a real application and test client backed by in-memory SQLite."""
     tmp_path = tmp_path_factory.mktemp("ui")
     settings = Settings(
         openrouter_api_key="test-key",
-        database=SqliteSettings(path=":memory:"),
+        database=SqliteSettings(path=str(tmp_path / "ui-tests.db")),
         environment="test",
         bootstrap_schema_on_startup=True,
         upload_dir=tmp_path / "uploads",
         prompt_dir=tmp_path / "prompts",
     )
 
-    app = create_app()
-    app.state.runtime = initialize_database_runtime(settings=settings)
-    asyncio.run(create_all(engine=app.state.runtime.engine))
+    app = create_app(settings=settings)
 
     with TestClient(app) as client:
         yield app, client
 
 
 @pytest_asyncio.fixture(autouse=True)
-async def clear_ui_database(app_client: tuple[FastAPI, TestClient]) -> None:
+async def clear_ui_database(
+    app_client: tuple[FastAPI, TestClient],
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
     """Reset UI-facing tables asynchronously before each test for isolation."""
-    async with session_scope() as session:
+    app, _ = app_client
+    monkeypatch.setattr(
+        db_session_module,
+        "resolve_session_factory",
+        lambda *_args, **_kwargs: app.state.runtime.session_factory,
+    )
+    async with session_scope(session_factory=app.state.runtime.session_factory) as session:
         await session.exec(delete(JobSource))
         await session.exec(delete(DocumentPerson))
         await session.exec(delete(Source))
@@ -118,9 +126,7 @@ async def seed_job(app_client: tuple[FastAPI, TestClient]) -> Callable[..., Awai
                         job_id=job.id,
                         source_id=source.id,
                         status=(
-                            JobSourceStatus.TRANSCRIBED
-                            if transcription_text is not None
-                            else JobSourceStatus.FAILED
+                            JobSourceStatus.TRANSCRIBED if transcription_text is not None else JobSourceStatus.FAILED
                         ),
                         raw_transcription=transcription_text,
                         error_detail=error_detail,
@@ -135,4 +141,4 @@ async def seed_job(app_client: tuple[FastAPI, TestClient]) -> Callable[..., Awai
             await session.commit()
             return job.id
 
-    return _seed
+    return _seed