feat: add support for Bedrock/Anthropic ToolChoice to structured_output #720
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liushang1997
requested a deployment
to
manual-approval
GitHub Actions
Waiting
liushang1997
requested a deployment
to
manual-approval
GitHub Actions
Waiting
zastrowm
requested changes
Aug 26, 2025
| @@ -197,7 +199,7 @@ def format_request( | |||
| else [] | |||
| ), | |||
| ], | |||
| "toolChoice": {"auto": {}}, | |||
| **({"toolChoice": tool_choice} if tool_choice else {}), | |||
There was a problem hiding this comment.
I think we'd want to preserve the old behavior?
Suggested change
| **({"toolChoice": tool_choice} if tool_choice else {}), | |
| **({"toolChoice": tool_choice} if tool_choice else {"auto": {}}), |
LMK if I'm missing a reason not to have the old behavior
| @@ -171,6 +171,27 @@ def format_request_tool_message(cls, tool_result: ToolResult) -> dict[str, Any]: | |||
| "content": [cls.format_request_message_content(content) for content in contents], | |||
| } | |||
|
|
|||
| @classmethod | |||
| def format_request_tool_choice(cls, tool_choice: ToolChoice) -> Union[str, dict[str, Any]]: | |||
There was a problem hiding this comment.
Let's mark this as internal with an underscore prefix
| @@ -290,6 +297,8 @@ async def stream( | |||
| messages: List of message objects to be processed by the model. | |||
| tool_specs: List of tool specifications to make available to the model. | |||
| system_prompt: System prompt to provide context to the model. | |||
| tool_choice: Selection strategy for tool invocation. **Note: This parameter is accepted for | |||
There was a problem hiding this comment.
If these are not implemented, if tool_choice is not None, throw instead of just relying on documentation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The structured_output implementation in the Bedrock and Anthropic model provider call the model with a hard coded tool_choice:
auto. Theautooption lets the model itself decides whether to use a tool and use which tool. Instead, we want to make sure the tool is used in structured_output function for the sake of performance.Therefore, following changes are made:
auto;Related Issues
#256
Documentation PR
N/A
Type of Change
New feature
Testing
How have you tested the change? Verify that the changes do not break functionality or introduce warnings in consuming repositories: agents-docs, agents-tools, agents-cli
hatch run prepareChecklist
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.