Merge branch 'master' into improved-hr-conflict-test

1 files changed, 35 insertions, 6 deletions

diff --git a/modules/shared.py b/modules/shared.py
index eb04e811..69634fd8 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -105,6 +105,8 @@ parser.add_argument("--tls-keyfile", type=str, help="Partially enables TLS, requ
 parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, requires --tls-keyfile to fully function", default=None)

 parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None)

 parser.add_argument("--gradio-queue", action='store_true', help="Uses gradio queue; experimental option; breaks restart UI button")

+parser.add_argument("--skip-version-check", action='store_true', help="Do not check versions of torch and xformers")

+

 

 

 script_loading.preload_extensions(extensions.extensions_dir, parser)

@@ -127,12 +129,13 @@ restricted_opts = {
 ui_reorder_categories = [

     "inpaint",

     "sampler",

+    "checkboxes",

+    "hires_fix",

     "dimensions",

     "cfg",

     "seed",

-    "checkboxes",

-    "hires_fix",

     "batch",

+    "override_settings",

     "scripts",

 ]

 

@@ -346,10 +349,10 @@ options_templates.update(options_section(('saving-paths', "Paths for saving"), {
 }))

 

 options_templates.update(options_section(('saving-to-dirs', "Saving to a directory"), {

-    "save_to_dirs": OptionInfo(False, "Save images to a subdirectory"),

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

+    "save_to_dirs": OptionInfo(True, "Save images to a subdirectory"),

+    "grid_save_to_dirs": OptionInfo(True, "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", component_args=hide_dirs),

+    "directories_filename_pattern": OptionInfo("[date]", "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}),

 }))

 

@@ -440,7 +443,7 @@ options_templates.update(options_section(('ui', "User interface"), {
     "do_not_show_images": OptionInfo(False, "Do not show any images in results for web"),

     "add_model_hash_to_info": OptionInfo(True, "Add model hash to generation information"),

     "add_model_name_to_info": OptionInfo(True, "Add model name to generation information"),

-    "disable_weights_auto_swap": OptionInfo(False, "When reading generation parameters from text into UI (from PNG info or pasted text), do not change the selected model/checkpoint."),

+    "disable_weights_auto_swap": OptionInfo(True, "When reading generation parameters from text into UI (from PNG info or pasted text), do not change the selected model/checkpoint."),

     "send_seed": OptionInfo(True, "Send seed when sending prompt or image to other interface"),

     "send_size": OptionInfo(True, "Send size when sending prompt or image to another interface"),

     "font": OptionInfo("", "Font for image grids that have text"),

@@ -605,11 +608,37 @@ class Options:
 

         self.data_labels = {k: v for k, v in sorted(settings_items, key=lambda x: section_ids[x[1].section])}

 

+    def cast_value(self, key, value):

+        """casts an arbitrary to the same type as this setting's value with key

+        Example: cast_value("eta_noise_seed_delta", "12") -> returns 12 (an int rather than str)

+        """

+

+        if value is None:

+            return None

+

+        default_value = self.data_labels[key].default

+        if default_value is None:

+            default_value = getattr(self, key, None)

+        if default_value is None:

+            return None

+

+        expected_type = type(default_value)

+        if expected_type == bool and value == "False":

+            value = False

+        else:

+            value = expected_type(value)

+

+        return value

+

+

 

 opts = Options()

 if os.path.exists(config_filename):

     opts.load(config_filename)

 

+settings_components = None

+"""assinged from ui.py, a mapping on setting anmes to gradio components repsponsible for those settings"""

+

 latent_upscale_default_mode = "Latent"

 latent_upscale_modes = {

     "Latent": {"mode": "bilinear", "antialias": False},