From d7a5ee36979dfef2be24da38c7bc59fde867d22b Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Mon, 15 Apr 2024 18:37:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat=20generate=20=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index 0444760..bbb2a0b 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -19,19 +19,16 @@ class Settings(BaseSettings): LOGGING_CONFIG_FILE = os.path.join(BASE_DIR, 'logging_env.py') -DEBUG = True +DEBUG = False ENV = 0 if DEBUG: LOGS_PATH = "logs/errors.log" else: LOGS_PATH = "app/logs/errors.log" -RABBITMQ_ENV = "" - -if ENV == 1: - RABBITMQ_ENV = "dev" -elif ENV == 2: - RABBITMQ_ENV = "local" +# RABBITMQ_ENV = "" +# RABBITMQ_ENV = "dev" +RABBITMQ_ENV = "local" settings = Settings() From 6bb988bd88c3edfc60ede110cfb95dd4d9851865 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Mon, 15 Apr 2024 18:41:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feat=20generate=20=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- app/core/config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e94af1..2f4ba1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,4 +19,4 @@ LABEL maintainer="zchengrong@yeah.net" \ name="trinity_aida" -CMD ["gunicorn", "-c", "gunicorn_config.py", "app.main:app" , "-e", "SR_RABBITMQ_QUEUES=SuperResolution" ,"-e", "GI_RABBITMQ_QUEUES=GenerateImage"] \ No newline at end of file +CMD ["gunicorn", "-c", "gunicorn_config.py", "app.main:app" , "-e", "SR_RABBITMQ_QUEUES=SuperResolution-local" ,"-e", "GI_RABBITMQ_QUEUES=GenerateImage-local"] \ No newline at end of file diff --git a/app/core/config.py b/app/core/config.py index 6bf0556..a9220f1 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -25,9 +25,9 @@ if DEBUG: else: LOGS_PATH = "app/logs/errors.log" -RABBITMQ_ENV = "" # 生产环境 +# RABBITMQ_ENV = "" # 生产环境 # RABBITMQ_ENV = "-dev" # 开发环境 -# RABBITMQ_ENV = "-local" # 本地测试环境 +RABBITMQ_ENV = "-local" # 本地测试环境 settings = Settings() From b596692b35c1d30cc5ee9180f165ffe79c2432ad Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 15:53:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feat=20generate=20=E5=8D=87=E7=BA=A7=20attr?= =?UTF-8?q?ibute=20retrieve=20=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- app/core/config.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c577312..2f4ba1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,4 +19,4 @@ LABEL maintainer="zchengrong@yeah.net" \ name="trinity_aida" -CMD ["gunicorn", "-c", "gunicorn_config.py", "app.main:app" , "-e", "SR_RABBITMQ_QUEUES=SuperResolution-dev" ,"-e", "GI_RABBITMQ_QUEUES=GenerateImage-dev"] \ No newline at end of file +CMD ["gunicorn", "-c", "gunicorn_config.py", "app.main:app" , "-e", "SR_RABBITMQ_QUEUES=SuperResolution-local" ,"-e", "GI_RABBITMQ_QUEUES=GenerateImage-local"] \ No newline at end of file diff --git a/app/core/config.py b/app/core/config.py index d7810db..a114fa6 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -19,7 +19,7 @@ class Settings(BaseSettings): LOGGING_CONFIG_FILE = os.path.join(BASE_DIR, 'logging_env.py') -DEBUG = True +DEBUG = False if DEBUG: LOGS_PATH = "logs/" CATEGORY_PATH = "service/attribute/config/descriptor/category/category_dis.csv" @@ -28,8 +28,8 @@ else: CATEGORY_PATH = "app/service/attribute/config/descriptor/category/category_dis.csv" # RABBITMQ_ENV = "" # 生产环境 -RABBITMQ_ENV = "-dev" # 开发环境 -# RABBITMQ_ENV = "-local" # 本地测试环境 +# RABBITMQ_ENV = "-dev" # 开发环境 +RABBITMQ_ENV = "-local" # 本地测试环境 settings = Settings() From 6759b873d520f9643ca56c1640d3de4534143a90 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 16:36:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat=20generate=20=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 4 ++-- app/service/generate_image/service.py | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index a114fa6..73e6e67 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -19,7 +19,7 @@ class Settings(BaseSettings): LOGGING_CONFIG_FILE = os.path.join(BASE_DIR, 'logging_env.py') -DEBUG = False +DEBUG = True if DEBUG: LOGS_PATH = "logs/" CATEGORY_PATH = "service/attribute/config/descriptor/category/category_dis.csv" @@ -29,7 +29,7 @@ else: # RABBITMQ_ENV = "" # 生产环境 # RABBITMQ_ENV = "-dev" # 开发环境 -RABBITMQ_ENV = "-local" # 本地测试环境 +RABBITMQ_ENV = "-local" # 本地测试环境 settings = Settings() diff --git a/app/service/generate_image/service.py b/app/service/generate_image/service.py index fed3d41..b1448b2 100644 --- a/app/service/generate_image/service.py +++ b/app/service/generate_image/service.py @@ -10,7 +10,10 @@ import json import logging import time +from io import BytesIO +import cv2 +import minio import redis import tritonclient.grpc as grpcclient import numpy as np @@ -20,7 +23,6 @@ from tritonclient.utils import np_to_triton_dtype from app.core.config import * from app.schemas.generate_image import GenerateImageModel from app.service.generate_image.utils.upload_sd_image import upload_png_sd -from app.service.utils.generate_uuid import generate_uuid logger = logging.getLogger() @@ -32,13 +34,15 @@ class GenerateImage: self.redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, db=REDIS_DB, decode_responses=True) self.connection = pika.BlockingConnection(pika.ConnectionParameters(**RABBITMQ_PARAMS)) self.channel = self.connection.channel() - if request_data.mode == "txt2img": - self.image = np.random.randint(0, 256, (1024, 1024, 3), dtype=np.uint8) + if request_data.mode == "img2img": + self.image = self.get_image(request_data.image_url) + self.prompt = request_data.prompt else: - self.image = request_data.image + self.image = np.random.randint(0, 256, (1024, 1024, 3), dtype=np.uint8) + self.prompt = request_data.prompt + self.tasks_id = request_data.tasks_id self.user_id = self.tasks_id[self.tasks_id.rfind('-') + 1:] - self.prompt = request_data.prompt self.mode = request_data.mode self.batch_size = 1 self.category = request_data.category @@ -49,9 +53,22 @@ class GenerateImage: self.grpc_client.close() self.connection.close() + def get_image(self, image_url): + # Get data of an object. + # Read data from response. + try: + response = self.minio_client.get_object(image_url.split('/')[0], image_url[image_url.find('/') + 1:]) + image_file = BytesIO(response.data) + image_array = np.asarray(bytearray(image_file.read()), dtype=np.uint8) + image_cv2 = cv2.imdecode(image_array, cv2.IMREAD_COLOR) + except minio.error.S3Error: + image_cv2 = np.random.randint(0, 256, (1024, 1024, 3), dtype=np.uint8) + return image_cv2 + def __call__(self, *args, **kwargs): self.generate_data = json.dumps({'status': 'PENDING', 'message': "pending", 'data': ''}) self.redis_client.set(self.tasks_id, self.generate_data) + self.redis_client.expire(self.tasks_id, 600) def callback(self, result, error): if error: From 43ddc82fb40b205fa28f8011b6c61ec678af8fe1 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 16:52:25 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + requirements.txt | Bin 708 -> 814 bytes 2 files changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2f4ba1b..d97cfae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apt install -y libgl1-mesa-glx COPY ./requirements.txt /requirements.txt RUN pip install --upgrade pip RUN pip install -r requirements.txt +RUN mkdir logs RUN pip install gunicorn RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 RUN #pip install mmcv==1.4.2 -f https://download.openmmlab.com/mmcv/dist/cu117/torch1.13/index.html diff --git a/requirements.txt b/requirements.txt index b77dd7d0cfc9f81464fad1b15bb2f83471bba06e..152908247f5c59e3953542a8479bc450084ee395 100644 GIT binary patch delta 117 zcmX@Yx{hr_2cu*GLn1>SLkf^AX0Qc9BL+P%Hk@q9)a}j7zy%afX2@j72I3M1T_BkY pRGZF_3RZ0ZRt?f)zyMNP!cYh_D;F$h0u(g^LXdetxyj9p+W{JN6c_*i delta 15 XcmZ3-c7%092jk=#rcIL Date: Tue, 16 Apr 2024 17:05:21 +0800 Subject: [PATCH 6/9] =?UTF-8?q?feat=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d97cfae..674faec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt install -y libgl1-mesa-glx COPY ./requirements.txt /requirements.txt RUN pip install --upgrade pip RUN pip install -r requirements.txt -RUN mkdir logs +RUN mkdir app/logs RUN pip install gunicorn RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 RUN #pip install mmcv==1.4.2 -f https://download.openmmlab.com/mmcv/dist/cu117/torch1.13/index.html From f53dc0b33114bc2d8d20213c90e9dda2be21caad Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 17:09:53 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 674faec..0bd3e74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt install -y libgl1-mesa-glx COPY ./requirements.txt /requirements.txt RUN pip install --upgrade pip RUN pip install -r requirements.txt -RUN mkdir app/logs +RUN mkdir -p app/logs RUN pip install gunicorn RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 RUN #pip install mmcv==1.4.2 -f https://download.openmmlab.com/mmcv/dist/cu117/torch1.13/index.html From 32ebb2232ce1d983c478f73eea9bcf5d331b83b8 Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 17:14:02 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feat=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/generate_image/service.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/service/generate_image/service.py b/app/service/generate_image/service.py index b1448b2..46c96a9 100644 --- a/app/service/generate_image/service.py +++ b/app/service/generate_image/service.py @@ -48,11 +48,6 @@ class GenerateImage: self.category = request_data.category self.index = 0 - def __del__(self): - self.redis_client.close() - self.grpc_client.close() - self.connection.close() - def get_image(self, image_url): # Get data of an object. # Read data from response. From c9b407b2a4340a139d6d54141fde5e33d331cb0a Mon Sep 17 00:00:00 2001 From: zhouchengrong Date: Tue, 16 Apr 2024 17:15:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?feat=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/attribute/service_att_recognition.py | 3 --- app/service/generate_image/test.py | 5 ----- app/service/super_resolution/service.py | 5 ----- 3 files changed, 13 deletions(-) diff --git a/app/service/attribute/service_att_recognition.py b/app/service/attribute/service_att_recognition.py index d307474..da71c16 100644 --- a/app/service/attribute/service_att_recognition.py +++ b/app/service/attribute/service_att_recognition.py @@ -30,9 +30,6 @@ class AttributeRecognition: self.const = const self.triton_client = httpclient.InferenceServerClient(url=f"{ATT_TRITON_URL}") - def __del__(self): - self.triton_client.close() - def get_result(self): for sketch in self.request_data: if sketch['category'] == "Tops" or sketch['category'] == "Blouse": diff --git a/app/service/generate_image/test.py b/app/service/generate_image/test.py index 0e03900..ab2dc43 100644 --- a/app/service/generate_image/test.py +++ b/app/service/generate_image/test.py @@ -64,11 +64,6 @@ class GenerateImage: pass - def __del__(self): - self.redis_client.close() - self.triton_client.close() - self.connection.close() - @staticmethod def image_grid(imgs, rows, cols): assert len(imgs) == rows * cols diff --git a/app/service/super_resolution/service.py b/app/service/super_resolution/service.py index e20eb70..95b2811 100644 --- a/app/service/super_resolution/service.py +++ b/app/service/super_resolution/service.py @@ -29,11 +29,6 @@ class SuperResolution: self.connection = pika.BlockingConnection(pika.ConnectionParameters(**RABBITMQ_PARAMS)) self.channel = self.connection.channel() - def __del__(self): - self.redis_client.close() - self.triton_client.close() - self.connection.close() - # @RunTime def read_image(self): try: