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

Updated xy_grid infotext formatting, parser regex

Browse source
This commit is contained in:
RnDMonkey 2022-10-01 13:56:29 -07:00
parent cf141157e7
commit eba0c29dbc
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/generation_parameters_copypaste.py
View file

@ -1,7 +1,7 @@
import re import re
import gradio as gr import gradio as gr
re_param_code = r"\s*([\w ]+):\s*([^,]+)(?:,|$)" re_param_code = r"\s*([\w ]+):\s*((?:{[^}]+})|(?:[^,]+))(?:,|$)"
re_param = re.compile(re_param_code) re_param = re.compile(re_param_code)
re_params = re.compile(r"^(?:" + re_param_code + "){3,}$") re_params = re.compile(r"^(?:" + re_param_code + "){3,}$")
re_imagesize = re.compile(r"^(\d+)x(\d+)$") re_imagesize = re.compile(r"^(\d+)x(\d+)$")

12
scripts/xy_grid.py
View file

@ -245,12 +245,16 @@ class Script(scripts.Script):
return process_images(pc) return process_images(pc)
if not x_opt.label == 'Nothing': if not x_opt.label == 'Nothing':
p.extra_generation_params["X/Y Plot X Type"] = x_opt.label p.extra_generation_params["XY Plot X Type"] = x_opt.label
p.extra_generation_params["X Values"] = '{' + ", ".join([f'{x}' for x in xs]) + '}' p.extra_generation_params["X Values"] = '{' + x_values + '}'
if x_opt.label in ["Seed","Var. seed"] and not no_fixed_seeds:
p.extra_generation_params["Fixed X Values"] = '{' + ", ".join([str(x) for x in xs])+ '}'
if not y_opt.label == 'Nothing': if not y_opt.label == 'Nothing':
p.extra_generation_params["X/Y Plot Y Type"] = y_opt.label p.extra_generation_params["XY Plot Y Type"] = y_opt.label
p.extra_generation_params["Y Values"] = '{' + ", ".join([f'{y}' for y in ys]) + '}' p.extra_generation_params["Y Values"] = '{' + y_values + '}'
if y_opt.label in ["Seed","Var. seed"] and not no_fixed_seeds:
p.extra_generation_params["Fixed Y Values"] = '{' + ", ".join([str(y) for y in ys])+ '}'
processed = draw_xy_grid( processed = draw_xy_grid(
p, p,