generated from john/python-template
Baseline was 207 diagnostics. Two real bugs were hiding in the noise: - tools/run_destructive_tests.py imported ctypes.wintypes at module scope, which raises on non-Windows, and called fcntl unconditionally. The Windows and POSIX implementations now live under a module-level sys.platform split. - tests/ui/test_sources_page.py constructed Source(...) without document_id. Structural fixes, not suppressions: - New src/transcription/db/loading.py owns the SQLModel-field to QueryableAttribute reinterpretation via orm_attribute()/selectinload()/ defer(). This removed 42 "# pyright: ignore[reportArgumentType]" comments across documents/jobs/people/sources. Its docstring records that selectinload(A.b, B.c) is NOT equivalent to the chained form: varargs applies the selectin strategy only to the last path element, which under lazy="raise" raises InvalidRequestError at render time. - db/session.py transaction_scope no longer accepts or yields AsyncSessionTransaction. No caller ever passed one, sessionmaker.begin() yields an AsyncSession, and the dead branch was latently buggy because services call .exec(). Cleared 7 workflows.py diagnostics. - services/registry.py RegistryService is bound by a new RegistryEntry Protocol instead of bare SQLModel, so the shared implementation can read id/label/normalized_label/is_active. Cleared 9 diagnostics. - Column expressions in sources.py/jobs.py/test_store.py wrap in sqlmodel col(), the idiom already used in registry.py. - read_source_navigation wraps its literal tuple bounds in literal(). - normalization.py narrows with isinstance(image, TiffImageFile) rather than comparing image.format, since tag_v2 is TIFF-only. - linked_people.render uses @ui.refreshable_method, the NiceGUI API for bound methods. - The OpenRouter capturing client re-raises ResponseNotRead when the response stream is not async rather than mis-wrapping it. Tooling gate: - New .pre-commit-config.yaml runs ruff check and ty check as blocking hooks. No pre-commit config previously existed. Negative-tested: injecting a type error fails both hooks. - The last two "# pyright: ignore" comments (config.py) are removed; ty does not honor pyright directives. One "# ty: ignore" remains, in tests/test_prompts.py, where the test deliberately assigns to a frozen field to assert ValidationError. - asyncio_default_fixture_loop_scope is pinned to "function" so pytest-asyncio behavior does not shift on upgrade. Verification: ruff check clean, ty check reports 0 diagnostics, 292 passed and 4 skipped, pre-commit passes and demonstrably fails on a regression, and tools/run_destructive_tests.py runs on Windows. Co-authored-by: Copilot App <[email protected]>
116 lines
3.5 KiB
Python
116 lines
3.5 KiB
Python
import asyncio
|
|
import logging
|
|
from typing import cast
|
|
|
|
import pytest
|
|
|
|
from transcription.services import ServiceBundle
|
|
from transcription.services.sources import SourceService
|
|
from transcription.worker import process_next_queued_job
|
|
from transcription.worker import run_worker_loop
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_run_worker_loop_survives_process_next_exception(monkeypatch, caplog):
|
|
calls = 0
|
|
stop_event = asyncio.Event()
|
|
|
|
async def _fake_process_next_queued_job(*, session=None, session_factory=None, services=None):
|
|
nonlocal calls
|
|
_ = (session, session_factory, services)
|
|
calls += 1
|
|
if calls == 1:
|
|
raise RuntimeError("boom")
|
|
stop_event.set()
|
|
return False
|
|
|
|
monkeypatch.setattr("transcription.worker.process_next_queued_job", _fake_process_next_queued_job)
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
await run_worker_loop(stop_event=stop_event, poll_interval_seconds=0)
|
|
|
|
assert calls == 2
|
|
assert "Worker loop exception" in caplog.text
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_run_worker_loop_reuses_one_bundle_across_jobs(monkeypatch):
|
|
"""HIGH-02: the provider client is built once per loop, not once per job."""
|
|
stop_event = asyncio.Event()
|
|
seen: list[object] = []
|
|
closed = False
|
|
|
|
class _Sources:
|
|
async def aclose(self):
|
|
nonlocal closed
|
|
closed = True
|
|
|
|
bundle = ServiceBundle(sources=cast("SourceService", _Sources()))
|
|
monkeypatch.setattr(
|
|
"transcription.worker.ServiceBundle.from_session_factory",
|
|
classmethod(lambda _cls, _factory=None, **_kwargs: bundle),
|
|
)
|
|
|
|
async def _fake_process_next_queued_job(*, session=None, session_factory=None, services=None):
|
|
_ = (session, session_factory)
|
|
seen.append(services)
|
|
if len(seen) >= 3:
|
|
stop_event.set()
|
|
return False
|
|
return True
|
|
|
|
monkeypatch.setattr("transcription.worker.process_next_queued_job", _fake_process_next_queued_job)
|
|
|
|
await run_worker_loop(stop_event=stop_event, poll_interval_seconds=0)
|
|
|
|
assert len(seen) == 3
|
|
assert all(item is bundle for item in seen)
|
|
assert closed is True
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_process_next_closes_provider_for_the_bundle_it_owns(monkeypatch):
|
|
closed = False
|
|
|
|
class _Sources:
|
|
async def aclose(self):
|
|
nonlocal closed
|
|
closed = True
|
|
|
|
bundle = ServiceBundle(sources=cast("SourceService", _Sources()))
|
|
monkeypatch.setattr(
|
|
"transcription.worker.ServiceBundle.from_session_factory",
|
|
classmethod(lambda _cls, _factory=None, **_kwargs: bundle),
|
|
)
|
|
|
|
async def _no_job(*, services, session):
|
|
_ = (services, session)
|
|
return False
|
|
|
|
monkeypatch.setattr("transcription.worker.process_next_queued_job_workflow", _no_job)
|
|
|
|
assert await process_next_queued_job() is False
|
|
assert closed is True
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_process_next_leaves_a_caller_owned_bundle_open(monkeypatch):
|
|
"""A bundle passed in belongs to the caller and must outlive one job."""
|
|
closed = False
|
|
|
|
class _Sources:
|
|
async def aclose(self):
|
|
nonlocal closed
|
|
closed = True
|
|
|
|
bundle = ServiceBundle(sources=cast("SourceService", _Sources()))
|
|
|
|
async def _no_job(*, services, session):
|
|
_ = (services, session)
|
|
return False
|
|
|
|
monkeypatch.setattr("transcription.worker.process_next_queued_job_workflow", _no_job)
|
|
|
|
assert await process_next_queued_job(services=bundle) is False
|
|
assert closed is False
|