feat design 提速测试

fix

app/service/design_test/batch_design.py

@@ -13,7 +13,8 @@ from minio import Minio
 from app.core.config import PRIORITY_DICT
 from app.service.design.utils.redis_utils import Redis
 from app.service.design_test.item import BodyItem, TopItem, BottomItem
-from app.service.utils.oss_client import oss_upload_image
+from app.service.utils.decorator import RunTime
+from app.service.utils.new_oss_client import oss_upload_image
 
 id_lock = threading.Lock()
 
@@ -298,10 +299,11 @@ def synthesis(data, size, basic_info):
         logging.warning(f"synthesis runtime exception : {e}")
 
 
+@RunTime
 def design_generate(request_data):
     objects_data = request_data.dict()['objects']
     process_id = request_data.dict()['process_id']
-    object_response = []
+    object_response = {}
     threads = []
     active_threads = 0
     lock = threading.Lock()
@@ -362,7 +364,7 @@ def design_generate(request_data):
         update_progress(process_id, total)
 
         with lock:
-            object_response.append(items_response)
+            object_response[step] = items_response
             active_threads -= 1
 
     for step, object in enumerate(objects_data):

app/service/design_test/pipeline/color.py

@@ -3,7 +3,7 @@ import logging
 import cv2
 import numpy as np
 
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 logger = logging.getLogger()
 

app/service/design_test/pipeline/loading.py

@@ -5,7 +5,7 @@ import cv2
 import numpy as np
 from PIL import Image
 
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 logger = logging.getLogger()
 

app/service/design_test/pipeline/print_painting.py

@@ -4,7 +4,7 @@ import cv2
 import numpy as np
 from PIL import Image
 
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 
 class PrintPainting:

app/service/design_test/pipeline/segmentation.py

@@ -6,7 +6,7 @@ import numpy as np
 
 from app.core.config import SEG_CACHE_PATH
 from app.service.design.utils.design_ensemble import get_seg_result
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 logger = logging.getLogger()
 

app/service/design_test/pipeline/split.py

@@ -8,9 +8,9 @@ from cv2 import cvtColor, COLOR_BGR2RGBA
 
 from app.core.config import AIDA_CLOTHING
 from app.service.design.utils.conversion_image import rgb_to_rgba
-from app.service.design.utils.upload_image import upload_png_mask
+from app.service.design_test.utils.upload_image import upload_png_mask
 from app.service.utils.generate_uuid import generate_uuid
-from app.service.utils.oss_client import oss_upload_image
+from app.service.utils.new_oss_client import oss_upload_image
 
 
 class Split(object):

app/service/design_test/utils/upload_image.py

@@ -13,12 +13,11 @@ import logging
 import cv2
 
 from app.core.config import *
-from app.service.utils.decorator import RunTime
-from app.service.utils.oss_client import oss_upload_image
+from app.service.utils.new_oss_client import oss_upload_image
 
 
 # @RunTime
-def upload_png_mask(front_image, object_name, mask=None):
+def upload_png_mask(minio_client, front_image, object_name, mask=None):
     try:
         mask_url = None
         if mask is not None:
@@ -26,30 +25,15 @@ def upload_png_mask(front_image, object_name, mask=None):
             # 将掩模的3通道转换为4通道，白色部分不透明，黑色部分透明
             rgba_image = cv2.cvtColor(mask_inverted, cv2.COLOR_BGR2BGRA)
             rgba_image[rgba_image[:, :, 0] == 0] = [0, 0, 0, 0]
-            # image_bytes = io.BytesIO()
-            # image_bytes.write(cv2.imencode('.png', rgba_image)[1].tobytes())
-            # image_bytes.seek(0)
-            # mask_url = f"{AIDA_CLOTHING}/{minio_client.put_object('aida-clothing', f'mask/mask_{object_name}.png', image_bytes, len(image_bytes.getvalue()), content_type='image/png').object_name}"
-            # oss upload ####################
-            req = oss_upload_image(bucket=AIDA_CLOTHING, object_name=f"mask/mask_{object_name}.png", image_bytes=cv2.imencode('.png', rgba_image)[1])
+            req = oss_upload_image(oss_client=minio_client, bucket=AIDA_CLOTHING, object_name=f"mask/mask_{object_name}.png", image_bytes=cv2.imencode('.png', rgba_image)[1])
             mask_url = f"{AIDA_CLOTHING}/mask/mask_{object_name}.png"
 
         image_data = io.BytesIO()
         front_image.save(image_data, format='PNG')
         image_data.seek(0)
         image_bytes = image_data.read()
-        # image_url = f"{AIDA_CLOTHING}/{minio_client.put_object('aida-clothing', f'image/image_{object_name}.png', io.BytesIO(image_bytes), len(image_bytes), content_type='image/png').object_name}"
-        req = oss_upload_image(bucket=AIDA_CLOTHING, object_name=f"image/image_{object_name}.png", image_bytes=image_bytes)
+        req = oss_upload_image(oss_client=minio_client, bucket=AIDA_CLOTHING, object_name=f"image/image_{object_name}.png", image_bytes=image_bytes)
         image_url = f"{AIDA_CLOTHING}/image/image_{object_name}.png"
         return front_image, image_url, mask_url
     except Exception as e:
         logging.warning(f"upload_png_mask runtime exception : {e}")
-
-
-# @RunTime
-# def upload_png_mask(front_image, object_name, mask=None):
-#     mask_url = None
-#     if mask is not None:
-#         mask_url = f"{AIDA_CLOTHING}/mask/mask_{object_name}.png"
-#     image_url = f"{AIDA_CLOTHING}/image/image_{object_name}.png"
-#     return front_image, image_url, mask_url