add tool hooks

Signed-off-by: myan <[email protected]>

Author: yanmxa

examples/basic/agent_lifecycle_example.py

@@ -28,7 +28,7 @@ async def on_handoff(self, context: RunContextWrapper, agent: Agent, source: Age
             f"### ({self.display_name}) {self.event_counter}: Agent {source.name} handed off to {agent.name}"
         )
 
-    async def on_tool_start(self, context: RunContextWrapper, agent: Agent, tool: Tool) -> None:
+    async def on_tool_start(self, context: RunContextWrapper, agent: Agent, tool: Tool, args: str) -> None:
         self.event_counter += 1
         print(
             f"### ({self.display_name}) {self.event_counter}: Agent {agent.name} started tool {tool.name}"

examples/basic/lifecycle_example.py

@@ -26,7 +26,7 @@ async def on_agent_end(self, context: RunContextWrapper, agent: Agent, output: A
             f"### {self.event_counter}: Agent {agent.name} ended with output {output}. Usage: {self._usage_to_str(context.usage)}"
         )
 
-    async def on_tool_start(self, context: RunContextWrapper, agent: Agent, tool: Tool) -> None:
+    async def on_tool_start(self, context: RunContextWrapper, agent: Agent, tool: Tool, args: str) -> None:
         self.event_counter += 1
         print(
             f"### {self.event_counter}: Tool {tool.name} started. Usage: {self._usage_to_str(context.usage)}"

src/agents/_run_impl.py

@@ -437,9 +437,9 @@ async def run_single_tool(
                     span_fn.span_data.input = tool_call.arguments
                 try:
                     _, _, result = await asyncio.gather(
-                        hooks.on_tool_start(context_wrapper, agent, func_tool),
+                        hooks.on_tool_start(context_wrapper, agent, func_tool, tool_call.arguments),
                         (
-                            agent.hooks.on_tool_start(context_wrapper, agent, func_tool)
+                            agent.hooks.on_tool_start(context_wrapper, agent, func_tool, tool_call.arguments)
                             if agent.hooks
                             else _coro.noop_coroutine()
                         ),

src/agents/lifecycle.py

@@ -39,6 +39,7 @@ async def on_tool_start(
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
         tool: Tool,
+        args: str,
     ) -> None:
         """Called before a tool is invoked."""
         pass
@@ -61,7 +62,9 @@ class AgentHooks(Generic[TContext]):
     Subclass and override the methods you need.
     """
 
-    async def on_start(self, context: RunContextWrapper[TContext], agent: Agent[TContext]) -> None:
+    async def on_start(
+        self, context: RunContextWrapper[TContext], agent: Agent[TContext]
+    ) -> None:
         """Called before the agent is invoked. Called each time the running agent is changed to this
         agent."""
         pass
@@ -90,6 +93,7 @@ async def on_tool_start(
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
         tool: Tool,
+        args: str,
     ) -> None:
         """Called before a tool is invoked."""
         pass

tests/test_agent_hooks.py

@@ -54,6 +54,7 @@ async def on_tool_start(
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
         tool: Tool,
+        args: str,
     ) -> None:
         self.events["on_tool_start"] += 1
 

tests/test_computer_action.py

@@ -127,10 +127,18 @@ async def drag(self, path: list[tuple[int, int]]) -> None:
 @pytest.mark.parametrize(
     "action,expected_call",
     [
-        (ActionClick(type="click", x=10, y=21, button="left"), ("click", (10, 21, "left"))),
-        (ActionDoubleClick(type="double_click", x=42, y=47), ("double_click", (42, 47))),
         (
-            ActionDrag(type="drag", path=[ActionDragPath(x=1, y=2), ActionDragPath(x=3, y=4)]),
+            ActionClick(type="click", x=10, y=21, button="left"),
+            ("click", (10, 21, "left")),
+        ),
+        (
+            ActionDoubleClick(type="double_click", x=42, y=47),
+            ("double_click", (42, 47)),
+        ),
+        (
+            ActionDrag(
+                type="drag", path=[ActionDragPath(x=1, y=2), ActionDragPath(x=3, y=4)]
+            ),
             ("drag", (((1, 2), (3, 4)),)),
         ),
         (ActionKeypress(type="keypress", keys=["a", "b"]), ("keypress", (["a", "b"],))),
@@ -172,13 +180,24 @@ async def test_get_screenshot_sync_executes_action_and_takes_screenshot(
 @pytest.mark.parametrize(
     "action,expected_call",
     [
-        (ActionClick(type="click", x=2, y=3, button="right"), ("click", (2, 3, "right"))),
-        (ActionDoubleClick(type="double_click", x=12, y=13), ("double_click", (12, 13))),
         (
-            ActionDrag(type="drag", path=[ActionDragPath(x=5, y=6), ActionDragPath(x=6, y=7)]),
+            ActionClick(type="click", x=2, y=3, button="right"),
+            ("click", (2, 3, "right")),
+        ),
+        (
+            ActionDoubleClick(type="double_click", x=12, y=13),
+            ("double_click", (12, 13)),
+        ),
+        (
+            ActionDrag(
+                type="drag", path=[ActionDragPath(x=5, y=6), ActionDragPath(x=6, y=7)]
+            ),
             ("drag", (((5, 6), (6, 7)),)),
         ),
-        (ActionKeypress(type="keypress", keys=["ctrl", "c"]), ("keypress", (["ctrl", "c"],))),
+        (
+            ActionKeypress(type="keypress", keys=["ctrl", "c"]),
+            ("keypress", (["ctrl", "c"],)),
+        ),
         (ActionMove(type="move", x=8, y=9), ("move", (8, 9))),
         (ActionScreenshot(type="screenshot"), ("screenshot", ())),
         (
@@ -241,7 +260,7 @@ def __init__(self) -> None:
         self.ended: list[tuple[Agent[Any], Any, str]] = []
 
     async def on_tool_start(
-        self, context: RunContextWrapper[Any], agent: Agent[Any], tool: Any
+        self, context: RunContextWrapper[Any], agent: Agent[Any], tool: Any, args: str,
     ) -> None:
         self.started.append((agent, tool))