pydantic-ai 0.0.36__tar.gz → 0.0.37__tar.gz

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydantic-ai
-Version: 0.0.36
+Version: 0.0.37
 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,bedrock,cli,cohere,groq,mistral,openai,vertexai]==0.0.36
+Requires-Dist: pydantic-ai-slim[anthropic,bedrock,cli,cohere,groq,mistral,openai,vertexai]==0.0.37
 Provides-Extra: examples
-Requires-Dist: pydantic-ai-examples==0.0.36; extra == 'examples'
+Requires-Dist: pydantic-ai-examples==0.0.37; extra == 'examples'
 Provides-Extra: logfire
 Requires-Dist: logfire>=2.3; extra == 'logfire'
 Description-Content-Type: text/markdown

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/pyproject.toml

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

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_anthropic.py

@@ -71,6 +71,7 @@ def test_init():
     assert m.client.api_key == 'foobar'
     assert m.model_name == 'claude-3-5-haiku-latest'
     assert m.system == 'anthropic'
+    assert m.base_url == 'https://api.anthropic.com'
 
 
 @dataclass

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_bedrock.py

@@ -58,6 +58,7 @@ def bedrock_provider():
 
 async def test_bedrock_model(allow_model_requests: None, bedrock_provider: BedrockProvider):
     model = BedrockConverseModel('us.amazon.nova-micro-v1:0', provider=bedrock_provider)
+    assert model.base_url == 'https://bedrock-runtime.us-east-1.amazonaws.com'
     agent = Agent(model=model, system_prompt='You are a chatbot.')
 
     result = await agent.run('Hello!')

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_cohere.py

@@ -52,6 +52,7 @@ def test_init():
     m = CohereModel('command-r7b-12-2024', api_key='foobar')
     assert m.model_name == 'command-r7b-12-2024'
     assert m.system == 'cohere'
+    assert m.base_url == 'https://api.cohere.com'
 
 
 @dataclass

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_fallback.py

@@ -38,6 +38,7 @@ def test_init() -> None:
         'FallBackModel[function:failure_response:, function:success_response:]'
     )
     assert fallback_model.system is None
+    assert fallback_model.base_url is None
 
 
 def test_first_successful() -> None:

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_gemini.py

@@ -58,6 +58,7 @@ def test_api_key_arg(env: TestEnv):
     env.set('GEMINI_API_KEY', 'via-env-var')
     m = GeminiModel('gemini-1.5-flash', provider=GoogleGLAProvider(api_key='via-arg'))
     assert m.client.headers['x-goog-api-key'] == 'via-arg'
+    assert m.base_url == 'https://generativelanguage.googleapis.com/v1beta/models/'
 
 
 def test_api_key_env_var(env: TestEnv):

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_groq.py

@@ -61,6 +61,7 @@ def test_init():
     assert m.client.api_key == 'foobar'
     assert m.model_name == 'llama-3.3-70b-versatile'
     assert m.system == 'groq'
+    assert m.base_url == 'https://api.groq.com'
 
 
 @dataclass

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_instrumented.py

@@ -56,6 +56,10 @@ class MyModel(Model):
     def model_name(self) -> str:
         return 'my_model'
 
+    @property
+    def base_url(self) -> str:
+        return 'https://example.com:8000/foo'
+
     async def request(
         self,
         messages: list[ModelMessage],
@@ -146,6 +150,8 @@ async def test_instrumented_model(capfire: CaptureLogfire):
                     'gen_ai.operation.name': 'chat',
                     'gen_ai.system': 'my_system',
                     'gen_ai.request.model': 'my_model',
+                    'server.address': 'example.com',
+                    'server.port': 8000,
                     'gen_ai.request.temperature': 1,
                     'logfire.msg': 'chat my_model',
                     'logfire.span_type': 'span',
@@ -366,6 +372,8 @@ async def test_instrumented_model_stream(capfire: CaptureLogfire):
                     'gen_ai.operation.name': 'chat',
                     'gen_ai.system': 'my_system',
                     'gen_ai.request.model': 'my_model',
+                    'server.address': 'example.com',
+                    'server.port': 8000,
                     'gen_ai.request.temperature': 1,
                     'logfire.msg': 'chat my_model',
                     'logfire.span_type': 'span',
@@ -447,6 +455,8 @@ async def test_instrumented_model_stream_break(capfire: CaptureLogfire):
                     'gen_ai.operation.name': 'chat',
                     'gen_ai.system': 'my_system',
                     'gen_ai.request.model': 'my_model',
+                    'server.address': 'example.com',
+                    'server.port': 8000,
                     'gen_ai.request.temperature': 1,
                     'logfire.msg': 'chat my_model',
                     'logfire.span_type': 'span',
@@ -547,6 +557,8 @@ async def test_instrumented_model_attributes_mode(capfire: CaptureLogfire):
                     'gen_ai.operation.name': 'chat',
                     'gen_ai.system': 'my_system',
                     'gen_ai.request.model': 'my_model',
+                    'server.address': 'example.com',
+                    'server.port': 8000,
                     'gen_ai.request.temperature': 1,
                     'logfire.msg': 'chat my_model',
                     'logfire.span_type': 'span',

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_mistral.py

@@ -176,6 +176,7 @@ def func_chunk(
 def test_init():
     m = MistralModel('mistral-large-latest', api_key='foobar')
     assert m.model_name == 'mistral-large-latest'
+    assert m.base_url == 'https://api.mistral.ai'
 
 
 #####################

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_openai.py

@@ -60,7 +60,7 @@ pytestmark = [
 
 def test_init():
     m = OpenAIModel('gpt-4o', provider=OpenAIProvider(api_key='foobar'))
-    assert str(m.client.base_url) == 'https://api.openai.com/v1/'
+    assert m.base_url == 'https://api.openai.com/v1/'
     assert m.client.api_key == 'foobar'
     assert m.model_name == 'gpt-4o'
 

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/models/test_vertexai.py

@@ -38,7 +38,7 @@ async def test_init_service_account(tmp_path: Path, allow_model_requests: None):
 
     await model.ainit()
 
-    assert model.url == snapshot(
+    assert model.base_url == snapshot(
         'https://us-central1-aiplatform.googleapis.com/v1/projects/my-project-id/locations/us-central1/'
         'publishers/google/models/gemini-1.5-flash:'
     )
@@ -66,7 +66,7 @@ async def test_init_env(mocker: MockerFixture, allow_model_requests: None):
 
     assert patch.call_count == 1
 
-    assert model.url == snapshot(
+    assert model.base_url == snapshot(
         'https://us-central1-aiplatform.googleapis.com/v1/projects/my-project-id/locations/us-central1/'
         'publishers/google/models/gemini-1.5-flash:'
     )
@@ -75,7 +75,7 @@ async def test_init_env(mocker: MockerFixture, allow_model_requests: None):
     assert model.system == snapshot('google-vertex')
 
     await model.ainit()
-    assert model.url is not None
+    assert model.base_url is not None
     assert model.auth is not None
     assert patch.call_count == 1
 
@@ -90,7 +90,7 @@ async def test_init_right_project_id(tmp_path: Path, allow_model_requests: None)
 
     await model.ainit()
 
-    assert model.url == snapshot(
+    assert model.base_url == snapshot(
         'https://us-central1-aiplatform.googleapis.com/v1/projects/my-project-id/locations/us-central1/'
         'publishers/google/models/gemini-1.5-flash:'
     )

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/providers/test_google_vertex.py

@@ -74,8 +74,31 @@ async def test_google_vertex_provider_service_account_file(
     assert getattr(provider.client.auth, 'token_created') is not None
 
 
-def save_service_account(service_account_path: Path, project_id: str) -> None:
-    service_account = {
+async def test_google_vertex_provider_service_account_file_info(
+    monkeypatch: pytest.MonkeyPatch, allow_model_requests: None
+):
+    account_info = prepare_service_account_contents('my-project-id')
+
+    provider = GoogleVertexProvider(service_account_info=account_info)
+    monkeypatch.setattr(provider.client.auth, '_refresh_token', lambda: 'my-token')
+    await provider.client.post('/gemini-1.0-pro:generateContent')
+    assert provider.region == 'us-central1'
+    assert getattr(provider.client.auth, 'project_id') == 'my-project-id'
+    assert getattr(provider.client.auth, 'token_created') is not None
+
+
+async def test_google_vertex_provider_service_account_xor(allow_model_requests: None):
+    with pytest.raises(
+        ValueError, match='Only one of `service_account_file` or `service_account_info` can be provided'
+    ):
+        GoogleVertexProvider(  # type: ignore[reportCallIssue]
+            service_account_file='path/to/service-account.json',
+            service_account_info=prepare_service_account_contents('my-project-id'),
+        )
+
+
+def prepare_service_account_contents(project_id: str) -> dict[str, str]:
+    return {
         'type': 'service_account',
         'project_id': project_id,
         'private_key_id': 'abc',
@@ -107,4 +130,8 @@ def save_service_account(service_account_path: Path, project_id: str) -> None:
         'universe_domain': 'googleapis.com',
     }
 
+
+def save_service_account(service_account_path: Path, project_id: str) -> None:
+    service_account = prepare_service_account_contents(project_id)
+
     service_account_path.write_text(json.dumps(service_account, indent=2))

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/test_agent.py

@@ -13,6 +13,7 @@ from pydantic_core import to_json
 
 from pydantic_ai import Agent, ModelRetry, RunContext, UnexpectedModelBehavior, UserError, capture_run_messages
 from pydantic_ai.messages import (
+    BinaryContent,
     ModelMessage,
     ModelRequest,
     ModelResponse,
@@ -29,7 +30,7 @@ from pydantic_ai.models.test import TestModel
 from pydantic_ai.result import Usage
 from pydantic_ai.tools import ToolDefinition
 
-from .conftest import IsNow, TestEnv
+from .conftest import IsNow, IsStr, TestEnv
 
 pytestmark = pytest.mark.anyio
 
@@ -1572,3 +1573,29 @@ def test_custom_result_type_invalid() -> None:
 
     with pytest.raises(UserError, match='Cannot set a custom run `result_type` when the agent has result validators'):
         agent.run_sync('Hello', result_type=int)
+
+
+def test_binary_content_all_messages_json():
+    agent = Agent('test')
+
+    result = agent.run_sync(['Hello', BinaryContent(data=b'Hello', media_type='text/plain')])
+    assert json.loads(result.all_messages_json()) == snapshot(
+        [
+            {
+                'parts': [
+                    {
+                        'content': ['Hello', {'data': 'SGVsbG8=', 'media_type': 'text/plain', 'kind': 'binary'}],
+                        'timestamp': IsStr(),
+                        'part_kind': 'user-prompt',
+                    }
+                ],
+                'kind': 'request',
+            },
+            {
+                'parts': [{'content': 'success (no tool calls)', 'part_kind': 'text'}],
+                'model_name': 'test',
+                'timestamp': IsStr(),
+                'kind': 'response',
+            },
+        ]
+    )

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/test_examples.py

@@ -188,6 +188,7 @@ text_responses: dict[str, str | ToolCallPart] = {
         tool_name='weather_forecast', args={'location': 'Paris', 'forecast_date': '2030-01-01'}, tool_call_id='0001'
     ),
     'Tell me a joke.': 'Did you hear about the toothpaste scandal? They called it Colgate.',
+    'Tell me a different joke.': 'No.',
     'Explain?': 'This is an excellent joke invented by Samuel Colvin, it needs no explanation.',
     'What is the capital of France?': 'Paris',
     'What is the capital of Italy?': 'Rome',

{pydantic_ai-0.0.36 → pydantic_ai-0.0.37}/tests/test_tools.py

@@ -500,6 +500,28 @@ def test_dynamic_tool_decorator():
     assert r.data == snapshot('success (no tool calls)')
 
 
+def test_plain_tool_name():
+    agent = Agent(FunctionModel(get_json_schema))
+
+    def my_tool(arg: str) -> str: ...
+
+    agent.tool_plain(name='foo_tool')(my_tool)
+    result = agent.run_sync('Hello')
+    json_schema = json.loads(result.data)
+    assert json_schema['name'] == 'foo_tool'
+
+
+def test_tool_name():
+    agent = Agent(FunctionModel(get_json_schema))
+
+    def my_tool(ctx: RunContext, arg: str) -> str: ...
+
+    agent.tool(name='foo_tool')(my_tool)
+    result = agent.run_sync('Hello')
+    json_schema = json.loads(result.data)
+    assert json_schema['name'] == 'foo_tool'
+
+
 def test_dynamic_tool_use_messages():
     async def repeat_call_foobar(_messages: list[ModelMessage], info: AgentInfo) -> ModelResponse:
         if info.function_tools: