From dba573bf1a821b76325f1fb6fcc6919dba0a3550 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 23 Aug 2023 13:02:20 +0530 Subject: [PATCH] Show v3 engine selection even without beta --- ui/easydiffusion/runtime.py | 4 +--- ui/media/js/main.js | 2 +- ui/media/js/parameters.js | 17 ++++------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ui/easydiffusion/runtime.py b/ui/easydiffusion/runtime.py index 8d2f0186..38c56e40 100644 --- a/ui/easydiffusion/runtime.py +++ b/ui/easydiffusion/runtime.py @@ -30,9 +30,7 @@ def init(device): from easydiffusion import app app_config = app.getConfig() - context.test_diffusers = ( - app_config.get("test_diffusers", True) and app_config.get("update_branch", "main") != "main" - ) + context.test_diffusers = app_config.get("test_diffusers", True) log.info("Device usage during initialization:") get_device_usage(device, log_info=True, process_usage_only=False) diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 1ce88d4d..646226e5 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1306,7 +1306,7 @@ function getCurrentUserRequest() { function setEmbeddings(task) { let prompt = task.reqBody.prompt.toLowerCase() let negativePrompt = task.reqBody.negative_prompt.toLowerCase() - let overallPrompt = (prompt + " " + negativePrompt) + let overallPrompt = prompt + " " + negativePrompt let embeddingsTree = modelsOptions["embeddings"] let embeddings = [] diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 2209f286..fcbcf8a8 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -198,7 +198,8 @@ var PARAMETERS = [ id: "profileName", type: ParameterType.custom, label: "Profile Name", - note: "Name of the profile for model manager settings, e.g. thumbnails for embeddings. Use this to have different settings for different users.", + note: + "Name of the profile for model manager settings, e.g. thumbnails for embeddings. Use this to have different settings for different users.", render: (parameter) => { return `` }, @@ -452,8 +453,6 @@ async function getAppConfig() { if (config.update_branch === "beta") { useBetaChannelField.checked = true document.querySelector("#updateBranchLabel").innerText = "(beta)" - } else { - getParameterSettingsEntry("test_diffusers").classList.add("displayNone") } if (config.ui && config.ui.open_browser_on_start === false) { uiOpenBrowserOnStartField.checked = false @@ -465,14 +464,14 @@ async function getAppConfig() { listenPortField.value = config.net.listen_port } - let testDiffusersEnabled = config.update_branch !== "main" + let testDiffusersEnabled = true if (config.test_diffusers === false) { testDiffusersEnabled = false } testDiffusers.checked = testDiffusersEnabled if (config.config_on_startup) { - if (config.config_on_startup?.test_diffusers && config.update_branch !== "main") { + if (config.config_on_startup?.test_diffusers) { document.body.classList.add("diffusers-enabled-on-startup") document.body.classList.remove("diffusers-disabled-on-startup") } else { @@ -819,11 +818,3 @@ navigator.permissions.query({ name: "clipboard-write" }).then(function(result) { }) document.addEventListener("system_info_update", (e) => setDeviceInfo(e.detail)) - -useBetaChannelField.addEventListener("change", (e) => { - if (e.target.checked) { - getParameterSettingsEntry("test_diffusers").classList.remove("displayNone") - } else { - getParameterSettingsEntry("test_diffusers").classList.add("displayNone") - } -})