Browse Source

详情页目录

rambo 1 month ago
parent
commit
e9fba315f8
2 changed files with 22 additions and 8 deletions
  1. 4 4
      python/api.py
  2. 18 4
      python/service/run_main.py

+ 4 - 4
python/api.py

@@ -601,7 +601,7 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
             if os.path.isfile(save_image_path):
                 goods_art_dict_info["场景图"] = save_image_path
                 new_goods_dict[goods_art_no] = goods_art_dict_info
-                product_scene_progress["folder"] = save_image_path
+                product_scene_progress["folder"] = save_image_path.replace("场景图.jpg", "")
                 await sendAsyncMessage(
                     msg="场景图处理完成",
                     goods_arts=[goods_art_no],
@@ -616,7 +616,7 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
                 save_image_path, product_scene_prompt, save_image_path
             )
             
-            goods_art_dict_info["场景图"] = image_path
+            goods_art_dict_info["场景图"] = image_path.replace("场景图.jpg", "")
             new_goods_dict[goods_art_no] = goods_art_dict_info
             product_scene_progress["folder"] = save_image_path
             await sendAsyncMessage(
@@ -738,7 +738,7 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
             if os.path.isfile(save_image_path):
                 goods_art_dict_info["模特图"] = save_image_path
                 new_goods_dict[goods_art_no] = goods_art_dict_info
-                upper_footer_progress["folder"] = save_image_path
+                upper_footer_progress["folder"] = save_image_path.replace("模特图.jpg", "")
                 await sendAsyncMessage(
                     msg="模特图处理成功",
                     goods_arts=[goods_art_no],
@@ -761,7 +761,7 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
                 # 设置70秒超时
                 image_path = future.result(timeout=70)
             
-            goods_art_dict_info["模特图"] = image_path
+            goods_art_dict_info["模特图"] = image_path.replace("模特图.jpg", "")
             new_goods_dict[goods_art_no] = goods_art_dict_info
             
             # upper_footer_progress = {

+ 18 - 4
python/service/run_main.py

@@ -730,7 +730,8 @@ class RunMain:
                     "status":progress.get("status"),
                     "current":progress.get("current",0),
                     "total":progress.get("total",0),
-                    "error":progress.get("error",0)
+                    "error":progress.get("error",0),
+                    "folder":progress.get("folder",0)
                 },
             "msg_type": "detail_progress",
         }
@@ -902,7 +903,14 @@ class RunMain:
             for _temp_name in temp_name_list:
                 try:
                     detail_finish_progress+=1
-                    detail_progress = {"status":"正在处理","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
+                    detail_progress = {
+                        "status":"正在处理",
+                        "goods_art_no":goods_no, 
+                        "current":detail_finish_progress, 
+                        "total":detail_total_progress, 
+                        "error":detail_error_progress,
+                        "folder":""
+                        }
                     self.sendAsyncMessage(
                         msg="正在处理详情页",
                         goods_arts=[],
@@ -951,7 +959,7 @@ class RunMain:
                     config_data["success_handler"].append(
                         {"goods_art_no": goods_no, "success": True, "info": "处理成功"}
                     )
-                    detail_progress = {"status":"正在处理","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
+                    detail_progress["folder"] = out_put_dir_resp
                     self.sendAsyncMessage(
                         msg="开始处理详情页",
                         goods_arts=[],
@@ -1020,7 +1028,13 @@ class RunMain:
         # os.startfile(out_put_dir)
         detail_finish_progress = self.total_num - self.fail_num
         text_status = "处理完成" if detail_finish_progress > 0 else "处理失败"
-        detail_progress = {"status":text_status, "current":detail_finish_progress, "total":self.total_num, "error":self.fail_num}
+        detail_progress = {
+            "status":text_status, 
+            "current":detail_finish_progress, 
+            "total":self.total_num, 
+            "error":self.fail_num,
+            "folder":out_put_dir_resp[0] if len(all_detail_path_list) > 0 else "",
+        }
         self.sendAsyncMessage(
             msg=text_status,
             goods_arts=[],