nodes/blepping-ComfyUI-bleh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add sampler presets feature and associated BlehSetSamplerPreset node

Browse Source
This commit is contained in:
blepping
2024-11-03 08:16:02 -07:00
parent 92610163f0
commit f90ce285ad
4 changed files with 159 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+8
View File
@@ -116,6 +116,14 @@ Basically the same idea as `BlehForceSeedSampler`, however it is usable with `Sa
You can connect this node to any input and it will be the same as if the input had no connection. Why is this useful? It's mainly for [Use Everywhere](https://github.com/chrisgoringe/cg-use-everywhere) — sometimes it's desirable to leave an input unconnected, but if you have Use Everywhere broadcasting an output it can be inconvenient. Just shove a plug in those inputs.
### BlehSetSamplerPreset
Allows associating a `SAMPLER` with a name in list of samplers so you can use a custom sampler in places that do not allow custom sampling - FaceDetailer for example. You can adjust the number of presets by setting the environment variable `COMFYUI_BLEH_SAMPLER_PRESET_COUNT` - it defaults to 1 if unset.
This node needs to run before sampling with the preset starts - in takes a wildcard input with can be used to pass through something like the model or latent just to make sure the node runs before the sampler. **Note**: Since the input and outputs are wildcards, ComfyUI's normal type checking does not apply here - be sure you connect the output to something that expects the input. For example, if you connect a `MODEL` then ComfyUI will let you connect that to something expecting `LATENT` which won't work very well.
It's also possible to override the sigmas used for sampling - possibly to do stuff like using Restart sampling in nodes that don't currently allow you to pass in sigmas. This is an advanced option, if you don't know you need it then I suggest not connecting anything here. *Note*: If the sampler is adding noise then you likely will get poor results if the two sets of sigmas start at different values.
### BlehRefinerAfter
Allows switching to a refiner model at a predefined time. There are three time modes:
__init__.py
+8 -7
View File
@@ -8,6 +8,7 @@ if settings.SETTINGS.btp_enabled:
from .py import betterTaesdPreview # noqa: F401
from .py.nodes import (
blockCFG,
deepShrink,
hyperTile,
misc,
@@ -17,19 +18,23 @@ from .py.nodes import (
samplers,
)
samplers.add_sampler_presets()
NODE_CLASS_MAPPINGS = {
"BlehBlockCFG": blockCFG.BlockCFGBleh,
"BlehBlockOps": ops.BlehBlockOps,
"BlehDeepShrink": deepShrink.DeepShrinkBleh,
"BlehDiscardPenultimateSigma": misc.DiscardPenultimateSigma,
"BlehDisableNoise": misc.BlehDisableNoise,
"BlehPlug": misc.BlehPlug,
"BlehDiscardPenultimateSigma": misc.DiscardPenultimateSigma,
"BlehForceSeedSampler": samplers.BlehForceSeedSampler,
"BlehHyperTile": hyperTile.HyperTileBleh,
"BlehInsaneChainSampler": samplers.BlehInsaneChainSampler,
"BlehLatentScaleBy": ops.BlehLatentScaleBy,
"BlehLatentOps": ops.BlehLatentOps,
"BlehLatentScaleBy": ops.BlehLatentScaleBy,
"BlehModelPatchConditional": modelPatchConditional.ModelPatchConditionalNode,
"BlehPlug": misc.BlehPlug,
"BlehRefinerAfter": refinerAfter.BlehRefinerAfter,
"BlehSetSamplerPreset": samplers.BlehSetSamplerPreset,
}
NODE_DISPLAY_NAME_MAPPINGS = {
@@ -38,7 +43,3 @@ NODE_DISPLAY_NAME_MAPPINGS = {
}
__all__ = ("BLEH_VERSION", "NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS")
from .py.nodes import blockCFG
NODE_CLASS_MAPPINGS["BlehBlockCFG"] = blockCFG.BlockCFGBleh
changelog.md
+4
View File
@@ -2,6 +2,10 @@
Note, only relatively significant changes to user-visible functionality will be included here. Most recent changes at the top.
## 20241103
* Added the `BlehSetSamplerPreset` node and sampler presets feature.
## 20241021
* Added `seed_offset` parameter to `BlehDisableNoise` and `BlehForceSeedSampler` nodes. This is to avoid a case where the same noise would be used during sampling as the initial noise. **Note**: Changes seeds. You can set `seed_offset` to 0 to get the same behavior as before.
py/nodes/samplers.py
+139 -1
View File
@@ -1,12 +1,30 @@
from __future__ import annotations
import contextlib
import importlib
import random
from copy import deepcopy
from functools import partial
from os import environ
from typing import Any, Callable, NamedTuple
import torch
from comfy.samplers import KSAMPLER
from comfy.samplers import KSAMPLER, KSampler, k_diffusion_sampling
from tqdm import tqdm
from .misc import Wildcard
BLEH_PRESET_LIMIT = 16
BLEH_PRESET_COUNT = 1
with contextlib.suppress(Exception):
BLEH_PRESET_COUNT = min(
BLEH_PRESET_LIMIT,
max(
0,
int(environ.get("COMFYUI_BLEH_SAMPLER_PRESET_COUNT", 1)),
),
)
class SamplerChain(NamedTuple):
prev: SamplerChain | None = None
@@ -168,3 +186,123 @@ class BlehForceSeedSampler:
extra_args=extra_args,
**kwargs,
)
BLEH_PRESET = [None] * BLEH_PRESET_COUNT
def bleh_sampler_preset_wrapper(
preset_idx,
model,
x,
sigmas,
*args: list,
**kwargs: dict,
) -> torch.Tensor:
if not (0 <= preset_idx < BLEH_PRESET_COUNT):
raise ValueError("Bleh sampler preset out of range")
preset = BLEH_PRESET[preset_idx]
if preset is None:
errstr = f"Cannot use bleh_preset_{preset_idx} - present not defined. Ensure BlehSetSamplerPreset runs before sampling."
raise RuntimeError(errstr)
sampler, override_sigmas = preset
if override_sigmas is not None:
sigmas = override_sigmas.detach().clone().to(sigmas)
return sampler.sampler_function(
model,
x,
sigmas,
*args,
**sampler.extra_options,
**kwargs,
)
def add_sampler_presets():
if BLEH_PRESET_COUNT < 1:
return
for idx in range(BLEH_PRESET_COUNT):
key = f"bleh_preset_{idx}"
KSampler.SAMPLERS.append(key)
setattr(
k_diffusion_sampling,
f"sample_{key}",
partial(bleh_sampler_preset_wrapper, idx),
)
importlib.reload(k_diffusion_sampling)
class BlehSetSamplerPreset:
WILDCARD = Wildcard("*")
DESCRIPTION = "This node allows setting a custom sampler as a preset that can be selected in nodes that don't support custom sampling (FaceDetailer for example). This node needs to run at least once with any preset changes before actual sampling begins. the `any_input` input acts as a passthrough so you can do something like pass your model or latent through before you start sampling to ensure the node runs. The number of presets can be adjusted (and the whole feature disabled if desired) by setting the environment variable `COMFYUI_BLEH_SAMPLER_PRESET_COUNT`. WARNING: Since the input and output are wildcards, this bypasses ComfyUI's normal type checking. Make sure you connect the output to something that actually accepts the input type."
RETURN_TYPES = (WILDCARD,)
OUTPUT_TOOLTIPS = (
"This just passes through the value from any_input. WARNING: ComfyUI's normal typechecking is disabled here, make sure you connect this output to something that allows the input type.",
)
CATEGORY = "hacks"
NOT_IDEMPOTENT = True
FUNCTION = "go"
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"sampler": ("SAMPLER", {"tooltip": "Sampler to use for this preset."}),
"any_input": (cls.WILDCARD,),
"preset": (
"INT",
{
"min": -1,
"max": BLEH_PRESET_COUNT - 1,
"default": 0 if BLEH_PRESET_COUNT > 0 else -1,
"tooltip": "Preset index to set. If set to -1, nothing happens. The number of presets can be adjusted, see the README.",
},
),
"discard_penultimate_sigma": (
"BOOLEAN",
{
"default": False,
"tooltip": "Advanced option to enabling discarding the penultimate sigma. May be needed for some samplers like dpmpp_3m_sde - if it seems like the generation has a bunch of noise added at the very last step then you can try enabling this. Note: Cannot be used when override sigmas are attached.",
},
),
},
"optional": {
"override_sigmas_opt": (
"SIGMAS",
{
"tooltip": "Advanced option that allows overriding the sigmas used for sampling. Note: Cannot be used with discard_penultimate_sigma. Also this cannot control the noise added by the sampler, so if the schedules start on different sigmas you likely will get the wrong amount of noise.",
},
),
},
}
@classmethod
def go(
cls,
*,
sampler,
any_input,
preset,
discard_penultimate_sigma,
override_sigmas_opt: None | torch.Tensor = None,
):
if not (0 <= preset < BLEH_PRESET_COUNT):
return (any_input,)
if discard_penultimate_sigma and override_sigmas_opt is not None:
raise ValueError(
"BlehSetSamplerPreset: Cannot override sigmas and also enable discard penultimate sigma",
)
dps_samplers = getattr(KSampler, "DISCARD_PENULTIMATE_SIGMA_SAMPLERS", None)
if dps_samplers is not None:
key = f"bleh_preset_{preset}"
if discard_penultimate_sigma:
dps_samplers.update(key)
else:
dps_samplers -= {key}
sigmas = (
None
if override_sigmas_opt is None
else override_sigmas_opt.detach().clone().cpu()
)
BLEH_PRESET[preset] = (deepcopy(sampler), sigmas)
return (any_input,)