Selaa lähdekoodia

生成问题处理

rambo 3 kuukautta sitten
vanhempi
commit
d102e8bb37

+ 21 - 6
python/api.py

@@ -747,6 +747,7 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
         
         if params.excel_path and params.excel_path.strip():
             # 处理Excel模式
+            is_detail = 1#强制处理详情页
             goods_art_no_arrays,excel_df,_ = __createExcelGoodsArray(params.excel_path)
             move_folder_array = await _process_excel_mode(
                 goods_art_no_arrays, excel_df
@@ -782,6 +783,20 @@ async def process_handle_detail(request: Request, params: HandlerDetail):
             
         # 如果全部失败,直接终止
         if failed_items and len(failed_items) == len(success_handler):
+            check_progress = {
+                "status": "处理失败", 
+                "current": 0, 
+                "total": len(success_handler), 
+                "error": len(failed_items)
+            }
+            
+            await sendAsyncMessage(
+                msg="检查失败",
+                goods_arts=[],
+                status="检查失败",
+                msg_type="segment_progress",
+                progress=check_progress
+            )
             return True
             
         # 处理场景图
@@ -1076,7 +1091,7 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
             new_goods_dict[goods_art_no] = goods_art_dict_info
             
             product_scene_progress = {
-                "status": "处理成功", 
+                "status": "正在处理", 
                 "current": product_scene_finish_progress, 
                 "total": product_scene_total_progress, 
                 "error": product_scene_error_progress,
@@ -1111,9 +1126,9 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
                 msg_type="scene_progress",
                 progress=product_scene_progress
             )
-            
+    status_text = "处理完成"  if product_scene_finish_progress > 0 else "处理失败" 
     product_scene_progress = {
-        "status": "处理完成", 
+        "status": status_text, 
         "current": product_scene_finish_progress, 
         "total": product_scene_total_progress, 
         "error": product_scene_error_progress
@@ -1211,7 +1226,7 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
             new_goods_dict[goods_art_no] = goods_art_dict_info
             
             upper_footer_progress = {
-                "status": "处理完成", 
+                "status": "正在处理", 
                 "goods_art_no": goods_art_no,
                 "current": upper_footer_finish_progress, 
                 "total": upper_footer_total_progress, 
@@ -1245,9 +1260,9 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
                 msg_type="upper_footer_progress",
                 progress=upper_footer_progress
             )
-            
+    status_text = "处理完成"  if upper_footer_finish_progress > 0 else "处理失败"        
     upper_footer_progress = {
-        "status": "处理完成", 
+        "status": status_text, 
         "current": upper_footer_finish_progress, 
         "total": upper_footer_total_progress, 
         "error": upper_footer_error_progress

+ 4 - 2
python/service/base_deal.py

@@ -439,7 +439,8 @@ class BaseDealImage(object):
                 cut_image_path=original_move_bg_image_path,
                 out_path=out_path,
                 image_deal_mode=is_image_deal_mode,
-                resize_mode=resize_mode,
+                # resize_mode=resize_mode,
+                resize_mode=1,#将这里得缩放模式改为强制不缩放 2025-10-22
                 out_pic_size=out_pic_size,
                 is_logo=True if i_n == 1 else False,
                 out_process_path_1=out_process_path_1,
@@ -648,7 +649,7 @@ class BaseDealImage(object):
                         break
         error_progress = len(error_goods_art_no_folder)
         progress = {
-                "status":"抠图完成",
+                "status":"处理完成",
                 "current":finish_progress,
                 "total":total_progress,
                 "error":error_progress
@@ -664,6 +665,7 @@ class BaseDealImage(object):
             )
         else:
             pass
+        progress["status"] = "处理失败" if error_progress == total_progress else "处理完成"
         sendAsyncMessage(
                     msg="抠图完成",
                     goods_arts=[],

+ 2 - 1
python/service/online_request/module_online_data.py

@@ -190,12 +190,12 @@ class AIGCDataRequest(object):
         data = {"site": 1, "generate_ids": [id], "type": "aigc_pro"}
         resultData = self.s.post(url, json=data, headers=self.post_headers)
         resultData = resultData.json()
-
         code = resultData.get("code", 0)
         message = resultData.get("message", "")
         if code != 0:
             raise UnicornException(message)
         data_result = resultData.get("data", [])
+        print("查询进度", data_result)
         if len(data_result) == 0:
             return -1, None
         data_item = data_result[0]
@@ -203,6 +203,7 @@ class AIGCDataRequest(object):
         if status in [0,1]:
             return status, None
         result_image_urls = data_item.get("result_image_urls", [])
+        result_image_urls = [] if result_image_urls == None else result_image_urls
         result_image = result_image_urls[0] if len(result_image_urls) > 0 else None
         return status, result_image
 

+ 4 - 3
python/service/run_main.py

@@ -1004,11 +1004,12 @@ class RunMain:
         # 打开文件夹
         # os.startfile(out_put_dir)
         detail_finish_progress = self.total_num - self.fail_num
-        detail_progress = {"status":"处理完成", "current":detail_finish_progress, "total":self.total_num, "error":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}
         self.sendAsyncMessage(
-            msg="处理完成",
+            msg=text_status,
             goods_arts=[],
-            status="处理完成",
+            status=text_status,
             progress=detail_progress
         )
         return config_data

+ 2 - 124
python/temp.py

@@ -1,127 +1,5 @@
 # from PIL import Image
 # from settings import recordDataPoint
 from service.online_request.module_online_data import OnlineDataRequest,AIGCDataRequest
-
-tempData = {
-    "code": 0,
-    "message": "",
-    "data": {
-        "error_folder_list": [],
-        "goods_no_dict": {
-            "A596371111": {
-                "款号": "A596371",
-                "货号资料": [
-                    {
-                        "货号": "A596371",
-                        "文件夹名称": "A596371",
-                        " 编号": "",
-                        "颜色名称": "黑色",
-                        "pics": {
-                            "俯视-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(1)_俯视_抠图.png",
-                            "俯视-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(1)_俯视_阴影.png",
-                            "侧视-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(2)_侧视_抠图.png",
-                            "侧视-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(2)_侧视_阴影.png",
-                            "后跟-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(3)_后跟_抠图.png",
-                            "后跟-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(3)_后跟_阴影.png",
-                            "鞋底-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(4)_鞋底_抠图.png",
-                            "鞋底-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(4)_鞋底_阴影.png",
-                            "内里-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(5)_内里_抠图.png",
-                            "内里-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(5)_内里_阴影.png",
-                            "其他1-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(6)_其他1_抠图.png",
-                            "其他1-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(6)_其他1_阴影.png",
-                            "其他0-抠图": "output/2025-08-20/A596371/阴影图处理/A596371(7)_其他0_抠图.png",
-                            "其他0-阴影": "output/2025-08-20/A596371/阴影图处理/A596371(7)_其他0_阴影.png",
-                        },
-                        "800x800": [
-                            "output/2025-08-20/A596371/800x800/A596371(1)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(2)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(3)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(4)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(5)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(6)_800.png",
-                            "output/2025-08-20/A596371/800x800/A596371(7)_800.png",
-                        ],
-                    }
-                ],
-                "商品面料": "",
-                "商品内里": "",
-                "商品鞋底": "",
-                "鞋垫": "",
-                "商品标题": "女单鞋",
-                "商品价格": "300.00",
-            }
-        },
-        "succeed_folder_list": ["A596371"],
-        "temp_name": "huilima-1",
-        "temp_name_list": [
-            "huilima-1",
-            "huilima-2",
-            "huilima-3",
-            "huilima-4",
-            "xinnuo-1",
-            "xinnuo-2",
-            "xinnuo-3",
-            "huilima-6",
-            "xinjunlue-1",
-            "qingyangyizhan-1",
-        ],
-        "assigned_page_dict": {},
-        "excel_temp_goods_no_data": {},
-        "finally_goods_no_need_temps": {"A596371": ["huilima-1"]},
-        "config_data": {
-            "image_dir": "output/2025-08-20",
-            "image_order": "俯视,侧视,后跟,鞋底,内里,组合,组合2",
-            "goods_art_no": "",
-            "goods_art_nos": ["A596371"],
-            "is_check_number": False,
-            "resize_image_view": "后跟",
-            "cutout_mode": 1,
-            "logo_path": "",
-            "special_goods_art_no_folder_line": "",
-            "is_use_excel": False,
-            "excel_path": "",
-            "is_check_color_is_all": False,
-            "cutout_is_pass": True,
-            "assigned_page_dict": {},
-            "detail_is_pass": True,
-            "upload_is_pass": False,
-            "upload_is_enable": True,
-            "is_filter": False,
-            "temp_class": {
-                "huilima-1": "custom_plugins.plugins.detail_template.huilima.detail_huilima1.DetailPicGet",
-                "huilima-2": "custom_plugins.plugins.detail_template.huilima.detail_huilima2.DetailPicGet",
-                "huilima-3": "custom_plugins.plugins.detail_template.huilima.detail_huilima3.DetailPicGet",
-                "huilima-4": "custom_plugins.plugins.detail_template.huilima.detail_huilima4.DetailPicGet",
-                "xinnuo-1": "custom_plugins.plugins.detail_template.xinnuo.detail_xinnuo1.DetailPicGet",
-                "xinnuo-2": "custom_plugins.plugins.detail_template.xinnuo.detail_xinnuo2.DetailPicGet",
-                "xinnuo-3": "custom_plugins.plugins.detail_template.xinnuo.detail_xinnuo3.DetailPicGet",
-                "huilima-6": "custom_plugins.plugins.detail_template.huilima.detail_huilima6.DetailPicGet",
-                "xinjunlue-1": "custom_plugins.plugins.detail_template.xinjunlue.detail_xinjunlue1.DetailPicGet",
-                "qingyangyizhan-1": "custom_plugins.plugins.detail_template.qingyangyizhan.detail_qingyangyizhan1.DetailPicGet",
-            },
-            "temp_name": "huilima-1",
-            "temp_name_list": [
-                "huilima-1",
-                "huilima-2",
-                "huilima-3",
-                "huilima-4",
-                "xinnuo-1",
-                "xinnuo-2",
-                "xinnuo-3",
-                "huilima-6",
-                "xinjunlue-1",
-                "qingyangyizhan-1",
-            ],
-            "target_error_folder": "output/2025-08-20/软件-生成详情错误",
-            "success_handler": [],
-            "sign_text": "",
-        },
-    },
-}
-goods_no_dict = tempData["data"]["goods_no_dict"]
-params = []
-token = "Bearer 18323b96c68234597b1fa8d10fecb6bbe45cadc3"
-# onlineData = OnlineDataRequest(token)
-# aigc_clazz = AIGCDataRequest(token)
-# res = aigc_clazz.searchProgress(1120457)
-# print("res", res)
+aigc = AIGCDataRequest("Bearer f99e72d818b504d23e0581ef1b1a2b4bb687c683")
+aigc.searchProgress(1127919)