mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-17 04:34:25 +00:00
* fix(responses bridge): keep defer_loading on function tools sent to the Responses API Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): give the defer_loading casts a cast-ok reason Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor(responses bridge): build defer_loading outside the tool loop so Final stays valid Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): round-trip tool_search_call and tool_search_output items between turns Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor(responses bridge): read replayed tool-search and namespace fields through typed helpers Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): keep tool_search items on a turn with no message or tool call Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): keep every reasoning item on a search-only turn Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): leave content unset on a search-only turn so replay adds no empty message Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): replay tool search items only with tool_search, count replayed tools in the allowlist, keep namespace off guardrails * fix(responses bridge): honor drop_params for defer_loading and route tool_search to Responses Under drop_params, defer_loading is dropped when no tool_search tool is sent, so the 400 it would cause upstream goes away as before. A non-bool value answers 400 without drop_params and is dropped with it. A null tool-level value falls back to the nested function value. A request carrying a tool_search tool now bridges to Responses on OpenAI and Azure endpoints even with reasoning_effort none, since chat completions rejects the tool_search type. * fix(responses bridge): replay tool search items in output order and count replayed tools in tool policy Store the ordered output prefix through the last tool search item, reasoning included, so a second reasoning item no longer makes OpenAI reject the replay. The shared chat-to-Responses converter now replays tool search items and namespace only when the bridge opts in, so Noma, the complexity router and guardrail payloads keep their shape. The tool policy guardrail and the allowlist count replayed tools only when the request can send them. * fix(responses bridge): forward defer_loading only beside a tool_search tool defer_loading only means something with tool_search, and backends without it reject the key (xAI answers 403). A true value with no tool_search tool now answers 400 naming drop_params and is dropped under drop_params; a false value there is a no-op and is dropped. * fix(tool_loop): keep tool search items and namespace between rounds * fix(responses bridge): check replayed tool search loads when a deployment adds tool_search * fix(chat): drop litellm response fields before strict OpenAI-compatible providers A chat reply from the Responses bridge carries provider_specific_fields on the message and on each tool call, plus reasoning_items. Groq, Fireworks, Mistral and Together reject unknown fields, so sending that reply back to them as history failed with a 400 or 422. Strip them in the shared helper and use it in those providers. * fix(caching): keep reasoning_items and tool search items on response cache hits A cached bridge response lost reasoning_items on a non-streaming hit and lost both reasoning_items and provider_specific_fields (tool_search_items) on a streamed hit, so the next turn could not replay the search or the reasoning around it * test(integration): cover tool search item replay on the chat to Responses bridge Proxy, SDK, authorization and chaos cells for returning and replaying tool_search_call and tool_search_output items and the tool call namespace * test(integration): add response cache twins for the tool search guardrail cells Each guardrail cell now has a twin where the answer is already in the Redis response cache: a key opted out of global guardrails caches a replay that loads a policy-blocked tool, the same replay without guardrails is cached before block mode sees it, rewrite mode is not served the unrewritten conversation's cached answer, and an allowed replay is served from the cache. * fix(responses bridge): forward defer_loading beside a client-executed tool_search The bridge now replays a client tool_search_call and the client's tool_search_output through provider_specific_fields.tool_search_items, so a deferred function beside a client tool_search keeps defer_loading like it does beside a hosted one * test(responses bridge): pin the client tool_search turn and its replay, streamed and not * fix(responses bridge): strip nested namespace for strict providers and keep streamed reasoning_items on text replies Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix(responses bridge): keep dropping defer_loading beside a client-executed tool_search Forwarding defer_loading beside a client tool_search made GPT stop with a search call the chat client has to answer by hand, so a plain question that used to get tool calls got none. Keep main's behavior of dropping it there. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
226 lines
8.9 KiB
Python
226 lines
8.9 KiB
Python
"""Client-side tool-calling loop helpers for litellm.completion."""
|
|
|
|
from collections.abc import Awaitable, Callable, Sequence
|
|
from typing import Final, TypeAlias, cast
|
|
|
|
from typing_extensions import TypedDict, Unpack
|
|
|
|
from litellm.constants import DEFAULT_TOOL_LOOP_MAX_ROUNDS
|
|
from litellm.types.llms.openai import (
|
|
AllMessageValues,
|
|
ChatCompletionAssistantMessage,
|
|
ChatCompletionAssistantToolCall,
|
|
ChatCompletionToolCallFunctionChunk,
|
|
ChatCompletionToolMessage,
|
|
ChatCompletionToolParam,
|
|
)
|
|
from litellm.types.utils import ChatCompletionMessageToolCall, Message, ModelResponse
|
|
|
|
ToolExecutor: TypeAlias = Callable[[ChatCompletionMessageToolCall], ChatCompletionToolMessage]
|
|
AsyncToolExecutor: TypeAlias = Callable[[ChatCompletionMessageToolCall], Awaitable[ChatCompletionToolMessage]]
|
|
|
|
|
|
class _ToolLoopCompletionKwargs(TypedDict, total=False, extra_items=object):
|
|
"""Extra keywords forwarded verbatim to ``litellm.completion``, which owns their contract."""
|
|
|
|
|
|
class ToolLoopMaxRoundsExceeded(RuntimeError):
|
|
max_rounds: int
|
|
|
|
def __init__(self, max_rounds: int) -> None:
|
|
self.max_rounds = max_rounds
|
|
super().__init__(f"model still requested tool calls on round {max_rounds} of {max_rounds}")
|
|
|
|
|
|
def _validate_tool_loop_args(max_rounds: int, completion_kwargs: _ToolLoopCompletionKwargs) -> None:
|
|
if max_rounds < 1:
|
|
raise ValueError(f"max_rounds must be >= 1, got {max_rounds}")
|
|
if completion_kwargs.get("stream"):
|
|
raise ValueError("run_tool_loop requires whole responses; stream=True is not supported")
|
|
|
|
|
|
def _expect_model_response(response: object) -> ModelResponse:
|
|
if not isinstance(response, ModelResponse):
|
|
raise TypeError(f"run_tool_loop requires completion to return a ModelResponse, got {type(response).__name__}")
|
|
return response
|
|
|
|
|
|
def _assistant_tool_call(tool_call: ChatCompletionMessageToolCall) -> ChatCompletionAssistantToolCall:
|
|
provider_fields: Final[object] = getattr(tool_call, "provider_specific_fields", None)
|
|
return cast( # cast-ok: dict literal with provider_specific_fields spread in only when set
|
|
"ChatCompletionAssistantToolCall",
|
|
{
|
|
"id": tool_call.id,
|
|
"type": "function",
|
|
"function": ChatCompletionToolCallFunctionChunk(
|
|
name=tool_call.function.name, arguments=tool_call.function.arguments
|
|
),
|
|
**({"provider_specific_fields": provider_fields} if provider_fields else {}),
|
|
},
|
|
)
|
|
|
|
|
|
def _assistant_message(
|
|
message: Message, tool_calls: tuple[ChatCompletionMessageToolCall, ...], replays_provider_specific_fields: bool
|
|
) -> ChatCompletionAssistantMessage:
|
|
return cast( # cast-ok: dict literal with the optional message fields spread in only when set
|
|
"ChatCompletionAssistantMessage",
|
|
{
|
|
"role": "assistant",
|
|
"content": message.content,
|
|
"tool_calls": [_assistant_tool_call(tc) for tc in tool_calls],
|
|
**{
|
|
key: value
|
|
for key, value in (
|
|
("thinking_blocks", getattr(message, "thinking_blocks", None)),
|
|
("reasoning_items", getattr(message, "reasoning_items", None)),
|
|
(
|
|
"provider_specific_fields",
|
|
getattr(message, "provider_specific_fields", None)
|
|
if replays_provider_specific_fields
|
|
else None,
|
|
),
|
|
)
|
|
if value is not None
|
|
},
|
|
},
|
|
)
|
|
|
|
|
|
def _function_tool_call(tool_call: object) -> ChatCompletionMessageToolCall:
|
|
if not isinstance(tool_call, ChatCompletionMessageToolCall):
|
|
raise TypeError(
|
|
f"run_tool_loop only executes function tool calls, got custom tool call {getattr(tool_call, 'id', None)}"
|
|
)
|
|
return tool_call
|
|
|
|
|
|
def _function_tool_calls(message: Message) -> tuple[ChatCompletionMessageToolCall, ...]:
|
|
return tuple(_function_tool_call(tool_call) for tool_call in message.tool_calls or ())
|
|
|
|
|
|
def _client_tool_calls(
|
|
message: Message, tool_calls: tuple[ChatCompletionMessageToolCall, ...]
|
|
) -> tuple[ChatCompletionMessageToolCall, ...]:
|
|
from litellm.llms.anthropic.common_utils import tool_call_is_rebuilt_as_server_tool_use
|
|
|
|
provider_specific_fields: Final = getattr(message, "provider_specific_fields", None)
|
|
return tuple(
|
|
tool_call
|
|
for tool_call in tool_calls
|
|
if not tool_call_is_rebuilt_as_server_tool_use(tool_call.id, provider_specific_fields)
|
|
)
|
|
|
|
|
|
def _replays_provider_specific_fields(
|
|
message: Message,
|
|
tool_calls: tuple[ChatCompletionMessageToolCall, ...],
|
|
client_tool_calls: tuple[ChatCompletionMessageToolCall, ...],
|
|
) -> bool:
|
|
from litellm.completion_extras.litellm_responses_transformation.transformation import carries_tool_search_items
|
|
|
|
return client_tool_calls != tool_calls or carries_tool_search_items(
|
|
getattr(message, "provider_specific_fields", None)
|
|
)
|
|
|
|
|
|
def run_tool_loop(
|
|
*,
|
|
model: str,
|
|
messages: Sequence[AllMessageValues],
|
|
tools: Sequence[ChatCompletionToolParam],
|
|
execute_tool: ToolExecutor,
|
|
max_rounds: int = DEFAULT_TOOL_LOOP_MAX_ROUNDS,
|
|
**completion_kwargs: Unpack[_ToolLoopCompletionKwargs], # kwargs-ok: forwarded verbatim to litellm.completion
|
|
) -> str | None:
|
|
"""Call completion, execute each requested tool, and repeat until the model answers.
|
|
|
|
Returns the final assistant message content. Raises ToolLoopMaxRoundsExceeded when the
|
|
model is still requesting tools after max_rounds completions.
|
|
|
|
Example:
|
|
execute = functools.partial(run_repo_tool, repository="litellm", revision="main")
|
|
answer = litellm.run_tool_loop(
|
|
model="anthropic/claude-sonnet-5-5", messages=messages, tools=tools, execute_tool=execute
|
|
)
|
|
"""
|
|
import litellm
|
|
|
|
_validate_tool_loop_args(max_rounds, completion_kwargs)
|
|
history: tuple[AllMessageValues, ...] = tuple(messages) # rebind-ok: rounds append new turns
|
|
for round_number in range(1, max_rounds + 1):
|
|
message = (
|
|
_expect_model_response(
|
|
litellm.completion(model=model, messages=list(history), tools=list(tools), **completion_kwargs)
|
|
)
|
|
.choices[0]
|
|
.message
|
|
)
|
|
if not message.tool_calls:
|
|
return message.content
|
|
tool_calls = _function_tool_calls(message)
|
|
client_tool_calls = _client_tool_calls(message, tool_calls)
|
|
if not client_tool_calls:
|
|
return message.content
|
|
if round_number == max_rounds:
|
|
break
|
|
tool_results = tuple(execute_tool(tool_call) for tool_call in client_tool_calls)
|
|
history = (
|
|
*history,
|
|
_assistant_message(
|
|
message, tool_calls, _replays_provider_specific_fields(message, tool_calls, client_tool_calls)
|
|
),
|
|
*tool_results,
|
|
)
|
|
raise ToolLoopMaxRoundsExceeded(max_rounds)
|
|
|
|
|
|
async def arun_tool_loop(
|
|
*,
|
|
model: str,
|
|
messages: Sequence[AllMessageValues],
|
|
tools: Sequence[ChatCompletionToolParam],
|
|
execute_tool: AsyncToolExecutor,
|
|
max_rounds: int = DEFAULT_TOOL_LOOP_MAX_ROUNDS,
|
|
**completion_kwargs: Unpack[_ToolLoopCompletionKwargs], # kwargs-ok: forwarded verbatim to litellm.acompletion
|
|
) -> str | None:
|
|
"""Async version of run_tool_loop, awaiting each execute_tool call in order.
|
|
|
|
Returns the final assistant message content. Raises ToolLoopMaxRoundsExceeded when the
|
|
model is still requesting tools after max_rounds completions.
|
|
|
|
Example:
|
|
execute = functools.partial(arun_repo_tool, repository="litellm", revision="main")
|
|
answer = await litellm.arun_tool_loop(
|
|
model="anthropic/claude-sonnet-5-5", messages=messages, tools=tools, execute_tool=execute
|
|
)
|
|
"""
|
|
import litellm
|
|
|
|
_validate_tool_loop_args(max_rounds, completion_kwargs)
|
|
history: tuple[AllMessageValues, ...] = tuple(messages) # rebind-ok: rounds append new turns
|
|
for round_number in range(1, max_rounds + 1):
|
|
message = (
|
|
_expect_model_response(
|
|
await litellm.acompletion(model=model, messages=list(history), tools=list(tools), **completion_kwargs)
|
|
)
|
|
.choices[0]
|
|
.message
|
|
)
|
|
if not message.tool_calls:
|
|
return message.content
|
|
tool_calls = _function_tool_calls(message)
|
|
client_tool_calls = _client_tool_calls(message, tool_calls)
|
|
if not client_tool_calls:
|
|
return message.content
|
|
if round_number == max_rounds:
|
|
break
|
|
tool_results = tuple([await execute_tool(tool_call) for tool_call in client_tool_calls])
|
|
history = (
|
|
*history,
|
|
_assistant_message(
|
|
message, tool_calls, _replays_provider_specific_fields(message, tool_calls, client_tool_calls)
|
|
),
|
|
*tool_results,
|
|
)
|
|
raise ToolLoopMaxRoundsExceeded(max_rounds)
|