detail_result_progress

python/api.py

@@ -326,7 +326,7 @@ async def fromExcelHandler(params: HandlerDetail):
         msg="处理结束",
         data={"output_folder": handler_result_folder, "list": handler_result},
         status="处理结束",
-        msg_type="detail_progress",
+        msg_type="detail_result_progress",
     )
     return
 
@@ -492,7 +492,7 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
             msg="处理结束",
             data={"output_folder": handler_result_folder, "list": handler_result},
             status="处理结束",
-            msg_type="detail_progress",
+            msg_type="detail_result_progress",
         )
         return
     if is_product_scene == 1:
@@ -520,6 +520,7 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
                 msg_type="scene_progress",
             )
             for goods_art_no in goods_dict.keys():
+                print("处理场景图", goods_art_no)
                 goods_art_dict_info = goods_dict[goods_art_no]
                 first_goods_art_no_info = goods_art_dict_info.get("货号资料", [])[0]
                 first_pics = first_goods_art_no_info.get("pics")
@@ -530,7 +531,9 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
                     goods_art_dict_info["场景图"] = save_image_path
                     new_goods_dict[goods_art_no] = goods_art_dict_info
                     continue
+                print("处理场景图2", goods_art_no)
                 aigc_clazz.center_paste_image(ceshi_image_path, save_image_path)
+                print("处理场景图3", goods_art_no)
                 try:
                     image_path = await aigc_clazz.generateProductScene(
                         save_image_path, product_scene_prompt, save_image_path
@@ -565,7 +568,8 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
                         status="场景图处理失败",
                         msg_type="scene_progress",
                     )
-            return_data_check_before_detail["data"]["goods_no_dict"] = new_goods_dict
+            if new_goods_dict is not None or new_goods_dict != {}:
+                return_data_check_before_detail["data"]["goods_no_dict"] = new_goods_dict
         if is_upper_footer == 1:
             goods_dict = parserGoodsDict2Aigc(return_data_check_before_detail)
             new_goods_dict = {}
@@ -623,7 +627,10 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
                         status="模特图处理失败",
                         msg_type="upper_footer_progress",
                     )
-            return_data_check_before_detail["data"]["goods_no_dict"] = new_goods_dict
+            if new_goods_dict is not None or new_goods_dict != {}:
+                return_data_check_before_detail["data"][
+                    "goods_no_dict"
+                ] = new_goods_dict
         if is_detail == 0:
             # return {
             #     "code": 0,
@@ -637,7 +644,7 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
                 msg="处理结束",
                 data={"output_folder": handler_result_folder, "list": handler_result},
                 status="处理结束",
-                msg_type="detail_progress",
+                msg_type="detail_result_progress",
             )
             return
         check_for_detail_first_res = await run_main.check_for_detail_first_call_back(
@@ -732,11 +739,11 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
     #     "data": {"output_folder": handler_result_folder, "list": handler_result},
     # }
     await sendAsyncMessage(
-                msg="处理结束",
-                data={"output_folder": handler_result_folder, "list": handler_result},
-                status="处理结束",
-                msg_type="detail_progress",
-            )
+        msg="处理结束",
+        data={"output_folder": handler_result_folder, "list": handler_result},
+        status="处理结束",
+        msg_type="detail_result_progress",
+    )
     return
 
 

python/mcu/capture/smart_shooter_class.py

@@ -511,11 +511,9 @@ class SmartShooter(metaclass=SingletonType):
                 # future = asyncio.ensure_future(self.asyncMessageListen())
                 # 运行任务，但设置超时以避免无限等待
                 # 使用一致的事件循环运行异步任务
-                asyncio.run(self.asyncMessageListen())
+                # asyncio.run(self.asyncMessageListen())
                 # 运行任务，但设置超时以避免无限等待
-                # self.listen_loop.run_until_complete(
-                #     asyncio.wait_for(future, timeout=0.1)
-                # )
+                self.listen_loop.run_until_complete(self.asyncMessageListen())
             except asyncio.TimeoutError:
                 # 超时是正常的，表示没有消息需要处理
                 pass