Skip to content

Commit 4202e95

Browse files
Add append feature to conditioning_set_values (Comfy-Org#8239)
Refactor unclipconditioning node.
1 parent b838c36 commit 4202e95

2 files changed

Lines changed: 9 additions & 12 deletions

File tree

node_helpers.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55

66
from PIL import ImageFile, UnidentifiedImageError
77

8-
def conditioning_set_values(conditioning, values={}):
8+
def conditioning_set_values(conditioning, values={}, append=False):
99
c = []
1010
for t in conditioning:
1111
n = [t[0], t[1].copy()]
1212
for k in values:
13-
n[1][k] = values[k]
13+
val = values[k]
14+
if append:
15+
old_val = n[1].get(k, None)
16+
if old_val is not None:
17+
val = old_val + val
18+
19+
n[1][k] = val
1420
c.append(n)
1521

1622
return c

nodes.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,16 +1103,7 @@ def apply_adm(self, conditioning, clip_vision_output, strength, noise_augmentati
11031103
if strength == 0:
11041104
return (conditioning, )
11051105

1106-
c = []
1107-
for t in conditioning:
1108-
o = t[1].copy()
1109-
x = {"clip_vision_output": clip_vision_output, "strength": strength, "noise_augmentation": noise_augmentation}
1110-
if "unclip_conditioning" in o:
1111-
o["unclip_conditioning"] = o["unclip_conditioning"][:] + [x]
1112-
else:
1113-
o["unclip_conditioning"] = [x]
1114-
n = [t[0], o]
1115-
c.append(n)
1106+
c = node_helpers.conditioning_set_values(conditioning, {"unclip_conditioning": [{"clip_vision_output": clip_vision_output, "strength": strength, "noise_augmentation": noise_augmentation}]}, append=True)
11161107
return (c, )
11171108

11181109
class GLIGENLoader:

0 commit comments

Comments
 (0)