From 6e007b36cf42b3ec04e57b32e4edb8cc97f872ed Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Thu, 25 Jul 2024 11:21:27 +0800 Subject: [PATCH] feat fix --- app/service/design/service.py | 17 ++++++++--------- app/service/design/utils/upload_image.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/service/design/service.py b/app/service/design/service.py index d7f1899..9e29cc0 100644 --- a/app/service/design/service.py +++ b/app/service/design/service.py @@ -1,6 +1,5 @@ import concurrent.futures import io -from concurrent.futures import ProcessPoolExecutor import cv2 @@ -91,13 +90,13 @@ def process_object(cfg, process_id, total): else: layers = sorted(layers.layer, key=lambda x: PRIORITY_DICT.get(x['name'], float('inf'))) # 上传所有图片 - # for layer in layers: - # if 'image' in layer.keys() and layer['image'] is not None: - # uploaded_images.append({'image_obj': layer['image'], 'image_url': layer['image_url'], 'image_type': 'image'}) - # if 'pattern_image' in layer.keys() and layer['pattern_image'] is not None: - # uploaded_images.append({'image_obj': layer['pattern_image'], 'image_url': layer['pattern_image_url'], 'image_type': 'pattern_image'}) - # if 'mask' in layer.keys() and layer['mask'] is not None and layer['mask_url'] is not None: - # uploaded_images.append({'image_obj': layer['mask'], 'image_url': layer['mask_url'], 'image_type': 'mask'}) + for layer in layers: + if 'image' in layer.keys() and layer['image'] is not None: + uploaded_images.append({'image_obj': layer['image'], 'image_url': layer['image_url'], 'image_type': 'image'}) + if 'pattern_image' in layer.keys() and layer['pattern_image'] is not None: + uploaded_images.append({'image_obj': layer['pattern_image'], 'image_url': layer['pattern_image_url'], 'image_type': 'pattern_image'}) + if 'mask' in layer.keys() and layer['mask'] is not None and layer['mask_url'] is not None: + uploaded_images.append({'image_obj': layer['mask'], 'image_url': layer['mask_url'], 'image_type': 'mask'}) # 合成 items_response['synthesis_url'] = synthesis(layers, body_size, basic_info) @@ -152,7 +151,7 @@ def process_object(cfg, process_id, total): @RunTime def process_images(images): - with ProcessPoolExecutor() as executor: + with concurrent.futures.ThreadPoolExecutor() as executor: results = list(executor.map(upload_images, images)) # results = [] # for image in images: diff --git a/app/service/design/utils/upload_image.py b/app/service/design/utils/upload_image.py index 610c188..20036e1 100644 --- a/app/service/design/utils/upload_image.py +++ b/app/service/design/utils/upload_image.py @@ -46,7 +46,7 @@ from app.service.utils.oss_client import oss_upload_image # logging.warning(f"upload_png_mask runtime exception : {e}") -@RunTime +# @RunTime def upload_png_mask(front_image, object_name, mask=None): mask_url = None if mask is not None: