Merge branch 'macae-v3-dev' into rai-check - resolved conflicts in router.py

Author: blessing-sanusi

src/backend/app_kernel.py

@@ -2,6 +2,7 @@
 import asyncio
 import logging
 import os
+
 # Azure monitoring
 import re
 import uuid
@@ -12,26 +13,37 @@
 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.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 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)
+# 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
@@ -91,6 +103,7 @@
 app.include_router(app_v3)
 logging.info("Added health check middleware")
 
+
 # WebSocket streaming endpoint
 @app.websocket("/ws/streaming")
 async def websocket_endpoint(websocket: WebSocket):
@@ -604,6 +617,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(
@@ -677,7 +691,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 orchestration_config.get_current_orchestration(user_id=user_id)
 
@@ -906,66 +920,73 @@ 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_plan_update, send_agent_message, send_step_update
-    
+    from common.utils.websocket_streaming import (
+        send_plan_update,
+        send_agent_message,
+        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"
+            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"
+            message_type="action",
         )
-        
+
         await asyncio.sleep(2)
-        
+
         await send_agent_message(
             plan_id=plan_id,
-            agent_name="Data Analyst", 
+            agent_name="Data Analyst",
             content="Found 3 key insights in the customer data. Processing recommendations...",
-            message_type="result"
+            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!"
+            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"
+            message_type="thinking",
         )
-        
+
         await asyncio.sleep(2)
-        
+
         await send_plan_update(
             plan_id=plan_id,
-            step_id="step_2", 
+            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"
+            message_type="result",
         )
-        
-        return {"status": "success", "message": f"Test streaming updates sent for plan {plan_id}"}
-        
+
+        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))

src/backend/v3/api/router.py

@@ -18,6 +18,9 @@
 from v3.common.services.team_service import TeamService
 from kernel_agents.agent_factory import AgentFactory
 from common.database.database_factory import DatabaseFactory
+
+# 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
 

src/backend/v3/config/settings.py

@@ -8,10 +8,13 @@
 from common.config.app_config import config
 from semantic_kernel.agents.orchestration.magentic import MagenticOrchestration
 from semantic_kernel.connectors.ai.open_ai import (
-    AzureChatCompletion, OpenAIChatPromptExecutionSettings)
-from v3.magentic_agents.magentic_agent_factory import (cleanup_all_agents,
-                                                       get_agents)
-from v3.orchestration.manager import init_orchestration
+    AzureChatCompletion,
+    OpenAIChatPromptExecutionSettings,
+)
+
+# from v3.magentic_agents.magentic_agent_factory import (cleanup_all_agents,
+#                                                        get_agents)
+# from v3.orchestration.manager import init_orchestration
 
 
 class AzureConfig:
@@ -58,22 +61,23 @@ def get_headers(self, token):
             if token
             else {}
         )
-    
-class OrchestrationConfig:
-    """Configuration for orchestration settings."""
 
-    def __init__(self):
-        self._orchestrations = {}
 
-    async def get_current_orchestration(self, user_id: str) -> MagenticOrchestration:
-        """Initialize or get existing orchestration instance."""
-        if user_id not in self._orchestrations:
-            agents = await get_agents()
-            self._orchestrations[user_id] = await init_orchestration(agents)
-        return self._orchestrations[user_id]
+# class OrchestrationConfig:
+#     """Configuration for orchestration settings."""
+
+#     def __init__(self):
+#         self._orchestrations = {}
+
+#     async def get_current_orchestration(self, user_id: str) -> MagenticOrchestration:
+#         """Initialize or get existing orchestration instance."""
+#         if user_id not in self._orchestrations:
+#             agents = await get_agents()
+#             self._orchestrations[user_id] = await init_orchestration(agents)
+#         return self._orchestrations[user_id]
 
 
 # Global config instances
 azure_config = AzureConfig()
 mcp_config = MCPConfig()
-orchestration_config = OrchestrationConfig()
+# orchestration_config = OrchestrationConfig()