fix: clean up unnecessary comments in create_plan_endpoint and fixed RAI validation for plans

Author: blessing-sanusi

src/backend/v3/api/router.py

@@ -1,44 +1,34 @@
-import json
-import logging
 import uuid
+import logging
+import json
+from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Request
 
 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 fastapi import (
-    APIRouter,
-    Depends,
-    File,
-    HTTPException,
-    Request,
-    UploadFile,
-    WebSocket,
-    WebSocketDisconnect,
+from common.utils.utils_kernel import (
+    rai_success,
+    rai_validate_team_config,
 )
-from kernel_agents.agent_factory import AgentFactory
-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 kernel_agents.agent_factory import AgentFactory
+from common.database.database_factory import DatabaseFactory
 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 process_request(input_task: InputTask, request: Request):
+async def create_plan_endpoint(input_task: InputTask, request: Request):
     """
     Create a new plan without full processing.
 
@@ -87,33 +77,31 @@ async def process_request(input_task: InputTask, request: Request):
               type: string
               description: Error message
     """
-    # Perform RAI check on the description
-    # if not await rai_success(input_task.description, False):
-    #     track_event_if_configured(
-    #         "RAI failed",
-    #         {
-    #             "status": "Plan not created - RAI check failed",
-    #             "description": input_task.description,
-    #             "session_id": input_task.session_id,
-    #         },
-    #     )
-    #     raise HTTPException(
-    #         status_code=400,
-    #         detail={
-    #             "error_type": "RAI_VALIDATION_FAILED",
-    #             "message": "Content Safety Check Failed",
-    #             "description": "Your request contains content that doesn't meet our safety guidelines. Please modify your request to ensure it's appropriate and try again.",
-    #             "suggestions": [
-    #                 "Remove any potentially harmful, inappropriate, or unsafe content",
-    #                 "Use more professional and constructive language",
-    #                 "Focus on legitimate business or educational objectives",
-    #                 "Ensure your request complies with content policies",
-    #             ],
-    #             "user_action": "Please revise your request and try again",
-    #         },
-    #     )
-
-    # Get authenticated user
+    if not await rai_success(input_task.description, False):
+        track_event_if_configured(
+            "RAI failed",
+            {
+                "status": "Plan not created - RAI check failed",
+                "description": input_task.description,
+                "session_id": input_task.session_id,
+            },
+        )
+        raise HTTPException(
+            status_code=400,
+            detail={
+                "error_type": "RAI_VALIDATION_FAILED",
+                "message": "Content Safety Check Failed",
+                "description": "Your request contains content that doesn't meet our safety guidelines. Please modify your request to ensure it's appropriate and try again.",
+                "suggestions": [
+                    "Remove any potentially harmful, inappropriate, or unsafe content",
+                    "Use more professional and constructive language",
+                    "Focus on legitimate business or educational objectives",
+                    "Ensure your request complies with content policies",
+                ],
+                "user_action": "Please revise your request and try again",
+            },
+        )
+
     authenticated_user = get_authenticated_user_details(request_headers=request.headers)
     user_id = authenticated_user["user_principal_id"]
 
@@ -129,42 +117,23 @@ async def process_request(input_task: InputTask, request: Request):
         )
         raise HTTPException(status_code=400, detail="no team id")
 
-    # Generate session ID if not provided
     if not input_task.session_id:
         input_task.session_id = str(uuid.uuid4())
 
     try:
-        # Initialize memory store
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
 
-        # Create a new Plan object
-        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
+        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,
         )
-        team_result = await orchestration_result.get()
 
-        # Save the plan to the database
         await memory_store.add_plan(plan)
 
-        # Log successful plan creation
         track_event_if_configured(
             "PlanCreated",
             {
@@ -353,7 +322,7 @@ async def upload_team_config_endpoint(request: Request, file: UploadFile = File(
             "team_id": team_id,
             "name": team_config.name,
             "message": "Team configuration uploaded and saved successfully",
-            "team": team_config.model_dump(),  # Return the full team configuration
+            "team": team_config.model_dump()  # Return the full team configuration
         }
 
     except HTTPException:
@@ -654,28 +623,3 @@ 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)