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

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

@@ -11,15 +11,22 @@ from openai.types import chat as openai_types, shared_params as shared_openai_ty
 from openai.types.shared_params.response_format_json_schema import JSONSchema
 
 from .....exceptions import FeatureNotSupportedError
-from .....formatting import Format, FormattableT, OutputParser, resolve_format
+from .....formatting import Format, FormatSpec, FormattableT, 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 (
     MODELS_WITHOUT_AUDIO_SUPPORT,
     MODELS_WITHOUT_JSON_OBJECT_SUPPORT,
     MODELS_WITHOUT_JSON_SCHEMA_SUPPORT,
+    NON_REASONING_MODELS,
 )
 
 if TYPE_CHECKING:
@@ -41,6 +48,7 @@ class ChatCompletionCreateKwargs(TypedDict, total=False):
     parallel_tool_calls: bool | Omit
     temperature: float | Omit
     max_tokens: int | Omit
+    max_completion_tokens: int | Omit
     top_p: float | Omit
     seed: int | Omit
     stop: str | list[str] | Omit
@@ -228,9 +236,20 @@ def _encode_message(
 
 @lru_cache(maxsize=128)
 def _convert_tool_to_tool_param(
-    tool: AnyToolSchema,
+    tool: AnyToolSchema | ProviderTool,
 ) -> openai_types.ChatCompletionToolParam:
     """Convert a single Mirascope `Tool` to OpenAI ChatCompletionToolParam with caching."""
+    if isinstance(tool, WebSearchTool):
+        raise FeatureNotSupportedError(
+            "WebSearchTool",
+            provider_id="openai:completions",
+            message="Web search is only available in the OpenAI Responses API. "
+            "Use a model with :responses suffix (e.g., 'openai/gpt-4o:responses').",
+        )
+    if isinstance(tool, ProviderTool):
+        raise FeatureNotSupportedError(
+            f"Provider tool {tool.name}", provider_id="openai:completions"
+        )
     schema_dict = tool.parameters.model_dump(by_alias=True, exclude_none=True)
     schema_dict["type"] = "object"
     _base_utils.ensure_additional_properties_false(schema_dict)
@@ -280,11 +299,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, ChatCompletionCreateKwargs]:
     """Prepares a request for the `OpenAI.chat.completions.create` method."""
@@ -297,37 +313,40 @@ def encode_request(
         )
     base_model_name = model_name(model_id, None)
 
+    is_reasoning_model = base_model_name not in NON_REASONING_MODELS
     kwargs: ChatCompletionCreateKwargs = ChatCompletionCreateKwargs(
-        {
-            "model": base_model_name,
-        }
+        {"model": base_model_name}
     )
     encode_thoughts_as_text = False
 
     with _base_utils.ensure_all_params_accessed(
         params=params,
         provider_id="openai",
-        unsupported_params=["top_k"],
+        unsupported_params=[
+            "top_k",
+            *(["temperature", "top_p", "stop_sequences"] if is_reasoning_model else []),
+        ],
     ) as param_accessor:
-        if param_accessor.temperature is not None:
+        if not is_reasoning_model and param_accessor.temperature is not None:
             kwargs["temperature"] = param_accessor.temperature
         if param_accessor.max_tokens is not None:
-            kwargs["max_tokens"] = param_accessor.max_tokens
-        if param_accessor.top_p is not None:
+            if is_reasoning_model:
+                kwargs["max_completion_tokens"] = param_accessor.max_tokens
+            else:
+                kwargs["max_tokens"] = param_accessor.max_tokens
+        if not is_reasoning_model and param_accessor.top_p is not None:
             kwargs["top_p"] = param_accessor.top_p
 
         if param_accessor.seed is not None:
             kwargs["seed"] = param_accessor.seed
-        if param_accessor.stop_sequences is not None:
+        if not is_reasoning_model and param_accessor.stop_sequences is not None:
             kwargs["stop"] = param_accessor.stop_sequences
         if param_accessor.thinking is not None:
             thinking = param_accessor.thinking
             if thinking.get("encode_thoughts_as_text"):
                 encode_thoughts_as_text = True
 
-    tools = tools.tools if isinstance(tools, BaseToolkit) else tools or []
-
-    openai_tools = [_convert_tool_to_tool_param(tool) for tool in tools]
+    openai_tools = [_convert_tool_to_tool_param(tool) for tool in tools.tools]
 
     model_supports_strict = base_model_name not in MODELS_WITHOUT_JSON_SCHEMA_SUPPORT
     default_mode = "strict" if model_supports_strict else "tool"
@@ -342,7 +361,7 @@ def encode_request(
                 )
             kwargs["response_format"] = _create_strict_response_format(format)
         elif format.mode == "tool":
-            if tools:
+            if tools.tools:
                 kwargs["tool_choice"] = "required"
             else:
                 kwargs["tool_choice"] = {

mirascope/llm/providers/openai/completions/base_provider.py

@@ -10,7 +10,7 @@ from typing_extensions import Unpack
 from openai import AsyncOpenAI, OpenAI
 
 from ....context import Context, DepsT
-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 model_name as openai_model_name
@@ -101,11 +92,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         *,
         model_id: str,
         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 API.
@@ -123,7 +111,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -143,7 +131,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -157,13 +145,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: str,
         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, None] | ContextResponse[DepsT, FormattableT]:
         """Generate an `llm.ContextResponse` by synchronously calling the API.
@@ -182,7 +165,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -202,7 +185,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -215,11 +198,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         *,
         model_id: str,
         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 API.
@@ -238,7 +218,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             params=params,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
         )
         kwargs["model"] = self._model_name(model_id)
@@ -257,7 +237,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -271,13 +251,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: str,
         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, None] | AsyncContextResponse[DepsT, FormattableT]:
         """Generate an `llm.AsyncContextResponse` by asynchronously calling the API.
@@ -297,7 +272,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             params=params,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
         )
         kwargs["model"] = self._model_name(model_id)
@@ -316,7 +291,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             assistant_message=assistant_message,
             finish_reason=finish_reason,
@@ -329,11 +304,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         *,
         model_id: str,
         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 an `llm.StreamResponse` by synchronously streaming from the API.
@@ -351,7 +323,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -369,7 +341,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -381,13 +353,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: str,
         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 an `llm.ContextStreamResponse` by synchronously streaming from the API.
@@ -406,7 +373,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -425,7 +392,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -436,11 +403,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         *,
         model_id: str,
         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 an `llm.AsyncStreamResponse` by asynchronously streaming from the API.
@@ -458,7 +422,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -476,7 +440,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             chunk_iterator=chunk_iterator,
             format=format,
@@ -488,13 +452,8 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         ctx: Context[DepsT],
         model_id: str,
         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]
@@ -516,7 +475,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
         input_messages, format, kwargs = _utils.encode_request(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            tools=toolkit,
             format=format,
             params=params,
         )
@@ -535,7 +494,7 @@ class BaseOpenAICompletionsProvider(BaseProvider[OpenAI]):
             model_id=model_id,
             provider_model_name=self._provider_model_name(model_id),
             params=params,
-            tools=tools,
+            tools=toolkit,
             input_messages=input_messages,
             chunk_iterator=chunk_iterator,
             format=format,

mirascope/llm/providers/openai/provider.py

@@ -10,7 +10,7 @@ from openai import 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,
@@ -23,13 +23,9 @@ from ...responses import (
     StreamResponse,
 )
 from ...tools import (
-    AsyncContextTool,
     AsyncContextToolkit,
-    AsyncTool,
     AsyncToolkit,
-    ContextTool,
     ContextToolkit,
-    Tool,
     Toolkit,
 )
 from ..base import BaseProvider
@@ -162,11 +158,8 @@ class OpenAIProvider(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 API.
@@ -185,7 +178,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
         return client.call(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -196,13 +189,8 @@ class OpenAIProvider(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, None] | ContextResponse[DepsT, FormattableT]:
         """Generate an `llm.ContextResponse` by synchronously calling the OpenAI API.
@@ -223,7 +211,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
             ctx=ctx,
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -233,11 +221,8 @@ class OpenAIProvider(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 API.
@@ -255,7 +240,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
         return await self._choose_subprovider(model_id, messages).call_async(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -266,13 +251,8 @@ class OpenAIProvider(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, None] | AsyncContextResponse[DepsT, FormattableT]:
         """Generate an `llm.AsyncContextResponse` by asynchronously calling the OpenAI API.
@@ -292,7 +272,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
             ctx=ctx,
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -302,11 +282,8 @@ class OpenAIProvider(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 an `llm.StreamResponse` by synchronously streaming from the OpenAI API.
@@ -325,7 +302,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
         return client.stream(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -336,13 +313,8 @@ class OpenAIProvider(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 an `llm.ContextStreamResponse` by synchronously streaming from the OpenAI API.
@@ -363,7 +335,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
             ctx=ctx,
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -373,11 +345,8 @@ class OpenAIProvider(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 an `llm.AsyncStreamResponse` by asynchronously streaming from the OpenAI API.
@@ -395,7 +364,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
         return await self._choose_subprovider(model_id, messages).stream_async(
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )
@@ -406,13 +375,8 @@ class OpenAIProvider(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]
@@ -435,7 +399,7 @@ class OpenAIProvider(BaseProvider[OpenAI]):
             ctx=ctx,
             model_id=model_id,
             messages=messages,
-            tools=tools,
+            toolkit=toolkit,
             format=format,
             **params,
         )