From 6afd667d30be897dfd9edb6d3189a1084fb33c64 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 12:52:11 +0000 Subject: [PATCH 1/8] feat: Add persist_memory flag to AgentTool --- src/google/adk/tools/agent_tool.py | 64 ++++++++++++---- tests/unittests/tools/test_agent_tool.py | 96 ++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 15 deletions(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 979a68c3e01..0ddf547eb9b 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -47,9 +47,19 @@ class AgentTool(BaseTool): skip_summarization: Whether to skip summarization of the agent output. """ - def __init__(self, agent: BaseAgent, skip_summarization: bool = False): + def __init__( + self, + agent: BaseAgent, + skip_summarization: bool = False, + persist_memory: bool = False, + ): self.agent = agent self.skip_summarization: bool = skip_summarization + self.persist_memory: bool = persist_memory + if self.persist_memory: + self._runners = {} + else: + self._runners = None super().__init__(name=agent.name, description=agent.description) @@ -125,19 +135,38 @@ async def run_async( role='user', parts=[types.Part.from_text(text=args['request'])], ) - runner = Runner( - app_name=self.agent.name, - agent=self.agent, - artifact_service=ForwardingArtifactService(tool_context), - session_service=InMemorySessionService(), - memory_service=InMemoryMemoryService(), - credential_service=tool_context._invocation_context.credential_service, - ) - session = await runner.session_service.create_session( - app_name=self.agent.name, - user_id=tool_context._invocation_context.user_id, - state=tool_context.state.to_dict(), - ) + if self.persist_memory: + session_id = tool_context._invocation_context.session.id + if session_id not in self._runners: + runner = Runner( + app_name=self.agent.name, + agent=self.agent, + artifact_service=ForwardingArtifactService(tool_context), + session_service=InMemorySessionService(), + memory_service=InMemoryMemoryService(), + credential_service=tool_context._invocation_context.credential_service, + ) + session = await runner.session_service.create_session( + app_name=self.agent.name, + user_id=tool_context._invocation_context.user_id, + state=tool_context.state.to_dict(), + ) + self._runners[session_id] = (runner, session) + (runner, session) = self._runners[session_id] + else: + runner = Runner( + app_name=self.agent.name, + agent=self.agent, + artifact_service=ForwardingArtifactService(tool_context), + session_service=InMemorySessionService(), + memory_service=InMemoryMemoryService(), + credential_service=tool_context._invocation_context.credential_service, + ) + session = await runner.session_service.create_session( + app_name=self.agent.name, + user_id=tool_context._invocation_context.user_id, + state=tool_context.state.to_dict(), + ) last_content = None async with Aclosing( @@ -176,7 +205,9 @@ def from_config( agent_tool_config.agent, config_abs_path ) return cls( - agent=agent, skip_summarization=agent_tool_config.skip_summarization + agent=agent, + skip_summarization=agent_tool_config.skip_summarization, + persist_memory=agent_tool_config.persist_memory, ) @@ -188,3 +219,6 @@ class AgentToolConfig(BaseToolConfig): skip_summarization: bool = False """Whether to skip summarization of the agent output.""" + + persist_memory: bool = False + """Whether to persist the agent's memory across tool calls.""" diff --git a/tests/unittests/tools/test_agent_tool.py b/tests/unittests/tools/test_agent_tool.py index d181f72f5a0..6481a582ab3 100644 --- a/tests/unittests/tools/test_agent_tool.py +++ b/tests/unittests/tools/test_agent_tool.py @@ -12,10 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest.mock import MagicMock from google.adk.agents.callback_context import CallbackContext from google.adk.agents.llm_agent import Agent from google.adk.agents.sequential_agent import SequentialAgent +from google.adk.auth.credential_service.in_memory_credential_service import InMemoryCredentialService from google.adk.tools.agent_tool import AgentTool +from google.adk.tools.tool_context import ToolContext from google.adk.utils.variant_utils import GoogleLLMVariant from google.genai import types from google.genai.types import Part @@ -355,3 +358,96 @@ class CustomInput(BaseModel): # Should have string response schema for VERTEX_AI when no output_schema assert declaration.response is not None assert declaration.response.type == types.Type.STRING + +@mark.asyncio +async def test_persist_memory(): + """Tests that the agent tool can persist memory across tool calls.""" + # Model for the sub-agent + tool_mock_model = testing_utils.MockModel.create( + responses=["Sub-agent response 1", "Sub-agent response 2"] + ) + tool_agent = Agent( + name="tool_agent", + model=tool_mock_model, + ) + + agent_tool = AgentTool(agent=tool_agent, persist_memory=True) + + # Create a mock tool context + mock_context = MagicMock(spec=ToolContext) + mock_invocation_context = MagicMock() + mock_session = MagicMock() + mock_session.id = "test_session" + mock_invocation_context.session = mock_session + mock_invocation_context.user_id = "test_user" + mock_invocation_context.credential_service = InMemoryCredentialService() + mock_context._invocation_context = mock_invocation_context + mock_context.state = MagicMock() + mock_context.state.to_dict.return_value = {} + + # First call to the tool + await agent_tool.run_async( + args={"request": "test1"}, tool_context=mock_context + ) + + # Second call to the tool + await agent_tool.run_async( + args={"request": "test2"}, tool_context=mock_context + ) + + # Check the history of the sub-agent's model + # The second request should contain the history of the first call. + assert len(tool_mock_model.requests) == 2 + second_request_contents = tool_mock_model.requests[1].contents + assert len(second_request_contents) == 3 + assert second_request_contents[0].role == "user" + assert second_request_contents[0].parts[0].text == "test1" + assert second_request_contents[1].role == "model" + assert second_request_contents[1].parts[0].text == "Sub-agent response 1" + assert second_request_contents[2].role == "user" + assert second_request_contents[2].parts[0].text == "test2" + + +@mark.asyncio +async def test_no_persist_memory(): + """Tests that the agent tool does not persist memory across tool calls.""" + # Model for the sub-agent + tool_mock_model = testing_utils.MockModel.create( + responses=["Sub-agent response 1", "Sub-agent response 2"] + ) + tool_agent = Agent( + name="tool_agent", + model=tool_mock_model, + ) + + agent_tool = AgentTool(agent=tool_agent, persist_memory=False) + + # Create a mock tool context + mock_context = MagicMock(spec=ToolContext) + mock_invocation_context = MagicMock() + mock_session = MagicMock() + mock_session.id = "test_session" + mock_invocation_context.session = mock_session + mock_invocation_context.user_id = "test_user" + mock_invocation_context.credential_service = InMemoryCredentialService() + mock_context._invocation_context = mock_invocation_context + mock_context.state = MagicMock() + mock_context.state.to_dict.return_value = {} + + # First call to the tool + await agent_tool.run_async( + args={"request": "test1"}, tool_context=mock_context + ) + + # Second call to the tool + await agent_tool.run_async( + args={"request": "test2"}, tool_context=mock_context + ) + + # Check the history of the sub-agent's model + # The second request should not contain the history of the first call. + assert len(tool_mock_model.requests) == 2 + second_request_contents = tool_mock_model.requests[1].contents + assert len(second_request_contents) == 1 + assert second_request_contents[0].role == "user" + assert second_request_contents[0].parts[0].text == "test2" \ No newline at end of file From 574ff865b3f2197226e7dd69701f4780a2cf236a Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 12:56:48 +0000 Subject: [PATCH 2/8] refactor: Remove duplication in AgentTool.run_async --- src/google/adk/tools/agent_tool.py | 75 ++++++++++++++++-------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 0ddf547eb9b..781cbaa5a6c 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -114,8 +114,6 @@ async def run_async( tool_context: ToolContext, ) -> Any: from ..agents.llm_agent import LlmAgent - from ..runners import Runner - from ..sessions.in_memory_session_service import InMemorySessionService if self.skip_summarization: tool_context.actions.skip_summarization = True @@ -135,38 +133,8 @@ async def run_async( role='user', parts=[types.Part.from_text(text=args['request'])], ) - if self.persist_memory: - session_id = tool_context._invocation_context.session.id - if session_id not in self._runners: - runner = Runner( - app_name=self.agent.name, - agent=self.agent, - artifact_service=ForwardingArtifactService(tool_context), - session_service=InMemorySessionService(), - memory_service=InMemoryMemoryService(), - credential_service=tool_context._invocation_context.credential_service, - ) - session = await runner.session_service.create_session( - app_name=self.agent.name, - user_id=tool_context._invocation_context.user_id, - state=tool_context.state.to_dict(), - ) - self._runners[session_id] = (runner, session) - (runner, session) = self._runners[session_id] - else: - runner = Runner( - app_name=self.agent.name, - agent=self.agent, - artifact_service=ForwardingArtifactService(tool_context), - session_service=InMemorySessionService(), - memory_service=InMemoryMemoryService(), - credential_service=tool_context._invocation_context.credential_service, - ) - session = await runner.session_service.create_session( - app_name=self.agent.name, - user_id=tool_context._invocation_context.user_id, - state=tool_context.state.to_dict(), - ) + + runner, session = await self._get_or_create_runner_and_session(tool_context) last_content = None async with Aclosing( @@ -192,6 +160,45 @@ async def run_async( tool_result = merged_text return tool_result + async def _get_or_create_runner_and_session(self, tool_context: ToolContext): + from ..runners import Runner + from ..sessions.in_memory_session_service import InMemorySessionService + from ..memory.in_memory_memory_service import InMemoryMemoryService + + if self.persist_memory: + session_id = tool_context._invocation_context.session.id + if session_id not in self._runners: + runner = Runner( + app_name=self.agent.name, + agent=self.agent, + artifact_service=ForwardingArtifactService(tool_context), + session_service=InMemorySessionService(), + memory_service=InMemoryMemoryService(), + credential_service=tool_context._invocation_context.credential_service, + ) + session = await runner.session_service.create_session( + app_name=self.agent.name, + user_id=tool_context._invocation_context.user_id, + state=tool_context.state.to_dict(), + ) + self._runners[session_id] = (runner, session) + return self._runners[session_id] + + runner = Runner( + app_name=self.agent.name, + agent=self.agent, + artifact_service=ForwardingArtifactService(tool_context), + session_service=InMemorySessionService(), + memory_service=InMemoryMemoryService(), + credential_service=tool_context._invocation_context.credential_service, + ) + session = await runner.session_service.create_session( + app_name=self.agent.name, + user_id=tool_context._invocation_context.user_id, + state=tool_context.state.to_dict(), + ) + return runner, session + @override @classmethod def from_config( From 1c658638b3860813d8ca1f27271aac322a397f30 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 13:00:11 +0000 Subject: [PATCH 3/8] refactor: Simplify runner and session creation in AgentTool --- src/google/adk/tools/agent_tool.py | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 781cbaa5a6c..a46a4322df4 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -165,23 +165,8 @@ async def _get_or_create_runner_and_session(self, tool_context: ToolContext): from ..sessions.in_memory_session_service import InMemorySessionService from ..memory.in_memory_memory_service import InMemoryMemoryService - if self.persist_memory: - session_id = tool_context._invocation_context.session.id - if session_id not in self._runners: - runner = Runner( - app_name=self.agent.name, - agent=self.agent, - artifact_service=ForwardingArtifactService(tool_context), - session_service=InMemorySessionService(), - memory_service=InMemoryMemoryService(), - credential_service=tool_context._invocation_context.credential_service, - ) - session = await runner.session_service.create_session( - app_name=self.agent.name, - user_id=tool_context._invocation_context.user_id, - state=tool_context.state.to_dict(), - ) - self._runners[session_id] = (runner, session) + session_id = tool_context._invocation_context.session.id + if self.persist_memory and session_id in self._runners: return self._runners[session_id] runner = Runner( @@ -197,6 +182,10 @@ async def _get_or_create_runner_and_session(self, tool_context: ToolContext): user_id=tool_context._invocation_context.user_id, state=tool_context.state.to_dict(), ) + + if self.persist_memory: + self._runners[session_id] = (runner, session) + return runner, session @override From 9e290039b12e214223dcb0e492c4f155cbc75255 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 13:12:46 +0000 Subject: [PATCH 4/8] refactor: Simplify runner and session creation in AgentTool --- src/google/adk/tools/agent_tool.py | 51 ++++++++++-------------- tests/unittests/tools/test_agent_tool.py | 1 + 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index a46a4322df4..a3d02a63121 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -114,6 +114,9 @@ async def run_async( tool_context: ToolContext, ) -> Any: from ..agents.llm_agent import LlmAgent + from ..runners import Runner + from ..sessions.in_memory_session_service import InMemorySessionService + from ..memory.in_memory_memory_service import InMemoryMemoryService if self.skip_summarization: tool_context.actions.skip_summarization = True @@ -134,7 +137,25 @@ async def run_async( parts=[types.Part.from_text(text=args['request'])], ) - runner, session = await self._get_or_create_runner_and_session(tool_context) + session_id = tool_context._invocation_context.session.id + if self.persist_memory and session_id in self._runners: + runner, session = self._runners[session_id] + else: + runner = Runner( + app_name=self.agent.name, + agent=self.agent, + artifact_service=ForwardingArtifactService(tool_context), + session_service=InMemorySessionService(), + memory_service=InMemoryMemoryService(), + credential_service=tool_context._invocation_context.credential_service, + ) + session = await runner.session_service.create_session( + app_name=self.agent.name, + user_id=tool_context._invocation_context.user_id, + state=tool_context.state.to_dict(), + ) + if self.persist_memory: + self._runners[session_id] = (runner, session) last_content = None async with Aclosing( @@ -160,34 +181,6 @@ async def run_async( tool_result = merged_text return tool_result - async def _get_or_create_runner_and_session(self, tool_context: ToolContext): - from ..runners import Runner - from ..sessions.in_memory_session_service import InMemorySessionService - from ..memory.in_memory_memory_service import InMemoryMemoryService - - session_id = tool_context._invocation_context.session.id - if self.persist_memory and session_id in self._runners: - return self._runners[session_id] - - runner = Runner( - app_name=self.agent.name, - agent=self.agent, - artifact_service=ForwardingArtifactService(tool_context), - session_service=InMemorySessionService(), - memory_service=InMemoryMemoryService(), - credential_service=tool_context._invocation_context.credential_service, - ) - session = await runner.session_service.create_session( - app_name=self.agent.name, - user_id=tool_context._invocation_context.user_id, - state=tool_context.state.to_dict(), - ) - - if self.persist_memory: - self._runners[session_id] = (runner, session) - - return runner, session - @override @classmethod def from_config( diff --git a/tests/unittests/tools/test_agent_tool.py b/tests/unittests/tools/test_agent_tool.py index 6481a582ab3..954f59622ff 100644 --- a/tests/unittests/tools/test_agent_tool.py +++ b/tests/unittests/tools/test_agent_tool.py @@ -124,6 +124,7 @@ async def before_tool_agent(callback_context: CallbackContext): tool_agent = SequentialAgent( name='tool_agent', + sub_agents= [], before_agent_callback=before_tool_agent, ) From ea73e2304d319011c1190174ede568b46c769a02 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 13:18:52 +0000 Subject: [PATCH 5/8] remove duplicate --- src/google/adk/tools/agent_tool.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index a3d02a63121..8b06a1d169e 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -116,7 +116,6 @@ async def run_async( from ..agents.llm_agent import LlmAgent from ..runners import Runner from ..sessions.in_memory_session_service import InMemorySessionService - from ..memory.in_memory_memory_service import InMemoryMemoryService if self.skip_summarization: tool_context.actions.skip_summarization = True From 60ba9437877e95f1bd4b742c0a0ae77c22ad7e43 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 13:40:49 +0000 Subject: [PATCH 6/8] refactor: Add cleanup method to AgentTool to prevent memory leaks --- src/google/adk/tools/agent_tool.py | 9 ++++ tests/unittests/tools/test_agent_tool.py | 52 +++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 8b06a1d169e..2c370ed6c73 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -152,6 +152,7 @@ async def run_async( app_name=self.agent.name, user_id=tool_context._invocation_context.user_id, state=tool_context.state.to_dict(), + session_id=session_id, ) if self.persist_memory: self._runners[session_id] = (runner, session) @@ -180,6 +181,14 @@ async def run_async( tool_result = merged_text return tool_result + def cleanup(self, session_id: str | None = None): + """Cleans up the runners for all sessions.""" + if self.persist_memory: + if session_id: + self._runners.pop(session_id, None) + else: + self._runners.clear() + @override @classmethod def from_config( diff --git a/tests/unittests/tools/test_agent_tool.py b/tests/unittests/tools/test_agent_tool.py index 954f59622ff..b5ea6456302 100644 --- a/tests/unittests/tools/test_agent_tool.py +++ b/tests/unittests/tools/test_agent_tool.py @@ -451,4 +451,54 @@ async def test_no_persist_memory(): second_request_contents = tool_mock_model.requests[1].contents assert len(second_request_contents) == 1 assert second_request_contents[0].role == "user" - assert second_request_contents[0].parts[0].text == "test2" \ No newline at end of file + assert second_request_contents[0].parts[0].text == "test2" + +@mark.asyncio +async def test_cleanup(): + """Tests that the agent tool can cleanup runners.""" + # Model for the sub-agent + tool_mock_model = testing_utils.MockModel.create( + responses=["Sub-agent response 1", "Sub-agent response 2"] + ) + tool_agent = Agent( + name="tool_agent", + model=tool_mock_model, + ) + + agent_tool = AgentTool(agent=tool_agent, persist_memory=True) + + # Create a mock tool context + mock_context = MagicMock(spec=ToolContext) + mock_invocation_context = MagicMock() + mock_session = MagicMock() + mock_session.id = "test_session" + mock_invocation_context.session = mock_session + mock_invocation_context.user_id = "test_user" + mock_invocation_context.credential_service = InMemoryCredentialService() + mock_context._invocation_context = mock_invocation_context + mock_context.state = MagicMock() + mock_context.state.to_dict.return_value = {} + + # First call to the tool + await agent_tool.run_async( + args={"request": "test1"}, tool_context=mock_context + ) + + assert len(agent_tool._runners) == 1 + + # Cleanup the session + agent_tool.cleanup("test_session") + + assert len(agent_tool._runners) == 0 + + # Second call to the tool + await agent_tool.run_async( + args={"request": "test2"}, tool_context=mock_context + ) + + assert len(agent_tool._runners) == 1 + + # Cleanup all sessions + agent_tool.cleanup() + + assert len(agent_tool._runners) == 0 \ No newline at end of file From e526f82cfb8a1a4825ebb13d0aaa7cb835a687f5 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 13:51:11 +0000 Subject: [PATCH 7/8] refactor: Add type hint and refactor tests for AgentTool --- src/google/adk/tools/agent_tool.py | 2 + tests/unittests/tools/test_agent_tool.py | 100 ++++++++--------------- 2 files changed, 35 insertions(+), 67 deletions(-) diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 2c370ed6c73..f1b50a91c48 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -46,6 +46,8 @@ class AgentTool(BaseTool): agent: The agent to wrap. skip_summarization: Whether to skip summarization of the agent output. """ + _runners: Optional[dict[str, tuple['Runner', 'Session']]] + _runners: Optional[dict[str, tuple['Runner', 'Session']]] def __init__( self, diff --git a/tests/unittests/tools/test_agent_tool.py b/tests/unittests/tools/test_agent_tool.py index b5ea6456302..cf9ab82dd27 100644 --- a/tests/unittests/tools/test_agent_tool.py +++ b/tests/unittests/tools/test_agent_tool.py @@ -23,6 +23,7 @@ from google.genai import types from google.genai.types import Part from pydantic import BaseModel +from pytest import fixture from pytest import mark from .. import testing_utils @@ -44,6 +45,31 @@ ) +@fixture +def agent_tool_test_setup(): + """Sets up common objects for agent tool tests.""" + tool_mock_model = testing_utils.MockModel.create( + responses=["Sub-agent response 1", "Sub-agent response 2"] + ) + tool_agent = Agent( + name="tool_agent", + model=tool_mock_model, + ) + + mock_context = MagicMock(spec=ToolContext) + mock_invocation_context = MagicMock() + mock_session = MagicMock() + mock_session.id = "test_session" + mock_invocation_context.session = mock_session + mock_invocation_context.user_id = "test_user" + mock_invocation_context.credential_service = InMemoryCredentialService() + mock_context._invocation_context = mock_invocation_context + mock_context.state = MagicMock() + mock_context.state.to_dict.return_value = {} + + return tool_agent, tool_mock_model, mock_context + + def change_state_callback(callback_context: CallbackContext): callback_context.state['state_1'] = 'changed_value' print('change_state_callback: ', callback_context.state) @@ -361,31 +387,11 @@ class CustomInput(BaseModel): assert declaration.response.type == types.Type.STRING @mark.asyncio -async def test_persist_memory(): +async def test_persist_memory(agent_tool_test_setup): """Tests that the agent tool can persist memory across tool calls.""" - # Model for the sub-agent - tool_mock_model = testing_utils.MockModel.create( - responses=["Sub-agent response 1", "Sub-agent response 2"] - ) - tool_agent = Agent( - name="tool_agent", - model=tool_mock_model, - ) - + tool_agent, tool_mock_model, mock_context = agent_tool_test_setup agent_tool = AgentTool(agent=tool_agent, persist_memory=True) - # Create a mock tool context - mock_context = MagicMock(spec=ToolContext) - mock_invocation_context = MagicMock() - mock_session = MagicMock() - mock_session.id = "test_session" - mock_invocation_context.session = mock_session - mock_invocation_context.user_id = "test_user" - mock_invocation_context.credential_service = InMemoryCredentialService() - mock_context._invocation_context = mock_invocation_context - mock_context.state = MagicMock() - mock_context.state.to_dict.return_value = {} - # First call to the tool await agent_tool.run_async( args={"request": "test1"}, tool_context=mock_context @@ -410,31 +416,11 @@ async def test_persist_memory(): @mark.asyncio -async def test_no_persist_memory(): +async def test_no_persist_memory(agent_tool_test_setup): """Tests that the agent tool does not persist memory across tool calls.""" - # Model for the sub-agent - tool_mock_model = testing_utils.MockModel.create( - responses=["Sub-agent response 1", "Sub-agent response 2"] - ) - tool_agent = Agent( - name="tool_agent", - model=tool_mock_model, - ) - + tool_agent, tool_mock_model, mock_context = agent_tool_test_setup agent_tool = AgentTool(agent=tool_agent, persist_memory=False) - # Create a mock tool context - mock_context = MagicMock(spec=ToolContext) - mock_invocation_context = MagicMock() - mock_session = MagicMock() - mock_session.id = "test_session" - mock_invocation_context.session = mock_session - mock_invocation_context.user_id = "test_user" - mock_invocation_context.credential_service = InMemoryCredentialService() - mock_context._invocation_context = mock_invocation_context - mock_context.state = MagicMock() - mock_context.state.to_dict.return_value = {} - # First call to the tool await agent_tool.run_async( args={"request": "test1"}, tool_context=mock_context @@ -454,31 +440,11 @@ async def test_no_persist_memory(): assert second_request_contents[0].parts[0].text == "test2" @mark.asyncio -async def test_cleanup(): +async def test_cleanup(agent_tool_test_setup): """Tests that the agent tool can cleanup runners.""" - # Model for the sub-agent - tool_mock_model = testing_utils.MockModel.create( - responses=["Sub-agent response 1", "Sub-agent response 2"] - ) - tool_agent = Agent( - name="tool_agent", - model=tool_mock_model, - ) - + tool_agent, _, mock_context = agent_tool_test_setup agent_tool = AgentTool(agent=tool_agent, persist_memory=True) - # Create a mock tool context - mock_context = MagicMock(spec=ToolContext) - mock_invocation_context = MagicMock() - mock_session = MagicMock() - mock_session.id = "test_session" - mock_invocation_context.session = mock_session - mock_invocation_context.user_id = "test_user" - mock_invocation_context.credential_service = InMemoryCredentialService() - mock_context._invocation_context = mock_invocation_context - mock_context.state = MagicMock() - mock_context.state.to_dict.return_value = {} - # First call to the tool await agent_tool.run_async( args={"request": "test1"}, tool_context=mock_context @@ -501,4 +467,4 @@ async def test_cleanup(): # Cleanup all sessions agent_tool.cleanup() - assert len(agent_tool._runners) == 0 \ No newline at end of file + assert len(agent_tool._runners) == 0 From d2da6e0a71b15797d5328aec6d2dfd72b0042a08 Mon Sep 17 00:00:00 2001 From: ThibaultScalbert Date: Thu, 4 Sep 2025 14:03:53 +0000 Subject: [PATCH 8/8] feat: Implement LRU cache for AgentTool runners --- pyproject.toml | 1 + src/google/adk/tools/agent_tool.py | 16 ++++++------- tests/unittests/tools/test_agent_tool.py | 30 +++++++++++------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1105e345ce8..52cf932b273 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ dependencies = [ "absolufy-imports>=0.3.1, <1.0.0", # For Agent Engine deployment. "anyio>=4.9.0, <5.0.0;python_version>='3.10'", # For MCP Session Manager "authlib>=1.5.1, <2.0.0", # For RestAPI Tool + "cachetools>=5.3.3, <6.0.0", # For LRU cache "click>=8.1.8, <9.0.0", # For CLI tools "fastapi>=0.115.0, <1.0.0", # FastAPI framework "google-api-python-client>=2.157.0, <3.0.0", # Google API client discovery diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index f1b50a91c48..c00d4b688b9 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -17,6 +17,7 @@ from typing import Any from typing import TYPE_CHECKING +from cachetools import LRUCache from google.genai import types from pydantic import model_validator from typing_extensions import override @@ -54,12 +55,13 @@ def __init__( agent: BaseAgent, skip_summarization: bool = False, persist_memory: bool = False, + cache_size: int = 128, ): self.agent = agent self.skip_summarization: bool = skip_summarization self.persist_memory: bool = persist_memory if self.persist_memory: - self._runners = {} + self._runners = LRUCache(maxsize=cache_size) else: self._runners = None @@ -183,14 +185,6 @@ async def run_async( tool_result = merged_text return tool_result - def cleanup(self, session_id: str | None = None): - """Cleans up the runners for all sessions.""" - if self.persist_memory: - if session_id: - self._runners.pop(session_id, None) - else: - self._runners.clear() - @override @classmethod def from_config( @@ -207,6 +201,7 @@ def from_config( agent=agent, skip_summarization=agent_tool_config.skip_summarization, persist_memory=agent_tool_config.persist_memory, + cache_size=agent_tool_config.cache_size, ) @@ -221,3 +216,6 @@ class AgentToolConfig(BaseToolConfig): persist_memory: bool = False """Whether to persist the agent's memory across tool calls.""" + + cache_size: int = 128 + """The maximum number of runners to cache.""" diff --git a/tests/unittests/tools/test_agent_tool.py b/tests/unittests/tools/test_agent_tool.py index cf9ab82dd27..5369d516292 100644 --- a/tests/unittests/tools/test_agent_tool.py +++ b/tests/unittests/tools/test_agent_tool.py @@ -49,7 +49,7 @@ def agent_tool_test_setup(): """Sets up common objects for agent tool tests.""" tool_mock_model = testing_utils.MockModel.create( - responses=["Sub-agent response 1", "Sub-agent response 2"] + responses=["Sub-agent response 1", "Sub-agent response 2", "Sub-agent response 3"] ) tool_agent = Agent( name="tool_agent", @@ -440,31 +440,29 @@ async def test_no_persist_memory(agent_tool_test_setup): assert second_request_contents[0].parts[0].text == "test2" @mark.asyncio -async def test_cleanup(agent_tool_test_setup): - """Tests that the agent tool can cleanup runners.""" +async def test_lru_cache(agent_tool_test_setup): + """Tests that the LRU cache evicts runners.""" tool_agent, _, mock_context = agent_tool_test_setup - agent_tool = AgentTool(agent=tool_agent, persist_memory=True) + agent_tool = AgentTool(agent=tool_agent, persist_memory=True, cache_size=2) # First call to the tool + mock_context._invocation_context.session.id = "session1" await agent_tool.run_async( args={"request": "test1"}, tool_context=mock_context ) - assert len(agent_tool._runners) == 1 - # Cleanup the session - agent_tool.cleanup("test_session") - - assert len(agent_tool._runners) == 0 - # Second call to the tool + mock_context._invocation_context.session.id = "session2" await agent_tool.run_async( args={"request": "test2"}, tool_context=mock_context ) + assert len(agent_tool._runners) == 2 - assert len(agent_tool._runners) == 1 - - # Cleanup all sessions - agent_tool.cleanup() - - assert len(agent_tool._runners) == 0 + # Third call to the tool, should evict the first runner + mock_context._invocation_context.session.id = "session3" + await agent_tool.run_async( + args={"request": "test3"}, tool_context=mock_context + ) + assert len(agent_tool._runners) == 2 + assert "session1" not in agent_tool._runners \ No newline at end of file