Switch to just storing ModelRequestParameters and ModelSettings on ModelRequest

Author: mwildehahn

pydantic_ai_slim/pydantic_ai/_agent_graph.py

@@ -495,12 +495,11 @@ async def _prepare_request(
 
         model_request_parameters = await _prepare_request_parameters(ctx)
 
-        # Populate tool tracking on the ModelRequest (the last request in the original history)
-        self.request.function_tools = model_request_parameters.function_tools
-        self.request.builtin_tools = model_request_parameters.builtin_tools
-        self.request.output_tools = model_request_parameters.output_tools
-
         model_settings = ctx.deps.model_settings
+        # Record metadata on the ModelRequest (the last request in the original history)
+        self.request.model_request_parameters = model_request_parameters
+        self.request.model_settings = model_settings
+
         usage = ctx.state.usage
         if ctx.deps.usage_limits.count_tokens_before_request:
             # Copy to avoid modifying the original usage object with the counted usage

pydantic_ai_slim/pydantic_ai/_model_request_parameters.py

@@ -0,0 +1,44 @@
+from __future__ import annotations as _annotations
+
+from dataclasses import dataclass, field
+from functools import cached_property
+from typing import TYPE_CHECKING
+
+from . import _utils
+from ._tool_types import ToolDefinition
+from .builtin_tools import AbstractBuiltinTool
+
+if TYPE_CHECKING:
+    from ._output import OutputObjectDefinition
+    from .output import OutputMode
+
+__all__ = ('ModelRequestParameters',)
+
+
+@dataclass(repr=False, kw_only=True)
+class ModelRequestParameters:
+    """Configuration for an agent's request to a model, specifically related to tools and output handling."""
+
+    function_tools: list[ToolDefinition] = field(default_factory=list)
+    builtin_tools: list[AbstractBuiltinTool] = field(default_factory=list)
+
+    output_mode: OutputMode = 'text'
+    output_object: OutputObjectDefinition | None = None
+    output_tools: list[ToolDefinition] = field(default_factory=list)
+    prompted_output_template: str | None = None
+    allow_text_output: bool = True
+    allow_image_output: bool = False
+
+    @cached_property
+    def tool_defs(self) -> dict[str, ToolDefinition]:
+        return {tool_def.name: tool_def for tool_def in [*self.function_tools, *self.output_tools]}
+
+    @cached_property
+    def prompted_output_instructions(self) -> str | None:
+        if self.output_mode == 'prompted' and self.prompted_output_template and self.output_object:
+            from ._output import PromptedOutputSchema
+
+            return PromptedOutputSchema.build_instructions(self.prompted_output_template, self.output_object)
+        return None
+
+    __repr__ = _utils.dataclasses_no_defaults_repr

pydantic_ai_slim/pydantic_ai/messages.py

@@ -16,15 +16,21 @@
 from typing_extensions import deprecated
 
 from . import _otel_messages, _utils
-from ._tool_types import ToolDefinition
+from ._model_request_parameters import ModelRequestParameters
 from ._utils import generate_tool_call_id as _generate_tool_call_id, now_utc as _now_utc
-from .builtin_tools import AbstractBuiltinTool
 from .exceptions import UnexpectedModelBehavior
+from .settings import ModelSettings
 from .usage import RequestUsage
 
 if TYPE_CHECKING:
     from .models.instrumented import InstrumentationSettings
 
+    ModelRequestParametersField = ModelRequestParameters | None
+    ModelSettingsField = ModelSettings | None
+else:  # pragma: no cover
+    ModelRequestParametersField = Any
+    ModelSettingsField = Any
+
 
 AudioMediaType: TypeAlias = Literal['audio/wav', 'audio/mpeg', 'audio/ogg', 'audio/flac', 'audio/aiff', 'audio/aac']
 ImageMediaType: TypeAlias = Literal['image/jpeg', 'image/png', 'image/gif', 'image/webp']
@@ -947,26 +953,18 @@ class ModelRequest:
     instructions: str | None = None
     """The instructions for the model."""
 
-    function_tools: Annotated[list[ToolDefinition] | None, pydantic.Field(exclude=True, repr=False)] = field(
-        default=None, repr=False
-    )
-    """Function tools that were available for this request.
-
-    Available for introspection during a run. This field is excluded from serialization.
-    """
-
-    builtin_tools: Annotated[list[AbstractBuiltinTool] | None, pydantic.Field(exclude=True, repr=False)] = field(
-        default=None, repr=False
-    )
-    """Builtin tools that were available for this request.
+    model_request_parameters: Annotated[
+        ModelRequestParametersField, pydantic.Field(exclude=True, repr=False)
+    ] = field(default=None, repr=False)
+    """Full request parameters captured for this request.
 
     Available for introspection during a run. This field is excluded from serialization.
     """
 
-    output_tools: Annotated[list[ToolDefinition] | None, pydantic.Field(exclude=True, repr=False)] = field(
+    model_settings: Annotated[ModelSettingsField, pydantic.Field(exclude=True, repr=False)] = field(
         default=None, repr=False
     )
-    """Output tools that were available for this request.
+    """Effective model settings that were applied to this request.
 
     Available for introspection during a run. This field is excluded from serialization.
     """

pydantic_ai_slim/pydantic_ai/models/__init__.py

@@ -19,12 +19,11 @@
 import httpx
 from typing_extensions import TypeAliasType, TypedDict
 
-from .. import _utils
 from .._json_schema import JsonSchemaTransformer
-from .._output import OutputObjectDefinition, PromptedOutputSchema
+from .._model_request_parameters import ModelRequestParameters
+from .._output import OutputObjectDefinition
 from .._parts_manager import ModelResponsePartsManager
 from .._run_context import RunContext
-from ..builtin_tools import AbstractBuiltinTool
 from ..exceptions import UserError
 from ..messages import (
     BaseToolCallPart,
@@ -45,7 +44,6 @@
     ToolCallPart,
     VideoUrl,
 )
-from ..output import OutputMode
 from ..profiles import DEFAULT_PROFILE, ModelProfile, ModelProfileSpec
 from ..providers import Provider, infer_provider
 from ..settings import ModelSettings, merge_model_settings
@@ -308,33 +306,6 @@
 """
 
 
-@dataclass(repr=False, kw_only=True)
-class ModelRequestParameters:
-    """Configuration for an agent's request to a model, specifically related to tools and output handling."""
-
-    function_tools: list[ToolDefinition] = field(default_factory=list)
-    builtin_tools: list[AbstractBuiltinTool] = field(default_factory=list)
-
-    output_mode: OutputMode = 'text'
-    output_object: OutputObjectDefinition | None = None
-    output_tools: list[ToolDefinition] = field(default_factory=list)
-    prompted_output_template: str | None = None
-    allow_text_output: bool = True
-    allow_image_output: bool = False
-
-    @cached_property
-    def tool_defs(self) -> dict[str, ToolDefinition]:
-        return {tool_def.name: tool_def for tool_def in [*self.function_tools, *self.output_tools]}
-
-    @cached_property
-    def prompted_output_instructions(self) -> str | None:
-        if self.output_mode == 'prompted' and self.prompted_output_template and self.output_object:
-            return PromptedOutputSchema.build_instructions(self.prompted_output_template, self.output_object)
-        return None
-
-    __repr__ = _utils.dataclasses_no_defaults_repr
-
-
 class Model(ABC):
     """Abstract class for a model."""
 

tests/test_messages.py

@@ -27,7 +27,8 @@
     VideoUrl,
 )
 from pydantic_ai.builtin_tools import ImageGenerationTool
-from pydantic_ai.models import ToolDefinition
+from pydantic_ai.models import ModelRequestParameters, ToolDefinition
+from pydantic_ai.settings import ModelSettings
 
 from .conftest import IsDatetime, IsNow, IsStr
 
@@ -407,8 +408,6 @@ def test_pre_usage_refactor_messages_deserializable():
                         timestamp=IsNow(tz=timezone.utc),
                     )
                 ],
-                function_tools=None,
-                builtin_tools=None,
             ),
             ModelResponse(
                 parts=[TextPart(content='Mexico City.')],
@@ -612,7 +611,7 @@ def test_binary_content_validation_with_optional_identifier():
 
 
 def test_model_request_tool_tracking_excluded_from_serialization():
-    """Test that function, builtin, and output tools are not serialized in the request."""
+    """Test that request metadata is accessible but not serialized."""
     tool_def = ToolDefinition(
         name='test_tool',
         description='A test tool',
@@ -624,21 +623,30 @@ def test_model_request_tool_tracking_excluded_from_serialization():
         parameters_json_schema={'type': 'object', 'properties': {}},
     )
 
-    request = ModelRequest(
-        parts=[UserPromptPart('test prompt')],
-        instructions='test instructions',
+    model_request_parameters = ModelRequestParameters(
         function_tools=[tool_def],
         builtin_tools=[ImageGenerationTool()],
         output_tools=[output_tool_def],
     )
+    model_settings = ModelSettings(max_tokens=256)
+
+    request = ModelRequest(
+        parts=[UserPromptPart('test prompt')],
+        instructions='test instructions',
+        model_request_parameters=model_request_parameters,
+        model_settings=model_settings,
+    )
 
-    # Verify the fields are accessible
-    assert request.function_tools == [tool_def]
-    assert request.builtin_tools == [ImageGenerationTool()]
-    assert request.output_tools == [output_tool_def]
+    # Verify the metadata is accessible
+    assert request.model_request_parameters is model_request_parameters
+    assert request.model_settings == model_settings
+    params = request.model_request_parameters
+    assert params is not None
+    assert params.function_tools == [tool_def]
+    assert params.builtin_tools == [ImageGenerationTool()]
+    assert params.output_tools == [output_tool_def]
 
     # Serialize - fields ARE excluded
     serialized = ModelMessagesTypeAdapter.dump_python([request], mode='json')
-    assert 'function_tools' not in serialized[0]
-    assert 'builtin_tools' not in serialized[0]
-    assert 'output_tools' not in serialized[0]
+    assert 'model_request_parameters' not in serialized[0]
+    assert 'model_settings' not in serialized[0]