Merge branch 'main' into toolsets

# Conflicts:
#	pydantic_ai_slim/pydantic_ai/tools.py

Author: DouweM

pydantic_ai_slim/pydantic_ai/_agent_graph.py

@@ -737,22 +737,40 @@ async def _call_function_tool(
             {
                 'type': 'object',
                 'properties': {
-                    **({'tool_arguments': {'type': 'object'}} if include_content else {}),
+                    **(
+                        {
+                            'tool_arguments': {'type': 'object'},
+                            'tool_response': {'type': 'object'},
+                        }
+                        if include_content
+                        else {}
+                    ),
                     'gen_ai.tool.name': {},
                     'gen_ai.tool.call.id': {},
                 },
             }
         ),
     }
 
-    with tracer.start_as_current_span('running tool', attributes=span_attributes):
+    with tracer.start_as_current_span('running tool', attributes=span_attributes) as span:
         try:
             tool_result = await _call_tool(toolset, tool_call, run_context)
         except ToolRetryError as e:
+            part = e.tool_retry
+            if include_content and span.is_recording():
+                span.set_attribute('tool_response', part.model_response())
             return (e.tool_retry, [])
 
+        part = _messages.ToolReturnPart(
+            tool_name=tool_call.tool_name,
+            content=tool_result,
+            tool_call_id=tool_call.tool_call_id,
+        )
+
+        if include_content and span.is_recording():
+            span.set_attribute('tool_response', part.model_response_str())
+
         extra_parts: list[_messages.ModelRequestPart] = []
-        metadata = None
 
         def process_content(content: Any) -> Any:
             if isinstance(content, _messages.ToolReturn):
@@ -790,27 +808,20 @@ def process_content(content: Any) -> Any:
                     f'Please use `content` instead.'
                 )
 
-            metadata = tool_result.metadata
+            part.content = tool_result.return_value  # type: ignore
+            part.metadata = tool_result.metadata
             if tool_result.content:
                 extra_parts.append(
                     _messages.UserPromptPart(
                         content=list(tool_result.content),
                         part_kind='user-prompt',
                     )
                 )
-            tool_result = tool_result.return_value  # type: ignore
         elif isinstance(tool_result, list):
             contents = cast(list[Any], tool_result)
-            tool_result = [process_content(content) for content in contents]
+            part.content = [process_content(content) for content in contents]
         else:
-            tool_result = process_content(tool_result)
-
-        part = _messages.ToolReturnPart(
-            tool_name=tool_call.tool_name,
-            content=tool_result,
-            metadata=metadata,
-            tool_call_id=tool_call.tool_call_id,
-        )
+            part.content = process_content(tool_result)
 
         return (part, extra_parts)
 

tests/test_logfire.py

@@ -555,6 +555,46 @@ async def add_numbers(x: int, y: int) -> int:
     ]
 
     if include_content:
-        assert tool_attributes['tool_arguments'] == snapshot('{"x":42,"y":42}')
+        assert tool_attributes == snapshot(
+            {
+                'gen_ai.tool.name': 'add_numbers',
+                'gen_ai.tool.call.id': IsStr(),
+                'tool_arguments': '{"x":42,"y":42}',
+                'tool_response': '84',
+                'logfire.msg': 'running tool: add_numbers',
+                'logfire.json_schema': IsJson(
+                    snapshot(
+                        {
+                            'type': 'object',
+                            'properties': {
+                                'tool_arguments': {'type': 'object'},
+                                'tool_response': {'type': 'object'},
+                                'gen_ai.tool.name': {},
+                                'gen_ai.tool.call.id': {},
+                            },
+                        }
+                    )
+                ),
+                'logfire.span_type': 'span',
+            }
+        )
     else:
-        assert 'tool_arguments' not in tool_attributes
+        assert tool_attributes == snapshot(
+            {
+                'gen_ai.tool.name': 'add_numbers',
+                'gen_ai.tool.call.id': IsStr(),
+                'logfire.msg': 'running tool: add_numbers',
+                'logfire.json_schema': IsJson(
+                    snapshot(
+                        {
+                            'type': 'object',
+                            'properties': {
+                                'gen_ai.tool.name': {},
+                                'gen_ai.tool.call.id': {},
+                            },
+                        }
+                    )
+                ),
+                'logfire.span_type': 'span',
+            }
+        )