Python: Removed DefaultAzureCredential (#490)

* Removed DefaultAzureCredential

* Renamed ad_credential to credential

python/packages/azure/agent_framework_azure/_assistants_client.py

@@ -12,7 +12,7 @@ from pydantic.networks import AnyUrl
 from ._shared import AzureOpenAISettings
 
 if TYPE_CHECKING:
-    from azure.identity import ChainedTokenCredential
+    from azure.core.credentials import TokenCredential
 
 __all__ = ["AzureAssistantsClient"]
 
@@ -35,7 +35,7 @@ class AzureAssistantsClient(OpenAIAssistantsClient):
         ad_token: str | None = None,
         ad_token_provider: AsyncAzureADTokenProvider | None = None,
         token_endpoint: str | None = None,
-        ad_credential: "ChainedTokenCredential | None" = None,
+        credential: "TokenCredential | None" = None,
         default_headers: Mapping[str, str] | None = None,
         async_client: AsyncAzureOpenAI | None = None,
         env_file_path: str | None = None,
@@ -62,7 +62,7 @@ class AzureAssistantsClient(OpenAIAssistantsClient):
             ad_token: The Azure Active Directory token. (Optional)
             ad_token_provider: The Azure Active Directory token provider. (Optional)
             token_endpoint: The token endpoint to request an Azure token. (Optional)
-            ad_credential: The Azure AD credential to use for authentication. (Optional)
+            credential: The Azure credential to use for authentication. (Optional)
             default_headers: The default headers mapping of string keys to
                 string values for HTTP requests. (Optional)
             async_client: An existing client to use. (Optional)
@@ -95,9 +95,9 @@ class AzureAssistantsClient(OpenAIAssistantsClient):
             and not ad_token
             and not ad_token_provider
             and azure_openai_settings.token_endpoint
-            and ad_credential
+            and credential
         ):
-            ad_token = azure_openai_settings.get_azure_auth_token(ad_credential)
+            ad_token = azure_openai_settings.get_azure_auth_token(credential)
 
         if not async_client and not azure_openai_settings.api_key and not ad_token and not ad_token_provider:
             raise ServiceInitializationError("The Azure OpenAI API key, ad_token, or ad_token_provider is required.")

python/packages/azure/agent_framework_azure/_chat_client.py

@@ -14,7 +14,7 @@ from agent_framework import (
 )
 from agent_framework.exceptions import ServiceInitializationError
 from agent_framework.openai._chat_client import OpenAIChatClientBase
-from azure.identity import ChainedTokenCredential
+from azure.core.credentials import TokenCredential
 from openai.lib.azure import AsyncAzureADTokenProvider, AsyncAzureOpenAI
 from openai.types.chat.chat_completion import Choice
 from openai.types.chat.chat_completion_chunk import Choice as ChunkChoice
@@ -50,7 +50,7 @@ class AzureChatClient(AzureOpenAIConfigBase, OpenAIChatClientBase):
         ad_token: str | None = None,
         ad_token_provider: AsyncAzureADTokenProvider | None = None,
         token_endpoint: str | None = None,
-        ad_credential: ChainedTokenCredential | None = None,
+        credential: TokenCredential | None = None,
         default_headers: Mapping[str, str] | None = None,
         async_client: AsyncAzureOpenAI | None = None,
         env_file_path: str | None = None,
@@ -73,7 +73,7 @@ class AzureChatClient(AzureOpenAIConfigBase, OpenAIChatClientBase):
             ad_token: The Azure Active Directory token. (Optional)
             ad_token_provider: The Azure Active Directory token provider. (Optional)
             token_endpoint: The token endpoint to request an Azure token. (Optional)
-            ad_credential: The Azure Active Directory credential. (Optional)
+            credential: The Azure credential for authentication. (Optional)
             default_headers: The default headers mapping of string keys to
                 string values for HTTP requests. (Optional)
             async_client: An existing client to use. (Optional)
@@ -111,7 +111,7 @@ class AzureChatClient(AzureOpenAIConfigBase, OpenAIChatClientBase):
             ad_token=ad_token,
             ad_token_provider=ad_token_provider,
             token_endpoint=azure_openai_settings.token_endpoint,
-            ad_credential=ad_credential,
+            credential=credential,
             default_headers=default_headers,
             client=async_client,
             instruction_role=instruction_role,

python/packages/azure/agent_framework_azure/_entra_id_authentication.py

@@ -7,14 +7,14 @@ from agent_framework.exceptions import ServiceInvalidAuthError
 from azure.core.exceptions import ClientAuthenticationError
 
 if TYPE_CHECKING:
-    from azure.identity import ChainedTokenCredential
-    from azure.identity.aio import ChainedTokenCredential as AsyncChainedTokenCredential
+    from azure.core.credentials import TokenCredential
+    from azure.core.credentials_async import AsyncTokenCredential
 
 logger: logging.Logger = logging.getLogger(__name__)
 
 
 def get_entra_auth_token(
-    credential: "ChainedTokenCredential",
+    credential: "TokenCredential",
     token_endpoint: str,
     **kwargs: Any,
 ) -> str | None:
@@ -25,7 +25,6 @@ def get_entra_auth_token(
 
     Args:
         credential: The Azure credential to use for authentication.
-            for dev, you can use `DefaultAzureCredential`, but this is not recommended for production.
         token_endpoint: The token endpoint to use to retrieve the authentication token.
         **kwargs: Additional keyword arguments to pass to the token retrieval method.
 
@@ -47,7 +46,7 @@ def get_entra_auth_token(
 
 
 async def get_entra_auth_token_async(
-    credential: "AsyncChainedTokenCredential", token_endpoint: str, **kwargs: Any
+    credential: "AsyncTokenCredential", token_endpoint: str, **kwargs: Any
 ) -> str | None:
     """Retrieve a async Microsoft Entra Auth Token for a given token endpoint.
 
@@ -56,7 +55,6 @@ async def get_entra_auth_token_async(
 
     Args:
         credential: The async Azure credential to use for authentication.
-            for dev, you can use `DefaultAzureCredential`, but this is not recommended for production.
         token_endpoint: The token endpoint to use to retrieve the authentication token.
         **kwargs: Additional keyword arguments to pass to the token retrieval method.
 

python/packages/azure/agent_framework_azure/_responses_client.py

@@ -8,7 +8,7 @@ from agent_framework import use_tool_calling
 from agent_framework.exceptions import ServiceInitializationError
 from agent_framework.openai._responses_client import OpenAIResponsesClientBase
 from agent_framework.telemetry import use_telemetry
-from azure.identity import ChainedTokenCredential
+from azure.core.credentials import TokenCredential
 from openai.lib.azure import AsyncAzureADTokenProvider, AsyncAzureOpenAI
 from pydantic import SecretStr, ValidationError
 from pydantic.networks import AnyUrl
@@ -36,7 +36,7 @@ class AzureResponsesClient(AzureOpenAIConfigBase, OpenAIResponsesClientBase):
         ad_token: str | None = None,
         ad_token_provider: AsyncAzureADTokenProvider | None = None,
         token_endpoint: str | None = None,
-        ad_credential: ChainedTokenCredential | None = None,
+        credential: TokenCredential | None = None,
         default_headers: Mapping[str, str] | None = None,
         async_client: AsyncAzureOpenAI | None = None,
         env_file_path: str | None = None,
@@ -59,7 +59,7 @@ class AzureResponsesClient(AzureOpenAIConfigBase, OpenAIResponsesClientBase):
             ad_token: The Azure Active Directory token. (Optional)
             ad_token_provider: The Azure Active Directory token provider. (Optional)
             token_endpoint: The token endpoint to request an Azure token. (Optional)
-            ad_credential: The Azure Active Directory credential. (Optional)
+            credential: The Azure credential for authentication. (Optional)
             default_headers: The default headers mapping of string keys to
                 string values for HTTP requests. (Optional)
             async_client: An existing client to use. (Optional)
@@ -107,7 +107,7 @@ class AzureResponsesClient(AzureOpenAIConfigBase, OpenAIResponsesClientBase):
             ad_token=ad_token,
             ad_token_provider=ad_token_provider,
             token_endpoint=azure_openai_settings.token_endpoint,
-            ad_credential=ad_credential,
+            credential=credential,
             default_headers=default_headers,
             client=async_client,
             instruction_role=instruction_role,

python/packages/azure/agent_framework_azure/_shared.py

@@ -10,7 +10,7 @@ from agent_framework._pydantic import AFBaseSettings, HttpsUrl
 from agent_framework.exceptions import ServiceInitializationError
 from agent_framework.openai._shared import OpenAIHandler
 from agent_framework.telemetry import USER_AGENT_KEY
-from azure.identity import ChainedTokenCredential
+from azure.core.credentials import TokenCredential
 from openai.lib.azure import AsyncAzureOpenAI
 from pydantic import ConfigDict, SecretStr, model_validator, validate_call
 
@@ -135,7 +135,7 @@ class AzureOpenAISettings(AFBaseSettings):
     default_token_endpoint: str = DEFAULT_AZURE_TOKEN_ENDPOINT
 
     def get_azure_auth_token(
-        self, credential: "ChainedTokenCredential", token_endpoint: str | None = None, **kwargs: Any
+        self, credential: "TokenCredential", token_endpoint: str | None = None, **kwargs: Any
     ) -> str | None:
         """Retrieve a Microsoft Entra Auth Token for a given token endpoint for the use with Azure OpenAI.
 
@@ -181,7 +181,7 @@ class AzureOpenAIConfigBase(OpenAIHandler):
         ad_token: str | None = None,
         ad_token_provider: Callable[[], str | Awaitable[str]] | None = None,
         token_endpoint: str | None = None,
-        ad_credential: ChainedTokenCredential | None = None,
+        credential: TokenCredential | None = None,
         default_headers: Mapping[str, str] | None = None,
         client: AsyncAzureOpenAI | None = None,
         instruction_role: str | None = None,
@@ -202,7 +202,7 @@ class AzureOpenAIConfigBase(OpenAIHandler):
             ad_token: Azure AD token for authentication.
             ad_token_provider: A callable or coroutine function providing Azure AD tokens.
             token_endpoint: Azure AD token endpoint use to get the token.
-            ad_credential: Azure AD credential for authentication.
+            credential: Azure credential for authentication.
             default_headers: Default headers for HTTP requests.
             client: An existing client to use.
             instruction_role: The role to use for 'instruction' messages, for example, summarization
@@ -217,8 +217,8 @@ class AzureOpenAIConfigBase(OpenAIHandler):
             # If the client is None, the api_key is none, the ad_token is none, and the ad_token_provider is none,
             # then we will attempt to get the ad_token using the default endpoint specified in the Azure OpenAI
             # settings.
-            if not api_key and not ad_token_provider and not ad_token and token_endpoint and ad_credential:
-                ad_token = get_entra_auth_token(ad_credential, token_endpoint)
+            if not api_key and not ad_token_provider and not ad_token and token_endpoint and credential:
+                ad_token = get_entra_auth_token(credential, token_endpoint)
 
             if not api_key and not ad_token and not ad_token_provider:
                 raise ServiceInitializationError(

python/packages/azure/tests/test_azure_assistants_client.py

@@ -13,7 +13,7 @@ from agent_framework import (
     TextContent,
 )
 from agent_framework.exceptions import ServiceInitializationError
-from azure.identity import DefaultAzureCredential
+from azure.identity import AzureCliCredential
 from pydantic import Field
 
 from agent_framework_azure import AzureAssistantsClient
@@ -260,7 +260,7 @@ def get_weather(
 @skip_if_azure_integration_tests_disabled
 async def test_azure_assistants_client_get_response() -> None:
     """Test Azure Assistants Client response."""
-    async with AzureAssistantsClient(ad_credential=DefaultAzureCredential()) as azure_assistants_client:
+    async with AzureAssistantsClient(credential=AzureCliCredential()) as azure_assistants_client:
         assert isinstance(azure_assistants_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -284,7 +284,7 @@ async def test_azure_assistants_client_get_response() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_assistants_client_get_response_tools() -> None:
     """Test Azure Assistants Client response with tools."""
-    async with AzureAssistantsClient(ad_credential=DefaultAzureCredential()) as azure_assistants_client:
+    async with AzureAssistantsClient(credential=AzureCliCredential()) as azure_assistants_client:
         assert isinstance(azure_assistants_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -305,7 +305,7 @@ async def test_azure_assistants_client_get_response_tools() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_assistants_client_streaming() -> None:
     """Test Azure Assistants Client streaming response."""
-    async with AzureAssistantsClient(ad_credential=DefaultAzureCredential()) as azure_assistants_client:
+    async with AzureAssistantsClient(credential=AzureCliCredential()) as azure_assistants_client:
         assert isinstance(azure_assistants_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -335,7 +335,7 @@ async def test_azure_assistants_client_streaming() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_assistants_client_streaming_tools() -> None:
     """Test Azure Assistants Client streaming response with tools."""
-    async with AzureAssistantsClient(ad_credential=DefaultAzureCredential()) as azure_assistants_client:
+    async with AzureAssistantsClient(credential=AzureCliCredential()) as azure_assistants_client:
         assert isinstance(azure_assistants_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -362,7 +362,7 @@ async def test_azure_assistants_client_streaming_tools() -> None:
 async def test_azure_assistants_client_with_existing_assistant() -> None:
     """Test Azure Assistants Client with existing assistant ID."""
     # First create an assistant to use in the test
-    async with AzureAssistantsClient(ad_credential=DefaultAzureCredential()) as temp_client:
+    async with AzureAssistantsClient(credential=AzureCliCredential()) as temp_client:
         # Get the assistant ID by triggering assistant creation
         messages = [ChatMessage(role="user", text="Hello")]
         await temp_client.get_response(messages=messages)
@@ -370,7 +370,7 @@ async def test_azure_assistants_client_with_existing_assistant() -> None:
 
         # Now test using the existing assistant
         async with AzureAssistantsClient(
-            assistant_id=assistant_id, ad_credential=DefaultAzureCredential()
+            assistant_id=assistant_id, credential=AzureCliCredential()
         ) as azure_assistants_client:
             assert isinstance(azure_assistants_client, ChatClient)
             assert azure_assistants_client.assistant_id == assistant_id
@@ -386,7 +386,7 @@ async def test_azure_assistants_client_with_existing_assistant() -> None:
 
 
 def test_azure_assistants_client_entra_id_authentication() -> None:
-    """Test Entra ID authentication path with ad_credential."""
+    """Test Entra ID authentication path with credential."""
     mock_credential = MagicMock()
 
     with (
@@ -408,7 +408,7 @@ def test_azure_assistants_client_entra_id_authentication() -> None:
             deployment_name="test-deployment",
             api_key="placeholder-key",
             endpoint="https://test-endpoint.openai.azure.com",
-            ad_credential=mock_credential,
+            credential=mock_credential,
             token_endpoint="https://login.microsoftonline.com/test",
         )
 

python/packages/azure/tests/test_azure_chat_client.py

@@ -21,7 +21,7 @@ from agent_framework.openai import (
     OpenAIContentFilterException,
 )
 from agent_framework.telemetry import USER_AGENT_KEY
-from azure.identity import DefaultAzureCredential
+from azure.identity import AzureCliCredential
 from httpx import Request, Response
 from openai import AsyncAzureOpenAI, AsyncStream
 from openai.resources.chat.completions import AsyncCompletions as AsyncChatCompletions
@@ -601,7 +601,7 @@ def get_story_text() -> str:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_openai_chat_client_response() -> None:
     """Test Azure OpenAI chat completion responses."""
-    azure_chat_client = AzureChatClient(ad_credential=DefaultAzureCredential())
+    azure_chat_client = AzureChatClient(credential=AzureCliCredential())
     assert isinstance(azure_chat_client, ChatClient)
 
     messages: list[ChatMessage] = []
@@ -627,7 +627,7 @@ async def test_azure_openai_chat_client_response() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_openai_chat_client_response_tools() -> None:
     """Test AzureOpenAI chat completion responses."""
-    azure_chat_client = AzureChatClient(ad_credential=DefaultAzureCredential())
+    azure_chat_client = AzureChatClient(credential=AzureCliCredential())
     assert isinstance(azure_chat_client, ChatClient)
 
     messages: list[ChatMessage] = []
@@ -648,7 +648,7 @@ async def test_azure_openai_chat_client_response_tools() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_openai_chat_client_streaming() -> None:
     """Test Azure OpenAI chat completion responses."""
-    azure_chat_client = AzureChatClient(ad_credential=DefaultAzureCredential())
+    azure_chat_client = AzureChatClient(credential=AzureCliCredential())
     assert isinstance(azure_chat_client, ChatClient)
 
     messages: list[ChatMessage] = []
@@ -680,7 +680,7 @@ async def test_azure_openai_chat_client_streaming() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_openai_chat_client_streaming_tools() -> None:
     """Test AzureOpenAI chat completion responses."""
-    azure_chat_client = AzureChatClient(ad_credential=DefaultAzureCredential())
+    azure_chat_client = AzureChatClient(credential=AzureCliCredential())
     assert isinstance(azure_chat_client, ChatClient)
 
     messages: list[ChatMessage] = []

python/packages/azure/tests/test_azure_responses_client.py

@@ -14,7 +14,7 @@ from agent_framework import (
 )
 from agent_framework.azure import AzureResponsesClient
 from agent_framework.exceptions import ServiceInitializationError
-from azure.identity import DefaultAzureCredential
+from azure.identity import AzureCliCredential
 from pydantic import BaseModel
 
 skip_if_azure_integration_tests_disabled = pytest.mark.skipif(
@@ -112,7 +112,7 @@ def test_serialize(azure_openai_unit_test_env: dict[str, str]) -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_responses_client_response() -> None:
     """Test azure responses client responses."""
-    azure_responses_client = AzureResponsesClient(ad_credential=DefaultAzureCredential())
+    azure_responses_client = AzureResponsesClient(credential=AzureCliCredential())
 
     assert isinstance(azure_responses_client, ChatClient)
 
@@ -155,7 +155,7 @@ async def test_azure_responses_client_response() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_responses_client_response_tools() -> None:
     """Test azure responses client tools."""
-    azure_responses_client = AzureResponsesClient(ad_credential=DefaultAzureCredential())
+    azure_responses_client = AzureResponsesClient(credential=AzureCliCredential())
 
     assert isinstance(azure_responses_client, ChatClient)
 
@@ -194,7 +194,7 @@ async def test_azure_responses_client_response_tools() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_responses_client_streaming() -> None:
     """Test Azure azure responses client streaming responses."""
-    azure_responses_client = AzureResponsesClient(ad_credential=DefaultAzureCredential())
+    azure_responses_client = AzureResponsesClient(credential=AzureCliCredential())
 
     assert isinstance(azure_responses_client, ChatClient)
 
@@ -244,7 +244,7 @@ async def test_azure_responses_client_streaming() -> None:
 @skip_if_azure_integration_tests_disabled
 async def test_azure_responses_client_streaming_tools() -> None:
     """Test azure responses client streaming tools."""
-    azure_responses_client = AzureResponsesClient(ad_credential=DefaultAzureCredential())
+    azure_responses_client = AzureResponsesClient(credential=AzureCliCredential())
 
     assert isinstance(azure_responses_client, ChatClient)
 

python/packages/azure/tests/test_entra_id_authentication.py

@@ -14,7 +14,7 @@ from agent_framework_azure._entra_id_authentication import (
 
 @pytest.fixture
 def mock_credential() -> MagicMock:
-    """Mock synchronous ChainedTokenCredential."""
+    """Mock synchronous TokenCredential."""
     mock_cred = MagicMock()
     # Create a mock token object with a .token attribute
     mock_token = MagicMock()
@@ -25,7 +25,7 @@ def mock_credential() -> MagicMock:
 
 @pytest.fixture
 def mock_async_credential() -> MagicMock:
-    """Mock asynchronous ChainedTokenCredential."""
+    """Mock asynchronous AsyncTokenCredential."""
     mock_cred = MagicMock()
     # Create a mock token object with a .token attribute
     mock_token = MagicMock()

python/packages/foundry/agent_framework_foundry/_chat_client.py

@@ -120,7 +120,7 @@ class FoundryChatClient(ChatClientBase):
         thread_id: str | None = None,
         project_endpoint: str | None = None,
         model_deployment_name: str | None = None,
-        async_ad_credential: AsyncTokenCredential | None = None,
+        async_credential: AsyncTokenCredential | None = None,
         env_file_path: str | None = None,
         env_file_encoding: str | None = None,
         **kwargs: Any,
@@ -137,7 +137,7 @@ class FoundryChatClient(ChatClientBase):
                 conversation_id property, when making a request.
             project_endpoint: The Azure AI Foundry project endpoint URL. Used if client is not provided.
             model_deployment_name: The model deployment name to use for agent creation.
-            async_ad_credential: Azure async credential to use for authentication.
+            async_credential: Azure async credential to use for authentication.
             env_file_path: Path to environment file for loading settings.
             env_file_encoding: Encoding of the environment file.
             **kwargs: Additional keyword arguments passed to the parent class.
@@ -162,15 +162,15 @@ class FoundryChatClient(ChatClientBase):
             if agent_id is None and not foundry_settings.model_deployment_name:
                 raise ServiceInitializationError("Model deployment name is required for agent creation.")
 
-            # Use provided credential or fallback to DefaultAzureCredential
-            if not async_ad_credential:
+            # Use provided credential
+            if not async_credential:
                 raise ServiceInitializationError("Azure AD credential is required when client is not provided.")
-            client = AIProjectClient(endpoint=foundry_settings.project_endpoint, credential=async_ad_credential)
+            client = AIProjectClient(endpoint=foundry_settings.project_endpoint, credential=async_credential)
             should_close_client = True
 
         super().__init__(
             client=client,  # type: ignore[reportCallIssue]
-            credential=async_ad_credential,  # type: ignore[reportCallIssue]
+            credential=async_credential,  # type: ignore[reportCallIssue]
             agent_id=agent_id,  # type: ignore[reportCallIssue]
             thread_id=thread_id,  # type: ignore[reportCallIssue]
             agent_name=foundry_settings.agent_name,  # type: ignore[reportCallIssue]

python/packages/foundry/tests/test_foundry_chat_client.py

@@ -24,7 +24,7 @@ from azure.ai.agents.models import (
     ThreadRun,
 )
 from azure.core.credentials_async import AsyncTokenCredential
-from azure.identity.aio import DefaultAzureCredential
+from azure.identity.aio import AzureCliCredential
 from pydantic import Field, ValidationError
 
 from agent_framework_foundry import FoundryChatClient, FoundrySettings
@@ -133,7 +133,7 @@ def test_foundry_chat_client_init_missing_project_endpoint() -> None:
                 agent_id=None,
                 project_endpoint=None,  # Missing endpoint
                 model_deployment_name="test-model",
-                async_ad_credential=AsyncMock(spec=AsyncTokenCredential),
+                async_credential=AsyncMock(spec=AsyncTokenCredential),
             )
 
 
@@ -153,7 +153,7 @@ def test_foundry_chat_client_init_missing_model_deployment_for_agent_creation()
                 agent_id=None,  # No existing agent
                 project_endpoint="https://test.com",
                 model_deployment_name=None,  # Missing for agent creation
-                async_ad_credential=AsyncMock(spec=AsyncTokenCredential),
+                async_credential=AsyncMock(spec=AsyncTokenCredential),
             )
 
 
@@ -187,14 +187,14 @@ def test_foundry_chat_client_from_dict(mock_ai_project_client: MagicMock) -> Non
 
 
 def test_foundry_chat_client_init_missing_credential(foundry_unit_test_env: dict[str, str]) -> None:
-    """Test FoundryChatClient.__init__ when async_ad_credential is missing and no client provided."""
+    """Test FoundryChatClient.__init__ when async_credential is missing and no client provided."""
     with pytest.raises(ServiceInitializationError, match="Azure AD credential is required when client is not provided"):
         FoundryChatClient(
             client=None,
             agent_id="existing-agent",
             project_endpoint=foundry_unit_test_env["FOUNDRY_PROJECT_ENDPOINT"],
             model_deployment_name=foundry_unit_test_env["FOUNDRY_MODEL_DEPLOYMENT_NAME"],
-            async_ad_credential=None,  # Missing credential
+            async_credential=None,  # Missing credential
         )
 
 
@@ -208,7 +208,7 @@ def test_foundry_chat_client_init_validation_error(mock_azure_credential: MagicM
             FoundryChatClient(
                 project_endpoint="https://test.com",
                 model_deployment_name="test-model",
-                async_ad_credential=mock_azure_credential,
+                async_credential=mock_azure_credential,
             )
 
 
@@ -662,7 +662,7 @@ def get_weather(
 @skip_if_foundry_integration_tests_disabled
 async def test_foundry_chat_client_get_response() -> None:
     """Test Foundry Chat Client response."""
-    async with FoundryChatClient(async_ad_credential=DefaultAzureCredential()) as foundry_chat_client:
+    async with FoundryChatClient(async_credential=AzureCliCredential()) as foundry_chat_client:
         assert isinstance(foundry_chat_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -686,7 +686,7 @@ async def test_foundry_chat_client_get_response() -> None:
 @skip_if_foundry_integration_tests_disabled
 async def test_foundry_chat_client_get_response_tools() -> None:
     """Test Foundry Chat Client response with tools."""
-    async with FoundryChatClient(async_ad_credential=DefaultAzureCredential()) as foundry_chat_client:
+    async with FoundryChatClient(async_credential=AzureCliCredential()) as foundry_chat_client:
         assert isinstance(foundry_chat_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -707,7 +707,7 @@ async def test_foundry_chat_client_get_response_tools() -> None:
 @skip_if_foundry_integration_tests_disabled
 async def test_foundry_chat_client_streaming() -> None:
     """Test Foundry Chat Client streaming response."""
-    async with FoundryChatClient(async_ad_credential=DefaultAzureCredential()) as foundry_chat_client:
+    async with FoundryChatClient(async_credential=AzureCliCredential()) as foundry_chat_client:
         assert isinstance(foundry_chat_client, ChatClient)
 
         messages: list[ChatMessage] = []
@@ -737,7 +737,7 @@ async def test_foundry_chat_client_streaming() -> None:
 @skip_if_foundry_integration_tests_disabled
 async def test_foundry_chat_client_streaming_tools() -> None:
     """Test Foundry Chat Client streaming response with tools."""
-    async with FoundryChatClient(async_ad_credential=DefaultAzureCredential()) as foundry_chat_client:
+    async with FoundryChatClient(async_credential=AzureCliCredential()) as foundry_chat_client:
         assert isinstance(foundry_chat_client, ChatClient)
 
         messages: list[ChatMessage] = []