Review feedback

Author: mwildehahn

docs/builtin-tools.md

@@ -202,7 +202,7 @@ The [`ImageGenerationTool`][pydantic_ai.builtin_tools.ImageGenerationTool] enabl
 | Provider | Supported | Notes |
 |----------|-----------|-------|
 | OpenAI Responses | ✅ | Full feature support. Only supported by models newer than `gpt-5`. Metadata about the generated image, like the [`revised_prompt`](https://platform.openai.com/docs/guides/tools-image-generation#revised-prompt) sent to the underlying image model, is available on the [`BuiltinToolReturnPart`][pydantic_ai.messages.BuiltinToolReturnPart] that's available via [`ModelResponse.builtin_tool_calls`][pydantic_ai.messages.ModelResponse.builtin_tool_calls]. |
-| Google | ✅ | Supports the `aspect_ratio` parameter when explicitly provided. Only supported by [image generation models](https://ai.google.dev/gemini-api/docs/image-generation) like `gemini-2.5-flash-image`. These models do not support [structured output](output.md) or [function tools](tools.md) and will always generate images, even if this built-in tool is not explicitly specified. |
+| Google | ✅ | Limited parameter support. Only supported by [image generation models](https://ai.google.dev/gemini-api/docs/image-generation) like `gemini-2.5-flash-image`. These models do not support [structured output](output.md) or [function tools](tools.md) and will always generate images, even if this built-in tool is not explicitly specified. |
 | Anthropic | ❌ | |
 | Groq | ❌ | |
 | Bedrock | ❌ | |
@@ -248,23 +248,6 @@ assert isinstance(result.response.images[0], BinaryImage)
 
 _(This example is complete, it can be run "as is")_
 
-To control the aspect ratio when using Gemini image models, include the `ImageGenerationTool` explicitly:
-
-```py {title="image_generation_google_aspect_ratio.py"}
-from pydantic_ai import Agent, BinaryImage, ImageGenerationTool
-
-agent = Agent(
-    'google-gla:gemini-2.5-flash-image',
-    builtin_tools=[ImageGenerationTool(aspect_ratio='16:9')],
-    output_type=BinaryImage,
-)
-
-result = agent.run_sync('Generate a wide illustration of an axolotl city skyline.')
-assert isinstance(result.output, BinaryImage)
-```
-
-_(This example is complete, it can be run "as is")_
-
 The `ImageGenerationTool` can be used together with `output_type=BinaryImage` to get [image output](output.md#image-output). If the `ImageGenerationTool` built-in tool is not explicitly specified, it will be enabled automatically:
 
 ```py {title="image_generation_output.py"}
@@ -308,7 +291,22 @@ assert isinstance(result.output, BinaryImage)
 
 _(This example is complete, it can be run "as is")_
 
-Gemini image models support the separate `aspect_ratio` parameter; set `aspect_ratio='16:9'`, for example, when calling `ImageGenerationTool` to generate wide or tall compositions.
+To control the aspect ratio when using Gemini image models, include the `ImageGenerationTool` explicitly:
+
+```py {title="image_generation_google_aspect_ratio.py"}
+from pydantic_ai import Agent, BinaryImage, ImageGenerationTool
+
+agent = Agent(
+    'google-gla:gemini-2.5-flash-image',
+    builtin_tools=[ImageGenerationTool(aspect_ratio='16:9')],
+    output_type=BinaryImage,
+)
+
+result = agent.run_sync('Generate a wide illustration of an axolotl city skyline.')
+assert isinstance(result.output, BinaryImage)
+```
+
+_(This example is complete, it can be run "as is")_
 
 For more details, check the [API documentation][pydantic_ai.builtin_tools.ImageGenerationTool].
 

pydantic_ai_slim/pydantic_ai/builtin_tools.py

@@ -263,7 +263,7 @@ class ImageGenerationTool(AbstractBuiltinTool):
 
     Supported by:
 
-    * Google image-generation models (Gemini) when the tool is explicitly enabled.
+    * Google image-generation models (Gemini)
     """
 
     kind: str = 'image_generation'

pydantic_ai_slim/pydantic_ai/models/google.py

@@ -353,10 +353,6 @@ def _get_tools(
                             "`ImageGenerationTool` is not supported by this model. Use a model with 'image' in the name instead."
                         )
                     if tool.aspect_ratio:
-                        if image_config and image_config.get('aspect_ratio') != tool.aspect_ratio:
-                            raise UserError(
-                                'Multiple `ImageGenerationTool` instances with different `aspect_ratio` values are not supported.'
-                            )
                         image_config = ImageConfigDict(aspect_ratio=tool.aspect_ratio)
                 else:  # pragma: no cover
                     raise UserError(
@@ -448,29 +444,28 @@ async def _build_content_and_config(
             else:
                 raise UserError('Google does not support setting ModelSettings.timeout to a httpx.Timeout')
 
-        config: GenerateContentConfigDict = {
-            'http_options': http_options,
-            'system_instruction': system_instruction,
-            'temperature': model_settings.get('temperature'),
-            'top_p': model_settings.get('top_p'),
-            'max_output_tokens': model_settings.get('max_tokens'),
-            'stop_sequences': model_settings.get('stop_sequences'),
-            'presence_penalty': model_settings.get('presence_penalty'),
-            'frequency_penalty': model_settings.get('frequency_penalty'),
-            'seed': model_settings.get('seed'),
-            'safety_settings': model_settings.get('google_safety_settings'),
-            'thinking_config': model_settings.get('google_thinking_config'),
-            'labels': model_settings.get('google_labels'),
-            'media_resolution': model_settings.get('google_video_resolution'),
-            'cached_content': model_settings.get('google_cached_content'),
-            'tools': cast(ToolListUnionDict, tools),
-            'tool_config': tool_config,
-            'response_mime_type': response_mime_type,
-            'response_schema': response_schema,
-            'response_modalities': modalities,
-        }
-        if image_config:
-            config['image_config'] = image_config
+        config = GenerateContentConfigDict(
+            http_options=http_options,
+            system_instruction=system_instruction,
+            temperature=model_settings.get('temperature'),
+            top_p=model_settings.get('top_p'),
+            max_output_tokens=model_settings.get('max_tokens'),
+            stop_sequences=model_settings.get('stop_sequences'),
+            presence_penalty=model_settings.get('presence_penalty'),
+            frequency_penalty=model_settings.get('frequency_penalty'),
+            seed=model_settings.get('seed'),
+            safety_settings=model_settings.get('google_safety_settings'),
+            thinking_config=model_settings.get('google_thinking_config'),
+            labels=model_settings.get('google_labels'),
+            media_resolution=model_settings.get('google_video_resolution'),
+            cached_content=model_settings.get('google_cached_content'),
+            tools=cast(ToolListUnionDict, tools),
+            tool_config=tool_config,
+            response_mime_type=response_mime_type,
+            response_schema=response_schema,
+            response_modalities=modalities,
+            image_config=image_config,
+        )
 
         return contents, config
 

tests/models/test_google.py

@@ -3143,22 +3143,6 @@ async def test_google_image_generation_tool_aspect_ratio(google_provider: Google
     assert image_config == {'aspect_ratio': '16:9'}
 
 
-async def test_google_image_generation_tool_aspect_ratio_conflict(google_provider: GoogleProvider) -> None:
-    model = GoogleModel('gemini-2.5-flash-image', provider=google_provider)
-    params = ModelRequestParameters(
-        builtin_tools=[
-            ImageGenerationTool(aspect_ratio='16:9'),
-            ImageGenerationTool(aspect_ratio='1:1'),
-        ]
-    )
-
-    with pytest.raises(
-        UserError,
-        match='Multiple `ImageGenerationTool` instances with different `aspect_ratio` values are not supported.',
-    ):
-        model._get_tools(params)  # pyright: ignore[reportPrivateUsage]
-
-
 async def test_google_vertexai_image_generation(allow_model_requests: None, vertex_provider: GoogleProvider):
     model = GoogleModel('gemini-2.5-flash-image', provider=vertex_provider)