Skip to content

Commit ddaedfe

Browse files
committed
feat: ImpactWildcardEncode - support BREAK syntax
1 parent 36fbaab commit ddaedfe

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

modules/impact/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33

44

5-
version = "V4.55"
5+
version = "V4.56"
66

77
dependency_version = 20
88

modules/impact/wildcards.py

+22-5
Original file line numberDiff line numberDiff line change
@@ -328,12 +328,29 @@ def default_lora():
328328
else:
329329
print(f"LORA NOT FOUND: {orig_lora_name}")
330330

331-
print(f"CLIP: {pass2}")
331+
pass3 = [x.strip() for x in pass2.split("BREAK")]
332+
pass3 = [x for x in pass3 if x != '']
332333

333-
if clip_encoder is None:
334-
return model, clip, nodes.CLIPTextEncode().encode(clip, pass2)[0]
335-
else:
336-
return model, clip, clip_encoder.encode(clip, pass2)[0]
334+
if len(pass3) == 0:
335+
pass3 = ['']
336+
337+
pass3_str = [f'[{x}]' for x in pass3]
338+
print(f"CLIP: {str.join(' + ', pass3_str)}")
339+
340+
result = None
341+
342+
for prompt in pass3:
343+
if clip_encoder is None:
344+
cur = nodes.CLIPTextEncode().encode(clip, prompt)[0]
345+
else:
346+
cur = clip_encoder.encode(clip, prompt)[0]
347+
348+
if result is not None:
349+
result = nodes.ConditioningConcat().concat(result, cur)[0]
350+
else:
351+
result = cur
352+
353+
return model, clip, result
337354

338355

339356
def starts_with_regex(pattern, text):

0 commit comments

Comments
 (0)