[BugFIX] enable Hunyuan image3 with stage selection among text_to_image/image_to_text (#1826)
Signed-off-by: Chendi Xue <chendi.xue@intel.com>
This commit is contained in:
1 parent
4ac25287fd
commit
d71c9ae60f
6 files changed
+227
-2
No files matched your search
@@ -293,6 +293,100 @@ def load_stage_configs_from_yaml(config_path: str, base_engine_args: dict | None
|
||||
return stage_args
|
||||
|
||||
|
||||
def filter_stages(
|
||||
config_path: str | None,
|
||||
stage_configs: list,
|
||||
kwargs: dict | None,
|
||||
) -> list:
|
||||
"""Filter stage configs by mode when YAML defines a `modes` section.
|
||||
|
||||
The YAML can define, e.g.:
|
||||
|
||||
modes:
|
||||
- mode: text-to-image
|
||||
stages: [1]
|
||||
- mode: image-to-text
|
||||
stages: [0]
|
||||
|
||||
When users pass `mode="image-to-text"` into Omni(**kwargs), only the stages
|
||||
listed for that mode are returned. If no mode is provided, defaults to
|
||||
"text-to-image". If no modes are defined or filtering fails, returns the
|
||||
original stage_configs unchanged.
|
||||
|
||||
Args:
|
||||
config_path: Path to the YAML config (used to read `modes`).
|
||||
stage_configs: Loaded list of stage configs.
|
||||
kwargs: Engine/caller kwargs; may contain "mode".
|
||||
|
||||
Returns:
|
||||
Filtered list of stage configs (or original list if filtering not applied).
|
||||
"""
|
||||
if not stage_configs or config_path is None:
|
||||
return stage_configs
|
||||
|
||||
try:
|
||||
cfg = load_yaml_config(config_path)
|
||||
yaml_modes = getattr(cfg, "modes", None)
|
||||
if yaml_modes is None:
|
||||
return stage_configs
|
||||
|
||||
mode_to_stage_ids: dict[str, list[int]] = {}
|
||||
if yaml_modes is not None:
|
||||
for entry in yaml_modes:
|
||||
mode_name = None
|
||||
stages = None
|
||||
if hasattr(entry, "mode") or hasattr(entry, "stages"):
|
||||
mode_name = getattr(entry, "mode", None)
|
||||
stages = getattr(entry, "stages", None)
|
||||
elif isinstance(entry, dict):
|
||||
mode_name = entry.get("mode")
|
||||
stages = entry.get("stages")
|
||||
|
||||
if mode_name is None or stages is None:
|
||||
continue
|
||||
|
||||
if isinstance(stages, int):
|
||||
stage_list = [stages]
|
||||
else:
|
||||
stage_list = list(stages)
|
||||
|
||||
mode_to_stage_ids[str(mode_name)] = [int(sid) for sid in stage_list]
|
||||
|
||||
# No modes section or empty mapping: use all stages and return early.
|
||||
active_mode: str | None = None
|
||||
if isinstance(kwargs, dict):
|
||||
active_mode = kwargs.get("mode")
|
||||
|
||||
if active_mode is None:
|
||||
active_mode = "text-to-image"
|
||||
|
||||
if active_mode not in mode_to_stage_ids:
|
||||
logger.warning(
|
||||
"Requested mode '%s' not found in config '%s'; available modes: %s. Using all stages.",
|
||||
active_mode,
|
||||
config_path,
|
||||
sorted(mode_to_stage_ids.keys()),
|
||||
)
|
||||
return stage_configs
|
||||
|
||||
allowed_ids = set(mode_to_stage_ids[active_mode])
|
||||
filtered_stage_configs = [sc for sc in stage_configs if getattr(sc, "stage_id", None) in allowed_ids]
|
||||
if not filtered_stage_configs:
|
||||
logger.warning(
|
||||
"Mode '%s' in config '%s' resolved to stage ids %s, but none matched loaded stage_args. "
|
||||
"Falling back to all stages.",
|
||||
active_mode,
|
||||
config_path,
|
||||
sorted(allowed_ids),
|
||||
)
|
||||
return stage_configs
|
||||
|
||||
return filtered_stage_configs
|
||||
except Exception as e:
|
||||
logger.warning("Failed to apply mode-based stage filtering: %s", e)
|
||||
return stage_configs
|
||||
|
||||
|
||||
def load_and_resolve_stage_configs(
|
||||
model: str,
|
||||
stage_configs_path: str | None,
|
||||
@@ -324,6 +418,9 @@ def load_and_resolve_stage_configs(
|
||||
config_path = stage_configs_path
|
||||
stage_configs = load_stage_configs_from_yaml(stage_configs_path, base_engine_args=kwargs)
|
||||
|
||||
stage_configs = filter_stages(config_path, stage_configs, kwargs)
|
||||
logger.debug(f"stage_configs: {stage_configs}")
|
||||
|
||||
return config_path, stage_configs
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user