agent framework v2 changes

Author: Abdul-Microsoft

src/backend/pyproject.toml

@@ -7,21 +7,20 @@ requires-python = ">=3.11"
 dependencies = [
     "azure-ai-evaluation==1.11.0",
     "azure-ai-inference==1.0.0b9",
-    "azure-ai-projects==1.0.0",
-    "azure-ai-agents==1.2.0b5",
+    "azure-ai-projects==2.0.0b3",
     "azure-cosmos==4.9.0",
     "azure-identity==1.24.0",
     "azure-monitor-events-extension==0.1.0",
-    "azure-monitor-opentelemetry==1.7.0",
+    "azure-monitor-opentelemetry>=1.8.0",
     "azure-search-documents==11.5.3",
     "fastapi==0.116.1",
-    "openai==1.105.0",
-    "opentelemetry-api==1.36.0",
-    "opentelemetry-exporter-otlp-proto-grpc==1.36.0",
-    "opentelemetry-exporter-otlp-proto-http==1.36.0",
-    "opentelemetry-instrumentation-fastapi==0.57b0",
-    "opentelemetry-instrumentation-openai==0.46.2",
-    "opentelemetry-sdk==1.36.0",
+    "openai>=2.8.0",
+    "opentelemetry-api>=1.39.0",
+    "opentelemetry-exporter-otlp-proto-grpc>=1.39.0",
+    "opentelemetry-exporter-otlp-proto-http>=1.39.0",
+    "opentelemetry-instrumentation-fastapi>=0.57b0",
+    "opentelemetry-instrumentation-openai>=0.46.2",
+    "opentelemetry-sdk>=1.39.0",
     "pytest==8.4.1",
     "pytest-asyncio==0.24.0",
     "pytest-cov==5.0.0",
@@ -31,6 +30,7 @@ dependencies = [
     "uvicorn==0.35.0",
     "pylint-pydantic==0.3.5",
     "pexpect==4.9.0",
-    "mcp==1.13.1",
-    "agent-framework>=1.0.0b251105",
-]
+    "mcp>=1.24.0,<2",
+    "agent-framework-azure-ai==1.0.0b260130",
+    "agent-framework-core==1.0.0b260130"
+]

src/backend/uv.lock

@@ -8,10 +8,7 @@
 import re
 from typing import Any
 
-from agent_framework import ChatMessage
-# Removed: from agent_framework._content import FunctionCallContent  (does not exist)
-
-from agent_framework._workflows._magentic import AgentRunResponseUpdate  # Streaming update type from workflows
+from agent_framework import ChatMessage, AgentRunUpdateEvent
 
 from v4.config.settings import connection_config
 from v4.models.messages import (
@@ -111,26 +108,31 @@ def agent_response_callback(
 
 async def streaming_agent_response_callback(
     agent_id: str,
-    update: AgentRunResponseUpdate,
+    update,  # AgentRunUpdateEvent.data or similar streaming update object
     is_final: bool,
     user_id: str | None = None,
 ) -> None:
     """
-    Streaming callback for incremental agent output (AgentRunResponseUpdate).
+    Streaming callback for incremental agent output.
     """
     if not user_id:
         return
 
     try:
+        # Handle both AgentRunUpdateEvent.data and raw text updates
         chunk_text = getattr(update, "text", None)
-        if not chunk_text:
-            contents = getattr(update, "contents", []) or []
-            collected = []
-            for item in contents:
-                txt = getattr(item, "text", None)
-                if txt:
-                    collected.append(str(txt))
-            chunk_text = "".join(collected) if collected else ""
+        
+        # If text is None, don't fall back to str(update) as that would show object repr
+        # Just skip if there's no actual text content
+        if chunk_text is None:
+            # Check if update is a ChatMessage
+            if isinstance(update, ChatMessage):
+                chunk_text = update.text or ""
+            elif hasattr(update, "content"):
+                chunk_text = str(update.content) if update.content else ""
+            else:
+                # Skip if no text content available
+                return
 
         cleaned = clean_citations(chunk_text or "")
 

src/backend/v4/callbacks/response_handlers.py

@@ -10,8 +10,8 @@
     MCPStreamableHTTPTool,
 )
 
-# from agent_framework.azure import AzureAIAgentClient
-from agent_framework_azure_ai import AzureAIAgentClient
+# from agent_framework.azure import AzureAIClient
+from agent_framework_azure_ai import AzureAIClient
 from azure.ai.agents.aio import AgentsClient
 from azure.identity.aio import DefaultAzureCredential
 from common.database.database_base import DatabaseBase
@@ -51,7 +51,7 @@ def __init__(
         self._agent: ChatAgent | None = None
         self.team_service: TeamService | None = team_service
         self.team_config: TeamConfiguration | None = team_config
-        self.client: Optional[AzureAIAgentClient] = None
+        self.client: Optional[AzureAIClient] = None
         self.project_endpoint = project_endpoint
         self.creds: Optional[DefaultAzureCredential] = None
         self.memory_store: Optional[DatabaseBase] = memory_store
@@ -105,7 +105,7 @@ async def close(self) -> None:
             # Attempt to close the underlying agent/client if it exposes close()
             if self._agent and hasattr(self._agent, "close"):
                 try:
-                    await self._agent.close()  # AzureAIAgentClient has async close
+                    await self._agent.close()  # AzureAIClient has async close
                 except Exception as exc:
                     # Best-effort close; log failure but continue teardown
                     self.logger.warning(
@@ -148,24 +148,22 @@ async def _after_open(self) -> None:
         """Subclasses must build self._agent here."""
         raise NotImplementedError
 
-    def get_chat_client(self, chat_client) -> AzureAIAgentClient:
-        """Return the underlying ChatClientProtocol (AzureAIAgentClient)."""
+    def get_chat_client(self, chat_client) -> AzureAIClient:
+        """Return the underlying ChatClientProtocol (AzureAIClient)."""
         if chat_client:
             return chat_client
         if (
             self._agent
             and self._agent.chat_client
-            and self._agent.chat_client.agent_id is not None
         ):
             return self._agent.chat_client  # type: ignore
-        chat_client = AzureAIAgentClient(
+        chat_client = AzureAIClient(
             project_endpoint=self.project_endpoint,
             model_deployment_name=self.model_deployment_name,
-            async_credential=self.creds,
+            credential=self.creds,
         )
         self.logger.info(
-            "Created new AzureAIAgentClient for  get chat client",
-            extra={"agent_id": chat_client.agent_id},
+            "Created new AzureAIClient for get chat client",
         )
         return chat_client
 
@@ -219,20 +217,17 @@ async def resolve_agent_id(self, agent_id: str) -> Optional[str]:
         return None
 
     def get_agent_id(self, chat_client) -> str:
-        """Return the underlying agent ID."""
-        if chat_client and chat_client.agent_id is not None:
-            return chat_client.agent_id
-        if (
-            self._agent
-            and self._agent.chat_client
-            and self._agent.chat_client.agent_id is not None
-        ):
-            return self._agent.chat_client.agent_id  # type: ignore
+        """Return the underlying agent ID or generate a new one.
+        
+        Note: The new AzureAIClient doesn't expose agent_id directly.
+        We generate a new ID if not available.
+        """
+        # Generate a new agent ID since AzureAIClient doesn't expose agent_id
         id = generate_assistant_id()
         self.logger.info("Generated new agent ID: %s", id)
         return id
 
-    async def get_database_team_agent(self) -> Optional[AzureAIAgentClient]:
+    async def get_database_team_agent(self) -> Optional[AzureAIClient]:
         """Retrieve existing team agent from database, if any."""
         chat_client = None
         try:
@@ -258,24 +253,24 @@ async def get_database_team_agent(self) -> Optional[AzureAIAgentClient]:
 
             # Create client with resolved ID, preferring project_client for RAI agents
             if self.agent_name == "RAIAgent" and self.project_client:
-                chat_client = AzureAIAgentClient(
+                chat_client = AzureAIClient(
                     project_client=self.project_client,
                     agent_id=resolved,
-                    async_credential=self.creds,
+                    credential=self.creds,
                 )
                 self.logger.info(
-                    "RAI.AgentReuseSuccess: Created AzureAIAgentClient via Projects SDK (id=%s)",
+                    "RAI.AgentReuseSuccess: Created AzureAIClient via Projects SDK (id=%s)",
                     resolved,
                 )
             else:
-                chat_client = AzureAIAgentClient(
+                chat_client = AzureAIClient(
                     project_endpoint=self.project_endpoint,
                     agent_id=resolved,
                     model_deployment_name=self.model_deployment_name,
-                    async_credential=self.creds,
+                    credential=self.creds,
                 )
                 self.logger.info(
-                    "Created AzureAIAgentClient via endpoint (id=%s)", resolved
+                    "Created AzureAIClient via endpoint (id=%s)", resolved
                 )
 
         except Exception as ex:
@@ -339,10 +334,10 @@ async def _prepare_mcp_tool(self) -> None:
 
 class AzureAgentBase(MCPEnabledBase):
     """
-    Extends MCPEnabledBase with Azure credential + AzureAIAgentClient contexts.
+    Extends MCPEnabledBase with Azure credential + AzureAIClient contexts.
     Subclasses:
       - create or attach an Azure AI Agent definition
-      - instantiate an AzureAIAgentClient and assign to self._agent
+      - instantiate an AzureAIClient and assign to self._agent
       - optionally register themselves via agent_registry
     """
 

src/backend/v4/magentic_agents/common/lifecycle.py

@@ -6,7 +6,7 @@
 from agent_framework import (ChatAgent, ChatMessage, HostedCodeInterpreterTool,
                              Role)
 from agent_framework_azure_ai import \
-    AzureAIAgentClient  # Provided by agent_framework
+    AzureAIClient  # Provided by agent_framework
 from azure.ai.projects.models import ConnectionType
 from common.config.app_config import config
 from common.database.database_base import DatabaseBase
@@ -111,7 +111,7 @@ async def _collect_tools(self) -> List:
     # -------------------------
     # Azure Search helper
     # -------------------------
-    async def _create_azure_search_enabled_client(self, chatClient=None) -> Optional[AzureAIAgentClient]:
+    async def _create_azure_search_enabled_client(self, chatClient=None) -> Optional[AzureAIClient]:
         """
         Create a server-side Azure AI agent with Azure AI Search raw tool.
 
@@ -123,7 +123,7 @@ async def _create_azure_search_enabled_client(self, chatClient=None) -> Optional
 
 
         Returns:
-            AzureAIAgentClient | None
+            AzureAIClient | None
         """
         if chatClient:
             return chatClient
@@ -205,10 +205,10 @@ async def _create_azure_search_enabled_client(self, chatClient=None) -> Optional
                 query_type,
             )
 
-            chat_client = AzureAIAgentClient(
+            chat_client = AzureAIClient(
                 project_client=self.project_client,
                 agent_id=azure_agent.id,
-                async_credential=self.creds,
+                credential=self.creds,
             )
             return chat_client
         except Exception as ex:
@@ -301,8 +301,8 @@ async def invoke(self, prompt: str):
 
         agent_saved = False
         async for update in self._agent.run_stream(messages):
-            # Save agent ID only once on first update (agent ID won't change during streaming)
-            if not agent_saved and self._agent.chat_client.agent_id:
+            # Save agent ID only once on first update
+            if not agent_saved:
                 await self.save_database_team_agent()
                 agent_saved = True
             yield update

src/backend/v4/magentic_agents/foundry_agent.py

@@ -16,13 +16,12 @@
 from typing import Any, AsyncIterable
 
 from agent_framework import (
-    AgentRunResponse,
-    AgentRunResponseUpdate,
+    AgentResponse,
+    AgentResponseUpdate,
     BaseAgent,
     ChatMessage,
     Role,
-    TextContent,
-    UsageContent,
+    Content,
     UsageDetails,
     AgentThread,
 )
@@ -88,7 +87,7 @@ async def run(
         *,
         thread: AgentThread | None = None,
         **kwargs: Any,
-    ) -> AgentRunResponse:
+    ) -> AgentResponse:
         """
         Get complete clarification response (non-streaming).
 
@@ -98,7 +97,7 @@ async def run(
             kwargs: Additional keyword arguments
 
         Returns:
-            AgentRunResponse with the clarification
+            AgentResponse with the clarification
         """
         # Collect all streaming updates
         response_messages: list[ChatMessage] = []
@@ -113,7 +112,7 @@ async def run(
                     )
                 )
 
-        return AgentRunResponse(
+        return AgentResponse(
             messages=response_messages,
             response_id=response_id,
         )
@@ -124,7 +123,7 @@ def run_stream(
         *,
         thread: AgentThread | None = None,
         **kwargs: Any,
-    ) -> AsyncIterable[AgentRunResponseUpdate]:
+    ) -> AsyncIterable[AgentResponseUpdate]:
         """
         Stream clarification process with human interaction.
 
@@ -143,7 +142,7 @@ async def _invoke_stream_internal(
         messages: str | ChatMessage | list[str] | list[ChatMessage] | None,
         thread: AgentThread | None,
         **kwargs: Any,
-    ) -> AsyncIterable[AgentRunResponseUpdate]:
+    ) -> AsyncIterable[AgentResponseUpdate]:
         """
         Internal streaming implementation.
 
@@ -205,9 +204,10 @@ async def _invoke_stream_internal(
         message_id = str(uuid.uuid4())
 
         # Yield final assistant text update with explicit text content
-        text_update = AgentRunResponseUpdate(
+        # New API: use Content.from_text() or pass text directly to AgentResponseUpdate
+        text_update = AgentResponseUpdate(
             role=Role.ASSISTANT,
-            contents=[TextContent(text=synthetic_reply)],
+            text=synthetic_reply,  # New API accepts text directly
             author_name=self.name,
             response_id=response_id,
             message_id=message_id,
@@ -218,10 +218,10 @@ async def _invoke_stream_internal(
 
         # Yield synthetic usage update for consistency
         # Use same message_id to indicate this is part of the same message
-        usage_update = AgentRunResponseUpdate(
+        usage_update = AgentResponseUpdate(
             role=Role.ASSISTANT,
             contents=[
-                UsageContent(
+                Content.from_usage(
                     UsageDetails(
                         input_token_count=len(message_text.split()),
                         output_token_count=len(synthetic_reply.split()),

src/backend/v4/magentic_agents/proxy_agent.py

@@ -34,11 +34,12 @@ class HumanApprovalMagenticManager(StandardMagenticManager):
     magentic_plan: Optional[MPlan] = None
     current_user_id: str  # populated in __init__
 
-    def __init__(self, user_id: str, *args, **kwargs):
+    def __init__(self, user_id: str, agent, *args, **kwargs):
         """
         Initialize the HumanApprovalMagenticManager.
         Args:
             user_id: ID of the user to associate with this orchestration instance.
+            agent: The manager ChatAgent for orchestration (required by new API).
             *args: Additional positional arguments for the parent StandardMagenticManager.
             **kwargs: Additional keyword arguments for the parent StandardMagenticManager.
         """
@@ -76,7 +77,8 @@ def __init__(self, user_id: str, *args, **kwargs):
         kwargs["final_answer_prompt"] = ORCHESTRATOR_FINAL_ANSWER_PROMPT + final_append
 
         self.current_user_id = user_id
-        super().__init__(*args, **kwargs)
+        # New API: StandardMagenticManager takes agent as first positional argument
+        super().__init__(agent, *args, **kwargs)
 
     async def plan(self, magentic_context: MagenticContext) -> Any:
         """