wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-06-22 15:59:45 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Add the reescape option.

Browse Source
This commit is contained in:
Barry Downes 2023-08-05 14:14:32 +10:00
parent 84360083c8
commit 277e75f66f
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
comfy/choices.py
View File

@ -15,7 +15,7 @@ class LogicError(Exception):
def get_random_seed(): def get_random_seed():
return int.from_bytes(os.urandom(8)) return int.from_bytes(os.urandom(8))
def translate(text, seed=None): def translate(text, seed=None, reescape=frozenset()):
''' '''
Parses the text, translating "{A|B|C}" choices into a single chosen option. Parses the text, translating "{A|B|C}" choices into a single chosen option.
An option is chosen randomly from the available options. An option is chosen randomly from the available options.
@ -25,16 +25,11 @@ def translate(text, seed=None):
could expand to could expand to
"a woman wearing a realistic police uniform". "a woman wearing a realistic police uniform".
All random choices are governed by the supplied random seed value, ensuring repeatability. All random choices are governed by the supplied random seed value, ensuring repeatability.
'''
# the user will be escaping for both this processing (using curly braces) and the weight processing (using round parentheses) reescape indicates the set of metacharacters that, if escaped with a backslash in the input, should be re-escaped in the output.
# from their perspective, they will need to escape literal data like this to cover both sets of processing: This is useful to avoid need for multi-escaping when incorporating this parser as a single phase in a multi-phase parsing operation.
# { -> \{ Note that while the default is a frozenset, you can pass anything that works with the "in" operator, such as a string or a set.
# } -> \} '''
# | -> \|
# \ -> \\
# ( -> \(
# ) -> \)
def parse_choice(input): def parse_choice(input):
options = [] options = []
@ -58,15 +53,12 @@ def translate(text, seed=None):
while True: while True:
if 0: pass if 0: pass
elif m := input.match(r'\\'): # \ elif m := input.match(r'\\'): # \ = escape character
if 0: pass if m := input.match(r'.'):
elif m := input.match(r'[\{\|\}\/]'): ch = m.group(0)
# escaping a metacharacter to make it literal if ch in reescape:
out.append(m.group(0)) # output literal character out.append('\\')
elif m := input.match(r'.'): out.append(ch)
# by passing through non-native or unrecognised escape codes without change, we support clean combiniation of multiple parsing phases
# without forcing the user to add additional escaping for each phase
out.append(f'\\{m.group(0)}')
else: else:
raise ParseError(input, f'Unexpected end of input after backslash') raise ParseError(input, f'Unexpected end of input after backslash')
elif m := input.match(r'\{'): # { elif m := input.match(r'\{'): # {

2
nodes.py
View File

@ -1479,7 +1479,7 @@ class DynamicPrompt:
CATEGORY = "conditioning" CATEGORY = "conditioning"
def dynamic_prompt(self, text, seed): def dynamic_prompt(self, text, seed):
translated_prompt_text = comfy.choices.translate(text, seed) translated_prompt_text = comfy.choices.translate(text, seed=seed, reescape=r'\()')
return (translated_prompt_text,) return (translated_prompt_text,)