rollback

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

Author: yanmxa

examples/basic/agent_lifecycle_example.py

@@ -4,7 +4,7 @@
 
 from pydantic import BaseModel
 
-from agents import Agent, AgentHooks, RunContextWrapper, Runner, Tool, function_tool
+from agents import Agent, AgentHooks, RunContextWrapper, Runner, Tool, Action, function_tool
 
 
 class CustomAgentHooks(AgentHooks):
@@ -28,10 +28,10 @@ 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, action: Action) -> None:
         self.event_counter += 1
         print(
-            f"### ({self.display_name}) {self.event_counter}: Agent {agent.name} started tool {tool.name}"
+            f"### ({self.display_name}) {self.event_counter}: Agent {agent.name} started tool {action.function_tool.name}"
         )
 
     async def on_tool_end(

examples/basic/lifecycle_example.py

@@ -4,8 +4,17 @@
 
 from pydantic import BaseModel
 
-from agents import Agent, RunContextWrapper, RunHooks, Runner, Tool, Usage, function_tool
-
+from agents import (
+    Agent,
+    RunContextWrapper,
+    RunHooks,
+    Runner,
+    Tool,
+    Action,
+    Usage,
+    function_tool,
+    ToolCallItem
+)
 
 class ExampleHooks(RunHooks):
     def __init__(self):
@@ -26,10 +35,15 @@ 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,
+        action: Action,
+    ) -> None:
         self.event_counter += 1
         print(
-            f"### {self.event_counter}: Tool {tool.name} started. Usage: {self._usage_to_str(context.usage)}"
+            f"### {self.event_counter}: Tool {action.function_tool.tool.name} started. Usage: {self._usage_to_str(context.usage)}"
         )
 
     async def on_tool_end(

src/agents/__init__.py

@@ -62,6 +62,7 @@
     WebSearchTool,
     default_tool_error_function,
     function_tool,
+    Action,
 )
 from .tracing import (
     AgentSpanData,
@@ -209,6 +210,7 @@ def enable_verbose_stdout_logging():
     "Tool",
     "WebSearchTool",
     "function_tool",
+    "Action",
     "Usage",
     "add_trace_processor",
     "agent_span",

src/agents/lifecycle.py

@@ -2,7 +2,7 @@
 
 from .agent import Agent
 from .run_context import RunContextWrapper, TContext
-from .tool import Tool
+from .tool import Tool, Action
 
 
 class RunHooks(Generic[TContext]):
@@ -38,7 +38,7 @@ async def on_tool_start(
         self,
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
-        tool: Tool,
+        action: Action,
     ) -> None:
         """Called before a tool is invoked."""
         pass
@@ -89,7 +89,7 @@ async def on_tool_start(
         self,
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
-        tool: Tool,
+        action: Action,
     ) -> None:
         """Called before a tool is invoked."""
         pass

tests/test_agent_hooks.py

@@ -7,7 +7,7 @@
 import pytest
 from typing_extensions import TypedDict
 
-from agents.agent import Agent
+from agents.agent import Agent, Action
 from agents.lifecycle import AgentHooks
 from agents.run import Runner
 from agents.run_context import RunContextWrapper, TContext
@@ -53,7 +53,7 @@ async def on_tool_start(
         self,
         context: RunContextWrapper[TContext],
         agent: Agent[TContext],
-        tool: Tool,
+        action: Action,
     ) -> None:
         self.events["on_tool_start"] += 1
 

tests/test_computer_action.py

@@ -23,6 +23,7 @@
 
 from agents import (
     Agent,
+    Action,
     AgentHooks,
     AsyncComputer,
     Computer,
@@ -31,7 +32,8 @@
     RunContextWrapper,
     RunHooks,
 )
-from agents._run_impl import ComputerAction, ToolRunComputerAction
+from agents._run_impl import ComputerAction
+from agents.tool import ToolRunComputerAction
 from agents.items import ToolCallOutputItem
 
 
@@ -127,10 +129,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 +182,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", ())),
         (
@@ -222,9 +243,9 @@ 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], action: Action,
     ) -> None:
-        self.started.append((agent, tool))
+        self.started.append((agent, action.computer_tool))
 
     async def on_tool_end(
         self, context: RunContextWrapper[Any], agent: Agent[Any], tool: Any, result: str
@@ -241,9 +262,9 @@ 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], action: Action,
     ) -> None:
-        self.started.append((agent, tool))
+        self.started.append((agent, action.computer_tool))
 
     async def on_tool_end(
         self, context: RunContextWrapper[Any], agent: Agent[Any], tool: Any, result: str