Add deployment_name to team configs and refactor agent ID logic

Introduces a deployment_name field to agent team JSON files and TeamConfiguration model for dynamic model selection. Refactors agent ID generation and retrieval into utility functions, updates orchestration and lifecycle logic to use these utilities, and improves error logging and RAI validation handling in API routes.

Author: Fr4nc3

data/agent_teams/hr.json

@@ -5,6 +5,7 @@
   "status": "visible",
   "created": "",
   "created_by": "",
+  "deployment_name": "gpt-4.1-mini",
   "agents": [
     {
       "input_key": "",

data/agent_teams/marketing.json

@@ -5,6 +5,7 @@
   "status": "visible",
   "created": "",
   "created_by": "",
+  "deployment_name": "gpt-4.1-mini",
   "agents": [
     {
       "input_key": "",

data/agent_teams/retail.json

@@ -5,6 +5,7 @@
   "status": "visible",
   "created": "",
   "created_by": "",
+  "deployment_name": "gpt-4.1-mini",
   "agents": [
     {
       "input_key": "",

data/agent_teams/rfp_analysis_team.json

@@ -5,6 +5,7 @@
   "status": "visible",
   "created": "",
   "created_by": "",
+  "deployment_name": "gpt-4.1-mini",
   "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/models/messages_af.py

@@ -196,6 +196,7 @@ class TeamConfiguration(BaseDataModel):
     status: str
     created: str
     created_by: str
+    deployment_name: str
     agents: List[TeamAgent] = Field(default_factory=list)
     description: str = ""
     logo: str = ""

src/backend/common/utils/utils_af.py

@@ -1,18 +1,28 @@
-"""Utility functions for agent_framework-based integration and agent management (converted from agent framework )."""
+"""Utility functions for agent_framework-based integration and agent management."""
 
+from http import client
 import logging
+import secrets
+import string
+from typing import Optional  # <-- Add this import
+
+from tomlkit import (
+    string as toml_string,
+)  # <-- If you need tomlkit.string elsewhere, alias it
 
 from common.config.app_config import config
-# Converted import path (agent_framework version of FoundryAgentTemplate)
+
 from common.database.database_base import DatabaseBase
 from common.models.messages_af import TeamConfiguration
 from v4.common.services.team_service import TeamService
 from v4.config.agent_registry import agent_registry
-from v4.magentic_agents.foundry_agent import \
-    FoundryAgentTemplate  # formerly v4.magentic_agents.foundry_agent
+from v4.magentic_agents.foundry_agent import (
+    FoundryAgentTemplate,
+)  # formerly v4.magentic_agents.foundry_agent
 
 logging.basicConfig(level=logging.INFO)
 
+
 async def find_first_available_team(team_service: TeamService, user_id: str) -> str:
     """
     Check teams in priority order (4 to 1) and return the first available team ID.
@@ -38,7 +48,10 @@ async def find_first_available_team(team_service: TeamService, user_id: str) ->
     print("No teams found in priority order")
     return None
 
-async def create_RAI_agent(team: TeamConfiguration, memory_store: DatabaseBase) -> FoundryAgentTemplate:
+
+async def create_RAI_agent(
+    team: TeamConfiguration, memory_store: DatabaseBase
+) -> FoundryAgentTemplate:
     """Create and initialize a FoundryAgentTemplate for Responsible AI (RAI) checks."""
     agent_name = "RAIAgent"
     agent_description = "A comprehensive research assistant for integration testing"
@@ -55,7 +68,7 @@ async def create_RAI_agent(team: TeamConfiguration, memory_store: DatabaseBase)
         "- Is completely meaningless, incoherent, or appears to be spam\n"
         "Respond with 'TRUE' if the input violates any rules and should be blocked, otherwise respond with 'FALSE'."
     )
-    
+
     model_deployment_name = config.AZURE_OPENAI_DEPLOYMENT_NAME
     team.team_id = "rai_team"  # Use a fixed team ID for RAI agent
     team.name = "RAI Team"
@@ -114,7 +127,9 @@ async def _get_agent_response(agent: FoundryAgentTemplate, query: str) -> str:
         return "TRUE"  # Default to blocking on error
 
 
-async def rai_success(description: str, team_config: TeamConfiguration,  memory_store: DatabaseBase) -> bool:
+async def rai_success(
+    description: str, team_config: TeamConfiguration, memory_store: DatabaseBase
+) -> bool:
     """
     Run a RAI compliance check on the provided description using the RAIAgent.
     Returns True if content is safe (should proceed), False if it should be blocked.
@@ -148,7 +163,9 @@ async def rai_success(description: str, team_config: TeamConfiguration,  memory_
                 pass
 
 
-async def rai_validate_team_config(team_config_json: dict, team_config: TeamConfiguration,  memory_store: DatabaseBase) -> tuple[bool, str]:
+async def rai_validate_team_config(
+    team_config_json: dict, memory_store: DatabaseBase
+) -> tuple[bool, str]:
     """
     Validate a team configuration for RAI compliance.
 
@@ -189,7 +206,7 @@ async def rai_validate_team_config(team_config_json: dict, team_config: TeamConf
         combined = " ".join(text_content).strip()
         if not combined:
             return False, "Team configuration contains no readable text content."
-
+        team_config = TeamConfiguration(**team_config_json)
         if not await rai_success(combined, team_config, memory_store):
             return (
                 False,
@@ -200,3 +217,37 @@ async def rai_validate_team_config(team_config_json: dict, team_config: TeamConf
     except Exception as e:
         logging.error("Error validating team configuration content: %s", e)
         return False, "Unable to validate team configuration content. Please try again."
+
+
+def generate_assistant_id(prefix: str = "asst_", length: int = 24) -> str:
+    """
+    Generate a unique ID like 'asst_jRgR5t2U7o8nUPkNGv5HWOgV'.
+
+    - prefix: leading string (defaults to 'asst_')
+    - length: number of random characters after the prefix
+    """
+    # URL-safe characters similar to what OpenAI-style IDs use
+    alphabet = string.ascii_letters + string.digits  # a-zA-Z0-9
+
+    # cryptographically strong randomness
+    random_part = "".join(secrets.choice(alphabet) for _ in range(length))
+    return f"{prefix}{random_part}"
+
+
+async def get_database_team_agent_id(
+    memory_store: DatabaseBase, team_config: TeamConfiguration, agent_name: str
+) -> Optional[str]:
+    """Retrieve existing team agent from database, if any."""
+    agent_id = None
+    try:
+        currentAgent = await memory_store.get_team_agent(
+            team_id=team_config.team_id, agent_name=agent_name
+        )
+        if currentAgent and currentAgent.agent_foundry_id:
+            agent_id = currentAgent.agent_foundry_id
+
+    except (
+        Exception
+    ) as ex:  # Consider narrowing this to specific exceptions if possible
+        logging.error("Failed to initialize Get database team agent: %s", ex)
+    return agent_id

src/backend/v4/api/router.py

@@ -438,13 +438,14 @@ async def plan_approval(
                 return {"status": "approval recorded"}
             else:
                 logging.warning(
-                    f"No orchestration or plan found for plan_id: {human_feedback.m_plan_id}"
+                    "No orchestration or plan found for plan_id: %s",
+                    human_feedback.m_plan_id
                 )
                 raise HTTPException(
                     status_code=404, detail="No active plan found for approval"
                 )
     except Exception as e:
-        logging.error(f"Error processing plan approval: {e}")
+        logging.error("Error processing plan approval: %s", e)
         raise HTTPException(status_code=500, detail="Internal server error")
 
 
@@ -710,16 +711,7 @@ async def upload_team_config(
       raise HTTPException(status_code=400, detail="no user found")
     try:
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
-        user_current_team = await memory_store.get_current_team(user_id=user_id)
-        team_id = None
-        if user_current_team:
-            team_id = user_current_team.team_id
-        team = await memory_store.get_team_by_id(team_id=team_id)
-        if not team:
-            raise HTTPException(
-                status_code=404,
-                detail=f"Team configuration '{team_id}' not found or access denied",
-            )
+
     except Exception as e:
         raise HTTPException(
             status_code=400,
@@ -740,11 +732,11 @@ async def upload_team_config(
         except json.JSONDecodeError as e:
             raise HTTPException(
                 status_code=400, detail=f"Invalid JSON format: {str(e)}"
-            )
+            ) from e
 
         # Validate content with RAI before processing
         if not team_id:
-            rai_valid, rai_error = await rai_validate_team_config(json_data, team, memory_store)
+            rai_valid, rai_error = await rai_validate_team_config(json_data, memory_store)
             if not rai_valid:
                 track_event_if_configured(
                     "Team configuration RAI validation failed",
@@ -819,7 +811,7 @@ async def upload_team_config(
                 json_data, user_id
             )
         except ValueError as e:
-            raise HTTPException(status_code=400, detail=str(e))
+            raise HTTPException(status_code=400, detail=str(e)) from e
 
         # Save the configuration
         try:
@@ -831,7 +823,7 @@ async def upload_team_config(
         except ValueError as e:
             raise HTTPException(
                 status_code=500, detail=f"Failed to save configuration: {str(e)}"
-            )
+            ) from e
 
         track_event_if_configured(
             "Team configuration uploaded",
@@ -855,7 +847,7 @@ async def upload_team_config(
     except HTTPException:
         raise
     except Exception as e:
-        logging.error(f"Unexpected error uploading team configuration: {str(e)}")
+        logging.error("Unexpected error uploading team configuration: %s", str(e))
         raise HTTPException(status_code=500, detail="Internal server error occurred")
 
 

src/backend/v4/magentic_agents/common/lifecycle.py

@@ -1,24 +1,27 @@
 from __future__ import annotations
 
 import logging
-import os
 import secrets
 import string
 from contextlib import AsyncExitStack
 from typing import Any, Optional
 
-from agent_framework import (AggregateContextProvider, ChatAgent,
-                             ChatClientProtocol, ChatMessage,
-                             ChatMessageStoreProtocol, ChatOptions,
-                             ContextProvider, HostedMCPTool,
-                             MCPStreamableHTTPTool, Middleware, Role, ToolMode,
-                             ToolProtocol)
+from agent_framework import (
+    ChatAgent,
+    HostedMCPTool,
+    MCPStreamableHTTPTool,
+)
+
 # from agent_framework.azure import AzureAIAgentClient
 from agent_framework_azure_ai import AzureAIAgentClient
 from azure.ai.agents.aio import AgentsClient
 from azure.identity.aio import DefaultAzureCredential
 from common.database.database_base import DatabaseBase
 from common.models.messages_af import CurrentTeamAgent, TeamConfiguration
+from src.backend.common.utils.utils_af import (
+    generate_assistant_id,
+    get_database_team_agent_id,
+)
 from v4.common.services.team_service import TeamService
 from v4.config.agent_registry import agent_registry
 from v4.magentic_agents.models.agent_models import MCPConfig
@@ -147,19 +150,6 @@ def get_chat_client(self, chat_client) -> AzureAIAgentClient:
             extra={"agent_id": chat_client.agent_id},
         )
         return chat_client
-    def generate_assistant_id(self, prefix: str = "asst_", length: int = 24) -> str:
-        """
-        Generate a unique ID like 'asst_jRgR5t2U7o8nUPkNGv5HWOgV'.
-
-        - prefix: leading string (defaults to 'asst_')
-        - length: number of random characters after the prefix
-        """
-        # URL-safe characters similar to what OpenAI-style IDs use
-        alphabet = string.ascii_letters + string.digits  # a-zA-Z0-9
-
-        # cryptographically strong randomness
-        random_part = "".join(secrets.choice(alphabet) for _ in range(length))
-        return f"{prefix}{random_part}"
 
     def get_agent_id(self, chat_client) -> str:
         """Return the underlying agent ID."""
@@ -171,21 +161,20 @@ def get_agent_id(self, chat_client) -> str:
             and self._agent.chat_client.agent_id is not None
         ):
             return self._agent.chat_client.agent_id  # type: ignore
-        id = self.generate_assistant_id()
+        id = generate_assistant_id()
         self.logger.info("Generated new agent ID: %s", id)
         return id
 
     async def get_database_team_agent(self) -> Optional[AzureAIAgentClient]:
         """Retrieve existing team agent from database, if any."""
         chat_client = None
         try:
-            currentAgent = await self.memory_store.get_team_agent(
-                team_id=self.team_config.team_id, agent_name=self.agent_name
+            agent_id = await get_database_team_agent_id(
+                self.memory_store, self.team_config, self.agent_name
             )
-            if currentAgent and currentAgent.agent_foundry_id:
-                agent = await self.client.get_agent(
-                    agent_id=currentAgent.agent_foundry_id
-                )
+
+            if agent_id:
+                agent = await self.client.get_agent(agent_id=agent_id)
                 if agent and agent.id is not None:
                     chat_client = AzureAIAgentClient(
                         project_endpoint=self.project_endpoint,

src/backend/v4/orchestration/orchestration_manager.py

@@ -21,6 +21,11 @@
 from common.config.app_config import config
 from common.models.messages_af import TeamConfiguration
 
+from src.backend.common.database.database_base import DatabaseBase
+from src.backend.common.utils.utils_af import (
+    generate_assistant_id,
+    get_database_team_agent_id,
+)
 from v4.common.services.team_service import TeamService
 from v4.callbacks.response_handlers import (
     agent_response_callback,
@@ -45,7 +50,13 @@ def __init__(self):
     # Orchestration construction
     # ---------------------------
     @classmethod
-    async def init_orchestration(cls, agents: List, user_id: str | None = None):
+    async def init_orchestration(
+        cls,
+        agents: List,
+        team_config: TeamConfiguration,
+        memory_store: DatabaseBase,
+        user_id: str | None = None,
+    ):
         """
         Initialize a Magentic workflow with:
           - Provided agents (participants)
@@ -64,16 +75,23 @@ async def init_orchestration(cls, agents: List, user_id: str | None = None):
 
         # Create Azure AI Agent client for orchestration using config
         # This replaces AzureChatCompletion from SK
+        agent_name = team_config.name if team_config.name else "OrchestratorAgent"
+        db_agent_id = await get_database_team_agent_id(
+            memory_store, team_config, agent_name
+        )
+        agent_id = db_agent_id or generate_assistant_id()
         try:
             chat_client = AzureAIAgentClient(
                 project_endpoint=config.AZURE_AI_PROJECT_ENDPOINT,
-                model_deployment_name=config.AZURE_OPENAI_DEPLOYMENT_NAME,
+                model_deployment_name=team_config.deployment_name,
+                agent_id=agent_id,
+                agent_name=agent_name,
                 async_credential=credential,
             )
 
             cls.logger.info(
                 "Created AzureAIAgentClient for orchestration with model '%s' at endpoint '%s'",
-                config.AZURE_OPENAI_DEPLOYMENT_NAME,
+                team_config.deployment_name,
                 config.AZURE_AI_PROJECT_ENDPOINT,
             )
         except Exception as e:
@@ -150,7 +168,7 @@ async def get_current_or_new_orchestration(
         user_id: str,
         team_config: TeamConfiguration,
         team_switched: bool,
-        team_service:TeamService = None,
+        team_service: TeamService = None,
     ):
         """
         Return an existing workflow for the user or create a new one if:
@@ -194,7 +212,9 @@ async def get_current_or_new_orchestration(
             try:
                 cls.logger.info("Initializing new orchestration for user '%s'", user_id)
                 orchestration_config.orchestrations[user_id] = (
-                    await cls.init_orchestration(agents, user_id)
+                    await cls.init_orchestration(
+                        agents, team_config, team_service.memory_context, user_id
+                    )
                 )
             except Exception as e:
                 cls.logger.error(