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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: pydantic-ai
-Version: 0.0.31
+Version: 0.0.33
 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.33
 Provides-Extra: examples
-Requires-Dist: pydantic-ai-examples==0.0.31; extra == 'examples'
+Requires-Dist: pydantic-ai-examples==0.0.33; 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.33}/pyproject.toml

@@ -4,9 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pydantic-ai"
-version = "0.0.31"
+version = "0.0.33"
 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.33",
 ]
 
 [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.33"]
 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.33}/tests/conftest.py

@@ -200,6 +200,7 @@ def pytest_recording_configure(config: Any, vcr: VCR):
 @pytest.fixture(scope='module')
 def vcr_config():
     return {
+        'ignore_localhost': True,
         # Note: additional header filtering is done inside the serializer
         'filter_headers': ['authorization', 'x-api-key'],
         'decode_compressed_response': True,

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/tests/json_body_serializer.py

@@ -1,5 +1,6 @@
 # pyright: reportUnknownMemberType=false, reportUnknownVariableType=false
 import json
+import urllib.parse
 from typing import TYPE_CHECKING, Any
 
 import yaml
@@ -59,19 +60,24 @@ def serialize(cassette_dict: Any):
             # update headers on source object
             data['headers'] = headers
 
-            content_type = headers.get('content-type', None)
-            if content_type != ['application/json']:
-                continue
-
-            # Parse the body as JSON
-            body: Any = data.get('body', None)
-            assert body is not None, data
-            if isinstance(body, dict):
-                # Responses will have the body under a field called 'string'
-                body = body.get('string')
-            if body is not None:
-                data['parsed_body'] = json.loads(body)
-                del data['body']
+            content_type = headers.get('content-type', [])
+            if any(header.startswith('application/json') for header in content_type):
+                # Parse the body as JSON
+                body: Any = data.get('body', None)
+                assert body is not None, data
+                if isinstance(body, dict):
+                    # Responses will have the body under a field called 'string'
+                    body = body.get('string')
+                if body is not None:
+                    data['parsed_body'] = json.loads(body)
+                    if 'access_token' in data['parsed_body']:
+                        data['parsed_body']['access_token'] = 'scrubbed'
+                    del data['body']
+            if content_type == ['application/x-www-form-urlencoded']:
+                query_params = urllib.parse.parse_qs(data['body'])
+                if 'client_secret' in query_params:
+                    query_params['client_secret'] = ['scrubbed']
+                    data['body'] = urllib.parse.urlencode(query_params)
 
     # Use our custom dumper
     return yaml.dump(cassette_dict, Dumper=LiteralDumper, allow_unicode=True, width=120)

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/tests/models/cassettes/test_gemini/test_image_as_binary_content_input.yaml

@@ -38,7 +38,7 @@ interactions:
                 "role": "model"
               },
               "finishReason": "STOP",
-              "avgLogprobs": -0.02894418438275655
+              "avgLogprobs": -0.031536102294921875
             }
           ],
           "usageMetadata": {
@@ -68,11 +68,11 @@ interactions:
       alt-svc:
       - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
       content-length:
-      - '710'
+      - '711'
       content-type:
       - application/json; charset=UTF-8
       server-timing:
-      - gfet4t7; dur=2776
+      - gfet4t7; dur=2657
       transfer-encoding:
       - chunked
       vary:

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/tests/models/cassettes/test_gemini/test_image_url_input.yaml

@@ -6793,7 +6793,7 @@ interactions:
       access-control-allow-origin:
       - '*'
       age:
-      - '42504'
+      - '88'
       alt-svc:
       - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
       cache-control:
@@ -6809,7 +6809,7 @@ interactions:
       cross-origin-resource-policy:
       - cross-origin
       expires:
-      - Wed, 25 Feb 2026 21:07:23 GMT
+      - Wed, 04 Mar 2026 10:32:03 GMT
       last-modified:
       - Mon, 30 Aug 2123 17:01:05 GMT
       report-to:
@@ -6850,19 +6850,19 @@ interactions:
               "content": {
                 "parts": [
                   {
-                    "text": "This is not a fruit, it is an organ console."
+                    "text": "This is not a fruit; it's a pipe organ console."
                   }
                 ],
                 "role": "model"
               },
               "finishReason": "STOP",
-              "avgLogprobs": -0.4544379711151123
+              "avgLogprobs": -0.31288215092250277
             }
           ],
           "usageMetadata": {
             "promptTokenCount": 1814,
-            "candidatesTokenCount": 12,
-            "totalTokenCount": 1826,
+            "candidatesTokenCount": 14,
+            "totalTokenCount": 1828,
             "promptTokensDetails": [
               {
                 "modality": "TEXT",
@@ -6876,7 +6876,7 @@ interactions:
             "candidatesTokensDetails": [
               {
                 "modality": "TEXT",
-                "tokenCount": 12
+                "tokenCount": 14
               }
             ]
           },
@@ -6886,11 +6886,11 @@ interactions:
       alt-svc:
       - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
       content-length:
-      - '726'
+      - '730'
       content-type:
       - application/json; charset=UTF-8
       server-timing:
-      - gfet4t7; dur=6687
+      - gfet4t7; dur=1749
       transfer-encoding:
       - chunked
       vary:

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/tests/models/test_gemini.py

@@ -45,6 +45,7 @@ from pydantic_ai.models.gemini import (
     _GeminiTools,
     _GeminiUsageMetaData,
 )
+from pydantic_ai.providers.google_gla import GoogleGLAProvider
 from pydantic_ai.result import Usage
 from pydantic_ai.tools import ToolDefinition
 
@@ -55,9 +56,8 @@ pytestmark = pytest.mark.anyio
 
 def test_api_key_arg(env: TestEnv):
     env.set('GEMINI_API_KEY', 'via-env-var')
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
-    assert isinstance(m.auth, ApiKeyAuth)
-    assert m.auth.api_key == 'via-arg'
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
+    assert m.client.headers['x-goog-api-key'] == 'via-arg'
 
 
 def test_api_key_env_var(env: TestEnv):
@@ -80,11 +80,10 @@ def test_api_key_empty(env: TestEnv):
 
 
 async def test_model_simple(allow_model_requests: None):
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
-    assert isinstance(m.http_client, httpx.AsyncClient)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
+    assert isinstance(m.client, httpx.AsyncClient)
     assert m.model_name == 'gemini-1.5-flash'
-    assert isinstance(m.auth, ApiKeyAuth)
-    assert m.auth.api_key == 'via-arg'
+    assert 'x-goog-api-key' in m.client.headers
 
     arc = ModelRequestParameters(function_tools=[], allow_text_result=True, result_tools=[])
     tools = m._get_tools(arc)
@@ -94,7 +93,7 @@ async def test_model_simple(allow_model_requests: None):
 
 
 async def test_model_tools(allow_model_requests: None):
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     tools = [
         ToolDefinition(
             'foo',
@@ -153,7 +152,7 @@ async def test_model_tools(allow_model_requests: None):
 
 
 async def test_require_response_tool(allow_model_requests: None):
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     result_tool = ToolDefinition(
         'result',
         'This is the tool for the final Result',
@@ -212,7 +211,7 @@ async def test_json_def_replaced(allow_model_requests: None):
         }
     )
 
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     result_tool = ToolDefinition(
         'result',
         'This is the tool for the final Result',
@@ -259,7 +258,7 @@ async def test_json_def_replaced_any_of(allow_model_requests: None):
 
     json_schema = Locations.model_json_schema()
 
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     result_tool = ToolDefinition(
         'result',
         'This is the tool for the final Result',
@@ -322,7 +321,7 @@ async def test_json_def_recursive(allow_model_requests: None):
         }
     )
 
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     result_tool = ToolDefinition(
         'result',
         'This is the tool for the final Result',
@@ -354,7 +353,7 @@ async def test_json_def_date(allow_model_requests: None):
         }
     )
 
-    m = GeminiModel('gemini-1.5-flash', api_key='via-arg')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     result_tool = ToolDefinition(
         'result',
         'This is the tool for the final Result',
@@ -451,7 +450,7 @@ def example_usage() -> _GeminiUsageMetaData:
 async def test_text_success(get_gemini_client: GetGeminiClient):
     response = gemini_response(_content_model_response(ModelResponse(parts=[TextPart('Hello world')])))
     gemini_client = get_gemini_client(response)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m)
 
     result = await agent.run('Hello')
@@ -493,7 +492,7 @@ async def test_request_structured_response(get_gemini_client: GetGeminiClient):
         _content_model_response(ModelResponse(parts=[ToolCallPart('final_result', {'response': [1, 2, 123]})]))
     )
     gemini_client = get_gemini_client(response)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m, result_type=list[int])
 
     result = await agent.run('Hello')
@@ -540,7 +539,7 @@ async def test_request_tool_call(get_gemini_client: GetGeminiClient):
         gemini_response(_content_model_response(ModelResponse(parts=[TextPart('final response')]))),
     ]
     gemini_client = get_gemini_client(responses)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m, system_prompt='this is the system prompt')
 
     @agent.tool_plain
@@ -622,7 +621,7 @@ async def test_unexpected_response(client_with_handler: ClientWithHandler, env:
         return httpx.Response(401, content='invalid request')
 
     gemini_client = client_with_handler(handler)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m, system_prompt='this is the system prompt')
 
     with pytest.raises(ModelHTTPError) as exc_info:
@@ -639,7 +638,7 @@ async def test_stream_text(get_gemini_client: GetGeminiClient):
     json_data = _gemini_streamed_response_ta.dump_json(responses, by_alias=True)
     stream = AsyncByteStreamList([json_data[:100], json_data[100:200], json_data[200:]])
     gemini_client = get_gemini_client(stream)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m)
 
     async with agent.run_stream('Hello') as result:
@@ -684,7 +683,7 @@ async def test_stream_invalid_unicode_text(get_gemini_client: GetGeminiClient):
 
     stream = AsyncByteStreamList(parts)
     gemini_client = get_gemini_client(stream)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m)
 
     async with agent.run_stream('Hello') as result:
@@ -698,7 +697,7 @@ async def test_stream_text_no_data(get_gemini_client: GetGeminiClient):
     json_data = _gemini_streamed_response_ta.dump_json(responses, by_alias=True)
     stream = AsyncByteStreamList([json_data[:100], json_data[100:200], json_data[200:]])
     gemini_client = get_gemini_client(stream)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m)
     with pytest.raises(UnexpectedModelBehavior, match='Streamed response ended without con'):
         async with agent.run_stream('Hello'):
@@ -714,7 +713,7 @@ async def test_stream_structured(get_gemini_client: GetGeminiClient):
     json_data = _gemini_streamed_response_ta.dump_json(responses, by_alias=True)
     stream = AsyncByteStreamList([json_data[:100], json_data[100:200], json_data[200:]])
     gemini_client = get_gemini_client(stream)
-    model = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    model = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(model, result_type=tuple[int, int])
 
     async with agent.run_stream('Hello') as result:
@@ -744,7 +743,7 @@ async def test_stream_structured_tool_calls(get_gemini_client: GetGeminiClient):
     second_stream = AsyncByteStreamList([d2[:100], d2[100:]])
 
     gemini_client = get_gemini_client([first_stream, second_stream])
-    model = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    model = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(model, result_type=tuple[int, int])
     tool_calls: list[str] = []
 
@@ -817,7 +816,7 @@ async def test_stream_text_heterogeneous(get_gemini_client: GetGeminiClient):
     json_data = _gemini_streamed_response_ta.dump_json(responses, by_alias=True)
     stream = AsyncByteStreamList([json_data[:100], json_data[100:200], json_data[200:]])
     gemini_client = get_gemini_client(stream)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client)
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client))
     agent = Agent(m)
 
     @agent.tool_plain()
@@ -887,7 +886,7 @@ async def test_model_settings(client_with_handler: ClientWithHandler, env: TestE
         )
 
     gemini_client = client_with_handler(handler)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client, api_key='mock')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client, api_key='mock'))
     agent = Agent(m)
 
     result = await agent.run(
@@ -939,7 +938,8 @@ async def test_safety_settings_unsafe(
             )
 
         gemini_client = client_with_handler(handler)
-        m = GeminiModel('gemini-1.5-flash', http_client=gemini_client, api_key='mock')
+
+        m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client, api_key='mock'))
         agent = Agent(m)
 
         await agent.run(
@@ -975,7 +975,7 @@ async def test_safety_settings_safe(
         )
 
     gemini_client = client_with_handler(handler)
-    m = GeminiModel('gemini-1.5-flash', http_client=gemini_client, api_key='mock')
+    m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(http_client=gemini_client, api_key='mock'))
     agent = Agent(m)
 
     result = await agent.run(
@@ -994,7 +994,7 @@ async def test_safety_settings_safe(
 async def test_image_as_binary_content_input(
     allow_model_requests: None, gemini_api_key: str, image_content: BinaryContent
 ) -> None:
-    m = GeminiModel('gemini-2.0-flash', api_key=gemini_api_key)
+    m = GeminiModel('gemini-2.0-flash', provider=GoogleGLAProvider(api_key=gemini_api_key))
     agent = Agent(m)
 
     result = await agent.run(['What is the name of this fruit?', image_content])
@@ -1003,10 +1003,10 @@ async def test_image_as_binary_content_input(
 
 @pytest.mark.vcr()
 async def test_image_url_input(allow_model_requests: None, gemini_api_key: str) -> None:
-    m = GeminiModel('gemini-2.0-flash-exp', api_key=gemini_api_key)
+    m = GeminiModel('gemini-2.0-flash-exp', provider=GoogleGLAProvider(api_key=gemini_api_key))
     agent = Agent(m)
 
     image_url = ImageUrl(url='https://goo.gle/instrument-img')
 
     result = await agent.run(['What is the name of this fruit?', image_url])
-    assert result.data == snapshot('This is not a fruit, it is an organ console.')
+    assert result.data == snapshot("This is not a fruit; it's a pipe organ console.")

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/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.33}/tests/models/test_model.py

@@ -19,7 +19,7 @@ TEST_CASES = [
         'gemini-1.5-flash',
         'google-vertex',
         'vertexai',
-        'VertexAIModel',
+        'GeminiModel',
     ),
     (
         'GEMINI_API_KEY',
@@ -27,7 +27,7 @@ TEST_CASES = [
         'gemini-1.5-flash',
         'google-vertex',
         'vertexai',
-        'VertexAIModel',
+        'GeminiModel',
     ),
     (
         'ANTHROPIC_API_KEY',

{pydantic_ai-0.0.31 → pydantic_ai-0.0.33}/tests/models/test_model_names.py

@@ -1,7 +1,8 @@
 from collections.abc import Iterator
-from typing import Any, get_args
+from typing import Any
 
 import pytest
+from typing_extensions import get_args
 
 from pydantic_ai.models import KnownModelName
 
@@ -40,10 +41,18 @@ def test_known_model_names():
     openai_names = [f'openai:{n}' for n in get_model_names(OpenAIModelName)] + [
         n for n in get_model_names(OpenAIModelName) if n.startswith('o1') or n.startswith('gpt') or n.startswith('o3')
     ]
+    deepseek_names = ['deepseek:deepseek-chat', 'deepseek:deepseek-reasoner']
     extra_names = ['test']
 
     generated_names = sorted(
-        anthropic_names + cohere_names + google_names + groq_names + mistral_names + openai_names + extra_names
+        anthropic_names
+        + cohere_names
+        + google_names
+        + groq_names
+        + mistral_names
+        + openai_names
+        + deepseek_names
+        + extra_names
     )
 
     known_model_names = sorted(get_args(KnownModelName))