fix(storage): use centralized config management (#9620)

api/extensions/storage/aws_s3_storage.py

@@ -5,6 +5,7 @@ import boto3
 from botocore.client import Config
 from botocore.exceptions import ClientError
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 logger = logging.getLogger(__name__)
@@ -15,24 +16,23 @@ class AwsS3Storage(BaseStorage):
 
     def __init__(self):
         super().__init__()
-        app_config = self.app.config
-        self.bucket_name = app_config.get("S3_BUCKET_NAME")
-        if app_config.get("S3_USE_AWS_MANAGED_IAM"):
+        self.bucket_name = dify_config.S3_BUCKET_NAME
+        if dify_config.S3_USE_AWS_MANAGED_IAM:
             logger.info("Using AWS managed IAM role for S3")
 
             session = boto3.Session()
-            region_name = app_config.get("S3_REGION")
+            region_name = dify_config.S3_REGION
             self.client = session.client(service_name="s3", region_name=region_name)
         else:
             logger.info("Using ak and sk for S3")
 
             self.client = boto3.client(
                 "s3",
-                aws_secret_access_key=app_config.get("S3_SECRET_KEY"),
-                aws_access_key_id=app_config.get("S3_ACCESS_KEY"),
-                endpoint_url=app_config.get("S3_ENDPOINT"),
-                region_name=app_config.get("S3_REGION"),
-                config=Config(s3={"addressing_style": app_config.get("S3_ADDRESS_STYLE")}),
+                aws_secret_access_key=dify_config.S3_SECRET_KEY,
+                aws_access_key_id=dify_config.S3_ACCESS_KEY,
+                endpoint_url=dify_config.S3_ENDPOINT,
+                region_name=dify_config.S3_REGION,
+                config=Config(s3={"addressing_style": dify_config.S3_ADDRESS_STYLE}),
             )
         # create bucket
         try:

api/extensions/storage/supabase_storage.py

@@ -4,6 +4,7 @@ from pathlib import Path
 
 from supabase import Client
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -12,14 +13,16 @@ class SupabaseStorage(BaseStorage):
 
     def __init__(self):
         super().__init__()
-        app_config = self.app.config
-        self.bucket_name = app_config.get("SUPABASE_BUCKET_NAME")
-        self.client = Client(
-            supabase_url=app_config.get("SUPABASE_URL"), supabase_key=app_config.get("SUPABASE_API_KEY")
-        )
-        self.create_bucket(
-            id=app_config.get("SUPABASE_BUCKET_NAME"), bucket_name=app_config.get("SUPABASE_BUCKET_NAME")
-        )
+        if dify_config.SUPABASE_URL is None:
+            raise ValueError("SUPABASE_URL is not set")
+        if dify_config.SUPABASE_API_KEY is None:
+            raise ValueError("SUPABASE_API_KEY is not set")
+        if dify_config.SUPABASE_BUCKET_NAME is None:
+            raise ValueError("SUPABASE_BUCKET_NAME is not set")
+
+        self.bucket_name = dify_config.SUPABASE_BUCKET_NAME
+        self.client = Client(supabase_url=dify_config.SUPABASE_URL, supabase_key=dify_config.SUPABASE_API_KEY)
+        self.create_bucket(id=dify_config.SUPABASE_BUCKET_NAME, bucket_name=dify_config.SUPABASE_BUCKET_NAME)
 
     def create_bucket(self, id, bucket_name):
         if not self.bucket_exists():