diff --git a/app/service/design_fast/pipeline/split.py b/app/service/design_fast/pipeline/split.py index fe0c45a..192529e 100644 --- a/app/service/design_fast/pipeline/split.py +++ b/app/service/design_fast/pipeline/split.py @@ -21,7 +21,9 @@ class Split(object): try: if result['name'] in ('outwear', 'dress', 'blouse', 'skirt', 'trousers', 'tops', 'bottoms', 'others'): if result.get('design_type', None) == 'merge': - # merge 不需要返回mask (红绿图) + ori_front_mask = result['front_mask'].copy() + ori_back_mask = result['back_mask'].copy() + if result['resize_scale'][0] == 1.0 and result['resize_scale'][1] == 1.0: front_mask = result['front_mask'] back_mask = result['back_mask'] @@ -43,6 +45,20 @@ class Split(object): result_front_image_pil = Image.fromarray(cv2.cvtColor(result_front_image, cv2.COLOR_BGR2RGBA)) result['front_image'], result["front_image_url"], _ = upload_png_mask(self.minio_client, result_front_image_pil, f'{generate_uuid()}', mask=None) + height, width = ori_front_mask.shape + mask_image = np.zeros((height, width, 3)) + mask_image[ori_front_mask != 0] = [0, 0, 255] + mask_image[ori_back_mask != 0] = [0, 255, 0] + rbga_mask = rgb_to_rgba(mask_image, ori_front_mask + ori_back_mask) + mask_pil = Image.fromarray(cv2.cvtColor(rbga_mask.astype(np.uint8), cv2.COLOR_BGR2RGBA)) + image_data = io.BytesIO() + mask_pil.save(image_data, format='PNG') + image_data.seek(0) + image_bytes = image_data.read() + req = oss_upload_image(oss_client=self.minio_client, bucket="aida-clothing", object_name=f"mask/mask_{generate_uuid()}.png", image_bytes=image_bytes) + result['mask_url'] = req.bucket_name + "/" + req.object_name + + result_back_image = np.zeros_like(rgba_image) back_mask = cv2.resize(back_mask, new_size, interpolation=cv2.INTER_AREA) result_back_image[back_mask != 0] = rgba_image[back_mask != 0] diff --git a/app/service/design_fast/utils/organize.py b/app/service/design_fast/utils/organize.py index 6cf06ec..82e8026 100644 --- a/app/service/design_fast/utils/organize.py +++ b/app/service/design_fast/utils/organize.py @@ -79,7 +79,7 @@ def organize_others(layer): front_layer = dict(priority=layer['priority'] if layer.get("layer_order", False) else PRIORITY_DICT.get(f'{layer["name"].lower()}_front', None), name=f'{layer["name"].lower()}_front', image=layer["front_image"], - # mask_image=layer['front_mask_image'], + mask_image=layer['front_mask_image'], image_url=layer['front_image_url'], mask_url=layer.get('mask_url', None), sacle=layer['scale'], @@ -97,7 +97,7 @@ def organize_others(layer): back_layer = dict(priority=-layer.get("priority", 0) if layer.get("layer_order", False) else PRIORITY_DICT.get(f'{layer["name"].lower()}_back', None), name=f'{layer["name"].lower()}_back', image=layer["back_image"], - # mask_image=layer['back_mask_image'], + mask_image=layer['back_mask_image'], image_url=layer['back_image_url'], mask_url=layer.get('mask_url', None), sacle=layer['scale'],