[diffusion] fix: fix Qwen-Image 2.1 default RGBA output (#41150)
Co-authored-by: jacky.cheng <yichiche@amd.com>
This commit is contained in:
@@ -13,3 +13,9 @@ class QwenImage21SamplingParams(SamplingParams):
|
||||
guidance_scale: float = 1.0
|
||||
num_inference_steps: int = 40
|
||||
negative_prompt: str | None = None
|
||||
|
||||
@classmethod
|
||||
def default_image_output_format(cls) -> str:
|
||||
"""Preserve Qwen-Image 2.1's RGBA outputs by default."""
|
||||
|
||||
return "png"
|
||||
|
||||
@@ -86,6 +86,14 @@ def _runtime_sampling_quality(quality: str | None) -> str | None:
|
||||
return None if quality in (None, "auto") else quality
|
||||
|
||||
|
||||
def _resolve_image_output_format(
|
||||
output_format: str | None, sampling_params_cls: type[SamplingParams]
|
||||
) -> str | None:
|
||||
if output_format is not None:
|
||||
return output_format
|
||||
return sampling_params_cls.default_image_output_format()
|
||||
|
||||
|
||||
def _read_b64_for_paths(paths: list[str]) -> list[str]:
|
||||
"""Read and base64-encode each file. Must be called before cloud upload deletes them."""
|
||||
result = []
|
||||
@@ -271,10 +279,8 @@ async def generations(
|
||||
server_args = get_global_server_args()
|
||||
sampling_params_cls = resolve_sampling_params_cls(server_args)
|
||||
model_kwargs = _image_request_model_kwargs(request, sampling_params_cls)
|
||||
output_format = (
|
||||
request.output_format
|
||||
if request.output_format is not None
|
||||
else sampling_params_cls.default_image_output_format()
|
||||
output_format = _resolve_image_output_format(
|
||||
request.output_format, sampling_params_cls
|
||||
)
|
||||
ext = choose_output_image_ext(output_format, request.background)
|
||||
prompt = await maybe_enhance_prompt(
|
||||
@@ -437,6 +443,8 @@ async def edits(
|
||||
):
|
||||
request_id = generate_request_id()
|
||||
server_args = get_global_server_args()
|
||||
sampling_params_cls = resolve_sampling_params_cls(server_args)
|
||||
output_format = _resolve_image_output_format(output_format, sampling_params_cls)
|
||||
# Resolve images from either `image` or `image[]` (OpenAI SDK sends `image[]` when list is provided)
|
||||
images = image or image_array
|
||||
urls = url or url_array
|
||||
|
||||
@@ -22,6 +22,9 @@ from sglang.multimodal_gen.configs.pipeline_configs.qwen_image21 import (
|
||||
)
|
||||
from sglang.multimodal_gen.configs.sample.qwenimage21 import QwenImage21SamplingParams
|
||||
from sglang.multimodal_gen.registry import _get_config_info
|
||||
from sglang.multimodal_gen.runtime.entrypoints.openai.image_api import (
|
||||
_resolve_image_output_format,
|
||||
)
|
||||
from sglang.multimodal_gen.runtime.managers.memory_managers.component_manager import (
|
||||
ResidencyState,
|
||||
)
|
||||
@@ -279,6 +282,12 @@ def test_latent_pack_decode_contract():
|
||||
)
|
||||
|
||||
|
||||
def test_default_image_output_format_preserves_rgba():
|
||||
assert QwenImage21SamplingParams.default_image_output_format() == "png"
|
||||
assert _resolve_image_output_format(None, QwenImage21SamplingParams) == "png"
|
||||
assert _resolve_image_output_format("webp", QwenImage21SamplingParams) == "webp"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("outputs", [1, 2])
|
||||
def test_dynamic_batching_preserves_output_order_and_seeds(outputs):
|
||||
scheduler = object.__new__(Scheduler)
|
||||
|
||||
Reference in New Issue
Block a user