Add default value for _azure_ad_token attribute in AzureOpenAI class (#10245)

llama_index/llms/azure_openai.py

@@ -51,7 +51,7 @@ class AzureOpenAI(OpenAI):
         description="Indicates if Microsoft Entra ID (former Azure AD) is used for token authentication"
     )
 
-    _azure_ad_token: Any = PrivateAttr()
+    _azure_ad_token: Any = PrivateAttr(default=None)
     _client: SyncAzureOpenAI = PrivateAttr()
     _aclient: AsyncAzureOpenAI = PrivateAttr()
 

pyproject.toml

@@ -110,6 +110,7 @@ query_tools = [
 ]
 
 [tool.poetry.group.dev.dependencies]
+azure-identity = ">=1.15.0"
 black = {extras = ["jupyter"], version = "<=23.9.1,>=23.7.0"}
 boto3 = "1.33.6"  # needed for tests
 botocore = ">=1.33.13"

tests/llms/test_azure_openai.py

@@ -22,3 +22,24 @@ def test_custom_http_client(sync_azure_openai_mock: MagicMock) -> None:
     kwargs = sync_azure_openai_mock.call_args.kwargs
     assert "http_client" in kwargs
     assert kwargs["http_client"] == custom_http_client
+
+
+@patch("llama_index.llms.azure_openai.SyncAzureOpenAI")
+def test_azure_open_ai_with_azure_ad(sync_azure_openai_mock: MagicMock) -> None:
+    """
+    Verify that a custom http_client set for AzureOpenAI.
+    Should get passed on to the implementation from OpenAI.
+    Use azure ad.
+    """
+    custom_http_client = httpx.Client()
+    mock_instance = sync_azure_openai_mock.return_value
+    # Valid mocked result required to not run into another error
+    mock_instance.chat.completions.create.return_value = mock_chat_completion_v1()
+    azure_openai = AzureOpenAI(
+        engine="foo bar", http_client=custom_http_client, use_azure_ad=True
+    )
+    azure_openai.complete("test prompt")
+    sync_azure_openai_mock.assert_called()
+    kwargs = sync_azure_openai_mock.call_args.kwargs
+    assert "http_client" in kwargs
+    assert kwargs["http_client"] == custom_http_client