diff --git a/litellm/llms/anthropic/messages/responses_adapters/handler.py b/litellm/llms/anthropic/messages/responses_adapters/handler.py index ef023e99ec6..3df19d8151c 100644 --- a/litellm/llms/anthropic/messages/responses_adapters/handler.py +++ b/litellm/llms/anthropic/messages/responses_adapters/handler.py @@ -315,9 +315,10 @@ def _build_responses_kwargs( request_data["temperature"] = temperature if thinking: request_data["thinking"] = thinking - if tool_choice: + drops_tools: Final = "tools" in drop_policy(forwarded_kwargs).additional_drop_params + if tool_choice and not drops_tools: request_data["tool_choice"] = tool_choice - if tools and "tools" not in drop_policy(forwarded_kwargs).additional_drop_params: + if tools and not drops_tools: request_data["tools"] = tools if top_p is not None: request_data["top_p"] = top_p diff --git a/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py b/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py index fb96039e73a..c9a750f43ec 100644 --- a/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py +++ b/tests/unit/llms/anthropic/messages/responses_adapters/test_responses_adapters_handler.py @@ -939,6 +939,29 @@ async def test_additional_drop_params_tools_sends_no_tools_even_beside_one_opena assert "tools" not in json.loads(upstream.calls.last.request.content) +@pytest.mark.asyncio +@pytest.mark.parametrize( + "tool_choice", + [{"type": "tool", "name": "web_fetch"}, {"type": "tool", "name": "bash"}, {"type": "any"}], + ids=["forcing-a-tool-openai-cannot-run", "forcing-a-client-tool", "forcing-any-tool"], +) +async def test_additional_drop_params_tools_sends_no_tool_choice_forcing_a_dropped_tool( + respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch, tool_choice: Mapping[str, object] +): + upstream: Final = await _openai_request_for( + respx_mock, + monkeypatch, + [WEB_FETCH, TYPED_BASH], + drop_params=True, + additional_drop_params=["tools"], + tool_choice=dict(tool_choice), + ) + + sent: Final = json.loads(upstream.calls.last.request.content) + assert "tools" not in sent + assert "tool_choice" not in sent + + @pytest.mark.asyncio async def test_a_tool_openai_cannot_run_answers_400_before_any_openai_call_without_drop_params( respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch