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

feat: Macae v3 fr dev 92

Author: blessing-sanusi

src/backend/common/database/cosmosdb.py

@@ -30,6 +30,7 @@
     AgentMessage,
     TeamConfiguration,
     DataType,
+    UserCurrentTeam,
 )
 
 
@@ -42,6 +43,7 @@ class CosmosDBClient(DatabaseBase):
         "step": Step,
         "agent_message": AgentMessage,
         "team_config": TeamConfiguration,
+        "user_current_team": UserCurrentTeam,
     }
 
     def __init__(
@@ -431,3 +433,31 @@ async def update_team(self, team: TeamConfiguration) -> None:
             team: The TeamConfiguration to update
         """
         await self.update_item(team)
+
+    async def get_current_team(self, user_id: str, team_id: str) -> 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"
+        parameters = [
+            {"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)
+
+        return None
+    async def set_current_team(self, current_team: UserCurrentTeam) -> None:
+        """Set the current team for a user."""
+        await self._ensure_initialized()
+        await self.add_item(current_team)
+
+
+    async def update_current_team(self, current_team: UserCurrentTeam) -> None:
+        """Update the current team for a user."""
+        await self._ensure_initialized()
+        await self.update_item(current_team)

src/backend/common/database/database_base.py

@@ -9,6 +9,7 @@
     Plan,
     Step,
     TeamConfiguration,
+    UserCurrentTeam,
 )
 
 
@@ -80,6 +81,7 @@ async def add_plan(self, plan: Plan) -> None:
         """Add a plan to the database."""
         pass
 
+    
     @abstractmethod
     async def update_plan(self, plan: Plan) -> None:
         """Update a plan in the database."""
@@ -184,7 +186,21 @@ async def __aexit__(self, exc_type, exc, tb):
         """Async context manager exit."""
         await self.close()
 
-    # Convenience aliases
+    @abstractmethod
     async def get_steps_for_plan(self, plan_id: str) -> List[Step]:
         """Convenience method aliasing get_steps_by_plan for compatibility."""
         pass
+
+    @abstractmethod
+    async def get_current_team(self, user_id: str, team_id: str) -> UserCurrentTeam:
+        """Retrieve the current team for a user."""
+        pass
+
+    @abstractmethod
+    async def set_current_team(self, current_team: UserCurrentTeam) -> None:
+        pass
+
+    @abstractmethod
+    async def update_current_team(self, current_team: UserCurrentTeam) -> None:
+        """Update the current team for a user."""
+        pass    

src/backend/common/models/messages_kernel.py

@@ -188,7 +188,6 @@ class StartingTask(KernelBaseModel):
 class TeamSelectionRequest(KernelBaseModel):
     """Request model for team selection."""
     team_id: str
-    session_id: Optional[str] = None
 
 class TeamConfiguration(BaseDataModel):
     """Represents a team configuration stored in the database."""

src/backend/v3/api/router.py

@@ -10,7 +10,7 @@
 from common.database.database_factory import DatabaseFactory
 from common.models.messages_kernel import (GeneratePlanRequest, InputTask,
                                            Plan, PlanStatus,
-                                           TeamSelectionRequest)
+                                           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,
@@ -813,9 +813,21 @@ async def select_team_endpoint(selection: TeamSelectionRequest, request: Request
                 status_code=404, 
                 detail=f"Team configuration '{selection.team_id}' not found or access denied"
             )
-
-        # Generate session ID if not provided
-        session_id = selection.session_id or str(uuid.uuid4())
+        set_team = await team_service.handle_team_selection(user_id=user_id, team_id=selection.team_id)
+        if not set_team:
+            track_event_if_configured(
+            "Team selected",
+            {
+                "status": "failed",
+                "team_id": selection.team_id,
+                "team_name": team_configuration.name,
+                "user_id": user_id
+            },
+        )
+            raise HTTPException(
+                status_code=404,
+                detail=f"Team configuration '{selection.team_id}' failed to set"
+            )
 
         # save to in-memory config for current user
         team_config.set_current_team(user_id=user_id, team_configuration=team_configuration)
@@ -827,8 +839,7 @@ async def select_team_endpoint(selection: TeamSelectionRequest, request: Request
                 "status": "success",
                 "team_id": selection.team_id,
                 "team_name": team_configuration.name,
-                "user_id": user_id,
-                "session_id": session_id,
+                "user_id": user_id
             },
         )
 
@@ -837,7 +848,6 @@ async def select_team_endpoint(selection: TeamSelectionRequest, request: Request
             "message": f"Team '{team_configuration.name}' selected successfully",
             "team_id": selection.team_id,
             "team_name": team_configuration.name,
-            "session_id": session_id,
             "agents_count": len(team_configuration.agents),
             "team_description": team_configuration.description,
         }

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

@@ -5,15 +5,21 @@
 from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional, Tuple
 
-from azure.core.credentials import AzureKeyCredential
-from azure.core.exceptions import (ClientAuthenticationError,
-                                   HttpResponseError, ResourceNotFoundError)
-from azure.identity import DefaultAzureCredential
+from azure.core.exceptions import (
+    ClientAuthenticationError,
+    HttpResponseError,
+    ResourceNotFoundError,
+)
+
 from azure.search.documents.indexes import SearchIndexClient
 from common.config.app_config import config
 from common.database.database_base import DatabaseBase
-from common.models.messages_kernel import (StartingTask, TeamAgent,
-                                           TeamConfiguration)
+from common.models.messages_kernel import (
+    StartingTask,
+    TeamAgent,
+    TeamConfiguration,
+    UserCurrentTeam,
+)
 from v3.common.services.foundry_service import FoundryService
 
 
@@ -218,6 +224,52 @@ async def get_team_configuration(
             self.logger.error("Error retrieving team configuration: %s", str(e))
             return None
 
+    async def delete_user_current_team(self, user_id: str) -> bool:
+        """
+        Delete the current team for a user.
+
+        Args:
+            user_id: User ID to delete the current team for
+
+        Returns:
+            True if successful, False otherwise
+        """
+        try:
+            await self.memory_context.delete_user_current_team(user_id)
+            self.logger.info("Successfully deleted current team for user %s", user_id)
+            return True
+
+        except Exception as e:
+            self.logger.error("Error deleting current team: %s", str(e))
+            return False
+
+    async def handle_team_selection(self, user_id: str, team_id: str) -> bool:
+        """
+        Set a default team for a user.
+
+        Args:
+            user_id: User ID to set the default team for
+            team_id: Team ID to set as default
+
+        Returns:
+            True if successful, False otherwise
+        """
+        try:
+            current_team = await self.memory_context.get_current_team(user_id, team_id)
+
+            if current_team is None:
+                current_team = UserCurrentTeam(user_id=user_id, team_id=team_id)
+                await self.memory_context.set_current_team(current_team)
+                return True
+            else:
+                current_team.team_id = team_id
+                await self.memory_context.update_current_team(current_team)
+                return True
+
+        except Exception as e:
+            self.logger.error("Error setting default team: %s", str(e))
+            return False
+
     async def get_all_team_configurations(
         self, user_id: str
     ) -> List[TeamConfiguration]:
@@ -345,7 +397,7 @@ async def validate_team_models(
             missing_models: List[str] = []
             for model in required_models:
                 # Temporary bypass for known deployed models
-                if model.lower() in ['gpt-4o', 'o3', 'gpt-4', 'gpt-35-turbo']:
+                if model.lower() in ["gpt-4o", "o3", "gpt-4", "gpt-35-turbo"]:
                     continue
                 if model not in available_models:
                     missing_models.append(model)