pydantic-ai-slim 1.0.14__py3-none-any.whl → 1.0.15__py3-none-any.whl

pydantic_ai/models/gemini.py

@@ -21,6 +21,7 @@ from ..messages import (
     BinaryContent,
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
+    FilePart,
     FileUrl,
     ModelMessage,
     ModelRequest,
@@ -46,7 +47,11 @@ LatestGeminiModelNames = Literal[
     'gemini-2.0-flash',
     'gemini-2.0-flash-lite',
     'gemini-2.5-flash',
+    'gemini-2.5-flash-preview-09-2025',
     'gemini-2.5-flash-lite',
+    'gemini-2.5-flash-lite-preview-09-2025',
+    'gemini-flash-latest',
+    'gemini-flash-lite-latest',
     'gemini-2.5-pro',
 ]
 """Latest Gemini models."""
@@ -628,6 +633,9 @@ def _content_model_response(m: ModelResponse) -> _GeminiContent:
         elif isinstance(item, BuiltinToolCallPart | BuiltinToolReturnPart):  # pragma: no cover
             # This is currently never returned from gemini
             pass
+        elif isinstance(item, FilePart):  # pragma: no cover
+            # Files generated by models are not sent back to models that don't themselves generate files.
+            pass
         else:
             assert_never(item)
     return _GeminiContent(role='model', parts=parts)

pydantic_ai/models/google.py

@@ -13,12 +13,13 @@ from typing_extensions import assert_never
 from .. import UnexpectedModelBehavior, _utils, usage
 from .._output import OutputObjectDefinition
 from .._run_context import RunContext
-from ..builtin_tools import CodeExecutionTool, UrlContextTool, WebSearchTool
+from ..builtin_tools import CodeExecutionTool, ImageGenerationTool, UrlContextTool, WebSearchTool
 from ..exceptions import UserError
 from ..messages import (
     BinaryContent,
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
+    FilePart,
     FileUrl,
     FinishReason,
     ModelMessage,
@@ -95,7 +96,11 @@ LatestGoogleModelNames = Literal[
     'gemini-2.0-flash',
     'gemini-2.0-flash-lite',
     'gemini-2.5-flash',
+    'gemini-2.5-flash-preview-09-2025',
+    'gemini-flash-latest',
     'gemini-2.5-flash-lite',
+    'gemini-2.5-flash-lite-preview-09-2025',
+    'gemini-flash-lite-latest',
     'gemini-2.5-pro',
 ]
 """Latest Gemini models."""
@@ -308,6 +313,11 @@ class GoogleModel(Model):
         yield await self._process_streamed_response(response, model_request_parameters)  # type: ignore
 
     def _get_tools(self, model_request_parameters: ModelRequestParameters) -> list[ToolDict] | None:
+        tools: list[ToolDict] = [
+            ToolDict(function_declarations=[_function_declaration_from_tool(t)])
+            for t in model_request_parameters.tool_defs.values()
+        ]
+
         if model_request_parameters.builtin_tools:
             if model_request_parameters.output_tools:
                 raise UserError(
@@ -316,21 +326,22 @@ class GoogleModel(Model):
             if model_request_parameters.function_tools:
                 raise UserError('Gemini does not support user tools and built-in tools at the same time.')
 
-        tools: list[ToolDict] = [
-            ToolDict(function_declarations=[_function_declaration_from_tool(t)])
-            for t in model_request_parameters.tool_defs.values()
-        ]
-        for tool in model_request_parameters.builtin_tools:
-            if isinstance(tool, WebSearchTool):
-                tools.append(ToolDict(google_search=GoogleSearchDict()))
-            elif isinstance(tool, UrlContextTool):
-                tools.append(ToolDict(url_context=UrlContextDict()))
-            elif isinstance(tool, CodeExecutionTool):  # pragma: no branch
-                tools.append(ToolDict(code_execution=ToolCodeExecutionDict()))
-            else:  # pragma: no cover
-                raise UserError(
-                    f'`{tool.__class__.__name__}` is not supported by `GoogleModel`. If it should be, please file an issue.'
-                )
+            for tool in model_request_parameters.builtin_tools:
+                if isinstance(tool, WebSearchTool):
+                    tools.append(ToolDict(google_search=GoogleSearchDict()))
+                elif isinstance(tool, UrlContextTool):
+                    tools.append(ToolDict(url_context=UrlContextDict()))
+                elif isinstance(tool, CodeExecutionTool):
+                    tools.append(ToolDict(code_execution=ToolCodeExecutionDict()))
+                elif isinstance(tool, ImageGenerationTool):  # pragma: no branch
+                    if not self.profile.supports_image_output:
+                        raise UserError(
+                            "`ImageGenerationTool` is not supported by this model. Use a model with 'image' in the name instead."
+                        )
+                else:  # pragma: no cover
+                    raise UserError(
+                        f'`{tool.__class__.__name__}` is not supported by `GoogleModel`. If it should be, please file an issue.'
+                    )
         return tools or None
 
     def _get_tool_config(
@@ -382,6 +393,9 @@ class GoogleModel(Model):
         model_request_parameters: ModelRequestParameters,
     ) -> tuple[list[ContentUnionDict], GenerateContentConfigDict]:
         tools = self._get_tools(model_request_parameters)
+        if tools and not self.profile.supports_tools:
+            raise UserError('Tools are not supported by this model.')
+
         response_mime_type = None
         response_schema = None
         if model_request_parameters.output_mode == 'native':
@@ -394,6 +408,8 @@ class GoogleModel(Model):
             assert output_object is not None
             response_schema = self._map_response_schema(output_object)
         elif model_request_parameters.output_mode == 'prompted' and not tools:
+            if not self.profile.supports_json_object_output:
+                raise UserError('JSON output is not supported by this model.')
             response_mime_type = 'application/json'
 
         tool_config = self._get_tool_config(model_request_parameters, tools)
@@ -615,8 +631,8 @@ class GeminiStreamedResponse(StreamedResponse):
             #     candidate.grounding_metadata, self.provider_name
             # )
             # if web_search_call and web_search_return:
-            #     yield self._parts_manager.handle_builtin_tool_call_part(vendor_part_id=uuid4(), part=web_search_call)
-            #     yield self._parts_manager.handle_builtin_tool_return_part(
+            #     yield self._parts_manager.handle_part(vendor_part_id=uuid4(), part=web_search_call)
+            #     yield self._parts_manager.handle_part(
             #         vendor_part_id=uuid4(), part=web_search_return
             #     )
 
@@ -658,9 +674,18 @@ class GeminiStreamedResponse(StreamedResponse):
                     )
                     if maybe_event is not None:  # pragma: no branch
                         yield maybe_event
+                elif part.inline_data is not None:
+                    data = part.inline_data.data
+                    mime_type = part.inline_data.mime_type
+                    assert data and mime_type, 'Inline data must have data and mime type'
+                    content = BinaryContent(data=data, media_type=mime_type)
+                    yield self._parts_manager.handle_part(
+                        vendor_part_id=uuid4(),
+                        part=FilePart(content=BinaryContent.narrow_type(content)),
+                    )
                 elif part.executable_code is not None:
                     code_execution_tool_call_id = _utils.generate_tool_call_id()
-                    yield self._parts_manager.handle_builtin_tool_call_part(
+                    yield self._parts_manager.handle_part(
                         vendor_part_id=uuid4(),
                         part=_map_executable_code(
                             part.executable_code, self.provider_name, code_execution_tool_call_id
@@ -668,7 +693,7 @@ class GeminiStreamedResponse(StreamedResponse):
                     )
                 elif part.code_execution_result is not None:
                     assert code_execution_tool_call_id is not None
-                    yield self._parts_manager.handle_builtin_tool_return_part(
+                    yield self._parts_manager.handle_part(
                         vendor_part_id=uuid4(),
                         part=_map_code_execution_result(
                             part.code_execution_result, self.provider_name, code_execution_tool_call_id
@@ -729,6 +754,10 @@ def _content_model_response(m: ModelResponse, provider_name: str) -> ContentDict
                 elif item.tool_name == WebSearchTool.kind:
                     # Web search results are not sent back
                     pass
+        elif isinstance(item, FilePart):
+            content = item.content
+            inline_data_dict: BlobDict = {'data': content.data, 'mime_type': content.media_type}
+            part['inline_data'] = inline_data_dict
         else:
             assert_never(item)
 
@@ -784,10 +813,14 @@ def _process_response_from_parts(
             item = ToolCallPart(tool_name=part.function_call.name, args=part.function_call.args)
             if part.function_call.id is not None:
                 item.tool_call_id = part.function_call.id  # pragma: no cover
+        elif inline_data := part.inline_data:
+            data = inline_data.data
+            mime_type = inline_data.mime_type
+            assert data and mime_type, 'Inline data must have data and mime type'
+            content = BinaryContent(data=data, media_type=mime_type)
+            item = FilePart(content=BinaryContent.narrow_type(content))
         else:  # pragma: no cover
-            raise UnexpectedModelBehavior(
-                f'Unsupported response from Gemini, expected all parts to be function calls, text, or thoughts, got: {part!r}'
-            )
+            raise UnexpectedModelBehavior(f'Unsupported response from Gemini: {part!r}')
 
         items.append(item)
     return ModelResponse(

pydantic_ai/models/groq.py

@@ -1,6 +1,5 @@
 from __future__ import annotations as _annotations
 
-import base64
 from collections.abc import AsyncIterable, AsyncIterator, Iterable
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -23,6 +22,7 @@ from ..messages import (
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
     DocumentUrl,
+    FilePart,
     FinishReason,
     ImageUrl,
     ModelMessage,
@@ -117,6 +117,10 @@ class GroqModelSettings(ModelSettings, total=False):
     # ALL FIELDS MUST BE `groq_` PREFIXED SO YOU CAN MERGE THEM WITH OTHER MODELS.
 
     groq_reasoning_format: Literal['hidden', 'raw', 'parsed']
+    """The format of the reasoning output.
+
+    See [the Groq docs](https://console.groq.com/docs/reasoning#reasoning-format) for more details.
+    """
 
 
 @dataclass(init=False)
@@ -404,6 +408,9 @@ class GroqModel(Model):
                     elif isinstance(item, BuiltinToolCallPart | BuiltinToolReturnPart):  # pragma: no cover
                         # These are not currently sent back
                         pass
+                    elif isinstance(item, FilePart):  # pragma: no cover
+                        # Files generated by models are not sent back to models that don't themselves generate files.
+                        pass
                     else:
                         assert_never(item)
                 message_param = chat.ChatCompletionAssistantMessageParam(role='assistant')
@@ -491,9 +498,8 @@ class GroqModel(Model):
                     image_url = ImageURL(url=item.url)
                     content.append(chat.ChatCompletionContentPartImageParam(image_url=image_url, type='image_url'))
                 elif isinstance(item, BinaryContent):
-                    base64_encoded = base64.b64encode(item.data).decode('utf-8')
                     if item.is_image:
-                        image_url = ImageURL(url=f'data:{item.media_type};base64,{base64_encoded}')
+                        image_url = ImageURL(url=item.data_uri)
                         content.append(chat.ChatCompletionContentPartImageParam(image_url=image_url, type='image_url'))
                     else:
                         raise RuntimeError('Only images are supported for binary content in Groq.')
@@ -546,12 +552,12 @@ class GroqStreamedResponse(StreamedResponse):
                         )
                         if call_part:
                             executed_tool_call_id = call_part.tool_call_id
-                            yield self._parts_manager.handle_builtin_tool_call_part(
+                            yield self._parts_manager.handle_part(
                                 vendor_part_id=f'executed_tools-{tool.index}-call', part=call_part
                             )
                         if return_part:
                             executed_tool_call_id = None
-                            yield self._parts_manager.handle_builtin_tool_return_part(
+                            yield self._parts_manager.handle_part(
                                 vendor_part_id=f'executed_tools-{tool.index}-return', part=return_part
                             )
 

pydantic_ai/models/huggingface.py

@@ -1,6 +1,5 @@
 from __future__ import annotations as _annotations
 
-import base64
 from collections.abc import AsyncIterable, AsyncIterator
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -20,6 +19,7 @@ from ..messages import (
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
     DocumentUrl,
+    FilePart,
     FinishReason,
     ImageUrl,
     ModelMessage,
@@ -344,6 +344,9 @@ class HuggingFaceModel(Model):
                     elif isinstance(item, BuiltinToolCallPart | BuiltinToolReturnPart):  # pragma: no cover
                         # This is currently never returned from huggingface
                         pass
+                    elif isinstance(item, FilePart):  # pragma: no cover
+                        # Files generated by models are not sent back to models that don't themselves generate files.
+                        pass
                     else:
                         assert_never(item)
                 message_param = ChatCompletionInputMessage(role='assistant')  # type: ignore
@@ -433,9 +436,8 @@ class HuggingFaceModel(Model):
                     url = ChatCompletionInputURL(url=item.url)  # type: ignore
                     content.append(ChatCompletionInputMessageChunk(type='image_url', image_url=url))  # type: ignore
                 elif isinstance(item, BinaryContent):
-                    base64_encoded = base64.b64encode(item.data).decode('utf-8')
                     if item.is_image:
-                        url = ChatCompletionInputURL(url=f'data:{item.media_type};base64,{base64_encoded}')  # type: ignore
+                        url = ChatCompletionInputURL(url=item.data_uri)  # type: ignore
                         content.append(ChatCompletionInputMessageChunk(type='image_url', image_url=url))  # type: ignore
                     else:  # pragma: no cover
                         raise RuntimeError(f'Unsupported binary content type: {item.media_type}')

pydantic_ai/models/mistral.py

@@ -1,6 +1,5 @@
 from __future__ import annotations as _annotations
 
-import base64
 from collections.abc import AsyncIterable, AsyncIterator, Iterable
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -20,6 +19,7 @@ from ..messages import (
     BuiltinToolCallPart,
     BuiltinToolReturnPart,
     DocumentUrl,
+    FilePart,
     FinishReason,
     ImageUrl,
     ModelMessage,
@@ -544,6 +544,9 @@ class MistralModel(Model):
                     elif isinstance(part, BuiltinToolCallPart | BuiltinToolReturnPart):  # pragma: no cover
                         # This is currently never returned from mistral
                         pass
+                    elif isinstance(part, FilePart):  # pragma: no cover
+                        # Files generated by models are not sent back to models that don't themselves generate files.
+                        pass
                     else:
                         assert_never(part)
                 if thinking_chunks:
@@ -580,16 +583,11 @@ class MistralModel(Model):
                 elif isinstance(item, ImageUrl):
                     content.append(MistralImageURLChunk(image_url=MistralImageURL(url=item.url)))
                 elif isinstance(item, BinaryContent):
-                    base64_encoded = base64.b64encode(item.data).decode('utf-8')
                     if item.is_image:
-                        image_url = MistralImageURL(url=f'data:{item.media_type};base64,{base64_encoded}')
+                        image_url = MistralImageURL(url=item.data_uri)
                         content.append(MistralImageURLChunk(image_url=image_url, type='image_url'))
                     elif item.media_type == 'application/pdf':
-                        content.append(
-                            MistralDocumentURLChunk(
-                                document_url=f'data:application/pdf;base64,{base64_encoded}', type='document_url'
-                            )
-                        )
+                        content.append(MistralDocumentURLChunk(document_url=item.data_uri, type='document_url'))
                     else:
                         raise RuntimeError('BinaryContent other than image or PDF is not supported in Mistral.')
                 elif isinstance(item, DocumentUrl):