Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Fix prompt parser default step transformer #6628

Merged
merged 5 commits into from
Jan 11, 2023
Merged

Fix prompt parser default step transformer #6628

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5830095
Add old prompt parser compat option
catboxanon Jan 11, 2023
7e45fba
Fix prompt parser default step transformer w/ test
catboxanon Jan 11, 2023
035f2af
Merge branch 'AUTOMATIC1111:master' into fix/alternating-words-emphasis
catboxanon Jan 11, 2023
ab388d6
Remove compat option check for prompt parser
catboxanon Jan 11, 2023
0b38b72
Remove compat option for prompt parser
catboxanon Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/prompt_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -84,7 +86,7 @@ def plain(self, args):
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):
Expand Down