Further bug fixes

microsoft · Sep 10, 2024 · 0634e24 · 0634e24
1 parent a9386a9
commit 0634e24
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/ai_search_with_adi/adi_function_app/adi_2_ai_search.py b/ai_search_with_adi/adi_function_app/adi_2_ai_search.py
@@ -146,7 +146,7 @@ async def understand_image_with_gptv(image_base64, caption, tries_left=3):
     elif get_identity_type() != IdentityType.USER_ASSIGNED:
         token_provider = get_bearer_token_provider(
             DefaultAzureCredential(
-                managed_identity_client_id=os.environ["FunctionApp__ClientId"]
+                managed_identity_client_id=os.environ.get("FunctionApp__ClientId")
             ),
             "https://cognitiveservices.azure.com/.default",
         )

diff --git a/ai_search_with_adi/adi_function_app/key_phrase_extraction.py b/ai_search_with_adi/adi_function_app/key_phrase_extraction.py
@@ -42,12 +42,12 @@ async def extract_key_phrases_from_text(
         credential = DefaultAzureCredential()
     elif get_identity_type() == IdentityType.USER_ASSIGNED:
         credential = DefaultAzureCredential(
-            managed_identity_client_id=os.environ["FunctionApp__ClientId"]
+            managed_identity_client_id=os.environ.get("FunctionApp__ClientId")
         )
     else:
-        credential = AzureKeyCredential(os.environ["AIService__Services__Key"])
+        credential = AzureKeyCredential(os.environ.get("AIService__Services__Key"))
     text_analytics_client = TextAnalyticsClient(
-        endpoint=os.environ["AIService__Services__Endpoint"],
+        endpoint=os.environ.get("AIService__Services__Endpoint"),
         credential=credential,
     )
 

diff --git a/ai_search_with_adi/adi_function_app/storage_account.py b/ai_search_with_adi/adi_function_app/storage_account.py
@@ -13,22 +13,21 @@
 class StorageAccountHelper:
     """Helper class for interacting with Azure Blob Storage."""
 
-    def __init__(self) -> None:
-        """Initialize the StorageAccountHelper class."""
-        self._endpoint = os.environ["StorageAccount__ConnectionString"]
-
     async def get_client(self):
         """Get the BlobServiceClient object."""
         if get_identity_type() == IdentityType.SYSTEM_ASSIGNED:
+            endpoint = os.environ.get("StorageAccount__Endpoint")
             credential = DefaultAzureCredential()
-            return BlobServiceClient(account_url=self._endpoint, credential=credential)
+            return BlobServiceClient(account_url=endpoint, credential=credential)
         elif get_identity_type() == IdentityType.USER_ASSIGNED:
+            endpoint = os.environ.get("StorageAccount__Endpoint")
             credential = DefaultAzureCredential(
-                managed_identity_client_id=os.environ["FunctionApp__ClientId"]
+                managed_identity_client_id=os.environ.get("FunctionApp__ClientId")
             )
-            return BlobServiceClient(account_url=self._endpoint, credential=credential)
+            return BlobServiceClient(account_url=endpoint, credential=credential)
         else:
-            return BlobServiceClient(account_url=self._endpoint)
+            endpoint = os.environ.get("StorageAccount__ConnectionString")
+            return BlobServiceClient(account_url=endpoint)
 
     async def add_metadata_to_blob(
         self, source: str, container: str, metadata: dict