[Diffusion]Centralize prompt normalization and strip null negative prompts#3780
Open
maang-h wants to merge 2 commits into
Open
[Diffusion]Centralize prompt normalization and strip null negative prompts#3780maang-h wants to merge 2 commits into
maang-h wants to merge 2 commits into
Conversation
Signed-off-by: maang <maang_h@163.com>
|
Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits. |
RuixiangMa
reviewed
May 21, 2026
Collaborator
RuixiangMa
left a comment
There was a problem hiding this comment.
@maang-h Thanks for the contribution! Leaving a fe comments
Signed-off-by: maang <maang_h@163.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Fix inconsistent diffusion prompt handling in online serving where
serving_chatalways injectednegative_prompt:NoneintoOmniTextPrompt, even when the client did not provide a negative prompt. Downstream pipelines then had to duplicate ad-hoc parsing logic, and SD3 could treat missing negatives as empty strings and unintentionally enable CFG-style behavior.This PR (PR1 of a two-part cleanup):
vllm_omni/diffusion/prompt_utils.pyto normalize prompt entries (strip None/blank negative_prompt keys while preserving multimodal fields) and to extract batched (prompt, negative_prompt) pairs.OmniDiffusionRequest.prompts in __post_init__and useshas_negative_prompt()fordo_classifier_free_guidance.serving_chatdiffusion paths to only setnegative_promptwhen it is non-None (aligned with api_server image generation).Test Plan
New unit tests:
Test Result
PASS