Merge pull request #617 from microsoft/marktayl-macae-rfp-agent-framework

Marktayl macae rfp agent framework

Author: Fr4nc3

src/backend/pyproject.toml

@@ -5,16 +5,10 @@ description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "agent-framework-core @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/core",
-    "agent-framework-azure-ai @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/azure-ai",
-    "agent-framework-copilotstudio @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/copilotstudio",
-    "agent-framework-devui @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/devui",
-    "agent-framework-mem0 @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/mem0",
-    "agent-framework-redis @ git+https://github.com/microsoft/agent-framework.git@main#subdirectory=python/packages/redis",
     "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-agents==1.2.0b5",
     "azure-cosmos==4.9.0",
     "azure-identity==1.24.0",
     "azure-monitor-events-extension==0.1.0",
@@ -37,6 +31,6 @@ dependencies = [
     "uvicorn==0.35.0",
     "pylint-pydantic==0.3.5",
     "pexpect==4.9.0",
-    "mcp==1.13.1"
-
+    "mcp==1.13.1",
+    "agent-framework>=1.0.0b251105",
 ]

src/backend/uv.lock

@@ -4,27 +4,18 @@
 from contextlib import AsyncExitStack
 from typing import Any, Optional
 
+from agent_framework import (AggregateContextProvider, ChatAgent,
+                             ChatClientProtocol, ChatMessage,
+                             ChatMessageStoreProtocol, ChatOptions,
+                             ContextProvider, HostedMCPTool,
+                             MCPStreamableHTTPTool, Middleware, Role, ToolMode,
+                             ToolProtocol)
 # from agent_framework.azure import AzureAIAgentClient
 from agent_framework_azure_ai import AzureAIAgentClient
+from azure.ai.agents.aio import AgentsClient
 from azure.identity.aio import DefaultAzureCredential
-from agent_framework import (
-    ChatMessage,
-    Role,
-    ChatOptions,
-    HostedMCPTool,
-    AggregateContextProvider,
-    ChatAgent,
-    ChatClientProtocol,
-    ChatMessageStoreProtocol,
-    ContextProvider,
-    Middleware,
-    ToolMode,
-    ToolProtocol,
-)
-from agent_framework import MCPStreamableHTTPTool
-
-from v4.magentic_agents.models.agent_models import MCPConfig
 from v4.config.agent_registry import agent_registry
+from v4.magentic_agents.models.agent_models import MCPConfig
 
 
 class MCPEnabledBase:
@@ -44,7 +35,7 @@ async def open(self) -> "MCPEnabledBase":
         if self._stack is not None:
             return self
         self._stack = AsyncExitStack()
-        self._prepare_mcp_tool()
+        await self._prepare_mcp_tool()
         await self._after_open()
         return self
 
@@ -133,10 +124,16 @@ async def open(self) -> "AzureAgentBase":
         await self._stack.enter_async_context(self.creds)
 
         # Create AIProjectClient
-        self.client = AzureAIAgentClient(
-            project_endpoint=self.project_endpoint,
-            model_deployment_name=self.model_deployment_name,
-            async_credential=self.creds,
+        # self.client = AzureAIAgentClient(
+        #     project_endpoint=self.project_endpoint,
+        #     model_deployment_name=self.model_deployment_name,
+        #     async_credential=self.creds,
+        # )
+
+        #Create AgentsClient
+        self.client = AgentsClient(
+            endpoint=self.project_endpoint,
+            credential=self.creds,
         )
         await self._stack.enter_async_context(self.client)
 

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

@@ -3,19 +3,16 @@
 import logging
 from typing import List, Optional
 
-from agent_framework import (
-    ChatAgent,
-    ChatMessage,
-    Role,
-    HostedCodeInterpreterTool,
-)
+from agent_framework import (ChatAgent, ChatMessage, HostedCodeInterpreterTool,
+                             Role)
+from agent_framework_azure_ai import \
+    AzureAIAgentClient  # Provided by agent_framework
+from azure.ai.projects.aio import AIProjectClient
 from azure.ai.projects.models import ConnectionType
-from agent_framework_azure_ai import AzureAIAgentClient  # Provided by agent_framework
-
-
+from common.config.app_config import config
+from v4.config.agent_registry import agent_registry
 from v4.magentic_agents.common.lifecycle import AzureAgentBase
 from v4.magentic_agents.models.agent_models import MCPConfig, SearchConfig
-from v4.config.agent_registry import agent_registry
 
 
 class FoundryAgentTemplate(AzureAgentBase):
@@ -45,6 +42,7 @@ def __init__(
         self.enable_code_interpreter = enable_code_interpreter
         self.search = search_config
         self.logger = logging.getLogger(__name__)
+        self.project_client = config.get_ai_project_client()
 
         # Decide early whether Azure Search mode should be activated
         self._use_azure_search = self._is_azure_search_requested()
@@ -128,7 +126,7 @@ async def _create_azure_search_enabled_client(self):
         resolved_connection_id = None
 
         try:
-            async for connection in self.client.project_client.connections.list():
+            async for connection in self.project_client.connections.list():
                 if connection.type == ConnectionType.AZURE_AI_SEARCH:
                     # Allow direct id override
                     if desired_connection_id and connection.id == desired_connection_id:
@@ -164,7 +162,7 @@ async def _create_azure_search_enabled_client(self):
 
         # Create agent with raw tool
         try:
-            azure_agent = await self.client.project_client.agents.create_agent(
+            azure_agent = await self.client.create_agent(
                 model=self.model_deployment_name,
                 name=self.agent_name,
                 instructions=(
@@ -193,8 +191,10 @@ async def _create_azure_search_enabled_client(self):
             )
 
             chat_client = AzureAIAgentClient(
-                project_client=self.client.project_client,
+                project_client=self.project_client,
+                #agents_client=self.client,
                 agent_id=azure_agent.id,
+                async_credential=self.creds,
             )
             return chat_client
         except Exception as ex:
@@ -233,7 +233,11 @@ async def _after_open(self) -> None:
                 self.logger.info("Initializing agent in MCP mode.")
                 tools = await self._collect_tools()
                 self._agent = ChatAgent(
-                    chat_client=self.client,
+                    chat_client=AzureAIAgentClient(
+                        project_endpoint=self.project_endpoint,
+                        model_deployment_name=self.model_deployment_name,
+                        async_credential=self.creds,
+                    ),
                     instructions=self.agent_instructions,
                     name=self.agent_name,
                     description=self.agent_description,
@@ -293,23 +297,24 @@ async def close(self) -> None:
 # -------------------------
 # Factory
 # -------------------------
-async def create_foundry_agent(
-    agent_name: str,
-    agent_description: str,
-    agent_instructions: str,
-    model_deployment_name: str,
-    mcp_config: MCPConfig | None,
-    search_config: SearchConfig | None,
-) -> FoundryAgentTemplate:
-    """Factory to create and open a FoundryAgentTemplate."""
-    agent = FoundryAgentTemplate(
-        agent_name=agent_name,
-        agent_description=agent_description,
-        agent_instructions=agent_instructions,
-        model_deployment_name=model_deployment_name,
-        enable_code_interpreter=True,
-        mcp_config=mcp_config,
-        search_config=search_config,
-    )
-    await agent.open()
-    return agent
+# async def create_foundry_agent(
+#     agent_name: str,
+#     agent_description: str,
+#     agent_instructions: str,
+#     model_deployment_name: str,
+#     mcp_config: MCPConfig | None,
+#     search_config: SearchConfig | None,
+# ) -> FoundryAgentTemplate:
+#     """Factory to create and open a FoundryAgentTemplate."""
+#     agent = FoundryAgentTemplate(
+#         agent_name=agent_name,
+#         agent_description=agent_description,
+#         agent_instructions=agent_instructions,
+#         model_deployment_name=model_deployment_name,
+#         enable_code_interpreter=True,
+#         mcp_config=mcp_config,
+#         search_config=search_config,
+
+#     )
+#     await agent.open()
+#     return agent

src/backend/v4/magentic_agents/foundry_agent.py

@@ -4,4 +4,11 @@ version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = []
+dependencies = [
+    "fastapi",
+    "uvicorn[standard]>=0.38.0",
+    "jinja2",
+    "azure-identity",
+    "python-dotenv",
+    "python-multipart",
+]