wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-14 19:17:32 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Cleanup nodes

Browse Source
This commit is contained in:
kijai 2026-05-10 11:15:22 +03:00
parent 68d5d31096
commit 8982726f6d
1 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
comfy_extras/nodes_hidream_o1.py
View File

@ -14,7 +14,8 @@ class EmptyHiDreamO1LatentImage(io.ComfyNode):
def define_schema(cls) -> io.Schema: def define_schema(cls) -> io.Schema:
return io.Schema( return io.Schema(
node_id="EmptyHiDreamO1LatentImage", node_id="EmptyHiDreamO1LatentImage",
category="latent/hidream_o1", display_name="Empty HiDream-O1 Latent Image",
category="latent/image",
description=( description=(
"Empty pixel-space latent for HiDream-O1-Image. When " "Empty pixel-space latent for HiDream-O1-Image. When "
"snap_to_predefined is on, dimensions are matched (by aspect " "snap_to_predefined is on, dimensions are matched (by aspect "
@ -40,7 +41,7 @@ class EmptyHiDreamO1LatentImage(io.ComfyNode):
@classmethod @classmethod
def execute(cls, *, width: int, height: int, batch_size: int = 1, def execute(cls, *, width: int, height: int, batch_size: int = 1,
snap_to_predefined: bool = True) -> io.NodeOutput: snap_to_predefined: bool = True) -> io.NodeOutput:
if snap_to_predefined: if snap_to_predefined: #TODO: better way to handle this
sw, sh = find_closest_resolution(width, height) sw, sh = find_closest_resolution(width, height)
width, height = sw, sh width, height = sw, sh
width = (width // 32) * 32 width = (width // 32) * 32
@ -53,24 +54,17 @@ class EmptyHiDreamO1LatentImage(io.ComfyNode):
class HiDreamO1ReferenceImages(io.ComfyNode): class HiDreamO1ReferenceImages(io.ComfyNode):
"""Attach reference images to both positive and negative conditioning. """Attach reference images to both positive and negative conditioning."""
Refs are model-level inputs, not per-prompt CONDITIONING — they must ride
on both CFG branches, otherwise CFG amplifies "with-refs vs no-refs"
instead of "edit prompt vs empty prompt with same refs" and saturation
blows out.
"""
@classmethod @classmethod
def define_schema(cls) -> io.Schema: def define_schema(cls) -> io.Schema:
return io.Schema( return io.Schema(
node_id="HiDreamO1ReferenceImages", node_id="HiDreamO1ReferenceImages",
category="conditioning/hidream_o1", display_name="HiDream-O1 Reference Images",
category="conditioning/image",
description=( description=(
"Attach 1-10 reference images to BOTH positive and negative " "Attach 1-10 reference images to conditioning, one for edit instruction"
"conditioning for HiDream-O1 edit (K=1) or subject-driven " "or multiple for subject-driven personalization."
"personalization (K=2..10). Refs must ride on both CFG "
"branches; this node enforces that."
), ),
inputs=[ inputs=[
io.Conditioning.Input(id="positive"), io.Conditioning.Input(id="positive"),
@ -96,14 +90,9 @@ class HiDreamO1ReferenceImages(io.ComfyNode):
@classmethod @classmethod
def execute(cls, *, positive, negative, images: io.Autogrow.Type) -> io.NodeOutput: def execute(cls, *, positive, negative, images: io.Autogrow.Type) -> io.NodeOutput:
# Numeric-suffix order; alphabetic sort would give image_1, image_10, image_2, ...
refs = [images[f"image_{i}"] for i in range(1, 11) if f"image_{i}" in images] refs = [images[f"image_{i}"] for i in range(1, 11) if f"image_{i}" in images]
positive = node_helpers.conditioning_set_values( positive = node_helpers.conditioning_set_values(positive, {"hidream_o1_ref_images": refs})
positive, {"hidream_o1_ref_images": refs}, negative = node_helpers.conditioning_set_values(negative, {"hidream_o1_ref_images": refs})
)
negative = node_helpers.conditioning_set_values(
negative, {"hidream_o1_ref_images": refs},
)
return io.NodeOutput(positive, negative) return io.NodeOutput(positive, negative)
@ -114,23 +103,22 @@ class HiDreamO1Sampling(io.ComfyNode):
def define_schema(cls) -> io.Schema: def define_schema(cls) -> io.Schema:
return io.Schema( return io.Schema(
node_id="HiDreamO1Sampling", node_id="HiDreamO1Sampling",
category="advanced/model/hidream_o1", display_name="HiDream-O1 Sampling",
category="advanced/model",
description=( description=(
"Patch HiDream-O1's sigma shift and noise scaling factor. " "Patch HiDream-O1's sigma shift and noise scaling factor. "
"Full recipe: shift=3.0, s_noise=8.0. " "Base model defaults: shift=3.0, s_noise=8.0. "
"Dev/flash recipe: shift=1.0, s_noise=7.5." "Dev/flash sampler defaults: shift=1.0, s_noise=7.5."
), ),
inputs=[ inputs=[
io.Model.Input(id="model"), io.Model.Input(id="model"),
io.Float.Input( io.Float.Input(
id="shift", default=3.0, min=0.0, max=100.0, step=0.01, id="shift", default=3.0, min=0.0, max=100.0, step=0.01,
tooltip="Flow-match sigma shift. 3.0 for full, 1.0 for dev.", tooltip="Flow-match sigma shift. Defaults: 3.0 for base, 1.0 for dev.",
), ),
io.Float.Input( io.Float.Input(
id="s_noise", default=8.0, min=0.0, max=64.0, step=0.1, id="s_noise", default=8.0, min=0.0, max=64.0, step=0.1,
tooltip=( tooltip=("HiDream-O1 noise scale (CONST_SCALED_NOISE). Defaults: 8.0 for base, 7.5 for dev/flash."
"HiDream-O1 noise scale (CONST_SCALED_NOISE._s_noise). "
"8.0 for full, 7.5 for dev/flash."
), ),
), ),
], ],
@ -160,11 +148,9 @@ class SamplerEulerFlashFlowmatch(io.ComfyNode):
def define_schema(cls) -> io.Schema: def define_schema(cls) -> io.Schema:
return io.Schema( return io.Schema(
node_id="SamplerEulerFlashFlowmatch", node_id="SamplerEulerFlashFlowmatch",
display_name="Sampler Euler Flash Flowmatch",
category="sampling/custom_sampling/samplers", category="sampling/custom_sampling/samplers",
description=( description=("HiDream-O1 dev/flash sampler with tunable per-step noise"),
"HiDream-O1 dev/flash sampler with tunable per-step noise "
"schedule (start, end, clip_std). Wire into SamplerCustom."
),
inputs=[ inputs=[
io.Float.Input( io.Float.Input(
id="s_noise_start", default=7.5, min=0.0, max=64.0, step=0.1, id="s_noise_start", default=7.5, min=0.0, max=64.0, step=0.1,
@ -173,17 +159,13 @@ class SamplerEulerFlashFlowmatch(io.ComfyNode):
io.Float.Input( io.Float.Input(
id="s_noise_end", default=7.5, min=0.0, max=64.0, step=0.1, id="s_noise_end", default=7.5, min=0.0, max=64.0, step=0.1,
tooltip=( tooltip=(
"Per-step noise scale at the last step. Equals " "Per-step noise scale at the last step. Default: 7.5 for dev/flash. "
"s_noise_start for upstream-default behaviour; differ " "Differ from s_noise_start to linearly ramp noise across steps."
"to ramp the noise across the trajectory."
), ),
), ),
io.Float.Input( io.Float.Input(
id="noise_clip_std", default=2.5, min=0.0, max=10.0, step=0.1, id="noise_clip_std", default=2.5, min=0.0, max=10.0, step=0.1,
tooltip=( tooltip=("Clamp per-step noise to +/- N*std. 0 disables.")
"Clamp per-step noise to +/- N*std. 0 disables. "
"Upstream dev recipe: 2.5."
),
), ),
], ],
outputs=[io.Sampler.Output()], outputs=[io.Sampler.Output()],