mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-10 03:28:53 +00:00
fix(bedrock_mantle): stop dropping the web_search tool on /v1/responses
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
parent
2a9843e649
commit
26805f75fe
4 changed files with 107 additions and 17 deletions
|
|
@ -44,7 +44,9 @@ _BASE_SUFFIXES_TO_STRIP: Final = (
|
|||
)
|
||||
|
||||
# Per Bedrock Mantle Responses API validation errors.
|
||||
_BEDROCK_MANTLE_SUPPORTED_RESPONSE_TOOL_TYPES = frozenset({"function", "mcp", "custom", "namespace", "tool_search"})
|
||||
_BEDROCK_MANTLE_SUPPORTED_RESPONSE_TOOL_TYPES: Final = frozenset(
|
||||
{"function", "mcp", "custom", "namespace", "tool_search", "web_search"}
|
||||
)
|
||||
|
||||
_BEDROCK_MANTLE_SUPPORTED_SERVICE_TIERS: Final = frozenset({"auto", "default"})
|
||||
|
||||
|
|
|
|||
|
|
@ -45247,7 +45247,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.6-terra": {
|
||||
"input_cost_per_token": 2.2e-06,
|
||||
|
|
@ -45275,7 +45276,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.6-luna": {
|
||||
"input_cost_per_token": 2.2e-07,
|
||||
|
|
@ -45303,7 +45305,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.5": {
|
||||
"input_cost_per_token": 5.5e-06,
|
||||
|
|
@ -45330,7 +45333,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.4": {
|
||||
"input_cost_per_token": 2.75e-06,
|
||||
|
|
@ -45357,7 +45361,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/google.gemma-4-31b": {
|
||||
"input_cost_per_token": 1.4e-07,
|
||||
|
|
|
|||
|
|
@ -45368,7 +45368,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.6-terra": {
|
||||
"input_cost_per_token": 2.2e-06,
|
||||
|
|
@ -45396,7 +45397,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.6-luna": {
|
||||
"input_cost_per_token": 2.2e-07,
|
||||
|
|
@ -45424,7 +45426,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.5": {
|
||||
"input_cost_per_token": 5.5e-06,
|
||||
|
|
@ -45451,7 +45454,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/openai.gpt-5.4": {
|
||||
"input_cost_per_token": 2.75e-06,
|
||||
|
|
@ -45478,7 +45482,8 @@
|
|||
"supports_reasoning": true,
|
||||
"supports_response_schema": true,
|
||||
"supports_tool_choice": true,
|
||||
"supports_vision": true
|
||||
"supports_vision": true,
|
||||
"supports_web_search": true
|
||||
},
|
||||
"bedrock_mantle/google.gemma-4-31b": {
|
||||
"input_cost_per_token": 1.4e-07,
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ class TestBedrockMantleResponsesTools:
|
|||
params = cfg.map_openai_params(
|
||||
response_api_optional_params={
|
||||
"tools": [
|
||||
{"type": "web_search"},
|
||||
{"type": "file_search", "vector_store_ids": ["vs_123"]},
|
||||
{"type": "function", "name": "exec_command"},
|
||||
]
|
||||
},
|
||||
|
|
@ -351,7 +351,7 @@ class TestBedrockMantleResponsesTools:
|
|||
def test_map_openai_params_removes_tools_when_all_unsupported(self):
|
||||
cfg = BedrockMantleResponsesAPIConfig()
|
||||
params = cfg.map_openai_params(
|
||||
response_api_optional_params={"tools": [{"type": "web_search"}]},
|
||||
response_api_optional_params={"tools": [{"type": "file_search", "vector_store_ids": ["vs_123"]}]},
|
||||
model="openai.gpt-5.5",
|
||||
drop_params=False,
|
||||
)
|
||||
|
|
@ -365,12 +365,86 @@ class TestBedrockMantleResponsesTools:
|
|||
"litellm.llms.bedrock_mantle.responses.transformation.verbose_logger.warning"
|
||||
) as mock_warning:
|
||||
cfg.map_openai_params(
|
||||
response_api_optional_params={"tools": [{"type": "web_search"}]},
|
||||
response_api_optional_params={"tools": [{"type": "file_search", "vector_store_ids": ["vs_123"]}]},
|
||||
model="openai.gpt-5.5",
|
||||
drop_params=False,
|
||||
)
|
||||
assert mock_warning.call_count == 1
|
||||
assert "web_search" in str(mock_warning.call_args)
|
||||
assert "file_search" in str(mock_warning.call_args)
|
||||
|
||||
|
||||
class TestBedrockMantleResponsesWebSearch:
|
||||
"""Web Search on Amazon Bedrock is a server-side built-in tool that Mantle runs
|
||||
itself when the caller passes {"type": "web_search"} on the Responses path, so
|
||||
the config must forward the tool and its options untouched instead of filtering
|
||||
it out and returning an ungrounded answer."""
|
||||
|
||||
_WEB_SEARCH_TOOL = {"type": "web_search", "external_web_access": False}
|
||||
|
||||
def test_web_search_survives_map_openai_params_with_its_options(self):
|
||||
cfg = BedrockMantleResponsesAPIConfig()
|
||||
params = cfg.map_openai_params(
|
||||
response_api_optional_params={"tools": [self._WEB_SEARCH_TOOL]},
|
||||
model="openai.gpt-5.6-sol",
|
||||
drop_params=False,
|
||||
)
|
||||
assert params["tools"] == [self._WEB_SEARCH_TOOL]
|
||||
|
||||
def test_web_search_reaches_outbound_body_alongside_function_tools(self):
|
||||
cfg = BedrockMantleResponsesAPIConfig()
|
||||
function_tool = {"type": "function", "name": "exec_command"}
|
||||
params = cfg.map_openai_params(
|
||||
response_api_optional_params={"tools": [self._WEB_SEARCH_TOOL, function_tool]},
|
||||
model="openai.gpt-5.6-sol",
|
||||
drop_params=False,
|
||||
)
|
||||
body = cfg.transform_responses_api_request(
|
||||
model="openai.gpt-5.6-sol",
|
||||
input="What did AWS announce today?",
|
||||
response_api_optional_request_params=params,
|
||||
litellm_params=GenericLiteLLMParams(),
|
||||
headers={},
|
||||
)
|
||||
assert body["tools"] == [self._WEB_SEARCH_TOOL, function_tool]
|
||||
|
||||
def test_web_search_is_not_logged_as_dropped(self):
|
||||
from unittest.mock import patch
|
||||
|
||||
cfg = BedrockMantleResponsesAPIConfig()
|
||||
with patch("litellm.llms.bedrock_mantle.responses.transformation.verbose_logger.warning") as mock_warning:
|
||||
cfg.map_openai_params(
|
||||
response_api_optional_params={"tools": [self._WEB_SEARCH_TOOL]},
|
||||
model="openai.gpt-5.6-sol",
|
||||
drop_params=False,
|
||||
)
|
||||
assert mock_warning.call_count == 0
|
||||
|
||||
def test_hoisted_web_search_tool_survives(self):
|
||||
cfg = BedrockMantleResponsesAPIConfig()
|
||||
body = cfg.transform_responses_api_request(
|
||||
model="openai.gpt-5.6-sol",
|
||||
input=[
|
||||
{"type": "additional_tools", "role": "developer", "tools": [self._WEB_SEARCH_TOOL]},
|
||||
{"type": "message", "role": "user", "content": [{"type": "input_text", "text": "hi"}]},
|
||||
],
|
||||
response_api_optional_request_params={},
|
||||
litellm_params=GenericLiteLLMParams(),
|
||||
headers={},
|
||||
)
|
||||
assert body["tools"] == [self._WEB_SEARCH_TOOL]
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"model",
|
||||
[
|
||||
"bedrock_mantle/openai.gpt-5.6-sol",
|
||||
"bedrock_mantle/openai.gpt-5.6-terra",
|
||||
"bedrock_mantle/openai.gpt-5.6-luna",
|
||||
"bedrock_mantle/openai.gpt-5.5",
|
||||
"bedrock_mantle/openai.gpt-5.4",
|
||||
],
|
||||
)
|
||||
def test_cost_map_advertises_web_search_support(self, model):
|
||||
assert litellm.supports_web_search(model=model) is True
|
||||
|
||||
|
||||
def _codex_exec_tool():
|
||||
|
|
@ -558,7 +632,7 @@ class TestBedrockMantleCodexAdditionalTools:
|
|||
"type": "additional_tools",
|
||||
"role": "developer",
|
||||
"tools": [
|
||||
{"type": "web_search"},
|
||||
{"type": "file_search", "vector_store_ids": ["vs_123"]},
|
||||
{"type": "function", "name": "wait"},
|
||||
],
|
||||
},
|
||||
|
|
@ -570,7 +644,11 @@ class TestBedrockMantleCodexAdditionalTools:
|
|||
def test_item_stripped_even_when_no_hoisted_tool_survives(self):
|
||||
body = self._transform(
|
||||
input=[
|
||||
{"type": "additional_tools", "role": "developer", "tools": [{"type": "web_search"}]},
|
||||
{
|
||||
"type": "additional_tools",
|
||||
"role": "developer",
|
||||
"tools": [{"type": "file_search", "vector_store_ids": ["vs_123"]}],
|
||||
},
|
||||
self._USER_MESSAGE,
|
||||
]
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue