pydantic-ai 0.2.18__tar.gz → 0.2.20__tar.gz

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/PKG-INFO

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

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/tests/mcp_server.py

@@ -3,6 +3,8 @@ from pathlib import Path
 from typing import Any
 
 from mcp.server.fastmcp import Context, FastMCP, Image
+from mcp.server.session import ServerSessionT
+from mcp.shared.context import LifespanContextT, RequestT
 from mcp.types import BlobResourceContents, EmbeddedResource, TextResourceContents
 from pydantic import AnyUrl
 
@@ -118,6 +120,22 @@ async def get_log_level(ctx: Context) -> str:  # type: ignore
     return log_level
 
 
+@mcp.tool()
+async def echo_deps(ctx: Context[ServerSessionT, LifespanContextT, RequestT]) -> dict[str, Any]:
+    """Echo the run context.
+
+    Args:
+        ctx: Context object containing request and session information.
+
+    Returns:
+        Dictionary with an echo message and the deps.
+    """
+    await ctx.info('This is an info message')
+
+    deps: Any = getattr(ctx.request_context.meta, 'deps')
+    return {'echo': 'This is an echo message', 'deps': deps}
+
+
 @mcp._mcp_server.set_logging_level()  # pyright: ignore[reportPrivateUsage]
 async def set_logging_level(level: str) -> None:
     global log_level

pydantic_ai-0.2.20/tests/models/cassettes/test_gemini/test_gemini_tool_config_any_with_tool_without_args.yaml

@@ -0,0 +1,182 @@
+interactions:
+- request:
+    headers:
+      accept:
+      - '*/*'
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '468'
+      content-type:
+      - application/json
+      host:
+      - generativelanguage.googleapis.com
+    method: POST
+    parsed_body:
+      contents:
+      - parts:
+        - text: run bar for me please
+        role: user
+      toolConfig:
+        function_calling_config:
+          allowed_function_names:
+          - bar
+          - final_result
+          mode: ANY
+      tools:
+        functionDeclarations:
+        - description: ''
+          name: bar
+          parameters:
+            properties: {}
+            type: object
+        - description: The final response which ends this conversation
+          name: final_result
+          parameters:
+            properties:
+              bar:
+                type: string
+            required:
+            - bar
+            type: object
+    uri: https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent
+  response:
+    headers:
+      alt-svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      content-length:
+      - '721'
+      content-type:
+      - application/json; charset=UTF-8
+      server-timing:
+      - gfet4t7; dur=618
+      transfer-encoding:
+      - chunked
+      vary:
+      - Origin
+      - X-Origin
+      - Referer
+    parsed_body:
+      candidates:
+      - avgLogprobs: 2.094004230457358e-05
+        content:
+          parts:
+          - functionCall:
+              args: {}
+              name: bar
+          role: model
+        finishReason: STOP
+      modelVersion: gemini-2.0-flash
+      responseId: t61QaPKoBZSF_NUPqYHxmAg
+      usageMetadata:
+        candidatesTokenCount: 1
+        candidatesTokensDetails:
+        - modality: TEXT
+          tokenCount: 1
+        promptTokenCount: 21
+        promptTokensDetails:
+        - modality: TEXT
+          tokenCount: 21
+        totalTokenCount: 22
+    status:
+      code: 200
+      message: OK
+- request:
+    headers:
+      accept:
+      - '*/*'
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '635'
+      content-type:
+      - application/json
+      host:
+      - generativelanguage.googleapis.com
+    method: POST
+    parsed_body:
+      contents:
+      - parts:
+        - text: run bar for me please
+        role: user
+      - parts:
+        - functionCall:
+            args: {}
+            name: bar
+        role: model
+      - parts:
+        - functionResponse:
+            name: bar
+            response:
+              return_value: hello
+        role: user
+      toolConfig:
+        function_calling_config:
+          allowed_function_names:
+          - bar
+          - final_result
+          mode: ANY
+      tools:
+        functionDeclarations:
+        - description: ''
+          name: bar
+          parameters:
+            properties: {}
+            type: object
+        - description: The final response which ends this conversation
+          name: final_result
+          parameters:
+            properties:
+              bar:
+                type: string
+            required:
+            - bar
+            type: object
+    uri: https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent
+  response:
+    headers:
+      alt-svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      content-length:
+      - '776'
+      content-type:
+      - application/json; charset=UTF-8
+      server-timing:
+      - gfet4t7; dur=674
+      transfer-encoding:
+      - chunked
+      vary:
+      - Origin
+      - X-Origin
+      - Referer
+    parsed_body:
+      candidates:
+      - avgLogprobs: -0.002446441538631916
+        content:
+          parts:
+          - functionCall:
+              args:
+                bar: hello
+              name: final_result
+          role: model
+        finishReason: STOP
+      modelVersion: gemini-2.0-flash
+      responseId: t61QaMaQJ-qm1PIPwJSz4AI
+      usageMetadata:
+        candidatesTokenCount: 5
+        candidatesTokensDetails:
+        - modality: TEXT
+          tokenCount: 5
+        promptTokenCount: 27
+        promptTokensDetails:
+        - modality: TEXT
+          tokenCount: 27
+        totalTokenCount: 32
+    status:
+      code: 200
+      message: OK
+version: 1

pydantic_ai-0.2.20/tests/models/cassettes/test_google/test_google_timeout.yaml

@@ -0,0 +1,64 @@
+interactions:
+- request:
+    headers:
+      accept:
+      - '*/*'
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '87'
+      content-type:
+      - application/json
+      host:
+      - generativelanguage.googleapis.com
+    method: POST
+    parsed_body:
+      contents:
+      - parts:
+        - text: Hello!
+        role: user
+      generationConfig: {}
+    uri: https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash:generateContent
+  response:
+    headers:
+      alt-svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      content-length:
+      - '687'
+      content-type:
+      - application/json; charset=UTF-8
+      server-timing:
+      - gfet4t7; dur=304
+      transfer-encoding:
+      - chunked
+      vary:
+      - Origin
+      - X-Origin
+      - Referer
+    parsed_body:
+      candidates:
+      - avgLogprobs: -0.0009780019860376012
+        content:
+          parts:
+          - text: |
+              Hello there! How can I help you today?
+          role: model
+        finishReason: STOP
+      modelVersion: gemini-1.5-flash
+      responseId: KKRRaJyZNJiFm9IPzMfNiAk
+      usageMetadata:
+        candidatesTokenCount: 11
+        candidatesTokensDetails:
+        - modality: TEXT
+          tokenCount: 11
+        promptTokenCount: 2
+        promptTokensDetails:
+        - modality: TEXT
+          tokenCount: 2
+        totalTokenCount: 13
+    status:
+      code: 200
+      message: OK
+version: 1

pydantic_ai-0.2.20/tests/models/cassettes/test_google/test_google_tool_config_any_with_tool_without_args.yaml

@@ -0,0 +1,180 @@
+interactions:
+- request:
+    headers:
+      accept:
+      - '*/*'
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '477'
+      content-type:
+      - application/json
+      host:
+      - generativelanguage.googleapis.com
+    method: POST
+    parsed_body:
+      contents:
+      - parts:
+        - text: run bar for me please
+        role: user
+      generationConfig: {}
+      toolConfig:
+        functionCallingConfig:
+          mode: ANY
+      tools:
+      - functionDeclarations:
+        - description: ''
+          name: bar
+          parameters:
+            properties: {}
+            type: OBJECT
+        - description: The final response which ends this conversation
+          name: final_result
+          parameters:
+            properties:
+              bar:
+                type: STRING
+            required:
+            - bar
+            type: OBJECT
+    uri: https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent
+  response:
+    headers:
+      alt-svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      content-length:
+      - '721'
+      content-type:
+      - application/json; charset=UTF-8
+      server-timing:
+      - gfet4t7; dur=720
+      transfer-encoding:
+      - chunked
+      vary:
+      - Origin
+      - X-Origin
+      - Referer
+    parsed_body:
+      candidates:
+      - avgLogprobs: 2.094004230457358e-05
+        content:
+          parts:
+          - functionCall:
+              args: {}
+              name: bar
+          role: model
+        finishReason: STOP
+      modelVersion: gemini-2.0-flash
+      responseId: Ba1QaMKCL-qm1PIPwJSz4AI
+      usageMetadata:
+        candidatesTokenCount: 1
+        candidatesTokensDetails:
+        - modality: TEXT
+          tokenCount: 1
+        promptTokenCount: 21
+        promptTokensDetails:
+        - modality: TEXT
+          tokenCount: 21
+        totalTokenCount: 22
+    status:
+      code: 200
+      message: OK
+- request:
+    headers:
+      accept:
+      - '*/*'
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '759'
+      content-type:
+      - application/json
+      host:
+      - generativelanguage.googleapis.com
+    method: POST
+    parsed_body:
+      contents:
+      - parts:
+        - text: run bar for me please
+        role: user
+      - parts:
+        - functionCall:
+            args: {}
+            id: pyd_ai_4809c3117a3d4ed398851cb98f8ec303
+            name: bar
+        role: model
+      - parts:
+        - functionResponse:
+            id: pyd_ai_4809c3117a3d4ed398851cb98f8ec303
+            name: bar
+            response:
+              return_value: hello
+        role: user
+      generationConfig: {}
+      toolConfig:
+        functionCallingConfig:
+          mode: ANY
+      tools:
+      - functionDeclarations:
+        - description: ''
+          name: bar
+          parameters:
+            properties: {}
+            type: OBJECT
+        - description: The final response which ends this conversation
+          name: final_result
+          parameters:
+            properties:
+              bar:
+                type: STRING
+            required:
+            - bar
+            type: OBJECT
+    uri: https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent
+  response:
+    headers:
+      alt-svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      content-length:
+      - '776'
+      content-type:
+      - application/json; charset=UTF-8
+      server-timing:
+      - gfet4t7; dur=589
+      transfer-encoding:
+      - chunked
+      vary:
+      - Origin
+      - X-Origin
+      - Referer
+    parsed_body:
+      candidates:
+      - avgLogprobs: -0.002446441538631916
+        content:
+          parts:
+          - functionCall:
+              args:
+                bar: hello
+              name: final_result
+          role: model
+        finishReason: STOP
+      modelVersion: gemini-2.0-flash
+      responseId: Bq1QaNCkF5SF_NUPqYHxmAg
+      usageMetadata:
+        candidatesTokenCount: 5
+        candidatesTokensDetails:
+        - modality: TEXT
+          tokenCount: 5
+        promptTokenCount: 27
+        promptTokensDetails:
+        - modality: TEXT
+          tokenCount: 27
+        totalTokenCount: 32
+    status:
+      code: 200
+      message: OK
+version: 1

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/tests/models/test_gemini.py

@@ -1398,3 +1398,84 @@ async def test_response_with_thought_part(get_gemini_client: GetGeminiClient):
 
     assert result.output == 'Hello from thought test'
     assert result.usage() == snapshot(Usage(requests=1, request_tokens=1, response_tokens=2, total_tokens=3))
+
+
+@pytest.mark.vcr()
+async def test_gemini_tool_config_any_with_tool_without_args(allow_model_requests: None, gemini_api_key: str):
+    class Foo(BaseModel):
+        bar: str
+
+    m = GeminiModel('gemini-2.0-flash', provider=GoogleGLAProvider(api_key=gemini_api_key))
+    agent = Agent(m, output_type=Foo)
+
+    @agent.tool_plain
+    async def bar() -> str:
+        return 'hello'
+
+    result = await agent.run('run bar for me please')
+    assert result.all_messages() == snapshot(
+        [
+            ModelRequest(
+                parts=[
+                    UserPromptPart(
+                        content='run bar for me please',
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+            ModelResponse(
+                parts=[ToolCallPart(tool_name='bar', args={}, tool_call_id=IsStr())],
+                usage=Usage(
+                    requests=1,
+                    request_tokens=21,
+                    response_tokens=1,
+                    total_tokens=22,
+                    details={'text_candidates_tokens': 1, 'text_prompt_tokens': 21},
+                ),
+                model_name='gemini-2.0-flash',
+                timestamp=IsDatetime(),
+                vendor_details={'finish_reason': 'STOP'},
+                vendor_id=IsStr(),
+            ),
+            ModelRequest(
+                parts=[
+                    ToolReturnPart(
+                        tool_name='bar',
+                        content='hello',
+                        tool_call_id=IsStr(),
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+            ModelResponse(
+                parts=[
+                    ToolCallPart(
+                        tool_name='final_result',
+                        args={'bar': 'hello'},
+                        tool_call_id=IsStr(),
+                    )
+                ],
+                usage=Usage(
+                    requests=1,
+                    request_tokens=27,
+                    response_tokens=5,
+                    total_tokens=32,
+                    details={'text_candidates_tokens': 5, 'text_prompt_tokens': 27},
+                ),
+                model_name='gemini-2.0-flash',
+                timestamp=IsDatetime(),
+                vendor_details={'finish_reason': 'STOP'},
+                vendor_id=IsStr(),
+            ),
+            ModelRequest(
+                parts=[
+                    ToolReturnPart(
+                        tool_name='final_result',
+                        content='Final result processed.',
+                        tool_call_id=IsStr(),
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+        ]
+    )

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/tests/models/test_google.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 from typing import Any, Union
 
 import pytest
-from httpx import Request
+from httpx import Request, Timeout
 from inline_snapshot import Is, snapshot
 from pytest_mock import MockerFixture
 from typing_extensions import TypedDict
@@ -726,3 +726,94 @@ async def test_google_gs_url_force_download_raises_user_error(allow_model_reques
     url = ImageUrl(url='gs://pydantic-ai-dev/wikipedia_screenshot.png', force_download=True)
     with pytest.raises(UserError, match='Downloading from protocol "gs://" is not supported.'):
         _ = await agent.run(['What is the main content of this URL?', url])
+
+
+async def test_google_tool_config_any_with_tool_without_args(
+    allow_model_requests: None, google_provider: GoogleProvider
+):
+    class Foo(TypedDict):
+        bar: str
+
+    m = GoogleModel('gemini-2.0-flash', provider=google_provider)
+    agent = Agent(m, output_type=Foo)
+
+    @agent.tool_plain
+    async def bar() -> str:
+        return 'hello'
+
+    result = await agent.run('run bar for me please')
+    assert result.all_messages() == snapshot(
+        [
+            ModelRequest(
+                parts=[
+                    UserPromptPart(
+                        content='run bar for me please',
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+            ModelResponse(
+                parts=[ToolCallPart(tool_name='bar', args={}, tool_call_id=IsStr())],
+                usage=Usage(
+                    requests=1,
+                    request_tokens=21,
+                    response_tokens=1,
+                    total_tokens=22,
+                    details={'text_candidates_tokens': 1, 'text_prompt_tokens': 21},
+                ),
+                model_name='gemini-2.0-flash',
+                timestamp=IsDatetime(),
+                vendor_details={'finish_reason': 'STOP'},
+            ),
+            ModelRequest(
+                parts=[
+                    ToolReturnPart(
+                        tool_name='bar',
+                        content='hello',
+                        tool_call_id=IsStr(),
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+            ModelResponse(
+                parts=[
+                    ToolCallPart(
+                        tool_name='final_result',
+                        args={'bar': 'hello'},
+                        tool_call_id=IsStr(),
+                    )
+                ],
+                usage=Usage(
+                    requests=1,
+                    request_tokens=27,
+                    response_tokens=5,
+                    total_tokens=32,
+                    details={'text_candidates_tokens': 5, 'text_prompt_tokens': 27},
+                ),
+                model_name='gemini-2.0-flash',
+                timestamp=IsDatetime(),
+                vendor_details={'finish_reason': 'STOP'},
+            ),
+            ModelRequest(
+                parts=[
+                    ToolReturnPart(
+                        tool_name='final_result',
+                        content='Final result processed.',
+                        tool_call_id=IsStr(),
+                        timestamp=IsDatetime(),
+                    )
+                ]
+            ),
+        ]
+    )
+
+
+async def test_google_timeout(allow_model_requests: None, google_provider: GoogleProvider):
+    model = GoogleModel('gemini-1.5-flash', provider=google_provider)
+    agent = Agent(model=model)
+
+    result = await agent.run('Hello!', model_settings={'timeout': 10})
+    assert result.output == snapshot('Hello there! How can I help you today?\n')
+
+    with pytest.raises(UserError, match='Google does not support setting ModelSettings.timeout to a httpx.Timeout'):
+        await agent.run('Hello!', model_settings={'timeout': Timeout(10)})

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/tests/providers/test_provider_names.py

@@ -65,3 +65,10 @@ def test_infer_provider(provider: str, provider_cls: type[Provider[Any]], except
             infer_provider(provider)
     else:
         assert isinstance(infer_provider(provider), provider_cls)
+
+
+@pytest.mark.parametrize(('provider', 'provider_cls', 'exception_has'), test_infer_provider_params)
+def test_infer_provider_class(provider: str, provider_cls: type[Provider[Any]], exception_has: str | None):
+    from pydantic_ai.providers import infer_provider_class
+
+    assert infer_provider_class(provider) == provider_cls

{pydantic_ai-0.2.18 → pydantic_ai-0.2.20}/tests/test_agent.py

@@ -2425,6 +2425,10 @@ def test_instructions_raise_error_when_instructions_is_set():
     def instructions() -> str:
         return 'An instructions!'
 
+    @agent.instructions
+    def empty_instructions() -> str:
+        return ''
+
     result = agent.run_sync('Hello')
     assert result.all_messages()[0] == snapshot(
         ModelRequest(
@@ -2512,7 +2516,10 @@ def test_instructions_parameter_with_sequence():
     def instructions() -> str:
         return 'You are a potato.'
 
-    agent = Agent('test', instructions=('You are a helpful assistant.', instructions))
+    def empty_instructions() -> str:
+        return ''
+
+    agent = Agent('test', instructions=('You are a helpful assistant.', empty_instructions, instructions))
     result = agent.run_sync('Hello')
     assert result.all_messages()[0] == snapshot(
         ModelRequest(