diff --git a/app/service/design/items/pipelines/painting.py b/app/service/design/items/pipelines/painting.py index 43b42e4..6d88411 100644 --- a/app/service/design/items/pipelines/painting.py +++ b/app/service/design/items/pipelines/painting.py @@ -1,6 +1,6 @@ import random from io import BytesIO -import boto3 +# import boto3 import cv2 import numpy as np from PIL import Image @@ -15,7 +15,7 @@ minio_client = Minio( secret_key=MINIO_SECRET, secure=MINIO_SECURE) -s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) +# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) @PIPELINES.register_module() diff --git a/app/service/design/utils/synthesis_item.py b/app/service/design/utils/synthesis_item.py index 0cf844b..e6a2f25 100644 --- a/app/service/design/utils/synthesis_item.py +++ b/app/service/design/utils/synthesis_item.py @@ -11,7 +11,7 @@ import io import logging import time -import boto3 +# import boto3 import cv2 import numpy as np from PIL import Image @@ -27,12 +27,12 @@ minio_client = Minio( secret_key=MINIO_SECRET, secure=MINIO_SECURE) -s3 = boto3.client( - 's3', - aws_access_key_id=S3_ACCESS_KEY, - aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, - region_name=S3_REGION_NAME -) +# s3 = boto3.client( +# 's3', +# aws_access_key_id=S3_ACCESS_KEY, +# aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, +# region_name=S3_REGION_NAME +# ) def positioning(all_mask_shape, mask_shape, offset): diff --git a/app/service/design/utils/upload_image.py b/app/service/design/utils/upload_image.py index 70b259c..2142126 100644 --- a/app/service/design/utils/upload_image.py +++ b/app/service/design/utils/upload_image.py @@ -11,7 +11,7 @@ import io import logging import time -import boto3 +# import boto3 import cv2 from minio import Minio @@ -25,7 +25,7 @@ minio_client = Minio( secure=MINIO_SECURE) """S3 上传""" -s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) +# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) diff --git a/app/service/generate_image/utils/upload_sd_image.py b/app/service/generate_image/utils/upload_sd_image.py index 2773aa2..ec476f9 100644 --- a/app/service/generate_image/utils/upload_sd_image.py +++ b/app/service/generate_image/utils/upload_sd_image.py @@ -10,7 +10,7 @@ import io import logging -import boto3 +# import boto3 import cv2 from PIL import Image from minio import Minio @@ -18,7 +18,7 @@ from minio import Minio from app.core.config import * minio_client = Minio(MINIO_URL, access_key=MINIO_ACCESS, secret_key=MINIO_SECRET, secure=MINIO_SECURE) -s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) +# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME) # def upload_single_logo(image, user_id, category, object_name): diff --git a/requirements.txt b/requirements.txt index a203fe5..1e4ee61 100644 Binary files a/requirements.txt and b/requirements.txt differ