From 1d299e9ad186d0f4f103cd170c9bc6bb2bdecd11 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Fri, 23 Aug 2024 11:08:06 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=20=20=E7=BB=99=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=8F=90=E4=BE=9Bsketch=20mask=20=E6=A0=87=E6=B3=A8=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/design/items/clothing.py | 4 +-- app/service/design/items/pipelines/split.py | 28 +++++++++++++++------ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/service/design/items/clothing.py b/app/service/design/items/clothing.py index 7dd845b..953cecf 100644 --- a/app/service/design/items/clothing.py +++ b/app/service/design/items/clothing.py @@ -30,7 +30,7 @@ class Clothing(object): image=self.result["front_image"], # mask_image=self.result['front_mask_image'], image_url=self.result['front_image_url'], - mask_url=self.result['front_mask_url'], + mask_url=self.result['mask_url'], sacle=self.result['scale'], clothes_keypoint=self.result['clothes_keypoint'], position=start_point, @@ -48,7 +48,7 @@ class Clothing(object): image=self.result["back_image"], # mask_image=self.result['back_mask_image'], image_url=self.result['back_image_url'], - mask_url=self.result['back_mask_url'], + mask_url=self.result['mask_url'], sacle=self.result['scale'], clothes_keypoint=self.result['clothes_keypoint'], position=start_point, diff --git a/app/service/design/items/pipelines/split.py b/app/service/design/items/pipelines/split.py index 5b7f1bc..6569c5d 100644 --- a/app/service/design/items/pipelines/split.py +++ b/app/service/design/items/pipelines/split.py @@ -1,3 +1,4 @@ +import io import logging import cv2 @@ -5,8 +6,9 @@ import numpy as np from PIL import Image from cv2 import cvtColor, COLOR_BGR2RGBA -from app.service.utils.decorator import ClassCallRunTime +from app.core.config import AIDA_CLOTHING from app.service.utils.generate_uuid import generate_uuid +from app.service.utils.oss_client import oss_upload_image from ..builder import PIPELINES from ...utils.conversion_image import rgb_to_rgba from ...utils.upload_image import upload_png_mask @@ -33,20 +35,32 @@ class Split(object): front_mask = cv2.resize(front_mask, new_size) result_front_image[front_mask != 0] = rgba_image[front_mask != 0] result_front_image_pil = Image.fromarray(cvtColor(result_front_image, COLOR_BGR2RGBA)) - result['front_image'], result["front_image_url"], result["front_mask_url"] = upload_png_mask(result_front_image_pil, f'{generate_uuid()}', mask=front_mask) + result['front_image'], result["front_image_url"], _ = upload_png_mask(result_front_image_pil, f'{generate_uuid()}', mask=None) + + height, width = front_mask.shape + mask_image = np.zeros((height, width, 3)) + mask_image[front_mask != 0] = [0, 0, 255] + if result["name"] in ('blouse', 'dress', 'outwear', 'tops'): result_back_image = np.zeros_like(rgba_image) back_mask = cv2.resize(back_mask, new_size) result_back_image[back_mask != 0] = rgba_image[back_mask != 0] result_back_image_pil = Image.fromarray(cvtColor(result_back_image, COLOR_BGR2RGBA)) - result['back_image'], result["back_image_url"], result["back_mask_url"] = upload_png_mask(result_back_image_pil, f'{generate_uuid()}', mask=back_mask) + result['back_image'], result["back_image_url"], _ = upload_png_mask(result_back_image_pil, f'{generate_uuid()}', mask=None) + mask_image[back_mask != 0] = [0, 255, 0] + + image_bytes = cv2.imencode(".jpg", mask_image)[1].tobytes() + req = oss_upload_image(bucket=AIDA_CLOTHING, object_name=f"mask/mask_{generate_uuid()}.jpg", image_bytes=image_bytes) + result['mask_url'] = req.bucket_name + "/" + req.object_name else: + image_bytes = cv2.imencode(".jpg", mask_image)[1].tobytes() + req = oss_upload_image(bucket=AIDA_CLOTHING, object_name=f"mask/mask_{generate_uuid()}.jpg", image_bytes=image_bytes) + result['mask_url'] = req.bucket_name + "/" + req.object_name result['back_image'] = None result["back_image_url"] = None - result["back_mask_url"] = None - result['back_mask_image'] = None - - # 创建中间图层 + # result["back_mask_url"] = None + # result['back_mask_image'] = None + # 创建中间图层 result_pattern_image_rgba = rgb_to_rgba(result['pattern_image'], result['mask']) result_pattern_image_pil = Image.fromarray(cvtColor(result_pattern_image_rgba, COLOR_BGR2RGBA)) result['pattern_image'], result['pattern_image_url'], _ = upload_png_mask(result_pattern_image_pil, f'{generate_uuid()}')