feat: replace fake pipeline with staged adapter-driven pipeline
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
+140
-16
@@ -1,14 +1,11 @@
|
||||
import time
|
||||
from typing import Sequence
|
||||
|
||||
import psycopg
|
||||
|
||||
# (state, currentStage) pairs the job moves through, in order, after claim.
|
||||
_STAGES = [
|
||||
("matched", "rank"),
|
||||
("downloading", "download"),
|
||||
("tagging", "tag"),
|
||||
("imported", "import"),
|
||||
]
|
||||
from lyra_worker.adapters.base import SourceAdapter
|
||||
from lyra_worker.quality import quality_class
|
||||
from lyra_worker.ranker import rank_candidates
|
||||
from lyra_worker.types import Candidate, MBTarget
|
||||
|
||||
|
||||
def _set_state(conn: psycopg.Connection, job_id: str, state: str, stage: str) -> None:
|
||||
@@ -20,17 +17,144 @@ def _set_state(conn: psycopg.Connection, job_id: str, state: str, stage: str) ->
|
||||
conn.commit()
|
||||
|
||||
|
||||
def run_pipeline(conn: psycopg.Connection, job_id: str, stage_delay: float = 0.0) -> None:
|
||||
"""Fake acquisition: walk the claimed job through to 'imported'."""
|
||||
for state, stage in _STAGES:
|
||||
if stage_delay:
|
||||
time.sleep(stage_delay)
|
||||
_set_state(conn, job_id, state, stage)
|
||||
def _request_id(conn: psycopg.Connection, job_id: str) -> str:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute('SELECT "requestId" FROM "Job" WHERE id = %s', (job_id,))
|
||||
return cur.fetchone()[0]
|
||||
|
||||
|
||||
def _fail(conn: psycopg.Connection, job_id: str, reason: str) -> None:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'UPDATE "Request" SET status = \'completed\' '
|
||||
'WHERE id = (SELECT "requestId" FROM "Job" WHERE id = %s)',
|
||||
'UPDATE "Job" SET state = \'needs_attention\', error = %s, "updatedAt" = now() WHERE id = %s',
|
||||
(reason, job_id),
|
||||
)
|
||||
cur.execute(
|
||||
'UPDATE "Request" SET status = \'needs_attention\' WHERE id = (SELECT "requestId" FROM "Job" WHERE id = %s)',
|
||||
(job_id,),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def _load_target(conn: psycopg.Connection, job_id: str) -> MBTarget:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'SELECT artist, album FROM "Request" WHERE id = (SELECT "requestId" FROM "Job" WHERE id = %s)',
|
||||
(job_id,),
|
||||
)
|
||||
artist, album = cur.fetchone()
|
||||
return MBTarget(artist=artist, album=album)
|
||||
|
||||
|
||||
def _already_in_library(conn: psycopg.Connection, target: MBTarget) -> bool:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'SELECT 1 FROM "LibraryItem" WHERE artist = %s AND album = %s LIMIT 1',
|
||||
(target.artist, target.album),
|
||||
)
|
||||
return cur.fetchone() is not None
|
||||
|
||||
|
||||
def _persist_candidates(conn: psycopg.Connection, job_id: str, candidates: list[Candidate]) -> None:
|
||||
with conn.cursor() as cur:
|
||||
for c in candidates:
|
||||
cur.execute(
|
||||
'INSERT INTO "Candidate" (id, "jobId", source, format, "qualityClass", '
|
||||
'"trackCount", confidence, "sourceRef", chosen, "createdAt") '
|
||||
"VALUES (gen_random_uuid()::text, %s, %s, %s, %s, %s, %s, %s, false, now())",
|
||||
(job_id, c.source, c.quality.fmt, quality_class(c.quality),
|
||||
c.track_count, c.confidence, c.source_ref),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def _mark_chosen(conn: psycopg.Connection, job_id: str, source_ref: str) -> None:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'UPDATE "Candidate" SET chosen = true WHERE "jobId" = %s AND "sourceRef" = %s',
|
||||
(job_id, source_ref),
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def _import(conn: psycopg.Connection, job_id: str, target: MBTarget,
|
||||
winner: Candidate, path: str) -> None:
|
||||
request_id = _request_id(conn, job_id)
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
'INSERT INTO "LibraryItem" (id, "requestId", artist, album, path, source, '
|
||||
'format, "qualityClass", "importedAt") '
|
||||
"VALUES (gen_random_uuid()::text, %s, %s, %s, %s, %s, %s, %s, now()) "
|
||||
'ON CONFLICT (artist, album) DO NOTHING',
|
||||
(request_id, target.artist, target.album, path, winner.source,
|
||||
winner.quality.fmt, quality_class(winner.quality)),
|
||||
)
|
||||
cur.execute(
|
||||
"UPDATE \"Request\" SET status = 'completed' WHERE id = %s", (request_id,)
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def run_pipeline(
|
||||
conn: psycopg.Connection,
|
||||
job_id: str,
|
||||
adapters: Sequence[SourceAdapter],
|
||||
min_confidence: float = 0.7,
|
||||
dest_root: str = "/music",
|
||||
) -> None:
|
||||
"""Real staged acquisition using source-agnostic adapters. Fakes in this plan."""
|
||||
# 1. intake
|
||||
_set_state(conn, job_id, "matching", "intake")
|
||||
target = _load_target(conn, job_id)
|
||||
if _already_in_library(conn, target):
|
||||
_set_state(conn, job_id, "imported", "import")
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"UPDATE \"Request\" SET status = 'completed' WHERE id = %s",
|
||||
(_request_id(conn, job_id),),
|
||||
)
|
||||
conn.commit()
|
||||
return
|
||||
|
||||
# 2. match
|
||||
_set_state(conn, job_id, "matching", "match")
|
||||
candidates: list[Candidate] = []
|
||||
for adapter in adapters:
|
||||
candidates.extend(adapter.search(target))
|
||||
|
||||
# 3. rank
|
||||
_set_state(conn, job_id, "matched", "rank")
|
||||
ranked = rank_candidates(target, candidates, min_confidence)
|
||||
_persist_candidates(conn, job_id, ranked)
|
||||
if not ranked:
|
||||
_fail(conn, job_id, "no candidate above confidence threshold")
|
||||
return
|
||||
|
||||
# 4. download (fall-through)
|
||||
_set_state(conn, job_id, "downloading", "download")
|
||||
by_source = {a.name: a for a in adapters}
|
||||
dest = f"{dest_root}/{target.artist}/{target.album}"
|
||||
winner = None
|
||||
result = None
|
||||
for candidate in ranked:
|
||||
adapter = by_source.get(candidate.source)
|
||||
if adapter is None:
|
||||
continue
|
||||
result = adapter.download(candidate, dest, lambda _pct: None)
|
||||
if result.ok:
|
||||
winner = candidate
|
||||
_mark_chosen(conn, job_id, candidate.source_ref)
|
||||
break
|
||||
if winner is None or result is None or not result.ok:
|
||||
_fail(conn, job_id, "all downloads failed")
|
||||
return
|
||||
|
||||
# 5. tag (integrity check; real tagging is Plan 4)
|
||||
_set_state(conn, job_id, "tagging", "tag")
|
||||
if result.track_count != winner.track_count:
|
||||
_fail(conn, job_id, "incomplete download")
|
||||
return
|
||||
|
||||
# 6. import
|
||||
_set_state(conn, job_id, "imported", "import")
|
||||
_import(conn, job_id, target, winner, result.path or dest)
|
||||
|
||||
Reference in New Issue
Block a user