Merge branch 'master' into tensorboard

1 files changed, 3 insertions, 1 deletions

diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py
index f70872c4..870218db 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):