Merge branch 'dev-python'

python/api.py

@@ -52,20 +52,20 @@ async def segmentImages(params: SegmentImages):
         # need_cutout_images = service.check_need_cutout_images(file_path)
         deal_cutout_cloth.need_cutout_images = need_cutout_images
         deal_cutout_cloth.output_type = output_type
-        result = deal_cutout_cloth.startDispose()
+        result, save_root_path = deal_cutout_cloth.startDispose()
     elif image_type == 0 and segment_type == 1:
         deal_cutout_mode = DealCutout(token)
         # 通用-精细化抠图
         deal_cutout_mode.need_cutout_images = need_cutout_images
         deal_cutout_mode.output_type = output_type
-        result = deal_cutout_mode.startDispose()
+        result, save_root_path = deal_cutout_mode.startDispose()
     elif image_type == 0 and segment_type == 0:
         # 通用-普通抠图
         deal_cutout_mode = DealCutout(token)
         deal_cutout_mode.need_cutout_images = need_cutout_images
         deal_cutout_mode.output_type = output_type
-        result = deal_cutout_mode.normalMode()
-    return success({"result": result})
+        result, save_root_path = deal_cutout_mode.normalMode()
+    return success({"result": result, "save_root_path": save_root_path})
 
 
 @app.post("/api/request_hlm", description="请求查询可用余额")

python/services/deal_cutout.py

@@ -27,8 +27,10 @@ class DealCutout:
         self.get_online_data.refresh_headers()
         num = 0
         result_array = []
+        save_root_path = ""
         for image_data in self.need_cutout_images:
             num += 1
+            save_root_path = "{}/已扣图".format(image_data["root_path"])
             upload_pic_dict = {}
             upload_pic_dict = DealOneImageBeforehand(
                 image_data=image_data,
@@ -45,7 +47,7 @@ class DealCutout:
                 token=self.token,
             ).run(image_data, upload_pic_dict)
             result_array.append(result)
-        return result_array
+        return result_array, save_root_path
 
     def normalMode(self):
         """普通模式"""
@@ -53,8 +55,10 @@ class DealCutout:
         num = 0
         result_array = []
         print("self.need_cutout_images", self.need_cutout_images)
+        save_root_path = ""
         for image_data in self.need_cutout_images:
             num += 1
+            save_root_path = "{}/已扣图".format(image_data["root_path"])
             result = DealOneImageBeforehand(
                 image_data=image_data,
                 lock=self.lock,
@@ -63,7 +67,7 @@ class DealCutout:
                 token=self.token,
             ).get_image_cut_noraml(image_data)
             result_array.append(result)
-        return result_array
+        return result_array, save_root_path
 
 
 class DealCloths:
@@ -86,8 +90,10 @@ class DealCloths:
         self.get_online_data.refresh_headers()
         num = 0
         result_array = []
+        save_root_path = ""
         for image_data in self.need_cutout_images:
             num += 1
+            save_root_path = "{}/已扣图".format(image_data["root_path"])
             upload_pic_dict = {}
             hand = DealOneImageBeforehand(
                 image_data=image_data,
@@ -98,4 +104,4 @@ class DealCloths:
             )
             upload_pic_dict = hand.get_image_cut_cloths(image_data)
             result_array.append(upload_pic_dict)
-        return result_array
+        return result_array, save_root_path

python/services/deal_one_image.py

@@ -406,7 +406,6 @@ class DealOneImageBeforehand(Base):
         original_pic = Picture(self.file_path)
         original_pic.im = self.get_image_orientation(original_pic.im)
         original_pic.x, original_pic.y = original_pic.im.size
-
         original_pic.im = original_pic.im.convert("RGB")
         image_deal_info = {}
         image_deal_info["原始图片大小"] = (original_pic.x, original_pic.y)