Remove compat option check for prompt parser

This commit is contained in:
catboxanon 2023-01-11 08:59:47 -05:00 committed by GitHub
parent 035f2af050
commit ab388d6f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,11 +3,6 @@ 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']
@ -91,13 +86,7 @@ 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:
try: yield child
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):