Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui into gamepad

1 files changed, 9 insertions, 2 deletions

diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py
index f70872c4..69665372 100644
--- a/modules/prompt_parser.py
+++ b/modules/prompt_parser.py
@@ -49,6 +49,8 @@ def get_learned_conditioning_prompt_schedules(prompts, steps):
     [[5, 'a  c'], [10, 'a {b|d{ c']]

     >>> g("((a][:b:c [d:3]")

     [[3, '((a][:b:c '], [10, '((a][:b:c d']]

+    >>> g("[a|(b:1.1)]")

+    [[1, 'a'], [2, '(b:1.1)'], [3, 'a'], [4, '(b:1.1)'], [5, 'a'], [6, '(b:1.1)'], [7, 'a'], [8, '(b:1.1)'], [9, 'a'], [10, '(b:1.1)']]

     """

 

     def collect_steps(steps, tree):

@@ -84,7 +86,7 @@ def get_learned_conditioning_prompt_schedules(prompts, steps):
                 yield args[0].value

             def __default__(self, data, children, meta):

                 for child in children:

-                    yield from child

+                    yield child

         return AtStep().transform(tree)

 

     def get_schedule(prompt):

@@ -272,6 +274,7 @@ re_attention = re.compile(r"""
 :

 """, re.X)

 

+re_break = re.compile(r"\s*\bBREAK\b\s*", re.S)

 

 def parse_prompt_attention(text):

     """

@@ -337,7 +340,11 @@ def parse_prompt_attention(text):
         elif text == ']' and len(square_brackets) > 0:

             multiply_range(square_brackets.pop(), square_bracket_multiplier)

         else:

-            res.append([text, 1.0])

+            parts = re.split(re_break, text)

+            for i, part in enumerate(parts):

+                if i > 0:

+                    res.append(["BREAK", -1])

+                res.append([part, 1.0])

 

     for pos in round_brackets:

         multiply_range(pos, round_bracket_multiplier)