-
-
Notifications
You must be signed in to change notification settings - Fork 8.7k
[Bugfix] Fix Qwen2 audio chat template for old version transformers compatibility #20826
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
base: main
Are you sure you want to change the base?
Conversation
Signed-off-by: Isotr0py <2037008807@qq.com>
Signed-off-by: Isotr0py <2037008807@qq.com>
👋 Hi! Thank you for contributing to the vLLM project. 💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels. Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run 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 either: Add 🚀 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary of Changes
Hello @Isotr0py, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request provides a bugfix for Qwen2-Audio models, specifically addressing compatibility with older versions of the transformers
library. It introduces a new, explicit chat template for Qwen2-Audio and enhances the chat template resolution system to allow for overriding default templates with predefined fallbacks, ensuring correct prompt formatting across different transformers
versions.
Highlights
- Qwen2-Audio Chat Template Fix: A new Jinja template (
template_qwen2_audio.jinja
) has been added specifically for Qwen2-Audio models. This template ensures proper formatting of both text and audio inputs, addressing compatibility issues with oldertransformers
library versions. - Enhanced Chat Template Resolution Logic: The system for resolving chat templates has been improved. It now introduces a
TemplateInfo
dataclass with anoverride_exists
flag, allowing predefined fallback templates to explicitly override templates obtained fromAutoProcessor
orAutoTokenizer
when necessary. This ensures that models like Qwen2-Audio use the correct template even if the default one is problematic. - Refactored Chat Template Fallback Mechanism: The internal
get_chat_template_fallback
andget_chat_template_fallback_path
functions have been updated to leverage the newTemplateInfo
structure, providing a more robust and flexible way to manage and apply model-specific chat templates, especially for compatibility purposes.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command>
or @gemini-code-assist <command>
. Below is a summary of the supported commands.
Feature | Command | Description |
---|---|---|
Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/
folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request introduces a mechanism to override Hugging Face chat templates, specifically to fix an issue with Qwen2-Audio on older transformers
versions. The approach is solid and well-implemented. I've provided a few suggestions to enhance robustness and code clarity, including handling a potential None
value that could cause a runtime error and correcting a condition in the new Jinja template.
if path is not None and chat_template is None: | ||
logger.info("Loading chat template fallback for %s as there isn't one " | ||
"defined on HF Hub.", tokenizer.name_or_path) | ||
chat_template = load_chat_template(path) | ||
elif fallback_info is not None and fallback_info.override_exists: | ||
chat_template_to_override = load_chat_template(path) | ||
if chat_template_to_override != chat_template: | ||
chat_template = chat_template_to_override | ||
logger.warning("Override existing chat template for %s as " | ||
"its defined ones on HF Hub is not compatible " | ||
"with OpenAI server.", | ||
tokenizer.name_or_path) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To prevent a potential TypeError
, ensure path
is not None
before calling load_chat_template(path)
. If fallback_info.get_path()
returns None
, load_chat_template(None)
would raise an error.
if path is not None and chat_template is None: | |
logger.info("Loading chat template fallback for %s as there isn't one " | |
"defined on HF Hub.", tokenizer.name_or_path) | |
chat_template = load_chat_template(path) | |
elif fallback_info is not None and fallback_info.override_exists: | |
chat_template_to_override = load_chat_template(path) | |
if chat_template_to_override != chat_template: | |
chat_template = chat_template_to_override | |
logger.warning("Override existing chat template for %s as " | |
"its defined ones on HF Hub is not compatible " | |
"with OpenAI server.", | |
tokenizer.name_or_path) | |
# 4th priority: Predefined fallbacks | |
fallback_info = get_chat_template_fallback( | |
model_type=model_config.hf_config.model_type, | |
) | |
path = (fallback_info.get_path(model_config.tokenizer) | |
if fallback_info is not None else None) | |
if path is not None and chat_template is None: | |
logger.info("Loading chat template fallback for %s as there isn't one " | |
"defined on HF Hub.", tokenizer.name_or_path) | |
chat_template = load_chat_template(path) | |
elif fallback_info is not None and fallback_info.override_exists and path is not None: | |
chat_template_to_override = load_chat_template(path) | |
if chat_template_to_override != chat_template: | |
chat_template = chat_template_to_override | |
logger.warning("Override existing chat template for %s as " | |
"its defined ones on HF Hub is not compatible " | |
"with OpenAI server.", | |
tokenizer.name_or_path) |
{{ message['content'] + '<|im_end|>\n' }} | ||
{%- else -%} | ||
{%- for content in message['content'] -%} | ||
{%- if 'audio' in content or 'audio_url' in content or message['type'] == 'audio' or content['type'] == 'audio' -%} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The condition message['type'] == 'audio'
is likely incorrect, as message
refers to the entire message object (e.g., {'role': 'user', 'content': [...]}
) which typically doesn't have a type
key. The check should be on the content
part. Also, the check content['type'] == 'audio'
is duplicated. A more correct and robust condition would be to check for content.get('type') == 'audio'
and remove the other checks.
{%- if 'audio' in content or 'audio_url' in content or content.get('type') == 'audio' -%}
chat_template_info = get_chat_template_fallback(model_type) | ||
|
||
if chat_template is None: | ||
if chat_template_info is None: | ||
return None | ||
|
||
return chat_template | ||
return chat_template_info.get_path(tokenizer_name_or_path) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider simplifying this function by directly returning the result of get_chat_template_fallback(model_type)
. This eliminates the need for the chat_template_info
variable and the subsequent conditional checks, making the code more concise.
chat_template_info = get_chat_template_fallback(model_type) | |
if chat_template is None: | |
if chat_template_info is None: | |
return None | |
return chat_template | |
return chat_template_info.get_path(tokenizer_name_or_path) | |
def get_chat_template_fallback_path( | |
model_type: str, | |
tokenizer_name_or_path: str, | |
) -> Optional[Path]: | |
return get_chat_template_fallback(model_type).get_path(tokenizer_name_or_path) if get_chat_template_fallback(model_type) else None |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can merge once the author of the original issue confirms this fix
Essential Elements of an Effective PR Description Checklist
supported_models.md
andexamples
for a new model.Purpose
Transformers
has fixed the Qwen2-Audio in new version, we still need to replace the chat template for old versionTransformers
installationTest Plan
Test Result
(Optional) Documentation Update