mirascope 2.0.2__py3-none-any.whl → 2.1.0__py3-none-any.whl

mirascope/llm/providers/openai/responses/_utils/decode.py

@@ -27,6 +27,7 @@ from .....responses import (
     ChunkIterator,
     FinishReason,
     FinishReasonChunk,
+    ProviderToolUsage,
     RawMessageChunk,
     RawStreamEventChunk,
     Usage,
@@ -40,8 +41,21 @@ INCOMPLETE_DETAILS_TO_FINISH_REASON = {
 }
 
 
+def _extract_tool_usage(
+    output: list[openai_types.ResponseOutputItem],
+) -> list[ProviderToolUsage] | None:
+    """Extract provider tool usage from OpenAI Responses output."""
+    web_search_count = sum(1 for item in output if item.type == "web_search_call")
+
+    if web_search_count == 0:
+        return None
+
+    return [ProviderToolUsage(name="web_search", call_count=web_search_count)]
+
+
 def _decode_usage(
     usage: openai_types.ResponseUsage | None,
+    output: list[openai_types.ResponseOutputItem] | None = None,
 ) -> Usage | None:
     """Convert OpenAI ResponseUsage to Mirascope Usage."""
     if usage is None:  # pragma: no cover
@@ -63,6 +77,7 @@ def _decode_usage(
             else None
         )
         or 0,
+        provider_tool_usage=_extract_tool_usage(output) if output else None,
         raw=usage,
     )
 
@@ -112,7 +127,8 @@ def decode_response(
                 for reasoning_content in output_item.content:
                     if reasoning_content.type == "reasoning_text":
                         parts.append(Thought(thought=reasoning_content.text))
-
+        elif output_item.type == "web_search_call":
+            pass  # Skip, preserved in raw_message
         else:
             raise NotImplementedError(f"Unsupported output item: {output_item.type}")
 
@@ -134,7 +150,7 @@ def decode_response(
         ],
     )
 
-    usage = _decode_usage(response.usage)
+    usage = _decode_usage(response.usage, response.output)
     return assistant_message, finish_reason, usage
 
 
@@ -145,6 +161,7 @@ class _OpenAIResponsesChunkProcessor:
         self.current_content_type: Literal["text", "tool_call", "thought"] | None = None
         self.refusal_encountered = False
         self.include_thoughts = include_thoughts
+        self.web_search_count = 0
 
     def process_chunk(self, event: ResponseStreamEvent) -> ChunkIterator:
         """Process a single OpenAI Responses stream event and yield the appropriate content chunks."""
@@ -178,6 +195,8 @@ class _OpenAIResponsesChunkProcessor:
                         name=item.name,
                     )
                     self.current_content_type = "tool_call"
+                elif item.type == "web_search_call":
+                    self.web_search_count += 1
             elif event.type == "response.function_call_arguments.delta":
                 yield ToolCallChunk(id=self.current_tool_call_id, delta=event.delta)
             elif event.type == "response.function_call_arguments.done":
@@ -218,6 +237,15 @@ class _OpenAIResponsesChunkProcessor:
                 # Emit usage delta if present
                 if event.response.usage:
                     usage = event.response.usage
+                    provider_tool_usage = (
+                        [
+                            ProviderToolUsage(
+                                name="web_search", call_count=self.web_search_count
+                            )
+                        ]
+                        if self.web_search_count > 0
+                        else None
+                    )
                     yield UsageDeltaChunk(
                         input_tokens=usage.input_tokens,
                         output_tokens=usage.output_tokens,
@@ -234,6 +262,7 @@ class _OpenAIResponsesChunkProcessor:
                             else None
                         )
                         or 0,
+                        provider_tool_usage=provider_tool_usage,
                     )
 
 

mirascope/llm/providers/openai/responses/_utils/encode.py

@@ -17,6 +17,8 @@ from openai.types.responses import (
     ResponseTextConfigParam,
     ToolChoiceAllowedParam,
     ToolChoiceFunctionParam,
+    ToolParam,
+    WebSearchToolParam,
     response_create_params,
 )
 from openai.types.responses.easy_input_message_param import EasyInputMessageParam
@@ -34,12 +36,18 @@ from openai.types.shared_params.responses_model import ResponsesModel
 from .....exceptions import FeatureNotSupportedError
 from .....formatting import (
     Format,
+    FormatSpec,
     FormattableT,
-    OutputParser,
     resolve_format,
 )
 from .....messages import AssistantMessage, Message, UserMessage
-from .....tools import FORMAT_TOOL_NAME, AnyToolSchema, BaseToolkit
+from .....tools import (
+    FORMAT_TOOL_NAME,
+    AnyToolSchema,
+    BaseToolkit,
+    ProviderTool,
+    WebSearchTool,
+)
 from ....base import _utils as _base_utils
 from ...model_id import OpenAIModelId, model_name
 from ...model_info import (
@@ -72,7 +80,7 @@ class ResponseCreateKwargs(TypedDict, total=False):
     temperature: float
     max_output_tokens: int
     top_p: float
-    tools: list[FunctionToolParam] | Omit
+    tools: list[ToolParam] | Omit
     tool_choice: response_create_params.ToolChoice | Omit
     text: ResponseTextConfigParam
     reasoning: Reasoning | Omit
@@ -212,8 +220,16 @@ def _encode_message(
         return _encode_user_message(message)
 
 
-def _convert_tool_to_function_tool_param(tool: AnyToolSchema) -> FunctionToolParam:
-    """Convert a Mirascope ToolSchema to OpenAI Responses FunctionToolParam."""
+def _convert_tool_to_tool_param(
+    tool: AnyToolSchema | ProviderTool,
+) -> ToolParam:
+    """Convert a Mirascope ToolSchema to OpenAI Responses ToolParam."""
+    if isinstance(tool, WebSearchTool):
+        return WebSearchToolParam(type="web_search")
+    if isinstance(tool, ProviderTool):
+        raise FeatureNotSupportedError(
+            f"Provider tool {tool.name}", provider_id="openai:responses"
+        )
     schema_dict = tool.parameters.model_dump(by_alias=True, exclude_none=True)
     schema_dict["type"] = "object"
     _base_utils.ensure_additional_properties_false(schema_dict)
@@ -281,11 +297,8 @@ def encode_request(
     *,
     model_id: OpenAIModelId,
     messages: Sequence[Message],
-    tools: Sequence[AnyToolSchema] | BaseToolkit[AnyToolSchema] | None,
-    format: type[FormattableT]
-    | Format[FormattableT]
-    | OutputParser[FormattableT]
-    | None,
+    tools: BaseToolkit[AnyToolSchema],
+    format: FormatSpec[FormattableT] | None,
     params: Params,
 ) -> tuple[Sequence[Message], Format[FormattableT] | None, ResponseCreateKwargs]:
     """Prepares a request for the `OpenAI.responses.create` method."""
@@ -334,8 +347,7 @@ def encode_request(
             if thinking_config.get("encode_thoughts_as_text"):
                 encode_thoughts = True
 
-    tools = tools.tools if isinstance(tools, BaseToolkit) else tools or []
-    openai_tools = [_convert_tool_to_function_tool_param(tool) for tool in tools]
+    openai_tools = [_convert_tool_to_tool_param(tool) for tool in tools.tools]
 
     model_supports_strict = model_id not in MODELS_WITHOUT_JSON_SCHEMA_SUPPORT
     default_mode = "strict" if model_supports_strict else "tool"
@@ -346,16 +358,19 @@ def encode_request(
             kwargs["text"] = {"format": _create_strict_response_format(format)}
         elif format.mode == "tool":
             format_tool_schema = format.create_tool_schema()
-            openai_tools.append(
-                _convert_tool_to_function_tool_param(format_tool_schema)
-            )
-            if tools:
+            openai_tools.append(_convert_tool_to_tool_param(format_tool_schema))
+            if tools.tools:
+                # Only include function tools in tool_choice (filter out web search, etc.)
+                function_tools = cast(
+                    list[FunctionToolParam],
+                    [t for t in openai_tools if t.get("type") == "function"],
+                )
                 kwargs["tool_choice"] = ToolChoiceAllowedParam(
                     type="allowed_tools",
                     mode="required",
                     tools=[
                         {"type": "function", "name": tool["name"]}
-                        for tool in openai_tools
+                        for tool in function_tools
                     ],
                 )
             else:

mirascope/llm/providers/openai/responses/provider.py

@@ -10,7 +10,7 @@ from openai import AsyncOpenAI, BadRequestError as OpenAIBadRequestError, OpenAI
 
 from ....context import Context, DepsT
 from ....exceptions import BadRequestError, NotFoundError
-from ....formatting import Format, FormattableT, OutputParser
+from ....formatting import FormatSpec, FormattableT
 from ....messages import Message
 from ....responses import (
     AsyncContextResponse,
@@ -22,16 +22,7 @@ from ....responses import (
     Response,
     StreamResponse,
 )
-from ....tools import (
-    AsyncContextTool,
-    AsyncContextToolkit,
-    AsyncTool,
-    AsyncToolkit,
-    ContextTool,
-    ContextToolkit,
-    Tool,
-    Toolkit,
-)
+from ....tools import AsyncContextToolkit, AsyncToolkit, ContextToolkit, Toolkit
 from ...base import BaseProvider
 from .. import _utils as _shared_utils
 from ..model_id import OpenAIModelId, model_name
@@ -72,11 +63,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         *,
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[Tool] | Toolkit | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: Toolkit,
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> Response | Response[FormattableT]:
         """Generate an `llm.Response` by synchronously calling the OpenAI Responses API.
@@ -94,7 +82,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -112,7 +100,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -125,11 +113,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         *,
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[AsyncTool] | AsyncToolkit | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: AsyncToolkit,
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> AsyncResponse | AsyncResponse[FormattableT]:
         """Generate an `llm.AsyncResponse` by asynchronously calling the OpenAI Responses API.
@@ -147,7 +132,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -165,7 +150,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -178,11 +163,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         *,
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[Tool] | Toolkit | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: Toolkit,
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> StreamResponse | StreamResponse[FormattableT]:
         """Generate a `llm.StreamResponse` by synchronously streaming from the OpenAI Responses API.
@@ -200,7 +182,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -220,7 +202,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -231,11 +213,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         *,
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[AsyncTool] | AsyncToolkit | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: AsyncToolkit,
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> AsyncStreamResponse | AsyncStreamResponse[FormattableT]:
         """Generate a `llm.AsyncStreamResponse` by asynchronously streaming from the OpenAI Responses API.
@@ -253,7 +232,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -273,7 +252,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -285,13 +264,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[Tool | ContextTool[DepsT]]
-        | ContextToolkit[DepsT]
-        | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: ContextToolkit[DepsT],
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> ContextResponse[DepsT] | ContextResponse[DepsT, FormattableT]:
         """Generate a `llm.ContextResponse` by synchronously calling the OpenAI Responses API with context.
@@ -310,7 +284,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -328,7 +302,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -342,13 +316,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[AsyncTool | AsyncContextTool[DepsT]]
-        | AsyncContextToolkit[DepsT]
-        | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: AsyncContextToolkit[DepsT],
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> AsyncContextResponse[DepsT] | AsyncContextResponse[DepsT, FormattableT]:
         """Generate a `llm.AsyncContextResponse` by asynchronously calling the OpenAI Responses API with context.
@@ -367,7 +336,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -385,7 +354,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -399,13 +368,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[Tool | ContextTool[DepsT]]
-        | ContextToolkit[DepsT]
-        | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: ContextToolkit[DepsT],
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> ContextStreamResponse[DepsT] | ContextStreamResponse[DepsT, FormattableT]:
         """Generate a `llm.ContextStreamResponse` by synchronously streaming from the OpenAI Responses API with context.
@@ -424,7 +388,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -445,7 +409,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -457,13 +421,8 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: OpenAIModelId,
         messages: Sequence[Message],
-        tools: Sequence[AsyncTool | AsyncContextTool[DepsT]]
-        | AsyncContextToolkit[DepsT]
-        | None = None,
-        format: type[FormattableT]
-        | Format[FormattableT]
-        | OutputParser[FormattableT]
-        | None = None,
+        toolkit: AsyncContextToolkit[DepsT],
+        format: FormatSpec[FormattableT] | None = None,
         **params: Unpack[Params],
     ) -> (
         AsyncContextStreamResponse[DepsT]
@@ -485,7 +444,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
         messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -506,7 +465,7 @@ class OpenAIResponsesProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=provider_model_name,
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=messages,
             chunk_iterator=chunk_iterator,
             format=format,

mirascope/llm/responses/__init__.py

@@ -29,7 +29,7 @@ from .streams import (
     ThoughtStream,
     ToolCallStream,
 )
-from .usage import Usage, UsageDeltaChunk
+from .usage import ProviderToolUsage, Usage, UsageDeltaChunk
 
 __all__ = [
     "AnyResponse",
@@ -47,6 +47,7 @@ __all__ = [
     "ContextStreamResponse",
     "FinishReason",
     "FinishReasonChunk",
+    "ProviderToolUsage",
     "RawMessageChunk",
     "RawStreamEventChunk",
     "Response",

mirascope/llm/responses/base_stream_response.py

@@ -504,6 +504,8 @@ class BaseSyncStreamResponse(BaseStreamResponse[ChunkIterator, ToolkitT, Formatt
                 self.usage.cache_read_tokens += chunk.cache_read_tokens
                 self.usage.cache_write_tokens += chunk.cache_write_tokens
                 self.usage.reasoning_tokens += chunk.reasoning_tokens
+                if chunk.provider_tool_usage:
+                    self.usage.provider_tool_usage = chunk.provider_tool_usage
             else:
                 yield self._handle_chunk(chunk)
 
@@ -725,6 +727,8 @@ class BaseAsyncStreamResponse(
                 self.usage.cache_read_tokens += chunk.cache_read_tokens
                 self.usage.cache_write_tokens += chunk.cache_write_tokens
                 self.usage.reasoning_tokens += chunk.reasoning_tokens
+                if chunk.provider_tool_usage:
+                    self.usage.provider_tool_usage = chunk.provider_tool_usage
             else:
                 yield self._handle_chunk(chunk)
 

mirascope/llm/responses/response.py

@@ -9,14 +9,14 @@ from ..context import Context, DepsT
 from ..formatting import Format, FormattableT
 from ..messages import AssistantMessage, Message, UserContent
 from ..tools import (
-    AsyncContextTool,
     AsyncContextToolkit,
-    AsyncTool,
+    AsyncContextTools,
     AsyncToolkit,
-    ContextTool,
+    AsyncTools,
     ContextToolkit,
-    Tool,
+    ContextTools,
     Toolkit,
+    Tools,
 )
 from ..types import Jsonable
 from .base_response import BaseResponse
@@ -39,7 +39,7 @@ class Response(BaseResponse[Toolkit, FormattableT]):
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[Tool] | Toolkit | None = None,
+        tools: Tools | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         assistant_message: AssistantMessage,
@@ -112,7 +112,7 @@ class AsyncResponse(BaseResponse[AsyncToolkit, FormattableT]):
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[AsyncTool] | AsyncToolkit | None = None,
+        tools: AsyncTools | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         assistant_message: AssistantMessage,
@@ -194,9 +194,7 @@ class ContextResponse(
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[Tool | ContextTool[DepsT]]
-        | ContextToolkit[DepsT]
-        | None = None,
+        tools: ContextTools[DepsT] | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         assistant_message: AssistantMessage,
@@ -284,9 +282,7 @@ class AsyncContextResponse(
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[AsyncTool | AsyncContextTool[DepsT]]
-        | AsyncContextToolkit[DepsT]
-        | None = None,
+        tools: AsyncContextTools[DepsT] | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         assistant_message: AssistantMessage,

mirascope/llm/responses/stream_response.py

@@ -9,14 +9,14 @@ from ..context import Context, DepsT
 from ..formatting import Format, FormattableT
 from ..messages import Message, UserContent
 from ..tools import (
-    AsyncContextTool,
     AsyncContextToolkit,
-    AsyncTool,
+    AsyncContextTools,
     AsyncToolkit,
-    ContextTool,
+    AsyncTools,
     ContextToolkit,
-    Tool,
+    ContextTools,
     Toolkit,
+    Tools,
 )
 from ..types import Jsonable
 from .base_stream_response import (
@@ -98,7 +98,7 @@ class StreamResponse(BaseSyncStreamResponse[Toolkit, FormattableT]):
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[Tool] | Toolkit | None = None,
+        tools: Tools | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         chunk_iterator: ChunkIterator,
@@ -224,7 +224,7 @@ class AsyncStreamResponse(BaseAsyncStreamResponse[AsyncToolkit, FormattableT]):
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[AsyncTool] | AsyncToolkit | None = None,
+        tools: AsyncTools | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         chunk_iterator: AsyncChunkIterator,
@@ -359,9 +359,7 @@ class ContextStreamResponse(
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[Tool | ContextTool[DepsT]]
-        | ContextToolkit[DepsT]
-        | None = None,
+        tools: ContextTools[DepsT] | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         chunk_iterator: ChunkIterator,
@@ -502,9 +500,7 @@ class AsyncContextStreamResponse(
         model_id: "ModelId",
         provider_model_name: str,
         params: "Params",
-        tools: Sequence[AsyncTool | AsyncContextTool[DepsT]]
-        | AsyncContextToolkit[DepsT]
-        | None = None,
+        tools: AsyncContextTools[DepsT] | None = None,
         format: Format[FormattableT] | None = None,
         input_messages: Sequence[Message],
         chunk_iterator: AsyncChunkIterator,