feat
fix
This commit is contained in:
@@ -62,7 +62,7 @@ def generate(request_data):
|
||||
obj = futures[future]
|
||||
return_response[obj] = future.result()[0]
|
||||
return_png_mask.extend(future.result()[1])
|
||||
upload_results = process_images(return_png_mask)
|
||||
# upload_results = process_images(return_png_mask)
|
||||
final_progress(process_id)
|
||||
return return_response
|
||||
|
||||
@@ -90,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)
|
||||
|
||||
Reference in New Issue
Block a user