From db55064bb218842a14773d17a96edddd417d2835 Mon Sep 17 00:00:00 2001
From: Olivia Godone-Maresca <oliviagodonemaresca+github@gmail.com>
Date: Sun, 9 Jul 2023 16:54:25 -0400
Subject: [PATCH] Add Restart needed to diffusers-only fields if you enable
 diffusers then refresh without restarting EasyDiffusion

---
 ui/easydiffusion/app.py   | 15 ++++++++++++--
 ui/index.html             | 43 +++++++++++++++++++++++----------------
 ui/media/css/main.css     | 13 ++++++++++++
 ui/media/js/main.js       |  5 ++++-
 ui/media/js/parameters.js | 12 ++++++++++-
 5 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/ui/easydiffusion/app.py b/ui/easydiffusion/app.py
index 8e317d83..40a9792f 100644
--- a/ui/easydiffusion/app.py
+++ b/ui/easydiffusion/app.py
@@ -5,7 +5,7 @@ import shutil
 import socket
 import sys
 import traceback
-import shlex
+import copy
 from ruamel.yaml import YAML
 
 import urllib
@@ -102,7 +102,6 @@ def init_render_threads():
 
     update_render_threads()
 
-
 def getConfig(default_val=APP_CONFIG_DEFAULTS):
     config_yaml_path = os.path.join(CONFIG_DIR, "..", "config.yaml")
 
@@ -111,6 +110,11 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
     if os.path.isfile(config_legacy_yaml):
         shutil.move(config_legacy_yaml, config_yaml_path)
 
+    def set_default_config(config: dict):
+        if (getConfig.__config_on_startup is None):
+            getConfig.__config_on_startup = copy.deepcopy(config)
+        config["config_on_startup"] = getConfig.__config_on_startup
+
     if os.path.isfile(config_yaml_path):
         try:
             yaml = YAML()
@@ -126,9 +130,13 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
                     config["net"]["listen_to_network"] = os.getenv("SD_UI_BIND_IP") == "0.0.0.0"
                 else:
                     config["net"]["listen_to_network"] = True
+
+            set_default_config(config)
+
             return config
         except Exception as e:
             log.warn(traceback.format_exc())
+            set_default_config(default_val)
             return default_val
     else:
         try:
@@ -149,8 +157,11 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
             return getConfig(default_val)
         except Exception as e:
             log.warn(traceback.format_exc())
+            set_default_config(default_val)
             return default_val
 
+getConfig.__config_on_startup = None
+
 
 def setConfig(config):
     try:  # config.yaml
diff --git a/ui/index.html b/ui/index.html
index 47b05240..1ebde256 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -142,7 +142,7 @@
                     </td></tr>
                     <tr class="pl-5 displayNone" id="clip_skip_config">
                         <td><label for="clip_skip">Clip Skip:</label></td>
-                        <td>
+                        <td class="diffusers-restart-needed">
                             <input id="clip_skip" name="clip_skip" type="checkbox">
                             <a href="https://github.com/easydiffusion/easydiffusion/wiki/Clip-Skip" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Clip Skip</span></i></a>
                         </td>
@@ -227,12 +227,15 @@
                     <tr class="pl-5"><td><label for="num_inference_steps">Inference Steps:</label></td><td> <input id="num_inference_steps" name="num_inference_steps" size="4" value="25" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="11" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr id="prompt_strength_container" class="pl-5"><td><label for="prompt_strength_slider">Prompt Strength:</label></td><td> <input id="prompt_strength_slider" name="prompt_strength_slider" class="editor-slider" value="80" type="range" min="0" max="99"> <input id="prompt_strength" name="prompt_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td></tr>
-                    <tr id="lora_model_container" class="pl-5"><td><label for="lora_model">LoRA:</label></td><td>
-                        <input id="lora_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
-                    </td></tr>
+                    <tr id="lora_model_container" class="pl-5">
+                        <td><label for="lora_model">LoRA:</label></td>
+                        <td class="diffusers-restart-needed">
+                            <input id="lora_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
+                        </td>
+                    </tr>
                     <tr id="lora_alpha_container" class="pl-5">
                         <td><label for="lora_alpha_slider">LoRA Strength:</label></td>
-                        <td>
+                        <td class="diffusers-restart-needed">
                             <small>-2</small> <input id="lora_alpha_slider" name="lora_alpha_slider" class="editor-slider" value="50" type="range" min="-200" max="200"> <small>2</small> &nbsp;
                             <input id="lora_alpha" name="lora_alpha" size="4" pattern="^-?[0-9]*\.?[0-9]*$" onkeypress="preventNonNumericalInput(event)"><br/>
                         </td>
@@ -244,18 +247,24 @@
                         <td><label for="hypernetwork_strength_slider">Hypernetwork Strength:</label></td>
                         <td> <input id="hypernetwork_strength_slider" name="hypernetwork_strength_slider" class="editor-slider" value="100" type="range" min="0" max="100"> <input id="hypernetwork_strength" name="hypernetwork_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td>
                     </tr>
-                    <tr id="embeddings-container" class="pl-5 displayNone"><td><label for="embeddings-button">Embedding:</label></td><td>
-                        <button id="embeddings-button" class="tertiaryButton">Add embedding to prompt</button>
-                    </td></tr>
-                    <tr id="tiling_container" class="pl-5"><td><label for="tiling">Seamless Tiling:</label></td><td>
-                        <select id="tiling" name="tiling">
-                            <option value="none" selected>None</option>
-                            <option value="x">Horizontal</option>
-                            <option value="y">Vertical</option>
-                            <option value="xy">Both</option>
-                        </select>
-                        <a href="https://github.com/easydiffusion/easydiffusion/wiki/Seamless-Tiling" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Seamless Tiling</span></i></a>
-                    </td></tr>
+                    <tr id="embeddings-container" class="pl-5 displayNone">
+                        <td><label for="embeddings-button">Embedding:</label></td>
+                        <td class="diffusers-restart-needed">
+                            <button id="embeddings-button" class="tertiaryButton">Add embedding to prompt</button>
+                        </td>
+                    </tr>
+                    <tr id="tiling_container" class="pl-5">
+                        <td><label for="tiling">Seamless Tiling:</label></td>
+                        <td class="diffusers-restart-needed">
+                            <select id="tiling" name="tiling">
+                                <option value="none" selected>None</option>
+                                <option value="x">Horizontal</option>
+                                <option value="y">Vertical</option>
+                                <option value="xy">Both</option>
+                            </select>
+                            <a href="https://github.com/easydiffusion/easydiffusion/wiki/Seamless-Tiling" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Seamless Tiling</span></i></a>
+                        </td>
+                    </tr>
                     <tr class="pl-5"><td><label for="output_format">Output Format:</label></td><td>
                         <select id="output_format" name="output_format">
                             <option value="jpeg" selected>jpeg</option>
diff --git a/ui/media/css/main.css b/ui/media/css/main.css
index a6336dc4..54fe9774 100644
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@@ -1676,3 +1676,16 @@ body.wait-pause {
 #embeddings-list::-webkit-scrollbar-thumb {
   background: var(--background-color3);
 }
+
+.diffusers-disabled-on-startup .diffusers-restart-needed {
+    font-size: 0;
+}
+
+.diffusers-disabled-on-startup .diffusers-restart-needed * {
+    display: none;
+}
+
+.diffusers-disabled-on-startup .diffusers-restart-needed::after {
+    content: "Restart needed";
+    font-size: 10pt;
+}
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 5ebf76b5..83e80f4a 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -1851,7 +1851,10 @@ loraAlphaField.addEventListener("input", updateLoraAlphaSlider)
 updateLoraAlpha()
 
 function updateLoraAlphaContainer() {
-    document.querySelector("#lora_alpha_container").style.display = loraModelField.value === "" ? "none" : ""
+    const loraModelContainer = document.querySelector("#lora_model_container")
+    if (loraModelContainer && window.getComputedStyle(loraModelContainer).display !== "none") {
+        document.querySelector("#lora_alpha_container").style.display = loraModelField.value === "" ? "none" : ""
+    }
 }
 loraModelField.addEventListener("change", updateLoraAlphaContainer)
 updateLoraAlphaContainer()
diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js
index f8dc8066..b6f48d96 100644
--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@@ -3,7 +3,7 @@
  * @readonly
  * @enum {string}
  */
-var ParameterType = {
+ var ParameterType = {
     checkbox: "checkbox",
     select: "select",
     select_multiple: "select_multiple",
@@ -424,6 +424,16 @@ async function getAppConfig() {
         const testDiffusersEnabled = config.test_diffusers && config.update_branch !== "main"
         testDiffusers.checked = testDiffusersEnabled
 
+        if (config.config_on_startup) {
+            if (config.config_on_startup?.test_diffusers && config.update_branch !== "main") {
+                document.body.classList.add("diffusers-enabled-on-startup");
+                document.body.classList.remove("diffusers-disabled-on-startup");
+            } else {
+                document.body.classList.add("diffusers-disabled-on-startup");
+                document.body.classList.remove("diffusers-enabled-on-startup");
+            }
+        }
+
         if (!testDiffusersEnabled) {
             document.querySelector("#lora_model_container").style.display = "none"
             document.querySelector("#lora_alpha_container").style.display = "none"