From b7736553ffcc1a0a0a1c2c33d4dc426b041d261f Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Sun, 1 Dec 2024 20:17:39 +0800 Subject: [PATCH] =?UTF-8?q?feat=20design=20stream=20=E9=83=A8=E7=BD=B2=20f?= =?UTF-8?q?ix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/design_fast/design_generate.py | 24 +--------------------- app/service/utils/new_oss_client.py | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/app/service/design_fast/design_generate.py b/app/service/design_fast/design_generate.py index be015ac..f4012cf 100644 --- a/app/service/design_fast/design_generate.py +++ b/app/service/design_fast/design_generate.py @@ -2,6 +2,7 @@ import logging import threading import time +import requests from minio import Minio from app.core.config import * @@ -138,16 +139,9 @@ def design_generate(request_data): @RunTime def design_generate_v2(request_data): objects_data = request_data.dict()['objects'] - # process_id = request_data.dict()['process_id'] - # object_response = {} threads = [] - active_threads = 0 - lock = threading.Lock() - - # total = len(objects_data) def process_object(step, object): - nonlocal active_threads basic = object['basic'] items_response = { 'layers': [], @@ -219,26 +213,10 @@ def design_generate_v2(request_data): logger.info(response.text) logger.info(items_response) - # update_progress(process_id, total) - - # with lock: - # object_response[step] = items_response - # active_threads -= 1 - for step, object in enumerate(objects_data): t = threading.Thread(target=process_object, args=(step, object)) threads.append(t) t.start() - # with lock: - # active_threads += 1 - - # for t in threads: - # t.join() - # final_progress(process_id) - # return object_response - - -import requests def post_request(url, data=None, json_data=None, headers=None, auth=None, timeout=5): diff --git a/app/service/utils/new_oss_client.py b/app/service/utils/new_oss_client.py index 6dd22bd..4b3cbb1 100644 --- a/app/service/utils/new_oss_client.py +++ b/app/service/utils/new_oss_client.py @@ -82,7 +82,7 @@ if __name__ == '__main__': # url = "aida-users/89/sketchboard/female/Dress/e6724ab7-8d3f-4677-abe0-c3e42ab7af85.jpeg" # url = "aida-users/87/print/956614a2-7e75-4fbe-9ed0-c1831e37a2c9-4-87.png" # url = "aida-users/89/single_logo/123-89.png" - url ="aida-users/89/test/123-89.png" + url = "aida-users/89/test/123-89.png" # url = "aida-collection-element/12148/Sketchboard/95ea577b-305b-4a62-b30a-39c0dd3ddb3f.png" read_type = "2"