pydantic-ai-slim 0.4.11__tar.gz → 0.5.1__tar.gz

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydantic-ai-slim
-Version: 0.4.11
+Version: 0.5.1
 Summary: Agent Framework / shim to use Pydantic with LLMs, slim package
 Author-email: Samuel Colvin <samuel@pydantic.dev>, Marcelo Trylesinski <marcelotryle@gmail.com>, David Montague <david@pydantic.dev>, Alex Hall <alex@pydantic.dev>, Douwe Maan <douwe@pydantic.dev>
 License-Expression: MIT
@@ -30,7 +30,7 @@ Requires-Dist: exceptiongroup; python_version < '3.11'
 Requires-Dist: griffe>=1.3.2
 Requires-Dist: httpx>=0.27
 Requires-Dist: opentelemetry-api>=1.28.0
-Requires-Dist: pydantic-graph==0.4.11
+Requires-Dist: pydantic-graph==0.5.1
 Requires-Dist: pydantic>=2.10
 Requires-Dist: typing-inspection>=0.4.0
 Provides-Extra: a2a
@@ -51,9 +51,9 @@ Requires-Dist: cohere>=5.16.0; (platform_system != 'Emscripten') and extra == 'c
 Provides-Extra: duckduckgo
 Requires-Dist: ddgs>=9.0.0; extra == 'duckduckgo'
 Provides-Extra: evals
-Requires-Dist: pydantic-evals==0.4.11; extra == 'evals'
+Requires-Dist: pydantic-evals==0.5.1; extra == 'evals'
 Provides-Extra: google
-Requires-Dist: google-genai>=1.24.0; extra == 'google'
+Requires-Dist: google-genai>=1.28.0; extra == 'google'
 Provides-Extra: groq
 Requires-Dist: groq>=0.19.0; extra == 'groq'
 Provides-Extra: huggingface

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/_agent_graph.py

@@ -620,7 +620,7 @@ async def process_function_tools(  # noqa: C901
                 result_data = await tool_manager.handle_call(call)
             except exceptions.UnexpectedModelBehavior as e:
                 ctx.state.increment_retries(ctx.deps.max_result_retries, e)
-                raise e  # pragma: no cover
+                raise e  # pragma: lax no cover
             except ToolRetryError as e:
                 ctx.state.increment_retries(ctx.deps.max_result_retries, e)
                 yield _messages.FunctionToolCallEvent(call)

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/_function_schema.py

@@ -154,9 +154,13 @@ def function_schema(  # noqa: C901
             if p.kind == Parameter.VAR_POSITIONAL:
                 annotation = list[annotation]
 
-            # FieldInfo.from_annotation expects a type, `annotation` is Any
+            required = p.default is Parameter.empty
+            # FieldInfo.from_annotated_attribute expects a type, `annotation` is Any
             annotation = cast(type[Any], annotation)
-            field_info = FieldInfo.from_annotation(annotation)
+            if required:
+                field_info = FieldInfo.from_annotation(annotation)
+            else:
+                field_info = FieldInfo.from_annotated_attribute(annotation, p.default)
             if field_info.description is None:
                 field_info.description = field_descriptions.get(field_name)
 
@@ -164,7 +168,7 @@ def function_schema(  # noqa: C901
                 field_name,
                 field_info,
                 decorators,
-                required=p.default is Parameter.empty,
+                required=required,
             )
             # noinspection PyTypeChecker
             td_schema.setdefault('metadata', {})['is_model_like'] = is_model_like(annotation)
@@ -281,7 +285,6 @@ def _build_schema(
     td_schema = core_schema.typed_dict_schema(
         fields,
         config=core_config,
-        total=var_kwargs_schema is None,
         extras_schema=gen_schema.generate_schema(var_kwargs_schema) if var_kwargs_schema else None,
     )
     return td_schema, None

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/exceptions.py

@@ -5,9 +5,9 @@ import sys
 from typing import TYPE_CHECKING
 
 if sys.version_info < (3, 11):
-    from exceptiongroup import ExceptionGroup
+    from exceptiongroup import ExceptionGroup as ExceptionGroup  # pragma: lax no cover
 else:
-    ExceptionGroup = ExceptionGroup
+    ExceptionGroup = ExceptionGroup  # pragma: lax no cover
 
 if TYPE_CHECKING:
     from .messages import RetryPromptPart

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/messages.py

@@ -106,7 +106,7 @@ class FileUrl(ABC):
     - `GoogleModel`: `VideoUrl.vendor_metadata` is used as `video_metadata`: https://ai.google.dev/gemini-api/docs/video-understanding#customize-video-processing
     """
 
-    _media_type: str | None = field(init=False, repr=False)
+    _media_type: str | None = field(init=False, repr=False, compare=False)
 
     def __init__(
         self,
@@ -120,19 +120,21 @@ class FileUrl(ABC):
         self.force_download = force_download
         self._media_type = media_type
 
-    @abstractmethod
-    def _infer_media_type(self) -> str:
-        """Return the media type of the file, based on the url."""
-
     @property
     def media_type(self) -> str:
-        """Return the media type of the file, based on the url or the provided `_media_type`."""
+        """Return the media type of the file, based on the URL or the provided `media_type`."""
         return self._media_type or self._infer_media_type()
 
+    @abstractmethod
+    def _infer_media_type(self) -> str:
+        """Infer the media type of the file based on the URL."""
+        raise NotImplementedError
+
     @property
     @abstractmethod
     def format(self) -> str:
         """The file format."""
+        raise NotImplementedError
 
     __repr__ = _utils.dataclasses_no_defaults_repr
 
@@ -182,7 +184,9 @@ class VideoUrl(FileUrl):
         elif self.is_youtube:
             return 'video/mp4'
         else:
-            raise ValueError(f'Unknown video file extension: {self.url}')
+            raise ValueError(
+                f'Could not infer media type from video URL: {self.url}. Explicitly provide a `media_type` instead.'
+            )
 
     @property
     def is_youtube(self) -> bool:
@@ -238,7 +242,9 @@ class AudioUrl(FileUrl):
         if self.url.endswith('.aac'):
             return 'audio/aac'
 
-        raise ValueError(f'Unknown audio file extension: {self.url}')
+        raise ValueError(
+            f'Could not infer media type from audio URL: {self.url}. Explicitly provide a `media_type` instead.'
+        )
 
     @property
     def format(self) -> AudioFormat:
@@ -278,7 +284,9 @@ class ImageUrl(FileUrl):
         elif self.url.endswith('.webp'):
             return 'image/webp'
         else:
-            raise ValueError(f'Unknown image file extension: {self.url}')
+            raise ValueError(
+                f'Could not infer media type from image URL: {self.url}. Explicitly provide a `media_type` instead.'
+            )
 
     @property
     def format(self) -> ImageFormat:
@@ -312,9 +320,28 @@ class DocumentUrl(FileUrl):
 
     def _infer_media_type(self) -> str:
         """Return the media type of the document, based on the url."""
+        # Common document types are hardcoded here as mime-type support for these
+        # extensions varies across operating systems.
+        if self.url.endswith(('.md', '.mdx', '.markdown')):
+            return 'text/markdown'
+        elif self.url.endswith('.asciidoc'):
+            return 'text/x-asciidoc'
+        elif self.url.endswith('.txt'):
+            return 'text/plain'
+        elif self.url.endswith('.pdf'):
+            return 'application/pdf'
+        elif self.url.endswith('.rtf'):
+            return 'application/rtf'
+        elif self.url.endswith('.docx'):
+            return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+        elif self.url.endswith('.xlsx'):
+            return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
         type_, _ = guess_type(self.url)
         if type_ is None:
-            raise ValueError(f'Unknown document file extension: {self.url}')
+            raise ValueError(
+                f'Could not infer media type from document URL: {self.url}. Explicitly provide a `media_type` instead.'
+            )
         return type_
 
     @property

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/anthropic.py

@@ -256,7 +256,7 @@ class AnthropicModel(Model):
         except APIStatusError as e:
             if (status_code := e.status_code) >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
     def _process_response(self, response: BetaMessage) -> ModelResponse:
         """Process a non-streamed response, and prepare a message to return."""

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/bedrock.py

@@ -665,4 +665,4 @@ class _AsyncIteratorWrapper(Generic[T]):
             if type(e.__cause__) is StopIteration:
                 raise StopAsyncIteration
             else:
-                raise e  # pragma: no cover
+                raise e  # pragma: lax no cover

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/cohere.py

@@ -183,7 +183,7 @@ class CohereModel(Model):
         except ApiError as e:
             if (status_code := e.status_code) and status_code >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
     def _process_response(self, response: V2ChatResponse) -> ModelResponse:
         """Process a non-streamed response, and prepare a message to return."""

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/gemini.py

@@ -11,7 +11,7 @@ from uuid import uuid4
 import httpx
 import pydantic
 from httpx import USE_CLIENT_DEFAULT, Response as HTTPResponse
-from typing_extensions import NotRequired, TypedDict, assert_never
+from typing_extensions import NotRequired, TypedDict, assert_never, deprecated
 
 from pydantic_ai.providers import Provider, infer_provider
 
@@ -92,6 +92,7 @@ class GeminiModelSettings(ModelSettings, total=False):
     """
 
 
+@deprecated('Use `GoogleModel` instead. See <https://ai.pydantic.dev/models/google/> for more details.')
 @dataclass(init=False)
 class GeminiModel(Model):
     """A model that uses Gemini via `generativelanguage.googleapis.com` API.
@@ -236,7 +237,7 @@ class GeminiModel(Model):
 
         if gemini_labels := model_settings.get('gemini_labels'):
             if self._system == 'google-vertex':
-                request_data['labels'] = gemini_labels
+                request_data['labels'] = gemini_labels  # pragma: lax no cover
 
         headers = {'Content-Type': 'application/json', 'User-Agent': get_user_agent()}
         url = f'/{self._model_name}:{"streamGenerateContent" if streamed else "generateContent"}'
@@ -366,11 +367,11 @@ class GeminiModel(Model):
                             inline_data={'data': downloaded_item['data'], 'mime_type': downloaded_item['data_type']}
                         )
                         content.append(inline_data)
-                    else:
+                    else:  # pragma: lax no cover
                         file_data = _GeminiFileDataPart(file_data={'file_uri': item.url, 'mime_type': item.media_type})
                         content.append(file_data)
                 else:
-                    assert_never(item)
+                    assert_never(item)  # pragma: lax no cover
         return content
 
     def _map_response_schema(self, o: OutputObjectDefinition) -> dict[str, Any]:

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/google.py

@@ -407,7 +407,7 @@ class GoogleModel(Model):
                     content.append(inline_data_dict)  # type: ignore
                 elif isinstance(item, VideoUrl) and item.is_youtube:
                     file_data_dict = {'file_data': {'file_uri': item.url, 'mime_type': item.media_type}}
-                    if item.vendor_metadata:
+                    if item.vendor_metadata:  # pragma: no branch
                         file_data_dict['video_metadata'] = item.vendor_metadata
                     content.append(file_data_dict)  # type: ignore
                 elif isinstance(item, FileUrl):
@@ -421,7 +421,9 @@ class GoogleModel(Model):
                         inline_data = {'data': downloaded_item['data'], 'mime_type': downloaded_item['data_type']}
                         content.append({'inline_data': inline_data})  # type: ignore
                     else:
-                        content.append({'file_data': {'file_uri': item.url, 'mime_type': item.media_type}})
+                        content.append(
+                            {'file_data': {'file_uri': item.url, 'mime_type': item.media_type}}
+                        )  # pragma: lax no cover
                 else:
                     assert_never(item)
         return content

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/groq.py

@@ -249,7 +249,7 @@ class GroqModel(Model):
         except APIStatusError as e:
             if (status_code := e.status_code) >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
     def _process_response(self, response: chat.ChatCompletion) -> ModelResponse:
         """Process a non-streamed response, and prepare a message to return."""

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/instrumented.py

@@ -18,11 +18,7 @@ from opentelemetry.trace import Span, Tracer, TracerProvider, get_tracer_provide
 from opentelemetry.util.types import AttributeValue
 from pydantic import TypeAdapter
 
-from ..messages import (
-    ModelMessage,
-    ModelRequest,
-    ModelResponse,
-)
+from ..messages import ModelMessage, ModelRequest, ModelResponse
 from ..settings import ModelSettings
 from . import KnownModelName, Model, ModelRequestParameters, StreamedResponse
 from .wrapper import WrapperModel
@@ -138,7 +134,7 @@ class InstrumentationSettings:
                 **tokens_histogram_kwargs,
                 explicit_bucket_boundaries_advisory=TOKEN_HISTOGRAM_BOUNDARIES,
             )
-        except TypeError:
+        except TypeError:  # pragma: lax no cover
             # Older OTel/logfire versions don't support explicit_bucket_boundaries_advisory
             self.tokens_histogram = self.meter.create_histogram(
                 **tokens_histogram_kwargs,  # pyright: ignore

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/mistral.py

@@ -218,7 +218,7 @@ class MistralModel(Model):
         except SDKError as e:
             if (status_code := e.status_code) >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
         assert response, 'A unexpected empty response from Mistral.'
         return response

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/models/openai.py

@@ -359,7 +359,7 @@ class OpenAIModel(Model):
         except APIStatusError as e:
             if (status_code := e.status_code) >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
     def _process_response(self, response: chat.ChatCompletion | str) -> ModelResponse:
         """Process a non-streamed response, and prepare a message to return."""
@@ -814,7 +814,7 @@ class OpenAIResponsesModel(Model):
         except APIStatusError as e:
             if (status_code := e.status_code) >= 400:
                 raise ModelHTTPError(status_code=status_code, model_name=self.model_name, body=e.body) from e
-            raise  # pragma: no cover
+            raise  # pragma: lax no cover
 
     def _get_reasoning(self, model_settings: OpenAIResponsesModelSettings) -> Reasoning | NotGiven:
         reasoning_effort = model_settings.get('openai_reasoning_effort', None)

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/profiles/_json_schema.py

@@ -137,8 +137,9 @@ class JsonSchemaTransformer(ABC):
         return schema
 
     def _handle_union(self, schema: JsonSchema, union_kind: Literal['anyOf', 'oneOf']) -> JsonSchema:
-        members = schema.get(union_kind)
-        if not members:
+        try:
+            members = schema.pop(union_kind)
+        except KeyError:
             return schema
 
         handled = [self._handle(member) for member in members]
@@ -149,7 +150,7 @@ class JsonSchemaTransformer(ABC):
 
         if len(handled) == 1:
             # In this case, no need to retain the union
-            return handled[0]
+            return handled[0] | schema
 
         # If we have keys besides the union kind (such as title or discriminator), keep them without modifications
         schema = schema.copy()

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/profiles/openai.py

@@ -47,11 +47,6 @@ def openai_model_profile(model_name: str) -> ModelProfile:
 _STRICT_INCOMPATIBLE_KEYS = [
     'minLength',
     'maxLength',
-    'pattern',
-    'format',
-    'minimum',
-    'maximum',
-    'multipleOf',
     'patternProperties',
     'unevaluatedProperties',
     'propertyNames',
@@ -61,11 +56,21 @@ _STRICT_INCOMPATIBLE_KEYS = [
     'contains',
     'minContains',
     'maxContains',
-    'minItems',
-    'maxItems',
     'uniqueItems',
 ]
 
+_STRICT_COMPATIBLE_STRING_FORMATS = [
+    'date-time',
+    'time',
+    'date',
+    'duration',
+    'email',
+    'hostname',
+    'ipv4',
+    'ipv6',
+    'uuid',
+]
+
 _sentinel = object()
 
 
@@ -127,6 +132,9 @@ class OpenAIJsonSchemaTransformer(JsonSchemaTransformer):
             value = schema.get(key, _sentinel)
             if value is not _sentinel:
                 incompatible_values[key] = value
+        if format := schema.get('format'):
+            if format not in _STRICT_COMPATIBLE_STRING_FORMATS:
+                incompatible_values['format'] = format
         description = schema.get('description')
         if incompatible_values:
             if self.strict is True:
@@ -158,11 +166,13 @@ class OpenAIJsonSchemaTransformer(JsonSchemaTransformer):
                 schema['required'] = list(schema['properties'].keys())
 
             elif self.strict is None:
-                if (
-                    schema.get('additionalProperties') is not False
-                    or 'properties' not in schema
-                    or 'required' not in schema
-                ):
+                if schema.get('additionalProperties', None) not in (None, False):
+                    self.is_strict_compatible = False
+                else:
+                    # additional properties are disallowed by default
+                    schema['additionalProperties'] = False
+
+                if 'properties' not in schema or 'required' not in schema:
                     self.is_strict_compatible = False
                 else:
                     required = schema['required']

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/providers/google.py

@@ -3,6 +3,8 @@ from __future__ import annotations as _annotations
 import os
 from typing import Literal, overload
 
+import httpx
+
 from pydantic_ai.exceptions import UserError
 from pydantic_ai.models import get_user_agent
 from pydantic_ai.profiles import ModelProfile
@@ -12,6 +14,7 @@ from pydantic_ai.providers import Provider
 try:
     from google import genai
     from google.auth.credentials import Credentials
+    from google.genai.types import HttpOptionsDict
 except ImportError as _import_error:
     raise ImportError(
         'Please install the `google-genai` package to use the Google provider, '
@@ -89,17 +92,17 @@ class GoogleProvider(Provider[genai.Client]):
             if vertexai is None:
                 vertexai = bool(location or project or credentials)
 
+            http_options: HttpOptionsDict = {
+                'headers': {'User-Agent': get_user_agent()},
+                'async_client_args': {'transport': httpx.AsyncHTTPTransport()},
+            }
             if not vertexai:
                 if api_key is None:
                     raise UserError(  # pragma: no cover
                         'Set the `GOOGLE_API_KEY` environment variable or pass it via `GoogleProvider(api_key=...)`'
                         'to use the Google Generative Language API.'
                     )
-                self._client = genai.Client(
-                    vertexai=vertexai,
-                    api_key=api_key,
-                    http_options={'headers': {'User-Agent': get_user_agent()}},
-                )
+                self._client = genai.Client(vertexai=vertexai, api_key=api_key, http_options=http_options)
             else:
                 self._client = genai.Client(
                     vertexai=vertexai,
@@ -111,7 +114,7 @@ class GoogleProvider(Provider[genai.Client]):
                     # For more details, check: https://cloud.google.com/vertex-ai/generative-ai/docs/learn/locations#available-regions
                     location=location or os.environ.get('GOOGLE_CLOUD_LOCATION') or 'us-central1',
                     credentials=credentials,
-                    http_options={'headers': {'User-Agent': get_user_agent()}},
+                    http_options=http_options,
                 )
         else:
             self._client = client

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pydantic_ai/tools.py

@@ -133,11 +133,19 @@ A = TypeVar('A')
 
 class GenerateToolJsonSchema(GenerateJsonSchema):
     def typed_dict_schema(self, schema: core_schema.TypedDictSchema) -> JsonSchemaValue:
-        s = super().typed_dict_schema(schema)
-        total = schema.get('total')
-        if 'additionalProperties' not in s and (total is True or total is None):
-            s['additionalProperties'] = False
-        return s
+        json_schema = super().typed_dict_schema(schema)
+        # Workaround for https://github.com/pydantic/pydantic/issues/12123
+        if 'additionalProperties' not in json_schema:  # pragma: no branch
+            extra = schema.get('extra_behavior') or schema.get('config', {}).get('extra_fields_behavior')
+            if extra == 'allow':
+                extras_schema = schema.get('extras_schema', None)
+                if extras_schema is not None:
+                    json_schema['additionalProperties'] = self.generate_inner(extras_schema) or True
+                else:
+                    json_schema['additionalProperties'] = True  # pragma: no cover
+            elif extra == 'forbid':
+                json_schema['additionalProperties'] = False
+        return json_schema
 
     def _named_required_fields_schema(self, named_required_fields: Sequence[tuple[str, bool, Any]]) -> JsonSchemaValue:
         # Remove largely-useless property titles

{pydantic_ai_slim-0.4.11 → pydantic_ai_slim-0.5.1}/pyproject.toml

@@ -65,7 +65,7 @@ logfire = ["logfire>=3.11.0"]
 openai = ["openai>=1.92.0"]
 cohere = ["cohere>=5.16.0; platform_system != 'Emscripten'"]
 vertexai = ["google-auth>=2.36.0", "requests>=2.32.2"]
-google = ["google-genai>=1.24.0"]
+google = ["google-genai>=1.28.0"]
 anthropic = ["anthropic>=0.52.0"]
 groq = ["groq>=0.19.0"]
 mistral = ["mistralai>=1.9.2"]
@@ -92,7 +92,7 @@ dev = [
     "anyio>=4.5.0",
     "asgi-lifespan>=2.1.0",
     "devtools>=0.12.2",
-    "coverage[toml]>=7.6.2",
+    "coverage[toml]>=7.10.2",
     "dirty-equals>=0.9.0",
     "duckduckgo-search>=7.0.0",
     "inline-snapshot>=0.19.3",
@@ -103,8 +103,9 @@ dev = [
     "pytest-recording>=0.13.2",
     "diff-cover>=9.2.0",
     "boto3-stubs[bedrock-runtime]",
-    "strict-no-cover>=0.1.1",
+    "strict-no-cover @ git+https://github.com/pydantic/strict-no-cover.git@7fc59da2c4dff919db2095a0f0e47101b657131d",
     "pytest-xdist>=3.6.1",
+    "coverage-enable-subprocess>=0.1.0",
 ]
 
 [tool.hatch.metadata]