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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: pydantic-ai
-Version: 0.0.31
+Version: 0.0.32
 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
 Project-URL: Documentation, https://ai.pydantic.dev
 Project-URL: Changelog, https://github.com/pydantic/pydantic-ai/releases
-Author-email: Samuel Colvin <samuel@pydantic.dev>
+Author-email: Samuel Colvin <samuel@pydantic.dev>, Marcelo Trylesinski <marcelotryle@gmail.com>, David Montague <david@pydantic.dev>, Alex Hall <alex@pydantic.dev>
 License-Expression: MIT
 License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
@@ -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.31
+Requires-Dist: pydantic-ai-slim[anthropic,cohere,groq,mistral,openai,vertexai]==0.0.32
 Provides-Extra: examples
-Requires-Dist: pydantic-ai-examples==0.0.31; extra == 'examples'
+Requires-Dist: pydantic-ai-examples==0.0.32; extra == 'examples'
 Provides-Extra: logfire
 Requires-Dist: logfire>=2.3; extra == 'logfire'
 Description-Content-Type: text/markdown

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

@@ -4,9 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pydantic-ai"
-version = "0.0.31"
+version = "0.0.32"
 description = "Agent Framework / shim to use Pydantic with LLMs"
-authors = [{ name = "Samuel Colvin", email = "samuel@pydantic.dev" }]
+authors = [
+    { name = "Samuel Colvin", email = "samuel@pydantic.dev" },
+    { name = "Marcelo Trylesinski", email = "marcelotryle@gmail.com" },
+    { name = "David Montague", email = "david@pydantic.dev" },
+    { name = "Alex Hall", email = "alex@pydantic.dev" },
+]
 license = "MIT"
 readme = "README.md"
 classifiers = [
@@ -32,7 +37,7 @@ classifiers = [
 requires-python = ">=3.9"
 
 dependencies = [
-    "pydantic-ai-slim[openai,vertexai,groq,anthropic,mistral,cohere]==0.0.31",
+    "pydantic-ai-slim[openai,vertexai,groq,anthropic,mistral,cohere]==0.0.32",
 ]
 
 [project.urls]
@@ -42,7 +47,7 @@ Documentation = "https://ai.pydantic.dev"
 Changelog = "https://github.com/pydantic/pydantic-ai/releases"
 
 [project.optional-dependencies]
-examples = ["pydantic-ai-examples==0.0.31"]
+examples = ["pydantic-ai-examples==0.0.32"]
 logfire = ["logfire>=2.3"]
 
 [tool.uv.sources]
@@ -165,6 +170,9 @@ exclude_lines = [
 [tool.logfire]
 ignore_no_config = true
 
+[tool.inline-snapshot]
+format-command="ruff format --stdin-filename {filename}"
+
 [tool.inline-snapshot.shortcuts]
 snap-fix = ["create", "fix"]
 snap = ["create"]

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

@@ -106,7 +106,7 @@ class MyResponseStream(StreamedResponse):
 @pytest.mark.anyio
 @requires_logfire_events
 async def test_instrumented_model(capfire: CaptureLogfire):
-    model = InstrumentedModel.from_logfire(MyModel(), event_mode='logs')
+    model = InstrumentedModel(MyModel(), event_mode='logs')
     assert model.system == 'my_system'
     assert model.model_name == 'my_model'
 
@@ -168,6 +168,7 @@ async def test_instrumented_model(capfire: CaptureLogfire):
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.system.message',
                 },
                 'timestamp': 2000000000,
@@ -182,6 +183,7 @@ async def test_instrumented_model(capfire: CaptureLogfire):
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.user.message',
                 },
                 'timestamp': 4000000000,
@@ -196,6 +198,7 @@ async def test_instrumented_model(capfire: CaptureLogfire):
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.tool.message',
                 },
                 'timestamp': 6000000000,
@@ -218,6 +221,7 @@ Fix the errors and try again.\
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.tool.message',
                 },
                 'timestamp': 8000000000,
@@ -239,6 +243,7 @@ Fix the errors and try again.\
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.user.message',
                 },
                 'timestamp': 10000000000,
@@ -253,6 +258,7 @@ Fix the errors and try again.\
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 1,
                     'event.name': 'gen_ai.assistant.message',
                 },
                 'timestamp': 12000000000,
@@ -324,7 +330,7 @@ async def test_instrumented_model_not_recording():
 @pytest.mark.anyio
 @requires_logfire_events
 async def test_instrumented_model_stream(capfire: CaptureLogfire):
-    model = InstrumentedModel.from_logfire(MyModel(), event_mode='logs')
+    model = InstrumentedModel(MyModel(), event_mode='logs')
 
     messages: list[ModelMessage] = [
         ModelRequest(
@@ -380,6 +386,7 @@ async def test_instrumented_model_stream(capfire: CaptureLogfire):
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.user.message',
                 },
                 'timestamp': 2000000000,
@@ -406,7 +413,7 @@ async def test_instrumented_model_stream(capfire: CaptureLogfire):
 @pytest.mark.anyio
 @requires_logfire_events
 async def test_instrumented_model_stream_break(capfire: CaptureLogfire):
-    model = InstrumentedModel.from_logfire(MyModel(), event_mode='logs')
+    model = InstrumentedModel(MyModel(), event_mode='logs')
 
     messages: list[ModelMessage] = [
         ModelRequest(
@@ -474,6 +481,7 @@ async def test_instrumented_model_stream_break(capfire: CaptureLogfire):
                 'severity_text': None,
                 'attributes': {
                     'gen_ai.system': 'my_system',
+                    'gen_ai.message.index': 0,
                     'event.name': 'gen_ai.user.message',
                 },
                 'timestamp': 2000000000,
@@ -555,12 +563,14 @@ async def test_instrumented_model_attributes_mode(capfire: CaptureLogfire):
                                     'event.name': 'gen_ai.system.message',
                                     'content': 'system_prompt',
                                     'role': 'system',
+                                    'gen_ai.message.index': 0,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
                                     'event.name': 'gen_ai.user.message',
                                     'content': 'user_prompt',
                                     'role': 'user',
+                                    'gen_ai.message.index': 0,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
@@ -568,6 +578,7 @@ async def test_instrumented_model_attributes_mode(capfire: CaptureLogfire):
                                     'content': 'tool_return_content',
                                     'role': 'tool',
                                     'id': 'tool_call_3',
+                                    'gen_ai.message.index': 0,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
@@ -579,6 +590,7 @@ Fix the errors and try again.\
 """,
                                     'role': 'tool',
                                     'id': 'tool_call_4',
+                                    'gen_ai.message.index': 0,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
@@ -589,12 +601,14 @@ retry_prompt2
 Fix the errors and try again.\
 """,
                                     'role': 'user',
+                                    'gen_ai.message.index': 0,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
                                     'event.name': 'gen_ai.assistant.message',
                                     'role': 'assistant',
                                     'content': 'text3',
+                                    'gen_ai.message.index': 1,
                                     'gen_ai.system': 'my_system',
                                 },
                                 {
@@ -641,7 +655,7 @@ def test_messages_to_otel_events_serialization_errors():
 
     class Bar:
         def __repr__(self):
-            raise ValueError
+            raise ValueError('error!')
 
     messages = [
         ModelResponse(parts=[ToolCallPart('tool', {'arg': Foo()})]),
@@ -654,10 +668,12 @@ def test_messages_to_otel_events_serialization_errors():
         [
             {
                 'body': "{'role': 'assistant', 'tool_calls': [{'id': None, 'type': 'function', 'function': {'name': 'tool', 'arguments': {'arg': Foo()}}}]}",
+                'gen_ai.message.index': 0,
                 'event.name': 'gen_ai.assistant.message',
             },
             {
-                'body': 'Unable to serialize event body',
+                'body': 'Unable to serialize: error!',
+                'gen_ai.message.index': 1,
                 'event.name': 'gen_ai.tool.message',
             },
         ]

{pydantic_ai-0.0.31 → pydantic_ai-0.0.32}/tests/test_logfire.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from typing import Any, Callable
 
 import pytest
-from dirty_equals import IsInt, IsJson
+from dirty_equals import IsJson
 from inline_snapshot import snapshot
 from typing_extensions import NotRequired, TypedDict
 
@@ -59,7 +59,7 @@ def get_logfire_summary(capfire: CaptureLogfire) -> Callable[[], LogfireSummary]
 
 @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 = Agent(model=TestModel(), instrument=True)
 
     @my_agent.tool_plain
     async def my_ret(x: int) -> str:
@@ -73,53 +73,32 @@ def test_logfire(get_logfire_summary: Callable[[], LogfireSummary]) -> None:
         [
             {
                 'id': 0,
-                'message': 'my_agent run prompt=Hello',
+                'message': 'my_agent run',
                 'children': [
-                    {'id': 1, 'message': 'preparing model request params run_step=1'},
+                    {'id': 1, 'message': 'preparing model request params'},
                     {'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'},
+                    {'id': 3, 'message': 'running tools: my_ret'},
+                    {'id': 4, 'message': 'preparing model request params'},
+                    {'id': 5, 'message': 'chat test'},
                 ],
             }
         ]
     )
     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.msg': 'my_agent run',
             'logfire.span_type': 'span',
+            'gen_ai.usage.input_tokens': 103,
+            'gen_ai.usage.output_tokens': 12,
             'all_messages_events': IsJson(
                 snapshot(
                     [
                         {
                             'content': 'Hello',
                             'role': 'user',
+                            'gen_ai.message.index': 0,
                             'event.name': 'gen_ai.user.message',
                         },
                         {
@@ -134,44 +113,31 @@ def test_logfire(get_logfire_summary: Callable[[], LogfireSummary]) -> None:
                                     },
                                 }
                             ],
+                            'gen_ai.message.index': 1,
                             'event.name': 'gen_ai.assistant.message',
                         },
                         {
                             'content': '1',
                             'role': 'tool',
                             'id': None,
+                            'gen_ai.message.index': 2,
                             'event.name': 'gen_ai.tool.message',
                         },
                         {
                             'role': 'assistant',
                             'content': '{"my_ret":"1"}',
+                            'gen_ai.message.index': 3,
                             'event.name': 'gen_ai.assistant.message',
                         },
                     ]
                 )
             ),
-            'usage': IsJson(
-                {'requests': 2, 'request_tokens': 103, 'response_tokens': 12, 'total_tokens': 115, 'details': None}
-            ),
+            'final_result': '{"my_ret":"1"}',
             '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'},
-                        },
+                        'properties': {'all_messages_events': {'type': 'array'}, 'final_result': {'type': 'object'}},
                     }
                 )
             ),
@@ -179,13 +145,49 @@ def test_logfire(get_logfire_summary: Callable[[], LogfireSummary]) -> None:
     )
     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":{}}}',
+            'logfire.msg': 'preparing model request params',
+        }
+    )
+    assert summary.attributes[2] == snapshot(
+        {
+            'gen_ai.operation.name': 'chat',
+            'gen_ai.system': 'test',
+            'gen_ai.request.model': 'test',
+            'logfire.span_type': 'span',
+            'logfire.msg': 'chat test',
+            'gen_ai.response.model': 'test',
+            'gen_ai.usage.input_tokens': 51,
+            'gen_ai.usage.output_tokens': 4,
+            'events': IsJson(
+                snapshot(
+                    [
+                        {
+                            'event.name': 'gen_ai.user.message',
+                            'content': 'Hello',
+                            'role': 'user',
+                            'gen_ai.message.index': 0,
+                            'gen_ai.system': 'test',
+                        },
+                        {
+                            'event.name': 'gen_ai.choice',
+                            'index': 0,
+                            'message': {
+                                'role': 'assistant',
+                                'tool_calls': [
+                                    {
+                                        'id': None,
+                                        'type': 'function',
+                                        'function': {'name': 'my_ret', 'arguments': {'x': 0}},
+                                    }
+                                ],
+                            },
+                            'gen_ai.system': 'test',
+                        },
+                    ]
+                )
+            ),
+            'logfire.json_schema': '{"type": "object", "properties": {"events": {"type": "array"}}}',
         }
     )