mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
fix(anthropic): send no computer use beta for an unknown computer tool version
An unknown computer tool version fell back to computer-use-2024-10-22, which the anthropic and azure_ai columns now forward. It now gets no beta, as every platform effectively sent before. Every computer tool version also skips defer_loading and allowed_callers, computer_20251124 included
This commit is contained in:
parent
3475225905
commit
5195ef6d8a
3 changed files with 53 additions and 22 deletions
|
|
@ -1114,11 +1114,9 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
|
|||
if returned_tool is not None:
|
||||
# Only set defer_loading on tools that support it (not tool search tools or computer tools)
|
||||
tool_type = returned_tool.get("type", "")
|
||||
if tool_type not in (
|
||||
if not tool_type.startswith("computer_") and tool_type not in (
|
||||
"tool_search_tool_regex_20251119",
|
||||
"tool_search_tool_bm25_20251119",
|
||||
"computer_20241022",
|
||||
"computer_20250124",
|
||||
):
|
||||
if _defer_loading is not None:
|
||||
returned_tool["defer_loading"] = _validated_defer_loading(_defer_loading)
|
||||
|
|
@ -1133,11 +1131,9 @@ class AnthropicConfig(AnthropicModelInfo, BaseConfig):
|
|||
if returned_tool is not None:
|
||||
# Only set allowed_callers on tools that support it (not tool search tools or computer tools)
|
||||
tool_type = returned_tool.get("type", "")
|
||||
if tool_type not in (
|
||||
if not tool_type.startswith("computer_") and tool_type not in (
|
||||
"tool_search_tool_regex_20251119",
|
||||
"tool_search_tool_bm25_20251119",
|
||||
"computer_20241022",
|
||||
"computer_20250124",
|
||||
):
|
||||
if _allowed_callers is not None:
|
||||
if not isinstance(_allowed_callers, list) or not all(
|
||||
|
|
|
|||
|
|
@ -1260,7 +1260,7 @@ class AnthropicModelInfo(BaseLLMModelInfo):
|
|||
return None
|
||||
return anthropic_beta_header.split(",")
|
||||
|
||||
def get_computer_tool_beta_header(self, computer_tool_version: str) -> str:
|
||||
def get_computer_tool_beta_header(self, computer_tool_version: str) -> str | None:
|
||||
"""
|
||||
Get the appropriate beta header for a given computer tool version.
|
||||
|
||||
|
|
@ -1268,17 +1268,14 @@ class AnthropicModelInfo(BaseLLMModelInfo):
|
|||
computer_tool_version: The computer tool version (e.g., 'computer_20250124', 'computer_20241022')
|
||||
|
||||
Returns:
|
||||
The corresponding beta header string
|
||||
The corresponding beta header string, or None for a version with no known beta
|
||||
"""
|
||||
computer_tool_beta_mapping: Final = {
|
||||
"computer_20251124": "computer-use-2025-11-24",
|
||||
"computer_20250124": "computer-use-2025-01-24",
|
||||
"computer_20241022": "computer-use-2024-10-22",
|
||||
}
|
||||
return computer_tool_beta_mapping.get(
|
||||
computer_tool_version,
|
||||
"computer-use-2024-10-22", # Default fallback
|
||||
)
|
||||
return computer_tool_beta_mapping.get(computer_tool_version)
|
||||
|
||||
def get_anthropic_beta_list(
|
||||
self,
|
||||
|
|
@ -1310,9 +1307,8 @@ class AnthropicModelInfo(BaseLLMModelInfo):
|
|||
if effort_used:
|
||||
betas.append(ANTHROPIC_EFFORT_BETA_HEADER) # effort-2025-11-24
|
||||
|
||||
if computer_tool_used:
|
||||
beta_header: Final = self.get_computer_tool_beta_header(computer_tool_used)
|
||||
betas.append(beta_header)
|
||||
if computer_tool_used and (computer_tool_beta := self.get_computer_tool_beta_header(computer_tool_used)):
|
||||
betas.append(computer_tool_beta)
|
||||
|
||||
# Anthropic no longer requires the prompt-caching beta header
|
||||
# Prompt caching now works automatically when cache_control is used in messages
|
||||
|
|
@ -1401,9 +1397,8 @@ class AnthropicModelInfo(BaseLLMModelInfo):
|
|||
# Anthropic no longer requires the prompt-caching beta header
|
||||
# Prompt caching now works automatically when cache_control is used in messages
|
||||
# Reference: https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching
|
||||
if computer_tool_used:
|
||||
beta_header: Final = self.get_computer_tool_beta_header(computer_tool_used)
|
||||
betas.add(beta_header)
|
||||
if computer_tool_used and (computer_tool_beta := self.get_computer_tool_beta_header(computer_tool_used)):
|
||||
betas.add(computer_tool_beta)
|
||||
# if pdf_used:
|
||||
# betas.add("pdfs-2024-09-25")
|
||||
if file_id_used:
|
||||
|
|
|
|||
|
|
@ -6787,6 +6787,22 @@ def test_eager_input_streaming_not_set_on_computer_use_tool():
|
|||
assert "eager_input_streaming" not in mapped_tool
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tool_type", ["computer_20241022", "computer_20250124", "computer_20251124"])
|
||||
def test_computer_tools_drop_defer_loading_and_allowed_callers(tool_type: str):
|
||||
computer_tool: Final = {
|
||||
"type": tool_type,
|
||||
"function": {"name": "computer", "parameters": {"display_width_px": 1024, "display_height_px": 768}},
|
||||
"defer_loading": True,
|
||||
"allowed_callers": ["code_execution_20250825"],
|
||||
}
|
||||
|
||||
mapped_tool, _ = AnthropicConfig().map_tool_helper(computer_tool)
|
||||
|
||||
assert mapped_tool["type"] == tool_type
|
||||
assert "defer_loading" not in mapped_tool
|
||||
assert "allowed_callers" not in mapped_tool
|
||||
|
||||
|
||||
def test_eager_input_streaming_reaches_anthropic_request_tools():
|
||||
result = AnthropicConfig().map_openai_params(
|
||||
non_default_params={"tools": [_eager_chat_tool(eager_input_streaming=True)], "stream": True},
|
||||
|
|
@ -7519,10 +7535,10 @@ def test_process_anthropic_headers_with_no_matching_headers():
|
|||
@pytest.mark.parametrize(
|
||||
"computer_tool_used, prompt_caching_set, expected_beta_header",
|
||||
[
|
||||
(True, False, True),
|
||||
(False, True, False),
|
||||
(True, True, True),
|
||||
(False, False, False),
|
||||
("computer_20250124", False, True),
|
||||
(None, True, False),
|
||||
("computer_20250124", True, True),
|
||||
(None, False, False),
|
||||
],
|
||||
)
|
||||
def test_anthropic_beta_header(computer_tool_used, prompt_caching_set, expected_beta_header):
|
||||
|
|
@ -9322,6 +9338,30 @@ def test_completion_adds_the_beta_matching_the_computer_tool_version(
|
|||
assert sent_betas == frozenset({expected_beta})
|
||||
|
||||
|
||||
@pytest.mark.usefixtures("local_beta_headers_config")
|
||||
def test_completion_sends_no_computer_use_beta_for_an_unknown_computer_tool_version(respx_mock: respx.MockRouter):
|
||||
route: Final = respx_mock.post("https://api.anthropic.com/v1/messages").mock(
|
||||
return_value=httpx.Response(200, json=_anthropic_message_body([{"type": "text", "text": "hi"}], "end_turn"))
|
||||
)
|
||||
|
||||
litellm.completion(
|
||||
model="anthropic/claude-opus-5",
|
||||
api_key="mock_api_key",
|
||||
messages=[{"role": "user", "content": "Say hi"}],
|
||||
tools=[
|
||||
{
|
||||
"type": "computer_20991231",
|
||||
"function": {
|
||||
"name": "computer",
|
||||
"parameters": {"display_height_px": 768, "display_width_px": 1024},
|
||||
},
|
||||
}
|
||||
],
|
||||
)
|
||||
|
||||
assert "anthropic-beta" not in route.calls.last.request.headers
|
||||
|
||||
|
||||
def _anthropic_message_body(content: list[dict[str, object]], stop_reason: str) -> dict[str, object]:
|
||||
return {
|
||||
"id": "msg_01XrAv7gc5tQNDuoADra7vB4",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue