弃用mq 采用回调接口方式

src/server/canvas_generate_3D/tasks.py

@@ -3,6 +3,7 @@ import asyncio
 from celery import shared_task
 import httpx
 from src.core.config import settings
+from src.server.canvas_generate_3D.callback import notify_callback
 from src.server.utils.mq_util import send_to_rabbitmq
 import logging
 
@@ -10,90 +11,103 @@ logger = logging.getLogger(__name__)
 
 
 @shared_task(bind=True, queue="img_to_3d_queue", max_retries=3, name='src.server.canvas_generate_3D.tasks.img_to_3d_task')
-def img_to_3d_task(self, input_images: list, model: str = "single"):
+def img_to_3d_task(self, input_images: list, model: str = "single", callback_url: str = None):
     """img_to_3D 主任务"""
     job_id = self.request.id
-
     logger.info(f"开始处理 img_to_3D 任务 | job_id: {job_id}")
-
     try:
         input_data = {
             "image_paths": input_images,
             "model": model,
         }
-
         with httpx.Client(timeout=300.0) as client:
             resp = client.post(
                 f"http://{settings.IMAGE_TO_3D_MODEL_URL}/canvas/img_to_3D",
                 json=input_data
             )
-            resp.raise_for_status()
+            status_code = resp.status_code
             result = resp.json()
-
-        logger.info(f"img_to_3D 任务处理完成 | job_id: {job_id}")
-
-        # 发送到对应的结果队列
-        asyncio.run(send_to_rabbitmq(
-            result=result,
-            job_id=job_id,
-            status="completed",
-            routing_key=f"img_to_3d_results-{settings.SERVE_ENV}"  # ← 第一个任务的结果队列
-        ))
-
+        logger.info(f"img_to_3D 任务处理完成 | job_id: {job_id} | status_code : {status_code} | result: {result}")
+        # 发送到对应的回调接口
+        if status_code == 200:
+            asyncio.run(
+                notify_callback(
+                    callback_url=callback_url,
+                    job_id=job_id,
+                    status="completed",
+                    result=result,
+                )
+            )
+        else:
+            asyncio.run(
+                notify_callback(
+                    callback_url=callback_url,
+                    job_id=job_id,
+                    status="failed",
+                    result={},
+                )
+            )
         return result
 
     except Exception as exc:
-        logger.error(f"img_to_3D 任务失败 | job_id: {job_id}", exc_info=True)
-
-        asyncio.run(send_to_rabbitmq(
-            result={"error": str(exc)},
-            job_id=job_id,
-            status="failed",
-            routing_key=f"img_to_3d_results-{settings.SERVE_ENV}"
-        ))
+        logger.error(f"img_to_3D 任务失败 | job_id: {job_id} | exc {exc}", exc_info=True)
+        asyncio.run(
+            notify_callback(
+                callback_url=callback_url,
+                job_id=job_id,
+                status="failed",
+                result=result,
+            )
+        )
         raise self.retry(exc=exc, countdown=60, max_retries=3)
 
 
-@shared_task(bind=True, queue="three_d_to_3views_queue", max_retries=3,
-             name='src.server.canvas_generate_3D.tasks.three_d_to_3views_task')
-def three_d_to_3views_task(self, minio_glb_path: str):
+@shared_task(bind=True, queue="three_d_to_3views_queue", max_retries=3, name='src.server.canvas_generate_3D.tasks.three_d_to_3views_task')
+def three_d_to_3views_task(self, minio_glb_path: str, callback_url: str):
     """3D to 3views 主任务"""
     job_id = self.request.id
-
     logger.info(f"开始处理 three_d_to_3views_task | job_id: {job_id}")
-
     try:
         input_data = {
             "minio_glb_path": minio_glb_path,
         }
-
         with httpx.Client(timeout=300.0) as client:
             resp = client.post(
                 f"http://{settings.IMAGE_TO_3D_MODEL_URL}/canvas/3d_to_3views",
                 json=input_data
             )
-            resp.raise_for_status()
+            status_code = resp.status_code
             result = resp.json()
-
-        logger.info(f"three_d_to_3views_task 任务处理完成 | job_id: {job_id}")
-
-        # 发送到对应的结果队列
-        asyncio.run(send_to_rabbitmq(
-            result=result,
-            job_id=job_id,
-            status="completed",
-            routing_key="three_d_to_3views_results"  # ← 第二个任务的结果队列
-        ))
-
+        logger.info(f"three_d_to_3views_task 任务处理完成 | job_id: {job_id} | status_code : {status_code} | result: {result}")
+        # 发送到对应的回调接口
+        if status_code == 200:
+            asyncio.run(
+                notify_callback(
+                    callback_url=callback_url,
+                    job_id=job_id,
+                    status="completed",
+                    result=result,
+                )
+            )
+        else:
+            asyncio.run(
+                notify_callback(
+                    callback_url=callback_url,
+                    job_id=job_id,
+                    status="failed",
+                    result={},
+                )
+            )
         return result
 
     except Exception as exc:
         logger.error(f"three_d_to_3views_task 任务失败 | job_id: {job_id}", exc_info=True)
-
-        asyncio.run(send_to_rabbitmq(
-            result={"error": str(exc)},
-            job_id=job_id,
-            status="failed",
-            routing_key="three_d_to_3views_results"
-        ))
+        asyncio.run(
+            notify_callback(
+                callback_url=callback_url,
+                job_id=job_id,
+                status="failed",
+                result={},
+            )
+        )
         raise self.retry(exc=exc, countdown=60, max_retries=3)