[diffusion] fix: validate output_quality and fix return type annotation (#19530)

This commit is contained in:
Jay Zenith
2026-10-07 10:53:29 +08:00
committed by GitHub
parent 9c8fc6a8e4
commit 35f18848db
2 changed files with 19 additions and 6 deletions
@@ -609,7 +609,12 @@ class SamplingParams:
output_quality_mapper = {"maximum": 100, "high": 90, "medium": 55, "low": 35}
if output_quality == "default":
return 50 if data_type == DataType.VIDEO else 75
return output_quality_mapper.get(output_quality)
if output_quality not in output_quality_mapper:
valid = list(output_quality_mapper.keys()) + ["default"]
raise ValueError(
f"Invalid output_quality {output_quality!r}. Expected one of: {valid}"
)
return output_quality_mapper[output_quality]
def _validate(self):
"""
@@ -1250,6 +1255,7 @@ class SamplingParams:
add_argument(
"--output-quality",
type=str,
choices=["maximum", "high", "medium", "low", "default"],
help="Output quality setting (default, low, medium, high, maximum)",
)
add_argument(
@@ -269,9 +269,9 @@ def build_sampling_params(request_id: str, **kwargs) -> SamplingParams:
# SamplingParams.__post_init__ may have resolved with the wrong data_type
# (default VIDEO) before _adjust() set the correct one.
if not has_explicit_compression and output_quality is not None:
resolved = adjust_output_quality(output_quality, sampling_params.data_type)
if resolved is not None:
sampling_params.output_compression = resolved
sampling_params.output_compression = adjust_output_quality(
output_quality, sampling_params.data_type
)
return sampling_params
@@ -618,7 +618,14 @@ def add_common_data_to_response(
return response
def adjust_output_quality(output_quality: str, data_type: DataType = None) -> int:
def adjust_output_quality(
output_quality: str, data_type: DataType | None = None
) -> int:
if output_quality == "default":
return 50 if data_type == DataType.VIDEO else 75
return OUTPUT_QUALITY_MAPPER.get(output_quality, None)
if output_quality not in OUTPUT_QUALITY_MAPPER:
valid = list(OUTPUT_QUALITY_MAPPER.keys()) + ["default"]
raise ValueError(
f"Invalid output_quality {output_quality!r}. Expected one of: {valid}"
)
return OUTPUT_QUALITY_MAPPER[output_quality]