update blob config:

config/constant.py

@@ -23,6 +23,7 @@ class AzureBlobConstants:
     ENDPOINT: str = os.environ.get("azureai__container__endpoint")
     CONTAINER_NAME: str = os.environ.get("azureai__container__name")
     SAS_KEY: str = os.environ.get("azureai__search__sas")
+    CONTAINER_KEY: str = os.environ.get("azureai__container__key")
     MAX_FILE_SIZE_MB: int = int(os.getenv("azureai__max_file_size_mb", "5"))
     CHUNK_SIZE: int = 4 * 1024 * 1024
     ACCOUNT_NAME: str = os.environ.get("azureai__container__account__name")

externals/storages/azure_blob.py

@@ -4,38 +4,43 @@ from typing import List, Dict, Any
 
 from azure.identity.aio import DefaultAzureCredential
 from azure.storage.blob.aio import BlobServiceClient, ContainerClient
-from fastapi import UploadFile, HTTPException, status
+from azure.core.credentials import AzureSasCredential
+from azure.storage.blob import ContentSettings
 
 from config.constant import AzureBlobConstants
+from fastapi import UploadFile, HTTPException, status
 from utils.logger import get_logger
 
 logger = get_logger("azure-blob")
 
 # ---------- SINGLETONS ----------
-# _blob_service_client: BlobServiceClient | None = None
-# _credential: DefaultAzureCredential | None = None
-
 if "azureai__container__key" not in os.environ:
     credential=DefaultAzureCredential()
-    logger.info(f"✅ Initialized Azure AI Cred: Using Default Credential")
+    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'))
-    # credential = AzureKeyCredential(AzureBlobConstants.SAS_KEY)
-    credential = AzureBlobConstants.SAS_KEY
-    logger.info(f"✅ Initialized Azure AI Cred: Using Azure Key Credential")
+    credential = AzureSasCredential(AzureBlobConstants.SAS_KEY)
+    logger.info(f"✅ Initialized Azure AI Cred: Using **Azure Key Credential**")
 
 
-async def get_blob_service_client() -> BlobServiceClient:
-    _blob_service_client = BlobServiceClient(
-        account_url=AzureBlobConstants.ENDPOINT,
-        credential=credential,
-    )
-
-    if _blob_service_client is not None:
-        logger.info("✅ Azure BlobServiceClient initialized")
 
-    return _blob_service_client
+async def get_blob_service_client() -> BlobServiceClient:
+    try:
+        # default_credential = DefaultAzureCredential()
+        # 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}')
+        logger.error(f'⚠️ using DefaultAzureCredential')
+        credential=DefaultAzureCredential()
+        _blob_service_client = BlobServiceClient(
+            account_url=AzureBlobConstants.ENDPOINT,
+            credential=credential,
+        )
+        return _blob_service_client
 
 
 async def get_container_client() -> ContainerClient:
@@ -111,7 +116,7 @@ def helper_path_maker(
     return f"{in_folder}/{tenant_id}/{user_id}/{filename}"
 
 
-from azure.storage.blob import ContentSettings
+
 
 async def upload_pdf(file: UploadFile, tenant_id: str, user_id: str) -> dict:
     container_client = await get_container_client()

services/uploader/azure_blob_service.py

@@ -6,6 +6,9 @@ dotenv.load_dotenv(EnvFilepath.ENVPATH)
 from config.constant import AzureBlobConstants
 from azure.identity import DefaultAzureCredential
 
+from azure.core.credentials import AzureSasCredential
+
+# from azure.storage.blob import BlobServiceClient, ContainerClient
 from azure.storage.blob.aio import BlobServiceClient, ContainerClient
 # from azure.storage.blob import BlobServiceClient, ContainerClient
 from fastapi import UploadFile
@@ -18,19 +21,12 @@ logger = get_logger("azure blob")
 
 
 # --- Environment Variables ---
-# NOTE: Set the AZURE_STORAGE_CONNECTION_STRING in your environment (e.g., .env file or production environment).
-# CONNECTION_STRING = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
-# CONTAINER_NAME = "pdf-uploads"  # The name of your Azure Blob Storage container
-
-
 if "azureai__container__key" not in os.environ:
     credential=DefaultAzureCredential()
-    logger.info(f"✅ Initialized Azure AI Cred: Using Default Credential")
+    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'))
-    credential = AzureBlobConstants.SAS_KEY
-    logger.info(f"✅ Initialized Azure AI Cred: Using Azure Key Credential")
+    credential = AzureSasCredential(AzureBlobConstants.SAS_KEY)
+    logger.info(f"✅ Initialized Azure AI Cred: Using **Azure Key Credential**")
 
 
 async def get_blob_service_client() -> BlobServiceClient:
@@ -44,7 +40,13 @@ async def get_blob_service_client() -> BlobServiceClient:
         return _blob_service_client
     except Exception as E:
         logger.error(f'❌ Getting blob service client error, {E}')
-        raise
+        logger.error(f'⚠️ using DefaultAzureCredential')
+        credential=DefaultAzureCredential()
+        _blob_service_client = BlobServiceClient(
+            account_url=AzureBlobConstants.ENDPOINT,
+            credential=credential,
+        )
+        return _blob_service_client
 
 # async def get_blob_service_client() -> BlobServiceClient:
 #     try: