added proxy agent support and fixed Hr scenario issues

Author: marktayl1

data/agent_teams/hr.json

@@ -663,60 +663,62 @@ async def get_plans(
     # Initialize agent team for this user session
     await OrchestrationManager.get_current_orchestration(user_id=user_id)
 
-    # Initialize memory context
-    memory_store = await DatabaseFactory.get_database(user_id=user_id)
-    if session_id:
-        plan = await memory_store.get_plan_by_session(session_id=session_id)
-        if not plan:
-            track_event_if_configured(
-                "GetPlanBySessionNotFound",
-                {"status_code": 400, "detail": "Plan not found"},
-            )
-            raise HTTPException(status_code=404, detail="Plan not found")
-
-        # Use get_steps_by_plan to match the original implementation
-        steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
-        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-        plan_with_steps.update_step_counts()
-        return [plan_with_steps]
-    if plan_id:
-        plan = await memory_store.get_plan_by_plan_id(plan_id=plan_id)
-        if not plan:
-            track_event_if_configured(
-                "GetPlanBySessionNotFound",
-                {"status_code": 400, "detail": "Plan not found"},
-            )
-            raise HTTPException(status_code=404, detail="Plan not found")
+    # Replace the following with code to get plan run history from the database
+
+    # # Initialize memory context
+    # memory_store = await DatabaseFactory.get_database(user_id=user_id)
+    # if session_id:
+    #     plan = await memory_store.get_plan_by_session(session_id=session_id)
+    #     if not plan:
+    #         track_event_if_configured(
+    #             "GetPlanBySessionNotFound",
+    #             {"status_code": 400, "detail": "Plan not found"},
+    #         )
+    #         raise HTTPException(status_code=404, detail="Plan not found")
+
+    #     # Use get_steps_by_plan to match the original implementation
+    #     steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
+    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+    #     plan_with_steps.update_step_counts()
+    #     return [plan_with_steps]
+    # if plan_id:
+    #     plan = await memory_store.get_plan_by_plan_id(plan_id=plan_id)
+    #     if not plan:
+    #         track_event_if_configured(
+    #             "GetPlanBySessionNotFound",
+    #             {"status_code": 400, "detail": "Plan not found"},
+    #         )
+    #         raise HTTPException(status_code=404, detail="Plan not found")
+
+    #     # Use get_steps_by_plan to match the original implementation
+    #     steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
+    #     messages = await memory_store.get_data_by_type_and_session_id(
+    #         "agent_message", session_id=plan.session_id
+    #     )
+
+    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+    #     plan_with_steps.update_step_counts()
+
+    #     # Format dates in messages according to locale
+    #     formatted_messages = format_dates_in_messages(
+    #         messages, config.get_user_local_browser_language()
+    #     )
+
+    #     return [plan_with_steps, formatted_messages]
+
+    # all_plans = await memory_store.get_all_plans()
+    # # Fetch steps for all plans concurrently
+    # steps_for_all_plans = await asyncio.gather(
+    #     *[memory_store.get_steps_by_plan(plan_id=plan.id) for plan in all_plans]
+    # )
+    # # Create list of PlanWithSteps and update step counts
+    # list_of_plans_with_steps = []
+    # for plan, steps in zip(all_plans, steps_for_all_plans):
+    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+    #     plan_with_steps.update_step_counts()
+    #     list_of_plans_with_steps.append(plan_with_steps)
 
-        # Use get_steps_by_plan to match the original implementation
-        steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
-        messages = await memory_store.get_data_by_type_and_session_id(
-            "agent_message", session_id=plan.session_id
-        )
-
-        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-        plan_with_steps.update_step_counts()
-
-        # Format dates in messages according to locale
-        formatted_messages = format_dates_in_messages(
-            messages, config.get_user_local_browser_language()
-        )
-
-        return [plan_with_steps, formatted_messages]
-
-    all_plans = await memory_store.get_all_plans()
-    # Fetch steps for all plans concurrently
-    steps_for_all_plans = await asyncio.gather(
-        *[memory_store.get_steps_by_plan(plan_id=plan.id) for plan in all_plans]
-    )
-    # Create list of PlanWithSteps and update step counts
-    list_of_plans_with_steps = []
-    for plan, steps in zip(all_plans, steps_for_all_plans):
-        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-        plan_with_steps.update_step_counts()
-        list_of_plans_with_steps.append(plan_with_steps)
-
-    return list_of_plans_with_steps
+    return []
 
 
 @app.get("/api/steps/{plan_id}", response_model=List[Step])

data/agent_teams/marketing.json

@@ -58,14 +58,14 @@ class OrchestrationConfig:
     """Configuration for orchestration settings."""
 
     def __init__(self):
-        self._orchestrations = {}
+        self.orchestrations = {}
         self.plans = {}       # job_id -> current plan
         self.approvals = {}   # job_id -> True/False/None
         self.sockets = {}     # job_id -> WebSocket
 
     def get_current_orchestration(self, user_id: str) -> MagenticOrchestration:
         """get existing orchestration instance."""
-        return self._orchestrations.get(user_id, None)
+        return self.orchestrations.get(user_id, None)
 
 
 # Global config instances

data/agent_teams/retail.json

@@ -1,14 +1,11 @@
 """ Agent template for building foundry agents with Azure AI Search, Bing, and MCP plugins. """
 
-import asyncio
 import logging
 from typing import List, Optional
 
 from azure.ai.agents.models import (AzureAISearchTool, BingGroundingTool,
                                     CodeInterpreterToolDefinition)
 from semantic_kernel.agents import AzureAIAgent  # pylint: disable=E0611
-from semantic_kernel.agents import \
-    AzureAIAgentSettings  # pylint: disable=E0611
 from v3.magentic_agents.common.lifecycle import AzureAgentBase
 from v3.magentic_agents.models.agent_models import (BingConfig, MCPConfig,
                                                     SearchConfig)

data/agent_teams/sample.json

@@ -11,6 +11,7 @@
 from v3.magentic_agents.foundry_agent import FoundryAgentTemplate
 from v3.magentic_agents.models.agent_models import (BingConfig, MCPConfig,
                                                     SearchConfig)
+from v3.magentic_agents.proxy_agent import ProxyAgent
 from v3.magentic_agents.reasoning_agent import ReasoningAgentTemplate
 
 
@@ -38,7 +39,7 @@ def parse_team_config(file_path: Union[str, Path]) -> SimpleNamespace:
             data = json.load(f)
         return json.loads(json.dumps(data), object_hook=lambda d: SimpleNamespace(**d))
 
-    async def create_agent_from_config(self, agent_obj: SimpleNamespace, team_model: str = None) -> Union[FoundryAgentTemplate, ReasoningAgentTemplate]:
+    async def create_agent_from_config(self, agent_obj: SimpleNamespace) -> Union[FoundryAgentTemplate, ReasoningAgentTemplate, ProxyAgent]:
         """
         Create an agent from configuration object.
         
@@ -55,6 +56,10 @@ async def create_agent_from_config(self, agent_obj: SimpleNamespace, team_model:
         """
         # Get model from agent config, team model, or environment
         deployment_name = getattr(agent_obj, 'deployment_name', None)
+
+        if not deployment_name and agent_obj.name.lower() == "proxyagent":
+            self.logger.info("Creating ProxyAgent")
+            return ProxyAgent()
 
         # Validate supported models
         supported_models = json.loads(os.getenv("SUPPORTED_MODELS"))
@@ -114,7 +119,7 @@ async def create_agent_from_config(self, agent_obj: SimpleNamespace, team_model:
         self.logger.info(f"Successfully created and initialized agent '{agent_obj.name}'")
         return agent
 
-    async def get_agents(self, file_path: str, team_model: str = None) -> List:
+    async def get_agents(self, file_path: str) -> List:
         """
         Create and return a team of agents from JSON configuration.
         
@@ -137,7 +142,7 @@ async def get_agents(self, file_path: str, team_model: str = None) -> List:
                 try:
                     self.logger.info(f"Creating agent {i}/{len(team.agents)}: {agent_cfg.name}")
 
-                    agent = await self.create_agent_from_config(agent_cfg, team_model)
+                    agent = await self.create_agent_from_config(agent_cfg)
                     agents.append(agent)
                     self._agent_list.append(agent)  # Keep track for cleanup
 

src/backend/app_kernel.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
+""" Proxy agent that prompts for human clarification."""
 
-import asyncio
+import logging
 import uuid
 from collections.abc import AsyncIterable
 from typing import AsyncIterator
@@ -25,6 +26,7 @@ def __init__(self, chat_history: ChatHistory | None = None, thread_id: str | Non
         self._chat_history = chat_history if chat_history is not None else ChatHistory()
         self._id: str = thread_id or f"thread_{uuid.uuid4().hex}"
         self._is_deleted = False
+        self.logger = logging.getLogger(__name__)
 
     @override
     async def _create(self) -> str:
@@ -76,16 +78,19 @@ class ProxyAgentResponseItem:
     def __init__(self, message: ChatMessageContent, thread: AgentThread):
         self.message = message
         self.thread = thread
+        self.logger = logging.getLogger(__name__)
 
 class ProxyAgent(Agent):
     """Simple proxy agent that prompts for human clarification."""
 
     def __init__(self):
         super().__init__(
             name="ProxyAgent", 
-            description="I help clarify requests by asking the human user for more information. Please ask me for more details about any unclear requirements, missing information, or if you need me to elaborate on any aspect of the task."
+            description="""Call this agent when you need to clarify requests by asking the human user 
+            for more information. Ask it for more details about any unclear requirements, missing information, 
+            or if you need the user to elaborate on any aspect of the task."""
         )
-        self.instructions = "I gather clarification from the human user when requested by other agents."
+        self.instructions = ""
 
     async def invoke(self, message: str,*, thread: AgentThread | None = None,**kwargs) -> AsyncIterator[ChatMessageContent]:
         """Ask human user for clarification about the message."""
@@ -96,12 +101,13 @@ async def invoke(self, message: str,*, thread: AgentThread | None = None,**kwarg
             construct_thread=lambda: DummyAgentThread(),
             expected_type=DummyAgentThread,
         )
+        # Replace with websocket call when available
         print(f"\n🤔 ProxyAgent: Another agent is asking for clarification about:")
         print(f"   Request: {message}")
         print("-" * 60)
 
         # Get human input
-        human_response = input("💬 Please provide clarification: ").strip()
+        human_response = input("Please provide clarification: ").strip()
 
         if not human_response:
             human_response = "No additional clarification provided."
@@ -138,13 +144,13 @@ async def invoke_stream(self, messages, thread=None, **kwargs) -> AsyncIterator[
         else:
             message = str(messages)
 
-        
-        print(f"\n🤔 ProxyAgent: Another agent is asking for clarification about:")
+        # Replace with websocket call when available
+        print(f"\nProxyAgent: Another agent is asking for clarification about:")
         print(f"   Request: {message}")
         print("-" * 60)
 
-        # Get human input
-        human_response = input("💬 Please provide clarification: ").strip()
+        # Get human input - replace with websocket call when available
+        human_response = input("Please provide clarification: ").strip()
 
         if not human_response:
             human_response = "No additional clarification provided."
@@ -180,22 +186,4 @@ async def get_response(self, chat_history, **kwargs):
 
 async def create_proxy_agent():
     """Factory function for human proxy agent."""
-    return ProxyAgent()
-
-# Test harness
-async def test_proxy_agent():
-    """Test the proxy agent."""
-    print("🤖 Testing proxy agent...")
-    
-    agent = ProxyAgent()
-    test_messages = [
-        "More information needed.  What is the name of the employee?"
-    ]
-    
-    for message in test_messages:
-        print(f"\n🤖 Simulating agent request: {message}")
-        async for response in agent.invoke(message):
-            print(f"📝 Response: {response.content}")
-
-if __name__ == "__main__":
-    asyncio.run(test_proxy_agent())
+    return ProxyAgent()

src/backend/v3/config/settings.py

@@ -62,7 +62,7 @@ async def get_current_orchestration(cls, user_id: str) -> MagenticOrchestration:
             factory = MagenticAgentFactory()
             # to do: change to parsing teams from cosmos db
             agents = await factory.get_agents(config.AGENT_TEAM_FILE)
-            orchestration_config._orchestrations[user_id] = await cls.init_orchestration(agents)
+            orchestration_config.orchestrations[user_id] = await cls.init_orchestration(agents)
         return orchestration_config.get_current_orchestration(user_id)
 
     @classmethod