From de24bae9842fa001355d49d615ec37e60b22b1d4 Mon Sep 17 00:00:00 2001 From: gahusb Date: Sat, 23 May 2026 12:06:24 +0900 Subject: [PATCH] feat(image-render): Redis BLPOP worker + 3 provider dispatch --- services/image-render/tests/test_worker.py | 15 ++++ services/image-render/worker.py | 84 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 services/image-render/tests/test_worker.py create mode 100644 services/image-render/worker.py diff --git a/services/image-render/tests/test_worker.py b/services/image-render/tests/test_worker.py new file mode 100644 index 0000000..879bb6c --- /dev/null +++ b/services/image-render/tests/test_worker.py @@ -0,0 +1,15 @@ +import worker + + +def test_dispatch_routes_to_provider(monkeypatch): + called = {} + monkeypatch.setattr(worker, "run_gpt_image_generation", lambda tid, p: called.setdefault("gpt", (tid, p))) + worker._dispatch({"job_type": "gpt_image_generation", "task_id": "t1", "params": {"prompt": "x"}}) + assert called["gpt"][0] == "t1" + + +def test_dispatch_unknown_job_type_reports_failed(monkeypatch): + calls = [] + monkeypatch.setattr(worker, "webhook_update_task", lambda *a, **k: calls.append((a, k))) + worker._dispatch({"job_type": "midjourney_generation", "task_id": "t9", "params": {}}) + assert calls[-1][0][1] == "failed" diff --git a/services/image-render/worker.py b/services/image-render/worker.py new file mode 100644 index 0000000..963a900 --- /dev/null +++ b/services/image-render/worker.py @@ -0,0 +1,84 @@ +"""Redis BLPOP worker — queue:image-render → job_type dispatch → NAS webhook. + +queue:paused 가 set이면 대기 (task-watcher가 박재오 활동 감지 시 set). +video-render worker.py 패턴 — string-based dispatch + getattr (테스트 patch 호환). +""" +from __future__ import annotations + +import asyncio +import json +import logging +import os +import sys + +import redis.asyncio as aioredis + +from nas_client import webhook_update_task +from providers.gpt_image import run_gpt_image_generation +from providers.nano_banana import run_nano_banana_generation +from providers.flux import run_flux_generation + +logger = logging.getLogger(__name__) + +REDIS_URL = os.getenv("REDIS_URL", "redis://192.168.45.54:6379") +QUEUE_KEY = "queue:image-render" +PAUSED_KEY = "queue:paused" + +# string names so `unittest.mock.patch` / `monkeypatch.setattr` on `worker.` +# is correctly intercepted by getattr(sys.modules[__name__], ...) +_DISPATCH_TABLE = { + "gpt_image_generation": "run_gpt_image_generation", + "nano_banana_generation": "run_nano_banana_generation", + "flux_generation": "run_flux_generation", +} + + +def _dispatch(payload: dict) -> None: + """payload[job_type] → provider 함수 호출 (sync, worker_loop에서 asyncio.to_thread로 wrap).""" + job_type = payload.get("job_type", "") + task_id = payload.get("task_id", "") + params = payload.get("params", {}) + fn_name = _DISPATCH_TABLE.get(job_type) + if fn_name is None: + logger.error("unknown job_type=%s task=%s", job_type, task_id) + webhook_update_task(task_id, "failed", 0, "", error=f"unknown job_type: {job_type}") + return + try: + fn = getattr(sys.modules[__name__], fn_name) + except AttributeError: + logger.error("dispatch table typo for job_type=%s name=%s task=%s", job_type, fn_name, task_id) + webhook_update_task(task_id, "failed", 0, "", error=f"internal dispatch error: {fn_name}") + return + fn(task_id, params) + + +async def worker_loop(): + redis = aioredis.from_url(REDIS_URL, decode_responses=False) + logger.info("image-render worker started (queue=%s)", QUEUE_KEY) + while True: + try: + paused = await redis.get(PAUSED_KEY) + if paused == b"1": + await asyncio.sleep(10) + continue + item = await redis.blpop(QUEUE_KEY, timeout=5) + if item is None: + continue + _, raw = item + try: + payload = json.loads(raw) + except json.JSONDecodeError: + logger.error("invalid queue payload: %r", raw[:200]) + continue + await asyncio.to_thread(_dispatch, payload) + except asyncio.CancelledError: + logger.info("worker_loop cancelled") + raise + except Exception: + logger.exception("worker_loop iteration 실패, 5초 후 재시도") + await asyncio.sleep(5) + + +if __name__ == "__main__": + logging.basicConfig(level=logging.INFO) + asyncio.run(worker_loop())