BREAKING CHANGE: drop 4 months old deprecation warnings (#2451)

Author: Kludex

docs/changelog.md

@@ -30,6 +30,8 @@ See [#2445](https://github.com/pydantic/pydantic-ai/pull/2445) - The `get_data`
 See [#2446](https://github.com/pydantic/pydantic-ai/pull/2446) - The `format_as_xml` function was moved to the `pydantic_ai.format_as_xml` module.
 Import it via `from pydantic_ai import format_as_xml` instead.
 
+See [#2451](https://github.com/pydantic/pydantic-ai/pull/2451) - Removed deprecated `Agent.result_validator` method, `Agent.last_run_messages` property, `AgentRunResult.data` property, and `result_tool_return_content` parameters from result classes.
+
 ### v0.5.0 (2025-08-04)
 
 See [#2388](https://github.com/pydantic/pydantic-ai/pull/2388) - The `source` field of an `EvaluationResult` is now of type `EvaluatorSpec` rather than the actual source `Evaluator` instance, to help with serialization/deserialization.

pydantic_ai_slim/pydantic_ai/agent.py

@@ -1266,13 +1266,6 @@ async def output_validator_deps(ctx: RunContext[str], data: str) -> str:
         self._output_validators.append(_output.OutputValidator[AgentDepsT, Any](func))
         return func
 
-    @deprecated('`result_validator` is deprecated, use `output_validator` instead.')
-    def result_validator(self, func: Any, /) -> Any:
-        warnings.warn(
-            '`result_validator` is deprecated, use `output_validator` instead.', DeprecationWarning, stacklevel=2
-        )
-        return self.output_validator(func)  # type: ignore
-
     @overload
     def tool(self, func: ToolFuncContext[AgentDepsT, ToolParams], /) -> ToolFuncContext[AgentDepsT, ToolParams]: ...
 
@@ -1553,13 +1546,6 @@ def _infer_name(self, function_frame: FrameType | None) -> None:
                             self.name = name
                             return
 
-    @property
-    @deprecated(
-        'The `last_run_messages` attribute has been removed, use `capture_run_messages` instead.', category=None
-    )
-    def last_run_messages(self) -> list[_messages.ModelMessage]:
-        raise AttributeError('The `last_run_messages` attribute has been removed, use `capture_run_messages` instead.')
-
     def _prepare_output_schema(
         self, output_type: OutputSpec[RunOutputDataT] | None, model_profile: ModelProfile
     ) -> _output.OutputSchema[RunOutputDataT]:
@@ -2125,11 +2111,6 @@ def _traceparent(self, *, required: bool = True) -> str | None:
             raise AttributeError('No span was created for this agent run')
         return self._traceparent_value
 
-    @property
-    @deprecated('`result.data` is deprecated, use `result.output` instead.')
-    def data(self) -> OutputDataT:
-        return self.output
-
     def _set_output_tool_return(self, return_content: str) -> list[_messages.ModelMessage]:
         """Set return content for the output tool.
 
@@ -2151,69 +2132,40 @@ def _set_output_tool_return(self, return_content: str) -> list[_messages.ModelMe
 
         raise LookupError(f'No tool call found with tool name {self._output_tool_name!r}.')
 
-    @overload
-    def all_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def all_messages(self, *, result_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    def all_messages(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> list[_messages.ModelMessage]:
+    def all_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]:
         """Return the history of _messages.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: Deprecated, use `output_tool_return_content` instead.
 
         Returns:
             List of messages.
         """
-        content = result.coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        if content is not None:
-            return self._set_output_tool_return(content)
+        if output_tool_return_content is not None:
+            return self._set_output_tool_return(output_tool_return_content)
         else:
             return self._state.message_history
 
-    @overload
-    def all_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def all_messages_json(self, *, result_tool_return_content: str | None = None) -> bytes: ...
-
-    def all_messages_json(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> bytes:
+    def all_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes:
         """Return all messages from [`all_messages`][pydantic_ai.agent.AgentRunResult.all_messages] as JSON bytes.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: Deprecated, use `output_tool_return_content` instead.
 
         Returns:
             JSON bytes representing the messages.
         """
-        content = result.coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return _messages.ModelMessagesTypeAdapter.dump_json(self.all_messages(output_tool_return_content=content))
-
-    @overload
-    def new_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def new_messages(self, *, result_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
+        return _messages.ModelMessagesTypeAdapter.dump_json(
+            self.all_messages(output_tool_return_content=output_tool_return_content)
+        )
 
-    def new_messages(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> list[_messages.ModelMessage]:
+    def new_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]:
         """Return new messages associated with this run.
 
         Messages from older runs are excluded.
@@ -2223,38 +2175,27 @@ def new_messages(
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: Deprecated, use `output_tool_return_content` instead.
 
         Returns:
             List of new messages.
         """
-        content = result.coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return self.all_messages(output_tool_return_content=content)[self._new_message_index :]
-
-    @overload
-    def new_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes: ...
+        return self.all_messages(output_tool_return_content=output_tool_return_content)[self._new_message_index :]
 
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def new_messages_json(self, *, result_tool_return_content: str | None = None) -> bytes: ...
-
-    def new_messages_json(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> bytes:
+    def new_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes:
         """Return new messages from [`new_messages`][pydantic_ai.agent.AgentRunResult.new_messages] as JSON bytes.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: Deprecated, use `output_tool_return_content` instead.
 
         Returns:
             JSON bytes representing the new messages.
         """
-        content = result.coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return _messages.ModelMessagesTypeAdapter.dump_json(self.new_messages(output_tool_return_content=content))
+        return _messages.ModelMessagesTypeAdapter.dump_json(
+            self.new_messages(output_tool_return_content=output_tool_return_content)
+        )
 
     def usage(self) -> _usage.Usage:
         """Return the usage of the whole run."""

pydantic_ai_slim/pydantic_ai/result.py

@@ -1,14 +1,13 @@
 from __future__ import annotations as _annotations
 
-import warnings
 from collections.abc import AsyncIterable, AsyncIterator, Awaitable, Callable
 from copy import copy
 from dataclasses import dataclass, field
 from datetime import datetime
 from typing import Generic, cast
 
 from pydantic import ValidationError
-from typing_extensions import TypeVar, deprecated, overload
+from typing_extensions import TypeVar
 
 from pydantic_ai._tool_manager import ToolManager
 
@@ -291,68 +290,41 @@ class StreamedRunResult(Generic[AgentDepsT, OutputDataT]):
     [`get_output`][pydantic_ai.result.StreamedRunResult.get_output] completes.
     """
 
-    @overload
-    def all_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def all_messages(self, *, result_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    def all_messages(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> list[_messages.ModelMessage]:
+    def all_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]:
         """Return the history of _messages.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: deprecated, use `output_tool_return_content` instead.
 
         Returns:
             List of messages.
         """
         # this is a method to be consistent with the other methods
-        content = coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        if content is not None:
+        if output_tool_return_content is not None:
             raise NotImplementedError('Setting output tool return content is not supported for this result type.')
         return self._all_messages
 
-    @overload
-    def all_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def all_messages_json(self, *, result_tool_return_content: str | None = None) -> bytes: ...
-
-    def all_messages_json(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> bytes:  # pragma: no cover
+    def all_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes:  # pragma: no cover
         """Return all messages from [`all_messages`][pydantic_ai.result.StreamedRunResult.all_messages] as JSON bytes.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: deprecated, use `output_tool_return_content` instead.
 
         Returns:
             JSON bytes representing the messages.
         """
-        content = coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return _messages.ModelMessagesTypeAdapter.dump_json(self.all_messages(output_tool_return_content=content))
-
-    @overload
-    def new_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def new_messages(self, *, output_tool_return_content: str | None = None) -> list[_messages.ModelMessage]: ...
+        return _messages.ModelMessagesTypeAdapter.dump_json(
+            self.all_messages(output_tool_return_content=output_tool_return_content)
+        )
 
     def new_messages(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
+        self, *, output_tool_return_content: str | None = None
     ) -> list[_messages.ModelMessage]:  # pragma: no cover
         """Return new messages associated with this run.
 
@@ -363,38 +335,27 @@ def new_messages(
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: deprecated, use `output_tool_return_content` instead.
 
         Returns:
             List of new messages.
         """
-        content = coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return self.all_messages(output_tool_return_content=content)[self._new_message_index :]
+        return self.all_messages(output_tool_return_content=output_tool_return_content)[self._new_message_index :]
 
-    @overload
-    def new_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes: ...
-
-    @overload
-    @deprecated('`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.')
-    def new_messages_json(self, *, result_tool_return_content: str | None = None) -> bytes: ...
-
-    def new_messages_json(
-        self, *, output_tool_return_content: str | None = None, result_tool_return_content: str | None = None
-    ) -> bytes:  # pragma: no cover
+    def new_messages_json(self, *, output_tool_return_content: str | None = None) -> bytes:  # pragma: no cover
         """Return new messages from [`new_messages`][pydantic_ai.result.StreamedRunResult.new_messages] as JSON bytes.
 
         Args:
             output_tool_return_content: The return content of the tool call to set in the last message.
                 This provides a convenient way to modify the content of the output tool call if you want to continue
                 the conversation and want to set the response to the output tool call. If `None`, the last message will
                 not be modified.
-            result_tool_return_content: deprecated, use `output_tool_return_content` instead.
 
         Returns:
             JSON bytes representing the new messages.
         """
-        content = coalesce_deprecated_return_content(output_tool_return_content, result_tool_return_content)
-        return _messages.ModelMessagesTypeAdapter.dump_json(self.new_messages(output_tool_return_content=content))
+        return _messages.ModelMessagesTypeAdapter.dump_json(
+            self.new_messages(output_tool_return_content=output_tool_return_content)
+        )
 
     async def stream(self, *, debounce_by: float | None = 0.1) -> AsyncIterator[OutputDataT]:
         """Stream the response as an async iterable.
@@ -515,18 +476,3 @@ async def _usage_checking_iterator():
         return _usage_checking_iterator()
     else:
         return stream_response
-
-
-def coalesce_deprecated_return_content(
-    output_tool_return_content: T | None, result_tool_return_content: T | None
-) -> T | None:
-    """Return the first non-None value."""
-    if output_tool_return_content is None:
-        if result_tool_return_content is not None:  # pragma: no cover
-            warnings.warn(
-                '`result_tool_return_content` is deprecated, use `output_tool_return_content` instead.',
-                DeprecationWarning,
-                stacklevel=3,
-            )
-        return result_tool_return_content
-    return output_tool_return_content

tests/test_agent.py

@@ -2617,13 +2617,6 @@ async def get_location(loc_name: str) -> str:
     )
 
 
-def test_last_run_messages() -> None:
-    agent = Agent('test')
-
-    with pytest.raises(AttributeError, match='The `last_run_messages` attribute has been removed,'):
-        agent.last_run_messages  # pyright: ignore[reportDeprecated]
-
-
 def test_nested_capture_run_messages() -> None:
     agent = Agent('test')