rambo 11 місяців тому
батько
коміт
4e2f5deab2
2 змінених файлів з 21 додано та 21 видалено
  1. 2 2
      python/api.py
  2. 19 19
      python/services/deal_cutout.py

+ 2 - 2
python/api.py

@@ -82,8 +82,8 @@ def model_form_segment(params:ModelFormModel):
 @app.post("/api/search_bacth_progress", description="人台抠图")
 def search_bacth_progress(params:SearchProgress):
     modelFormClazz = DealModelForm(token=params.token,params=params)
-    is_finished,successCount,failCount = modelFormClazz.search_progress()
-    return success({"is_finished": is_finished,"success_count": successCount,"fail_count": failCount})
+    is_finished,successCount,failCount,root_path = modelFormClazz.search_progress()
+    return success({"is_finished": is_finished,"success_count": successCount,"fail_count": failCount,"save_root_path":root_path})
 @app.post("/api/request_hlm", description="请求查询可用余额")
 async def requestHlm(params: RequestHlm):
     token = params.token

+ 19 - 19
python/services/deal_cutout.py

@@ -198,25 +198,25 @@ class DealModelForm:
         successCount = 0
         failCount = 0
         is_finished = False
+        root_path = ""
         for idx,generate in generate_ids.iterrows():
-            filtered_results = list(filter(lambda d: d.get('id') == 3, responseData))
-            
+            for respItem in responseData:
+                if generate["generate_id"]!=respItem["id"]:
+                    continue
+                status = respItem['status']
+                if status == -1:
+                    failCount+=1
+                    csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
+                    break
+                if status == 2:
+                    successCount+=1
+                    result_image_url = respItem['result_image_urls'][0]
+                    result_image_pil = urlPilImage(result_image_url)
+                    root_path = generate["root_path"]
+                    file_name = generate["file"]
+                    result_image_pil.save(f"{root_path}/已扣图/{file_name}")
+                    csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
+                    break
         csvData.to_csv(self.csvName)
         is_finished = True if len(search_generate_ids) == (successCount+failCount) else False
-        return is_finished,successCount,failCount
-    # def getElement(self,responseData):
-    #  for respItem in responseData:
-    #             status = respItem['status']
-    #             if status == -1:
-    #                 failCount+=1
-    #                 csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
-    #                 continue
-    #             if status == 2:
-    #                 successCount+=1
-    #                 result_image_url = respItem['result_image_urls'][0]
-    #                 result_image_pil = urlPilImage(result_image_url)
-    #                 root_path = generate["root_path"]
-    #                 file_name = generate["file"]
-    #                 result_image_pil.save(f"{root_path}/已扣图/{file_name}")
-    #                 csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
-    #                 continue
+        return is_finished,successCount,failCount,root_path