Connect 2D upscaler through H3 parameter output

This commit is contained in:
2026-11-12 09:05:49 +00:00
parent 6a899bfacb
commit 100f17d356
3 changed files with 106 additions and 18 deletions
+55 -17
View File
@@ -243,23 +243,6 @@ class DumasH3ContinuumTiledLatentUpscalePerClip:
temporal_split_param=None,
upscale_sigmas=None,
):
native = _native_node("MMH3UltimateUpscale")
random_noise = _native_node("RandomNoise")
sampler_select = _native_node("KSamplerSelect")
scheduler = _native_node("BasicScheduler")
missing = [
name
for name, value in (
("MMH3UltimateUpscale", native),
("RandomNoise", random_noise),
("KSamplerSelect", sampler_select),
("BasicScheduler", scheduler),
)
if value is None
]
if missing:
raise RuntimeError("Missing native ComfyUI nodes: " + ", ".join(missing))
latents = _clips(video_latents)
if not latents:
raise ValueError("video_latents must contain at least one clip")
@@ -314,6 +297,25 @@ class DumasH3ContinuumTiledLatentUpscalePerClip:
upscale_param = _one(latent_upscale_param, "latent_upscale_param")
spatial_param = _one(spatial_split_param, "spatial_split_param")
native = _native_node("MMH3UltimateUpscale")
random_noise = _native_node("RandomNoise")
sampler_select = _native_node("KSamplerSelect")
scheduler = _native_node("BasicScheduler")
is_dumas_2d = isinstance(upscale_param, dict) and upscale_param.get("dumas_h3_2d")
if not is_dumas_2d:
missing = [
name
for name, value in (
("MMH3UltimateUpscale", native),
("RandomNoise", random_noise),
("KSamplerSelect", sampler_select),
("BasicScheduler", scheduler),
)
if value is None
]
if missing:
raise RuntimeError("Missing native ComfyUI nodes: " + ", ".join(missing))
outputs = []
video_outputs = []
reports = []
@@ -324,6 +326,42 @@ class DumasH3ContinuumTiledLatentUpscalePerClip:
raise ValueError(
"audio_latents must contain one first-pass audio latent per physical clip"
)
if is_dumas_2d:
from .dumas_h3_latent_upscale_2d import DumasMMH3LatentUpscale2D
processor = DumasMMH3LatentUpscale2D()
for index, clip_latent in enumerate(latents, start=1):
samples = clip_latent.get("samples") if isinstance(clip_latent, dict) else None
if samples is None or getattr(samples, "ndim", None) != 5:
raise ValueError(f"clip {index} is not a 5-D H3 LATENT")
upscaled, report = processor.upscale(
{"samples": samples},
model_name=upscale_param["model_name"],
scale=upscale_param["scale"],
tile_size=upscale_param["tile_size"],
tile_overlap=upscale_param["tile_overlap"],
sharpness=upscale_param["sharpness"],
device=upscale_param["device"],
precision=upscale_param["precision"],
)
audio_latent = audio_values[index - 1]
audio_samples = audio_latent.get("samples")
output = build_av_latent(upscaled["samples"], audio_samples)
outputs.append(output)
video_outputs.append(upscaled)
reports.append(f"clip {index}: {report}")
audio_outputs = _clips(audio_latents)
update_geometry = _continuum_helper("update_second_pass_geometry")
updated_plan = update_geometry(
_one(assembly_plan, "assembly_plan"), video_outputs
)
return (
outputs, audio_outputs, updated_plan,
"H3 Continuum DUMAS 2D spatial latent upscale; "
+ "; ".join(reports),
)
for index, (clip_latent, clip_model, clip_conditioning) in enumerate(
zip(latents, models, conditionings), start=1
):