diff --git a/app/service/generate_image/service.py b/app/service/generate_image/service.py index 67e8532..695cfe3 100644 --- a/app/service/generate_image/service.py +++ b/app/service/generate_image/service.py @@ -9,6 +9,8 @@ """ import json import logging + +import minio import numpy as np import random import redis @@ -106,7 +108,7 @@ class GenerateImage: img = cv2.imdecode(img, cv2.IMREAD_COLOR) # 解码 img = self.preprocess_image(img, self.category) img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB) - except: + except minio.error.S3Error: img = np.random.randn(512, 512, 3) return img @@ -214,7 +216,7 @@ if __name__ == '__main__': # "str": "a simple print", # "version": "1" # } - request_data = GenerateImageModel( + rd = GenerateImageModel( mode=1, content='a blouse', gender='', @@ -224,6 +226,6 @@ if __name__ == '__main__': version='1', tasks_id='123456' ) - server = GenerateImage(request_data) + server = GenerateImage(rd) server.get_result() # print(infer_cancel(123456)) diff --git a/app/service/super_resolution/service.py b/app/service/super_resolution/service.py index d6d54ca..1cfa231 100644 --- a/app/service/super_resolution/service.py +++ b/app/service/super_resolution/service.py @@ -86,6 +86,7 @@ class SuperResolution: generate_data = self.read_tasks_status() if generate_data['status'] in ["REVOKED", "FAILURE"]: ctx.cancel() + # noinspection PyTypeChecker self.channel.basic_publish(exchange='', routing_key=SR_RABBITMQ_QUEUES, body=json.dumps(generate_data)) logger.info(f" [x] Sent {generate_data}") break diff --git a/requirements.txt b/requirements.txt index dc39ccd..b77dd7d 100644 Binary files a/requirements.txt and b/requirements.txt differ