Merge remote-tracking branch 'origin/master'

modules/ui.py

@@ -1040,7 +1040,10 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
     def loadsave(path, x):
         def apply_field(obj, field, condition=None):
             key = path + "/" + field
-
+            
+            if getattr(obj,'do_not_save_to_config',False):
+              return
+            
             saved_value = ui_settings.get(key, None)
             if saved_value is None:
                 ui_settings[key] = getattr(obj, field)
@@ -1056,6 +1059,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo):
         if type(x) == gr.Radio:
             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(img2img_interface, loadsave, "img2img")
     visit(extras_interface, loadsave, "extras")

requirements.txt

@@ -1,22 +1,20 @@
-transformers
-diffusers
 basicsr
-gfpgan
-gradio
-numpy
-Pillow
-realesrgan
-torch
-transformers
-omegaconf
-pytorch_lightning
 diffusers
-invisible-watermark
+fairscale==0.4.4
-scikit-image>=0.19
 fonts
 font-roboto
+gfpgan
+gradio
+invisible-watermark
 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
 timm==0.4.12
-fairscale==0.4.4
+transformers
-piexif
+torch