fix and clean json handling, commonX considered, headers not 0,1 anymore

exit_image
GeorgLegato 2023-05-01 22:17:41 +02:00 committed by Charles Fettinger
parent 8ebf364e77
commit b0e0aacad1
3 changed files with 18 additions and 4 deletions

View File

@ -4,7 +4,8 @@ from jsonschema import validate
from .static_variables import (
empty_prompt,
invalid_prompt,
jsonprompt_schemafile
jsonprompt_schemafile,
promptTableHeaders
)
def completeOptionals(j):
@ -13,15 +14,22 @@ def completeOptionals(j):
if "prompts" in j:
if "headers" in j["prompts"]:
del j["prompts"]["headers"]
j["prompts"]["headers"]=promptTableHeaders
if "negPrompt" not in j:
j["negPrompt"]=""
if "prePrompt" not in j:
j["prePrompt"]=""
if "commonPromptPrefix" in j:
j["prePrompt"]=j["commonPromptPrefix"]
else:
j["prePrompt"]=""
if "postPrompt" not in j:
j["postPrompt"]=""
if "commonPromptSuffix" in j:
j["postPrompt"]=j["commonPromptSuffix"]
else:
j["postPrompt"]=""
return j

View File

@ -2,6 +2,8 @@ import os
from modules import scripts
import modules.sd_samplers
promptTableHeaders=["Start at second [0,1,...]", "prompt", "image location", "blend mask", "is keyframe"],
default_prompt = """
{
"prePrompt":"<lora:epiNoiseoffset_v2:0.6> ",

View File

@ -11,6 +11,8 @@ from .static_variables import (
available_samplers,
)
from .helpers import validatePromptJson_throws, putPrompts, clearPrompts
from .prompt_util import readJsonPrompt
from .static_variables import promptTableHeaders
def on_ui_tabs():
@ -58,6 +60,8 @@ def on_ui_tabs():
type="array",
headers=["outpaint step", "prompt", "image location", "blend mask", "is keyframe"],
datatype=["number", "str", "str", "str", "bool"],
headers= promptTableHeaders,
datatype=["number", "str", "str", "str", "bool"],
row_count=1,
col_count=(5, "fixed"),
value=jpr["prompts"],