Merge pull request #1379 from easydiffusion/yaml-legacy-path

Handle the legacy yaml config path

CHANGES.md

@@ -22,6 +22,11 @@
 Our focus continues to remain on an easy installation experience, and an easy user-interface. While still remaining pretty powerful, in terms of features and speed.
 
 ### Detailed changelog
+* 2.5.41 - 24 Jun 2023 - (beta-only) Fix broken inpainting in low VRAM usage mode.
+* 2.5.41 - 24 Jun 2023 - (beta-only) Fix a recent regression where the LoRA would not get applied when changing SD models.
+* 2.5.41 - 23 Jun 2023 - Fix a regression where latent upscaler stopped working on PCs without a graphics card.
+* 2.5.41 - 20 Jun 2023 - Automatically fix black images if fp32 attention precision is required in diffusers.
+* 2.5.41 - 19 Jun 2023 - Another fix for multi-gpu rendering (in all VRAM usage modes).
 * 2.5.41 - 13 Jun 2023 - Fix multi-gpu bug with "low" VRAM usage mode while generating images.
 * 2.5.41 - 12 Jun 2023 - Fix multi-gpu bug with CodeFormer.
 * 2.5.41 - 6 Jun 2023 - Allow changing the strength of CodeFormer, and slightly improved styling of the CodeFormer options.

scripts/check_modules.py

@@ -18,7 +18,7 @@ os_name = platform.system()
 modules_to_check = {
     "torch": ("1.11.0", "1.13.1", "2.0.0"),
     "torchvision": ("0.12.0", "0.14.1", "0.15.1"),
-    "sdkit": "1.0.106",
+    "sdkit": "1.0.112",
     "stable-diffusion-sdkit": "2.1.4",
     "rich": "12.6.0",
     "uvicorn": "0.19.0",

scripts/get_config.py

@@ -4,7 +4,7 @@ import sys
 
 # The config file is in the same directory as this script
 config_directory = os.path.dirname(__file__)
-config_yaml = os.path.join(config_directory, "config.yaml")
+# config_yaml = os.path.join(config_directory, "config.yaml")
 config_json = os.path.join(config_directory, "config.json")
 
 parser = argparse.ArgumentParser(description='Get values from config file')
@@ -16,15 +16,16 @@ parser.add_argument('key', metavar='key', nargs='+',
 args = parser.parse_args()
 
 
-if os.path.isfile(config_yaml):
-    import yaml
-    with open(config_yaml, 'r') as configfile:
-        try:
-            config = yaml.safe_load(configfile)
-        except Exception as e:
-            print(e, file=sys.stderr)
-            config = {}
-elif os.path.isfile(config_json):
+# if os.path.isfile(config_yaml):
+#     import yaml
+#     with open(config_yaml, 'r') as configfile:
+#         try:
+#             config = yaml.safe_load(configfile)
+#         except Exception as e:
+#             print(e, file=sys.stderr)
+#             config = {}
+# el
+if os.path.isfile(config_json):
     import json
     with open(config_json, 'r') as configfile:
         try:

ui/easydiffusion/app.py

@@ -100,7 +100,28 @@ def init():
 def getConfig(default_val=APP_CONFIG_DEFAULTS):
     try:
         config_json_path = os.path.join(CONFIG_DIR, "config.json")
-        if not os.path.exists(config_json_path):
+
+        # compatibility with upcoming yaml changes, switching from beta to main
+        config_yaml_path = os.path.join(CONFIG_DIR, "..", "config.yaml")
+
+        # migrate the old config yaml location
+        config_legacy_yaml = os.path.join(CONFIG_DIR, "config.yaml")
+        if os.path.isfile(config_legacy_yaml):
+            shutil.move(config_legacy_yaml, config_yaml_path)
+
+        if os.path.exists(config_yaml_path):
+            try:
+                import yaml
+
+                with open(config_yaml_path, "r", encoding="utf-8") as f:
+                    config = yaml.safe_load(f)
+
+                setConfig(config)  # save to config.json
+                os.remove(config_yaml_path)  # delete the yaml file
+            except:
+                log.warn(traceback.format_exc())
+                config = default_val
+        elif not os.path.exists(config_json_path):
             config = default_val
         else:
             with open(config_json_path, "r", encoding="utf-8") as f:

ui/media/js/parameters.js

@@ -664,7 +664,7 @@ saveSettingsBtn.addEventListener("click", function() {
         update_branch: updateBranch,
     }
 
-    Array.from(parametersTable.children).forEach((parameterRow) => {
+    document.querySelectorAll('#system-settings [data-setting-id]').forEach((parameterRow) => {
         if (parameterRow.dataset.saveInAppConfig === "true") {
             const parameterElement =
                 document.getElementById(parameterRow.dataset.settingId) ||