Python: [BREAKING] Simplify API: ChatAgent -> Agent, ChatMessage -> Message (#3747)

* [BREAKING] Rename ChatAgent -> Agent, ChatMessage -> Message, ChatClientProtocol -> SupportsChatGetResponse Simplify the public API by removing redundant 'Chat' prefix from core types: - ChatAgent -> Agent - RawChatAgent -> RawAgent - ChatMessage -> Message - ChatClientProtocol -> SupportsChatGetResponse Also renamed internal WorkflowMessage (was Message in _runner_context) to avoid collision. No backward compatibility aliases - this is a clean breaking change. * [BREAKING] Rename Agent chat_client parameter to client * Fix rebase issues: WorkflowMessage references and broken markdown links * Fix formatting and lint issues from code quality checks * Fix import ordering in workflow sample files * fixed rebase * Fix test failures: use WorkflowMessage and A2AMessage after ChatMessage→Message rename - Replace Message(data=..., source_id=...) with WorkflowMessage(...) in workflow tests - Fix isinstance check in A2A agent to use A2AMessage instead of Message - Fix import in test_workflow_observability.py (Message→WorkflowMessage) * Fix lint, fmt, and sample errors after ChatMessage→Message rename - Auto-fix 70+ ruff lint issues across samples (ChatMessage→Message refs) - Fix HostedVectorStoreContent→Content.from_hosted_vector_store in file search sample - Fix _normalize_messages→normalize_messages in custom agent sample - Fix context.terminate→raise MiddlewareTermination in middleware samples - Fix with_update_hook→with_transform_hook in override middleware sample - Add TOptions_co import back to custom_chat_client sample - Add noqa for FastAPI File() default in chatkit sample - Fix B023 loop variable capture in weather agent sample * fix: update Agent constructor calls from chat_client to client in declaration-only tool tests * fix: add register_cleanup to devui lazy-loading proxy and type stub * fixed tests and updated new pieces * fix agui typevar * fix merge errors * fix merge conflicts * fiux merge * Remove unused links --------- Co-authored-by: Evan Mattson <evan.mattson@microsoft.com>
2026-06-16 21:04:09 +08:00 · 2026-02-11 00:04:32 +01:00
parent a4c9e43afb
commit 0521f5bed8
418 changed files with 5385 additions and 5389 deletions
@@ -6,17 +6,17 @@ 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 `ChatAgent` with `AzureOpenAIAssistantsClient`. 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 `Agent` with `AzureOpenAIAssistantsClient`. Shows both streaming and non-streaming responses with automatic assistant creation and cleanup. |
 | [`azure_assistants_with_code_interpreter.py`](azure_assistants_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. |
 | [`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). |
 | [`azure_assistants_with_thread.py`](azure_assistants_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. |
-| [`azure_chat_client_basic.py`](azure_chat_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `AzureOpenAIChatClient`. 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 `Agent` with `AzureOpenAIChatClient`. 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. |
-| [`azure_responses_client_basic.py`](azure_responses_client_basic.py) | The simplest way to create an agent using `ChatAgent` with `AzureOpenAIResponsesClient`. 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 `Agent` with `AzureOpenAIResponsesClient`. Shows both streaming and non-streaming responses for structured response generation with Azure OpenAI models. |
 | [`azure_responses_client_code_interpreter_files.py`](azure_responses_client_code_interpreter_files.py) | Demonstrates using HostedCodeInterpreterTool with file uploads for data analysis. Shows how to create, upload, and analyze CSV files using Python code execution with Azure OpenAI Responses. |
 | [`azure_responses_client_image_analysis.py`](azure_responses_client_image_analysis.py) | Shows how to use Azure OpenAI Responses for image analysis and vision tasks. Demonstrates multi-modal messages combining text and image content using remote URLs. |
 | [`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. |
@@ -2,7 +2,7 @@

 import asyncio

-from agent_framework import AgentResponseUpdate, ChatAgent, ChatResponseUpdate, HostedCodeInterpreterTool
+from agent_framework import Agent, AgentResponseUpdate, ChatResponseUpdate, HostedCodeInterpreterTool
 from agent_framework.azure import AzureOpenAIAssistantsClient
 from azure.identity import AzureCliCredential
 from openai.types.beta.threads.runs import (
@@ -46,8 +46,8 @@ async def main() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    async with ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
        tools=HostedCodeInterpreterTool(),
    ) as agent:
@@ -5,7 +5,7 @@ import os
 from random import randint
 from typing import Annotated

-from agent_framework import ChatAgent, tool
+from agent_framework import Agent, tool
 from agent_framework.azure import AzureOpenAIAssistantsClient
 from azure.identity import AzureCliCredential, get_bearer_token_provider
 from openai import AsyncAzureOpenAI
@@ -46,8 +46,8 @@ async def main() -> None:
    )

    try:
-        async with ChatAgent(
-            chat_client=AzureOpenAIAssistantsClient(async_client=client, assistant_id=created_assistant.id),
+        async with Agent(
+            client=AzureOpenAIAssistantsClient(async_client=client, assistant_id=created_assistant.id),
            instructions="You are a helpful weather agent.",
            tools=get_weather,
        ) as agent:
@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated

-from agent_framework import ChatAgent, tool
+from agent_framework import Agent, tool
 from agent_framework.azure import AzureOpenAIAssistantsClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -43,8 +43,8 @@ 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 ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(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
    ) as agent:
@@ -74,8 +74,8 @@ 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 ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a helpful assistant.",
        # No tools defined here
    ) as agent:
@@ -105,8 +105,8 @@ 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 ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a comprehensive assistant that can help with various information requests.",
        tools=[get_weather],  # Base tool available for all queries
    ) as agent:
@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated

-from agent_framework import AgentThread, ChatAgent, tool
+from agent_framework import Agent, AgentThread, tool
 from agent_framework.azure import AzureOpenAIAssistantsClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,8 +33,8 @@ 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 ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    ) as agent:
@@ -59,8 +59,8 @@ async def example_with_thread_persistence() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    async with ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    ) as agent:
@@ -97,8 +97,8 @@ 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 ChatAgent(
-        chat_client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
+    async with Agent(
+        client=AzureOpenAIAssistantsClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    ) as agent:
@@ -117,8 +117,8 @@ 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 ChatAgent(
-            chat_client=AzureOpenAIAssistantsClient(thread_id=existing_thread_id, credential=AzureCliCredential()),
+        async with Agent(
+            client=AzureOpenAIAssistantsClient(thread_id=existing_thread_id, credential=AzureCliCredential()),
            instructions="You are a helpful weather agent.",
            tools=get_weather,
        ) as agent:
@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated

-from agent_framework import ChatAgent, tool
+from agent_framework import Agent, tool
 from agent_framework.azure import AzureOpenAIChatClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -43,8 +43,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(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
    )
@@ -75,8 +75,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a helpful assistant.",
        # No tools defined here
    )
@@ -107,8 +107,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a comprehensive assistant that can help with various information requests.",
        tools=[get_weather],  # Base tool available for all queries
    )
@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated

-from agent_framework import AgentThread, ChatAgent, ChatMessageStore, tool
+from agent_framework import Agent, AgentThread, ChatMessageStore, tool
 from agent_framework.azure import AzureOpenAIChatClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,8 +33,8 @@ async def example_with_automatic_thread_creation() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -60,8 +60,8 @@ async def example_with_thread_persistence() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -95,8 +95,8 @@ async def example_with_existing_thread_messages() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -117,8 +117,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIChatClient(credential=AzureCliCredential()),
+    new_agent = Agent(
+        client=AzureOpenAIChatClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -4,7 +4,7 @@ import asyncio
 import os
 import tempfile

-from agent_framework import ChatAgent, HostedCodeInterpreterTool
+from agent_framework import Agent, HostedCodeInterpreterTool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential
 from openai import AsyncAzureOpenAI
@@ -76,8 +76,8 @@ async def main() -> None:
    temp_file_path, file_id = await create_sample_file_and_upload(openai_client)

    # Create agent using Azure OpenAI Responses client
-    agent = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=credential),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=credential),
        instructions="You are a helpful assistant that can analyze data files using Python code.",
        tools=HostedCodeInterpreterTool(inputs=[{"file_id": file_id}]),
    )
@@ -2,7 +2,7 @@

 import asyncio

-from agent_framework import ChatMessage, Content
+from agent_framework import Content, Message
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential

@@ -24,7 +24,7 @@ async def main():
    )

    # 2. Create a simple message with both text and image content
-    user_message = ChatMessage(
+    user_message = Message(
        role="user",
        contents=[
            Content.from_text(text="What do you see in this image?"),
@@ -2,7 +2,7 @@

 import asyncio

-from agent_framework import ChatAgent, ChatResponse, HostedCodeInterpreterTool
+from agent_framework import Agent, ChatResponse, HostedCodeInterpreterTool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential
 from openai.types.responses.response import Response as OpenAIResponse
@@ -22,8 +22,8 @@ async def main() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a helpful assistant that can write and execute Python code to solve problems.",
        tools=HostedCodeInterpreterTool(),
    )
@@ -2,7 +2,7 @@

 import asyncio

-from agent_framework import ChatAgent, Content, HostedFileSearchTool
+from agent_framework import Agent, Content, HostedFileSearchTool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential

@@ -53,8 +53,8 @@ async def main() -> None:

    file_id, vector_store = await create_vector_store(client)

-    agent = ChatAgent(
-        chat_client=client,
+    agent = Agent(
+        client=client,
        instructions="You are a helpful assistant that can search through files to find information.",
        tools=[HostedFileSearchTool(inputs=vector_store)],
    )
@@ -5,7 +5,7 @@ from datetime import datetime, timezone
 from random import randint
 from typing import Annotated

-from agent_framework import ChatAgent, tool
+from agent_framework import Agent, tool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -43,8 +43,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(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
    )
@@ -75,8 +75,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a helpful assistant.",
        # No tools defined here
    )
@@ -107,8 +107,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a comprehensive assistant that can help with various information requests.",
        tools=[get_weather],  # Base tool available for all queries
    )
@@ -3,7 +3,7 @@
 import asyncio
 from typing import TYPE_CHECKING, Any

-from agent_framework import ChatAgent, HostedMCPTool
+from agent_framework import Agent, HostedMCPTool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential

@@ -20,7 +20,7 @@ if TYPE_CHECKING:

 async def handle_approvals_without_thread(query: str, agent: "SupportsAgentRun"):
    """When we don't have a thread, we need to ensure we return with the input, approval request and approval."""
-    from agent_framework import ChatMessage
+    from agent_framework import Message

    result = await agent.run(query)
    while len(result.user_input_requests) > 0:
@@ -30,10 +30,10 @@ async def handle_approvals_without_thread(query: str, agent: "SupportsAgentRun")
                f"User Input Request for function from {agent.name}: {user_input_needed.function_call.name}"
                f" with arguments: {user_input_needed.function_call.arguments}"
            )
-            new_inputs.append(ChatMessage(role="assistant", contents=[user_input_needed]))
+            new_inputs.append(Message(role="assistant", contents=[user_input_needed]))
            user_approval = input("Approve function call? (y/n): ")
            new_inputs.append(
-                ChatMessage(role="user", contents=[user_input_needed.to_function_approval_response(user_approval.lower() == "y")])
+                Message(role="user", contents=[user_input_needed.to_function_approval_response(user_approval.lower() == "y")])
            )

        result = await agent.run(new_inputs)
@@ -42,7 +42,7 @@ async def handle_approvals_without_thread(query: str, agent: "SupportsAgentRun")

 async def handle_approvals_with_thread(query: str, agent: "SupportsAgentRun", thread: "AgentThread"):
    """Here we let the thread deal with the previous responses, and we just rerun with the approval."""
-    from agent_framework import ChatMessage
+    from agent_framework import Message

    result = await agent.run(query, thread=thread, store=True)
    while len(result.user_input_requests) > 0:
@@ -54,7 +54,7 @@ async def handle_approvals_with_thread(query: str, agent: "SupportsAgentRun", th
            )
            user_approval = input("Approve function call? (y/n): ")
            new_input.append(
-                ChatMessage(
+                Message(
                    role="user",
                    contents=[user_input_needed.to_function_approval_response(user_approval.lower() == "y")],
                )
@@ -65,13 +65,13 @@ async def handle_approvals_with_thread(query: str, agent: "SupportsAgentRun", th

 async def handle_approvals_with_thread_streaming(query: str, agent: "SupportsAgentRun", thread: "AgentThread"):
    """Here we let the thread deal with the previous responses, and we just rerun with the approval."""
-    from agent_framework import ChatMessage
+    from agent_framework import Message

-    new_input: list[ChatMessage] = []
+    new_input: list[Message] = []
    new_input_added = True
    while new_input_added:
        new_input_added = False
-        new_input.append(ChatMessage(role="user", text=query))
+        new_input.append(Message(role="user", text=query))
        async for update in agent.run(new_input, thread=thread, options={"store": True}, stream=True):
            if update.user_input_requests:
                for user_input_needed in update.user_input_requests:
@@ -81,7 +81,7 @@ async def handle_approvals_with_thread_streaming(query: str, agent: "SupportsAge
                    )
                    user_approval = input("Approve function call? (y/n): ")
                    new_input.append(
-                        ChatMessage(
+                        Message(
                            role="user", contents=[user_input_needed.to_function_approval_response(user_approval.lower() == "y")]
                        )
                    )
@@ -96,8 +96,8 @@ async def run_hosted_mcp_without_thread_and_specific_approval() -> None:
    credential = AzureCliCredential()
    # Tools are provided when creating the agent
    # The agent can use these tools for any query during its lifetime
-    async with ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(
+    async with Agent(
+        client=AzureOpenAIResponsesClient(
            credential=credential,
        ),
        name="DocsAgent",
@@ -129,8 +129,8 @@ async def run_hosted_mcp_without_approval() -> None:
    credential = AzureCliCredential()
    # Tools are provided when creating the agent
    # The agent can use these tools for any query during its lifetime
-    async with ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(
+    async with Agent(
+        client=AzureOpenAIResponsesClient(
            credential=credential,
        ),
        name="DocsAgent",
@@ -163,8 +163,8 @@ async def run_hosted_mcp_with_thread() -> None:
    credential = AzureCliCredential()
    # Tools are provided when creating the agent
    # The agent can use these tools for any query during its lifetime
-    async with ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(
+    async with Agent(
+        client=AzureOpenAIResponsesClient(
            credential=credential,
        ),
        name="DocsAgent",
@@ -196,8 +196,8 @@ async def run_hosted_mcp_with_thread_streaming() -> None:
    credential = AzureCliCredential()
    # Tools are provided when creating the agent
    # The agent can use these tools for any query during its lifetime
-    async with ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(
+    async with Agent(
+        client=AzureOpenAIResponsesClient(
            credential=credential,
        ),
        name="DocsAgent",
@@ -3,7 +3,7 @@
 import asyncio
 import os

-from agent_framework import ChatAgent, MCPStreamableHTTPTool
+from agent_framework import Agent, MCPStreamableHTTPTool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential

@@ -37,7 +37,7 @@ async def main():
        credential=credential,
    )

-    agent: ChatAgent = responses_client.as_agent(
+    agent: Agent = responses_client.as_agent(
        name="DocsAgent",
        instructions=("You are a helpful assistant that can help with Microsoft documentation questions."),
    )
@@ -4,7 +4,7 @@ import asyncio
 from random import randint
 from typing import Annotated

-from agent_framework import AgentThread, ChatAgent, tool
+from agent_framework import Agent, AgentThread, tool
 from agent_framework.azure import AzureOpenAIResponsesClient
 from azure.identity import AzureCliCredential
 from pydantic import Field
@@ -33,8 +33,8 @@ async def example_with_automatic_thread_creation() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -62,8 +62,8 @@ 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 = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -103,8 +103,8 @@ async def example_with_existing_thread_id() -> None:

    # For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
    # authentication option.
-    agent = ChatAgent(
-        chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+    agent = Agent(
+        client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
        instructions="You are a helpful weather agent.",
        tools=get_weather,
    )
@@ -125,8 +125,8 @@ 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 = ChatAgent(
-            chat_client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
+        agent = Agent(
+            client=AzureOpenAIResponsesClient(credential=AzureCliCredential()),
            instructions="You are a helpful weather agent.",
            tools=get_weather,
        )