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.

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

[Bugfix] 500 Internal Server Error when tool_choice is incorrect. #10567

Merged
merged 2 commits into from
Nov 23, 2024

Conversation

shenoyvvarun
Copy link
Contributor

@shenoyvvarun shenoyvvarun commented Nov 22, 2024

Summary

This PR fixes the KeyError when tool_choice is incorrectly provided.


Request:
		{
	    "model": "vllm-model",
	    "messages": [ {"role": "user", "content": "what is 5+3"}],
	    "tool_choice": {},
	    "tools": [
	        {
	                "type": "function",
	                "name": "my_caculator",
	                "description": "A simple caculator takes an expression to caculate.",
	                "parameters": {
	                    "type": "object",
	                    "properties": {
	                        "expression": {
	                            "type": "string",
	                            "description": "A expressoin to caculate."
	                        }
	                    },
	                    "required": ["expression"]
	                }
	        }
	    ]
	}
Output:
Internal Server Error(base)
Screenshot 2024-11-21 at 11 04 08 PM

Checklist

  • Tested using curl
  • After fix:
{
    "object": "error",
    "message": "[{'type': 'value_error', 'loc': ('body',), 'msg': 'Value error, Incorrectly formatted `tool_choice`. Should be like `{\"type\": \"function\", \"function\": {\"name\": \"my_function\"}}`', 'input': {'model': 'vllm-model', 'messages': [{'role': 'user', 'content': 'what is 5+3'}], 'tool_choice': {}, 'tools': [{'type': 'function', 'name': 'my_caculator', 'description': 'A simple caculator takes an expression to caculate.', 'parameters': {'type': 'object', 'properties': {'expression': {'type': 'string', 'description': 'A expressoin to caculate.'}}, 'required': ['expression']}}]}, 'ctx': {'error': ValueError('Incorrectly formatted `tool_choice`. Should be like `{\"type\": \"function\", \"function\": {\"name\": \"my_function\"}}`')}}]",
    "type": "BadRequestError",
    "param": null,
    "code": 400
}
  • Lint
  • pytest

Signed-off-by: Varun Shenoy <varun.vinayak.shenoy@oracle.com>
Copy link

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can do one of these:

  • Add ready label to the PR
  • Enable auto-merge.

🚀

@mergify mergify bot added the frontend label Nov 22, 2024
@shenoyvvarun shenoyvvarun force-pushed the vasheno/tool_support_fix1 branch from fada59d to 0a59422 Compare November 22, 2024 17:04
Signed-off-by: Varun Shenoy <varun.vinayak.shenoy@oracle.com>
@shenoyvvarun shenoyvvarun force-pushed the vasheno/tool_support_fix1 branch from 0a59422 to 4c3697b Compare November 22, 2024 20:45
Copy link
Member

@DarkLight1337 DarkLight1337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now, thanks for the fix!

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) November 23, 2024 02:18
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Nov 23, 2024
@youkaichao youkaichao disabled auto-merge November 23, 2024 05:13
@youkaichao youkaichao merged commit 7d8ffb3 into vllm-project:main Nov 23, 2024
59 of 61 checks passed
@shenoyvvarun shenoyvvarun deleted the vasheno/tool_support_fix1 branch November 25, 2024 20:23
mfournioux pushed a commit to mfournioux/vllm that referenced this pull request Nov 28, 2024
…roject#10567)

Signed-off-by: Varun Shenoy <varun.vinayak.shenoy@oracle.com>
Signed-off-by: Maxime Fournioux <55544262+mfournioux@users.noreply.github.com>
sleepwalker2017 pushed a commit to sleepwalker2017/vllm that referenced this pull request Dec 13, 2024
…roject#10567)

Signed-off-by: Varun Shenoy <varun.vinayak.shenoy@oracle.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants