Updated team config with isdefault and logic to display teams is updated

Author: Roopan-Microsoft

data/agent_teams/contract_compliance_team.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "description": "A multi-agent compliance review team that summarizes NDAs, identifies risks, checks compliance, and recommends improvements using advanced legal reasoning and retrieval-augmented analysis.",
   "logo": "",
   "plan": "",

data/agent_teams/hr.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "agents": [
     {
       "input_key": "",

data/agent_teams/marketing.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "agents": [
     {
       "input_key": "",

data/agent_teams/retail.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "agents": [
     {
       "input_key": "",

data/agent_teams/rfp_analysis_team.json

@@ -6,6 +6,7 @@
   "created": "",
   "created_by": "",
   "deployment_name": "gpt-5.4-mini",
+  "is_default": true,
   "description": "A specialized multi-agent team that analyzes RFP and contract documents to summarize content, identify potential risks, check compliance gaps, and provide action plans for contract improvement.",
   "logo": "",
   "plan": "",

src/backend/common/database/cosmosdb.py

@@ -273,10 +273,11 @@ async def get_team(self, team_id: str) -> Optional[TeamConfiguration]:
         Returns:
             TeamConfiguration object or None if not found
         """
-        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type"
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type AND (c.user_id=@user_id OR c.is_default=true)"
         parameters = [
             {"name": "@team_id", "value": team_id},
             {"name": "@data_type", "value": DataType.team_config},
+            {"name": "@user_id", "value": self.user_id},
         ]
         teams = await self.query_items(query, parameters, TeamConfiguration)
         return teams[0] if teams else None
@@ -290,33 +291,34 @@ async def get_team_by_id(self, team_id: str) -> Optional[TeamConfiguration]:
         Returns:
             TeamConfiguration object or None if not found
         """
-        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type"
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type AND (c.user_id=@user_id OR c.is_default=true)"
         parameters = [
             {"name": "@team_id", "value": team_id},
             {"name": "@data_type", "value": DataType.team_config},
+            {"name": "@user_id", "value": self.user_id},
         ]
         teams = await self.query_items(query, parameters, TeamConfiguration)
         return teams[0] if teams else None
 
     async def get_all_teams(self) -> List[TeamConfiguration]:
-        """Retrieve all team configurations for a specific user.
-
-        Args:
-            user_id: The user_id to get team configurations for
+        """Retrieve all team configurations visible to the current user.
 
         Returns:
-            List of TeamConfiguration objects
+            List of TeamConfiguration objects: default teams plus user-specific teams
         """
-        query = "SELECT * FROM c WHERE c.data_type=@data_type ORDER BY c.created DESC"
+        query = "SELECT * FROM c WHERE c.data_type=@data_type AND (c.user_id=@user_id OR c.is_default=true) ORDER BY c.created DESC"
         parameters = [
             {"name": "@data_type", "value": DataType.team_config},
+            {"name": "@user_id", "value": self.user_id},
         ]
         teams = await self.query_items(query, parameters, TeamConfiguration)
         return teams
 
     async def delete_team(self, team_id: str) -> bool:
         """Delete a team configuration by team_id.
 
+        Only user-owned teams can be deleted; default teams cannot be deleted.
+
         Args:
             team_id: The team_id of the team configuration to delete
 
@@ -328,9 +330,12 @@ async def delete_team(self, team_id: str) -> bool:
         try:
             # First find the team to get its document id and partition key
             team = await self.get_team(team_id)
-            print(team)
-            if team:
-                await self.delete_item(item_id=team.id, partition_key=team.session_id)
+            if not team:
+                return False
+            # Prevent deletion of default teams
+            if team.is_default:
+                return False
+            await self.delete_item(item_id=team.id, partition_key=team.session_id)
             return True
         except Exception as e:
             logging.exception(f"Failed to delete team from Cosmos DB: {e}")

src/backend/common/database/database_factory.py

@@ -10,9 +10,16 @@
 
 
 class DatabaseFactory:
-    """Factory class for creating database instances."""
+    """Factory class for creating database instances.
 
-    _instance: Optional[DatabaseBase] = None
+    Caches the expensive CosmosDB connection infrastructure (client, database,
+    container) while creating per-request CosmosDBClient instances scoped to
+    the calling user_id.  This ensures ownership filters in queries always
+    reference the correct user without race conditions across concurrent
+    asyncio tasks.
+    """
+
+    _shared_instance: Optional[CosmosDBClient] = None
     _logger = logging.getLogger(__name__)
 
     @staticmethod
@@ -21,44 +28,55 @@ async def get_database(
         force_new: bool = False,
     ) -> DatabaseBase:
         """
-        Get a database instance.
+        Get a database instance scoped to the given user_id.
+
+        The underlying CosmosDB connection (client, database, container) is
+        shared across all requests.  Each call returns a lightweight wrapper
+        bound to *user_id* so that query-level ownership predicates are
+        always correct — even under concurrent async execution.
 
         Args:
-            endpoint: CosmosDB endpoint URL
-            credential: Azure credential for authentication
-            database_name: Name of the CosmosDB database
-            container_name: Name of the CosmosDB container
-            session_id: Session ID for partitioning
-            user_id: User ID for data isolation
-            force_new: Force creation of new instance
+            user_id: User ID for data isolation (required for ownership checks)
+            force_new: Force re-creation of the shared connection
 
         Returns:
-            DatabaseBase: Database instance
+            DatabaseBase: Database instance scoped to user_id
         """
 
-        # Create new instance if forced or if singleton doesn't exist
-        if force_new or DatabaseFactory._instance is None:
-            cosmos_db_client = CosmosDBClient(
+        # Ensure the shared connection infrastructure is initialized
+        if force_new or DatabaseFactory._shared_instance is None:
+            shared = CosmosDBClient(
                 endpoint=config.COSMOSDB_ENDPOINT,
                 credential=config.get_azure_credentials(),
                 database_name=config.COSMOSDB_DATABASE,
                 container_name=config.COSMOSDB_CONTAINER,
                 session_id="",
                 user_id=user_id,
             )
+            await shared.initialize()
+            DatabaseFactory._shared_instance = shared
 
-            await cosmos_db_client.initialize()
-
-            if not force_new:
-                DatabaseFactory._instance = cosmos_db_client
-
-            return cosmos_db_client
+        # Create a per-request instance that shares the connection but is
+        # bound to the caller's user_id
+        instance = CosmosDBClient(
+            endpoint=config.COSMOSDB_ENDPOINT,
+            credential=config.get_azure_credentials(),
+            database_name=config.COSMOSDB_DATABASE,
+            container_name=config.COSMOSDB_CONTAINER,
+            session_id="",
+            user_id=user_id,
+        )
+        # Share the already-initialized connection objects
+        instance.client = DatabaseFactory._shared_instance.client
+        instance.database = DatabaseFactory._shared_instance.database
+        instance.container = DatabaseFactory._shared_instance.container
+        instance._initialized = True
 
-        return DatabaseFactory._instance
+        return instance
 
     @staticmethod
     async def close_all():
         """Close all database connections."""
-        if DatabaseFactory._instance:
-            await DatabaseFactory._instance.close()
-            DatabaseFactory._instance = None
+        if DatabaseFactory._shared_instance:
+            await DatabaseFactory._shared_instance.close()
+            DatabaseFactory._shared_instance = None

src/backend/common/models/messages_af.py

@@ -203,6 +203,7 @@ class TeamConfiguration(BaseDataModel):
     plan: str = ""
     starting_tasks: List[StartingTask] = Field(default_factory=list)
     user_id: str  # who uploaded this configuration
+    is_default: bool = False  # default teams are visible to all users
 
 
 class PlanWithSteps(Plan):

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

@@ -112,6 +112,7 @@ async def validate_and_parse_team_config(
                 plan=json_data.get("plan", ""),
                 starting_tasks=starting_tasks,
                 user_id=user_id,
+                is_default=json_data.get("is_default", False),
             )
 
             self.logger.info(