Merge changes from dev

1 files changed, 28 insertions, 5 deletions

diff --git a/modules/options.py b/modules/options.py
index 4fead690..503b40e9 100644
--- a/modules/options.py
+++ b/modules/options.py
@@ -1,3 +1,4 @@
+import os

 import json

 import sys

 from dataclasses import dataclass

@@ -6,6 +7,7 @@ import gradio as gr
 

 from modules import errors

 from modules.shared_cmd_options import cmd_opts

+from modules.paths_internal import script_path

 

 

 class OptionInfo:

@@ -91,18 +93,35 @@ class Options:
 

         if self.data is not None:

             if key in self.data or key in self.data_labels:

+

+                # Check that settings aren't globally frozen

                 assert not cmd_opts.freeze_settings, "changing settings is disabled"

 

+                # Get the info related to the setting being changed

                 info = self.data_labels.get(key, None)

                 if info.do_not_save:

                     return

 

+                # Restrict component arguments

                 comp_args = info.component_args if info else None

                 if isinstance(comp_args, dict) and comp_args.get('visible', True) is False:

-                    raise RuntimeError(f"not possible to set {key} because it is restricted")

+                    raise RuntimeError(f"not possible to set '{key}' because it is restricted")

+

+                # Check that this section isn't frozen

+                if cmd_opts.freeze_settings_in_sections is not None:

+                    frozen_sections = list(map(str.strip, cmd_opts.freeze_settings_in_sections.split(','))) # Trim whitespace from section names

+                    section_key = info.section[0]

+                    section_name = info.section[1]

+                    assert section_key not in frozen_sections, f"not possible to set '{key}' because settings in section '{section_name}' ({section_key}) are frozen with --freeze-settings-in-sections"

+

+                # Check that this section of the settings isn't frozen

+                if cmd_opts.freeze_specific_settings is not None:

+                    frozen_keys = list(map(str.strip, cmd_opts.freeze_specific_settings.split(','))) # Trim whitespace from setting keys

+                    assert key not in frozen_keys, f"not possible to set '{key}' because this setting is frozen with --freeze-specific-settings"

 

+                # Check shorthand option which disables editing options in "saving-paths"

                 if cmd_opts.hide_ui_dir_config and key in self.restricted_opts:

-                    raise RuntimeError(f"not possible to set {key} because it is restricted")

+                    raise RuntimeError(f"not possible to set '{key}' because it is restricted with --hide_ui_dir_config")

 

                 self.data[key] = value

                 return

@@ -176,9 +195,13 @@ class Options:
         return type_x == type_y

 

     def load(self, filename):

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

-            self.data = json.load(file)

-

+        try:

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

+                self.data = json.load(file)

+        except Exception:

+            errors.report(f'\nCould not load settings\nThe config file "{filename}" is likely corrupted\nIt has been moved to the "tmp/config.json"\nReverting config to default\n\n''', exc_info=True)

+            os.replace(filename, os.path.join(script_path, "tmp", "config.json"))

+            self.data = {}

         # 1.6.0 VAE defaults

         if self.data.get('sd_vae_as_default') is not None and self.data.get('sd_vae_overrides_per_model_preferences') is None:

             self.data['sd_vae_overrides_per_model_preferences'] = not self.data.get('sd_vae_as_default')