feat : 代码梳理 移除所有敏感密钥 通过环境变量方式配置

app/service/generate_image/service_generate_multi_view.py

@@ -15,11 +15,11 @@ import numpy as np
 import redis
 import tritonclient.grpc as grpcclient
 
-from app.core.config import *
+from app.core.config import settings, GMV_MODEL_URL, GMV_MODEL_NAME, GMV_RABBITMQ_QUEUES
 from app.schemas.generate_image import GenerateMultiViewModel
 from app.service.generate_image.utils.mq import publish_status
 from app.service.generate_image.utils.upload_sd_image import upload_png_sd
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 logger = logging.getLogger()
 
@@ -27,7 +27,7 @@ logger = logging.getLogger()
 class GenerateMultiView:
     def __init__(self, request_data):
         self.grpc_client = grpcclient.InferenceServerClient(url=GMV_MODEL_URL)
-        self.redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, db=REDIS_DB, decode_responses=True)
+        self.redis_client = redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=settings.REDIS_DB, decode_responses=True)
         self.image = self.get_image(request_data.image_url)
         self.tasks_id = request_data.tasks_id
         self.user_id = self.tasks_id[self.tasks_id.rfind('-') + 1:]
@@ -35,7 +35,8 @@ class GenerateMultiView:
         self.redis_client.set(self.tasks_id, json.dumps(self.generate_data))
         self.redis_client.expire(self.tasks_id, 600)
 
-    def get_image(self, image_url):
+    @staticmethod
+    def get_image(image_url):
         try:
             image = oss_get_image(bucket=image_url.split('/')[0], object_name=image_url[image_url.find('/') + 1:], data_type="PIL")
             return image
@@ -92,12 +93,12 @@ class GenerateMultiView:
             raise Exception(str(e))
         finally:
             dict_generate_data, str_generate_data = self.read_tasks_status()
-            if not DEBUG:
+            if not settings.DEBUG:
                 publish_status(str_generate_data, GMV_RABBITMQ_QUEUES)
 
 
 def infer_cancel(tasks_id):
-    redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, db=REDIS_DB, decode_responses=True)
+    redis_client = redis.StrictRedis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=settings.REDIS_DB, decode_responses=True)
     data = {'tasks_id': tasks_id, 'status': 'REVOKED', 'message': "revoked", 'data': 'revoked'}
     generate_data = json.dumps(data)
     redis_client.set(tasks_id, generate_data)