Update Azure Blob Service Config

services/uploader/azure_blob_service.py

@@ -5,6 +5,7 @@ dotenv.load_dotenv(EnvFilepath.ENVPATH)
 
 from config.constant import AzureBlobConstants
 from azure.identity import DefaultAzureCredential
+
 from azure.storage.blob.aio import BlobServiceClient, ContainerClient
 # from azure.storage.blob import BlobServiceClient, ContainerClient
 from fastapi import UploadFile
@@ -21,31 +22,42 @@ logger = get_logger("azure blob")
 # CONNECTION_STRING = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
 # CONTAINER_NAME = "pdf-uploads"  # The name of your Azure Blob Storage container
 
-# async def get_blob_service_client(url=os.environ.get('azureai__container__endpoint')) -> BlobServiceClient:
-#     try:
-#         default_credential = DefaultAzureCredential()
-#         blob_service_client = BlobServiceClient(url, credential=default_credential)
-#         return blob_service_client
-#     except Exception as E:
-#         logger.error(f'❌ Getting blob service client error, {E}')
 
-async def get_blob_service_client() -> BlobServiceClient:
-    try:
-        account_url = os.environ.get("azureai__container__endpoint")
-        sas_token = os.environ.get("azureai__search__sas")
+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'))
+    logger.info(f"✅ Initialized Azure AI Cred: Using Azure Key Credential")
 
-        if not account_url or not sas_token:
-            raise ValueError("Missing AZURE_STORAGE_ACCOUNT_URL or AZURE_STORAGE_SAS_TOKEN")
 
-        blob_service_client = BlobServiceClient(
-            account_url=account_url,
-            credential=sas_token
-        )
+async def get_blob_service_client(url=os.environ.get('azureai__container__endpoint')) -> BlobServiceClient:
+    try:
+        # default_credential = DefaultAzureCredential()
+        blob_service_client = BlobServiceClient(url, credential=credential)
         return blob_service_client
-    except Exception as e:
-        logger.error(f"❌ Getting blob service client error: {e}")
+    except Exception as E:
+        logger.error(f'❌ Getting blob service client error, {E}')
         raise
 
+# async def get_blob_service_client() -> BlobServiceClient:
+#     try:
+#         account_url = os.environ.get("azureai__container__endpoint")
+#         sas_token = os.environ.get("azureai__search__sas")
+
+#         if not account_url or not sas_token:
+#             raise ValueError("Missing AZURE_STORAGE_ACCOUNT_URL or AZURE_STORAGE_SAS_TOKEN")
+
+#         blob_service_client = BlobServiceClient(
+#             account_url=account_url,
+#             credential=sas_token
+#         )
+#         return blob_service_client
+#     except Exception as e:
+#         logger.error(f"❌ Getting blob service client error: {e}")
+#         raise
+
 
 async def get_container_client(url=os.environ.get('azureai__container__endpoint'), container_name=os.environ.get("azureai__container__name")) -> ContainerClient:
     try: