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

feat: Macae v3 fr dev 92

Author: Fr4nc3

src/backend/app_kernel.py

@@ -598,9 +598,7 @@ async def approve_step_endpoint(
 @app.get("/api/plans")
 async def get_plans(
     request: Request,
-    session_id: Optional[str] = Query(None),
     plan_id: Optional[str] = Query(None),
-    team_id: Optional[str] = Query(None),
 ):
     """
     Retrieve plans for the current user.
@@ -673,20 +671,7 @@ async def get_plans(
 
     # # 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:
@@ -712,7 +697,11 @@ async def get_plans(
 
         return [plan_with_steps, formatted_messages]
 
-    all_plans = await memory_store.get_all_plans()
+    current_team = await memory_store.get_current_team(user_id=user_id)
+    if not current_team:
+      return []
+    
+    all_plans = await memory_store.get_all_plans_by_team_id(team_id=current_team.id)
     # 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]

src/backend/common/database/cosmosdb.py

@@ -259,6 +259,16 @@ async def get_all_plans(self) -> List[Plan]:
         ]
         return await self.query_items(query, parameters, Plan)
 
+    async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type and c.user_id=@user_id"
+        parameters = [
+            {"name": "@user_id", "value": self.user_id},
+            {"name": "@team_id", "value": team_id},
+            {"name": "@data_type", "value": "plan"},
+        ]
+        return await self.query_items(query, parameters, Plan)
+
     # Step Operations
     async def add_step(self, step: Step) -> None:
         """Add a step to CosmosDB."""
@@ -434,23 +444,22 @@ async def update_team(self, team: TeamConfiguration) -> None:
         """
         await self.update_item(team)
 
-    async def get_current_team(self, user_id: str, team_id: str) -> UserCurrentTeam:
+    async def get_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
         await self._ensure_initialized()
         if self.container is None:
             return None
 
-        query = "SELECT * FROM c WHERE c.user_id=@user_id AND c.is_default=true"
+        query = "SELECT * FROM c WHERE c.data_type=@data_type AND c.user_id=@user_id"
         parameters = [
+            {"name": "@data_type", "value": "user_current_team"},
             {"name": "@user_id", "value": user_id},
-            {"name": "@team_id", "value": team_id},
         ]
 
-        items = self.container.query_items(query=query, parameters=parameters)
-        async for item in items:
-            return UserCurrentTeam(**item)
+        # Get the appropriate model class
+        teams = await self.query_items(query, parameters, UserCurrentTeam)
+        return teams[0] if teams else None
 
-        return None
     async def set_current_team(self, current_team: UserCurrentTeam) -> None:
         """Set the current team for a user."""
         await self._ensure_initialized()

src/backend/common/database/database_base.py

@@ -106,7 +106,10 @@ async def get_plan(self, plan_id: str) -> Optional[Plan]:
     async def get_all_plans(self) -> List[Plan]:
         """Retrieve all plans for the user."""
         pass
-
+    @abstractmethod
+    async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        pass
     @abstractmethod
     async def get_data_by_type_and_session_id(
         self, data_type: str, session_id: str
@@ -192,7 +195,7 @@ async def get_steps_for_plan(self, plan_id: str) -> List[Step]:
         pass
 
     @abstractmethod
-    async def get_current_team(self, user_id: str, team_id: str) -> UserCurrentTeam:
+    async def get_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
         pass
 

src/backend/v3/api/router.py

@@ -13,7 +13,7 @@
                                            TeamSelectionRequest, UserCurrentTeam)
 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, BackgroundTasks, Depends, FastAPI, File,
+from fastapi import (APIRouter, BackgroundTasks, Depends, FastAPI, File, Query,
                      HTTPException, Request, UploadFile, WebSocket,
                      WebSocketDisconnect)
 from kernel_agents.agent_factory import AgentFactory
@@ -103,7 +103,11 @@ async def init_team(
       # Initialize memory store and service
       memory_store = await DatabaseFactory.get_database(user_id=user_id)
       team_service = TeamService(memory_store)
-
+      user_current_team = await memory_store.get_current_team(user_id=user_id)
+      if not user_current_team:
+          await team_service.handle_team_selection(user_id=user_id, team_id=init_team_id)
+      else:
+          init_team_id = user_current_team.team_id
       # Verify the team exists and user has access to it
       team_configuration = await team_service.get_team_configuration(init_team_id, user_id)
       if team_configuration is None:
@@ -120,7 +124,8 @@ async def init_team(
 
       return {
           "status": "Request started successfully",
-          "team_id": init_team_id
+          "team_id": init_team_id,
+          "team": team_configuration
       }
 
     except Exception as e:
@@ -184,30 +189,30 @@ async def process_request(background_tasks: BackgroundTasks, input_task: InputTa
     """
 
 
-    # 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",
-    #         },
-    #     )
+    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"]
@@ -309,10 +314,14 @@ async def plan_approval(human_feedback: messages.PlanApprovalResponse, request:
     if user_id and human_feedback.plan_dot_id:
         if orchestration_config and human_feedback.plan_dot_id in orchestration_config.approvals:
             orchestration_config.approvals[human_feedback.plan_dot_id] = human_feedback.approved
+            orchestration_config.plans[human_feedback.plan_dot_id]["plan_id"] = human_feedback.plan_id
+            print("Plan approval received:", human_feedback)
+            print("Updated orchestration config:", orchestration_config.plans[human_feedback.plan_dot_id])
             track_event_if_configured(
                 "PlanApprovalReceived",
                 {
-                    "plan_id": human_feedback.plan_dot_id,
+                    "plan_id": human_feedback.plan_id,
+                    "plan_dot_id": human_feedback.plan_dot_id,
                     "approved": human_feedback.approved,
                     "user_id": user_id,
                     "feedback": human_feedback.feedback
@@ -351,7 +360,7 @@ async def user_clarification(human_feedback: messages.UserClarificationResponse,
 
 
 @app_v3.post("/upload_team_config")
-async def upload_team_config_endpoint(request: Request, file: UploadFile = File(...)):
+async def upload_team_config(request: Request, file: UploadFile = File(...),     team_id: Optional[str] = Query(None),):
     """
     Upload and save a team configuration JSON file.
 
@@ -487,6 +496,10 @@ async def upload_team_config_endpoint(request: Request, file: UploadFile = File(
 
         # Save the configuration
         try:
+            print("Saving team configuration...", team_id)
+            if team_id:
+                team_config.team_id = team_id
+                team_config.id = team_id  # Ensure id is also set for updates
             team_id = await team_service.save_team_configuration(team_config)
         except ValueError as e:
             raise HTTPException(
@@ -521,7 +534,7 @@ async def upload_team_config_endpoint(request: Request, file: UploadFile = File(
 
 
 @app_v3.get("/team_configs")
-async def get_team_configs_endpoint(request: Request):
+async def get_team_configs(request: Request):
     """
     Retrieve all team configurations for the current user.
 
@@ -594,7 +607,7 @@ async def get_team_configs_endpoint(request: Request):
 
 
 @app_v3.get("/team_configs/{team_id}")
-async def get_team_config_by_id_endpoint(team_id: str, request: Request):
+async def get_team_config_by_id(team_id: str, request: Request):
     """
     Retrieve a specific team configuration by ID.
 
@@ -676,7 +689,7 @@ async def get_team_config_by_id_endpoint(team_id: str, request: Request):
 
 
 @app_v3.delete("/team_configs/{team_id}")
-async def delete_team_config_endpoint(team_id: str, request: Request):
+async def delete_team_config(team_id: str, request: Request):
     """
     Delete a team configuration by ID.
 
@@ -754,7 +767,7 @@ async def delete_team_config_endpoint(team_id: str, request: Request):
 
 
 @app_v3.get("/model_deployments")
-async def get_model_deployments_endpoint(request: Request):
+async def get_model_deployments(request: Request):
     """
     Get information about available model deployments for debugging/validation.
 
@@ -786,7 +799,7 @@ async def get_model_deployments_endpoint(request: Request):
 
 
 @app_v3.post("/select_team")
-async def select_team_endpoint(selection: TeamSelectionRequest, request: Request):
+async def select_team(selection: TeamSelectionRequest, request: Request):
     """
     Select the current team for the user session.
     """
@@ -870,7 +883,7 @@ async def select_team_endpoint(selection: TeamSelectionRequest, request: Request
 
 
 @app_v3.get("/search_indexes")
-async def get_search_indexes_endpoint(request: Request):
+async def get_search_indexes(request: Request):
     """
     Get information about available search indexes for debugging/validation.
 

src/backend/v3/common/services/team_service.py

@@ -255,7 +255,7 @@ async def handle_team_selection(self, user_id: str, team_id: str) -> bool:
             True if successful, False otherwise
         """
         try:
-            current_team = await self.memory_context.get_current_team(user_id, team_id)
+            current_team = await self.memory_context.get_current_team(user_id)
 
             if current_team is None:
                 current_team = UserCurrentTeam(user_id=user_id, team_id=team_id)

src/backend/v3/models/messages.py

@@ -52,6 +52,7 @@ class PlanApprovalResponse:
     plan_dot_id: str
     approved: bool
     feedback: str | None = None
+    plan_id: str | None = None
 
 @dataclass(slots=True)
 class ReplanApprovalRequest: