Skip to content

Conversation

llStringll
Copy link

@llStringll llStringll commented Jul 30, 2024

FIX #6416 (Add apply_chat_template method and update generate method in LLM class)

This PR, which is an implementation of the Issue [Feature]#6416 (Add apply_chat_template method and update generate method in LLM class), introduces a new method, apply_chat_template, to the LLM class and integrates it into the existing generate method. The changes add to the flexibility and functionality of the LLM class by allowing for the application of a chat template to input messages, either returning token IDs or raw text based on the user's requirements.

Key Changes:

  1. New Method: apply_chat_template

Purpose: Applies a chat template to a list of messages, with options to add a generation prompt and choose between tokenized output or raw text.
Parameters:
messages_list: A list of messages to be processed.
add_generation_prompt: A boolean flag to indicate whether to add a generation prompt.
tokenize: A boolean flag to determine the output format (token IDs or raw text).
Output:
I have kept the output type as Union[Union[List[List[str]], List[str]], Union[List[List[int]],List[int]]] to facilitate usage of the function outside of generate() method to fetch text and prompt_ids separately as:

from vllm import LLM

model = LLM("...")

messages_list = [
    [{"role": "user", "content": "Who are you?"}],
    [{"role": "user", "content": "write a quick sort algorithm in python."}],
    [{"role": "user", "content": "Write a piece of quicksort code in C++."}],
]

# use LLM class to apply chat template to prompts
prompt_ids = model.apply_chat_template(messages_list, add_generation_prompt=True)
text = model.apply_chat_template(messages_list, add_generation_prompt=True, tokenize=False)
  1. Update to generate Method
    new parameter : messages_list: I have created this separate from prompts variable as general structure of prompts is different from what we expect in messages_list (as it is a list of dictionary with keys denoting type of prompt, user,system,assistant) . Maybe this could be combined with prompts and we can add those keys automatically.
    Integrated apply_chat_template to process prompts into prompt_token_ids when prompt_token_ids is not provided.
    This allows the generate method to accept raw text prompts and handle them appropriately, converting them to token IDs if necessary.

So now usage becomes:

from vllm import LLM

model = LLM("...")

messages_list = [
    [{"role": "user", "content": "Who are you?"}],
    [{"role": "user", "content": "write a quick sort algorithm in python."}],
    [{"role": "user", "content": "Write a piece of quicksort code in C++."}],
]

# chat template applied internally
outputs = model.generate(messages_list=messages_list)

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!

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 consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

To run full CI, you can do one of these:

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

🚀

@llStringll llStringll force-pushed the feature/apply-chat-template-method branch from b307eb2 to 01b5bc3 Compare July 30, 2024 12:11
@mgoin
Copy link
Member

mgoin commented Jul 30, 2024

Hi @llStringll thanks for PR but I believe we would like to different interface rather than overloading the generate method. Please see this PR: #5049 and this comment by Simon: #5049 (review)
It seems to have been left behind by the original contributor so if you would like to pick it up to satisfy your needs, that would be fine

@DarkLight1337
Copy link
Member

The author of #5049 is active again so that PR should be merged soon, sorry for flip-flopping!

@llStringll llStringll deleted the feature/apply-chat-template-method branch January 20, 2025 08:23
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.

[Feature]: Apply chat template through LLM class
3 participants