getting the plan messages

Author: Fr4nc3

src/backend/app_kernel.py

@@ -519,12 +519,12 @@ async def approve_step_endpoint(
         return {"status": "All steps approved"}
 
 
-@app.get("/api/plans", response_model=List[PlanWithSteps])
+@app.get("/api/plans")
 async def get_plans(
     request: Request,
     session_id: Optional[str] = Query(None),
     plan_id: Optional[str] = Query(None),
-) -> List[PlanWithSteps]:
+):
     """
     Retrieve plans for the current user.
 
@@ -620,9 +620,12 @@ async def get_plans(
 
         # Use get_steps_by_plan to match the original implementation
         steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
+        messages = await memory_store.get_data_by_type_and_plan_id(
+            "agent_message", plan_id=plan.id
+        )
         plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
         plan_with_steps.update_step_counts()
-        return [plan_with_steps]
+        return [plan_with_steps, messages]
 
     all_plans = await memory_store.get_all_plans()
     # Fetch steps for all plans concurrently

src/frontend_react/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "frontend_react",
+  "name": "Multi Agent frontend",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

src/frontend_react/src/api/apiService.tsx

@@ -8,7 +8,8 @@ import {
     Plan,
     Step,
     StepStatus,
-    AgentType
+    AgentType,
+    PlanMessage
 } from '../models';
 
 // Constants for endpoints
@@ -137,27 +138,28 @@ export class APIService {
      * @param useCache Whether to use cached data or force fresh fetch
      * @returns Promise with the plan and its steps
      */
-    async getPlanById(planId: string, useCache = true): Promise<PlanWithSteps> {
+    async getPlanById(planId: string, useCache = true): Promise<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }> {
         const cacheKey = `plan_by_id_${planId}`;
         const params = { plan_id: planId };
 
         const fetcher = async () => {
             const data = await apiClient.get(API_ENDPOINTS.PLANS, { params });
 
             // The API returns an array, but with plan_id filter it should have only one item
-            if (!data || data.length === 0) {
+            if (!data) {
                 throw new Error(`Plan with ID ${planId} not found`);
             }
 
-            const plan = data[0];
+            const plan = data[0] as PlanWithSteps;
+            const messages = data[1] || [];
             if (useCache) {
-                this._cache.set(cacheKey, plan, 30000); // Cache for 30 seconds
+                this._cache.set(cacheKey, { plan_with_steps: plan, messages }, 30000); // Cache for 30 seconds
             }
-            return plan;
+            return { plan_with_steps: plan, messages };
         };
 
         if (useCache) {
-            const cachedPlan = this._cache.get<PlanWithSteps>(cacheKey);
+            const cachedPlan = this._cache.get<{ plan_with_steps: PlanWithSteps; messages: PlanMessage[] }>(cacheKey);
             if (cachedPlan) return cachedPlan;
 
             return this._requestTracker.trackRequest(cacheKey, fetcher);

src/frontend_react/src/models/plan.tsx

@@ -61,7 +61,22 @@ export interface Step extends BaseModel {
     /** Optional updated action */
     updated_action?: string;
 }
-
+export interface PlanMessage extends BaseModel {
+    /** The type of data model */
+    data_type: "agent_message";
+    /** Session identifier */
+    session_id: string;
+    /** User identifier */
+    user_id: string;
+    /** Plan identifier */
+    plan_id: string;
+    /** Message content */
+    content: string;
+    /** Source of the message */
+    source: string;
+    /** Step identifier */
+    step_id: string;
+}
 /**
  * Represents a plan that includes its associated steps.
  */
@@ -95,6 +110,7 @@ export interface ProcessedPlanData {
     agents: AgentType[];
     steps: Step[];
     hasHumanClarificationRequest: boolean;
+    messages: PlanMessage[];
 }
 
 export interface PlanChatProps {

src/frontend_react/src/services/PlanDataService.tsx

@@ -1,4 +1,4 @@
-import { PlanWithSteps, Step, AgentType, ProcessedPlanData } from '@/models';
+import { PlanWithSteps, Step, AgentType, ProcessedPlanData, PlanMessage } from '@/models';
 import { apiService } from '@/api';
 
 
@@ -13,8 +13,8 @@ export class PlanDataService {    /**
     static async fetchPlanData(planId: string): Promise<ProcessedPlanData> {
         try {
             // Use optimized getPlanById method for better performance
-            const plan = await apiService.getPlanById(planId);
-            return this.processPlanData(plan);
+            const planBody = await apiService.getPlanById(planId);
+            return this.processPlanData(planBody.plan_with_steps, planBody.messages || []);
         } catch (error) {
             console.error('Failed to fetch plan data:', error);
             throw error;
@@ -26,7 +26,7 @@ export class PlanDataService {    /**
      * @param plan PlanWithSteps object to process
      * @returns Processed plan data
      */
-    static processPlanData(plan: PlanWithSteps): ProcessedPlanData {
+    static processPlanData(plan: PlanWithSteps, messages: PlanMessage[]): ProcessedPlanData {
         // Extract unique agents from steps
         const uniqueAgents = new Set<AgentType>();
         plan.steps.forEach(step => {
@@ -49,7 +49,8 @@ export class PlanDataService {    /**
             plan,
             agents,
             steps,
-            hasHumanClarificationRequest
+            hasHumanClarificationRequest,
+            messages
         };
     }