* fix(errors): four failures that reached users as raw OS text (#1262, #1256, #1251, #1252) #1262 — a voice profile named in any non-latin-1 script 500'd every download endpoint with "'latin-1' codec can't encode characters in position 22-25". `attachment; filename="` is exactly 22 characters, so those were the first four characters of the user's own name. The sanitisers in front of the header filtered with str.isalnum(), which is True for every alphabetic script — they stripped punctuation and passed exactly what breaks the header. Ten sites, one RFC 6266 builder, plus a guard so an eleventh can't be hand-written. #1256 — a synth died on FileNotFoundError: 'ffprobe' and was reported as "an error OmniVoice doesn't recognize", on a Mac where the app's own ffprobe was resolvable the whole time. Our call sites pass explicit paths; a dependency shelling out by bare name does not. The resolved directories are now published on PATH, and the failure is classified either way. #1251 — "The paging file is too small" reached the user as a bare 500. It was already counted as an OOM, but that remedy (close apps, lighter engine) is wrong on a 32 GB machine — the fix is a Windows setting, and the hint now says which. Matched on the code in both the Python and Rust spellings. #1252/#1253 — deleting a dub mid-import crashed it with `ingest: 'mgw39lx3'`: str(KeyError) is the repr of the key. The pipeline blind-subscripted a job that DELETE /dub/history/{id} had popped minutes earlier. It now stops quietly, and no exception whose str() is a bare value can present itself that way again. * fix(engines): Unload 400'd, a wrong language said nothing, DRM was retried by hand (#1247, #1257, #1254) #1247 — list_loaded() advertises in-process engines as `engine:<id>` with "unloadable": true, but unload() only ever handled tts/diarization/sidecars. The panel was rendering a button for ids the dispatcher rejected. The engines already implement unload(); only the routing was missing. The contract test written for it immediately found a second instance — `capture-asr`, listed the same way with no branch either — which is why it enumerates the listing rather than hard-coding ids. #1257 — MLXAudioBackend.supported_languages() returns ["multi"] on the stated assumption that "each engine silently ignores languages it doesn't know". It doesn't; the library raises. So the picker offers all 646 languages and the rejection arrived as a bare list of 23 codes, naming neither the engine nor the way out. Enumerating each model's real language set would be a brittle map that goes stale every engine update — name the engine and the fix instead. #1254 — reported as intermittent: the same URL failed as DRM-protected, then succeeded on retry. Real DRM doesn't lapse; the player client varies. That is the same shape as the 403 case which already escalates through _YT_PLAYER_CLIENTS, so DRM now routes into it. If every client still refuses, the failure is classified instead of arriving as a raw yt-dlp line. * fix(review): close the delete race, narrow the tool match, sanitize the fallback Greptile P1 + CodeRabbit Major — verified real, and mine: splitting merge from save left a window where a delete lands between them, so the pending save UPSERTs the row straight back and a dub the user deleted reappears. Now one atomic step under _dub_jobs_lock, with both delete endpoints purging rows and memory under that same lock. That also fixed DELETE /dub/history, which deleted every row but evicted nothing — an in-flight job survived 'clear history' outright and re-saved itself on completion. CodeRabbit Minor (#1256): the media-tool match accepted any message ending in 'ffmpeg'/'ffprobe', so a missing FILE at /tmp/ffmpeg got the 'repair your media engine' remedy. Now requires the name unquoted-and-unqualified. CodeRabbit Major (#1262): `fallback` reached the header verbatim whenever the real name folded away entirely, walking past every guard the name goes through. Folded like the name. CodeRabbit Major (#1256): the PATH log printed resolved directories, and a user-set FFMPEG_PATH sits under their home. Logs a count now. CodeRabbit Minor (#1262): the subtitle-route assertion also passed against the pre-fix header; it now asserts filename*= too. Skipped: 'Highlights bullets must end with (#N)'. CLAUDE.md scopes that to the ### subsections; none of the seven pre-existing highlights carry refs, and tests/test_changelog_style.py encodes the rule already. * fix(review): the remaining unlocked save paths, an over-broad signature, two weak tests Greptile P1 — the mid-pipeline put_job + save_job pairs were still unlocked, so a clear-history landing between them left a ghost row behind the purge. Both go through put_and_save_job now; only the final completion gate decides whether a withdrawn job's work is kept. CodeRabbit Major (#1257) — 'unsupported language' as a bare prefix also matches 'Unsupported language model configuration', handing a model/config failure engine-switch advice it has no use for. The loose wordings now require the rejected thing to be a code or to end there. CodeRabbit Major (#1257) — the OOM test asserted on SOURCE TEXT, which passes even if the call is unreachable or its result discarded; #1224 taught this same lesson on this codebase. Both it and the language rewrite now drive the real _run_backend_inference with a raising backend. CodeRabbit Minor (#1257) — 'or "engine" in message' always passed, since the production template contains the word. Asserts the resolved class name now. CodeRabbit Major (#1252) — the delete-race test deleted the job BEFORE the merge, which only re-tested the absent case and would pass with the two steps still split. It now interleaves a real second thread against a slow save. CodeRabbit Major (#1256) — a hardcoded /tmp literal trips Ruff S108; built from tmp_path instead. * fix(review): a withdrawal must survive the job's first write CodeRabbit Major — the concern is real, though its suggested fix (gate the checkpoint on the job already existing) would break creation: an ingest's FIRST persistence is what creates the entry, so that gate would never pass. The actual defect is that dict membership cannot express 'withdrawn'. An absent key means 'not written yet' for a new job and 'deleted' for an established one — two opposite instructions from one signal. So a clear-history arriving before the first checkpoint was silently undone by that checkpoint recreating the row, and the run then persisted its result into history the user had just cleared. Tombstone it explicitly: the ingest declares itself in flight, a purge marks any in-flight id withdrawn, and both write paths refuse a withdrawn id. Released in , so it's bounded by concurrent ingests and can't poison a later run that reuses the id. That also fixed clear-history properly: a job with no row yet appears in no id list, so only an in-flight sweep can catch it. CodeRabbit Minor — my race test waited on an event that could not be set while the save held the lock, so it burned its full 2s timeout every run and synchronised nothing. It now waits for the purge thread to REACH the purge. * test(dub): the race test was not testing the race Caught by verifying fail-before rather than trusting the test: splitting merge from save — the exact resurrection bug — passed all 22 tests. The assertions checked WHAT happened (the save ran, the row was deleted, the job left memory) but never WHEN. A save landing after the delete is indistinguishable from one landing before if you only assert that both occurred — and 'after' is precisely the resurrection. Now recorded and asserted as an order. With merge+save atomic the purge cannot start until the save finishes, so the sequence is always save-then-delete; split them and it fails with ['delete', 'save']. That is the second time this test needed rewriting: v1 deleted the job before the merge and only re-checked the absent case, v2 interleaved a real thread but asserted the wrong thing. Both looked like tests. Also documents why the DB write sits inside the lock (atomicity beats a rare 5 s sqlite busy-timeout stall) and that no locked region calls another, so the non-reentrant lock cannot deadlock — verified by walking every locked region. * fix(dub): gate the withdrawal at save_job, not at its callers Greptile P1 — and the same class I'd already fixed, unfixed elsewhere. The withdrawal check sat in the two ingest helpers, but eight direct save_job call sites across dub generate / translate / export / core bypass those entirely. Deleting a dub mid-RENDER therefore still resurrected it, which is at least as likely as deleting mid-import. Moved the gate into save_job itself: one choke point, every caller inherits it, and the ninth cannot forget. That needs a re-entrant lock, since the atomic helpers call save_job while already holding it — a plain Lock would deadlock the backend, so a test pins the lock type and another exercises the nested path. Verified fail-before: removing the gate fails the new test. * fix(dub): the withdrawal only covered ingests, so it covered almost nothing Caught by testing the reported scenario directly instead of trusting a green suite: CI passed, 26 tests passed, and a dub deleted during a RENDER was still resurrected. The tombstone was scoped to in-flight ingests. But a dub is imported once and rendered many times, so the realistic delete lands during a render — long after its ingest ended — and end_ingest was CLEARING the tombstone at exactly that point. The rare case was protected and the common one left open. Now scoped to deletions, not ingests. Kept in a bounded LRU rather than cleared on completion, because there is no moment at which a delete stops mattering: any operation still holding that job can persist it. Re-importing an id is the only thing that legitimately revives it. Verified fail-before: the previous scoping fails three of the new tests. * refactor: move the dub delete-resurrection fix to its own PR (#1270) The six fixes left here are independent error-message changes that needed no corrections. The dub concurrency change needed five rounds, each finding something real in work that was already reviewed, tested and CI-green — the last of them being that the fix did not fix the reported case at all. Riding a release on that record is a bad trade, so it ships separately as #1270. This branch keeps #1262, #1256, #1251, #1247, #1257 and #1254; the KeyError message half goes with the dub PR, since it is that issue's other half.
157 lines
5.5 KiB
Python
157 lines
5.5 KiB
Python
"""#1247: `400 Bad Request: Unknown model id: engine:kittentts`.
|
|
|
|
Reported straight from `EngineCompatibilityMatrix.jsx` — the user opened
|
|
Settings and pressed Unload on a resident engine.
|
|
|
|
`list_loaded()` enumerates in-process engines as `engine:<id>` and marks
|
|
each ``"unloadable": True``. `unload()` handled `tts`, `diarization`,
|
|
`sidecars` and `sidecar:<id>` — and nothing else. The panel was offering a
|
|
button for an id the dispatcher rejected. The engines themselves have
|
|
implemented `unload()` the whole time; only the routing was missing.
|
|
|
|
The guard at the bottom is the point: the two functions are a *contract*, and
|
|
the bug was them disagreeing. Any future id the lister advertises as unloadable
|
|
must be one the dispatcher accepts.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from services import model_lifecycle
|
|
|
|
|
|
class _FakeEngine:
|
|
"""Stands in for an in-process backend (mlx-audio, kittentts, …)."""
|
|
|
|
id = "kittentts"
|
|
_MODEL_ATTRS = ("_model",)
|
|
|
|
def __init__(self, loaded=True):
|
|
self._model = object() if loaded else None
|
|
self.unload_calls = 0
|
|
|
|
def unload(self):
|
|
self.unload_calls += 1
|
|
self._model = None
|
|
|
|
|
|
@pytest.fixture
|
|
def fake_engines(monkeypatch):
|
|
import api.routers.engines as engines_router
|
|
|
|
instances = {}
|
|
monkeypatch.setattr(engines_router, "_ENGINE_INSTANCES", instances, raising=False)
|
|
return instances
|
|
|
|
|
|
# ── the reported failure ─────────────────────────────────────────────────
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_unloading_a_resident_engine_no_longer_400s(fake_engines):
|
|
engine = _FakeEngine(loaded=True)
|
|
fake_engines[type(engine)] = engine
|
|
|
|
result = await model_lifecycle.unload("engine:kittentts")
|
|
|
|
assert result["success"] is True
|
|
assert result["unloaded"] == "engine:kittentts"
|
|
assert engine.unload_calls == 1
|
|
assert engine._model is None, "the memory must actually be handed back"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_an_engine_that_holds_nothing_reports_not_loaded(fake_engines):
|
|
"""Same shape as the `tts` / `diarization` branches — a no-op, not an error."""
|
|
engine = _FakeEngine(loaded=False)
|
|
fake_engines[type(engine)] = engine
|
|
|
|
result = await model_lifecycle.unload("engine:kittentts")
|
|
|
|
assert result["success"] is False
|
|
assert result["reason"] == "not loaded"
|
|
assert engine.unload_calls == 0
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_an_engine_that_is_not_instantiated_reports_not_loaded(fake_engines):
|
|
"""A stale panel row (the engine was already evicted) must not 400 either —
|
|
the user pressing a button that raced a background eviction did nothing
|
|
wrong."""
|
|
result = await model_lifecycle.unload("engine:neverloaded")
|
|
|
|
assert result["success"] is False
|
|
assert result["reason"] == "not loaded"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_the_warm_dictation_asr_can_be_unloaded(monkeypatch):
|
|
"""A SECOND instance of the same defect, found by the contract test below
|
|
rather than by a user: `capture-asr` was listed as unloadable and the
|
|
dispatcher had no branch for it either."""
|
|
import services.asr_backend as ab
|
|
|
|
released = []
|
|
monkeypatch.setattr(ab, "_capture_backend", object(), raising=False)
|
|
monkeypatch.setattr(
|
|
ab, "release_idle_capture_backend",
|
|
lambda idle_s, **kw: (released.append(idle_s), True)[1],
|
|
raising=False,
|
|
)
|
|
|
|
result = await model_lifecycle.unload("capture-asr")
|
|
|
|
assert result["success"] is True
|
|
assert released == [0.0], "an explicit Unload releases now, not after a timeout"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_dictation_in_progress_declines_rather_than_yanking_the_model(monkeypatch):
|
|
import services.asr_backend as ab
|
|
|
|
monkeypatch.setattr(ab, "_capture_backend", object(), raising=False)
|
|
monkeypatch.setattr(
|
|
ab, "release_idle_capture_backend", lambda idle_s, **kw: False, raising=False
|
|
)
|
|
|
|
result = await model_lifecycle.unload("capture-asr")
|
|
|
|
assert result["success"] is False
|
|
assert "dictation" in result["reason"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_a_genuinely_unknown_id_still_raises(fake_engines):
|
|
"""The 400 is correct for an id nothing advertises — don't lose it."""
|
|
with pytest.raises(ValueError, match="Unknown model id"):
|
|
await model_lifecycle.unload("banana")
|
|
|
|
|
|
# ── the contract that was broken ─────────────────────────────────────────
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_every_advertised_unloadable_id_is_accepted(fake_engines, monkeypatch):
|
|
"""The recurrence guard.
|
|
|
|
The panel renders an Unload button for every row with ``unloadable: True``.
|
|
Advertising an id the dispatcher rejects is precisely #1247, and it will
|
|
keep happening as new model kinds are added unless the two sides are
|
|
checked against each other.
|
|
"""
|
|
engine = _FakeEngine(loaded=True)
|
|
fake_engines[type(engine)] = engine
|
|
|
|
listing = model_lifecycle.list_loaded()
|
|
advertised = [m["id"] for m in listing["models"] if m.get("unloadable")]
|
|
assert "engine:kittentts" in advertised, "fixture engine should be listed"
|
|
|
|
for model_id in advertised:
|
|
try:
|
|
await model_lifecycle.unload(model_id)
|
|
except ValueError as e: # pragma: no cover — this is the failure mode
|
|
pytest.fail(
|
|
f"{model_id} is advertised as unloadable but the dispatcher "
|
|
f"rejects it: {e}"
|
|
)
|