From 1985aa04fadd046a1de43cb206c445efa8fa1169 Mon Sep 17 00:00:00 2001 From: jquinter Date: Sat, 31 Jan 2026 20:09:32 -0300 Subject: [PATCH] Fix Nova grounding web_search_options={} not applying systemTool (#20044) * Fix Nova grounding web_search_options={} not applying systemTool Two bugs prevented web_search_options={} from working for Nova grounding: 1. Empty dict falsy check: The condition `value and isinstance(value, dict)` short-circuits to False when value is {} (empty dict is falsy in Python). Changed to `isinstance(value, dict)` to match Anthropic's implementation. 2. Pre-formatted tools mangled by _bedrock_tools_pt: The systemTool (already in Bedrock format) was added to optional_params["tools"], but _process_tools_and_beta passed all tools through _bedrock_tools_pt which expects OpenAI-format tools. This corrupted the systemTool into an empty toolSpec. Fixed by separating systemTool blocks before transformation and appending them after. Fixes follow-up to #19598 Co-Authored-By: Claude Opus 4.5 * Fix python-multipart Python version constraint for Poetry lock python-multipart ^0.0.22 requires Python >=3.10 but the project supports >=3.9. Add python = ">=3.10" marker so Poetry can resolve dependencies for Python 3.9. Co-Authored-By: Claude Opus 4.5 --------- Co-authored-by: Claude Opus 4.5 --- .../bedrock/chat/converse_transformation.py | 11 +++++++++- poetry.lock | 20 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/litellm/llms/bedrock/chat/converse_transformation.py b/litellm/llms/bedrock/chat/converse_transformation.py index d4e4d3591b..f6d7e12858 100644 --- a/litellm/llms/bedrock/chat/converse_transformation.py +++ b/litellm/llms/bedrock/chat/converse_transformation.py @@ -1081,10 +1081,16 @@ class AmazonConverseConfig(BaseConfig): user_betas = get_anthropic_beta_from_headers(headers) anthropic_beta_list.extend(user_betas) - # Filter out tool search tools - Bedrock Converse API doesn't support them + # Separate pre-formatted Bedrock tools (e.g. systemTool from web_search_options) + # from OpenAI-format tools that need transformation via _bedrock_tools_pt filtered_tools = [] + pre_formatted_tools: List[ToolBlock] = [] if original_tools: for tool in original_tools: + # Already-formatted Bedrock tools (e.g. systemTool for Nova grounding) + if "systemTool" in tool: + pre_formatted_tools.append(tool) + continue tool_type = tool.get("type", "") if tool_type in ( "tool_search_tool_regex_20251119", @@ -1116,6 +1122,9 @@ class AmazonConverseConfig(BaseConfig): # No computer use tools, process all tools as regular tools bedrock_tools = _bedrock_tools_pt(filtered_tools) + # Append pre-formatted tools (systemTool etc.) after transformation + bedrock_tools.extend(pre_formatted_tools) + # Set anthropic_beta in additional_request_params if we have any beta features # ONLY apply to Anthropic/Claude models - other models (e.g., Qwen, Llama) don't support this field # and will error with "unknown variant anthropic_beta" if included diff --git a/poetry.lock b/poetry.lock index 537367c5aa..3b2a8d20f2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.1.4 and should not be changed by hand. [[package]] name = "a2a-sdk" @@ -5704,6 +5704,24 @@ pytest = ">=7.0.0" [package.extras] dev = ["black", "flake8", "isort", "mypy"] +[[package]] +name = "pytest-retry" +version = "1.7.0" +description = "Adds the ability to retry flaky tests in CI environments" +optional = false +python-versions = ">=3.9" +groups = ["dev"] +files = [ + {file = "pytest_retry-1.7.0-py3-none-any.whl", hash = "sha256:a2dac85b79a4e2375943f1429479c65beb6c69553e7dae6b8332be47a60954f4"}, + {file = "pytest_retry-1.7.0.tar.gz", hash = "sha256:f8d52339f01e949df47c11ba9ee8d5b362f5824dff580d3870ec9ae0057df80f"}, +] + +[package.dependencies] +pytest = ">=7.0.0" + +[package.extras] +dev = ["black", "flake8", "isort", "mypy"] + [[package]] name = "python-dateutil" version = "2.9.0.post0"