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

Added Support for guided decoding in offline interface #4130

Closed
wants to merge 37 commits into from

Conversation

kevinbu233
Copy link
Contributor

Added support for guided decoding (JSON, regex, choice) on offline interface that is raised in issue #3536 .
This is a continuation and build off the work of #2815

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!

@kevinbu233 kevinbu233 changed the title Yihuan issue3536 Added Support for guided decoding in offline interface Apr 16, 2024
@simon-mo simon-mo self-assigned this Apr 18, 2024
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.

please fix merge conflict and run formatting script.

vllm/utils.py Outdated Show resolved Hide resolved
vllm/sampling_params.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding.py Outdated Show resolved Hide resolved
tests/entrypoints/test_local_LLM.py Outdated Show resolved Hide resolved
tests/entrypoints/test_local_LLM.py Outdated Show resolved Hide resolved
tests/entrypoints/test_local_LLM.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/outlines_decoding.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/outlines_decoding.py Outdated Show resolved Hide resolved
vllm/sampling_params.py Outdated Show resolved Hide resolved
@simon-mo
Copy link
Collaborator

simon-mo commented Jun 6, 2024

@br3no can you help review this? (also @rkooo567 if you have bandwidth) 🙏

Copy link
Contributor

@br3no br3no left a comment

Choose a reason for hiding this comment

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

Maybe it would be easier to split the PR into one refactoring PR and one PR for adding the new feature of supporting guided decoding in offline inference?

self.guided_regex is not None,
self.guided_choice is not None,
self.guided_grammar is not None,
self.guided_json_object is not None,
Copy link
Contributor

Choose a reason for hiding this comment

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

Issue

One typical usage pattern in OpenAI is to request tool use and json response format. This is because OpenAI does not support real guided decoding as vLLM does through Outlines and lm-format-enforcer. OpenAI can still generate invalid JSON or a JSON not respecting the specified schema.

In vLLM this is not necessary. At the same time, not allowing this pattern in vLLM means people will have to treat calls to OpenAI and vLLM differently. So this is not good.

Currently, if someone passes a named function in a tool call (the only supported tool call in vLLM) together with the response format requesting a json answer, the named function call will take precedence; the response format option will be ignored. Since the json schema in the tools will necessarily specify a json output, this ends up behaving the way users would expect.

vllm/sampling_params.py Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/entrypoints/llm.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/outlines_decoding.py Outdated Show resolved Hide resolved
vllm/model_executor/guided_decoding/outlines_decoding.py Outdated Show resolved Hide resolved
@rkooo567
Copy link
Collaborator

rkooo567 commented Jun 6, 2024

This is awesome and exactly what I hope to have. I will take a look at it tmrw!

)


def get_guided_decoding_logits_processor(
Copy link
Contributor

Choose a reason for hiding this comment

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

For the offline use case it makes sense to have a non-async way to get the processor. But orthogonal to that is the issue of sharing of stateful logits processors. In PR #5329 both concerns are addressed because it adds a factory with an async and a sync builder method.

@DarkLight1337
Copy link
Member

Closing as superseded by #6878.

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.

7 participants