-
Notifications
You must be signed in to change notification settings - Fork 1.9k
feat: Add warnings for invalid tool_choice and UTs #6582
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.
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
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
- Add checks for invalid tool_choice when tool_choice is ToolChoice, e.g. function_name is not in tools - Add test_tool_choice.py to run_suite
- Replace class-level FLAKY_TESTS with setUpClass configuration for better inheritance handling - Remove warning system in favor of explicit flaky test marking - Mark `test_multi_tool_scenario_auto` and `test_multi_tool_scenario_required` as flaky - Increase max_tokens from 200 to 400 for better tool calling performance - Update `test_tool_choice_specific_function_non_streaming` to handle multiple weather calls for top 5 cities
JustinTong0323
approved these changes
May 27, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
zhyncs
approved these changes
May 27, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
verified locally
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.
Motivation
This PR improves error handling and user experience for invalid tool choices in SGLang's function calling system. Previously, when users specified a tool_choice with a function name that doesn't exist in the available tools, the system would silently fail with
Skip invalid EBNF strings
. This change adds proper validation and logging.NOTE: the correct way is to add this kind of validation in the ChatCompletionRequest protocol and returns a 400. However, our adapter.py or protocol.py doesn't have this kind of check. And it is better to fix all similar issues in refactor. So right now we use a logging.warning to mitigate it.
The changes also introduce comprehensive unit tests for tool choice functionality across different models and scenarios, ensuring robust validation of the function calling system.
Modifications
get_ebnf()
method to check if the requested function exists in available toolsChecklist