Skip to content

fix(aws): Handle thinking with tools, use CountTokens API for Haiku 4.5 #698

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

Merged
merged 3 commits into from
Oct 22, 2025
Merged

fix(aws): Handle thinking with tools, use CountTokens API for Haiku 4.5 #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ea2c21
fix(aws): Handle thinking with tools, use CountTokens API for Haiku 4.5
michaelnchin Oct 17, 2025
dbb6030
remove debug
michaelnchin Oct 17, 2025
a3158d1
lint
michaelnchin Oct 17, 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
7 changes: 6 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 @@ -1231,7 +1231,12 @@ def bind_tools(
base_model = self._get_base_model()
if any(
x in base_model
for x in ("claude-3-7-", "claude-opus-4-", "claude-sonnet-4-")
for x in (
"claude-3-7-",
"claude-opus-4-",
"claude-sonnet-4-",
"claude-haiku-4-",
)
) and thinking_in_params(self.model_kwargs or {}):
forced = False
if isinstance(tool_choice, bool):
Expand Down
12 changes: 10 additions & 2 deletions libs/aws/langchain_aws/chat_models/bedrock_converse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@ def validate_environment(self) -> Self:
"claude-3-7-sonnet",
"claude-sonnet-4",
"claude-opus-4",
"claude-haiku-4",
)
thinking_params = (self.additional_model_request_fields or {}).get(
"thinking", {}
Expand Down Expand Up @@ -977,9 +978,15 @@ def _get_llm_for_structured_output_no_tool_choice(
"langchain_core.exceptions.OutputParserException if tool calls are not "
"generated. Consider adjusting your prompt to ensure the tool is called."
)
if "claude-3-7-sonnet" in self._get_base_model():
thinking_claude_models = (
"claude-3-7-sonnet",
"claude-sonnet-4",
"claude-opus-4",
"claude-haiku-4",
)
if any(model in self._get_base_model() for model in thinking_claude_models):
additional_context = (
"For Claude 3.7 Sonnet models, you can also support forced tool use "
"For Claude 3/4 models, you can also support forced tool use "
"by disabling `thinking`."
)
admonition = f"{admonition} {additional_context}"
Expand Down Expand Up @@ -1066,6 +1073,7 @@ def with_structured_output(
"claude-3-7-sonnet",
"claude-sonnet-4",
"claude-opus-4",
"claude-haiku-4",
)
if tool_choice is None and any(
model in self._get_base_model() for model in thinking_claude_models
Expand Down
8 changes: 7 additions & 1 deletion libs/aws/langchain_aws/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,13 @@ def anthropic_tokens_supported() -> bool:
def count_tokens_api_supported_for_model(model: str) -> bool:
return any(
x in model
for x in ("claude-3-5-", "claude-3-7-", "claude-opus-4-", "claude-sonnet-4-")
for x in (
"claude-3-5-",
"claude-3-7-",
"claude-opus-4-",
"claude-sonnet-4-",
"claude-haiku-4-",
)
)


Expand Down
4 changes: 4 additions & 0 deletions libs/aws/tests/integration_tests/chat_models/test_bedrock_converse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,10 @@ def test_guardrails() -> None:
"us.anthropic.claude-3-7-sonnet-20250219-v1:0",
"us.anthropic.claude-sonnet-4-20250514-v1:0",
"us.anthropic.claude-opus-4-20250514-v1:0",
"us.anthropic.claude-opus-4-1-20250805-v1:0",
"us.anthropic.claude-sonnet-4-5-20250929-v1:0",
#
# "us.anthropic.claude-haiku-4-5-20251001-v1:0",
],
)
def test_structured_output_tool_choice_not_supported(thinking_model: str) -> None:
Expand Down
1 change: 1 addition & 0 deletions libs/aws/tests/unit_tests/chat_models/test_bedrock_converse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ def test_anthropic_bind_tools_tool_choice() -> None:
"anthropic.claude-3-7-sonnet-20250219-v1:0",
"anthropic.claude-sonnet-4-20250514-v1:0",
"anthropic.claude-opus-4-20250514-v1:0",
"anthropic.claude-haiku-4-5-20251001-v1:0",
],
)
def test_anthropic_thinking_bind_tools_tool_choice(thinking_model: str) -> None:
Expand Down
1 change: 1 addition & 0 deletions libs/aws/tests/unit_tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ def test_trim_message_whitespace_with_empty_messages() -> None:
@pytest.mark.parametrize(
"model_id,expected_result",
[
("us.anthropic.claude-haiku-4-5-20251001-v1:0", True),
("us.anthropic.claude-opus-4-20250514-v1:0", True),
("us.anthropic.claude-sonnet-4-20250514-v1:0", True),
("us.anthropic.claude-3-7-sonnet-20250219-v1:0", True),
Expand Down