Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mypy checks violation in AzureBlobStorage #13215

Merged
merged 3 commits into from
Feb 5, 2025
Merged

fix: mypy checks violation in AzureBlobStorage #13215

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2b2f68
update
bowenliang123 Feb 5, 2025
2c4e690
update
bowenliang123 Feb 5, 2025
7900cb2
fix
bowenliang123 Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions api/extensions/storage/azure_blob_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -64,7 +66,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)
Expand Down