Преглед изворни кода

Add S3_ADDRESS_STYLE configuration option (#2934)

tags/0.5.11
Leo Q пре 1 година
родитељ
комит
7c8c233cf4
No account linked to committer's email address
2 измењених фајлова са 5 додато и 1 уклоњено
  1. 2
    0
      api/config.py
  2. 3
    1
      api/extensions/ext_storage.py

+ 2
- 0
api/config.py Прегледај датотеку

'SERVICE_API_URL': 'https://api.dify.ai', 'SERVICE_API_URL': 'https://api.dify.ai',
'APP_WEB_URL': 'https://udify.app', 'APP_WEB_URL': 'https://udify.app',
'FILES_URL': '', 'FILES_URL': '',
'S3_ADDRESS_STYLE': 'auto',
'STORAGE_TYPE': 'local', 'STORAGE_TYPE': 'local',
'STORAGE_LOCAL_PATH': 'storage', 'STORAGE_LOCAL_PATH': 'storage',
'CHECK_UPDATE_URL': 'https://updates.dify.ai', 'CHECK_UPDATE_URL': 'https://updates.dify.ai',
self.S3_ACCESS_KEY = get_env('S3_ACCESS_KEY') self.S3_ACCESS_KEY = get_env('S3_ACCESS_KEY')
self.S3_SECRET_KEY = get_env('S3_SECRET_KEY') self.S3_SECRET_KEY = get_env('S3_SECRET_KEY')
self.S3_REGION = get_env('S3_REGION') self.S3_REGION = get_env('S3_REGION')
self.S3_ADDRESS_STYLE = get_env('S3_ADDRESS_STYLE')
self.AZURE_BLOB_ACCOUNT_NAME = get_env('AZURE_BLOB_ACCOUNT_NAME') self.AZURE_BLOB_ACCOUNT_NAME = get_env('AZURE_BLOB_ACCOUNT_NAME')
self.AZURE_BLOB_ACCOUNT_KEY = get_env('AZURE_BLOB_ACCOUNT_KEY') self.AZURE_BLOB_ACCOUNT_KEY = get_env('AZURE_BLOB_ACCOUNT_KEY')
self.AZURE_BLOB_CONTAINER_NAME = get_env('AZURE_BLOB_CONTAINER_NAME') self.AZURE_BLOB_CONTAINER_NAME = get_env('AZURE_BLOB_CONTAINER_NAME')

+ 3
- 1
api/extensions/ext_storage.py Прегледај датотеку



import boto3 import boto3
from azure.storage.blob import AccountSasPermissions, BlobServiceClient, ResourceTypes, generate_account_sas from azure.storage.blob import AccountSasPermissions, BlobServiceClient, ResourceTypes, generate_account_sas
from botocore.client import Config
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
from flask import Flask from flask import Flask


aws_secret_access_key=app.config.get('S3_SECRET_KEY'), aws_secret_access_key=app.config.get('S3_SECRET_KEY'),
aws_access_key_id=app.config.get('S3_ACCESS_KEY'), aws_access_key_id=app.config.get('S3_ACCESS_KEY'),
endpoint_url=app.config.get('S3_ENDPOINT'), endpoint_url=app.config.get('S3_ENDPOINT'),
region_name=app.config.get('S3_REGION')
region_name=app.config.get('S3_REGION'),
config=Config(s3={'addressing_style': app.config.get('S3_ADDRESS_STYLE')})
) )
elif self.storage_type == 'azure-blob': elif self.storage_type == 'azure-blob':
self.bucket_name = app.config.get('AZURE_BLOB_CONTAINER_NAME') self.bucket_name = app.config.get('AZURE_BLOB_CONTAINER_NAME')

Loading…
Откажи
Сачувај