end of day commit

Author: marktayl1

data/agent_teams/hr.json

@@ -1,7 +1,7 @@
 {
   "id": "3",
   "team_id": "team-3",
-  "name": "Retail Customer Success Team",
+  "name": "Human Resources Team",
   "status": "visible",
   "created": "",
   "created_by": "",

data/agent_teams/new 29.txt

@@ -0,0 +1,48 @@
+Tasks:
+
+Done: Make 3 teams upload work to cosmos (HR, Marketing, Retail).  We will load this Cosmos data on deploy as default teams.
+Done: - call "/socket/{process_id}" (start_comms) to setup websocket
+Done: Make sure that a team is always selected - start with the hr.json team
+
+call init_team API for the currently loaded team on App start - 
+Spinner / team-loading should display until this call returns (user should not be able to input tasks)
+<takes about 20 seconds> - say something like "team loading" with spinner
+FE: send unload current team API and call init team for team switch - sending select_team(new team id)
+	spin while waiting for return of API
+BE: unload old team - load new team - return status
+
+BE: For Francia - implement get_plans to fill in history from cosmos
+
+BE: Create a teams container in Cosmos and move all loaded team definitions there
+
+Implement saving of plan to cosmos -> history in...
+
+================ Request submit flow ======================
+on request submission call "/create_plan" (process_request)
+This will return immediately - move to other page and display spinner -> "creating plan"
+Socket will start receiving messages ->
+Stream plan output into main window
+
+Will receive the PlanApprovalRequest message
+	Enable accept / reject UI
+Send PlanApprovalResponse message when user answers
+
+If not approved 
+	BE: plan will cancel on backend 
+	FE: - enable input again for fresh request
+	Call input_request API on backend again (just like inputing any request)
+
+If approved:
+	Display plan steps in right pane if approved
+=============================================================
+
+================== Message Streaming ========================	
+Process socket message routing to display agent output
+	See message types in src\backend\v3\models\messages.py
+	for each message from agent - process stream then rollup
+
+On FinalResultMessage
+	display final result with all agent output in rollups by agent above
+==============================================================
+
+

src/backend/app_kernel.py

@@ -102,27 +102,27 @@
 #     connection_config.add_connection(process_id=process_id, connection=websocket)
 
 @app.websocket("/socket/{process_id}")
-async def process_outputs(websocket: WebSocket, process_id: str):
+async def start_comms(websocket: WebSocket, process_id: str):
     """ Web-Socket endpoint for real-time process status updates. """
 
     # Always accept the WebSocket connection first
     await websocket.accept()
 
-    # user_id = None
-    # try:
-    #     # WebSocket headers are different, try to get user info
-    #     headers = dict(websocket.headers)
-    #     authenticated_user = get_authenticated_user_details(request_headers=headers)
-    #     user_id = authenticated_user.get("user_principal_id")
-    #     if not user_id:
-    #         user_id = f"anonymous_{process_id}"
-    # except Exception as e:
-    #     logging.warning(f"Could not extract user from WebSocket headers: {e}")
-        # user_id = f"anonymous_{user_id}"
+    user_id = None
+    try:
+        # WebSocket headers are different, try to get user info
+        headers = dict(websocket.headers)
+        authenticated_user = get_authenticated_user_details(request_headers=headers)
+        user_id = authenticated_user.get("user_principal_id")
+        if not user_id:
+            user_id = f"anonymous_{process_id}"
+    except Exception as e:
+        logging.warning(f"Could not extract user from WebSocket headers: {e}")
+        user_id = f"anonymous_{user_id}"
 
     # Add to the connection manager for backend updates
 
-    connection_config.add_connection(process_id, websocket)
+    connection_config.add_connection(user_id, websocket)
     track_event_if_configured("WebSocketConnectionAccepted", {"process_id": "user_id"})
 
       # Keep the connection open - FastAPI will close the connection if this returns
@@ -135,8 +135,8 @@ async def process_outputs(websocket: WebSocket, process_id: str):
             pass
 
         except WebSocketDisconnect:
-            track_event_if_configured("WebSocketDisconnect", {"process_id": user_id})
-            logging.info(f"Client disconnected from batch {user_id}")
+            track_event_if_configured("WebSocketDisconnect", {"process_id": process_id})
+            logging.info(f"Client disconnected from batch {process_id}")
             await connection_config.close_connection(user_id)
         except Exception as e:
             logging.error("Error in WebSocket connection", error=str(e))
@@ -726,10 +726,7 @@ async def get_plans(
 
     await connection_config.send_status_update_async("Test message from get_plans", user_id)
 
-    # Initialize agent team for this user session
-    #await OrchestrationManager.get_current_orchestration(user_id=user_id)
-
-    # Replace the following with code to get plan run history from the database
+    #### <To do: Francia> Replace the following with code to get plan run history from the database
 
     # # Initialize memory context
     # memory_store = await DatabaseFactory.get_database(user_id=user_id)
@@ -786,7 +783,21 @@ async def get_plans(
 
     return []
 
-
+@app.get("/api/init_team")
+async def init_team(
+    request: Request,
+):
+    """ Initialize the team of agents """
+    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 OrchestrationManager.get_current_orchestration(user_id=user_id)
+    
 @app.get("/api/steps/{plan_id}", response_model=List[Step])
 async def get_steps_by_plan(plan_id: str, request: Request) -> List[Step]:
     """

src/backend/v3/api/router.py

@@ -86,7 +86,7 @@ async def process_request(background_tasks: BackgroundTasks, input_task: InputTa
               type: string
               description: Error message
     """
-    await connection_config.send_status_update_async(message="sending test from the server", process_id='12345')
+
 
     # if not await rai_success(input_task.description, False):
     #     track_event_if_configured(
@@ -133,6 +133,7 @@ async def process_request(background_tasks: BackgroundTasks, input_task: InputTa
 
     try:
         #background_tasks.add_task(OrchestrationManager.run_orchestration, user_id, input_task)
+        await connection_config.send_status_update_async("Test message from process_request", user_id)
 
         return {
             "status": "Request started successfully",

src/backend/v3/models/messages.py

@@ -0,0 +1,65 @@
+"""Messages from the backend to the frontend via WebSocket."""
+
+from dataclasses import dataclass
+
+from models import MPlan, PlanStatus
+
+
+@dataclass(slots=True)
+class AgentMessage:
+    """Message from the backend to the frontend via WebSocket."""
+    agent_name: str
+    timestamp: str
+    content: str
+
+@dataclass(slots=True)
+class AgentMessageStreaming:
+    """Streaming message from the backend to the frontend via WebSocket."""
+    agent_name: str
+    content: str
+    is_final: bool = False
+
+@dataclass(slots=True)
+class PlanApprovalRequest:
+    """Request for plan approval from the frontend."""
+    plan: MPlan
+    status: PlanStatus
+
+    context: dict | None = None
+
+@dataclass(slots=True)
+class PlanApprovalResponse:
+    """Response for plan approval from the frontend."""
+    approved: bool
+    feedback: str | None = None
+
+@dataclass(slots=True)
+class ReplanApprovalRequest:
+    """Request for replan approval from the frontend."""
+    reason: str
+    context: dict | None = None
+
+@dataclass(slots=True)
+class ReplanApprovalResponse:   
+    """Response for replan approval from the frontend."""
+    approved: bool
+    feedback: str | None = None
+
+@dataclass(slots=True)
+class UserClarificationRequest:
+    """Request for user clarification from the frontend."""
+    question: str
+    context: dict | None = None
+
+@dataclass(slots=True)
+class UserClarificationResponse:
+    """Response for user clarification from the frontend."""
+    def __init__(self, answer: str):
+        self.answer = answer
+
+@dataclass(slots=True)
+class FinalResultMessage:
+    """Final result message from the backend to the frontend."""
+    result: str
+    summary: str | None = None
+    context: dict | None = None

src/frontend/src/services/WebSocketService.tsx

@@ -37,7 +37,7 @@ class WebSocketService {
                 // Get WebSocket URL from environment or default to localhost
                 const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
                 const wsHost = process.env.REACT_APP_WS_HOST || '127.0.0.1:8000';
-                const processId = '12345'; // Replace with actual process ID as needed'
+                const processId = crypto.randomUUID(); // Replace with actual process ID as needed'
                 const wsUrl = `${wsProtocol}//${wsHost}/socket/${processId}`;
 
                 console.log('Connecting to WebSocket:', wsUrl);