Skip to content
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

fix validation: Only set tool_choice auto if at least one tool is provided #8568

Merged
merged 6 commits into from
Sep 26, 2024
Merged

fix validation: Only set tool_choice auto if at least one tool is provided #8568

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7aa40bf
Only set tool_choice `auto` if at least one tool is provided
chiragjn Sep 18, 2024
d2bbf5e
Apply suggestion from code review
chiragjn Sep 19, 2024
5a7fb2d
Merge branch 'vllm-project:main' into patch-3
chiragjn Sep 20, 2024
203d07e
Add tests
chiragjn Sep 24, 2024
824b7c1
Merge branch 'main' of https://github.com/chiragjn/vllm into patch-3
chiragjn Sep 24, 2024
eae161c
Fix isort lint issues
chiragjn Sep 24, 2024
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
Prev Previous commit
Next Next commit
Apply suggestion from code review
  • Loading branch information
@chiragjn
chiragjn authored Sep 19, 2024
commit d2bbf5e69518c648824c21e1d70f9be3c7702fe2
7 changes: 3 additions & 4 deletions vllm/entrypoints/openai/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,11 @@ def check_tool_usage(cls, data):

# if "tool_choice" is not specified but tools are provided,
# default to "auto" tool_choice
if "tool_choice" not in data:
if data.get("tools"):
data["tool_choice"] = "auto"
if "tool_choice" not in data and data.get("tools"):
data["tool_choice"] = "auto"

# if "tool_choice" is specified -- validation
elif "tool_choice" in data:
if "tool_choice" in data:

# ensure that if "tool choice" is specified, tools are present
if "tools" not in data or data["tools"] is None:
Expand Down
Loading