Update

Author: BenConstable9

deploy_ai_search/src/deploy_ai_search/environment.py

@@ -109,12 +109,11 @@ def ai_search_credential(self) -> DefaultAzureCredential | AzureKeyCredential:
         Returns:
             DefaultAzureCredential | AzureKeyCredential: The ai search credential
         """
-        if self.identity_type == IdentityType.SYSTEM_ASSIGNED:
+        if self.identity_type in [
+            IdentityType.SYSTEM_ASSIGNED,
+            IdentityType.USER_ASSIGNED,
+        ]:
             return DefaultAzureCredential()
-        elif self.identity_type == IdentityType.USER_ASSIGNED:
-            return DefaultAzureCredential(
-                managed_identity_client_id=self.ai_search_identity_id
-            )
         else:
             return AzureKeyCredential(
                 os.environ.get("AIService__AzureSearchOptions__Key")
@@ -180,7 +179,7 @@ def storage_account_blob_container_name(self) -> str:
         if container is None:
             raise ValueError(
                 f"""Populate environment variable 'StorageAccount__{
-                             self.normalised_indexer_type}__Container' with container name."""
+                    self.normalised_indexer_type}__Container' with container name."""
             )
 
         return container

text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/open_ai.py

@@ -12,21 +12,15 @@
 class OpenAIConnector:
     @classmethod
     def get_authentication_properties(cls) -> dict:
-        if get_identity_type() == IdentityType.SYSTEM_ASSIGNED:
+        if get_identity_type() in [
+            IdentityType.SYSTEM_ASSIGNED,
+            IdentityType.USER_ASSIGNED,
+        ]:
             # Create the token provider
             api_key = None
             token_provider = get_bearer_token_provider(
                 DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
             )
-        elif get_identity_type() == IdentityType.USER_ASSIGNED:
-            # Create the token provider
-            api_key = None
-            token_provider = get_bearer_token_provider(
-                DefaultAzureCredential(
-                    managed_identity_client_id=os.environ["ClientId"]
-                ),
-                "https://cognitiveservices.azure.com/.default",
-            )
         else:
             token_provider = None
             api_key = os.environ["OpenAI__ApiKey"]