feat

fix  minio and s3

app/service/generate_image/service_generate_image.py

@@ -10,22 +10,17 @@
 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
-from minio import Minio
 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.adjust_contrast import adjust_contrast
 from app.service.generate_image.utils.image_processing import remove_background, stain_detection, generate_category_recognition, autoLevels, luminance_adjust, face_detect_pic
-from app.service.generate_image.utils.upload_sd_image import upload_png_sd, upload_stain_png_sd
-from app.service.utils.oss_client import get_image
+from app.service.generate_image.utils.upload_sd_image import upload_png_sd
+from app.service.utils.oss_client import oss_get_image
 
 logger = logging.getLogger()
 
@@ -70,7 +65,7 @@ class GenerateImage:
             # image_cv2 = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
             # image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
 
-            image_cv2 = get_image(object_name=image_url, data_type="cv2")
+            image_cv2 = oss_get_image(bucket=image_url.split('/')[0], object_name=image_url, data_type="cv2")
             image_rbg = cv2.cvtColor(image_cv2, cv2.COLOR_BGR2RGB)
             image = cv2.resize(image_rbg, (1024, 1024))
         except minio.error.S3Error:
@@ -197,4 +192,4 @@ if __name__ == '__main__':
         gender="male"
     )
     server = GenerateImage(rd)
-    print(server.get_result())
+    print(server.get_result())