fix(pydantic-ai): Do not fail on new ToolManager._call_tool() parameters (#5084)

Update our patch of `ToolManager._call_tool` to accept arbitrary parameters, preventing unexpected arguments. In version 1.12.0 of `pydantic-ai`, `ToolManager._call_tool` introduced a new parameter, which caused our patch to raise an exception.

Author: alexander-alderman-webb

sentry_sdk/integrations/pydantic_ai/patches/tools.py

@@ -37,8 +37,8 @@ def _patch_tool_execution():
     original_call_tool = ToolManager._call_tool
 
     @wraps(original_call_tool)
-    async def wrapped_call_tool(self, call, allow_partial, wrap_validation_errors):
-        # type: (Any, Any, bool, bool) -> Any
+    async def wrapped_call_tool(self, call, *args, **kwargs):
+        # type: (Any, Any, *Any, **Any) -> Any
 
         # Extract tool info before calling original
         name = call.tool_name
@@ -64,18 +64,14 @@ async def wrapped_call_tool(self, call, allow_partial, wrap_validation_errors):
 
             with execute_tool_span(name, args_dict, agent, tool_type=tool_type) as span:
                 try:
-                    result = await original_call_tool(
-                        self, call, allow_partial, wrap_validation_errors
-                    )
+                    result = await original_call_tool(self, call, *args, **kwargs)
                     update_execute_tool_span(span, result)
                     return result
                 except Exception as exc:
                     _capture_exception(exc)
                     raise exc from None
 
         # No span context - just call original
-        return await original_call_tool(
-            self, call, allow_partial, wrap_validation_errors
-        )
+        return await original_call_tool(self, call, *args, **kwargs)
 
     ToolManager._call_tool = wrapped_call_tool

tox.ini

@@ -103,9 +103,9 @@ envlist =
     {py3.10,py3.13,py3.14,py3.14t}-openai_agents-v0.5.0
 
     {py3.10,py3.12,py3.13}-pydantic_ai-v1.0.18
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.3.0
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.6.0
-    {py3.10,py3.12,py3.13}-pydantic_ai-v1.10.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.4.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.8.0
+    {py3.10,py3.12,py3.13}-pydantic_ai-v1.12.0
 
 
     # ~~~ Cloud ~~~
@@ -434,9 +434,9 @@ deps =
     openai_agents: pytest-asyncio
 
     pydantic_ai-v1.0.18: pydantic-ai==1.0.18
-    pydantic_ai-v1.3.0: pydantic-ai==1.3.0
-    pydantic_ai-v1.6.0: pydantic-ai==1.6.0
-    pydantic_ai-v1.10.0: pydantic-ai==1.10.0
+    pydantic_ai-v1.4.0: pydantic-ai==1.4.0
+    pydantic_ai-v1.8.0: pydantic-ai==1.8.0
+    pydantic_ai-v1.12.0: pydantic-ai==1.12.0
     pydantic_ai: pytest-asyncio