Merge pull request #435 from microsoft/macae-v3-fr-dev-92

feat: Macae v3 fr dev 92

Author: Fr4nc3

src/backend/app_kernel.py

@@ -28,6 +28,7 @@
 from kernel_agents.agent_factory import AgentFactory
 # Local imports
 from middleware.health_check import HealthCheckMiddleware
+from common.utils.utils_date import format_dates_in_messages
 from v3.api.router import app_v3
 
 # Semantic Kernel imports
@@ -671,57 +672,57 @@ async def get_plans(
     #### <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)
-    # if session_id:
-    #     plan = await memory_store.get_plan_by_session(session_id=session_id)
-    #     if not plan:
-    #         track_event_if_configured(
-    #             "GetPlanBySessionNotFound",
-    #             {"status_code": 400, "detail": "Plan not found"},
-    #         )
-    #         raise HTTPException(status_code=404, detail="Plan not found")
-
-    #     # Use get_steps_by_plan to match the original implementation
-    #     steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
-    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-    #     plan_with_steps.update_step_counts()
-    #     return [plan_with_steps]
-    # if plan_id:
-    #     plan = await memory_store.get_plan_by_plan_id(plan_id=plan_id)
-    #     if not plan:
-    #         track_event_if_configured(
-    #             "GetPlanBySessionNotFound",
-    #             {"status_code": 400, "detail": "Plan not found"},
-    #         )
-    #         raise HTTPException(status_code=404, detail="Plan not found")
-
-    #     # 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_session_id(
-    #         "agent_message", session_id=plan.session_id
-    #     )
-
-    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-    #     plan_with_steps.update_step_counts()
-
-    #     # Format dates in messages according to locale
-    #     formatted_messages = format_dates_in_messages(
-    #         messages, config.get_user_local_browser_language()
-    #     )
-
-    #     return [plan_with_steps, formatted_messages]
-
-    # all_plans = await memory_store.get_all_plans()
-    # # Fetch steps for all plans concurrently
-    # steps_for_all_plans = await asyncio.gather(
-    #     *[memory_store.get_steps_by_plan(plan_id=plan.id) for plan in all_plans]
-    # )
-    # # Create list of PlanWithSteps and update step counts
-    # list_of_plans_with_steps = []
-    # for plan, steps in zip(all_plans, steps_for_all_plans):
-    #     plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-    #     plan_with_steps.update_step_counts()
-    #     list_of_plans_with_steps.append(plan_with_steps)
+    memory_store = await DatabaseFactory.get_database(user_id=user_id)
+    if session_id:
+        plan = await memory_store.get_plan_by_session(session_id=session_id)
+        if not plan:
+            track_event_if_configured(
+                "GetPlanBySessionNotFound",
+                {"status_code": 400, "detail": "Plan not found"},
+            )
+            raise HTTPException(status_code=404, detail="Plan not found")
+
+        # Use get_steps_by_plan to match the original implementation
+        steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
+        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+        plan_with_steps.update_step_counts()
+        return [plan_with_steps]
+    if plan_id:
+        plan = await memory_store.get_plan_by_plan_id(plan_id=plan_id)
+        if not plan:
+            track_event_if_configured(
+                "GetPlanBySessionNotFound",
+                {"status_code": 400, "detail": "Plan not found"},
+            )
+            raise HTTPException(status_code=404, detail="Plan not found")
+
+        # 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_session_id(
+            "agent_message", session_id=plan.session_id
+        )
+
+        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+        plan_with_steps.update_step_counts()
+
+        # Format dates in messages according to locale
+        formatted_messages = format_dates_in_messages(
+            messages, config.get_user_local_browser_language()
+        )
+
+        return [plan_with_steps, formatted_messages]
+
+    all_plans = await memory_store.get_all_plans()
+    # Fetch steps for all plans concurrently
+    steps_for_all_plans = await asyncio.gather(
+        *[memory_store.get_steps_by_plan(plan_id=plan.id) for plan in all_plans]
+    )
+    # Create list of PlanWithSteps and update step counts
+    list_of_plans_with_steps = []
+    for plan, steps in zip(all_plans, steps_for_all_plans):
+        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
+        plan_with_steps.update_step_counts()
+        list_of_plans_with_steps.append(plan_with_steps)
 
     return []
 

src/frontend/src/api/config.tsx

@@ -97,7 +97,7 @@ export function getUserInfoGlobal() {
     }
 
     if (!USER_INFO) {
-        console.info('User info not yet configured');
+        // console.info('User info not yet configured');
         return null;
     }
 
@@ -149,7 +149,7 @@ export function headerBuilder(headers?: Record<string, string>): Record<string,
 //     });
 
 //     console.log('initializeTeam: Starting team initialization...');
-    
+
 //     try {
 //         const response = await fetch(`${apiUrl}/init_team`, {
 //             method: 'GET',
@@ -163,12 +163,12 @@ export function headerBuilder(headers?: Record<string, string>): Record<string,
 
 //         const data = await response.json();
 //         console.log('initializeTeam: Team initialization completed:', data);
-        
+
 //         // Validate the expected response format
 //         if (data.status !== 'Request started successfully' || !data.team_id) {
 //             throw new Error('Invalid response format from init_team endpoint');
 //         }
-        
+
 //         return data;
 //     } catch (error) {
 //         console.error('initializeTeam: Error initializing team:', error);