use attribute in place of property

Author: moonbox3

python/packages/ag-ui/tests/test_tooling.py

@@ -74,7 +74,7 @@ def test_collect_server_tools_includes_mcp_tools_when_connected() -> None:
     mock_mcp = MockMCPTool([mcp_function1, mcp_function2], is_connected=True)
 
     agent = _create_chat_agent_with_tool("regular_tool")
-    agent._local_mcp_tools = [mock_mcp]
+    agent.mcp_tools = [mock_mcp]
 
     tools = collect_server_tools(agent)
 
@@ -91,7 +91,7 @@ def test_collect_server_tools_excludes_mcp_tools_when_not_connected() -> None:
     mock_mcp = MockMCPTool([mcp_function], is_connected=False)
 
     agent = _create_chat_agent_with_tool("regular_tool")
-    agent._local_mcp_tools = [mock_mcp]
+    agent.mcp_tools = [mock_mcp]
 
     tools = collect_server_tools(agent)
 
@@ -118,7 +118,7 @@ def test_collect_server_tools_with_mcp_tools_via_public_property() -> None:
     mock_mcp = MockMCPTool([mcp_function], is_connected=True)
 
     agent = _create_chat_agent_with_tool("regular_tool")
-    agent._local_mcp_tools = [mock_mcp]
+    agent.mcp_tools = [mock_mcp]
 
     # Verify the public property works
     assert agent.mcp_tools == [mock_mcp]

python/packages/core/agent_framework/_agents.py

@@ -678,7 +678,7 @@ def __init__(
         normalized_tools: list[ToolProtocol | Callable[..., Any] | MutableMapping[str, Any]] = (  # type:ignore[reportUnknownVariableType]
             [] if tools_ is None else tools_ if isinstance(tools_, list) else [tools_]  # type: ignore[list-item]
         )
-        self._local_mcp_tools = [tool for tool in normalized_tools if isinstance(tool, MCPTool)]
+        self.mcp_tools: list[MCPTool] = [tool for tool in normalized_tools if isinstance(tool, MCPTool)]
         agent_tools = [tool for tool in normalized_tools if not isinstance(tool, MCPTool)]
 
         # Build chat options dict
@@ -720,7 +720,7 @@ async def __aenter__(self) -> "Self":
         Returns:
             The ChatAgent instance.
         """
-        for context_manager in chain([self.chat_client], self._local_mcp_tools):
+        for context_manager in chain([self.chat_client], self.mcp_tools):
             if isinstance(context_manager, AbstractAsyncContextManager):
                 await self._async_exit_stack.enter_async_context(context_manager)
         return self
@@ -742,18 +742,6 @@ async def __aexit__(
         """
         await self._async_exit_stack.aclose()
 
-    @property
-    def mcp_tools(self) -> list["MCPTool"]:
-        """Get the list of MCP tools attached to this agent.
-
-        MCP tools are stored separately from regular tools for lifecycle management.
-        Their functions are added to the tools list at runtime during run() or run_stream().
-
-        Returns:
-            List of MCPTool instances attached to this agent.
-        """
-        return self._local_mcp_tools
-
     def _update_agent_name_and_description(self) -> None:
         """Update the agent name in the chat client.
 
@@ -829,7 +817,7 @@ async def run(
             else:
                 final_tools.append(tool)  # type: ignore
 
-        for mcp_server in self._local_mcp_tools:
+        for mcp_server in self.mcp_tools:
             if not mcp_server.is_connected:
                 await self._async_exit_stack.enter_async_context(mcp_server)
             final_tools.extend(mcp_server.functions)
@@ -956,7 +944,7 @@ async def run_stream(
             else:
                 final_tools.append(tool)
 
-        for mcp_server in self._local_mcp_tools:
+        for mcp_server in self.mcp_tools:
             if not mcp_server.is_connected:
                 await self._async_exit_stack.enter_async_context(mcp_server)
             final_tools.extend(mcp_server.functions)

python/packages/devui/agent_framework_devui/_executor.py

@@ -114,10 +114,10 @@ async def _ensure_mcp_connections(self, agent: Any) -> None:
         Args:
             agent: Agent object that may have MCP tools
         """
-        if not hasattr(agent, "_local_mcp_tools"):
+        if not hasattr(agent, "mcp_tools"):
             return
 
-        for mcp_tool in agent._local_mcp_tools:
+        for mcp_tool in agent.mcp_tools:
             if not getattr(mcp_tool, "is_connected", False):
                 continue
 

python/packages/devui/agent_framework_devui/_server.py

@@ -248,9 +248,9 @@ async def _cleanup_entities(self) -> None:
                                 except Exception as e:
                                     logger.warning(f"Error closing credential for {entity_info.id}: {e}")
 
-                # Close MCP tools (framework tracks them in _local_mcp_tools)
-                if entity_obj and hasattr(entity_obj, "_local_mcp_tools"):
-                    for mcp_tool in entity_obj._local_mcp_tools:
+                # Close MCP tools (framework tracks them in mcp_tools)
+                if entity_obj and hasattr(entity_obj, "mcp_tools"):
+                    for mcp_tool in entity_obj.mcp_tools:
                         if hasattr(mcp_tool, "close") and callable(mcp_tool.close):
                             try:
                                 if inspect.iscoroutinefunction(mcp_tool.close):