Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 14 deletions

diff --git a/modules/shared.py b/modules/shared.py
index b55371d3..76cbb1bd 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -80,12 +80,13 @@ parser.add_argument('--vae-path', type=str, help='Path to Variational Autoencode
 parser.add_argument("--disable-safe-unpickle", action='store_true', help="disable checking pytorch models for malicious code", default=False)

 parser.add_argument("--api", action='store_true', help="use api=True to launch the api with the webui")

 parser.add_argument("--nowebui", action='store_true', help="use api=True to launch the api instead of the webui")

+parser.add_argument("--ui-debug-mode", action='store_true', help="Don't load model to quickly launch UI")

 parser.add_argument("--device-id", type=str, help="Select the default CUDA device to use (export CUDA_VISIBLE_DEVICES=0,1,etc might be needed before)", default=None)

-parser.add_argument("--browse-all-images", action='store_true', help="Allow browsing all images by Image Browser", default=False)

 

 cmd_opts = parser.parse_args()

 restricted_opts = [

     "samples_filename_pattern",

+    "directories_filename_pattern",

     "outdir_samples",

     "outdir_txt2img_samples",

     "outdir_img2img_samples",

@@ -190,7 +191,8 @@ options_templates = {}
 options_templates.update(options_section(('saving-images', "Saving images/grids"), {

     "samples_save": OptionInfo(True, "Always save all generated images"),

     "samples_format": OptionInfo('png', 'File format for images'),

-    "samples_filename_pattern": OptionInfo("", "Images filename pattern"),

+    "samples_filename_pattern": OptionInfo("", "Images filename pattern", component_args=hide_dirs),

+    "save_images_add_number": OptionInfo(True, "Add number to filename when saving", component_args=hide_dirs),

 

     "grid_save": OptionInfo(True, "Always save all generated image grids"),

     "grid_format": OptionInfo('png', 'File format for grids'),

@@ -225,8 +227,8 @@ options_templates.update(options_section(('saving-to-dirs', "Saving to a directo
     "save_to_dirs": OptionInfo(False, "Save images to a subdirectory"),

     "grid_save_to_dirs": OptionInfo(False, "Save grids to a subdirectory"),

     "use_save_to_dirs_for_ui": OptionInfo(False, "When using \"Save\" button, save images to a subdirectory"),

-    "directories_filename_pattern": OptionInfo("", "Directory name pattern"),

-    "directories_max_prompt_words": OptionInfo(8, "Max prompt words for [prompt_words] pattern", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1}),

+    "directories_filename_pattern": OptionInfo("", "Directory name pattern", component_args=hide_dirs),

+    "directories_max_prompt_words": OptionInfo(8, "Max prompt words for [prompt_words] pattern", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1, **hide_dirs}),

 }))

 

 options_templates.update(options_section(('upscaling', "Upscaling"), {

@@ -320,15 +322,6 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters"
     'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}),

 }))

 

-options_templates.update(options_section(('images-history', "Images Browser"), {

-    #"images_history_reconstruct_directory": OptionInfo(False, "Reconstruct output directory structure.This can greatly improve the speed of loading , but will change the original output directory structure"),

-    "images_history_preload": OptionInfo(False, "Preload images at startup"),

-    "images_history_num_per_page": OptionInfo(36, "Number of pictures displayed on each page"),

-    "images_history_pages_num": OptionInfo(6, "Minimum number of pages per load "),   

-    "images_history_grid_num": OptionInfo(6, "Number of grids in each row"),   

-

-}))

-

 

 class Options:

     data = None

@@ -357,7 +350,7 @@ class Options:
 

     def save(self, filename):

         with open(filename, "w", encoding="utf8") as file:

-            json.dump(self.data, file)

+            json.dump(self.data, file, indent=4)

 

     def same_type(self, x, y):

         if x is None or y is None: