Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into macae-v3-dev-marktayl

Author: marktayl1

data/agent_teams/default_team.json

@@ -14,7 +14,11 @@
             "system_message": "You are an AI Agent. You have knowledge about HR (e.g., human resources), policies, procedures, and onboarding guidelines.",
             "description": "Handles employee onboarding, HR policies, and human resources management tasks.",
             "icon": "Person",
-            "index_name": ""
+            "index_name": "",
+            "use_rag": false,
+            "use_mcp": false,
+            "coding_tools": false,
+            "use_bing": false
         },
         {
             "input_key": "tech-support-001",
@@ -24,7 +28,11 @@
             "system_message": "You are a Product agent. You have knowledge about product management, development, and compliance guidelines. When asked to call a function, you should summarize back what was done.",
             "description": "Provides technical support for mobile plans, telecommunications, and IT services.",
             "icon": "Phone",
-            "index_name": ""
+            "index_name": "",
+            "use_rag": false,
+            "use_mcp": false,
+            "coding_tools": false,
+            "use_bing": false
         },
         {
             "input_key": "procurement-001",
@@ -34,7 +42,11 @@
             "system_message": "You are a Procurement agent. You specialize in purchasing, vendor management, supply chain operations, and inventory control. You help with creating purchase orders, managing vendors, tracking orders, and ensuring efficient procurement processes.",
             "description": "Manages purchasing decisions, add-ons, and procurement processes.",
             "icon": "ShoppingBag",
-            "index_name": ""
+            "index_name": "",
+            "use_rag": false,
+            "use_mcp": false,
+            "coding_tools": false,
+            "use_bing": false
         },
         {
             "input_key": "marketing-001",
@@ -44,7 +56,11 @@
             "system_message": "You are a Marketing agent. You specialize in marketing strategy, campaign development, content creation, and market analysis. You help create effective marketing campaigns, analyze market data, and develop promotional content for products and services.",
             "description": "Creates marketing content, press releases, and promotional materials.",
             "icon": "DocumentEdit",
-            "index_name": ""
+            "index_name": "",
+            "use_rag": false,
+            "use_mcp": false,
+            "coding_tools": false,
+            "use_bing": false
         },
         {
             "input_key": "generic-001",
@@ -54,7 +70,11 @@
             "system_message": "You are a Generic agent that can help with general questions and provide basic information. You can search for information and perform simple calculations.",
             "description": "Provides general assistance and handles miscellaneous tasks that don't require specialized expertise.",
             "icon": "Bot",
-            "index_name": ""
+            "index_name": "",
+            "use_rag": false,
+            "use_mcp": false,
+            "coding_tools": false,
+            "use_bing": false
         }
     ],
     "description": "Business Operations team handles employee onboarding, telecommunications support, procurement, and marketing tasks for comprehensive business operations management.",

src/backend/app_kernel.py

@@ -20,8 +20,10 @@
 from common.utils.utils_date import format_dates_in_messages
 # Updated import for KernelArguments
 from common.utils.utils_kernel import rai_success
+from common.utils.websocket_streaming import (websocket_streaming_endpoint,
+                                              ws_manager)
 # FastAPI imports
-from fastapi import FastAPI, HTTPException, Query, Request
+from fastapi import FastAPI, HTTPException, Query, Request, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
 from kernel_agents.agent_factory import AgentFactory
 # Local imports
@@ -81,6 +83,13 @@
 logging.info("Added health check middleware")
 
 
+# WebSocket streaming endpoint
+@app.websocket("/ws/streaming")
+async def websocket_endpoint(websocket: WebSocket):
+    """WebSocket endpoint for real-time plan execution streaming"""
+    await websocket_streaming_endpoint(websocket)
+
+
 @app.post("/api/user_browser_language")
 async def user_browser_language_endpoint(user_language: UserLanguage, request: Request):
     """
@@ -587,12 +596,14 @@ async def approve_step_endpoint(
 
         return {"status": "All steps approved"}
 
+
 # Get plans is called in the initial side rendering of the frontend
 @app.get("/api/plans")
 async def get_plans(
     request: Request,
     session_id: Optional[str] = Query(None),
     plan_id: Optional[str] = Query(None),
+    team_id: Optional[str] = Query(None),
 ):
     """
     Retrieve plans for the current user.
@@ -659,7 +670,7 @@ async def get_plans(
             "UserIdNotFound", {"status_code": 400, "detail": "no user"}
         )
         raise HTTPException(status_code=400, detail="no user")
-    
+
     # Initialize agent team for this user session
     await OrchestrationManager.get_current_orchestration(user_id=user_id)
 
@@ -884,6 +895,82 @@ async def get_agent_tools():
     return []
 
 
+@app.post("/api/test/streaming/{plan_id}")
+async def test_streaming_updates(plan_id: str):
+    """
+    Test endpoint to simulate streaming updates for a plan.
+    This is for testing the WebSocket streaming functionality.
+    """
+    from common.utils.websocket_streaming import (send_agent_message,
+                                                  send_plan_update,
+                                                  send_step_update)
+
+    try:
+        # Simulate a series of streaming updates
+        await send_agent_message(
+            plan_id=plan_id,
+            agent_name="Data Analyst",
+            content="Starting analysis of the data...",
+            message_type="thinking",
+        )
+
+        await asyncio.sleep(1)
+
+        await send_plan_update(
+            plan_id=plan_id,
+            step_id="step_1",
+            agent_name="Data Analyst",
+            content="Analyzing customer data patterns...",
+            status="in_progress",
+            message_type="action",
+        )
+
+        await asyncio.sleep(2)
+
+        await send_agent_message(
+            plan_id=plan_id,
+            agent_name="Data Analyst",
+            content="Found 3 key insights in the customer data. Processing recommendations...",
+            message_type="result",
+        )
+
+        await asyncio.sleep(1)
+
+        await send_step_update(
+            plan_id=plan_id,
+            step_id="step_1",
+            status="completed",
+            content="Data analysis completed successfully!",
+        )
+
+        await send_agent_message(
+            plan_id=plan_id,
+            agent_name="Business Advisor",
+            content="Reviewing the analysis results and preparing strategic recommendations...",
+            message_type="thinking",
+        )
+
+        await asyncio.sleep(2)
+
+        await send_plan_update(
+            plan_id=plan_id,
+            step_id="step_2",
+            agent_name="Business Advisor",
+            content="Based on the data analysis, I recommend focusing on customer retention strategies for the identified high-value segments.",
+            status="completed",
+            message_type="result",
+        )
+
+        return {
+            "status": "success",
+            "message": f"Test streaming updates sent for plan {plan_id}",
+        }
+
+    except Exception as e:
+        logging.error(f"Error sending test streaming updates: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 # Run the app
 if __name__ == "__main__":
     import uvicorn

src/backend/common/config/app_config.py

@@ -39,6 +39,10 @@ def __init__(self):
             "AZURE_COGNITIVE_SERVICES", "https://cognitiveservices.azure.com/.default"
         )
 
+        self.AZURE_MANAGEMENT_SCOPE = self._get_optional(
+            "AZURE_MANAGEMENT_SCOPE", "https://management.azure.com/.default"
+        )
+
         # Azure OpenAI settings
         self.AZURE_OPENAI_DEPLOYMENT_NAME = self._get_required(
             "AZURE_OPENAI_DEPLOYMENT_NAME", "gpt-4o"