Python: name changes executed (#607)

* name changes executed

* updated adr to accepted

* renamed openai base config

* renamed openai config to mixin

* added renames in user docs

* reverted mcperror

* fix tests

* remove sse from tests

python/samples/getting_started/agents/azure_assistants_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`azure_assistants_basic.py`](azure_assistants_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `AzureAssistantsClient`. Shows both streaming and non-streaming responses with automatic assistant creation and cleanup. |
+| [`azure_assistants_basic.py`](azure_assistants_basic.py) | The simplest way to create an agent using `ChatAgent` with `AzureAssistantsClient`. Shows both streaming and non-streaming responses with automatic assistant creation and cleanup. |
 | [`azure_assistants_with_existing_assistant.py`](azure_assistants_with_existing_assistant.py) | Shows how to work with a pre-existing assistant by providing the assistant ID to the Azure Assistants client. Demonstrates proper cleanup of manually created assistants. |
 | [`azure_assistants_with_explicit_settings.py`](azure_assistants_with_explicit_settings.py) | Shows how to initialize an agent with a specific assistants client, configuring settings explicitly including endpoint and deployment name. |
 | [`azure_assistants_with_function_tools.py`](azure_assistants_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |

python/samples/getting_started/agents/azure_assistants_client/azure_assistants_basic.py

@@ -48,7 +48,7 @@ async def streaming_example() -> None:
         query = "What's the weather like in Portland?"
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
         print("\n")

python/samples/getting_started/agents/azure_assistants_client/azure_assistants_with_code_interpreter.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import AgentRunResponseUpdate, ChatClientAgent, ChatResponseUpdate, HostedCodeInterpreterTool
+from agent_framework import AgentRunResponseUpdate, ChatAgent, ChatResponseUpdate, HostedCodeInterpreterTool
 from agent_framework.azure import AzureAssistantsClient
 from azure.identity import AzureCliCredential
 from openai.types.beta.threads.runs import (
@@ -39,7 +39,7 @@ async def main() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
         tools=HostedCodeInterpreterTool(),
@@ -48,7 +48,7 @@ async def main() -> None:
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
         generated_code = ""
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
             code_interpreter_chunk = get_code_interpreter_chunk(chunk)

python/samples/getting_started/agents/azure_assistants_client/azure_assistants_with_existing_assistant.py

@@ -5,7 +5,7 @@ import os
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.azure import AzureAssistantsClient
 from azure.identity import AzureCliCredential, get_bearer_token_provider
 from openai import AsyncAzureOpenAI
@@ -37,7 +37,7 @@ async def main() -> None:
     )
 
     try:
-        async with ChatClientAgent(
+        async with ChatAgent(
             chat_client=AzureAssistantsClient(async_client=client, assistant_id=created_assistant.id),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/agents/azure_assistants_client/azure_assistants_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.azure import AzureAssistantsClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,7 +33,7 @@ async def tools_on_agent_level() -> None:
     # The agent can use these tools for any query during its lifetime
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -64,7 +64,7 @@ async def tools_on_run_level() -> None:
     # Agent created without tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -95,7 +95,7 @@ async def mixed_tools_example() -> None:
     # Agent created with some base tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/azure_assistants_client/azure_assistants_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent
+from agent_framework import AgentThread, ChatAgent
 from agent_framework.azure import AzureAssistantsClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -24,7 +24,7 @@ async def example_with_automatic_thread_creation() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -50,7 +50,7 @@ async def example_with_thread_persistence() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -88,7 +88,7 @@ async def example_with_existing_thread_id() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=AzureAssistantsClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -108,7 +108,7 @@ async def example_with_existing_thread_id() -> None:
         print("\n--- Continuing with the same thread ID in a new agent instance ---")
 
         # Create a new agent instance but use the existing thread ID
-        async with ChatClientAgent(
+        async with ChatAgent(
             chat_client=AzureAssistantsClient(thread_id=existing_thread_id, credential=AzureCliCredential()),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/agents/azure_chat_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`azure_chat_client_basic.py`](azure_chat_client_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `AzureChatClient`. Shows both streaming and non-streaming responses for chat-based interactions with Azure OpenAI models. |
+| [`azure_chat_client_basic.py`](azure_chat_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `AzureChatClient`. Shows both streaming and non-streaming responses for chat-based interactions with Azure OpenAI models. |
 | [`azure_chat_client_with_explicit_settings.py`](azure_chat_client_with_explicit_settings.py) | Shows how to initialize an agent with a specific chat client, configuring settings explicitly including endpoint and deployment name. |
 | [`azure_chat_client_with_function_tools.py`](azure_chat_client_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |
 | [`azure_chat_client_with_thread.py`](azure_chat_client_with_thread.py) | Demonstrates thread management with Azure agents, including automatic thread creation for stateless conversations and explicit thread management for maintaining conversation context across multiple interactions. |

python/samples/getting_started/agents/azure_chat_client/azure_chat_client_basic.py

@@ -50,7 +50,7 @@ async def streaming_example() -> None:
     query = "What's the weather like in Portland?"
     print(f"User: {query}")
     print("Agent: ", end="", flush=True)
-    async for chunk in agent.run_streaming(query):
+    async for chunk in agent.run_stream(query):
         if chunk.text:
             print(chunk.text, end="", flush=True)
     print("\n")

python/samples/getting_started/agents/azure_chat_client/azure_chat_client_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.azure import AzureChatClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,7 +33,7 @@ async def tools_on_agent_level() -> None:
     # The agent can use these tools for any query during its lifetime
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -65,7 +65,7 @@ async def tools_on_run_level() -> None:
     # Agent created without tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -97,7 +97,7 @@ async def mixed_tools_example() -> None:
     # Agent created with some base tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/azure_chat_client/azure_chat_client_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent, ChatMessageList
+from agent_framework import AgentThread, ChatAgent, ChatMessageList
 from agent_framework.azure import AzureChatClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -24,7 +24,7 @@ async def example_with_automatic_thread_creation() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -51,7 +51,7 @@ async def example_with_thread_persistence() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -86,7 +86,7 @@ async def example_with_existing_thread_messages() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -108,7 +108,7 @@ async def example_with_existing_thread_messages() -> None:
     print("\n--- Continuing with the same thread in a new agent instance ---")
 
     # Create a new agent instance but use the existing thread with its message history
-    new_agent = ChatClientAgent(
+    new_agent = ChatAgent(
         chat_client=AzureChatClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,

python/samples/getting_started/agents/azure_responses_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`azure_responses_client_basic.py`](azure_responses_client_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `AzureResponsesClient`. Shows both streaming and non-streaming responses for structured response generation with Azure OpenAI models. |
+| [`azure_responses_client_basic.py`](azure_responses_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `AzureResponsesClient`. Shows both streaming and non-streaming responses for structured response generation with Azure OpenAI models. |
 | [`azure_responses_client_with_explicit_settings.py`](azure_responses_client_with_explicit_settings.py) | Shows how to initialize an agent with a specific responses client, configuring settings explicitly including endpoint and deployment name. |
 | [`azure_responses_client_with_function_tools.py`](azure_responses_client_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |
 | [`azure_responses_client_with_code_interpreter.py`](azure_responses_client_with_code_interpreter.py) | Shows how to use the HostedCodeInterpreterTool with Azure agents to write and execute Python code. Includes helper methods for accessing code interpreter data from response chunks. |

python/samples/getting_started/agents/azure_responses_client/azure_responses_client_basic.py

@@ -48,7 +48,7 @@ async def streaming_example() -> None:
     query = "What's the weather like in Portland?"
     print(f"User: {query}")
     print("Agent: ", end="", flush=True)
-    async for chunk in agent.run_streaming(query):
+    async for chunk in agent.run_stream(query):
         if chunk.text:
             print(chunk.text, end="", flush=True)
     print("\n")

python/samples/getting_started/agents/azure_responses_client/azure_responses_client_with_code_interpreter.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatClientAgent, ChatResponse, HostedCodeInterpreterTool
+from agent_framework import ChatAgent, ChatResponse, HostedCodeInterpreterTool
 from agent_framework.azure import AzureResponsesClient
 from azure.identity import AzureCliCredential
 from openai.types.responses.response import Response as OpenAIResponse
@@ -15,7 +15,7 @@ async def main() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
         tools=HostedCodeInterpreterTool(),

python/samples/getting_started/agents/azure_responses_client/azure_responses_client_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.azure import AzureResponsesClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,7 +33,7 @@ async def tools_on_agent_level() -> None:
     # The agent can use these tools for any query during its lifetime
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -65,7 +65,7 @@ async def tools_on_run_level() -> None:
     # Agent created without tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -97,7 +97,7 @@ async def mixed_tools_example() -> None:
     # Agent created with some base tools
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/azure_responses_client/azure_responses_client_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent
+from agent_framework import AgentThread, ChatAgent
 from agent_framework.azure import AzureResponsesClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -24,7 +24,7 @@ async def example_with_automatic_thread_creation() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -53,7 +53,7 @@ async def example_with_thread_persistence_in_memory() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -94,7 +94,7 @@ async def example_with_existing_thread_id() -> None:
 
     # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
     # authentication option.
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=AzureResponsesClient(credential=AzureCliCredential()),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -116,7 +116,7 @@ async def example_with_existing_thread_id() -> None:
     if existing_thread_id:
         print("\n--- Continuing with the same thread ID in a new agent instance ---")
 
-        agent = ChatClientAgent(
+        agent = ChatAgent(
             chat_client=AzureResponsesClient(credential=AzureCliCredential()),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/agents/foundry/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`foundry_basic.py`](foundry_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `FoundryChatClient`. It automatically handles all configuration using environment variables. |
+| [`foundry_basic.py`](foundry_basic.py) | The simplest way to create an agent using `ChatAgent` with `FoundryChatClient`. It automatically handles all configuration using environment variables. |
 | [`foundry_with_explicit_settings.py`](foundry_with_explicit_settings.py) | Shows how to create an agent with explicitly configured `FoundryChatClient` settings, including project endpoint, model deployment, credentials, and agent name. |
 | [`foundry_with_existing_agent.py`](foundry_with_existing_agent.py) | Shows how to work with a pre-existing agent by providing the agent ID to the Foundry chat client. This example also demonstrates proper cleanup of manually created agents. |
 | [`foundry_with_function_tools.py`](foundry_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |

python/samples/getting_started/agents/foundry/foundry_basic.py

@@ -58,7 +58,7 @@ async def streaming_example() -> None:
         query = "What's the weather like in Portland?"
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
         print("\n")

python/samples/getting_started/agents/foundry/foundry_with_code_interpreter.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import AgentRunResponseUpdate, ChatClientAgent, ChatResponseUpdate, HostedCodeInterpreterTool
+from agent_framework import AgentRunResponseUpdate, ChatAgent, ChatResponseUpdate, HostedCodeInterpreterTool
 from agent_framework.foundry import FoundryChatClient
 from azure.ai.agents.models import (
     RunStepDelta,
@@ -41,7 +41,7 @@ async def main() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
             tools=HostedCodeInterpreterTool(),
@@ -51,7 +51,7 @@ async def main() -> None:
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
         generated_code = ""
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
             code_interpreter_chunk = get_code_interpreter_chunk(chunk)

python/samples/getting_started/agents/foundry/foundry_with_existing_agent.py

@@ -5,7 +5,7 @@ import os
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.foundry import FoundryChatClient
 from azure.ai.projects.aio import AIProjectClient
 from azure.identity.aio import AzureCliCredential
@@ -34,7 +34,7 @@ async def main() -> None:
         )
 
         try:
-            async with ChatClientAgent(
+            async with ChatAgent(
                 # passing in the client is optional here, so if you take the agent_id from the portal
                 # you can use it directly without the two lines above.
                 chat_client=FoundryChatClient(client=client, agent_id=created_agent.id),

python/samples/getting_started/agents/foundry/foundry_with_explicit_settings.py

@@ -5,7 +5,7 @@ import os
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.foundry import FoundryChatClient
 from azure.identity.aio import AzureCliCredential
 from pydantic import Field
@@ -28,7 +28,7 @@ async def main() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(
                 project_endpoint=os.environ["FOUNDRY_PROJECT_ENDPOINT"],
                 model_deployment_name=os.environ["FOUNDRY_MODEL_DEPLOYMENT_NAME"],

python/samples/getting_started/agents/foundry/foundry_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.foundry import FoundryChatClient
 from azure.identity.aio import AzureCliCredential
 from pydantic import Field
@@ -35,7 +35,7 @@ async def tools_on_agent_level() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful assistant that can provide weather and time information.",
             tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -69,7 +69,7 @@ async def tools_on_run_level() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful assistant.",
             # No tools defined here
@@ -103,7 +103,7 @@ async def mixed_tools_example() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a comprehensive assistant that can help with various information requests.",
             tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/foundry/foundry_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent
+from agent_framework import AgentThread, ChatAgent
 from agent_framework.foundry import FoundryChatClient
 from azure.identity.aio import AzureCliCredential
 from pydantic import Field
@@ -26,7 +26,7 @@ async def example_with_automatic_thread_creation() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful weather agent.",
             tools=get_weather,
@@ -55,7 +55,7 @@ async def example_with_thread_persistence() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful weather agent.",
             tools=get_weather,
@@ -96,7 +96,7 @@ async def example_with_existing_thread_id() -> None:
     # authentication option.
     async with (
         AzureCliCredential() as credential,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=FoundryChatClient(async_credential=credential),
             instructions="You are a helpful weather agent.",
             tools=get_weather,
@@ -119,7 +119,7 @@ async def example_with_existing_thread_id() -> None:
         # Create a new agent instance but use the existing thread ID
         async with (
             AzureCliCredential() as credential,
-            ChatClientAgent(
+            ChatAgent(
                 chat_client=FoundryChatClient(thread_id=existing_thread_id, async_credential=credential),
                 instructions="You are a helpful weather agent.",
                 tools=get_weather,

python/samples/getting_started/agents/openai_assistants_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`openai_assistants_basic.py`](openai_assistants_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `OpenAIAssistantsClient`. Shows both streaming and non-streaming responses with automatic assistant creation and cleanup. |
+| [`openai_assistants_basic.py`](openai_assistants_basic.py) | The simplest way to create an agent using `ChatAgent` with `OpenAIAssistantsClient`. Shows both streaming and non-streaming responses with automatic assistant creation and cleanup. |
 | [`openai_assistants_with_existing_assistant.py`](openai_assistants_with_existing_assistant.py) | Shows how to work with a pre-existing assistant by providing the assistant ID to the OpenAI Assistants client. Demonstrates proper cleanup of manually created assistants. |
 | [`openai_assistants_with_explicit_settings.py`](openai_assistants_with_explicit_settings.py) | Shows how to initialize an agent with a specific assistants client, configuring settings explicitly including API key and model ID. |
 | [`openai_assistants_with_function_tools.py`](openai_assistants_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_basic.py

@@ -45,7 +45,7 @@ async def streaming_example() -> None:
         query = "What's the weather like in Portland?"
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
         print("\n")

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_with_code_interpreter.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import AgentRunResponseUpdate, ChatClientAgent, ChatResponseUpdate, HostedCodeInterpreterTool
+from agent_framework import AgentRunResponseUpdate, ChatAgent, ChatResponseUpdate, HostedCodeInterpreterTool
 from agent_framework.openai import OpenAIAssistantsClient
 from openai.types.beta.threads.runs import (
     CodeInterpreterToolCallDelta,
@@ -36,7 +36,7 @@ async def main() -> None:
     """Example showing how to use the HostedCodeInterpreterTool with OpenAI Assistants."""
     print("=== OpenAI Assistants Agent with Code Interpreter Example ===")
 
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
         tools=HostedCodeInterpreterTool(),
@@ -45,7 +45,7 @@ async def main() -> None:
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
         generated_code = ""
-        async for chunk in agent.run_streaming(query):
+        async for chunk in agent.run_stream(query):
             if chunk.text:
                 print(chunk.text, end="", flush=True)
             code_interpreter_chunk = get_code_interpreter_chunk(chunk)

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_with_existing_assistant.py

@@ -5,7 +5,7 @@ import os
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIAssistantsClient
 from openai import AsyncOpenAI
 from pydantic import Field
@@ -31,7 +31,7 @@ async def main() -> None:
     )
 
     try:
-        async with ChatClientAgent(
+        async with ChatAgent(
             chat_client=OpenAIAssistantsClient(async_client=client, assistant_id=created_assistant.id),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_with_file_search.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatClientAgent, HostedFileSearchTool, HostedVectorStoreContent
+from agent_framework import ChatAgent, HostedFileSearchTool, HostedVectorStoreContent
 from agent_framework.openai import OpenAIAssistantsClient
 
 # Helper functions
@@ -33,7 +33,7 @@ async def delete_vector_store(client: OpenAIAssistantsClient, file_id: str, vect
 
 async def main() -> None:
     client = OpenAIAssistantsClient()
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=client,
         instructions="You are a helpful assistant that searches files in a knowledge base.",
         tools=HostedFileSearchTool(),
@@ -43,7 +43,7 @@ async def main() -> None:
 
         print(f"User: {query}")
         print("Agent: ", end="", flush=True)
-        async for chunk in agent.run_streaming(
+        async for chunk in agent.run_stream(
             query, tool_resources={"file_search": {"vector_store_ids": [vector_store.vector_store_id]}}
         ):
             if chunk.text:

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIAssistantsClient
 from pydantic import Field
 
@@ -30,7 +30,7 @@ async def tools_on_agent_level() -> None:
 
     # Tools are provided when creating the agent
     # The agent can use these tools for any query during its lifetime
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -59,7 +59,7 @@ async def tools_on_run_level() -> None:
     print("=== Tools Passed to Run Method ===")
 
     # Agent created without tools
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -88,7 +88,7 @@ async def mixed_tools_example() -> None:
     print("=== Mixed Tools Example (Agent + Run Method) ===")
 
     # Agent created with some base tools
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/openai_assistants_client/openai_assistants_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent
+from agent_framework import AgentThread, ChatAgent
 from agent_framework.openai import OpenAIAssistantsClient
 from pydantic import Field
 
@@ -21,7 +21,7 @@ async def example_with_automatic_thread_creation() -> None:
     """Example showing automatic thread creation (service-managed thread)."""
     print("=== Automatic Thread Creation Example ===")
 
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -45,7 +45,7 @@ async def example_with_thread_persistence() -> None:
     print("=== Thread Persistence Example ===")
     print("Using the same thread across multiple conversations to maintain context.\n")
 
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -81,7 +81,7 @@ async def example_with_existing_thread_id() -> None:
     # First, create a conversation and capture the thread ID
     existing_thread_id = None
 
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIAssistantsClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -101,7 +101,7 @@ async def example_with_existing_thread_id() -> None:
         print("\n--- Continuing with the same thread ID in a new agent instance ---")
 
         # Create a new agent instance but use the existing thread ID
-        async with ChatClientAgent(
+        async with ChatAgent(
             chat_client=OpenAIAssistantsClient(thread_id=existing_thread_id),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/agents/openai_chat_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`openai_chat_client_basic.py`](openai_chat_client_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `OpenAIChatClient`. Shows both streaming and non-streaming responses for chat-based interactions with OpenAI models. |
+| [`openai_chat_client_basic.py`](openai_chat_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `OpenAIChatClient`. Shows both streaming and non-streaming responses for chat-based interactions with OpenAI models. |
 | [`openai_chat_client_with_explicit_settings.py`](openai_chat_client_with_explicit_settings.py) | Shows how to initialize an agent with a specific chat client, configuring settings explicitly including API key and model ID. |
 | [`openai_chat_client_with_function_tools.py`](openai_chat_client_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |
 | [`openai_chat_client_with_local_mcp.py`](openai_chat_client_with_local_mcp.py) | Shows how to integrate OpenAI agents with local Model Context Protocol (MCP) servers for enhanced functionality and tool integration. |

python/samples/getting_started/agents/openai_chat_client/openai_chat_client_basic.py

@@ -44,7 +44,7 @@ async def streaming_example() -> None:
     query = "What's the weather like in Portland?"
     print(f"User: {query}")
     print("Agent: ", end="", flush=True)
-    async for chunk in agent.run_streaming(query):
+    async for chunk in agent.run_stream(query):
         if chunk.text:
             print(chunk.text, end="", flush=True)
     print("\n")

python/samples/getting_started/agents/openai_chat_client/openai_chat_client_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIChatClient
 from pydantic import Field
 
@@ -30,7 +30,7 @@ async def tools_on_agent_level() -> None:
 
     # Tools are provided when creating the agent
     # The agent can use these tools for any query during its lifetime
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -60,7 +60,7 @@ async def tools_on_run_level() -> None:
     print("=== Tools Passed to Run Method ===")
 
     # Agent created without tools
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -90,7 +90,7 @@ async def mixed_tools_example() -> None:
     print("=== Mixed Tools Example (Agent + Run Method) ===")
 
     # Agent created with some base tools
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/openai_chat_client/openai_chat_client_with_local_mcp.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatClientAgent, McpStreamableHttpTool
+from agent_framework import ChatAgent, MCPStreamableHTTPTool
 from agent_framework.openai import OpenAIChatClient
 
 
@@ -14,11 +14,11 @@ async def mcp_tools_on_run_level() -> None:
     # This means we have to ensure we connect to the MCP server before running the agent
     # and pass the tools to the run method.
     async with (
-        McpStreamableHttpTool(
+        MCPStreamableHTTPTool(
             name="Microsoft Learn MCP",
             url="https://learn.microsoft.com/api/mcp",
         ) as mcp_server,
-        ChatClientAgent(
+        ChatAgent(
             chat_client=OpenAIChatClient(),
             name="DocsAgent",
             instructions="You are a helpful assistant that can help with microsoft documentation questions.",
@@ -47,7 +47,7 @@ async def mcp_tools_on_agent_level() -> None:
     async with OpenAIChatClient().create_agent(
         name="DocsAgent",
         instructions="You are a helpful assistant that can help with microsoft documentation questions.",
-        tools=McpStreamableHttpTool(  # Tools defined at agent creation
+        tools=MCPStreamableHTTPTool(  # Tools defined at agent creation
             name="Microsoft Learn MCP",
             url="https://learn.microsoft.com/api/mcp",
         ),

python/samples/getting_started/agents/openai_chat_client/openai_chat_client_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent, ChatMessageList
+from agent_framework import AgentThread, ChatAgent, ChatMessageList
 from agent_framework.openai import OpenAIChatClient
 from pydantic import Field
 
@@ -21,7 +21,7 @@ async def example_with_automatic_thread_creation() -> None:
     """Example showing automatic thread creation (service-managed thread)."""
     print("=== Automatic Thread Creation Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -46,7 +46,7 @@ async def example_with_thread_persistence() -> None:
     print("=== Thread Persistence Example ===")
     print("Using the same thread across multiple conversations to maintain context.\n")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -79,7 +79,7 @@ async def example_with_existing_thread_messages() -> None:
     """Example showing how to work with existing thread messages for OpenAI."""
     print("=== Existing Thread Messages Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -101,7 +101,7 @@ async def example_with_existing_thread_messages() -> None:
     print("\n--- Continuing with the same thread in a new agent instance ---")
 
     # Create a new agent instance but use the existing thread with its message history
-    new_agent = ChatClientAgent(
+    new_agent = ChatAgent(
         chat_client=OpenAIChatClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,

python/samples/getting_started/agents/openai_responses_client/README.md

@@ -6,7 +6,7 @@ This folder contains examples demonstrating different ways to create and use age
 
 | File | Description |
 |------|-------------|
-| [`openai_responses_client_basic.py`](openai_responses_client_basic.py) | The simplest way to create an agent using `ChatClientAgent` with `OpenAIResponsesClient`. Shows both streaming and non-streaming responses for structured response generation with OpenAI models. |
+| [`openai_responses_client_basic.py`](openai_responses_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `OpenAIResponsesClient`. Shows both streaming and non-streaming responses for structured response generation with OpenAI models. |
 | [`openai_responses_client_reasoning.py`](openai_responses_client_reasoning.py) | Demonstrates how to use reasoning capabilities with OpenAI agents, showing how the agent can provide detailed reasoning for its responses. |
 | [`openai_responses_client_with_explicit_settings.py`](openai_responses_client_with_explicit_settings.py) | Shows how to initialize an agent with a specific responses client, configuring settings explicitly including API key and model ID. |
 | [`openai_responses_client_with_function_tools.py`](openai_responses_client_with_function_tools.py) | Demonstrates how to use function tools with agents. Shows both agent-level tools (defined when creating the agent) and query-level tools (provided with specific queries). |

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_basic.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIResponsesClient
 from pydantic import Field
 
@@ -21,7 +21,7 @@ async def non_streaming_example() -> None:
     """Example of non-streaming response (get the complete result at once)."""
     print("=== Non-streaming Response Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -37,7 +37,7 @@ async def streaming_example() -> None:
     """Example of streaming response (get results as they are generated)."""
     print("=== Streaming Response Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -46,7 +46,7 @@ async def streaming_example() -> None:
     query = "What's the weather like in Portland?"
     print(f"User: {query}")
     print("Agent: ", end="", flush=True)
-    async for chunk in agent.run_streaming(query):
+    async for chunk in agent.run_stream(query):
         if chunk.text:
             print(chunk.text, end="", flush=True)
     print("\n")

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_reasoning.py

@@ -22,7 +22,7 @@ async def reasoning_example() -> None:
     print(f"User: {query}")
     print(f"{agent.name}: ", end="", flush=True)
     usage = None
-    async for chunk in agent.run_streaming(query):
+    async for chunk in agent.run_stream(query):
         if chunk.contents:
             for content in chunk.contents:
                 if isinstance(content, TextReasoningContent):

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_with_code_interpreter.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatClientAgent, ChatResponse, HostedCodeInterpreterTool
+from agent_framework import ChatAgent, ChatResponse, HostedCodeInterpreterTool
 from agent_framework.openai import OpenAIResponsesClient
 from openai.types.responses.response import Response as OpenAIResponse
 from openai.types.responses.response_code_interpreter_tool_call import ResponseCodeInterpreterToolCall
@@ -12,7 +12,7 @@ async def main() -> None:
     """Example showing how to use the HostedCodeInterpreterTool with OpenAI Responses."""
     print("=== OpenAI Responses Agent with Code Interpreter Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
         tools=HostedCodeInterpreterTool(),

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_with_function_tools.py

@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIResponsesClient
 from pydantic import Field
 
@@ -30,7 +30,7 @@ async def tools_on_agent_level() -> None:
 
     # Tools are provided when creating the agent
     # The agent can use these tools for any query during its lifetime
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful assistant that can provide weather and time information.",
         tools=[get_weather, get_time],  # Tools defined at agent creation
@@ -60,7 +60,7 @@ async def tools_on_run_level() -> None:
     print("=== Tools Passed to Run Method ===")
 
     # Agent created without tools
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful assistant.",
         # No tools defined here
@@ -90,7 +90,7 @@ async def mixed_tools_example() -> None:
     print("=== Mixed Tools Example (Agent + Run Method) ===")
 
     # Agent created with some base tools
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a comprehensive assistant that can help with various information requests.",
         tools=[get_weather],  # Base tool available for all queries

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_with_local_mcp.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatClientAgent, McpStreamableHttpTool
+from agent_framework import ChatAgent, MCPStreamableHTTPTool
 from agent_framework.openai import OpenAIResponsesClient
 
 
@@ -16,11 +16,11 @@ async def streaming_with_mcp(show_raw_stream: bool = False) -> None:
 
     # Tools are provided when creating the agent
     # The agent can use these tools for any query during its lifetime
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIResponsesClient(),
         name="DocsAgent",
         instructions="You are a helpful assistant that can help with microsoft documentation questions.",
-        tools=McpStreamableHttpTool(  # Tools defined at agent creation
+        tools=MCPStreamableHTTPTool(  # Tools defined at agent creation
             name="Microsoft Learn MCP",
             url="https://learn.microsoft.com/api/mcp",
         ),
@@ -29,7 +29,7 @@ async def streaming_with_mcp(show_raw_stream: bool = False) -> None:
         query1 = "How to create an Azure storage account using az cli?"
         print(f"User: {query1}")
         print(f"{agent.name}: ", end="")
-        async for chunk in agent.run_streaming(query1):
+        async for chunk in agent.run_stream(query1):
             if show_raw_stream:
                 print("Streamed event: ", chunk.raw_representation.raw_representation)  # type:ignore
             elif chunk.text:
@@ -40,7 +40,7 @@ async def streaming_with_mcp(show_raw_stream: bool = False) -> None:
         query2 = "What is Microsoft Semantic Kernel?"
         print(f"User: {query2}")
         print(f"{agent.name}: ", end="")
-        async for chunk in agent.run_streaming(query2):
+        async for chunk in agent.run_stream(query2):
             if show_raw_stream:
                 print("Streamed event: ", chunk.raw_representation.raw_representation)  # type:ignore
             elif chunk.text:
@@ -54,11 +54,11 @@ async def run_with_mcp() -> None:
 
     # Tools are provided when creating the agent
     # The agent can use these tools for any query during its lifetime
-    async with ChatClientAgent(
+    async with ChatAgent(
         chat_client=OpenAIResponsesClient(),
         name="DocsAgent",
         instructions="You are a helpful assistant that can help with microsoft documentation questions.",
-        tools=McpStreamableHttpTool(  # Tools defined at agent creation
+        tools=MCPStreamableHTTPTool(  # Tools defined at agent creation
             name="Microsoft Learn MCP",
             url="https://learn.microsoft.com/api/mcp",
         ),

python/samples/getting_started/agents/openai_responses_client/openai_responses_client_with_thread.py

@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated
 
-from agent_framework import AgentThread, ChatClientAgent
+from agent_framework import AgentThread, ChatAgent
 from agent_framework.openai import OpenAIResponsesClient
 from pydantic import Field
 
@@ -21,7 +21,7 @@ async def example_with_automatic_thread_creation() -> None:
     """Example showing automatic thread creation."""
     print("=== Automatic Thread Creation Example ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -48,7 +48,7 @@ async def example_with_thread_persistence_in_memory() -> None:
     """
     print("=== Thread Persistence Example (In-Memory) ===")
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -87,7 +87,7 @@ async def example_with_existing_thread_id() -> None:
     # First, create a conversation and capture the thread ID
     existing_thread_id = None
 
-    agent = ChatClientAgent(
+    agent = ChatAgent(
         chat_client=OpenAIResponsesClient(),
         instructions="You are a helpful weather agent.",
         tools=get_weather,
@@ -109,7 +109,7 @@ async def example_with_existing_thread_id() -> None:
     if existing_thread_id:
         print("\n--- Continuing with the same thread ID in a new agent instance ---")
 
-        agent = ChatClientAgent(
+        agent = ChatAgent(
             chat_client=OpenAIResponsesClient(),
             instructions="You are a helpful weather agent.",
             tools=get_weather,

python/samples/getting_started/telemetry/agent.py

@@ -5,7 +5,7 @@ import logging
 from random import randint
 from typing import Annotated
 
-from agent_framework import ChatClientAgent
+from agent_framework import ChatAgent
 from agent_framework.openai import OpenAIChatClient
 from azure.monitor.opentelemetry import configure_azure_monitor
 from opentelemetry import trace
@@ -163,7 +163,7 @@ async def main():
     with tracer.start_as_current_span("Scenario: Agent Chat", kind=SpanKind.CLIENT) as current_span:
         print("Running scenario: Agent Chat")
         print("Welcome to the chat, type 'exit' to quit.")
-        agent = ChatClientAgent(
+        agent = ChatAgent(
             chat_client=OpenAIChatClient(),
             tools=get_weather,
             name="WeatherAgent",
@@ -174,7 +174,7 @@ async def main():
         try:
             while message.lower() != "exit":
                 print(f"{agent.display_name}: ", end="")
-                async for update in agent.run_streaming(
+                async for update in agent.run_stream(
                     message,
                     thread=thread,
                 ):

python/samples/getting_started/telemetry/workflow.py

@@ -217,7 +217,7 @@ async def run_sequential_workflow() -> None:
             print(f"Starting workflow with input: '{input_text}'")
 
             completion_event = None
-            async for event in workflow.run_streaming(input_text):
+            async for event in workflow.run_stream(input_text):
                 print(f"Event: {event}")
                 if isinstance(event, WorkflowCompletedEvent):
                     # The WorkflowCompletedEvent contains the final result.

python/samples/getting_started/workflow/step_01_basic_workflow_sequential.py

@@ -58,7 +58,7 @@ async def main():
 
     # Step 3: Run the workflow with an initial message.
     completion_event = None
-    async for event in workflow.run_streaming("hello world"):
+    async for event in workflow.run_stream("hello world"):
         print(f"Event: {event}")
         if isinstance(event, WorkflowCompletedEvent):
             # The WorkflowCompletedEvent contains the final result.

python/samples/getting_started/workflow/step_02_basic_workflow_condition.py

@@ -110,7 +110,7 @@ async def main():
     )
 
     # Step 3: Run the workflow with an input message.
-    async for event in workflow.run_streaming("This is a spam."):
+    async for event in workflow.run_stream("This is a spam."):
         print(f"Event: {event}")
 
 

python/samples/getting_started/workflow/step_03_basic_workflow_loop.py

@@ -105,7 +105,7 @@ async def main():
 
     # Step 3: Run the workflow and print the events.
     iterations = 0
-    async for event in workflow.run_streaming(NumberSignal.INIT):
+    async for event in workflow.run_stream(NumberSignal.INIT):
         if isinstance(event, ExecutorCompletedEvent) and event.executor_id == guess_number_executor.id:
             iterations += 1
         print(f"Event: {event}")

python/samples/getting_started/workflow/step_04_basic_group_chat.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatMessage, ChatRole
+from agent_framework import ChatMessage, Role
 from agent_framework.azure import AzureChatClient
 from agent_framework.workflow import (
     AgentExecutor,
@@ -36,7 +36,7 @@ class RoundRobinGroupChatManager(Executor):
     @handler
     async def start(self, task: str, ctx: WorkflowContext[AgentExecutorRequest]) -> None:
         """Execute the task by sending messages to the next executor in the round-robin sequence."""
-        initial_message = ChatMessage(ChatRole.USER, text=task)
+        initial_message = ChatMessage(Role.USER, text=task)
 
         # Send the initial message to the members
         await asyncio.gather(*[
@@ -132,7 +132,7 @@ async def main():
 
     # Step 3: Run the workflow with an initial message.
     completion_event = None
-    async for event in workflow.run_streaming(
+    async for event in workflow.run_stream(
         "Create a slogan for a new electric SUV that is affordable and fun to drive."
     ):
         if isinstance(event, AgentRunEvent):

python/samples/getting_started/workflow/step_05_basic_group_chat_with_hil.py

@@ -2,7 +2,7 @@
 
 import asyncio
 
-from agent_framework import ChatMessage, ChatRole
+from agent_framework import ChatMessage, Role
 from agent_framework.azure import AzureChatClient
 from agent_framework.workflow import (
     AgentExecutor,
@@ -39,7 +39,7 @@ class CriticGroupChatManager(Executor):
     @handler
     async def start(self, task: str, ctx: WorkflowContext[AgentExecutorRequest]) -> None:
         """Handler that starts the group chat with an initial task."""
-        initial_message = ChatMessage(ChatRole.USER, text=task)
+        initial_message = ChatMessage(Role.USER, text=task)
 
         # Send the initial message to the members
         await asyncio.gather(*[
@@ -129,7 +129,7 @@ class CriticGroupChatManager(Executor):
             return False
 
         last_message = self._chat_history[-1]
-        return bool(last_message.role == ChatRole.USER and "approve" in last_message.text.lower())
+        return bool(last_message.role == Role.USER and "approve" in last_message.text.lower())
 
     def _should_request_info(self) -> bool:
         """Determine if the group chat should request HIL based on the last message."""
@@ -137,7 +137,7 @@ class CriticGroupChatManager(Executor):
             return True
 
         last_message = self._chat_history[-1]
-        return last_message.role == ChatRole.ASSISTANT
+        return last_message.role == Role.ASSISTANT
 
     def _get_next_member(self) -> str:
         """Get the next member in the round-robin sequence."""
@@ -200,12 +200,12 @@ async def main():
         # Depending on whether we have a RequestInfoEvent event, we either
         # run the workflow normally or send the message to the HIL executor.
         if not request_info_event:
-            response_stream = workflow.run_streaming(
+            response_stream = workflow.run_stream(
                 "Create a slogan for a new electric SUV that is affordable and fun to drive."
             )
         else:
             response_stream = workflow.send_responses_streaming({
-                request_info_event.request_id: [ChatMessage(ChatRole.USER, text=user_input)]
+                request_info_event.request_id: [ChatMessage(Role.USER, text=user_input)]
             })
             request_info_event = None
 

python/samples/getting_started/workflow/step_06_map_reduce_and_visualization.py

@@ -314,7 +314,7 @@ async def main():
 
     # Step 4: Run the workflow with the raw text as input.
     completion_event = None
-    async for event in workflow.run_streaming(raw_text):
+    async for event in workflow.run_stream(raw_text):
         print(f"Event: {event}")
         if isinstance(event, WorkflowCompletedEvent):
             completion_event = event

python/samples/getting_started/workflow/step_07_checkpoint_resume.py

@@ -135,7 +135,7 @@ async def main():
     )
 
     print("Running workflow with initial message...")
-    async for event in workflow.run_streaming(message="hello world"):
+    async for event in workflow.run_stream(message="hello world"):
         print(f"Event: {event}")
 
     # Inspect checkpoints
@@ -179,7 +179,7 @@ async def main():
     )
 
     print(f"\nResuming from checkpoint: {checkpoint_id}")
-    async for event in new_workflow.run_streaming_from_checkpoint(checkpoint_id, checkpoint_storage=checkpoint_storage):
+    async for event in new_workflow.run_stream_from_checkpoint(checkpoint_id, checkpoint_storage=checkpoint_storage):
         print(f"Resumed Event: {event}")
 
     """

python/samples/getting_started/workflow/step_08a_magentic_workflow.py

@@ -3,7 +3,7 @@
 import asyncio
 import logging
 
-from agent_framework import ChatClientAgent, HostedCodeInterpreterTool
+from agent_framework import ChatAgent, HostedCodeInterpreterTool
 from agent_framework.openai import OpenAIChatClient, OpenAIResponsesClient
 from agent_framework_workflow import (
     MagenticAgentDeltaEvent,
@@ -25,9 +25,9 @@ Magentic Workflow (multi-agent) sample.
 This sample shows how to orchestrate multiple agents using the
 MagenticBuilder:
 
-- ResearcherAgent (ChatClientAgent backed by an OpenAI chat client) for
+- ResearcherAgent (ChatAgent backed by an OpenAI chat client) for
     finding information.
-- CoderAgent (ChatClientAgent backed by OpenAI Assistants with the hosted
+- CoderAgent (ChatAgent backed by OpenAI Assistants with the hosted
     code interpreter tool) for analysis and computation.
 
 The workflow is configured with:
@@ -42,7 +42,7 @@ events to the console, and prints the final aggregated answer at completion.
 
 
 async def main() -> None:
-    researcher_agent = ChatClientAgent(
+    researcher_agent = ChatAgent(
         name="ResearcherAgent",
         description="Specialist in research and information gathering",
         instructions=(
@@ -50,11 +50,11 @@ async def main() -> None:
         ),
         # This agent requires the gpt-4o-search-preview model to perform web searches.
         # Feel free to explore with other agents that support web search, for example,
-        # the `OpenAIResponseAgent` or `AzureAIAgent` with bing grounding.
+        # the `OpenAIResponseAgent` or `AzureAgentProtocol` with bing grounding.
         chat_client=OpenAIChatClient(ai_model_id="gpt-4o-search-preview"),
     )
 
-    coder_agent = ChatClientAgent(
+    coder_agent = ChatAgent(
         name="CoderAgent",
         description="A helpful assistant that writes and executes code to process and analyze data.",
         instructions="You solve questions using code. Please provide detailed analysis and computation process.",
@@ -129,7 +129,7 @@ async def main() -> None:
 
     try:
         completion_event = None
-        async for event in workflow.run_streaming(task):
+        async for event in workflow.run_stream(task):
             print(f"Event: {event}")
 
             if isinstance(event, WorkflowCompletedEvent):

python/samples/getting_started/workflow/step_08b_magentic_human_plan_update.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 from typing import cast
 
-from agent_framework import ChatClientAgent, HostedCodeInterpreterTool
+from agent_framework import ChatAgent, HostedCodeInterpreterTool
 from agent_framework.openai import OpenAIChatClient, OpenAIResponsesClient
 from agent_framework_workflow import (
     MagenticAgentDeltaEvent,
@@ -30,8 +30,8 @@ Magentic workflow with human-in-the-loop plan review and update.
 This sample builds a Magentic workflow with two cooperating agents and enables
 plan review so a human can approve or revise the plan before execution:
 
-- researcher: ChatClientAgent backed by OpenAIChatClient (web/search-capable model)
-- coder: ChatClientAgent backed by OpenAIAssistantsClient with the Hosted Code Interpreter tool
+- researcher: ChatAgent backed by OpenAIChatClient (web/search-capable model)
+- coder: ChatAgent backed by OpenAIAssistantsClient with the Hosted Code Interpreter tool
 
 Key behaviors demonstrated:
 - with_plan_review(): requests a PlanReviewRequest before coordination begins
@@ -46,7 +46,7 @@ clients can run. You can swap clients/models as needed.
 
 
 async def main() -> None:
-    researcher_agent = ChatClientAgent(
+    researcher_agent = ChatAgent(
         name="ResearcherAgent",
         description="Specialist in research and information gathering",
         instructions=(
@@ -54,11 +54,11 @@ async def main() -> None:
         ),
         # This agent requires the gpt-4o-search-preview model to perform web searches.
         # Feel free to explore with other agents that support web search, for example,
-        # the `OpenAIResponseAgent` or `AzureAIAgent` with bing grounding.
+        # the `OpenAIResponseAgent` or `AzureAgentProtocol` with bing grounding.
         chat_client=OpenAIChatClient(ai_model_id="gpt-4o-search-preview"),
     )
 
-    coder_agent = ChatClientAgent(
+    coder_agent = ChatAgent(
         name="CoderAgent",
         description="A helpful assistant that writes and executes code to process and analyze data.",
         instructions="You solve questions using code. Please provide detailed analysis and computation process.",
@@ -140,7 +140,7 @@ async def main() -> None:
         while True:
             # Phase 1: run until either completion or a HIL request
             if pending_request is None:
-                async for event in workflow.run_streaming(task):
+                async for event in workflow.run_stream(task):
                     print(f"Event: {event}")
 
                     if isinstance(event, WorkflowCompletedEvent):

python/samples/getting_started/workflow/step_10a_workflow_agent_reflection_pattern.py

@@ -4,7 +4,7 @@ import asyncio
 from dataclasses import dataclass
 from uuid import uuid4
 
-from agent_framework import AgentRunResponseUpdate, AIContents, ChatClient, ChatMessage, ChatRole
+from agent_framework import AgentRunResponseUpdate, ChatClientProtocol, ChatMessage, Contents, Role
 from agent_framework.openai import OpenAIChatClient
 from agent_framework.workflow import AgentRunUpdateEvent, Executor, WorkflowBuilder, WorkflowContext, handler
 from pydantic import BaseModel
@@ -51,7 +51,7 @@ class ReviewResponse:
 class Reviewer(Executor):
     """An executor that reviews messages and provides feedback."""
 
-    def __init__(self, chat_client: ChatClient) -> None:
+    def __init__(self, chat_client: ChatClientProtocol) -> None:
         super().__init__()
         self._chat_client = chat_client
 
@@ -69,7 +69,7 @@ class Reviewer(Executor):
         # Define the system prompt.
         messages = [
             ChatMessage(
-                role=ChatRole.SYSTEM,
+                role=Role.SYSTEM,
                 text="You are a reviewer for an AI agent, please provide feedback on the "
                 "following exchange between a user and the AI agent, "
                 "and indicate if the agent's responses are approved or not.\n"
@@ -91,7 +91,7 @@ class Reviewer(Executor):
 
         # Add add one more instruction for the assistant to follow.
         messages.append(
-            ChatMessage(role=ChatRole.USER, text="Please provide a review of the agent's responses to the user.")
+            ChatMessage(role=Role.USER, text="Please provide a review of the agent's responses to the user.")
         )
 
         print("🔍 Reviewer: Sending review request to LLM...")
@@ -113,7 +113,7 @@ class Reviewer(Executor):
 class Worker(Executor):
     """An executor that performs tasks for the user."""
 
-    def __init__(self, chat_client: ChatClient) -> None:
+    def __init__(self, chat_client: ChatClientProtocol) -> None:
         super().__init__()
         self._chat_client = chat_client
         self._pending_requests: dict[str, tuple[ReviewRequest, list[ChatMessage]]] = {}
@@ -124,7 +124,7 @@ class Worker(Executor):
 
         # Handle user messages and prepare a review request for the reviewer.
         # Define the system prompt.
-        messages = [ChatMessage(role=ChatRole.SYSTEM, text="You are a helpful assistant.")]
+        messages = [ChatMessage(role=Role.SYSTEM, text="You are a helpful assistant.")]
 
         # Add user messages.
         messages.extend(user_messages)
@@ -163,14 +163,14 @@ class Worker(Executor):
             print("✅ Worker: Response approved! Emitting to external consumer...")
             # If approved, emit the agent run response update to the workflow's
             # external consumer.
-            contents: list[AIContents] = []
+            contents: list[Contents] = []
             for message in request.agent_messages:
                 contents.extend(message.contents)
             # Emitting an AgentRunUpdateEvent in a workflow wrapped by a WorkflowAgent
             # will send the AgentRunResponseUpdate to the WorkflowAgent's
             # event stream.
             await ctx.add_event(
-                AgentRunUpdateEvent(self.id, data=AgentRunResponseUpdate(contents=contents, role=ChatRole.ASSISTANT))
+                AgentRunUpdateEvent(self.id, data=AgentRunResponseUpdate(contents=contents, role=Role.ASSISTANT))
             )
             return
 
@@ -178,12 +178,12 @@ class Worker(Executor):
         print("🔧 Worker: Incorporating feedback and regenerating response...")
 
         # Construct new messages with feedback.
-        messages.append(ChatMessage(role=ChatRole.SYSTEM, text=review.feedback))
+        messages.append(ChatMessage(role=Role.SYSTEM, text=review.feedback))
 
         # Add additional instruction to address the feedback.
         messages.append(
             ChatMessage(
-                role=ChatRole.SYSTEM,
+                role=Role.SYSTEM,
                 text="Please incorporate the feedback above, and provide a response to user's next message.",
             )
         )
@@ -234,7 +234,7 @@ async def main() -> None:
     print("-" * 50)
 
     # Run the agent and stream events.
-    async for event in agent.run_streaming(
+    async for event in agent.run_stream(
         "Write code for parallel reading 1 million files on disk and write to a sorted output file."
     ):
         print(f"📤 Agent Response: {event}")

python/samples/getting_started/workflow/step_10b_workflow_agent_human_in_the_loop.py

@@ -5,9 +5,9 @@ from dataclasses import dataclass
 
 from agent_framework import (
     ChatMessage,
-    ChatRole,
     FunctionCallContent,
     FunctionResultContent,
+    Role,
 )
 from agent_framework.openai import OpenAIChatClient
 from agent_framework.workflow import (
@@ -133,7 +133,7 @@ async def main() -> None:
             result=human_response,
         )
         # Send the human review result back to the agent.
-        response = await agent.run(ChatMessage(role=ChatRole.TOOL, contents=[human_review_function_result]))
+        response = await agent.run(ChatMessage(role=Role.TOOL, contents=[human_review_function_result]))
         print(f"📤 Agent Response: {response.messages[-1].text}")
 
     print("=" * 50)