Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

Small cleanup.

comfyanonymousfcfd2bdf8a4f
diff --git a/comfy/samplers.py b/comfy/samplers.py
index 57f5632c5..a89e3a6c0 100644
--- a/comfy/samplers.py
+++ b/comfy/samplers.py
@@ -596,13 +596,16 @@ class CFGGuider:
self.original_conds = {}
self.cfg = 1.0
- def set_conds(self, conds):
- for k in conds:
- self.original_conds[k] = comfy.sampler_helpers.convert_cond(conds[k])
+ def set_conds(self, positive, negative):
+ self.inner_set_conds({"positive": positive, "negative": negative})
def set_cfg(self, cfg):
self.cfg = cfg
+ def inner_set_conds(self, conds):
+ for k in conds:
+ self.original_conds[k] = comfy.sampler_helpers.convert_cond(conds[k])
+
def __call__(self, *args, **kwargs):
return self.predict_noise(*args, **kwargs)
@@ -646,7 +649,7 @@ class CFGGuider:
def sample(model, noise, positive, negative, cfg, device, sampler, sigmas, model_options={}, latent_image=None, denoise_mask=None, callback=None, disable_pbar=False, seed=None):
cfg_guider = CFGGuider(model)
- cfg_guider.set_conds({"positive": positive, "negative": negative})
+ cfg_guider.set_conds(positive, negative)
cfg_guider.set_cfg(cfg)
return cfg_guider.sample(noise, latent_image, sampler, sigmas, denoise_mask, callback, disable_pbar, seed)
diff --git a/comfy_extras/nodes_custom_sampler.py b/comfy_extras/nodes_custom_sampler.py
index 32b2a56d6..e9dc3bd98 100644
--- a/comfy_extras/nodes_custom_sampler.py
+++ b/comfy_extras/nodes_custom_sampler.py
@@ -397,7 +397,7 @@ class CFGGuider:
def get_guider(self, model, positive, negative, cfg):
guider = comfy.samplers.CFGGuider(model)
- guider.set_conds({"positive": positive, "negative": negative})
+ guider.set_conds(positive, negative)
guider.set_cfg(cfg)
return (guider,)