feat(新功能): design batch 代码 更新
fix(修复bug): docs(文档变更): refactor(重构): test(增加测试):
This commit is contained in:
@@ -5,9 +5,9 @@ from celery import Celery
|
||||
from minio import Minio
|
||||
|
||||
from app.core.config import *
|
||||
from app.service.design_batch.item import BodyItem, TopItem, BottomItem
|
||||
from app.service.design_batch.item import BodyItem, TopItem, BottomItem, AccessoriesItem
|
||||
from app.service.design_batch.utils.MQ import publish_status
|
||||
from app.service.design_batch.utils.organize import organize_body, organize_clothing
|
||||
from app.service.design_batch.utils.organize import organize_body, organize_clothing, organize_accessories
|
||||
from app.service.design_batch.utils.save_json import oss_upload_json
|
||||
from app.service.design_batch.utils.synthesis_item import update_base_size_priority, synthesis, synthesis_single
|
||||
|
||||
@@ -19,6 +19,8 @@ logging.getLogger('pika').setLevel(logging.WARNING)
|
||||
logger = logging.getLogger()
|
||||
minio_client = Minio(MINIO_URL, access_key=MINIO_ACCESS, secret_key=MINIO_SECRET, secure=MINIO_SECURE)
|
||||
|
||||
print("start")
|
||||
|
||||
|
||||
def process_item(item, basic):
|
||||
# 处理project中单个item
|
||||
@@ -28,9 +30,14 @@ def process_item(item, basic):
|
||||
elif item['type'].lower() in ['blouse', 'outwear', 'dress', 'tops']:
|
||||
top_server = TopItem(data=item, basic=basic, minio_client=minio_client)
|
||||
item_data = top_server.process()
|
||||
else:
|
||||
elif item['type'].lower() in ['skirt', 'trousers', 'bottoms']:
|
||||
bottom_server = BottomItem(data=item, basic=basic, minio_client=minio_client)
|
||||
item_data = bottom_server.process()
|
||||
elif item['type'].lower() in ['accessories']:
|
||||
bottom_server = AccessoriesItem(data=item, basic=basic, minio_client=minio_client)
|
||||
item_data = bottom_server.process()
|
||||
else:
|
||||
raise NotImplementedError(f"Item type {item['type']} not implemented")
|
||||
return item_data
|
||||
|
||||
|
||||
@@ -40,6 +47,10 @@ def process_layer(item, layers):
|
||||
body_layer = organize_body(item)
|
||||
layers.append(body_layer)
|
||||
return item['body_image'].size
|
||||
elif item['name'] == 'accessories':
|
||||
front_layer, back_layer = organize_accessories(item)
|
||||
layers.append(front_layer)
|
||||
layers.append(back_layer)
|
||||
else:
|
||||
front_layer, back_layer = organize_clothing(item)
|
||||
layers.append(front_layer)
|
||||
@@ -48,6 +59,9 @@ def process_layer(item, layers):
|
||||
|
||||
@celery_app.task
|
||||
def batch_design(objects_data, tasks_id, json_name):
|
||||
print(objects_data)
|
||||
print(tasks_id)
|
||||
print(json_name)
|
||||
object_response = []
|
||||
threads = []
|
||||
active_threads = 0
|
||||
@@ -121,6 +135,7 @@ def batch_design(objects_data, tasks_id, json_name):
|
||||
for t in threads:
|
||||
t.join()
|
||||
logger.debug(object_response)
|
||||
print(object_response)
|
||||
oss_upload_json(minio_client, object_response, json_name)
|
||||
publish_status(tasks_id, "ok", json_name)
|
||||
return object_response
|
||||
|
||||
Reference in New Issue
Block a user