Merge branch 'macae-v3-dev' into planpage-uistreaming

Author: blessing-sanusi

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

@@ -2,45 +2,36 @@
 import asyncio
 import logging
 import os
-
 # Azure monitoring
 import re
 import uuid
+from contextlib import asynccontextmanager
 from typing import Dict, List, Optional
 
-# Semantic Kernel imports
-from common.config.app_config import config
 from auth.auth_utils import get_authenticated_user_details
 from azure.monitor.opentelemetry import configure_azure_monitor
+from common.config.app_config import config
+from common.database.database_factory import DatabaseFactory
+from common.models.messages_kernel import (AgentMessage, AgentType,
+                                           HumanClarification, HumanFeedback,
+                                           InputTask, Plan, PlanStatus,
+                                           PlanWithSteps, Step, UserLanguage)
 from common.utils.event_utils import track_event_if_configured
-
+from common.utils.utils_date import format_dates_in_messages
+# Updated import for KernelArguments
+from common.utils.utils_kernel import rai_success
 # FastAPI imports
 from fastapi import FastAPI, HTTPException, Query, Request, WebSocket
 from fastapi.middleware.cors import CORSMiddleware
 from kernel_agents.agent_factory import AgentFactory
-
 # Local imports
 from middleware.health_check import HealthCheckMiddleware
-from common.models.messages_kernel import (
-    AgentMessage,
-    AgentType,
-    HumanClarification,
-    HumanFeedback,
-    InputTask,
-    Plan,
-    PlanStatus,
-    PlanWithSteps,
-    Step,
-    UserLanguage,
-)
-
-# Updated import for KernelArguments
-from common.utils.utils_kernel import rai_success
-
-from common.database.database_factory import DatabaseFactory
-from common.utils.utils_date import format_dates_in_messages
 from v3.api.router import app_v3
 from common.utils.websocket_streaming import websocket_streaming_endpoint, ws_manager
+# Semantic Kernel imports
+from v3.config.settings import orchestration_config
+from v3.magentic_agents.magentic_agent_factory import (cleanup_all_agents,
+                                                       get_agents)
 
 # Check if the Application Insights Instrumentation Key is set in the environment variables
 connection_string = config.APPLICATIONINSIGHTS_CONNECTION_STRING
@@ -70,6 +61,14 @@
     logging.WARNING
 )
 
+
+# @asynccontextmanager
+# async def lifespan(app: FastAPI):
+#     """Lifespan event handler to create and clean up agents."""
+#     config.agents = await get_agents()
+#     yield
+#     await cleanup_all_agents()
+
 # Initialize the FastAPI app
 app = FastAPI()
 
@@ -605,7 +604,7 @@ 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,
@@ -670,13 +669,17 @@ async def get_plans(
       404:
         description: Plan not found
     """
+
     authenticated_user = get_authenticated_user_details(request_headers=request.headers)
     user_id = authenticated_user["user_principal_id"]
     if not user_id:
         track_event_if_configured(
             "UserIdNotFound", {"status_code": 400, "detail": "no user"}
         )
         raise HTTPException(status_code=400, detail="no user")
+    
+    # Initialize agent team for this user session
+    await orchestration_config.get_current_orchestration(user_id=user_id)
 
     # Initialize memory context
     memory_store = await DatabaseFactory.get_database(user_id=user_id)

src/backend/common/config/app_config.py

@@ -4,7 +4,7 @@
 from typing import Optional
 
 from azure.ai.projects.aio import AIProjectClient
-from azure.identity import ManagedIdentityCredential, DefaultAzureCredential
+from azure.identity import DefaultAzureCredential, ManagedIdentityCredential
 from dotenv import load_dotenv
 
 # Load environment variables from .env file
@@ -81,6 +81,8 @@ def __init__(self):
         self._cosmos_database = None
         self._ai_project_client = None
 
+        self._agents = {}
+
     def get_azure_credential(self, client_id=None):
         """
         Returns an Azure credential based on the application environment.
@@ -208,6 +210,15 @@ def set_user_local_browser_language(self, language: str):
         """
         os.environ["USER_LOCAL_BROWSER_LANGUAGE"] = language
 
+    # Get agent team list by user_id dictionary index
+    def get_agents(self) -> dict[str, list]:
+        """Get the list of agents configured in the application.
+
+        Returns:
+            A list of agent names or configurations
+        """
+        return self._agents
+
 
 # Create a global instance of AppConfig
 config = AppConfig()

src/backend/common/models/messages_kernel.py

@@ -160,6 +160,9 @@ class TeamAgent(KernelBaseModel):
     description: str = ""
     icon: str
     index_name: str = ""
+    use_rag: bool = False
+    use_mcp: bool = False
+    coding_tools: bool = False
 
 
 class StartingTask(KernelBaseModel):

src/backend/v3/api/router.py

@@ -1,34 +1,44 @@
-import uuid
-import logging
 import json
-from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Request
+import logging
+import uuid
 
 from auth.auth_utils import get_authenticated_user_details
+from common.config.app_config import config
+from common.database.database_factory import DatabaseFactory
 from common.models.messages_kernel import (
     GeneratePlanRequest,
     InputTask,
     Plan,
     PlanStatus,
 )
 from common.utils.event_utils import track_event_if_configured
-from common.utils.utils_kernel import (
-    rai_success,
-    rai_validate_team_config,
+from common.utils.utils_kernel import rai_success, rai_validate_team_config
+from fastapi import (
+    APIRouter,
+    Depends,
+    File,
+    HTTPException,
+    Request,
+    UploadFile,
+    WebSocket,
+    WebSocketDisconnect,
 )
-from v3.common.services.team_service import TeamService
 from kernel_agents.agent_factory import AgentFactory
-from common.database.database_factory import DatabaseFactory
+from semantic_kernel.agents.runtime import InProcessRuntime
+from v3.common.services.team_service import TeamService
+from v3.config.settings import orchestration_config
+from v3.models.models import MPlan, MStep
 from v3.models.orchestration_models import AgentType
-from common.config.app_config import config
 
 app_v3 = APIRouter(
     prefix="/api/v3",
     responses={404: {"description": "Not found"}},
 )
 
 
+# To do: change endpoint to process request
 @app_v3.post("/create_plan")
-async def create_plan_endpoint(input_task: InputTask, request: Request):
+async def process_request(input_task: InputTask, request: Request):
     """
     Create a new plan without full processing.
 
@@ -128,15 +138,29 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
 
         # Create a new Plan object
-        plan = Plan(
-            session_id=input_task.session_id,
-            team_id=input_task.team_id,
-            user_id=user_id,
-            initial_goal=input_task.description,
-            overall_status=PlanStatus.in_progress,
-            source=AgentType.PLANNER.value,
+        plan = MPlan()
+        #     session_id=input_task.session_id,
+        #     team_id=input_task.team_id,
+        #     user_id=user_id,
+        #     initial_goal=input_task.description,
+        #     overall_status=PlanStatus.in_progress,
+        #     source=AgentType.PLANNER.value,
+        # )
+
+        # setup and call the magentic orchestration
+        magentic_orchestration = await orchestration_config.get_current_orchestration(
+            user_id
         )
 
+        runtime = InProcessRuntime()
+        runtime.start()
+
+        # invoke returns immediately, wait on result.get
+        orchestration_result = await magentic_orchestration.invoke(
+            task=input_task.description, runtime=runtime
+        )
+        team_result = await orchestration_result.get()
+
         # Save the plan to the database
         await memory_store.add_plan(plan)
 
@@ -630,3 +654,28 @@ async def get_search_indexes_endpoint(request: Request):
     except Exception as e:
         logging.error(f"Error retrieving search indexes: {str(e)}")
         raise HTTPException(status_code=500, detail="Internal server error occurred")
+
+
+# WebSocket endpoint for job status updates
+plans = {}  # job_id -> current plan
+approvals = {}  # job_id -> True/False/None
+sockets = {}  # job_id -> WebSocket
+
+
+@app_v3.websocket("/ws/{job_id}")
+async def ws(job_id: str, websocket: WebSocket):
+    await websocket.accept()
+    sockets[job_id] = websocket
+    try:
+        if job_id in plans:
+            await websocket.send_json({"type": "plan_ready", "plan": plans[job_id]})
+        while True:
+            msg = await websocket.receive_json()
+            if msg.get("type") == "approve":
+                approvals[job_id] = True
+                await websocket.send_json({"type": "ack", "message": "approved"})
+            elif msg.get("type") == "reject":
+                approvals[job_id] = False
+                await websocket.send_json({"type": "ack", "message": "rejected"})
+    except WebSocketDisconnect:
+        sockets.pop(job_id, None)