mrq/stable-diffusion-webui
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prompt parser default step transformer w/ test

Browse Source
This commit is contained in:
catboxanon 2023-01-10 21:47:03 -05:00 committed by GitHub
parent 5830095b73
commit 7e45fba55b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/prompt_parser.py
View File

@ -3,6 +3,11 @@ from collections import namedtuple
from typing import List from typing import List
import lark import lark
try:
from modules.shared import opts
except:
pass
# a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]" # a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]"
# will be represented with prompt_schedule like this (assuming steps=100): # will be represented with prompt_schedule like this (assuming steps=100):
# [25, 'fantasy landscape with a mountain and an oak in foreground shoddy'] # [25, 'fantasy landscape with a mountain and an oak in foreground shoddy']
@ -49,6 +54,8 @@ def get_learned_conditioning_prompt_schedules(prompts, steps):
[[5, 'a c'], [10, 'a {b|d{ c']] [[5, 'a c'], [10, 'a {b|d{ c']]
>>> g("((a][:b:c [d:3]") >>> g("((a][:b:c [d:3]")
[[3, '((a][:b:c '], [10, '((a][:b:c d']] [[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): def collect_steps(steps, tree):
@ -84,7 +91,13 @@ def get_learned_conditioning_prompt_schedules(prompts, steps):
yield args[0].value yield args[0].value
def __default__(self, data, children, meta): def __default__(self, data, children, meta):
for child in children: for child in children:
yield from child try:
if opts.use_old_prompt_parser_default_step_transformer:
yield from child
else:
yield child
except:
yield child
return AtStep().transform(tree) return AtStep().transform(tree)
def get_schedule(prompt): def get_schedule(prompt):