feat: wire MusicBrainz resolver into the worker loop
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user