Merge pull request #446 from microsoft/macae-v3-fr-dev-92

feat: Macae v3 fr dev 92

Author: blessing-sanusi

src/backend/app_kernel.py

@@ -73,7 +73,7 @@
     allow_origins=[
         "http://localhost:3000",    # Add this for local development
         "https://localhost:3000",   # Add this if using HTTPS locally
-        "http://127.0.0.1:3000",
+        "https://127.0.0.1:3000",
         "http://127.0.0.1:3001",
     ],  # Allow all origins for development; restrict in production
     allow_credentials=True,

src/backend/common/models/messages_kernel.py

@@ -119,7 +119,7 @@ class Plan(BaseDataModel):
     team_id: Optional[str] = None
     human_clarification_request: Optional[str] = None
     human_clarification_response: Optional[str] = None
-
+    
 
 class Step(BaseDataModel):
     """Represents an individual step (task) within a plan."""

src/backend/v3/api/router.py

@@ -77,9 +77,9 @@ class OrchestrationConfig:
     def __init__(self):
         self.orchestrations: Dict[str, MagenticOrchestration] = {} # user_id -> orchestration instance
         self.plans: Dict[str, any] = {} # plan_id -> plan details
-        self.approvals: Dict[str, bool] = {} # plan_dot_id -> approval status
+        self.approvals: Dict[str, bool] = {} # m_plan_id -> approval status
         self.sockets: Dict[str, WebSocket] = {} # user_id -> WebSocket
-        self.clarifications: Dict[str, str] = {} # plan_dot_id -> clarification response
+        self.clarifications: Dict[str, str] = {} # m_plan_id -> clarification response
 
     def get_current_orchestration(self, user_id: str) -> MagenticOrchestration:
         """get existing orchestration instance."""

src/backend/v3/config/settings.py

@@ -2,8 +2,10 @@
 
 import os
 from dataclasses import dataclass
+
 from common.config.app_config import config
 
+
 @dataclass(slots=True)
 class MCPConfig:
     """Configuration for connecting to an MCP server."""
@@ -18,8 +20,8 @@ def from_env(cls) -> "MCPConfig":
         url = config.MCP_SERVER_ENDPOINT
         name = config.MCP_SERVER_NAME
         description = config.MCP_SERVER_DESCRIPTION
-        tenant_id = config.TENANT_ID
-        client_id = config.CLIENT_ID
+        tenant_id = config.AZURE_TENANT_ID
+        client_id = config.AZURE_CLIENT_ID
 
         # Raise exception if any required environment variable is missing
         if not all([url, name, description, tenant_id, client_id]):

src/backend/v3/magentic_agents/models/agent_models.py

@@ -49,7 +49,7 @@ class PlanApprovalRequest:
 @dataclass(slots=True)
 class PlanApprovalResponse:
     """Response for plan approval from the frontend."""
-    plan_dot_id: str
+    m_plan_id: str
     approved: bool
     feedback: str | None = None
     plan_id: str | None = None

src/backend/v3/models/messages.py

@@ -12,7 +12,7 @@
 from semantic_kernel.agents.orchestration.magentic import (
     MagenticContext, StandardMagenticManager)
 from semantic_kernel.agents.orchestration.prompts._magentic_prompts import \
-    ORCHESTRATOR_TASK_LEDGER_FACTS_PROMPT
+    ORCHESTRATOR_TASK_LEDGER_PLAN_PROMPT
 from semantic_kernel.contents import ChatMessageContent
 from v3.config.settings import (connection_config, current_user_id,
                                 orchestration_config)
@@ -37,13 +37,14 @@ def __init__(self, *args, **kwargs):
         # object.__setattr__(self, 'current_user_id', None)
 
         custom_addition = """
-To address this request we have assembled the following team:
+Before creating the final plan, please ask each agent - team member to list all relevant tools (including MCP tools, plug-ins, etc.) they have access to.  For each tool, list its required parameters.
+Obtain every required parameter that is not specified in the users request. These questions should be sent to the proxy agent.  Do not ask for information that is outside of this list of required parameters.
 
-{{$team}}
-
-Please check with the team members to list all relevant tools they have access to, and their required parameters."""
+Once this information is obtained, replan to create a final bullet-point plan to address the original request using the data and clarifications obtained.
+Each step in the plan should start with a specific agent which is responsible for executing it.
+"""
 
-        kwargs['task_ledger_facts_prompt'] = ORCHESTRATOR_TASK_LEDGER_FACTS_PROMPT + custom_addition
+        kwargs['task_ledger_plan_prompt'] = ORCHESTRATOR_TASK_LEDGER_PLAN_PROMPT + custom_addition
 
         super().__init__(*args, **kwargs)
 
@@ -78,7 +79,12 @@ async def plan(self, magentic_context: MagenticContext) -> Any:
                 "participant_descriptions": magentic_context.participant_descriptions
             } if hasattr(magentic_context, 'participant_descriptions') else {}
         )
-        
+        try:
+            orchestration_config.plans[self.magentic_plan.id] = self.magentic_plan 
+        except Exception as e:
+            print(f"Error processing plan approval: {e}")
+
+
         # Send the approval request to the user's WebSocket
         # The user_id will be automatically retrieved from context
         await connection_config.send_status_update_async({
@@ -105,15 +111,15 @@ async def plan(self, magentic_context: MagenticContext) -> Any:
             # )
 
 
-    async def _wait_for_user_approval(self, plan_dot_id: Optional[str] = None) -> Optional[messages.PlanApprovalResponse]: # plan_id will not be optional in future
+    async def _wait_for_user_approval(self, m_plan_id: Optional[str] = None) -> Optional[messages.PlanApprovalResponse]: # plan_id will not be optional in future
         """Wait for user approval response."""
 
         # To do: implement timeout and error handling
-        if plan_dot_id not in orchestration_config.approvals:
-            orchestration_config.approvals[plan_dot_id] = None
-        while orchestration_config.approvals[plan_dot_id] is None:
+        if m_plan_id not in orchestration_config.approvals:
+            orchestration_config.approvals[m_plan_id] = None
+        while orchestration_config.approvals[m_plan_id] is None:
             await asyncio.sleep(0.2)
-        return messages.PlanApprovalResponse(approved=orchestration_config.approvals[plan_dot_id], plan_dot_id=plan_dot_id)
+        return messages.PlanApprovalResponse(approved=orchestration_config.approvals[m_plan_id], m_plan_id=m_plan_id)
 
 
     async def prepare_final_answer(self, magentic_context: MagenticContext) -> ChatMessageContent:

src/backend/v3/orchestration/human_approval_manager.py

@@ -81,10 +81,17 @@ async def callback(streaming_message: StreamingChatMessageContent, is_final: boo
         return callback
 
     @classmethod
-    async def get_current_or_new_orchestration(self, user_id: str, team_config: TeamConfiguration) -> MagenticOrchestration:
+    async def get_current_or_new_orchestration(self, user_id: str, team_config: TeamConfiguration, team_switched: bool) -> MagenticOrchestration: # add team_switched: bool parameter
         """get existing orchestration instance."""
         current_orchestration = orchestration_config.get_current_orchestration(user_id)
-        if current_orchestration is None:
+        if current_orchestration is None or team_switched: # add check for team_switched flag
+            if current_orchestration is not None and team_switched:
+                for agent in current_orchestration._members:
+                    if agent.name != "ProxyAgent":
+                        try:
+                            await agent.close()
+                        except Exception as e:
+                            print(f"Error closing agent: {e}")
             factory = MagenticAgentFactory()
             agents = await factory.get_agents(team_config_input=team_config)
             orchestration_config.orchestrations[user_id] = await self.init_orchestration(agents, user_id)