fix(bedrock): stop forwarding strict tools for claude-sonnet-4-6 on Converse

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Devin AI 2026-09-18 19:08:08 +00:00
parent a2626726a2
commit e86ee4f4b2
3 changed files with 21 additions and 3 deletions

View file

@ -2524,6 +2524,7 @@
"prompt_cache_min_tokens": 1024
},
"anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 3.75e-06,
@ -2559,6 +2560,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"global.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 3.75e-06,
@ -2594,6 +2596,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"us.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2629,6 +2632,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"eu.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2663,6 +2667,7 @@
"prompt_cache_min_tokens": 1024
},
"au.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2697,6 +2702,7 @@
"prompt_cache_min_tokens": 1024
},
"jp.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,

View file

@ -2524,6 +2524,7 @@
"prompt_cache_min_tokens": 1024
},
"anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 3.75e-06,
@ -2559,6 +2560,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"global.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 3.75e-06,
@ -2594,6 +2596,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"us.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2629,6 +2632,7 @@
"source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrockFoundationModels/current/index.json"
},
"eu.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2663,6 +2667,7 @@
"prompt_cache_min_tokens": 1024
},
"au.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,
@ -2697,6 +2702,7 @@
"prompt_cache_min_tokens": 1024
},
"jp.anthropic.claude-sonnet-4-6": {
"bedrock_converse_supports_strict_tools": false,
"supports_adaptive_thinking": true,
"supports_legacy_thinking": true,
"cache_creation_input_token_cost": 4.125e-06,

View file

@ -67,12 +67,19 @@ _NON_STRICT_TOOL = [
"bedrock/us.anthropic.claude-sonnet-5",
"bedrock/eu.anthropic.claude-sonnet-5",
"bedrock/jp.anthropic.claude-sonnet-5",
# Sonnet 4.6 fails with "The compiled grammar is too large" once ~20+ strict tools are sent
"anthropic.claude-sonnet-4-6",
"bedrock/global.anthropic.claude-sonnet-4-6",
"bedrock/us.anthropic.claude-sonnet-4-6",
"bedrock/eu.anthropic.claude-sonnet-4-6",
"bedrock/au.anthropic.claude-sonnet-4-6",
"bedrock/jp.anthropic.claude-sonnet-4-6",
],
)
def test_bedrock_tools_pt_strict_dropped_for_strict_unsupported_models(
model_id: str,
) -> None:
"""Opus 4.7/4.8, Sonnet 4 and Sonnet 5 reject toolSpec.strict and additionalProperties."""
"""Opus 4.7/4.8, Sonnet 4, Sonnet 4.6 and Sonnet 5 reject toolSpec.strict and additionalProperties."""
result = _bedrock_tools_pt(_STRICT_TOOL, model=model_id)
tool_spec = result[0]["toolSpec"]
assert (
@ -87,13 +94,12 @@ def test_bedrock_tools_pt_strict_dropped_for_strict_unsupported_models(
"model_id",
[
"anthropic.claude-sonnet-4-5-20250929-v1:0",
"bedrock/us.anthropic.claude-sonnet-4-6",
"bedrock/us.anthropic.claude-opus-4-6",
"bedrock/us.anthropic.claude-opus-4-5",
],
)
def test_bedrock_tools_pt_strict_kept_for_other_anthropic(model_id: str) -> None:
"""Sonnet 4.5/4.6 and Opus <=4.6 accept toolSpec.strict — keep forwarding it."""
"""Sonnet 4.5 and Opus <=4.6 accept toolSpec.strict, keep forwarding it."""
result = _bedrock_tools_pt(_STRICT_TOOL, model=model_id)
assert (
result[0]["toolSpec"]["strict"] is True