[refactor] Flatten Ming-flash-omni-2.0 imagegen args (#4587)

Signed-off-by: Yuanheng <jonathan.zhaoyh@gmail.com>
This commit is contained in:
Yuanheng Zhao authored and GitHub committed 2026-06-24 17:01:58 +08:00
1 parent eb81914c64
commit fb3abb38fb
4 files changed
+69 -71

No files matched your search

@@ -198,7 +198,7 @@ class MingImagePipeline(ZImagePipeline):
self.condition_encoder.load_from_checkpoint(model_path)
# Optional ByT5 glyph/text encoder. Only loaded when the checkpoint
# ``extra_args.image_gen.byte5_text`` requests will be ignored.
# ships a byt5/ subfolder; otherwise byte5_text requests are ignored
byte5_dir = Path(model_path) / "byt5"
if byte5_dir.exists():
self.byte5 = MingByT5Encoder.from_checkpoint(byte5_dir, device=self.device, dtype=dtype)
@@ -217,13 +217,12 @@ class MingImagePipeline(ZImagePipeline):
"""Resolve byte5 glyph texts.
Two sources, in order of priority:
1. ``extra["byte5_text"]`` — auto-extracted from the user prompt's
quoted spans by ``thinker2imagegen`` (already wrapped as
``'Text "<glyph>". '`` by Ming's ``get_text_from_prompt``).
2. ``sampling_params.extra_args["image_gen"]["byte5_text"]`` — an
explicit override for programmatic callers; raw strings without
the ``Text "..."`` wrapper are auto-wrapped here to match the
distribution ByT5 was trained on.
1. `extra["byte5_text"]`: auto-extracted from the user prompt's quoted spans
by thinker2imagegen (already wrapped as `'Text "<glyph>". '`
by Ming's get_text_from_prompt).
2. `sampling_params.extra_args["byte5_text"]`:
raw strings without the `Text "..."` wrapper are auto-wrapped here
to match the distribution ByT5 was trained on.
"""
# Source 1: auto-extracted, already wrapped. Return as-is if non-empty.
raw = extra.get("byte5_text")
@@ -236,7 +235,7 @@ class MingImagePipeline(ZImagePipeline):
# Source 2: explicit override — wrap raw strings so the byte5 encoder
# sees the same ``Text "<glyph>". `` format Ming used during training.
raw = ((getattr(sampling_params, "extra_args", None) or {}).get("image_gen") or {}).get("byte5_text")
raw = (getattr(sampling_params, "extra_args", None) or {}).get("byte5_text")
if isinstance(raw, str):
raw = [raw]
if isinstance(raw, list):
@@ -366,21 +365,23 @@ class MingImagePipeline(ZImagePipeline):
negative_cap_feats = torch.cat((negative_cap_feats, torch.zeros_like(byte5_feats)), dim=1)
logger.debug("[MingImagePipeline.forward] byte5 cat'd: cap_feats=%s", tuple(cap_feats.shape))
# Sampling knobs: extra_args.image_gen.* > sampling_params.* > MingImageGenConfig defaults.
# Sampling knobs, in priority order:
# top-level extra_args[key] > sampling_params.* attr >
# MingImageGenConfig default. Knobs live flat on extra_args
sp = req.sampling_params
cfg = self.image_gen_config
ig = (sp.extra_args or {}).get("image_gen") or {}
ea = sp.extra_args or {}
resolved: dict[str, Any] = {}
for ig_key, sp_attr, default in (
for ea_key, sp_attr, default in (
("height", "height", cfg.default_height),
("width", "width", cfg.default_width),
("steps", "num_inference_steps", cfg.num_inference_steps),
("cfg", "guidance_scale", cfg.guidance_scale),
("seed", "seed", None),
):
for v in (ig.get(ig_key), getattr(sp, sp_attr), default):
for v in (ea.get(ea_key), getattr(sp, sp_attr), default):
if v is not None:
resolved[ig_key] = v
resolved[ea_key] = v
break
height = int(resolved["height"])
@@ -393,7 +394,7 @@ class MingImagePipeline(ZImagePipeline):
# ``sp.generator`` causes two problems:
# (1) if the caller pre-seeded it with sp.seed (e.g. the top-level
# ``seed`` key on OmniDiffusionSamplingParams), any override via
# ``extra_args.image_gen.seed`` would be silently ignored; and
# `extra_args["seed"]` would be silently ignored; and
# (2) a persistent generator instance accumulates state across
# requests → same-seed replays produce different outputs.
if seed is not None:
@@ -435,7 +436,7 @@ class MingImagePipeline(ZImagePipeline):
num_inference_steps,
guidance_scale,
seed,
ig,
ea,
None if ref_latent is None else tuple(ref_latent.shape),
)
try: