Refactor agent initialization and persistence logic

Standardizes agent metadata handling by passing agent_name, agent_description, and agent_instructions through constructors and storing them as instance variables. Refactors save_database_team_agent to use instance variables instead of method arguments. Updates orchestration and API router to support new agent initialization signatures. Improves logging and error handling for agent lifecycle management.

Author: Fr4nc3

src/backend/v4/api/router.py

@@ -14,7 +14,11 @@
     TeamSelectionRequest,
 )
 from common.utils.event_utils import track_event_if_configured
-from common.utils.utils_af import find_first_available_team, rai_success, rai_validate_team_config
+from common.utils.utils_af import (
+    find_first_available_team,
+    rai_success,
+    rai_validate_team_config,
+)
 from fastapi import (
     APIRouter,
     BackgroundTasks,
@@ -149,7 +153,10 @@ async def init_team(
 
         # Initialize agent team for this user session
         await OrchestrationManager.get_current_or_new_orchestration(
-            user_id=user_id, team_config=team_configuration, team_switched=team_switched
+            user_id=user_id,
+            team_config=team_configuration,
+            team_switched=team_switched,
+            team_service=team_service,
         )
 
         return {

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

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import os
 from contextlib import AsyncExitStack
 from typing import Any, Optional
@@ -45,6 +46,9 @@ def __init__(
         team_config: TeamConfiguration | None = None,
         project_endpoint: str | None = None,
         memory_store: DatabaseBase | None = None,
+        agent_name: str | None = None,
+        agent_description: str | None = None,
+        agent_instructions: str | None = None,
     ) -> None:
         self._stack: AsyncExitStack | None = None
         self.mcp_cfg: MCPConfig | None = mcp
@@ -56,6 +60,10 @@ def __init__(
         self.project_endpoint = project_endpoint
         self.creds: Optional[DefaultAzureCredential] = None
         self.memory_store: Optional[DatabaseBase] = memory_store
+        self.agent_name: str | None = agent_name
+        self.agent_description: str | None = agent_description
+        self.agent_instructions: str | None = agent_instructions
+        self.logger = logging.getLogger(__name__)
 
     async def open(self) -> "MCPEnabledBase":
         if self._stack is not None:
@@ -142,15 +150,16 @@ async def get_database_team_agent(self) -> Optional[CurrentTeamAgent]:
             self.logger.error("Failed to initialize ReasoningAgentTemplate: %s", ex)
         return agent
 
-    async def save_database_team_agent(self, agent_name, description, instructions) -> None:
+    async def save_database_team_agent(self) -> None:
         """Save current team agent to database."""
         try:
             currentAgent = CurrentTeamAgent(
                 team_id=self.team_config.team_id,
-                agent_name=agent_name,
+                team_name=self.team_config.name,
+                agent_name=self.agent_name,
                 agent_foundry_id=self._agent.id,
-                agent_description=description,
-                agent_instructions=instructions,
+                agent_description=self.agent_description,
+                agent_instructions=self.agent_instructions,
             )
             await self.memory_store.add_team_agent(currentAgent)
 
@@ -191,13 +200,19 @@ def __init__(
         team_service: TeamService | None = None,
         team_config: TeamConfiguration | None = None,
         memory_store: DatabaseBase | None = None,
+        agent_name: str | None = None,
+        agent_description: str | None = None,
+        agent_instructions: str | None = None,
     ) -> None:
         super().__init__(
             mcp=mcp,
             team_service=team_service,
             team_config=team_config,
             project_endpoint=project_endpoint,
             memory_store=memory_store,
+            agent_name=agent_name,
+            agent_description=agent_description,
+            agent_instructions=agent_instructions,
         )
 
         self._created_ephemeral: bool = (

src/backend/v4/magentic_agents/foundry_agent.py

@@ -45,10 +45,11 @@ def __init__(
             team_service=team_service,
             team_config=team_config,
             memory_store=memory_store,
+            agent_name=agent_name,
+            agent_description=agent_description,
+            agent_instructions=agent_instructions,
         )
-        self.agent_name = agent_name
-        self.agent_description = agent_description
-        self.agent_instructions = agent_instructions
+
         self.enable_code_interpreter = enable_code_interpreter
         self.search = search_config
         self.logger = logging.getLogger(__name__)
@@ -260,9 +261,7 @@ async def _after_open(self) -> None:
 
                 self.logger.info("Initialized ChatAgent '%s'", self.agent_name)
 
-                await self.save_database_team_agent(
-                    self.agent_name, self.agent_description, self.agent_instructions
-                )
+                await self.save_database_team_agent()
 
             else:
                 self.logger.info("Using existing ChatAgent '%s'", self.agent_name)

src/backend/v4/magentic_agents/reasoning_agent.py

@@ -70,9 +70,6 @@ def __init__(
             project_endpoint=project_endpoint,
             memory_store=memory_store,
         )
-        self.agent_name = agent_name
-        self.agent_description = agent_description
-        self.base_instructions = agent_instructions
         self.model_deployment_name = model_deployment_name
 
         self.search_config = search_config
@@ -118,10 +115,8 @@ async def _after_open(self) -> None:
                     temperature=1.0,  # Reasoning models use fixed temperature
                     model_id=self.model_deployment_name,
                 )
-                await self.save_database_team_agent(
-                    self.agent_name, self.agent_description, self.base_instructions
-                )
-
+                await self.save_database_team_agent()
+                    
             else:
                 self._agent = agent
                 self.logger.info("Using existing ReasoningAgent '%s'", self.agent_name)

src/backend/v4/orchestration/orchestration_manager.py

@@ -150,7 +150,7 @@ async def get_current_or_new_orchestration(
         user_id: str,
         team_config: TeamConfiguration,
         team_switched: bool,
-        team_service: Optional[TeamService] = None,
+        team_service:TeamService = None,
     ):
         """
         Return an existing workflow for the user or create a new one if: