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

app/service/generate_image/service_pose_transform.py

@@ -17,21 +17,23 @@ import numpy as np
 import redis
 import tritonclient.grpc as grpcclient
 from PIL import Image
+from minio import Minio
 from tritonclient.utils import np_to_triton_dtype
 
-from app.core.config import *
+from app.core.config import settings, PS_RABBITMQ_QUEUES, PT_MODEL_URL
 from app.schemas.pose_transform import PoseTransformModel
 from app.service.generate_image.utils.mq import publish_status
 from app.service.generate_image.utils.pose_transform_upload import upload_gif, upload_video, upload_first_image
-from app.service.utils.oss_client import oss_get_image
+from app.service.utils.new_oss_client import oss_get_image
 
 logger = logging.getLogger()
+minio_client = Minio(settings.MINIO_URL, access_key=settings.MINIO_ACCESS, secret_key=settings.MINIO_SECRET, secure=settings.MINIO_SECURE)
 
 
 class PoseTransformService:
     def __init__(self, request_data):
         self.grpc_client = grpcclient.InferenceServerClient(url=PT_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.category = "pose_transform"
         self.image_url = request_data.image_url
         self.pose_num = request_data.pose_id
@@ -115,16 +117,14 @@ class PoseTransformService:
             raise Exception(str(e))
         finally:
             dict_pose_transform_data, str_pose_transform_data = self.read_tasks_status()
-            if not DEBUG:
+            if not settings.DEBUG:
                 publish_status(json.dumps(str_pose_transform_data), PS_RABBITMQ_QUEUES)
             logger.info(
                 f" [x] Sent to： {PS_RABBITMQ_QUEUES} data：@@@@  {json.dumps(dict_pose_transform_data, indent=4)}")
 
 
-
-
 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'}
     pose_transform_data = json.dumps(data)
     redis_client.set(tasks_id, pose_transform_data)
@@ -132,8 +132,7 @@ def infer_cancel(tasks_id):
 
 
 def pre_processing_image(image_url):
-    image = oss_get_image(bucket=image_url.split('/')[0], object_name=image_url[image_url.find('/') + 1:],
-                          data_type="PIL")
+    image = oss_get_image(oss_client=minio_client, bucket=image_url.split('/')[0], object_name=image_url[image_url.find('/') + 1:], data_type="PIL")
     # 目标图片的尺寸
     target_width = 512
     target_height = 768