From 2a06825446a835c0cfaefdc1fb68fe811d86c7b6 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Wed, 11 Dec 2024 11:35:41 +0800 Subject: [PATCH] design design batch --- app/service/design_batch/design_batch_celery.py | 2 +- app/service/design_batch/service.py | 2 +- app/service/design_batch/utils/save_json.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/service/design_batch/design_batch_celery.py b/app/service/design_batch/design_batch_celery.py index d1b4240..e8e4b9d 100644 --- a/app/service/design_batch/design_batch_celery.py +++ b/app/service/design_batch/design_batch_celery.py @@ -108,7 +108,7 @@ def batch_design(objects_data, tasks_id, json_name): with lock: object_response.append(items_response) - logger.info(items_response) + # logger.info(items_response) publish_status(tasks_id, step + 1, items_response) active_threads -= 1 diff --git a/app/service/design_batch/service.py b/app/service/design_batch/service.py index fcd278c..e2a9b23 100644 --- a/app/service/design_batch/service.py +++ b/app/service/design_batch/service.py @@ -5,7 +5,7 @@ from app.service.design_batch.utils.MQ import publish_status async def start_design_batch_generate(data, file): - generate_clothes_task = batch_design.delay(json.loads(file.decode())['objects'], data.total, data.file_name) + generate_clothes_task = batch_design(json.loads(file.decode())['objects'], data.total, data.file_name) print(generate_clothes_task) publish_status(data.tasks_id, "0/100", "") return {"task_id": data.tasks_id} diff --git a/app/service/design_batch/utils/save_json.py b/app/service/design_batch/utils/save_json.py index f8f2925..915df69 100644 --- a/app/service/design_batch/utils/save_json.py +++ b/app/service/design_batch/utils/save_json.py @@ -1,3 +1,4 @@ +import io import json import logging import os @@ -14,6 +15,7 @@ def oss_upload_json(oss_client, json_data, object_name): file_path = os.path.join(save_dir, object_name) with open(file_path, 'w') as file: json.dump(json_data, file, indent=4) - oss_client.fput_object("test", object_name, file_path) + json_bytes = json.dumps(json_data).encode('utf-8') + oss_client.put_object("test", object_name, io.BytesIO(json_bytes), length=len(json_bytes), content_type="application/json") except Exception as e: logger.warning(str(e))