Update Azure Blob Service Config

externals/storages/azure_blob.py

@@ -19,15 +19,14 @@ if "azureai__container__key" not in os.environ:
     credential=DefaultAzureCredential()
     logger.info(f"✅ Initialized Azure AI Cred: Using Default Credential")
 else:
-    from azure.core.credentials import AzureKeyCredential
+    # from azure.core.credentials import AzureKeyCredential
     # credential = AzureKeyCredential(os.environ.get('azureai__container__key'))
-    credential = AzureKeyCredential(AzureBlobConstants.SAS_KEY)
+    # credential = AzureKeyCredential(AzureBlobConstants.SAS_KEY)
+    credential = AzureBlobConstants.SAS_KEY
     logger.info(f"✅ Initialized Azure AI Cred: Using Azure Key Credential")
 
 
 async def get_blob_service_client() -> BlobServiceClient:
-    # global _blob_service_client, _credential
-    # _credential = DefaultAzureCredential()
     _blob_service_client = BlobServiceClient(
         account_url=AzureBlobConstants.ENDPOINT,
         credential=credential,

services/uploader/azure_blob_service.py

@@ -27,16 +27,21 @@ if "azureai__container__key" not in os.environ:
     credential=DefaultAzureCredential()
     logger.info(f"✅ Initialized Azure AI Cred: Using Default Credential")
 else:
-    from azure.core.credentials import AzureKeyCredential
-    credential = AzureKeyCredential(os.environ.get('azureai__container__key'))
+    # from azure.core.credentials import AzureKeyCredential
+    # credential = AzureKeyCredential(os.environ.get('azureai__container__key'))
+    credential = AzureBlobConstants.SAS_KEY
     logger.info(f"✅ Initialized Azure AI Cred: Using Azure Key Credential")
 
 
-async def get_blob_service_client(url=os.environ.get('azureai__container__endpoint')) -> BlobServiceClient:
+async def get_blob_service_client() -> BlobServiceClient:
     try:
         # default_credential = DefaultAzureCredential()
-        blob_service_client = BlobServiceClient(url, credential=credential)
-        return blob_service_client
+        # blob_service_client = BlobServiceClient(url, credential=credential)
+        _blob_service_client = BlobServiceClient(
+            account_url=AzureBlobConstants.ENDPOINT,
+            credential=credential,
+        )
+        return _blob_service_client
     except Exception as E:
         logger.error(f'❌ Getting blob service client error, {E}')
         raise
@@ -59,9 +64,9 @@ async def get_blob_service_client(url=os.environ.get('azureai__container__endpoi
 #         raise
 
 
-async def get_container_client(url=os.environ.get('azureai__container__endpoint'), container_name=os.environ.get("azureai__container__name")) -> ContainerClient:
+async def get_container_client(container_name=os.environ.get("azureai__container__name")) -> ContainerClient:
     try:
-        blob_service_client = await get_blob_service_client(url=url)
+        blob_service_client = await get_blob_service_client()
         blob_client = blob_service_client.get_container_client(container_name)
         return blob_client
     except Exception as E: