Merge branch 'dev-python'

python/config.ini

@@ -1,8 +1,8 @@
 [app]
 host=127.0.0.1
 port=7074
-debug=false
-env=prod
+debug=true
+env=dev
 [dev]
 origin= http://my2.pubdata.cn
 host= mybackend2.pubdata.cn

python/services/deal_cutout.py

@@ -16,6 +16,10 @@ def urlPilImage(url):
     tempIm = BytesIO(yzmdata.content)
     im = Image.open(tempIm)
     return im
+def check_path(_path):
+        if not os.path.exists(_path):
+            os.mkdir(_path)
+        return True
 class DealCutout:
 
     def __init__(self, token):
@@ -199,11 +203,18 @@ class DealModelForm:
         failCount = 0
         is_finished = False
         root_path = ""
+        if len(generate_ids) > 0:
+            root_path = generate_ids.loc[0]["root_path"]
+            save_path = f"{root_path}/已扣图"
+            check_path(save_path)
+        else:
+            return is_finished,successCount,failCount,root_path
         for idx,generate in generate_ids.iterrows():
             for respItem in responseData:
                 if generate["generate_id"]!=respItem["id"]:
                     continue
                 status = respItem['status']
+                print("status",status)
                 if status == -1:
                     failCount+=1
                     csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
@@ -213,10 +224,14 @@ class DealModelForm:
                     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}")
+                    file_name = generate["file_name"]
+                    file_e = generate["file_e"]
+                    if result_image_pil.mode == 'RGBA':
+                        result_image_pil.save(f"{save_path}/{file_name}.png")
+                    else:
+                        result_image_pil.save(f"{save_path}/{file_name}.jpg")
                     csvData.drop(csvData.loc[csvData['generate_id'] == generate["generate_id"]].index,inplace=True)
                     break
-        csvData.to_csv(self.csvName)
+        csvData.to_csv(self.csvName, index=False)
         is_finished = True if len(search_generate_ids) == (successCount+failCount) else False
         return is_finished,successCount,failCount,root_path

python/services/other/module_online_data.py

@@ -178,7 +178,6 @@ class GetOnlineData(object):
         }
 
         _s = requests.post(url=url, headers=headers, files=files, timeout=60)
-        # print(_s.text)
         response_data = _s.json()
         return response_data["data"]["url"]
     def model_form_segment(self, data=None):