Add team agent retrieval and reuse in agent templates

Introduces logic to retrieve and reuse existing team agents from the database in FoundryAgentTemplate and ReasoningAgentTemplate. Adds get_database_team_agent to MCPEnabledBase for agent lookup, reducing redundant agent initialization and ensuring agent state consistency.

Author: Fr4nc3

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

@@ -24,7 +24,7 @@
 from agent_framework_azure_ai import AzureAIAgentClient
 from azure.ai.agents.aio import AgentsClient
 from azure.identity.aio import DefaultAzureCredential
-from common.models.messages_af import TeamConfiguration
+from common.models.messages_af import CurrentTeamAgent, TeamConfiguration
 from common.database.database_base import DatabaseBase
 from v4.common.services.team_service import TeamService
 from v4.config.agent_registry import agent_registry
@@ -125,6 +125,39 @@ async def _after_open(self) -> None:
         """Subclasses must build self._agent here."""
         raise NotImplementedError
 
+    async def get_database_team_agent(self) -> Optional[CurrentTeamAgent]:
+        """Retrieve existing team agent from database, if any."""
+        agent = None
+        try:
+            currentAgent = await self.memory_store.get_team_agent(
+                team_id=self.team_config.team_id,
+                agent_name=self.agent_name
+            )
+            if currentAgent and currentAgent.agent_foundry_id:
+                agent = self.client.get_agent(
+                    id=currentAgent.agent_foundry_id
+                )
+
+        except Exception as ex:
+            self.logger.error("Failed to initialize ReasoningAgentTemplate: %s", ex)
+        return agent
+    
+    async def save_database_team_agent(self, agent_name, description, instructions) -> None:
+        """Save current team agent to database."""
+        try:
+            currentAgent = CurrentTeamAgent(
+                team_id=self.team_config.team_id,
+                agent_name=agent_name,
+                agent_foundry_id=self._agent.id,
+                agent_description=description,
+                agent_instructions=instructions,
+            )
+            await self.memory_store.add_team_agent(currentAgent)
+
+        except Exception as ex:
+            self.logger.error("Failed to save ReasoningAgentTemplate: %s", ex)
+            
+        
     async def _prepare_mcp_tool(self) -> None:
         """Translate MCPConfig to a HostedMCPTool (agent_framework construct)."""
         if not self.mcp_cfg:

src/backend/v4/magentic_agents/foundry_agent.py

@@ -8,7 +8,7 @@
 from azure.ai.projects.models import ConnectionType
 from common.config.app_config import config
 from common.models.messages_af import TeamConfiguration
-from src.backend.common.database.database_base import DatabaseBase
+from common.database.database_base import DatabaseBase
 from v4.common.services.team_service import TeamService
 from v4.config.agent_registry import agent_registry
 from v4.magentic_agents.common.lifecycle import AzureAgentBase
@@ -214,55 +214,59 @@ async def _create_azure_search_enabled_client(self):
     # -------------------------
     async def _after_open(self) -> None:
         """Initialize ChatAgent after connections are established."""
-        try:
-            agent = self.client.get_agent(
-                agent_name=self.agent_name
-            )
 
-        except Exception as ex:
-            self.logger.error("Failed to initialize ReasoningAgentTemplate: %s", ex)
         try:
-            if self._use_azure_search:
-                # Azure Search mode (skip MCP + Code Interpreter due to incompatibility)
-                self.logger.info(
-                    "Initializing agent in Azure AI Search mode (exclusive)."
-                )
-                chat_client = await self._create_azure_search_enabled_client()
-                if not chat_client:
-                    raise RuntimeError(
-                        "Azure AI Search mode requested but setup failed."
+            agent = await self.get_database_team_agent()
+            if agent is None:
+                if self._use_azure_search:
+                    # Azure Search mode (skip MCP + Code Interpreter due to incompatibility)
+                    self.logger.info(
+                        "Initializing agent in Azure AI Search mode (exclusive)."
+                    )
+                    chat_client = await self._create_azure_search_enabled_client()
+                    if not chat_client:
+                        raise RuntimeError(
+                            "Azure AI Search mode requested but setup failed."
+                        )
+
+                    # In Azure Search raw tool path, tools/tool_choice are handled server-side.
+                    self._agent = ChatAgent(
+                        chat_client=chat_client,
+                        instructions=self.agent_instructions,
+                        name=self.agent_name,
+                        description=self.agent_description,
+                        tool_choice="required",  # Force usage
+                        temperature=0.7,
+                        model_id=self.model_deployment_name,
+                    )
+                else:
+                    # use MCP path
+                    self.logger.info("Initializing agent in MCP mode.")
+                    tools = await self._collect_tools()
+                    self._agent = ChatAgent(
+                        chat_client=AzureAIAgentClient(
+                            project_endpoint=self.project_endpoint,
+                            model_deployment_name=self.model_deployment_name,
+                            async_credential=self.creds,
+                        ),
+                        instructions=self.agent_instructions,
+                        name=self.agent_name,
+                        description=self.agent_description,
+                        tools=tools if tools else None,
+                        tool_choice="auto" if tools else "none",
+                        temperature=0.7,
+                        model_id=self.model_deployment_name,
                     )
 
-                # In Azure Search raw tool path, tools/tool_choice are handled server-side.
-                self._agent = ChatAgent(
-                    chat_client=chat_client,
-                    instructions=self.agent_instructions,
-                    name=self.agent_name,
-                    description=self.agent_description,
-                    tool_choice="required",  # Force usage
-                    temperature=0.7,
-                    model_id=self.model_deployment_name,
-                )
-            else:
-                # use MCP path
-                self.logger.info("Initializing agent in MCP mode.")
-                tools = await self._collect_tools()
-                self._agent = ChatAgent(
-                    chat_client=AzureAIAgentClient(
-                        project_endpoint=self.project_endpoint,
-                        model_deployment_name=self.model_deployment_name,
-                        async_credential=self.creds,
-                    ),
-                    instructions=self.agent_instructions,
-                    name=self.agent_name,
-                    description=self.agent_description,
-                    tools=tools if tools else None,
-                    tool_choice="auto" if tools else "none",
-                    temperature=0.7,
-                    model_id=self.model_deployment_name,
+                self.logger.info("Initialized ChatAgent '%s'", self.agent_name)
+
+                await self.save_database_team_agent(
+                    self.agent_name, self.agent_description, self.agent_instructions
                 )
 
-            self.logger.info("Initialized ChatAgent '%s'", self.agent_name)
+            else:
+                self.logger.info("Using existing ChatAgent '%s'", self.agent_name)
+                self._agent = agent
         except Exception as ex:
             self.logger.error("Failed to initialize ChatAgent: %s", ex)
             raise

src/backend/v4/magentic_agents/reasoning_agent.py

@@ -13,7 +13,7 @@
 from azure.identity.aio import DefaultAzureCredential
 
 
-#from agent_framework.azure import AzureOpenAIChatClient
+# from agent_framework.azure import AzureOpenAIChatClient
 
 from common.models.messages_af import TeamConfiguration
 from common.database.database_base import DatabaseBase
@@ -29,7 +29,7 @@
 class ReasoningAgentTemplate(MCPEnabledBase):
     """
     Reasoning agent using agent_framework with direct Azure AI Search integration.
-    
+
     This agent:
     - Uses reasoning models (o1, o3-mini, etc.)
     - Augments prompts with search results from Azure AI Search
@@ -52,7 +52,7 @@ def __init__(
         memory_store: DatabaseBase | None = None,
     ) -> None:
         """Initialize reasoning agent.
-        
+
         Args:
             agent_name: Name of the agent
             agent_description: Description of the agent's purpose
@@ -63,17 +63,21 @@ def __init__(
             mcp_config: Optional MCP server configuration
             max_search_docs: Maximum number of search documents to retrieve
         """
-        super().__init__(mcp=mcp_config, team_service=team_service, team_config=team_config, project_endpoint=project_endpoint, memory_store=memory_store)
+        super().__init__(
+            mcp=mcp_config,
+            team_service=team_service,
+            team_config=team_config,
+            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
         self.max_search_docs = max_search_docs
-        
-        
-        
+
         self.logger = logging.getLogger(__name__)
 
     async def _after_open(self) -> None:
@@ -82,43 +86,54 @@ async def _after_open(self) -> None:
 
             self.logger.info(
                 "Initialized AzureAIAgentClient for model '%s'",
-                self.model_deployment_name
+                self.model_deployment_name,
             )
 
-
             # Initialize MCP tools (called after stack is ready)
             await self._prepare_mcp_tool()
-            
+
             if self.mcp_tool:
                 self.logger.info(
                     "MCP tool '%s' ready with %d functions",
                     self.mcp_tool.name,
-                    len(self.mcp_tool.functions) if hasattr(self.mcp_tool, 'functions') else 0
+                    (
+                        len(self.mcp_tool.functions)
+                        if hasattr(self.mcp_tool, "functions")
+                        else 0
+                    ),
                 )
 
             # Prepare tools for the agent
             tools = self._prepare_tools()
 
-            # Create ChatAgent instance (similar to foundry_agent)
-            self._agent = ChatAgent(
-                chat_client=self.client,
-                instructions=self.base_instructions,
-                name=self.agent_name,
-                description=self.agent_description,
-                tools=tools if tools else None,
-                tool_choice="auto" if tools else "none",
-                temperature=1.0,  # Reasoning models use fixed temperature
-                model_id=self.model_deployment_name,
-            )
+            agent = await self.get_database_team_agent()
+            if not agent:
+                self._agent = ChatAgent(
+                    chat_client=self.client,
+                    instructions=self.base_instructions,
+                    name=self.agent_name,
+                    description=self.agent_description,
+                    tools=tools if tools else None,
+                    tool_choice="auto" if tools else "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
+                )
+
+            else:
+                self._agent = agent
+                self.logger.info("Using existing ReasoningAgent '%s'", self.agent_name)
             # Register agent globally
             try:
                 agent_registry.register_agent(self)
-                self.logger.info("Registered agent '%s' in global registry.", self.agent_name)
+                self.logger.info(
+                    "Registered agent '%s' in global registry.", self.agent_name
+                )
             except Exception as reg_ex:
                 self.logger.warning(
-                    "Could not register agent '%s': %s",
-                    self.agent_name,
-                    reg_ex
+                    "Could not register agent '%s': %s", self.agent_name, reg_ex
                 )
 
         except Exception as ex:
@@ -132,7 +147,7 @@ async def close(self) -> None:
             # Unregister from registry
             try:
                 agent_registry.unregister_agent(self)
-            except Exception:  
+            except Exception:
                 pass
 
         finally:
@@ -143,18 +158,17 @@ async def close(self) -> None:
     def _prepare_tools(self) -> list:
         """
         Prepare tools for reasoning model invocation.
-        
+
         Returns:
             List of tools (currently only MCP tools supported for reasoning models)
         """
         tools = []
-        
+
         if self.mcp_tool:
             tools.append(self.mcp_tool)
             self.logger.debug("Added MCP tool '%s' to tools list", self.mcp_tool.name)
-        
-        return tools
 
+        return tools
 
 
 # -------------------------
@@ -171,7 +185,7 @@ async def create_reasoning_agent(
 ) -> ReasoningAgentTemplate:
     """
     Factory to create and open a ReasoningAgentTemplate.
-    
+
     Args:
         agent_name: Name of the agent
         agent_description: Description of the agent's purpose
@@ -180,14 +194,14 @@ async def create_reasoning_agent(
         azure_ai_project_endpoint: Azure AI Project endpoint (defaults to env var)
         search_config: Optional Azure AI Search configuration
         mcp_config: Optional MCP server configuration
-        
+
     Returns:
         Initialized and opened ReasoningAgentTemplate instance
-        
+
     Example:
         ```python
         from af.magentic_agents.models.agent_models import SearchConfig, MCPConfig
-        
+
         # With search augmentation and MCP tools
         agent = await create_reasoning_agent(
             agent_name="ReasoningAgent",
@@ -205,11 +219,11 @@ async def create_reasoning_agent(
                 description="HR data access tools"
             ),
         )
-        
+
         ```
     """
     # Get endpoint from env if not provided
-    endpoint = azure_ai_project_endpoint 
+    endpoint = azure_ai_project_endpoint
     if not endpoint:
         raise RuntimeError(
             "AZURE_AI_PROJECT_ENDPOINT must be provided or set as environment variable"
@@ -225,4 +239,4 @@ async def create_reasoning_agent(
         mcp_config=mcp_config,
     )
     await agent.open()
-    return agent
+    return agent