pydantic-ai 0.0.30__tar.gz → 0.0.31__tar.gz

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydantic-ai
-Version: 0.0.30
+Version: 0.0.31
 Summary: Agent Framework / shim to use Pydantic with LLMs
 Project-URL: Homepage, https://ai.pydantic.dev
 Project-URL: Source, https://github.com/pydantic/pydantic-ai
@@ -28,9 +28,9 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
-Requires-Dist: pydantic-ai-slim[anthropic,cohere,groq,mistral,openai,vertexai]==0.0.30
+Requires-Dist: pydantic-ai-slim[anthropic,cohere,groq,mistral,openai,vertexai]==0.0.31
 Provides-Extra: examples
-Requires-Dist: pydantic-ai-examples==0.0.30; extra == 'examples'
+Requires-Dist: pydantic-ai-examples==0.0.31; extra == 'examples'
 Provides-Extra: logfire
 Requires-Dist: logfire>=2.3; extra == 'logfire'
 Description-Content-Type: text/markdown

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pydantic-ai"
-version = "0.0.30"
+version = "0.0.31"
 description = "Agent Framework / shim to use Pydantic with LLMs"
 authors = [{ name = "Samuel Colvin", email = "samuel@pydantic.dev" }]
 license = "MIT"
@@ -32,7 +32,7 @@ classifiers = [
 requires-python = ">=3.9"
 
 dependencies = [
-    "pydantic-ai-slim[openai,vertexai,groq,anthropic,mistral,cohere]==0.0.30",
+    "pydantic-ai-slim[openai,vertexai,groq,anthropic,mistral,cohere]==0.0.31",
 ]
 
 [project.urls]
@@ -42,7 +42,7 @@ Documentation = "https://ai.pydantic.dev"
 Changelog = "https://github.com/pydantic/pydantic-ai/releases"
 
 [project.optional-dependencies]
-examples = ["pydantic-ai-examples==0.0.30"]
+examples = ["pydantic-ai-examples==0.0.31"]
 logfire = ["logfire>=2.3"]
 
 [tool.uv.sources]

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/tests/models/test_instrumented.py

@@ -632,3 +632,33 @@ Fix the errors and try again.\
             },
         ]
     )
+
+
+def test_messages_to_otel_events_serialization_errors():
+    class Foo:
+        def __repr__(self):
+            return 'Foo()'
+
+    class Bar:
+        def __repr__(self):
+            raise ValueError
+
+    messages = [
+        ModelResponse(parts=[ToolCallPart('tool', {'arg': Foo()})]),
+        ModelRequest(parts=[ToolReturnPart('tool', Bar())]),
+    ]
+
+    assert [
+        InstrumentedModel.event_to_dict(e) for e in InstrumentedModel.messages_to_otel_events(messages)
+    ] == snapshot(
+        [
+            {
+                'body': "{'role': 'assistant', 'tool_calls': [{'id': None, 'type': 'function', 'function': {'name': 'tool', 'arguments': {'arg': Foo()}}}]}",
+                'event.name': 'gen_ai.assistant.message',
+            },
+            {
+                'body': 'Unable to serialize event body',
+                'event.name': 'gen_ai.tool.message',
+            },
+        ]
+    )

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/tests/test_agent.py

@@ -1183,6 +1183,42 @@ class TestMultipleToolCalls:
         tool_returns = [m for m in result.all_messages() if isinstance(m, ToolReturnPart)]
         assert tool_returns == snapshot([])
 
+    def test_multiple_final_result_are_validated_correctly(self):
+        """Tests that if multiple final results are returned, but one fails validation, the other is used."""
+
+        def return_model(_: list[ModelMessage], info: AgentInfo) -> ModelResponse:
+            assert info.result_tools is not None
+            return ModelResponse(
+                parts=[
+                    ToolCallPart('final_result', {'bad_value': 'first'}, tool_call_id='first'),
+                    ToolCallPart('final_result', {'value': 'second'}, tool_call_id='second'),
+                ]
+            )
+
+        agent = Agent(FunctionModel(return_model), result_type=self.ResultType, end_strategy='early')
+        result = agent.run_sync('test multiple final results')
+
+        # Verify the result came from the second final tool
+        assert result.data.value == 'second'
+
+        # Verify we got appropriate tool returns
+        assert result.new_messages()[-1].parts == snapshot(
+            [
+                ToolReturnPart(
+                    tool_name='final_result',
+                    tool_call_id='first',
+                    content='Result tool not used - result failed validation.',
+                    timestamp=IsNow(tz=timezone.utc),
+                ),
+                ToolReturnPart(
+                    tool_name='final_result',
+                    content='Final result processed.',
+                    timestamp=IsNow(tz=timezone.utc),
+                    tool_call_id='second',
+                ),
+            ]
+        )
+
 
 async def test_model_settings_override() -> None:
     def return_settings(_: list[ModelMessage], info: AgentInfo) -> ModelResponse:

pydantic_ai-0.0.31/tests/test_logfire.py

@@ -0,0 +1,191 @@
+from __future__ import annotations as _annotations
+
+from dataclasses import dataclass
+from typing import Any, Callable
+
+import pytest
+from dirty_equals import IsInt, IsJson
+from inline_snapshot import snapshot
+from typing_extensions import NotRequired, TypedDict
+
+from pydantic_ai import Agent
+from pydantic_ai.models.test import TestModel
+
+try:
+    from logfire.testing import CaptureLogfire
+except ImportError:
+    logfire_installed = False
+else:
+    logfire_installed = True
+
+
+class SpanSummary(TypedDict):
+    id: int
+    message: str
+    children: NotRequired[list[SpanSummary]]
+
+
+@dataclass(init=False)
+class LogfireSummary:
+    traces: list[SpanSummary]
+    attributes: dict[int, dict[str, Any]]
+
+    def __init__(self, capfire: CaptureLogfire):
+        spans = capfire.exporter.exported_spans_as_dict()
+        spans.sort(key=lambda s: s['start_time'])
+        self.traces = []
+        span_lookup: dict[tuple[str, str], SpanSummary] = {}
+        self.attributes = {}
+        id_counter = 0
+        for span in spans:
+            tid = span['context']['trace_id'], span['context']['span_id']
+            span_lookup[tid] = span_summary = SpanSummary(id=id_counter, message=span['attributes']['logfire.msg'])
+            self.attributes[id_counter] = span['attributes']
+            id_counter += 1
+            if parent := span['parent']:
+                parent_span = span_lookup[(parent['trace_id'], parent['span_id'])]
+                parent_span.setdefault('children', []).append(span_summary)
+            else:
+                self.traces.append(span_summary)
+
+
+@pytest.fixture
+def get_logfire_summary(capfire: CaptureLogfire) -> Callable[[], LogfireSummary]:
+    def get_summary() -> LogfireSummary:
+        return LogfireSummary(capfire)
+
+    return get_summary
+
+
+@pytest.mark.skipif(not logfire_installed, reason='logfire not installed')
+def test_logfire(get_logfire_summary: Callable[[], LogfireSummary]) -> None:
+    my_agent = Agent(model=TestModel())
+
+    @my_agent.tool_plain
+    async def my_ret(x: int) -> str:
+        return str(x + 1)
+
+    result = my_agent.run_sync('Hello')
+    assert result.data == snapshot('{"my_ret":"1"}')
+
+    summary = get_logfire_summary()
+    assert summary.traces == snapshot(
+        [
+            {
+                'id': 0,
+                'message': 'my_agent run prompt=Hello',
+                'children': [
+                    {'id': 1, 'message': 'preparing model request params run_step=1'},
+                    {'id': 2, 'message': 'chat test'},
+                    {
+                        'id': 3,
+                        'message': 'handle model response -> tool-return',
+                        'children': [{'id': 4, 'message': "running tools=['my_ret']"}],
+                    },
+                    {'id': 5, 'message': 'preparing model request params run_step=2'},
+                    {'id': 6, 'message': 'chat test'},
+                    {'id': 7, 'message': 'handle model response -> final result'},
+                ],
+            }
+        ]
+    )
+    assert summary.attributes[0] == snapshot(
+        {
+            'code.filepath': 'test_logfire.py',
+            'code.function': 'test_logfire',
+            'code.lineno': 123,
+            'prompt': 'Hello',
+            'agent': IsJson(
+                {
+                    'model': {
+                        'call_tools': 'all',
+                        'custom_result_text': None,
+                        'custom_result_args': None,
+                        'seed': 0,
+                        'last_model_request_parameters': None,
+                    },
+                    'name': 'my_agent',
+                    'end_strategy': 'early',
+                    'model_settings': None,
+                }
+            ),
+            'model_name': 'test',
+            'agent_name': 'my_agent',
+            'logfire.msg_template': '{agent_name} run {prompt=}',
+            'logfire.msg': 'my_agent run prompt=Hello',
+            'logfire.span_type': 'span',
+            'all_messages_events': IsJson(
+                snapshot(
+                    [
+                        {
+                            'content': 'Hello',
+                            'role': 'user',
+                            'event.name': 'gen_ai.user.message',
+                        },
+                        {
+                            'role': 'assistant',
+                            'tool_calls': [
+                                {
+                                    'id': None,
+                                    'type': 'function',
+                                    'function': {
+                                        'name': 'my_ret',
+                                        'arguments': {'x': 0},
+                                    },
+                                }
+                            ],
+                            'event.name': 'gen_ai.assistant.message',
+                        },
+                        {
+                            'content': '1',
+                            'role': 'tool',
+                            'id': None,
+                            'event.name': 'gen_ai.tool.message',
+                        },
+                        {
+                            'role': 'assistant',
+                            'content': '{"my_ret":"1"}',
+                            'event.name': 'gen_ai.assistant.message',
+                        },
+                    ]
+                )
+            ),
+            'usage': IsJson(
+                {'requests': 2, 'request_tokens': 103, 'response_tokens': 12, 'total_tokens': 115, 'details': None}
+            ),
+            'logfire.json_schema': IsJson(
+                snapshot(
+                    {
+                        'type': 'object',
+                        'properties': {
+                            'prompt': {},
+                            'agent': {
+                                'type': 'object',
+                                'title': 'Agent',
+                                'x-python-datatype': 'dataclass',
+                                'properties': {
+                                    'model': {'type': 'object', 'title': 'TestModel', 'x-python-datatype': 'dataclass'}
+                                },
+                            },
+                            'model_name': {},
+                            'agent_name': {},
+                            'usage': {'type': 'object', 'title': 'Usage', 'x-python-datatype': 'dataclass'},
+                            'all_messages_events': {'type': 'array'},
+                        },
+                    }
+                )
+            ),
+        }
+    )
+    assert summary.attributes[1] == snapshot(
+        {
+            'code.filepath': 'test_logfire.py',
+            'code.function': 'test_logfire',
+            'code.lineno': IsInt(),
+            'run_step': 1,
+            'logfire.msg_template': 'preparing model request params {run_step=}',
+            'logfire.span_type': 'span',
+            'logfire.msg': 'preparing model request params run_step=1',
+            'logfire.json_schema': '{"type":"object","properties":{"run_step":{}}}',
+        }
+    )

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/tests/test_streaming.py

@@ -761,14 +761,14 @@ async def test_iter_stream_output():
     messages: list[str] = []
 
     stream_usage: Usage | None = None
-    with agent.iter('Hello') as run:
+    async with agent.iter('Hello') as run:
         async for node in run:
             if agent.is_model_request_node(node):
                 async with node.stream(run.ctx) as stream:
                     async for chunk in stream.stream_output(debounce_by=None):
                         messages.append(chunk)
                 stream_usage = deepcopy(stream.usage())
-    assert run.next_node == End(data=FinalResult(data='The bat sat on the mat.', tool_name=None))
+    assert run.next_node == End(data=FinalResult(data='The bat sat on the mat.', tool_name=None, tool_call_id=None))
     assert (
         run.usage()
         == stream_usage
@@ -800,7 +800,7 @@ async def test_iter_stream_responses():
     run: AgentRun
     stream: AgentStream
     messages: list[ModelResponse] = []
-    with agent.iter('Hello') as run:
+    async with agent.iter('Hello') as run:
         async for node in run:
             if agent.is_model_request_node(node):
                 async with node.stream(run.ctx) as stream:
@@ -843,7 +843,7 @@ async def test_stream_iter_structured_validator() -> None:
         return ResultType(value=data.value + ' (validated)')
 
     outputs: list[ResultType] = []
-    with agent.iter('test') as run:
+    async with agent.iter('test') as run:
         async for node in run:
             if agent.is_model_request_node(node):
                 async with node.stream(run.ctx) as stream:

{pydantic_ai-0.0.30 → pydantic_ai-0.0.31}/tests/test_utils.py

@@ -44,6 +44,30 @@ def test_check_object_json_schema():
     object_schema = {'type': 'object', 'properties': {'a': {'type': 'string'}}}
     assert check_object_json_schema(object_schema) == object_schema
 
+    ref_schema = {
+        '$defs': {
+            'JsonModel': {
+                'properties': {
+                    'type': {'title': 'Type', 'type': 'string'},
+                    'items': {'anyOf': [{'$ref': '#/$defs/JsonModel'}, {'type': 'null'}]},
+                },
+                'required': ['type', 'items'],
+                'title': 'JsonModel',
+                'type': 'object',
+            }
+        },
+        '$ref': '#/$defs/JsonModel',
+    }
+    assert check_object_json_schema(ref_schema) == {
+        'properties': {
+            'type': {'title': 'Type', 'type': 'string'},
+            'items': {'anyOf': [{'$ref': '#/$defs/JsonModel'}, {'type': 'null'}]},
+        },
+        'required': ['type', 'items'],
+        'title': 'JsonModel',
+        'type': 'object',
+    }
+
     array_schema = {'type': 'array', 'items': {'type': 'string'}}
     with pytest.raises(UserError, match='^Schema must be an object$'):
         check_object_json_schema(array_schema)

pydantic_ai-0.0.30/tests/test_logfire.py

@@ -1,261 +0,0 @@
-from __future__ import annotations as _annotations
-
-from dataclasses import dataclass
-from typing import Any, Callable
-
-import pytest
-from dirty_equals import IsInt, IsJson, IsStr
-from inline_snapshot import snapshot
-from typing_extensions import NotRequired, TypedDict
-
-from pydantic_ai import Agent
-from pydantic_ai.models.test import TestModel
-
-try:
-    from logfire.testing import CaptureLogfire
-except ImportError:
-    logfire_installed = False
-else:
-    logfire_installed = True
-
-
-class SpanSummary(TypedDict):
-    id: int
-    message: str
-    children: NotRequired[list[SpanSummary]]
-
-
-@dataclass(init=False)
-class LogfireSummary:
-    traces: list[SpanSummary]
-    attributes: dict[int, dict[str, Any]]
-
-    def __init__(self, capfire: CaptureLogfire):
-        spans = capfire.exporter.exported_spans_as_dict()
-        spans.sort(key=lambda s: s['start_time'])
-        self.traces = []
-        span_lookup: dict[tuple[str, str], SpanSummary] = {}
-        self.attributes = {}
-        id_counter = 0
-        for span in spans:
-            tid = span['context']['trace_id'], span['context']['span_id']
-            span_lookup[tid] = span_summary = SpanSummary(id=id_counter, message=span['attributes']['logfire.msg'])
-            self.attributes[id_counter] = span['attributes']
-            id_counter += 1
-            if parent := span['parent']:
-                parent_span = span_lookup[(parent['trace_id'], parent['span_id'])]
-                parent_span.setdefault('children', []).append(span_summary)
-            else:
-                self.traces.append(span_summary)
-
-
-@pytest.fixture
-def get_logfire_summary(capfire: CaptureLogfire) -> Callable[[], LogfireSummary]:
-    def get_summary() -> LogfireSummary:
-        return LogfireSummary(capfire)
-
-    return get_summary
-
-
-@pytest.mark.skipif(not logfire_installed, reason='logfire not installed')
-def test_logfire(get_logfire_summary: Callable[[], LogfireSummary]) -> None:
-    my_agent = Agent(model=TestModel())
-
-    @my_agent.tool_plain
-    async def my_ret(x: int) -> str:
-        return str(x + 1)
-
-    result = my_agent.run_sync('Hello')
-    assert result.data == snapshot('{"my_ret":"1"}')
-
-    summary = get_logfire_summary()
-    assert summary.traces == snapshot(
-        [
-            {
-                'id': 0,
-                'message': 'my_agent run prompt=Hello',
-                'children': [
-                    {'id': 1, 'message': 'preparing model request params run_step=1'},
-                    {'id': 2, 'message': 'model request'},
-                    {
-                        'id': 3,
-                        'message': 'handle model response -> tool-return',
-                        'children': [{'id': 4, 'message': "running tools=['my_ret']"}],
-                    },
-                    {'id': 5, 'message': 'preparing model request params run_step=2'},
-                    {'id': 6, 'message': 'model request'},
-                    {'id': 7, 'message': 'handle model response -> final result'},
-                ],
-            }
-        ]
-    )
-    assert summary.attributes[0] == snapshot(
-        {
-            'code.filepath': 'test_logfire.py',
-            'code.function': 'test_logfire',
-            'code.lineno': 123,
-            'prompt': 'Hello',
-            'agent': IsJson(
-                {
-                    'model': {
-                        'call_tools': 'all',
-                        'custom_result_text': None,
-                        'custom_result_args': None,
-                        'seed': 0,
-                        'last_model_request_parameters': None,
-                    },
-                    'name': 'my_agent',
-                    'end_strategy': 'early',
-                    'model_settings': None,
-                }
-            ),
-            'model_name': 'test',
-            'agent_name': 'my_agent',
-            'logfire.msg_template': '{agent_name} run {prompt=}',
-            'logfire.msg': 'my_agent run prompt=Hello',
-            'logfire.span_type': 'span',
-            'all_messages': IsJson(
-                [
-                    {
-                        'parts': [
-                            {
-                                'content': 'Hello',
-                                'timestamp': IsStr(regex=r'\d{4}-\d{2}-.+'),
-                                'part_kind': 'user-prompt',
-                            },
-                        ],
-                        'kind': 'request',
-                    },
-                    {
-                        'parts': [
-                            {'tool_name': 'my_ret', 'args': {'x': 0}, 'tool_call_id': None, 'part_kind': 'tool-call'}
-                        ],
-                        'model_name': 'test',
-                        'timestamp': IsStr(regex=r'\d{4}-\d{2}-.+'),
-                        'kind': 'response',
-                    },
-                    {
-                        'parts': [
-                            {
-                                'tool_name': 'my_ret',
-                                'content': '1',
-                                'tool_call_id': None,
-                                'timestamp': IsStr(regex=r'\d{4}-\d{2}-.+'),
-                                'part_kind': 'tool-return',
-                            },
-                        ],
-                        'kind': 'request',
-                    },
-                    {
-                        'parts': [{'content': '{"my_ret":"1"}', 'part_kind': 'text'}],
-                        'model_name': 'test',
-                        'timestamp': IsStr(regex=r'\d{4}-\d{2}-.+'),
-                        'kind': 'response',
-                    },
-                ]
-            ),
-            'usage': IsJson(
-                {'requests': 2, 'request_tokens': 103, 'response_tokens': 12, 'total_tokens': 115, 'details': None}
-            ),
-            'logfire.json_schema': IsJson(
-                {
-                    'type': 'object',
-                    'properties': {
-                        'prompt': {},
-                        'agent': {
-                            'type': 'object',
-                            'title': 'Agent',
-                            'x-python-datatype': 'dataclass',
-                            'properties': {
-                                'model': {'type': 'object', 'title': 'TestModel', 'x-python-datatype': 'dataclass'}
-                            },
-                        },
-                        'model_name': {},
-                        'agent_name': {},
-                        'all_messages': {
-                            'type': 'array',
-                            'prefixItems': [
-                                {
-                                    'type': 'object',
-                                    'title': 'ModelRequest',
-                                    'x-python-datatype': 'dataclass',
-                                    'properties': {
-                                        'parts': {
-                                            'type': 'array',
-                                            'items': {
-                                                'type': 'object',
-                                                'title': 'UserPromptPart',
-                                                'x-python-datatype': 'dataclass',
-                                                'properties': {'timestamp': {'type': 'string', 'format': 'date-time'}},
-                                            },
-                                        }
-                                    },
-                                },
-                                {
-                                    'type': 'object',
-                                    'title': 'ModelResponse',
-                                    'x-python-datatype': 'dataclass',
-                                    'properties': {
-                                        'parts': {
-                                            'type': 'array',
-                                            'items': {
-                                                'type': 'object',
-                                                'title': 'ToolCallPart',
-                                                'x-python-datatype': 'dataclass',
-                                            },
-                                        },
-                                        'timestamp': {'type': 'string', 'format': 'date-time'},
-                                    },
-                                },
-                                {
-                                    'type': 'object',
-                                    'title': 'ModelRequest',
-                                    'x-python-datatype': 'dataclass',
-                                    'properties': {
-                                        'parts': {
-                                            'type': 'array',
-                                            'items': {
-                                                'type': 'object',
-                                                'title': 'ToolReturnPart',
-                                                'x-python-datatype': 'dataclass',
-                                                'properties': {'timestamp': {'type': 'string', 'format': 'date-time'}},
-                                            },
-                                        }
-                                    },
-                                },
-                                {
-                                    'type': 'object',
-                                    'title': 'ModelResponse',
-                                    'x-python-datatype': 'dataclass',
-                                    'properties': {
-                                        'parts': {
-                                            'type': 'array',
-                                            'items': {
-                                                'type': 'object',
-                                                'title': 'TextPart',
-                                                'x-python-datatype': 'dataclass',
-                                            },
-                                        },
-                                        'timestamp': {'type': 'string', 'format': 'date-time'},
-                                    },
-                                },
-                            ],
-                        },
-                        'usage': {'type': 'object', 'title': 'Usage', 'x-python-datatype': 'dataclass'},
-                    },
-                }
-            ),
-        }
-    )
-    assert summary.attributes[1] == snapshot(
-        {
-            'code.filepath': 'test_logfire.py',
-            'code.function': 'test_logfire',
-            'code.lineno': IsInt(),
-            'run_step': 1,
-            'logfire.msg_template': 'preparing model request params {run_step=}',
-            'logfire.span_type': 'span',
-            'logfire.msg': 'preparing model request params run_step=1',
-            'logfire.json_schema': '{"type":"object","properties":{"run_step":{}}}',
-        }
-    )