Remove untestable deferred_tool_results parameter from adapter methods

Author: bendrucker

pydantic_ai_slim/pydantic_ai/ui/_adapter.py

@@ -215,7 +215,6 @@ def run_stream_native(
         *,
         output_type: OutputSpec[Any] | None = None,
         message_history: Sequence[ModelMessage] | None = None,
-        deferred_tool_results: DeferredToolResults | None = None,
         model: Model | KnownModelName | str | None = None,
         instructions: Instructions[AgentDepsT] = None,
         deps: AgentDepsT = None,
@@ -232,7 +231,6 @@ def run_stream_native(
             output_type: Custom output type to use for this run, `output_type` may only be used if the agent has no
                 output validators since output validators would expect an argument that matches the agent's output type.
             message_history: History of the conversation so far.
-            deferred_tool_results: Optional results for deferred tool calls in the message history.
             model: Optional model to use for this run, required if `model` was not set when creating the agent.
             instructions: Optional additional instructions to use for this run.
             deps: Optional dependencies to use for this run.
@@ -243,10 +241,6 @@ def run_stream_native(
             toolsets: Optional additional toolsets for this run.
             builtin_tools: Optional additional builtin tools to use for this run.
         """
-        # Use instance field as fallback if not explicitly passed
-        if deferred_tool_results is None:
-            deferred_tool_results = self.deferred_tool_results
-
         message_history = [*(message_history or []), *self.messages]
 
         toolset = self.toolset
@@ -272,7 +266,7 @@ def run_stream_native(
         return self.agent.run_stream_events(
             output_type=output_type,
             message_history=message_history,
-            deferred_tool_results=deferred_tool_results,
+            deferred_tool_results=self.deferred_tool_results,
             model=model,
             deps=deps,
             model_settings=model_settings,
@@ -289,7 +283,6 @@ def run_stream(
         *,
         output_type: OutputSpec[Any] | None = None,
         message_history: Sequence[ModelMessage] | None = None,
-        deferred_tool_results: DeferredToolResults | None = None,
         model: Model | KnownModelName | str | None = None,
         instructions: Instructions[AgentDepsT] = None,
         deps: AgentDepsT = None,
@@ -307,7 +300,6 @@ def run_stream(
             output_type: Custom output type to use for this run, `output_type` may only be used if the agent has no
                 output validators since output validators would expect an argument that matches the agent's output type.
             message_history: History of the conversation so far.
-            deferred_tool_results: Optional results for deferred tool calls in the message history.
             model: Optional model to use for this run, required if `model` was not set when creating the agent.
             instructions: Optional additional instructions to use for this run.
             deps: Optional dependencies to use for this run.
@@ -324,7 +316,6 @@ def run_stream(
             self.run_stream_native(
                 output_type=output_type,
                 message_history=message_history,
-                deferred_tool_results=deferred_tool_results,
                 model=model,
                 instructions=instructions,
                 deps=deps,
@@ -345,7 +336,6 @@ async def dispatch_request(
         *,
         agent: AbstractAgent[DispatchDepsT, DispatchOutputDataT],
         message_history: Sequence[ModelMessage] | None = None,
-        deferred_tool_results: DeferredToolResults | None = None,
         model: Model | KnownModelName | str | None = None,
         instructions: Instructions[DispatchDepsT] = None,
         deps: DispatchDepsT = None,
@@ -366,7 +356,6 @@ async def dispatch_request(
             output_type: Custom output type to use for this run, `output_type` may only be used if the agent has no
                 output validators since output validators would expect an argument that matches the agent's output type.
             message_history: History of the conversation so far.
-            deferred_tool_results: Optional results for deferred tool calls in the message history.
             model: Optional model to use for this run, required if `model` was not set when creating the agent.
             instructions: Optional additional instructions to use for this run.
             deps: Optional dependencies to use for this run.
@@ -406,7 +395,6 @@ async def dispatch_request(
         return adapter.streaming_response(
             adapter.run_stream(
                 message_history=message_history,
-                deferred_tool_results=deferred_tool_results,
                 deps=deps,
                 output_type=output_type,
                 model=model,

tests/test_vercel_ai.py

@@ -3163,14 +3163,3 @@ async def test_adapter_dump_messages_with_cache_point():
             }
         ]
     )
-
-
-def starlette_import_successful() -> bool:
-    """Check if starlette is installed."""
-    try:
-        from starlette.requests import Request
-
-        assert Request  # Verify the import succeeded
-        return True
-    except ImportError:
-        return False