From bf1fb8e514df99ad35d6bf33a4d684c730832ea7 Mon Sep 17 00:00:00 2001 From: zhh Date: Thu, 25 Sep 2025 15:39:17 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=89:design=20=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E4=B8=AD=E9=97=B4=E7=BB=93=E6=9E=9C(=E6=9C=AA=E5=88=86?= =?UTF-8?q?=E5=89=B2=E5=9B=BE=E5=B1=82)=201.color=20+=20overall=5Fprint=20?= =?UTF-8?q?=202.color=20+=20overall=5Fprint=20+=20print=20fix=EF=BC=88?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=89:=20refactor=EF=BC=88=E9=87=8D?= =?UTF-8?q?=E6=9E=84=EF=BC=89:=20test(=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/design_fast/design_generate.py | 26 +++++++++++----------- app/service/design_fast/utils/organize.py | 13 +++++++---- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/service/design_fast/design_generate.py b/app/service/design_fast/design_generate.py index 4c3f320..1ef5a3b 100644 --- a/app/service/design_fast/design_generate.py +++ b/app/service/design_fast/design_generate.py @@ -79,7 +79,7 @@ def design_generate(request_data): layers = sorted(layers, key=lambda s: s.get("priority", float('inf'))) layers, new_size = update_base_size_priority(layers, body_size) - + # pattern_overall_image_url 、 pattern_print_image_url for lay in layers: items_response['layers'].append({ 'image_category': "body" if lay['name'] == 'mannequin' else lay['name'], @@ -90,8 +90,8 @@ def design_generate(request_data): 'gradient_string': lay['gradient_string'] if 'gradient_string' in lay.keys() else "", 'mask_url': lay['mask_url'], 'image_url': lay['image_url'] if 'image_url' in lay.keys() else None, - 'pattern_overall_image': lay['pattern_overall_image'] if 'pattern_overall_image' in lay.keys() else None, - 'pattern_print_image': lay['pattern_print_image'] if 'pattern_print_image' in lay.keys() else None, + 'pattern_overall_image_url': lay['pattern_overall_image_url'] if 'pattern_overall_image_url' in lay.keys() else None, + 'pattern_print_image_url': lay['pattern_print_image_url'] if 'pattern_print_image_url' in lay.keys() else None, # 'back_perspective_url': lay['back_perspective_url'] if 'back_perspective_url' in lay.keys() else None, }) @@ -106,8 +106,8 @@ def design_generate(request_data): 'image_url': item_result['front_image_url'], 'mask_url': item_result['mask_url'], "gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", - 'pattern_overall_image': item_result['pattern_overall_image'] if 'pattern_overall_image' in item_result.keys() else None, - 'pattern_print_image': item_result['pattern_print_image'] if 'pattern_print_image' in item_result.keys() else None, + 'pattern_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' in item_result.keys() else None, + 'pattern_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None, }) items_response['layers'].append({ @@ -118,8 +118,8 @@ def design_generate(request_data): 'image_url': item_result['back_image_url'], 'mask_url': item_result['mask_url'], "gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", - 'pattern_overall_image': item_result['pattern_overall_image'] if 'pattern_overall_image' in item_result.keys() else None, - 'pattern_print_image': item_result['pattern_print_image'] if 'pattern_print_image' in item_result.keys() else None, + 'pattern_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' in item_result.keys() else None, + 'pattern_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None, }) items_response['synthesis_url'] = synthesis_single(item_result['front_image'], item_result['back_image']) @@ -177,8 +177,8 @@ def design_generate_v2(request_data): 'gradient_string': lay['gradient_string'] if 'gradient_string' in lay.keys() else "", 'mask_url': lay['mask_url'], 'image_url': lay['image_url'] if 'image_url' in lay.keys() else None, - 'pattern_overall_image': lay['pattern_overall_image'] if 'pattern_overall_image' in lay.keys() else None, - 'pattern_print_image': lay['pattern_print_image'] if 'pattern_print_image' in lay.keys() else None, + 'pattern_overall_image_url': lay['pattern_overall_image_url'] if 'pattern_overall_image_url' in lay.keys() else None, + 'pattern_print_image_url': lay['pattern_print_image_url'] if 'pattern_print_image_url' in lay.keys() else None, # 'back_perspective_url': lay['back_perspective_url'] if 'back_perspective_url' in lay.keys() else None, }) @@ -193,8 +193,8 @@ def design_generate_v2(request_data): 'image_url': item_result['front_image_url'], 'mask_url': item_result['mask_url'], "gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", - 'pattern_overall_image': item_result['pattern_overall_image'] if 'pattern_overall_image' in item_result.keys() else None, - 'pattern_print_image': item_result['pattern_print_image'] if 'pattern_print_image' in item_result.keys() else None, + 'pattern_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' in item_result.keys() else None, + 'pattern_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None, }) items_response['layers'].append({ @@ -205,8 +205,8 @@ def design_generate_v2(request_data): 'image_url': item_result['back_image_url'], 'mask_url': item_result['mask_url'], "gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", - 'pattern_overall_image': item_result['pattern_overall_image'] if 'pattern_overall_image' in item_result.keys() else None, - 'pattern_print_image': item_result['pattern_print_image'] if 'pattern_print_image' in item_result.keys() else None, + 'pattern_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' in item_result.keys() else None, + 'pattern_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None, }) items_response['synthesis_url'] = synthesis_single(item_result['front_image'], item_result['back_image']) diff --git a/app/service/design_fast/utils/organize.py b/app/service/design_fast/utils/organize.py index 26bfa48..f5c8144 100644 --- a/app/service/design_fast/utils/organize.py +++ b/app/service/design_fast/utils/organize.py @@ -32,7 +32,9 @@ def organize_clothing(layer): resize_scale=layer["resize_scale"], mask=cv2.resize(layer['mask'], layer["front_image"].size), gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", - pattern_image_url=layer['pattern_image_url'], + pattern_overall_image_url=layer['pattern_overall_image_url'], + pattern_print_image_url=layer['pattern_print_image_url'], + pattern_image=layer['pattern_image'], # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" ) @@ -49,7 +51,8 @@ def organize_clothing(layer): resize_scale=layer["resize_scale"], mask=cv2.resize(layer['mask'], layer["front_image"].size), gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", - pattern_image_url=layer['pattern_image_url'], + pattern_overall_image_url=layer['pattern_overall_image_url'], + pattern_print_image_url=layer['pattern_print_image_url'], # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" ) return front_layer, back_layer @@ -80,7 +83,8 @@ def organize_accessories(layer): resize_scale=layer["resize_scale"], mask=cv2.resize(layer['mask'], layer["front_image"].size), gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", - pattern_image_url=layer['pattern_image_url'], + pattern_overall_image_url=layer['pattern_overall_image_url'], + pattern_print_image_url=layer['pattern_print_image_url'], pattern_image=layer['pattern_image'], # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" ) @@ -97,7 +101,8 @@ def organize_accessories(layer): resize_scale=layer["resize_scale"], mask=cv2.resize(layer['mask'], layer["front_image"].size), gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", - pattern_image_url=layer['pattern_image_url'], + pattern_overall_image_url=layer['pattern_overall_image_url'], + pattern_print_image_url=layer['pattern_print_image_url'], # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" ) return front_layer, back_layer