Merge remote-tracking branch 'origin/master'

This commit is contained in:
AUTOMATIC 2022-09-25 09:25:47 +03:00
commit b8eae5de93
2 changed files with 26 additions and 16 deletions

View File

@ -1041,6 +1041,9 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
def apply_field(obj, field, condition=None): def apply_field(obj, field, condition=None):
key = path + "/" + field key = path + "/" + field
if getattr(obj,'do_not_save_to_config',False):
return
saved_value = ui_settings.get(key, None) saved_value = ui_settings.get(key, None)
if saved_value is None: if saved_value is None:
ui_settings[key] = getattr(obj, field) ui_settings[key] = getattr(obj, field)
@ -1056,6 +1059,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
if type(x) == gr.Radio: if type(x) == gr.Radio:
apply_field(x, 'value', lambda val: val in x.choices) apply_field(x, 'value', lambda val: val in x.choices)
if type(x) == gr.Checkbox:
apply_field(x, 'value')
if type(x) == gr.Textbox:
apply_field(x, 'value')
if type(x) == gr.Number:
apply_field(x, 'value')
visit(txt2img_interface, loadsave, "txt2img") visit(txt2img_interface, loadsave, "txt2img")
visit(img2img_interface, loadsave, "img2img") visit(img2img_interface, loadsave, "img2img")
visit(extras_interface, loadsave, "extras") visit(extras_interface, loadsave, "extras")

View File

@ -1,22 +1,20 @@
transformers
diffusers
basicsr basicsr
gfpgan
gradio
numpy
Pillow
realesrgan
torch
transformers
omegaconf
pytorch_lightning
diffusers diffusers
invisible-watermark fairscale==0.4.4
scikit-image>=0.19
fonts fonts
font-roboto font-roboto
gfpgan
gradio
invisible-watermark
git+https://github.com/crowsonkb/k-diffusion.git git+https://github.com/crowsonkb/k-diffusion.git
numpy
omegaconf
piexif
Pillow
pytorch_lightning
realesrgan
scikit-image>=0.19
git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379
timm==0.4.12 timm==0.4.12
fairscale==0.4.4 transformers
piexif torch