From e40048bf5db6d49f146df5f0c069b882bf6c9644 Mon Sep 17 00:00:00 2001 From: zcr Date: Thu, 2 Apr 2026 11:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=94=A8mq=20=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/canvas_generate_3D/callback.py | 12 +++++----- src/server/canvas_generate_3D/tasks.py | 28 +++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/server/canvas_generate_3D/callback.py b/src/server/canvas_generate_3D/callback.py index 5590856..1dbb9d2 100644 --- a/src/server/canvas_generate_3D/callback.py +++ b/src/server/canvas_generate_3D/callback.py @@ -4,14 +4,14 @@ import logging logger = logging.getLogger(__name__) -async def notify_callback(callback_url: str, job_id: str, status: str, result: dict, ): +async def notify_callback(callback_url: str, task_id: str, status: str, result: dict, ): """ 调用客户端提供的回调接口 """ try: payload = { - "job_id": job_id, - " ": status, + "task_id": task_id, + "status": status, "result": result } logger.info(payload) @@ -23,12 +23,12 @@ async def notify_callback(callback_url: str, job_id: str, status: str, result: d ) if resp.status_code >= 200 and resp.status_code < 300: - logger.info(f"回调成功 | job_id: {job_id} | status: {status} | url: {callback_url}") + logger.info(f"回调成功 | task_id: {task_id} | status: {status} | url: {callback_url}") return True else: - logger.warning(f"回调返回非2xx状态码 | job_id: {job_id} | status: {resp.status_code} | url: {callback_url}") + logger.warning(f"回调返回非2xx状态码 | task_id: {task_id} | status: {resp.status_code} | url: {callback_url}") return False except Exception as e: - logger.error(f"回调失败 | job_id: {job_id} | url: {callback_url} | error: {e}", exc_info=True) + logger.error(f"回调失败 | task_id: {task_id} | url: {callback_url} | error: {e}", exc_info=True) return False diff --git a/src/server/canvas_generate_3D/tasks.py b/src/server/canvas_generate_3D/tasks.py index 5ae5b6b..6f88bbd 100755 --- a/src/server/canvas_generate_3D/tasks.py +++ b/src/server/canvas_generate_3D/tasks.py @@ -13,8 +13,8 @@ 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", callback_url: str = None): """img_to_3D 主任务""" - job_id = self.request.id - logger.info(f"开始处理 img_to_3D 任务 | job_id: {job_id}") + task_id = self.request.id + logger.info(f"开始处理 img_to_3D 任务 | task_id: {task_id}") try: input_data = { "image_paths": input_images, @@ -27,13 +27,13 @@ def img_to_3d_task(self, input_images: list, model: str = "single", callback_url ) status_code = resp.status_code result = resp.json() - logger.info(f"img_to_3D 任务处理完成 | job_id: {job_id} | status_code : {status_code} | result: {result}") + logger.info(f"img_to_3D 任务处理完成 | task_id: {task_id} | status_code : {status_code} | result: {result}") # 发送到对应的回调接口 if status_code == 200: asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="completed", result=result, ) @@ -42,7 +42,7 @@ def img_to_3d_task(self, input_images: list, model: str = "single", callback_url asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="failed", result={}, ) @@ -50,11 +50,11 @@ def img_to_3d_task(self, input_images: list, model: str = "single", callback_url return result except Exception as exc: - logger.error(f"img_to_3D 任务失败 | job_id: {job_id} | exc {exc}", exc_info=True) + logger.error(f"img_to_3D 任务失败 | task_id: {task_id} | exc {exc}", exc_info=True) asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="failed", result=result, ) @@ -65,8 +65,8 @@ def img_to_3d_task(self, input_images: list, model: str = "single", callback_url @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}") + task_id = self.request.id + logger.info(f"开始处理 three_d_to_3views_task | task_id: {task_id}") try: input_data = { "minio_glb_path": minio_glb_path, @@ -78,13 +78,13 @@ def three_d_to_3views_task(self, minio_glb_path: str, callback_url: str): ) status_code = resp.status_code result = resp.json() - logger.info(f"three_d_to_3views_task 任务处理完成 | job_id: {job_id} | status_code : {status_code} | result: {result}") + logger.info(f"three_d_to_3views_task 任务处理完成 | task_id: {task_id} | status_code : {status_code} | result: {result}") # 发送到对应的回调接口 if status_code == 200: asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="completed", result=result, ) @@ -93,7 +93,7 @@ def three_d_to_3views_task(self, minio_glb_path: str, callback_url: str): asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="failed", result={}, ) @@ -101,11 +101,11 @@ def three_d_to_3views_task(self, minio_glb_path: str, callback_url: str): return result except Exception as exc: - logger.error(f"three_d_to_3views_task 任务失败 | job_id: {job_id}", exc_info=True) + logger.error(f"three_d_to_3views_task 任务失败 | task_id: {task_id}", exc_info=True) asyncio.run( notify_callback( callback_url=callback_url, - job_id=job_id, + task_id=task_id, status="failed", result={}, )