From ded3c5e0298bb90548e3cb5caef172aafde05c04 Mon Sep 17 00:00:00 2001
From: zhouchengrong <Zchengrong@yeah.net>
Date: Mon, 15 Apr 2024 18:33:20 +0800
Subject: [PATCH] =?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/service/generate_image/service.py   |   8 +++++---
 app/service/super_resolution/service.py |   1 +
 requirements.txt                        | Bin 428 -> 708 bytes
 3 files changed, 6 insertions(+), 3 deletions(-)

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 dc39ccdfb2702706afa0dd8303e0626835ac0244..b77dd7d0cfc9f81464fad1b15bb2f83471bba06e 100644
GIT binary patch
literal 708
zcmZuv%TB{E5S%j-{}73Dsyaz|9QcxoLr6eWZETddt@wFhW;dyjiYzCVcV~BI)<56x
zXfYx4`-vT%xz<=AaOuCsEpBkciLnj|BjP2e!lPv>V_-aTCyPGtzT(~(Iubvy`j^Fm
z#qRlSESgz!$Nq`<4hNp!c*@w4(Shs5P^#9T=GPgiTE>T=O7#3^!<{ZYT!pwPw`Vm~
zl?rJT3s+bfi!;%$^dT|6=Q;B%Y$95GIyz8VrKPK?G_3MuoL2P0nT^cv*=Mpon>kur
zH95Q|lZAowcz^Y}L%}}sL2L`=#(6UGp_sdC1|5|b<hYzQorzo6zxOSj7ngK}E?Gk{
zaS1l7z#QFP_wn0kZ$Q;r(;~+HZbq_`W14`J$@v<Zu&W+8efhVjmTRtBen?xwd5#LJ
QS-Y42D_nX6=$!@p0xs-q&;S4c

delta 117
zcmX@Yx`vtm|GzYbM22F95+GT?kU3FNSeloCiy@aGlOYd?^BF+AJcd%BNC89T#9DP(
ykN}Vg)R6&{&STJJNCDC%45>hN*~I(Nk{|^|KyC_9e=%4;&|rpahQ!IujN1W2F&Z=g