Add team_id to Plan model and enforce in API

Added the team_id field to the Plan data model and updated the create_plan endpoint to require team_id, returning an error if missing. Also updated CosmosDB queries to include user_id and serialize datetime fields. Removed the /generate_plan endpoint from the router.

Author: Fr4nc3

src/backend/common/database/cosmosdb.py

@@ -3,7 +3,8 @@
 import json
 import logging
 import uuid
-from datetime import datetime, timezone
+
+import datetime
 from typing import Any, Dict, List, Optional, Type
 
 from azure.cosmos import PartitionKey, exceptions
@@ -111,7 +112,10 @@ async def add_item(self, item: BaseDataModel) -> None:
         try:
             # Convert to dictionary and handle datetime serialization
             document = item.model_dump()
-            document = json.loads(json.dumps(document, cls=DateTimeEncoder))
+
+            for key, value in list(document.items()):
+                if isinstance(value, datetime.datetime):
+                    document[key] = value.isoformat()
 
             await self.container.create_item(body=document)
         except Exception as e:
@@ -160,6 +164,7 @@ async def query_items(
             items = self.container.query_items(query=query, parameters=parameters)
             result_list = []
             async for item in items:
+                item["ts"] = item["_ts"]
                 try:
                     result_list.append(model_class.model_validate(item))
                 except Exception as validation_error:
@@ -233,6 +238,7 @@ async def get_plan_by_plan_id(self, plan_id: str) -> Optional[Plan]:
         parameters = [
             {"name": "@plan_id", "value": plan_id},
             {"name": "@data_type", "value": "plan"},
+            {"name": "@user_id", "value": self.user_id},
         ]
         results = await self.query_items(query, parameters, Plan)
         return results[0] if results else None

src/backend/common/models/messages_kernel.py

@@ -103,6 +103,7 @@ class Plan(BaseDataModel):
     """Represents a plan containing multiple steps."""
 
     data_type: Literal["plan"] = Field("plan", Literal=True)
+    team_id: str
     session_id: str
     user_id: str
     initial_goal: str

src/backend/v3/api/router.py

@@ -113,6 +113,12 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
         )
         raise HTTPException(status_code=400, detail="no user")
 
+    if not input_task.team_id:
+        track_event_if_configured(
+            "TeamIDNofound", {"status_code": 400, "detail": "no team id"}
+        )
+        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())
@@ -124,6 +130,7 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
         # Create a new Plan object
         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,
@@ -162,162 +169,6 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
         raise HTTPException(status_code=400, detail=f"Error creating plan: {e}") from e
 
 
-@app_v3.post("/generate_plan")
-async def generate_plan_endpoint(
-    generate_plan_request: GeneratePlanRequest, request: Request
-):
-    """
-    Generate plan steps for an existing plan using the planner agent.
-
-    ---
-    tags:
-      - Plans
-    parameters:
-      - name: user_principal_id
-        in: header
-        type: string
-        required: true
-        description: User ID extracted from the authentication header
-      - name: body
-        in: body
-        required: true
-        schema:
-          type: object
-          properties:
-            plan_id:
-              type: string
-              description: The ID of the existing plan to generate steps for
-    responses:
-      200:
-        description: Plan generation completed successfully
-        schema:
-          type: object
-          properties:
-            status:
-              type: string
-              description: Success message
-            plan_id:
-              type: string
-              description: The ID of the plan that was generated
-            steps_created:
-              type: integer
-              description: Number of steps created
-      400:
-        description: Invalid request or processing error
-        schema:
-          type: object
-          properties:
-            detail:
-              type: string
-              description: Error message
-      404:
-        description: Plan not found
-        schema:
-          type: object
-          properties:
-            detail:
-              type: string
-              description: Error message
-    """
-    # Get authenticated user
-    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")
-
-    try:
-        # Initialize memory store
-        memory_store = await DatabaseFactory.get_database(user_id=user_id)
-
-        # Get the existing plan
-        plan = await memory_store.get_plan_by_plan_id(
-            plan_id=generate_plan_request.plan_id
-        )
-        if not plan:
-            track_event_if_configured(
-                "GeneratePlanNotFound",
-                {
-                    "status_code": 404,
-                    "detail": "Plan not found",
-                    "plan_id": generate_plan_request.plan_id,
-                },
-            )
-            raise HTTPException(status_code=404, detail="Plan not found")
-
-        # Create the agents for this session
-        client = None
-        try:
-            client = config.get_ai_project_client()
-        except Exception as client_exc:
-            logging.error(f"Error creating AIProjectClient: {client_exc}")
-
-        agents = await AgentFactory.create_all_agents(
-            session_id=plan.session_id,
-            user_id=user_id,
-            memory_store=memory_store,
-            client=client,
-        )
-
-        # Get the group chat manager to process the plan
-        group_chat_manager = agents[AgentType.GROUP_CHAT_MANAGER.value]
-
-        # Create an InputTask from the plan's initial goal
-        input_task = InputTask(
-            session_id=plan.session_id, description=plan.initial_goal
-        )
-
-        # Use the group chat manager to generate the plan steps
-        await group_chat_manager.handle_input_task(input_task)
-
-        # Get the updated plan with steps
-        updated_plan = await memory_store.get_plan_by_plan_id(
-            plan_id=generate_plan_request.plan_id
-        )
-        steps = await memory_store.get_steps_by_plan(
-            plan_id=generate_plan_request.plan_id
-        )
-
-        # Log successful plan generation
-        track_event_if_configured(
-            "PlanGenerated",
-            {
-                "status": f"Plan generation completed for plan ID: {generate_plan_request.plan_id}",
-                "plan_id": generate_plan_request.plan_id,
-                "session_id": plan.session_id,
-                "steps_created": len(steps),
-            },
-        )
-
-        if client:
-            try:
-                client.close()
-            except Exception as e:
-                logging.error(f"Error closing AIProjectClient: {e}")
-
-        return {
-            "status": "Plan generation completed successfully",
-            "plan_id": generate_plan_request.plan_id,
-            "steps_created": len(steps),
-        }
-
-    except HTTPException:
-        # Re-raise HTTP exceptions
-        raise
-    except Exception as e:
-        track_event_if_configured(
-            "GeneratePlanError",
-            {
-                "plan_id": generate_plan_request.plan_id,
-                "error": str(e),
-            },
-        )
-        raise HTTPException(status_code=400, detail=f"Error generating plan: {e}")
-
-
 @app_v3.post("/upload_team_config")
 async def upload_team_config_endpoint(request: Request, file: UploadFile = File(...)):
     """