Support native json output and strict tool calls for anthropic #3457
+2,069
−228
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
DouweM
requested changes
Nov 17, 2025
| tools, strict_tools_requested = self._get_tools(model_request_parameters, model_settings) | ||
| tools, mcp_servers, beta_features = self._add_builtin_tools(tools, model_request_parameters) | ||
| output_format = self._build_output_format(model_request_parameters) | ||
| structured_output_beta_required = strict_tools_requested or bool(output_format) |
Collaborator
There was a problem hiding this comment.
We could simplify the code below by adding a value to the beta_headers list here right?
| 'input_schema': f.parameters_json_schema, | ||
| } | ||
| if f.strict is not None: | ||
| tool_param['strict'] = f.strict # type: ignore[assignment] |
Collaborator
There was a problem hiding this comment.
Look at how the OpenAI model uses is_strict_compatible. If the user didn't explicitly say strict=True on their tool, it'll be strict=None, so we check if the schema is strict-compatible, and if so we set strict=True.
So to get the same behavior with Anthropic, we should check if the schema can be transformed successfully (losslessly), and set strict=True unless it's explicitly strict=False
- Resolved conflicts in anthropic.py by keeping our strict tools and native JSON implementation - Resolved conflicts in test_anthropic.py by merging strict=True with TTL='5m' in assertions - Kept our test_anthropic_mixed_strict_tool_run test - Added upstream's new features: - count_tokens() method for token counting - TTL support for cache control (5m and 1h) - New helper methods (_infer_tool_choice, _map_extra_headers) - test_anthropic_cache_with_custom_ttl test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #3428
work in progress: