From f2b2f6847facdefb749cd5d4725aa4b99e8b513d Mon Sep 17 00:00:00 2001 From: Bowen Liang Date: Wed, 5 Feb 2025 15:43:02 +0800 Subject: [PATCH 1/3] update --- api/extensions/storage/azure_blob_storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/extensions/storage/azure_blob_storage.py b/api/extensions/storage/azure_blob_storage.py index eff7743cc29c4f..db125ca849ae60 100644 --- a/api/extensions/storage/azure_blob_storage.py +++ b/api/extensions/storage/azure_blob_storage.py @@ -64,7 +64,7 @@ def delete(self, filename): def _sync_client(self): if self.account_key == "managedidentity": - return BlobServiceClient(account_url=self.account_url, credential=self.credential) + return BlobServiceClient(account_url=self.account_url, credential=self.credential) # type: ignore cache_key = "azure_blob_sas_token_{}_{}".format(self.account_name, self.account_key) cache_result = redis_client.get(cache_key) From 2c4e6903d02206988492f0a1438e6ebd5ebbeac6 Mon Sep 17 00:00:00 2001 From: Bowen Liang Date: Wed, 5 Feb 2025 15:43:47 +0800 Subject: [PATCH 2/3] update --- api/extensions/storage/azure_blob_storage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/extensions/storage/azure_blob_storage.py b/api/extensions/storage/azure_blob_storage.py index db125ca849ae60..7eb611b52f79ab 100644 --- a/api/extensions/storage/azure_blob_storage.py +++ b/api/extensions/storage/azure_blob_storage.py @@ -64,7 +64,7 @@ def delete(self, filename): def _sync_client(self): if self.account_key == "managedidentity": - return BlobServiceClient(account_url=self.account_url, credential=self.credential) # type: ignore + return BlobServiceClient(account_url=self.account_url, credential=self.credential) # type: ignore cache_key = "azure_blob_sas_token_{}_{}".format(self.account_name, self.account_key) cache_result = redis_client.get(cache_key) From 7900cb2d48a358c27b5eaa853bf2d01d0a45379a Mon Sep 17 00:00:00 2001 From: Bowen Liang Date: Wed, 5 Feb 2025 15:48:11 +0800 Subject: [PATCH 3/3] fix --- api/extensions/storage/azure_blob_storage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/extensions/storage/azure_blob_storage.py b/api/extensions/storage/azure_blob_storage.py index 7eb611b52f79ab..7448fd4a6bb4be 100644 --- a/api/extensions/storage/azure_blob_storage.py +++ b/api/extensions/storage/azure_blob_storage.py @@ -1,7 +1,8 @@ from collections.abc import Generator from datetime import UTC, datetime, timedelta +from typing import Optional -from azure.identity import DefaultAzureCredential +from azure.identity import ChainedTokenCredential, DefaultAzureCredential from azure.storage.blob import AccountSasPermissions, BlobServiceClient, ResourceTypes, generate_account_sas from configs import dify_config @@ -19,6 +20,7 @@ def __init__(self): self.account_name = dify_config.AZURE_BLOB_ACCOUNT_NAME self.account_key = dify_config.AZURE_BLOB_ACCOUNT_KEY + self.credential: Optional[ChainedTokenCredential] = None if self.account_key == "managedidentity": self.credential = DefaultAzureCredential() else: