update

langgenius · Oct 8, 2024 · aa3b1a3 · aa3b1a3
1 parent bf3f1ac
commit aa3b1a3
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 50 deletions.
diff --git a/api/extensions/storage/aliyun_storage.py b/api/extensions/storage/aliyun_storage.py
@@ -4,6 +4,7 @@
 import oss2 as aliyun_s3
 from flask import Flask
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -13,18 +14,17 @@ class AliyunStorage(BaseStorage):
     def __init__(self, app: Flask):
         super().__init__(app)
 
-        app_config = self.app.config
-        self.bucket_name = app_config.get("ALIYUN_OSS_BUCKET_NAME")
+        self.bucket_name = dify_config.ALIYUN_OSS_BUCKET_NAME
         self.folder = app.config.get("ALIYUN_OSS_PATH")
         oss_auth_method = aliyun_s3.Auth
         region = None
-        if app_config.get("ALIYUN_OSS_AUTH_VERSION") == "v4":
+        if dify_config.ALIYUN_OSS_AUTH_VERSION == "v4":
             oss_auth_method = aliyun_s3.AuthV4
-            region = app_config.get("ALIYUN_OSS_REGION")
-        oss_auth = oss_auth_method(app_config.get("ALIYUN_OSS_ACCESS_KEY"), app_config.get("ALIYUN_OSS_SECRET_KEY"))
+            region = dify_config.ALIYUN_OSS_REGION
+        oss_auth = oss_auth_method(dify_config.ALIYUN_OSS_ACCESS_KEY, dify_config.ALIYUN_OSS_SECRET_KEY)
         self.client = aliyun_s3.Bucket(
             oss_auth,
-            app_config.get("ALIYUN_OSS_ENDPOINT"),
+            dify_config.ALIYUN_OSS_ENDPOINT,
             self.bucket_name,
             connect_timeout=30,
             region=region,

diff --git a/api/extensions/storage/azure_storage.py b/api/extensions/storage/azure_storage.py
@@ -4,6 +4,7 @@
 from azure.storage.blob import AccountSasPermissions, BlobServiceClient, ResourceTypes, generate_account_sas
 from flask import Flask
 
+from configs import dify_config
 from extensions.ext_redis import redis_client
 from extensions.storage.base_storage import BaseStorage
 
@@ -13,11 +14,11 @@ class AzureStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("AZURE_BLOB_CONTAINER_NAME")
-        self.account_url = app_config.get("AZURE_BLOB_ACCOUNT_URL")
-        self.account_name = app_config.get("AZURE_BLOB_ACCOUNT_NAME")
-        self.account_key = app_config.get("AZURE_BLOB_ACCOUNT_KEY")
+
+        self.bucket_name = dify_config.AZURE_BLOB_CONTAINER_NAME
+        self.account_url = dify_config.AZURE_BLOB_ACCOUNT_URL
+        self.account_name = dify_config.AZURE_BLOB_ACCOUNT_NAME
+        self.account_key = dify_config.AZURE_BLOB_ACCOUNT_KEY
 
     def save(self, filename, data):
         client = self._sync_client()

diff --git a/api/extensions/storage/baidu_storage.py b/api/extensions/storage/baidu_storage.py
@@ -7,6 +7,7 @@
 from baidubce.services.bos.bos_client import BosClient
 from flask import Flask
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -15,14 +16,14 @@ class BaiduStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("BAIDU_OBS_BUCKET_NAME")
+
+        self.bucket_name = dify_config.BAIDU_OBS_BUCKET_NAME
         client_config = BceClientConfiguration(
             credentials=BceCredentials(
-                access_key_id=app_config.get("BAIDU_OBS_ACCESS_KEY"),
-                secret_access_key=app_config.get("BAIDU_OBS_SECRET_KEY"),
+                access_key_id=dify_config.BAIDU_OBS_ACCESS_KEY,
+                secret_access_key=dify_config.BAIDU_OBS_SECRET_KEY,
             ),
-            endpoint=app_config.get("BAIDU_OBS_ENDPOINT"),
+            endpoint=dify_config.BAIDU_OBS_ENDPOINT,
         )
 
         self.client = BosClient(config=client_config)

diff --git a/api/extensions/storage/google_storage.py b/api/extensions/storage/google_storage.py
@@ -7,6 +7,7 @@
 from flask import Flask
 from google.cloud import storage as google_cloud_storage
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -15,9 +16,9 @@ class GoogleStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("GOOGLE_STORAGE_BUCKET_NAME")
-        service_account_json_str = app_config.get("GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64")
+
+        self.bucket_name = dify_config.GOOGLE_STORAGE_BUCKET_NAME
+        service_account_json_str = dify_config.GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64
         # if service_account_json_str is empty, use Application Default Credentials
         if service_account_json_str:
             service_account_json = base64.b64decode(service_account_json_str).decode("utf-8")

diff --git a/api/extensions/storage/huawei_storage.py b/api/extensions/storage/huawei_storage.py
@@ -3,6 +3,7 @@
 from flask import Flask
 from obs import ObsClient
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -11,12 +12,12 @@ class HuaweiStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("HUAWEI_OBS_BUCKET_NAME")
+
+        self.bucket_name = dify_config.HUAWEI_OBS_BUCKET_NAME
         self.client = ObsClient(
-            access_key_id=app_config.get("HUAWEI_OBS_ACCESS_KEY"),
-            secret_access_key=app_config.get("HUAWEI_OBS_SECRET_KEY"),
-            server=app_config.get("HUAWEI_OBS_SERVER"),
+            access_key_id=dify_config.HUAWEI_OBS_ACCESS_KEY,
+            secret_access_key=dify_config.HUAWEI_OBS_SECRET_KEY,
+            server=dify_config.HUAWEI_OBS_SERVER,
         )
 
     def save(self, filename, data):

diff --git a/api/extensions/storage/oci_storage.py b/api/extensions/storage/oci_storage.py
@@ -5,20 +5,21 @@
 from botocore.exceptions import ClientError
 from flask import Flask
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
 class OCIStorage(BaseStorage):
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("OCI_BUCKET_NAME")
+
+        self.bucket_name = dify_config.OCI_BUCKET_NAME
         self.client = boto3.client(
             "s3",
-            aws_secret_access_key=app_config.get("OCI_SECRET_KEY"),
-            aws_access_key_id=app_config.get("OCI_ACCESS_KEY"),
-            endpoint_url=app_config.get("OCI_ENDPOINT"),
-            region_name=app_config.get("OCI_REGION"),
+            aws_secret_access_key=dify_config.OCI_SECRET_KEY,
+            aws_access_key_id=dify_config.OCI_ACCESS_KEY,
+            endpoint_url=dify_config.OCI_ENDPOINT,
+            region_name=dify_config.OCI_REGION,
         )
 
     def save(self, filename, data):

diff --git a/api/extensions/storage/s3_storage.py b/api/extensions/storage/s3_storage.py
@@ -6,6 +6,7 @@
 from botocore.exceptions import ClientError
 from flask import Flask
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -14,19 +15,19 @@ class S3Storage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        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:
             session = boto3.Session()
             self.client = session.client("s3")
         else:
             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:

diff --git a/api/extensions/storage/tencent_storage.py b/api/extensions/storage/tencent_storage.py
@@ -3,6 +3,7 @@
 from flask import Flask
 from qcloud_cos import CosConfig, CosS3Client
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -11,13 +12,13 @@ class TencentStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("TENCENT_COS_BUCKET_NAME")
+
+        self.bucket_name = dify_config.TENCENT_COS_BUCKET_NAME
         config = CosConfig(
-            Region=app_config.get("TENCENT_COS_REGION"),
-            SecretId=app_config.get("TENCENT_COS_SECRET_ID"),
-            SecretKey=app_config.get("TENCENT_COS_SECRET_KEY"),
-            Scheme=app_config.get("TENCENT_COS_SCHEME"),
+            Region=dify_config.TENCENT_COS_REGION,
+            SecretId=dify_config.TENCENT_COS_SECRET_ID,
+            SecretKey=dify_config.TENCENT_COS_SECRET_KEY,
+            Scheme=dify_config.TENCENT_COS_SCHEME,
         )
         self.client = CosS3Client(config)
 

diff --git a/api/extensions/storage/volcengine_storage.py b/api/extensions/storage/volcengine_storage.py
@@ -3,6 +3,7 @@
 import tos
 from flask import Flask
 
+from configs import dify_config
 from extensions.storage.base_storage import BaseStorage
 
 
@@ -11,13 +12,13 @@ class VolcengineStorage(BaseStorage):
 
     def __init__(self, app: Flask):
         super().__init__(app)
-        app_config = self.app.config
-        self.bucket_name = app_config.get("VOLCENGINE_TOS_BUCKET_NAME")
+
+        self.bucket_name = dify_config.VOLCENGINE_TOS_BUCKET_NAME
         self.client = tos.TosClientV2(
-            ak=app_config.get("VOLCENGINE_TOS_ACCESS_KEY"),
-            sk=app_config.get("VOLCENGINE_TOS_SECRET_KEY"),
-            endpoint=app_config.get("VOLCENGINE_TOS_ENDPOINT"),
-            region=app_config.get("VOLCENGINE_TOS_REGION"),
+            ak=dify_config.VOLCENGINE_TOS_ACCESS_KEY,
+            sk=dify_config.VOLCENGINE_TOS_SECRET_KEY,
+            endpoint=dify_config.VOLCENGINE_TOS_ENDPOINT,
+            region=dify_config.VOLCENGINE_TOS_REGION,
         )
 
     def save(self, filename, data):