aidlab/AiDA_Python
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat（新功能）:design 新增两个中间结果(未分割图层) 1.color + overall_print 2.color + overall_print + print fix（修复bug）: refactor（重构）: test(增加测试):

Browse Source
This commit is contained in:
zhh
2025-09-25 15:39:17 +08:00
parent d720bf2209
commit bf1fb8e514
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/service/design_fast/design_generate.py
View File

@@ -79,7 +79,7 @@ def design_generate(request_data):
layers = sorted(layers, key=lambda s: s.get("priority", float('inf'))) layers = sorted(layers, key=lambda s: s.get("priority", float('inf')))
layers, new_size = update_base_size_priority(layers, body_size) layers, new_size = update_base_size_priority(layers, body_size)
# pattern_overall_image_url 、 pattern_print_image_url
for lay in layers: for lay in layers:
items_response['layers'].append({ items_response['layers'].append({
'image_category': "body" if lay['name'] == 'mannequin' else lay['name'], '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 "", 'gradient_string': lay['gradient_string'] if 'gradient_string' in lay.keys() else "",
'mask_url': lay['mask_url'], 'mask_url': lay['mask_url'],
'image_url': lay['image_url'] if 'image_url' in lay.keys() else None, '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_overall_image_url': lay['pattern_overall_image_url'] if 'pattern_overall_image_url' in lay.keys() else None,
'pattern_print_image': lay['pattern_print_image'] if 'pattern_print_image' 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, # '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'], 'image_url': item_result['front_image_url'],
'mask_url': item_result['mask_url'], 'mask_url': item_result['mask_url'],
"gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", "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_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' 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_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None,
}) })
items_response['layers'].append({ items_response['layers'].append({
@@ -118,8 +118,8 @@ def design_generate(request_data):
'image_url': item_result['back_image_url'], 'image_url': item_result['back_image_url'],
'mask_url': item_result['mask_url'], 'mask_url': item_result['mask_url'],
"gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", "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_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' 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_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']) 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 "", 'gradient_string': lay['gradient_string'] if 'gradient_string' in lay.keys() else "",
'mask_url': lay['mask_url'], 'mask_url': lay['mask_url'],
'image_url': lay['image_url'] if 'image_url' in lay.keys() else None, '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_overall_image_url': lay['pattern_overall_image_url'] if 'pattern_overall_image_url' in lay.keys() else None,
'pattern_print_image': lay['pattern_print_image'] if 'pattern_print_image' 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, # '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'], 'image_url': item_result['front_image_url'],
'mask_url': item_result['mask_url'], 'mask_url': item_result['mask_url'],
"gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", "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_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' 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_print_image_url': item_result['pattern_print_image_url'] if 'pattern_print_image_url' in item_result.keys() else None,
}) })
items_response['layers'].append({ items_response['layers'].append({
@@ -205,8 +205,8 @@ def design_generate_v2(request_data):
'image_url': item_result['back_image_url'], 'image_url': item_result['back_image_url'],
'mask_url': item_result['mask_url'], 'mask_url': item_result['mask_url'],
"gradient_string": item_result['gradient_string'] if 'gradient_string' in item_result.keys() else "", "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_overall_image_url': item_result['pattern_overall_image_url'] if 'pattern_overall_image_url' 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_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']) items_response['synthesis_url'] = synthesis_single(item_result['front_image'], item_result['back_image'])

13
app/service/design_fast/utils/organize.py
View File

@@ -32,7 +32,9 @@ def organize_clothing(layer):
resize_scale=layer["resize_scale"], resize_scale=layer["resize_scale"],
mask=cv2.resize(layer['mask'], layer["front_image"].size), mask=cv2.resize(layer['mask'], layer["front_image"].size),
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", 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'], pattern_image=layer['pattern_image'],
# back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" # 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"], resize_scale=layer["resize_scale"],
mask=cv2.resize(layer['mask'], layer["front_image"].size), mask=cv2.resize(layer['mask'], layer["front_image"].size),
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", 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 "" # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
) )
return front_layer, back_layer return front_layer, back_layer
@@ -80,7 +83,8 @@ def organize_accessories(layer):
resize_scale=layer["resize_scale"], resize_scale=layer["resize_scale"],
mask=cv2.resize(layer['mask'], layer["front_image"].size), mask=cv2.resize(layer['mask'], layer["front_image"].size),
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", 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'], pattern_image=layer['pattern_image'],
# back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else "" # 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"], resize_scale=layer["resize_scale"],
mask=cv2.resize(layer['mask'], layer["front_image"].size), mask=cv2.resize(layer['mask'], layer["front_image"].size),
gradient_string=layer['gradient_string'] if 'gradient_string' in layer.keys() else "", 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 "" # back_perspective_url=layer['back_perspective_url'] if 'back_perspective_url' in layer.keys() else ""
) )
return front_layer, back_layer return front_layer, back_layer