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

[FRONTEND] OpenAI tools support named functions #5032

Merged
merged 30 commits into from
Jun 3, 2024

Conversation

br3no
Copy link
Contributor

@br3no br3no commented May 24, 2024

PARTIAL FIX #1869 (and #5008) -- only named tools

BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE


PR Checklist (Click to Expand)

Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.

PR Title and Classification

Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:

  • [Bugfix] for bug fixes.
  • [CI/Build] for build or continuous integration improvements.
  • [Doc] for documentation fixes and improvements.
  • [Model] for adding a new model or improving an existing model. Model name should appear in the title.
  • [Frontend] For changes on the vLLM frontend (e.g., OpenAI API server, LLM class, etc.)
  • [Kernel] for changes affecting CUDA kernels or other compute kernels.
  • [Core] for changes in the core vLLM logic (e.g., LLMEngine, AsyncLLMEngine, Scheduler, etc.)
  • [Hardware][Vendor] for hardware-specific changes. Vendor name should appear in the prefix (e.g., [Hardware][AMD]).
  • [Misc] for PRs that do not fit the above categories. Please use this sparingly.

Note: If the PR spans more than one category, please include all relevant prefixes.

Code Quality

The PR need to meet the following code quality standards:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to docs/source/ if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.

Notes for Large Changes

Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with rfc-required and might not go through the PR.

What to Expect for the Reviews

The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an action-required label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

Thank You

Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!

@br3no
Copy link
Contributor Author

br3no commented May 24, 2024

@simon-mo

This PR implements only the "named tool" feature of the OpenAI API, as sketched in my comment here: #1869 (comment)

This exposes the guided_json functionality in an OpenAI compatible way.

Unfortunately, I have branched this change out of another small open PR (#5029), regarding correct logprob formats. Let me know if this is too confusing and I'll separate the two again.

@simon-mo simon-mo self-requested a review May 25, 2024 03:51
@simon-mo
Copy link
Collaborator

Thank you for this PR. Will review and merge once the logprobs is in. Let's get this in.

@K-Mistele
Copy link
Contributor

#4656 is a more complete implementation of this that supports auto tool choice (for models that support it); just need to fix jinja templating for the tool usage system prompt since different models have different system prompt formats (e.g. mistral 7B instruct v0.3, vs. Nous Hermes' Hermes 2 Pro Llama 3 8B)

@br3no
Copy link
Contributor Author

br3no commented May 29, 2024

@K-Mistele, I'm aware of #4656. I believe that a step-by-step approach will more easily find it's way into vLLM, so starting with the smallest possible increment is a much easier and more manageable task.

Once this is merged, #4656 can continue with the remaining missing features.

@br3no
Copy link
Contributor Author

br3no commented May 30, 2024

@simon-mo this is ready for review now.

@br3no
Copy link
Contributor Author

br3no commented Jun 3, 2024

@simon-mo the failing tests seem to be infrastructure-related and unrelated with the change. I hope you have time to review this soon. I’d love to have this in the next release. Let me know if you have any feedback so I can address all issues before you cut the next tag!

Copy link
Collaborator

@simon-mo simon-mo left a comment

Choose a reason for hiding this comment

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

This is great and thank you for breaking up the big PR. Most comments are cosmetic. Just to confirm, we are not appending the schema to the prompt and expecting users to do it? Should we add it in?

tests/entrypoints/test_openai_server.py Outdated Show resolved Hide resolved
tests/entrypoints/test_openai_server.py Outdated Show resolved Hide resolved
tests/entrypoints/test_openai_server.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/__init__.py Outdated Show resolved Hide resolved
@br3no
Copy link
Contributor Author

br3no commented Jun 3, 2024

@simon-mo cosmetic changes pushed.

Yes, correct, we are not appending the schema to the prompt.

This question will become more relevant once we add support for auto and required. Since this is highly dependent on the model and the use-case (e.g. language of the prompt), we will need to add support for configurable tool-prompt templates (see #4656, where @K-Mistele proposed just that, which I think is a good idea).

I think it's fair to have the user take care of this in this first iteration.

What do you think? I could add a documentation on the topic to make sure people know how to use this.

@br3no
Copy link
Contributor Author

br3no commented Jun 3, 2024

I added a suggestion for the documentation. Let me know what you think.

@simon-mo simon-mo merged commit f775a07 into vllm-project:main Jun 3, 2024
46 of 52 checks passed
@br3no br3no deleted the 1869-tools-support-step-1 branch June 4, 2024 07:06
blinkbear pushed a commit to blinkbear/vllm that referenced this pull request Jun 6, 2024
robertgshaw2-neuralmagic pushed a commit to neuralmagic/nm-vllm that referenced this pull request Jun 11, 2024
tool_calls=[
ToolCall(function=FunctionCall(
name=request.tool_choice.function.name,
arguments=output.text))

This comment was marked as resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Outlines or lm-format-enforcer guarantee that for us.

joerunde pushed a commit to joerunde/vllm that referenced this pull request Jun 17, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jun 27, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 8, 2024
xjpang pushed a commit to xjpang/vllm that referenced this pull request Jul 24, 2024
Temirulan pushed a commit to Temirulan/vllm-whisper that referenced this pull request Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support tools and tool_choice parameter in OpenAI compatible service
4 participants