From fef8cf0681671477323ea848a536f84a22a9068c Mon Sep 17 00:00:00 2001
From: Jonathan <claude.cs@jger.nl>
Date: Fri, 10 Jul 2026 23:27:28 +0200
Subject: [PATCH] feat: wire MusicBrainz resolver into the worker loop

---
 worker/lyra_worker/main.py           |  5 +++--
 worker/lyra_worker/registry.py       |  7 +++++++
 worker/tests/test_intake_pipeline.py | 29 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 worker/tests/test_intake_pipeline.py

diff --git a/worker/lyra_worker/main.py b/worker/lyra_worker/main.py
index acc3b4a..f1dd1bf 100644
--- a/worker/lyra_worker/main.py
+++ b/worker/lyra_worker/main.py
@@ -4,7 +4,7 @@ from lyra_worker.claim import claim_next
 from lyra_worker.config import get_config
 from lyra_worker.db import wait_for_db
 from lyra_worker.pipeline import run_pipeline
-from lyra_worker.registry import build_adapters
+from lyra_worker.registry import build_adapters, build_resolver
 
 IDLE_SLEEP = 2.0
 
@@ -12,6 +12,7 @@ IDLE_SLEEP = 2.0
 def run_forever() -> None:
     conn = wait_for_db()
     adapters = build_adapters(get_config(conn))
+    resolver = build_resolver()
     print(f"worker: {len(adapters)} adapter(s) enabled: {[a.name for a in adapters]}", flush=True)
     print("worker: waiting for jobs", flush=True)
     try:
@@ -21,7 +22,7 @@ def run_forever() -> None:
                 time.sleep(IDLE_SLEEP)
                 continue
             print(f"worker: claimed job {job_id}", flush=True)
-            run_pipeline(conn, job_id, adapters)
+            run_pipeline(conn, job_id, adapters, resolver=resolver)
             print(f"worker: finished job {job_id}", flush=True)
     finally:
         conn.close()
diff --git a/worker/lyra_worker/registry.py b/worker/lyra_worker/registry.py
index efc2c50..768523f 100644
--- a/worker/lyra_worker/registry.py
+++ b/worker/lyra_worker/registry.py
@@ -1,3 +1,4 @@
+from lyra_worker._musicbrainz import MusicBrainzResolver
 from lyra_worker.adapters._slskd import SlskdClient
 from lyra_worker.adapters._streamrip import StreamripClient
 from lyra_worker.adapters._ytdlp import YtDlpClient
@@ -5,6 +6,7 @@ from lyra_worker.adapters.base import SourceAdapter
 from lyra_worker.adapters.qobuz import QobuzAdapter
 from lyra_worker.adapters.soulseek import SoulseekAdapter
 from lyra_worker.adapters.youtube import YouTubeAdapter
+from lyra_worker.resolver import MbResolver
 
 
 def build_adapters(config: dict) -> list[SourceAdapter]:
@@ -19,3 +21,8 @@ def build_adapters(config: dict) -> list[SourceAdapter]:
         YouTubeAdapter(YtDlpClient()),
     ]
     return [a for a in candidates if a.health()]
+
+
+def build_resolver() -> MbResolver:
+    """The MusicBrainz resolver used to canonicalize requests in intake."""
+    return MusicBrainzResolver()
diff --git a/worker/tests/test_intake_pipeline.py b/worker/tests/test_intake_pipeline.py
new file mode 100644
index 0000000..836b046
--- /dev/null
+++ b/worker/tests/test_intake_pipeline.py
@@ -0,0 +1,29 @@
+from lyra_worker.adapters.qobuz import QobuzAdapter
+from lyra_worker.claim import claim_next
+from lyra_worker.pipeline import run_pipeline
+from lyra_worker.registry import build_resolver
+from lyra_worker.types import MBTarget
+from tests.conftest import insert_request
+from tests.test_qobuz_adapter import FakeQobuzClient
+
+
+def test_build_resolver_returns_a_resolver():
+    r = build_resolver()
+    assert hasattr(r, "resolve")
+
+
+def test_enriched_target_flows_end_to_end(conn):
+    class FakeResolver:
+        def resolve(self, artist, album):
+            return MBTarget(artist="John Mayer", album="Continuum", track_count=12, year=2006)
+
+    # FakeQobuzClient defaults to a 12-track match and 12-track download -> imports cleanly.
+    job_id = insert_request(conn, artist="j. mayer", album="continuum (deluxe)")
+    claim_next(conn)
+    run_pipeline(conn, job_id, [QobuzAdapter(FakeQobuzClient())], resolver=FakeResolver(), dest_root="/tmp/lib")
+
+    with conn.cursor() as cur:
+        cur.execute('SELECT state FROM "Job" WHERE id = %s', (job_id,))
+        assert cur.fetchone()[0] == "imported"
+        cur.execute('SELECT artist, album FROM "LibraryItem"')
+        assert cur.fetchone() == ("John Mayer", "Continuum")  # canonicalized, not the messy request