Skip to content

fix: block forced tool_choice for Claude 4.5 thinking models and tests #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: block forced tool_choice for Claude 4.5 thinking models and tests #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb29fe
fix: block forced tool_choice for Claude 4.5 thinking models and tests
jitokim Nov 10, 2025
02be4bf
Merge branch 'main' into fix/bedrock-claude45-thinking
jitokim Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libs/aws/langchain_aws/chat_models/bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,8 @@ def bind_tools(
"claude-3-7-",
"claude-opus-4-",
"claude-sonnet-4-",
"claude-haiku-4-",
"claude-sonnet-4-5-",
"claude-haiku-4-5-",
)
) and thinking_in_params(self.model_kwargs or {}):
forced = False
Expand Down
29 changes: 24 additions & 5 deletions libs/aws/tests/unit_tests/chat_models/test_bedrock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,15 @@ def test_anthropic_bind_tools_tool_choice() -> None:
}


@pytest.mark.parametrize(
"model_id",
[
"anthropic.claude-3-7-sonnet-20250219-v1:0",
"anthropic.claude-sonnet-4-20250514-v1:0",
"anthropic.claude-sonnet-4-5-20250929-v1:0",
"anthropic.claude-haiku-4-5-20251001-v1:0",
],
)
@pytest.mark.parametrize(
"tool_choice",
[
Expand All @@ -556,12 +565,12 @@ def test_anthropic_bind_tools_tool_choice() -> None:
],
)
@mock.patch("langchain_aws.chat_models.bedrock.create_aws_client")
def test_claude37_thinking_forced_tool_raises(
mock_create_aws_client, tool_choice
def test_claude_thinking_forced_tool_raises(
mock_create_aws_client, model_id, tool_choice
) -> None:
mock_create_aws_client.return_value = MagicMock()
chat = ChatBedrock(
model_id="anthropic.claude-3-7-sonnet-20250219-v1:0",
model_id=model_id,
region_name="us-west-2",
model_kwargs={
"thinking": {"type": "enabled", "budget_tokens": 2048},
Expand All @@ -587,11 +596,21 @@ def test_claude37_thinking_tool_choice_auto_ok(mock_create_aws_client) -> None:
}


@pytest.mark.parametrize(
"model_id",
[
"anthropic.claude-3-7-sonnet-20250219-v1:0",
"anthropic.claude-sonnet-4-5-20250929-v1:0",
"anthropic.claude-haiku-4-5-20251001-v1:0",
],
)
@mock.patch("langchain_aws.chat_models.bedrock.create_aws_client")
def test_claude37_no_thinking_forced_tool_ok(mock_create_aws_client) -> None:
def test_claude_models_no_thinking_forced_tool_ok(
mock_create_aws_client, model_id
) -> None:
mock_create_aws_client.return_value = MagicMock()
chat = ChatBedrock(
model_id="anthropic.claude-3-7-sonnet-20250219-v1:0",
model_id=model_id,
region_name="us-west-2",
)
chat_with_tools = chat.bind_tools([GetWeather], tool_choice="any")
Expand Down