From 0dbc19577039a186cfa2bcd280845b34b2bf172a Mon Sep 17 00:00:00 2001 From: JeLuF Date: Tue, 18 Jul 2023 18:37:14 +0200 Subject: [PATCH 01/39] Improve embedding readability --- ui/media/css/main.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 7506c46f..290b0acc 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1665,8 +1665,10 @@ body.wait-pause { } #embeddings-list button { - margin-top: 2px; - margin-bottom: 2px; + margin: 2px; + color: var(--button-color); + background: var(--button-text-color); + font-weight: 700; } #embeddings-list .collapsible { From 636c3e5c022e9b9521fd014643aea3ab86d0f38d Mon Sep 17 00:00:00 2001 From: JeLuF Date: Tue, 18 Jul 2023 18:39:49 +0200 Subject: [PATCH 02/39] restore hover --- ui/media/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 290b0acc..f6be52c5 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1670,6 +1670,10 @@ body.wait-pause { background: var(--button-text-color); font-weight: 700; } +#embeddings-list button:hover { + background: var(--accent-color); + color: var(--button-text-color); +} #embeddings-list .collapsible { background: var(--background-color3); From 192520eafe242995c5d89e4c9841ae54faed95bc Mon Sep 17 00:00:00 2001 From: Olivia Godone-Maresca Date: Fri, 21 Jul 2023 21:15:21 -0400 Subject: [PATCH 03/39] Fix SyntaxWarning on startup --- ui/easydiffusion/utils/save_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/easydiffusion/utils/save_utils.py b/ui/easydiffusion/utils/save_utils.py index 75d35dc8..7c9c2f67 100644 --- a/ui/easydiffusion/utils/save_utils.py +++ b/ui/easydiffusion/utils/save_utils.py @@ -215,7 +215,7 @@ def get_printable_request(req: GenerateImageRequest, task_data: TaskData): metadata[key] = req_metadata[key] elif key in task_data_metadata: metadata[key] = task_data_metadata[key] - elif key is "use_embedding_models" and using_diffusers: + elif key == "use_embedding_models" and using_diffusers: embeddings_extensions = {".pt", ".bin", ".safetensors"} def scan_directory(directory_path: str): used_embeddings = [] From ade0912ba106112bf69aa7248e49d9013d3f0e1e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Jul 2023 11:47:48 +0530 Subject: [PATCH 04/39] Fix for endlessly nesting config.yaml --- ui/easydiffusion/app.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/easydiffusion/app.py b/ui/easydiffusion/app.py index e3de614d..6020f03b 100644 --- a/ui/easydiffusion/app.py +++ b/ui/easydiffusion/app.py @@ -102,6 +102,7 @@ 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,9 +112,9 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS): shutil.move(config_legacy_yaml, config_yaml_path) def set_config_on_startup(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 getConfig.__test_diffusers_on_startup is None: + getConfig.__test_diffusers_on_startup = config.get("test_diffusers", False) + config["config_on_startup"] = {"test_diffusers": getConfig.__test_diffusers_on_startup} if os.path.isfile(config_yaml_path): try: @@ -160,7 +161,8 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS): set_config_on_startup(default_val) return default_val -getConfig.__config_on_startup = None + +getConfig.__test_diffusers_on_startup = None def setConfig(config): @@ -181,6 +183,8 @@ def setConfig(config): config = commented_config yaml.indent(mapping=2, sequence=4, offset=2) + del config["config_on_startup"] + try: f = open(config_yaml_path + ".tmp", "w", encoding="utf-8") yaml.dump(config, f) From 721ab8a0c7a8532124cb7b880724990f69ea1412 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Jul 2023 15:10:33 +0530 Subject: [PATCH 05/39] Silly error, don't delete a key if it doesn't exist --- ui/easydiffusion/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/easydiffusion/app.py b/ui/easydiffusion/app.py index 6020f03b..921886f1 100644 --- a/ui/easydiffusion/app.py +++ b/ui/easydiffusion/app.py @@ -183,7 +183,8 @@ def setConfig(config): config = commented_config yaml.indent(mapping=2, sequence=4, offset=2) - del config["config_on_startup"] + if "config_on_startup" in config: + del config["config_on_startup"] try: f = open(config_yaml_path + ".tmp", "w", encoding="utf-8") From 8857249b4833c900134e8620ddbac8154a648e52 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Jul 2023 18:22:13 +0530 Subject: [PATCH 06/39] sdkit 1.0.135 - fix broken inpainting models after the latest diffusers upgrade --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 03e50db0..1ab799d4 100644 --- a/scripts/check_modules.py +++ b/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.134", + "sdkit": "1.0.135", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From 158591bdcf6a9d469ade8e610843dea164dd2059 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Jul 2023 18:24:22 +0530 Subject: [PATCH 07/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 09af93d3..de11631c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.45 - 22 Jul 2023 - (beta-only) Fix the recently-broken inpainting models. * 2.5.45 - 16 Jul 2023 - (beta-only) Fix the image quality of LoRAs, which had degraded in v2.5.44. * 2.5.44 - 15 Jul 2023 - (beta-only) Support for multiple LoRA files. * 2.5.43 - 9 Jul 2023 - (beta-only) Support for loading Textual Inversion embeddings. You can find the option in the Image Settings panel. Thanks @JeLuf. From c402867d45eb68d8e12c3b6be2e4a16fb3d9d9aa Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 24 Jul 2023 16:36:34 +0530 Subject: [PATCH 08/39] Hide the samplers that won't be supported in the new diffusers version --- ui/index.html | 1 - ui/media/js/parameters.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/index.html b/ui/index.html index ea244f93..b03e11d6 100644 --- a/ui/index.html +++ b/ui/index.html @@ -171,7 +171,6 @@ - diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index ded09206..461f71c2 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -446,7 +446,7 @@ async function getAppConfig() { document.querySelector("#tiling_container").style.display = "" document.querySelectorAll("#sampler_name option.k_diffusion-only").forEach((option) => { - option.disabled = true + option.style.display = "none" }) document.querySelector("#clip_skip_config").classList.remove("displayNone") document.querySelector("#embeddings-button").classList.remove("displayNone") From cba1cfbbef9bf453e1f30b943c8fa718ae4969b3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 24 Jul 2023 16:38:16 +0530 Subject: [PATCH 09/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index de11631c..f0a2f691 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.45 - 24 Jul 2023 - (beta-only) Hide the samplers that won't be supported in the new diffusers version. * 2.5.45 - 22 Jul 2023 - (beta-only) Fix the recently-broken inpainting models. * 2.5.45 - 16 Jul 2023 - (beta-only) Fix the image quality of LoRAs, which had degraded in v2.5.44. * 2.5.44 - 15 Jul 2023 - (beta-only) Support for multiple LoRA files. From 357ab9596e5221bf4ad2e501132f7335ce04c286 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 24 Jul 2023 16:38:45 +0530 Subject: [PATCH 10/39] formatting --- ui/media/js/parameters.js | 57 +++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 461f71c2..ea273b88 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -240,7 +240,7 @@ var PARAMETERS = [ icon: ["fa-brands", "fa-cloudflare"], render: () => '', table: networkParametersTable, - } + }, ] function getParameterSettingsEntry(id) { @@ -315,7 +315,7 @@ function initParameters(parameters) { noteElements.push(noteElement) } - if (typeof(parameter.icon) == "string") { + if (typeof parameter.icon == "string") { parameter.icon = [parameter.icon] } const icon = parameter.icon ? [createElement("i", undefined, ["fa", ...parameter.icon])] : [] @@ -342,7 +342,7 @@ function initParameters(parameters) { let p = parametersTable if (parameter.table) { p = parameter.table - } + } p.appendChild(newrow) parameter.settingsEntry = newrow @@ -426,11 +426,11 @@ async function getAppConfig() { 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"); + 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"); + document.body.classList.add("diffusers-disabled-on-startup") + document.body.classList.remove("diffusers-enabled-on-startup") } } @@ -674,7 +674,7 @@ saveSettingsBtn.addEventListener("click", function() { update_branch: updateBranch, } - document.querySelectorAll('#system-settings [data-setting-id]').forEach((parameterRow) => { + document.querySelectorAll("#system-settings [data-setting-id]").forEach((parameterRow) => { if (parameterRow.dataset.saveInAppConfig === "true") { const parameterElement = document.getElementById(parameterRow.dataset.settingId) || @@ -713,28 +713,33 @@ saveSettingsBtn.addEventListener("click", function() { Promise.all([savePromise, asyncDelay(300)]).then(() => saveSettingsBtn.classList.remove("active")) }) -listenToNetworkField.addEventListener("change", debounce( ()=>{ - saveSettingsBtn.click() -}, 1000)) +listenToNetworkField.addEventListener( + "change", + debounce(() => { + saveSettingsBtn.click() + }, 1000) +) -listenPortField.addEventListener("change", debounce( ()=>{ - saveSettingsBtn.click() -}, 1000)) +listenPortField.addEventListener( + "change", + debounce(() => { + saveSettingsBtn.click() + }, 1000) +) let copyCloudflareAddressBtn = document.querySelector("#copy-cloudflare-address") let cloudflareAddressField = document.getElementById("cloudflare-address") -navigator.permissions.query({ name: "clipboard-write" }).then(function (result) { - if (result.state === "granted") { - // you can read from the clipboard - copyCloudflareAddressBtn.addEventListener("click", (e) => { - navigator.clipboard.writeText(cloudflareAddressField.innerHTML) - showToast("Copied server address to clipboard") - }) - } else { - copyCloudflareAddressBtn.classList.add("displayNone") - } -}); - +navigator.permissions.query({ name: "clipboard-write" }).then(function(result) { + if (result.state === "granted") { + // you can read from the clipboard + copyCloudflareAddressBtn.addEventListener("click", (e) => { + navigator.clipboard.writeText(cloudflareAddressField.innerHTML) + showToast("Copied server address to clipboard") + }) + } else { + copyCloudflareAddressBtn.classList.add("displayNone") + } +}) document.addEventListener("system_info_update", (e) => setDeviceInfo(e.detail)) From a8ed1ebf52216a69e4ab57226d3792a742a6f770 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 24 Jul 2023 16:41:35 +0530 Subject: [PATCH 11/39] sdkit 1.0.136 - unify unipc tu and tu2, don't reuse sampler instances between image generation to avoid image artifacts --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 1ab799d4..de0cf633 100644 --- a/scripts/check_modules.py +++ b/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.135", + "sdkit": "1.0.136", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From b408fc7cd2c62516c22733defe6872adf6e97a85 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 24 Jul 2023 19:59:57 +0530 Subject: [PATCH 12/39] sdkit 1.0.137 - Fix DPM single step solver with non-unique timesteps --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index de0cf633..850a4d79 100644 --- a/scripts/check_modules.py +++ b/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.136", + "sdkit": "1.0.137", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From 7b5e2b4a1217a100126b98c0cef397eab90e598f Mon Sep 17 00:00:00 2001 From: JeLuF Date: Tue, 25 Jul 2023 04:09:30 +0200 Subject: [PATCH 13/39] Display Test Diffusers checkbox when enabling beta (#1430) * Display Test Diffusers checkbox when enabling beta * remove debug --- ui/media/css/auto-save.css | 3 ++- ui/media/js/parameters.js | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/media/css/auto-save.css b/ui/media/css/auto-save.css index 119a7e10..94790740 100644 --- a/ui/media/css/auto-save.css +++ b/ui/media/css/auto-save.css @@ -78,6 +78,7 @@ border-bottom-right-radius: 12px; } -.parameters-table .fa-fire { +.parameters-table .fa-fire, +.parameters-table .fa-bolt { color: #F7630C; } diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index ea273b88..60f053b9 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -409,7 +409,7 @@ async function getAppConfig() { useBetaChannelField.checked = true document.querySelector("#updateBranchLabel").innerText = "(beta)" } else { - getParameterSettingsEntry("test_diffusers").style.display = "none" + getParameterSettingsEntry("test_diffusers").classList.add("displayNone") } if (config.ui && config.ui.open_browser_on_start === false) { uiOpenBrowserOnStartField.checked = false @@ -743,3 +743,11 @@ 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') + } +}) From 0b054b58d417e623a8e2f9567f45eadbf93bc8dc Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Jul 2023 15:35:43 +0530 Subject: [PATCH 14/39] sdkit 1.0.139 - SD-XL full support, diffusers 0.19.0, compel 2.0.0 --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 850a4d79..6a9fca80 100644 --- a/scripts/check_modules.py +++ b/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.137", + "sdkit": "1.0.139", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From de3b43647a10bed8f6f755caa0f29f0adf922175 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Jul 2023 15:38:10 +0530 Subject: [PATCH 15/39] changelog --- CHANGES.md | 1 + ui/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f0a2f691..19c175ce 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.46 - 27 Jul 2023 - (beta-only) Full support for SD-XL models (base and refiner)! * 2.5.45 - 24 Jul 2023 - (beta-only) Hide the samplers that won't be supported in the new diffusers version. * 2.5.45 - 22 Jul 2023 - (beta-only) Fix the recently-broken inpainting models. * 2.5.45 - 16 Jul 2023 - (beta-only) Fix the image quality of LoRAs, which had degraded in v2.5.44. diff --git a/ui/index.html b/ui/index.html index b03e11d6..c0e5e635 100644 --- a/ui/index.html +++ b/ui/index.html @@ -31,7 +31,7 @@

Easy Diffusion - v2.5.45 + v2.5.46

From 064a55f587968e3356cb11739aef86b2a308c0b3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Jul 2023 16:50:58 +0530 Subject: [PATCH 16/39] sdkit 1.0.140 - fix broken gfpgan and realesrgan --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 6a9fca80..01b25160 100644 --- a/scripts/check_modules.py +++ b/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.139", + "sdkit": "1.0.140", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From d118443a944f36b5086e36a203ff3f1f487e71d0 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Jul 2023 17:34:41 +0530 Subject: [PATCH 17/39] sdkit 1.0.141 - allow sdxl vae --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 01b25160..4490c3da 100644 --- a/scripts/check_modules.py +++ b/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.140", + "sdkit": "1.0.141", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From b93c624efa1b69cc778ccad5bcb11e60a0ce1a67 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 27 Jul 2023 17:51:52 +0530 Subject: [PATCH 18/39] sdkit 1.0.142 - fix live preview for sdxl --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 4490c3da..a285685f 100644 --- a/scripts/check_modules.py +++ b/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.141", + "sdkit": "1.0.142", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From e61549e0cddb4022880f8fa3009166548cc4ef31 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 28 Jul 2023 18:57:28 +0530 Subject: [PATCH 19/39] Mega refactor of the task processing and rendering logic; Split filter into a separate task, and add support for running filter tasks individually; Change the format for sending model and filter data from the API, but maintain backwards compatibility for now with the old API --- ui/easydiffusion/model_manager.py | 79 ++----- ui/easydiffusion/runtime.py | 53 +++++ ui/easydiffusion/server.py | 62 +++++- ui/easydiffusion/task_manager.py | 144 ++++--------- ui/easydiffusion/tasks/__init__.py | 3 + ui/easydiffusion/tasks/filter_images.py | 110 ++++++++++ .../{renderer.py => tasks/render_images.py} | 195 +++++++++--------- ui/easydiffusion/tasks/task.py | 47 +++++ ui/easydiffusion/types.py | 156 +++++++++++++- ui/easydiffusion/utils/save_utils.py | 54 +++-- ui/media/js/engine.js | 23 ++- 11 files changed, 626 insertions(+), 300 deletions(-) create mode 100644 ui/easydiffusion/runtime.py create mode 100644 ui/easydiffusion/tasks/__init__.py create mode 100644 ui/easydiffusion/tasks/filter_images.py rename ui/easydiffusion/{renderer.py => tasks/render_images.py} (54%) create mode 100644 ui/easydiffusion/tasks/task.py diff --git a/ui/easydiffusion/model_manager.py b/ui/easydiffusion/model_manager.py index bdecc109..1ee5ce9d 100644 --- a/ui/easydiffusion/model_manager.py +++ b/ui/easydiffusion/model_manager.py @@ -5,7 +5,7 @@ import traceback from typing import Union from easydiffusion import app -from easydiffusion.types import TaskData +from easydiffusion.types import ModelsData from easydiffusion.utils import log from sdkit import Context from sdkit.models import load_model, scan_model, unload_model, download_model, get_model_info_from_db @@ -57,7 +57,9 @@ def init(): def load_default_models(context: Context): - set_vram_optimizations(context) + from easydiffusion import runtime + + runtime.set_vram_optimizations(context) config = app.getConfig() context.embeddings_path = os.path.join(app.MODELS_DIR, "embeddings") @@ -138,43 +140,32 @@ def resolve_model_to_use_single(model_name: str = None, model_type: str = None, raise Exception(f"Could not find the desired model {model_name}! Is it present in the {model_dir} folder?") -def reload_models_if_necessary(context: Context, task_data: TaskData): - face_fix_lower = task_data.use_face_correction.lower() if task_data.use_face_correction else "" - upscale_lower = task_data.use_upscale.lower() if task_data.use_upscale else "" - - model_paths_in_req = { - "stable-diffusion": task_data.use_stable_diffusion_model, - "vae": task_data.use_vae_model, - "hypernetwork": task_data.use_hypernetwork_model, - "codeformer": task_data.use_face_correction if "codeformer" in face_fix_lower else None, - "gfpgan": task_data.use_face_correction if "gfpgan" in face_fix_lower else None, - "realesrgan": task_data.use_upscale if "realesrgan" in upscale_lower else None, - "latent_upscaler": True if "latent_upscaler" in upscale_lower else None, - "nsfw_checker": True if task_data.block_nsfw else None, - "lora": task_data.use_lora_model, - } +def reload_models_if_necessary(context: Context, models_data: ModelsData, models_to_force_reload: list = []): models_to_reload = { model_type: path - for model_type, path in model_paths_in_req.items() + for model_type, path in models_data.model_paths.items() if context.model_paths.get(model_type) != path } - if task_data.codeformer_upscale_faces: + if models_data.model_paths.get("codeformer"): if "realesrgan" not in models_to_reload and "realesrgan" not in context.models: default_realesrgan = DEFAULT_MODELS["realesrgan"][0]["file_name"] models_to_reload["realesrgan"] = resolve_model_to_use(default_realesrgan, "realesrgan") elif "realesrgan" in models_to_reload and models_to_reload["realesrgan"] is None: del models_to_reload["realesrgan"] # don't unload realesrgan - if set_vram_optimizations(context) or set_clip_skip(context, task_data): # reload SD - models_to_reload["stable-diffusion"] = model_paths_in_req["stable-diffusion"] + for model_type in models_to_force_reload: + if model_type not in models_data.model_paths: + continue + models_to_reload[model_type] = models_data.model_paths[model_type] for model_type, model_path_in_req in models_to_reload.items(): context.model_paths[model_type] = model_path_in_req action_fn = unload_model if context.model_paths[model_type] is None else load_model + extra_params = models_data.model_params.get(model_type, {}) try: - action_fn(context, model_type, scan_model=False) # we've scanned them already + action_fn(context, model_type, scan_model=False, **extra_params) # we've scanned them already if model_type in context.model_load_errors: del context.model_load_errors[model_type] except Exception as e: @@ -183,24 +174,15 @@ def reload_models_if_necessary(context: Context, task_data: TaskData): context.model_load_errors[model_type] = str(e) # storing the entire Exception can lead to memory leaks -def resolve_model_paths(task_data: TaskData): - task_data.use_stable_diffusion_model = resolve_model_to_use( - task_data.use_stable_diffusion_model, model_type="stable-diffusion" - ) - task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type="vae") - task_data.use_hypernetwork_model = resolve_model_to_use(task_data.use_hypernetwork_model, model_type="hypernetwork") - task_data.use_lora_model = resolve_model_to_use(task_data.use_lora_model, model_type="lora") - - if task_data.use_face_correction: - if "gfpgan" in task_data.use_face_correction.lower(): - model_type = "gfpgan" - elif "codeformer" in task_data.use_face_correction.lower(): - model_type = "codeformer" +def resolve_model_paths(models_data: ModelsData): + model_paths = models_data.model_paths + for model_type in model_paths: + if model_type in ("latent_upscaler", "nsfw_checker"): # doesn't use model paths + continue + if model_type == "codeformer": download_if_necessary("codeformer", "codeformer.pth", "codeformer-0.1.0") - task_data.use_face_correction = resolve_model_to_use(task_data.use_face_correction, model_type) - if task_data.use_upscale and "realesrgan" in task_data.use_upscale.lower(): - task_data.use_upscale = resolve_model_to_use(task_data.use_upscale, "realesrgan") + model_paths[model_type] = resolve_model_to_use(model_paths[model_type], model_type=model_type) def fail_if_models_did_not_load(context: Context): @@ -235,17 +217,6 @@ def download_if_necessary(model_type: str, file_name: str, model_id: str): download_model(model_type, model_id, download_base_dir=app.MODELS_DIR) -def set_vram_optimizations(context: Context): - config = app.getConfig() - vram_usage_level = config.get("vram_usage_level", "balanced") - - if vram_usage_level != context.vram_usage_level: - context.vram_usage_level = vram_usage_level - return True - - return False - - def migrate_legacy_model_location(): 'Move the models inside the legacy "stable-diffusion" folder, to their respective folders' @@ -266,16 +237,6 @@ def any_model_exists(model_type: str) -> bool: return False -def set_clip_skip(context: Context, task_data: TaskData): - clip_skip = task_data.clip_skip - - if clip_skip != context.clip_skip: - context.clip_skip = clip_skip - return True - - return False - - def make_model_folders(): for model_type in KNOWN_MODEL_TYPES: model_dir_path = os.path.join(app.MODELS_DIR, model_type) diff --git a/ui/easydiffusion/runtime.py b/ui/easydiffusion/runtime.py new file mode 100644 index 00000000..4098ee8e --- /dev/null +++ b/ui/easydiffusion/runtime.py @@ -0,0 +1,53 @@ +""" +A runtime that runs on a specific device (in a thread). + +It can run various tasks like image generation, image filtering, model merge etc by using that thread-local context. + +This creates an `sdkit.Context` that's bound to the device specified while calling the `init()` function. +""" + +from easydiffusion import device_manager +from easydiffusion.utils import log +from sdkit import Context +from sdkit.utils import get_device_usage + +context = Context() # thread-local +""" +runtime data (bound locally to this thread), for e.g. device, references to loaded models, optimization flags etc +""" + + +def init(device): + """ + Initializes the fields that will be bound to this runtime's context, and sets the current torch device + """ + context.stop_processing = False + context.temp_images = {} + context.partial_x_samples = None + context.model_load_errors = {} + context.enable_codeformer = True + + from easydiffusion import app + + app_config = app.getConfig() + context.test_diffusers = ( + app_config.get("test_diffusers", False) and app_config.get("update_branch", "main") != "main" + ) + + log.info("Device usage during initialization:") + get_device_usage(device, log_info=True, process_usage_only=False) + + device_manager.device_init(context, device) + + +def set_vram_optimizations(context: Context): + from easydiffusion import app + + config = app.getConfig() + vram_usage_level = config.get("vram_usage_level", "balanced") + + if vram_usage_level != context.vram_usage_level: + context.vram_usage_level = vram_usage_level + return True + + return False diff --git a/ui/easydiffusion/server.py b/ui/easydiffusion/server.py index df788b0c..0f1890c3 100644 --- a/ui/easydiffusion/server.py +++ b/ui/easydiffusion/server.py @@ -9,7 +9,16 @@ import traceback from typing import List, Union from easydiffusion import app, model_manager, task_manager -from easydiffusion.types import GenerateImageRequest, MergeRequest, TaskData +from easydiffusion.tasks import RenderTask, FilterTask +from easydiffusion.types import ( + GenerateImageRequest, + FilterImageRequest, + MergeRequest, + TaskData, + ModelsData, + OutputFormatData, + convert_legacy_render_req_to_new, +) from easydiffusion.utils import log from fastapi import FastAPI, HTTPException from fastapi.staticfiles import StaticFiles @@ -97,6 +106,10 @@ def init(): def render(req: dict): return render_internal(req) + @server_api.post("/filter") + def render(req: dict): + return filter_internal(req) + @server_api.post("/model/merge") def model_merge(req: dict): print(req) @@ -228,9 +241,13 @@ def ping_internal(session_id: str = None): def render_internal(req: dict): try: + req = convert_legacy_render_req_to_new(req) + # separate out the request data into rendering and task-specific data render_req: GenerateImageRequest = GenerateImageRequest.parse_obj(req) task_data: TaskData = TaskData.parse_obj(req) + models_data: ModelsData = ModelsData.parse_obj(req) + output_format: OutputFormatData = OutputFormatData.parse_obj(req) # Overwrite user specified save path config = app.getConfig() @@ -240,28 +257,53 @@ def render_internal(req: dict): render_req.init_image_mask = req.get("mask") # hack: will rename this in the HTTP API in a future revision app.save_to_config( - task_data.use_stable_diffusion_model, - task_data.use_vae_model, - task_data.use_hypernetwork_model, + models_data.model_paths.get("stable-diffusion"), + models_data.model_paths.get("vae"), + models_data.model_paths.get("hypernetwork"), task_data.vram_usage_level, ) # enqueue the task - new_task = task_manager.render(render_req, task_data) + task = RenderTask(render_req, task_data, models_data, output_format) + return enqueue_task(task) + except HTTPException as e: + raise e + except Exception as e: + log.error(traceback.format_exc()) + raise HTTPException(status_code=500, detail=str(e)) + + +def filter_internal(req: dict): + try: + session_id = req.get("session_id", "session") + filter_req: FilterImageRequest = FilterImageRequest.parse_obj(req) + models_data: ModelsData = ModelsData.parse_obj(req) + output_format: OutputFormatData = OutputFormatData.parse_obj(req) + + # enqueue the task + task = FilterTask(filter_req, session_id, models_data, output_format) + return enqueue_task(task) + except HTTPException as e: + raise e + except Exception as e: + log.error(traceback.format_exc()) + raise HTTPException(status_code=500, detail=str(e)) + + +def enqueue_task(task): + try: + task_manager.enqueue_task(task) response = { "status": str(task_manager.current_state), "queue": len(task_manager.tasks_queue), - "stream": f"/image/stream/{id(new_task)}", - "task": id(new_task), + "stream": f"/image/stream/{task.id}", + "task": task.id, } return JSONResponse(response, headers=NOCACHE_HEADERS) except ChildProcessError as e: # Render thread is dead raise HTTPException(status_code=500, detail=f"Rendering thread has died.") # HTTP500 Internal Server Error except ConnectionRefusedError as e: # Unstarted task pending limit reached, deny queueing too many. raise HTTPException(status_code=503, detail=str(e)) # HTTP503 Service Unavailable - except Exception as e: - log.error(traceback.format_exc()) - raise HTTPException(status_code=500, detail=str(e)) def model_merge_internal(req: dict): diff --git a/ui/easydiffusion/task_manager.py b/ui/easydiffusion/task_manager.py index a91cd9c6..27b53b6f 100644 --- a/ui/easydiffusion/task_manager.py +++ b/ui/easydiffusion/task_manager.py @@ -17,7 +17,7 @@ from typing import Any, Hashable import torch from easydiffusion import device_manager -from easydiffusion.types import GenerateImageRequest, TaskData +from easydiffusion.tasks import Task from easydiffusion.utils import log from sdkit.utils import gc @@ -27,6 +27,7 @@ LOCK_TIMEOUT = 15 # Maximum locking time in seconds before failing a task. # It's better to get an exception than a deadlock... ALWAYS use timeout in critical paths. DEVICE_START_TIMEOUT = 60 # seconds - Maximum time to wait for a render device to init. +MAX_OVERLOAD_ALLOWED_RATIO = 2 # i.e. 2x pending tasks compared to the number of render threads class SymbolClass(type): # Print nicely formatted Symbol names. @@ -58,46 +59,6 @@ class ServerStates: pass -class RenderTask: # Task with output queue and completion lock. - def __init__(self, req: GenerateImageRequest, task_data: TaskData): - task_data.request_id = id(self) - self.render_request: GenerateImageRequest = req # Initial Request - self.task_data: TaskData = task_data - self.response: Any = None # Copy of the last reponse - self.render_device = None # Select the task affinity. (Not used to change active devices). - self.temp_images: list = [None] * req.num_outputs * (1 if task_data.show_only_filtered_image else 2) - self.error: Exception = None - self.lock: threading.Lock = threading.Lock() # Locks at task start and unlocks when task is completed - self.buffer_queue: queue.Queue = queue.Queue() # Queue of JSON string segments - - async def read_buffer_generator(self): - try: - while not self.buffer_queue.empty(): - res = self.buffer_queue.get(block=False) - self.buffer_queue.task_done() - yield res - except queue.Empty as e: - yield - - @property - def status(self): - if self.lock.locked(): - return "running" - if isinstance(self.error, StopAsyncIteration): - return "stopped" - if self.error: - return "error" - if not self.buffer_queue.empty(): - return "buffer" - if self.response: - return "completed" - return "pending" - - @property - def is_pending(self): - return bool(not self.response and not self.error) - - # Temporary cache to allow to query tasks results for a short time after they are completed. class DataCache: def __init__(self): @@ -123,8 +84,8 @@ class DataCache: # Remove Items for key in to_delete: (_, val) = self._base[key] - if isinstance(val, RenderTask): - log.debug(f"RenderTask {key} expired. Data removed.") + if isinstance(val, Task): + log.debug(f"Task {key} expired. Data removed.") elif isinstance(val, SessionState): log.debug(f"Session {key} expired. Data removed.") else: @@ -220,8 +181,8 @@ class SessionState: tasks.append(task) return tasks - def put(self, task, ttl=TASK_TTL): - task_id = id(task) + def put(self, task: Task, ttl=TASK_TTL): + task_id = task.id self._tasks_ids.append(task_id) if not task_cache.put(task_id, task, ttl): return False @@ -230,11 +191,16 @@ class SessionState: return True +def keep_task_alive(task: Task): + task_cache.keep(task.id, TASK_TTL) + session_cache.keep(task.session_id, TASK_TTL) + + def thread_get_next_task(): - from easydiffusion import renderer + from easydiffusion import runtime if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): - log.warn(f"Render thread on device: {renderer.context.device} failed to acquire manager lock.") + log.warn(f"Render thread on device: {runtime.context.device} failed to acquire manager lock.") return None if len(tasks_queue) <= 0: manager_lock.release() @@ -242,7 +208,7 @@ def thread_get_next_task(): task = None try: # Select a render task. for queued_task in tasks_queue: - if queued_task.render_device and renderer.context.device != queued_task.render_device: + if queued_task.render_device and runtime.context.device != queued_task.render_device: # Is asking for a specific render device. if is_alive(queued_task.render_device) > 0: continue # requested device alive, skip current one. @@ -251,7 +217,7 @@ def thread_get_next_task(): queued_task.error = Exception(queued_task.render_device + " is not currently active.") task = queued_task break - if not queued_task.render_device and renderer.context.device == "cpu" and is_alive() > 1: + if not queued_task.render_device and runtime.context.device == "cpu" and is_alive() > 1: # not asking for any specific devices, cpu want to grab task but other render devices are alive. continue # Skip Tasks, don't run on CPU unless there is nothing else or user asked for it. task = queued_task @@ -266,19 +232,19 @@ def thread_get_next_task(): def thread_render(device): global current_state, current_state_error - from easydiffusion import model_manager, renderer + from easydiffusion import model_manager, runtime try: - renderer.init(device) + runtime.init(device) weak_thread_data[threading.current_thread()] = { - "device": renderer.context.device, - "device_name": renderer.context.device_name, + "device": runtime.context.device, + "device_name": runtime.context.device_name, "alive": True, } current_state = ServerStates.LoadingModel - model_manager.load_default_models(renderer.context) + model_manager.load_default_models(runtime.context) current_state = ServerStates.Online except Exception as e: @@ -290,8 +256,8 @@ def thread_render(device): session_cache.clean() task_cache.clean() if not weak_thread_data[threading.current_thread()]["alive"]: - log.info(f"Shutting down thread for device {renderer.context.device}") - model_manager.unload_all(renderer.context) + log.info(f"Shutting down thread for device {runtime.context.device}") + model_manager.unload_all(runtime.context) return if isinstance(current_state_error, SystemExit): current_state = ServerStates.Unavailable @@ -311,62 +277,31 @@ def thread_render(device): task.response = {"status": "failed", "detail": str(task.error)} task.buffer_queue.put(json.dumps(task.response)) continue - log.info(f"Session {task.task_data.session_id} starting task {id(task)} on {renderer.context.device_name}") + log.info(f"Session {task.session_id} starting task {task.id} on {runtime.context.device_name}") if not task.lock.acquire(blocking=False): raise Exception("Got locked task from queue.") try: + task.run() - def step_callback(): - global current_state_error - - task_cache.keep(id(task), TASK_TTL) - session_cache.keep(task.task_data.session_id, TASK_TTL) - - if ( - isinstance(current_state_error, SystemExit) - or isinstance(current_state_error, StopAsyncIteration) - or isinstance(task.error, StopAsyncIteration) - ): - renderer.context.stop_processing = True - if isinstance(current_state_error, StopAsyncIteration): - task.error = current_state_error - current_state_error = None - log.info(f"Session {task.task_data.session_id} sent cancel signal for task {id(task)}") - - current_state = ServerStates.LoadingModel - model_manager.resolve_model_paths(task.task_data) - model_manager.reload_models_if_necessary(renderer.context, task.task_data) - model_manager.fail_if_models_did_not_load(renderer.context) - - current_state = ServerStates.Rendering - task.response = renderer.make_images( - task.render_request, - task.task_data, - task.buffer_queue, - task.temp_images, - step_callback, - ) # Before looping back to the generator, mark cache as still alive. - task_cache.keep(id(task), TASK_TTL) - session_cache.keep(task.task_data.session_id, TASK_TTL) + keep_task_alive(task) except Exception as e: task.error = str(e) task.response = {"status": "failed", "detail": str(task.error)} task.buffer_queue.put(json.dumps(task.response)) log.error(traceback.format_exc()) finally: - gc(renderer.context) + gc(runtime.context) task.lock.release() - task_cache.keep(id(task), TASK_TTL) - session_cache.keep(task.task_data.session_id, TASK_TTL) + + keep_task_alive(task) + if isinstance(task.error, StopAsyncIteration): - log.info(f"Session {task.task_data.session_id} task {id(task)} cancelled!") + log.info(f"Session {task.session_id} task {task.id} cancelled!") elif task.error is not None: - log.info(f"Session {task.task_data.session_id} task {id(task)} failed!") + log.info(f"Session {task.session_id} task {task.id} failed!") else: - log.info( - f"Session {task.task_data.session_id} task {id(task)} completed by {renderer.context.device_name}." - ) + log.info(f"Session {task.session_id} task {task.id} completed by {runtime.context.device_name}.") current_state = ServerStates.Online @@ -548,28 +483,27 @@ def shutdown_event(): # Signal render thread to close on shutdown current_state_error = SystemExit("Application shutting down.") -def render(render_req: GenerateImageRequest, task_data: TaskData): +def enqueue_task(task: Task): current_thread_count = is_alive() if current_thread_count <= 0: # Render thread is dead raise ChildProcessError("Rendering thread has died.") # Alive, check if task in cache - session = get_cached_session(task_data.session_id, update_ttl=True) + session = get_cached_session(task.session_id, update_ttl=True) pending_tasks = list(filter(lambda t: t.is_pending, session.tasks)) - if current_thread_count < len(pending_tasks): + if len(pending_tasks) > current_thread_count * MAX_OVERLOAD_ALLOWED_RATIO: raise ConnectionRefusedError( - f"Session {task_data.session_id} already has {len(pending_tasks)} pending tasks out of {current_thread_count}." + f"Session {task.session_id} already has {len(pending_tasks)} pending tasks, with {current_thread_count} workers." ) - new_task = RenderTask(render_req, task_data) - if session.put(new_task, TASK_TTL): + if session.put(task, TASK_TTL): # Use twice the normal timeout for adding user requests. # Tries to force session.put to fail before tasks_queue.put would. if manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT * 2): try: - tasks_queue.append(new_task) + tasks_queue.append(task) idle_event.set() - return new_task + return task finally: manager_lock.release() raise RuntimeError("Failed to add task to cache.") diff --git a/ui/easydiffusion/tasks/__init__.py b/ui/easydiffusion/tasks/__init__.py new file mode 100644 index 00000000..1d295da8 --- /dev/null +++ b/ui/easydiffusion/tasks/__init__.py @@ -0,0 +1,3 @@ +from .task import Task +from .render_images import RenderTask +from .filter_images import FilterTask diff --git a/ui/easydiffusion/tasks/filter_images.py b/ui/easydiffusion/tasks/filter_images.py new file mode 100644 index 00000000..c4e674d7 --- /dev/null +++ b/ui/easydiffusion/tasks/filter_images.py @@ -0,0 +1,110 @@ +import json +import pprint + +from sdkit.filter import apply_filters +from sdkit.models import load_model +from sdkit.utils import img_to_base64_str, log + +from easydiffusion import model_manager, runtime +from easydiffusion.types import FilterImageRequest, FilterImageResponse, ModelsData, OutputFormatData + +from .task import Task + + +class FilterTask(Task): + "For applying filters to input images" + + def __init__( + self, req: FilterImageRequest, session_id: str, models_data: ModelsData, output_format: OutputFormatData + ): + super().__init__(session_id) + + self.request = req + self.models_data = models_data + self.output_format = output_format + + # convert to multi-filter format, if necessary + if isinstance(req.filter, str): + req.filter_params = {req.filter: req.filter_params} + req.filter = [req.filter] + + if not isinstance(req.image, list): + req.image = [req.image] + + def run(self): + "Runs the image filtering task on the assigned thread" + + context = runtime.context + + model_manager.resolve_model_paths(self.models_data) + model_manager.reload_models_if_necessary(context, self.models_data) + model_manager.fail_if_models_did_not_load(context) + + print_task_info(self.request, self.models_data, self.output_format) + + images = filter_images(context, self.request.image, self.request.filter, self.request.filter_params) + + output_format = self.output_format + images = [ + img_to_base64_str( + img, output_format.output_format, output_format.output_quality, output_format.output_lossless + ) + for img in images + ] + + res = FilterImageResponse(self.request, self.models_data, images=images) + res = res.json() + self.buffer_queue.put(json.dumps(res)) + log.info("Filter task completed") + + self.response = res + + +def filter_images(context, images, filters, filter_params={}): + filters = filters if isinstance(filters, list) else [filters] + + for filter_name in filters: + params = filter_params.get(filter_name, {}) + + previous_state = before_filter(context, filter_name, params) + + try: + images = apply_filters(context, filter_name, images, **params) + finally: + after_filter(context, filter_name, params, previous_state) + + return images + + +def before_filter(context, filter_name, filter_params): + if filter_name == "codeformer": + from easydiffusion.model_manager import DEFAULT_MODELS, resolve_model_to_use + + default_realesrgan = DEFAULT_MODELS["realesrgan"][0]["file_name"] + prev_realesrgan_path = None + + upscale_faces = filter_params.get("upscale_faces", False) + if upscale_faces and default_realesrgan not in context.model_paths["realesrgan"]: + prev_realesrgan_path = context.model_paths.get("realesrgan") + context.model_paths["realesrgan"] = resolve_model_to_use(default_realesrgan, "realesrgan") + load_model(context, "realesrgan") + + return prev_realesrgan_path + + +def after_filter(context, filter_name, filter_params, previous_state): + if filter_name == "codeformer": + prev_realesrgan_path = previous_state + if prev_realesrgan_path: + context.model_paths["realesrgan"] = prev_realesrgan_path + load_model(context, "realesrgan") + + +def print_task_info(req: FilterImageRequest, models_data: ModelsData, output_format: OutputFormatData): + req_str = pprint.pformat({"filter": req.filter, "filter_params": req.filter_params}).replace("[", "\[") + models_data = pprint.pformat(models_data.dict()).replace("[", "\[") + output_format = pprint.pformat(output_format.dict()).replace("[", "\[") + + log.info(f"request: {req_str}") + log.info(f"models data: {models_data}") + log.info(f"output format: {output_format}") diff --git a/ui/easydiffusion/renderer.py b/ui/easydiffusion/tasks/render_images.py similarity index 54% rename from ui/easydiffusion/renderer.py rename to ui/easydiffusion/tasks/render_images.py index a57dfc6c..42bcc76a 100644 --- a/ui/easydiffusion/renderer.py +++ b/ui/easydiffusion/tasks/render_images.py @@ -3,70 +3,109 @@ import pprint import queue import time -from easydiffusion import device_manager -from easydiffusion.types import GenerateImageRequest +from easydiffusion import model_manager, runtime +from easydiffusion.types import GenerateImageRequest, ModelsData, OutputFormatData from easydiffusion.types import Image as ResponseImage -from easydiffusion.types import Response, TaskData, UserInitiatedStop -from easydiffusion.model_manager import DEFAULT_MODELS, resolve_model_to_use +from easydiffusion.types import GenerateImageResponse, TaskData, UserInitiatedStop from easydiffusion.utils import get_printable_request, log, save_images_to_disk -from sdkit import Context -from sdkit.filter import apply_filters from sdkit.generate import generate_images -from sdkit.models import load_model from sdkit.utils import ( diffusers_latent_samples_to_images, gc, img_to_base64_str, img_to_buffer, latent_samples_to_images, - get_device_usage, ) -context = Context() # thread-local -""" -runtime data (bound locally to this thread), for e.g. device, references to loaded models, optimization flags etc -""" +from .task import Task +from .filter_images import filter_images -def init(device): - """ - Initializes the fields that will be bound to this runtime's context, and sets the current torch device - """ - context.stop_processing = False - context.temp_images = {} - context.partial_x_samples = None - context.model_load_errors = {} - context.enable_codeformer = True +class RenderTask(Task): + "For image generation" - from easydiffusion import app + def __init__( + self, req: GenerateImageRequest, task_data: TaskData, models_data: ModelsData, output_format: OutputFormatData + ): + super().__init__(task_data.session_id) - app_config = app.getConfig() - context.test_diffusers = ( - app_config.get("test_diffusers", False) and app_config.get("update_branch", "main") != "main" - ) + task_data.request_id = self.id + self.render_request: GenerateImageRequest = req # Initial Request + self.task_data: TaskData = task_data + self.models_data = models_data + self.output_format = output_format + self.temp_images: list = [None] * req.num_outputs * (1 if task_data.show_only_filtered_image else 2) - log.info("Device usage during initialization:") - get_device_usage(device, log_info=True, process_usage_only=False) + def run(self): + "Runs the image generation task on the assigned thread" - device_manager.device_init(context, device) + from easydiffusion import task_manager + + context = runtime.context + + def step_callback(): + task_manager.keep_task_alive(self) + task_manager.current_state = task_manager.ServerStates.Rendering + + if isinstance(task_manager.current_state_error, (SystemExit, StopAsyncIteration)) or isinstance( + self.error, StopAsyncIteration + ): + context.stop_processing = True + if isinstance(task_manager.current_state_error, StopAsyncIteration): + self.error = task_manager.current_state_error + task_manager.current_state_error = None + log.info(f"Session {self.session_id} sent cancel signal for task {self.id}") + + task_manager.current_state = task_manager.ServerStates.LoadingModel + model_manager.resolve_model_paths(self.models_data) + + models_to_force_reload = [] + if runtime.set_vram_optimizations(context) or self.has_clip_skip_changed(context): + models_to_force_reload.append("stable-diffusion") + + model_manager.reload_models_if_necessary(context, self.models_data, models_to_force_reload) + model_manager.fail_if_models_did_not_load(context) + + task_manager.current_state = task_manager.ServerStates.Rendering + self.response = make_images( + context, + self.render_request, + self.task_data, + self.models_data, + self.output_format, + self.buffer_queue, + self.temp_images, + step_callback, + ) + + def has_clip_skip_changed(self, context): + if not context.test_diffusers: + return False + + model = context.models["stable-diffusion"] + new_clip_skip = self.models_data.model_params.get("stable-diffusion", {}).get("clip_skip", False) + return model["clip_skip"] != new_clip_skip def make_images( + context, req: GenerateImageRequest, task_data: TaskData, + models_data: ModelsData, + output_format: OutputFormatData, data_queue: queue.Queue, task_temp_images: list, step_callback, ): context.stop_processing = False - print_task_info(req, task_data) + print_task_info(req, task_data, models_data, output_format) - images, seeds = make_images_internal(req, task_data, data_queue, task_temp_images, step_callback) + images, seeds = make_images_internal( + context, req, task_data, models_data, output_format, data_queue, task_temp_images, step_callback + ) - res = Response( - req, - task_data, - images=construct_response(images, seeds, task_data, base_seed=req.seed), + res = GenerateImageResponse( + req, task_data, models_data, output_format, images=construct_response(images, seeds, output_format) ) res = res.json() data_queue.put(json.dumps(res)) @@ -75,21 +114,32 @@ def make_images( return res -def print_task_info(req: GenerateImageRequest, task_data: TaskData): - req_str = pprint.pformat(get_printable_request(req, task_data)).replace("[", "\[") +def print_task_info( + req: GenerateImageRequest, task_data: TaskData, models_data: ModelsData, output_format: OutputFormatData +): + req_str = pprint.pformat(get_printable_request(req, task_data, output_format)).replace("[", "\[") task_str = pprint.pformat(task_data.dict()).replace("[", "\[") + models_data = pprint.pformat(models_data.dict()).replace("[", "\[") + output_format = pprint.pformat(output_format.dict()).replace("[", "\[") + log.info(f"request: {req_str}") log.info(f"task data: {task_str}") + # log.info(f"models data: {models_data}") + log.info(f"output format: {output_format}") def make_images_internal( + context, req: GenerateImageRequest, task_data: TaskData, + models_data: ModelsData, + output_format: OutputFormatData, data_queue: queue.Queue, task_temp_images: list, step_callback, ): images, user_stopped = generate_images_internal( + context, req, task_data, data_queue, @@ -98,11 +148,14 @@ def make_images_internal( task_data.stream_image_progress, task_data.stream_image_progress_interval, ) + gc(context) - filtered_images = filter_images(req, task_data, images, user_stopped) + + filters, filter_params = task_data.filters, task_data.filter_params + filtered_images = filter_images(context, images, filters, filter_params) if not user_stopped else images if task_data.save_to_disk_path is not None: - save_images_to_disk(images, filtered_images, req, task_data) + save_images_to_disk(images, filtered_images, req, task_data, output_format) seeds = [*range(req.seed, req.seed + len(images))] if task_data.show_only_filtered_image or filtered_images is images: @@ -112,6 +165,7 @@ def make_images_internal( def generate_images_internal( + context, req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, @@ -123,6 +177,7 @@ def generate_images_internal( context.temp_images.clear() callback = make_step_callback( + context, req, task_data, data_queue, @@ -155,65 +210,14 @@ def generate_images_internal( return images, user_stopped -def filter_images(req: GenerateImageRequest, task_data: TaskData, images: list, user_stopped): - if user_stopped: - return images - - if task_data.block_nsfw: - images = apply_filters(context, "nsfw_checker", images) - - if task_data.use_face_correction and "codeformer" in task_data.use_face_correction.lower(): - default_realesrgan = DEFAULT_MODELS["realesrgan"][0]["file_name"] - prev_realesrgan_path = None - if task_data.codeformer_upscale_faces and default_realesrgan not in context.model_paths["realesrgan"]: - prev_realesrgan_path = context.model_paths["realesrgan"] - context.model_paths["realesrgan"] = resolve_model_to_use(default_realesrgan, "realesrgan") - load_model(context, "realesrgan") - - try: - images = apply_filters( - context, - "codeformer", - images, - upscale_faces=task_data.codeformer_upscale_faces, - codeformer_fidelity=task_data.codeformer_fidelity, - ) - finally: - if prev_realesrgan_path: - context.model_paths["realesrgan"] = prev_realesrgan_path - load_model(context, "realesrgan") - elif task_data.use_face_correction and "gfpgan" in task_data.use_face_correction.lower(): - images = apply_filters(context, "gfpgan", images) - - if task_data.use_upscale: - if "realesrgan" in task_data.use_upscale.lower(): - images = apply_filters(context, "realesrgan", images, scale=task_data.upscale_amount) - elif task_data.use_upscale == "latent_upscaler": - images = apply_filters( - context, - "latent_upscaler", - images, - scale=task_data.upscale_amount, - latent_upscaler_options={ - "prompt": req.prompt, - "negative_prompt": req.negative_prompt, - "seed": req.seed, - "num_inference_steps": task_data.latent_upscaler_steps, - "guidance_scale": 0, - }, - ) - - return images - - -def construct_response(images: list, seeds: list, task_data: TaskData, base_seed: int): +def construct_response(images: list, seeds: list, output_format: OutputFormatData): return [ ResponseImage( data=img_to_base64_str( img, - task_data.output_format, - task_data.output_quality, - task_data.output_lossless, + output_format.output_format, + output_format.output_quality, + output_format.output_lossless, ), seed=seed, ) @@ -222,6 +226,7 @@ def construct_response(images: list, seeds: list, task_data: TaskData, base_seed def make_step_callback( + context, req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, @@ -242,7 +247,7 @@ def make_step_callback( images = latent_samples_to_images(context, x_samples) if task_data.block_nsfw: - images = apply_filters(context, "nsfw_checker", images) + images = filter_images(context, images, "nsfw_checker") for i, img in enumerate(images): buf = img_to_buffer(img, output_format="JPEG") diff --git a/ui/easydiffusion/tasks/task.py b/ui/easydiffusion/tasks/task.py new file mode 100644 index 00000000..4454efe6 --- /dev/null +++ b/ui/easydiffusion/tasks/task.py @@ -0,0 +1,47 @@ +from threading import Lock +from queue import Queue, Empty as EmptyQueueException +from typing import Any + + +class Task: + "Task with output queue and completion lock" + + def __init__(self, session_id): + self.id = id(self) + self.session_id = session_id + self.render_device = None # Select the task affinity. (Not used to change active devices). + self.error: Exception = None + self.lock: Lock = Lock() # Locks at task start and unlocks when task is completed + self.buffer_queue: Queue = Queue() # Queue of JSON string segments + self.response: Any = None # Copy of the last reponse + + async def read_buffer_generator(self): + try: + while not self.buffer_queue.empty(): + res = self.buffer_queue.get(block=False) + self.buffer_queue.task_done() + yield res + except EmptyQueueException as e: + yield + + @property + def status(self): + if self.lock.locked(): + return "running" + if isinstance(self.error, StopAsyncIteration): + return "stopped" + if self.error: + return "error" + if not self.buffer_queue.empty(): + return "buffer" + if self.response: + return "completed" + return "pending" + + @property + def is_pending(self): + return bool(not self.response and not self.error) + + def run(self): + "Override this to implement the task's behavior" + pass diff --git a/ui/easydiffusion/types.py b/ui/easydiffusion/types.py index a9e49a24..b5f6b21a 100644 --- a/ui/easydiffusion/types.py +++ b/ui/easydiffusion/types.py @@ -1,4 +1,4 @@ -from typing import Any, List, Union +from typing import Any, List, Dict, Union from pydantic import BaseModel @@ -17,6 +17,8 @@ class GenerateImageRequest(BaseModel): init_image: Any = None init_image_mask: Any = None + control_image: Any = None + control_alpha: Union[float, List[float]] = None prompt_strength: float = 0.8 preserve_init_image_color_profile = False @@ -26,6 +28,35 @@ class GenerateImageRequest(BaseModel): tiling: str = "none" # "none", "x", "y", "xy" +class FilterImageRequest(BaseModel): + image: Any = None + filter: Union[str, List[str]] = None + filter_params: dict = {} + + +class ModelsData(BaseModel): + """ + Contains the information related to the models involved in a request. + + - To load a model: set the relative path(s) to the model in `model_paths`. No effect if already loaded. + - To unload a model: set the model to `None` in `model_paths`. No effect if already unloaded. + + Models that aren't present in `model_paths` will not be changed. + """ + + model_paths: Dict[str, Union[str, None, List[str]]] = None + "model_type to string path, or list of string paths" + + model_params: Dict[str, Dict[str, Any]] = {} + "model_type to dict of parameters" + + +class OutputFormatData(BaseModel): + output_format: str = "jpeg" # or "png" or "webp" + output_quality: int = 75 + output_lossless: bool = False + + class TaskData(BaseModel): request_id: str = None session_id: str = "session" @@ -40,12 +71,12 @@ class TaskData(BaseModel): use_vae_model: Union[str, List[str]] = None use_hypernetwork_model: Union[str, List[str]] = None use_lora_model: Union[str, List[str]] = None + use_controlnet_model: Union[str, List[str]] = None + filters: List[str] = [] + filter_params: Dict[str, Dict[str, Any]] = {} show_only_filtered_image: bool = False block_nsfw: bool = False - output_format: str = "jpeg" # or "png" or "webp" - output_quality: int = 75 - output_lossless: bool = False metadata_output_format: str = "txt" # or "json" stream_image_progress: bool = False stream_image_progress_interval: int = 5 @@ -80,24 +111,38 @@ class Image: } -class Response: +class GenerateImageResponse: render_request: GenerateImageRequest task_data: TaskData + models_data: ModelsData images: list - def __init__(self, render_request: GenerateImageRequest, task_data: TaskData, images: list): + def __init__( + self, + render_request: GenerateImageRequest, + task_data: TaskData, + models_data: ModelsData, + output_format: OutputFormatData, + images: list, + ): self.render_request = render_request self.task_data = task_data + self.models_data = models_data + self.output_format = output_format self.images = images def json(self): del self.render_request.init_image del self.render_request.init_image_mask + task_data = self.task_data.dict() + task_data.update(self.output_format.dict()) + res = { "status": "succeeded", "render_request": self.render_request.dict(), - "task_data": self.task_data.dict(), + "task_data": task_data, + # "models_data": self.models_data.dict(), # haven't migrated the UI to the new format (yet) "output": [], } @@ -107,5 +152,102 @@ class Response: return res +class FilterImageResponse: + request: FilterImageRequest + models_data: ModelsData + images: list + + def __init__(self, request: FilterImageRequest, models_data: ModelsData, images: list): + self.request = request + self.models_data = models_data + self.images = images + + def json(self): + del self.request.image + + res = { + "status": "succeeded", + "request": self.request.dict(), + "models_data": self.models_data.dict(), + "output": [], + } + + for image in self.images: + res["output"].append(image) + + return res + + class UserInitiatedStop(Exception): pass + + +def convert_legacy_render_req_to_new(old_req: dict): + new_req = dict(old_req) + + # new keys + model_paths = new_req["model_paths"] = {} + model_params = new_req["model_params"] = {} + filters = new_req["filters"] = [] + filter_params = new_req["filter_params"] = {} + + # move the model info + model_paths["stable-diffusion"] = old_req.get("use_stable_diffusion_model") + model_paths["vae"] = old_req.get("use_vae_model") + model_paths["hypernetwork"] = old_req.get("use_hypernetwork_model") + model_paths["lora"] = old_req.get("use_lora_model") + model_paths["controlnet"] = old_req.get("use_controlnet_model") + + model_paths["gfpgan"] = old_req.get("use_face_correction", "") + model_paths["gfpgan"] = model_paths["gfpgan"] if "gfpgan" in model_paths["gfpgan"].lower() else None + + model_paths["codeformer"] = old_req.get("use_face_correction", "") + model_paths["codeformer"] = model_paths["codeformer"] if "codeformer" in model_paths["codeformer"].lower() else None + + model_paths["realesrgan"] = old_req.get("use_upscale", "") + model_paths["realesrgan"] = model_paths["realesrgan"] if "realesrgan" in model_paths["realesrgan"].lower() else None + + model_paths["latent_upscaler"] = old_req.get("use_upscale", "") + model_paths["latent_upscaler"] = ( + model_paths["latent_upscaler"] if "latent_upscaler" in model_paths["latent_upscaler"].lower() else None + ) + + if old_req.get("block_nsfw"): + model_paths["nsfw_checker"] = "nsfw_checker" + + # move the model params + if model_paths["stable-diffusion"]: + model_params["stable-diffusion"] = {"clip_skip": bool(old_req["clip_skip"])} + + # move the filter params + if model_paths["realesrgan"]: + filter_params["realesrgan"] = {"scale": int(old_req["upscale_amount"])} + if model_paths["latent_upscaler"]: + filter_params["latent_upscaler"] = { + "prompt": old_req["prompt"], + "negative_prompt": old_req.get("negative_prompt"), + "seed": int(old_req.get("seed", 42)), + "num_inference_steps": int(old_req.get("latent_upscaler_steps", 10)), + "guidance_scale": 0, + } + if model_paths["codeformer"]: + filter_params["codeformer"] = { + "upscale_faces": bool(old_req["codeformer_upscale_faces"]), + "codeformer_fidelity": float(old_req["codeformer_fidelity"]), + } + + # set the filters + if old_req.get("block_nsfw"): + filters.append("nsfw_checker") + + if model_paths["codeformer"]: + filters.append("codeformer") + elif model_paths["gfpgan"]: + filters.append("gfpgan") + + if model_paths["realesrgan"]: + filters.append("realesrgan") + elif model_paths["latent_upscaler"]: + filters.append("latent_upscaler") + + return new_req diff --git a/ui/easydiffusion/utils/save_utils.py b/ui/easydiffusion/utils/save_utils.py index f27e84de..49743554 100644 --- a/ui/easydiffusion/utils/save_utils.py +++ b/ui/easydiffusion/utils/save_utils.py @@ -7,7 +7,7 @@ from datetime import datetime from functools import reduce from easydiffusion import app -from easydiffusion.types import GenerateImageRequest, TaskData +from easydiffusion.types import GenerateImageRequest, TaskData, OutputFormatData from numpy import base_repr from sdkit.utils import save_dicts, save_images @@ -114,12 +114,14 @@ def format_file_name( return filename_regex.sub("_", format) -def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData): +def save_images_to_disk( + images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData, output_format: OutputFormatData +): now = time.time() app_config = app.getConfig() folder_format = app_config.get("folder_format", "$id") save_dir_path = os.path.join(task_data.save_to_disk_path, format_folder_name(folder_format, req, task_data)) - metadata_entries = get_metadata_entries_for_request(req, task_data) + metadata_entries = get_metadata_entries_for_request(req, task_data, output_format) file_number = calculate_img_number(save_dir_path, task_data) make_filename = make_filename_callback( app_config.get("filename_format", "$p_$tsb64"), @@ -134,9 +136,9 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR filtered_images, save_dir_path, file_name=make_filename, - output_format=task_data.output_format, - output_quality=task_data.output_quality, - output_lossless=task_data.output_lossless, + output_format=output_format.output_format, + output_quality=output_format.output_quality, + output_lossless=output_format.output_lossless, ) if task_data.metadata_output_format: for metadata_output_format in task_data.metadata_output_format.split(","): @@ -146,7 +148,7 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR save_dir_path, file_name=make_filename, output_format=metadata_output_format, - file_format=task_data.output_format, + file_format=output_format.output_format, ) else: make_filter_filename = make_filename_callback( @@ -162,17 +164,17 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR images, save_dir_path, file_name=make_filename, - output_format=task_data.output_format, - output_quality=task_data.output_quality, - output_lossless=task_data.output_lossless, + output_format=output_format.output_format, + output_quality=output_format.output_quality, + output_lossless=output_format.output_lossless, ) save_images( filtered_images, save_dir_path, file_name=make_filter_filename, - output_format=task_data.output_format, - output_quality=task_data.output_quality, - output_lossless=task_data.output_lossless, + output_format=output_format.output_format, + output_quality=output_format.output_quality, + output_lossless=output_format.output_lossless, ) if task_data.metadata_output_format: for metadata_output_format in task_data.metadata_output_format.split(","): @@ -181,20 +183,21 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR metadata_entries, save_dir_path, file_name=make_filter_filename, - output_format=task_data.metadata_output_format, - file_format=task_data.output_format, + output_format=metadata_output_format, + file_format=output_format.output_format, ) -def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskData): - metadata = get_printable_request(req, task_data) +def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskData, output_format: OutputFormatData): + metadata = get_printable_request(req, task_data, output_format) # if text, format it in the text format expected by the UI is_txt_format = task_data.metadata_output_format and "txt" in task_data.metadata_output_format.lower().split(",") if is_txt_format: + def format_value(value): if isinstance(value, list): - return ", ".join([ str(it) for it in value ]) + return ", ".join([str(it) for it in value]) return value metadata = { @@ -208,9 +211,10 @@ def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskD return entries -def get_printable_request(req: GenerateImageRequest, task_data: TaskData): +def get_printable_request(req: GenerateImageRequest, task_data: TaskData, output_format: OutputFormatData): req_metadata = req.dict() task_data_metadata = task_data.dict() + task_data_metadata.update(output_format.dict()) app_config = app.getConfig() using_diffusers = app_config.get("test_diffusers", False) @@ -224,6 +228,7 @@ def get_printable_request(req: GenerateImageRequest, task_data: TaskData): metadata[key] = task_data_metadata[key] elif key == "use_embedding_models" and using_diffusers: embeddings_extensions = {".pt", ".bin", ".safetensors"} + def scan_directory(directory_path: str): used_embeddings = [] for entry in os.scandir(directory_path): @@ -232,15 +237,18 @@ def get_printable_request(req: GenerateImageRequest, task_data: TaskData): if entry_extension not in embeddings_extensions: continue - embedding_name_regex = regex.compile(r"(^|[\s,])" + regex.escape(os.path.splitext(entry.name)[0]) + r"([+-]*$|[\s,]|[+-]+[\s,])") + embedding_name_regex = regex.compile( + r"(^|[\s,])" + regex.escape(os.path.splitext(entry.name)[0]) + r"([+-]*$|[\s,]|[+-]+[\s,])" + ) if embedding_name_regex.search(req.prompt) or embedding_name_regex.search(req.negative_prompt): used_embeddings.append(entry.path) elif entry.is_dir(): used_embeddings.extend(scan_directory(entry.path)) return used_embeddings + used_embeddings = scan_directory(os.path.join(app.MODELS_DIR, "embeddings")) metadata["use_embedding_models"] = used_embeddings if len(used_embeddings) > 0 else None - + # Clean up the metadata if req.init_image is None and "prompt_strength" in metadata: del metadata["prompt_strength"] @@ -254,7 +262,9 @@ def get_printable_request(req: GenerateImageRequest, task_data: TaskData): del metadata["latent_upscaler_steps"] if not using_diffusers: - for key in (x for x in ["use_lora_model", "lora_alpha", "clip_skip", "tiling", "latent_upscaler_steps"] if x in metadata): + for key in ( + x for x in ["use_lora_model", "lora_alpha", "clip_skip", "tiling", "latent_upscaler_steps"] if x in metadata + ): del metadata[key] return metadata diff --git a/ui/media/js/engine.js b/ui/media/js/engine.js index 39e06ed7..c584a609 100644 --- a/ui/media/js/engine.js +++ b/ui/media/js/engine.js @@ -1047,17 +1047,22 @@ } } class FilterTask extends Task { - constructor(options = {}) {} + constructor(options = {}) { + super(options) + } /** Send current task to server. * @param {*} [timeout=-1] Optional timeout value in ms * @returns the response from the render request. * @memberof Task */ async post(timeout = -1) { - let jsonResponse = await super.post("/filter", timeout) + let res = await super.post("/filter", timeout) //this._setId(jsonResponse.task) this._setStatus(TaskStatus.waiting) + + return res } + checkReqBody() {} enqueue(progressCallback) { return Task.enqueueNew(this, FilterTask, progressCallback) } @@ -1068,6 +1073,20 @@ if (this.isStopped) { return } + + this._setStatus(TaskStatus.pending) + progressCallback?.call(this, { reqBody: this._reqBody }) + Object.freeze(this._reqBody) + + // Post task request to backend + let renderRes = undefined + try { + renderRes = yield this.post() + yield progressCallback?.call(this, { renderResponse: renderRes }) + } catch (e) { + yield progressCallback?.call(this, { detail: e.message }) + throw e + } } static start(task, progressCallback) { if (typeof task !== "object") { From 17a11b94b292d30e1481b860d08bbbcc587035b1 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 28 Jul 2023 18:59:10 +0530 Subject: [PATCH 20/39] changelog --- CHANGES.md | 1 + ui/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 19c175ce..3d72d8f1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.47 - 28 Jul 2023 - Lots of internal code reorganization, in preparation for supporting Controlnets. No user-facing changes. * 2.5.46 - 27 Jul 2023 - (beta-only) Full support for SD-XL models (base and refiner)! * 2.5.45 - 24 Jul 2023 - (beta-only) Hide the samplers that won't be supported in the new diffusers version. * 2.5.45 - 22 Jul 2023 - (beta-only) Fix the recently-broken inpainting models. diff --git a/ui/index.html b/ui/index.html index c0e5e635..14cf25ec 100644 --- a/ui/index.html +++ b/ui/index.html @@ -31,7 +31,7 @@

Easy Diffusion - v2.5.46 + v2.5.47

From 7f32c531d79f06006c447488503f18a07eaef496 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 28 Jul 2023 19:14:40 +0530 Subject: [PATCH 21/39] sdkit 1.0.143 - Fixes for the new beta --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index a285685f..1519845b 100644 --- a/scripts/check_modules.py +++ b/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.142", + "sdkit": "1.0.143", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From 6e52680fa8ff8f246a8578c25a151111a77f24c9 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 28 Jul 2023 22:48:41 +0530 Subject: [PATCH 22/39] Fast in-place upscale and face fix buttons, with an option to undo the operations --- ui/index.html | 1 + ui/media/css/animations.css | 68 ++++++++++++++++++++++++++ ui/media/css/main.css | 17 +++++++ ui/media/js/engine.js | 68 ++++++++++++++++++++++++-- ui/media/js/main.js | 95 ++++++++++++++++++++++++++++++++----- 5 files changed, 232 insertions(+), 17 deletions(-) create mode 100644 ui/media/css/animations.css diff --git a/ui/index.html b/ui/index.html index 14cf25ec..776eb627 100644 --- a/ui/index.html +++ b/ui/index.html @@ -17,6 +17,7 @@ + diff --git a/ui/media/css/animations.css b/ui/media/css/animations.css new file mode 100644 index 00000000..71ee642f --- /dev/null +++ b/ui/media/css/animations.css @@ -0,0 +1,68 @@ +@keyframes ldio-8f673ktaleu-1 { + 0% { transform: rotate(0deg) } + 50% { transform: rotate(-45deg) } + 100% { transform: rotate(0deg) } +} +@keyframes ldio-8f673ktaleu-2 { + 0% { transform: rotate(180deg) } + 50% { transform: rotate(225deg) } + 100% { transform: rotate(180deg) } +} +.ldio-8f673ktaleu > div:nth-child(2) { + transform: translate(-15px,0); +} +.ldio-8f673ktaleu > div:nth-child(2) div { + position: absolute; + top: 20px; + left: 20px; + width: 60px; + height: 30px; + border-radius: 60px 60px 0 0; + background: #f3b72e; + animation: ldio-8f673ktaleu-1 1s linear infinite; + transform-origin: 30px 30px +} +.ldio-8f673ktaleu > div:nth-child(2) div:nth-child(2) { + animation: ldio-8f673ktaleu-2 1s linear infinite +} +.ldio-8f673ktaleu > div:nth-child(2) div:nth-child(3) { + transform: rotate(-90deg); + animation: none; +}@keyframes ldio-8f673ktaleu-3 { + 0% { transform: translate(95px,0); opacity: 0 } + 20% { opacity: 1 } + 100% { transform: translate(35px,0); opacity: 1 } +} +.ldio-8f673ktaleu > div:nth-child(1) { + display: block; +} +.ldio-8f673ktaleu > div:nth-child(1) div { + position: absolute; + top: 46px; + left: -4px; + width: 8px; + height: 8px; + border-radius: 50%; + background: #3869c5; + animation: ldio-8f673ktaleu-3 1s linear infinite +} +.ldio-8f673ktaleu > div:nth-child(1) div:nth-child(1) { animation-delay: -0.67s } +.ldio-8f673ktaleu > div:nth-child(1) div:nth-child(2) { animation-delay: -0.33s } +.ldio-8f673ktaleu > div:nth-child(1) div:nth-child(3) { animation-delay: 0s } +.loadingio-spinner-bean-eater-x0y3u8qky4n { + width: 58px; + height: 58px; + display: inline-block; + overflow: hidden; + background: none; +} +.ldio-8f673ktaleu { + width: 100%; + height: 100%; + position: relative; + transform: translateZ(0) scale(0.58); + backface-visibility: hidden; + transform-origin: 0 0; /* see note above */ +} +.ldio-8f673ktaleu div { box-sizing: content-box; } +/* generated by https://loading.io/ */ diff --git a/ui/media/css/main.css b/ui/media/css/main.css index f6be52c5..4d7a0f62 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1753,3 +1753,20 @@ body.wait-pause { content: "Please restart Easy Diffusion!"; font-size: 10pt; } + +.imgContainer .spinner { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + margin: 0; + padding: 0; + + background: var(--background-color3); + opacity: 0.8; + border-radius: 5px; + padding: 4pt; +} +.imgContainer .spinnerStatus { + font-size: 10pt; +} diff --git a/ui/media/js/engine.js b/ui/media/js/engine.js index c584a609..a11dd8b3 100644 --- a/ui/media/js/engine.js +++ b/ui/media/js/engine.js @@ -1056,11 +1056,26 @@ * @memberof Task */ async post(timeout = -1) { - let res = await super.post("/filter", timeout) - //this._setId(jsonResponse.task) + let jsonResponse = await super.post("/filter", timeout) + if (typeof jsonResponse?.task !== "number") { + console.warn("Endpoint error response: ", jsonResponse) + const event = Object.assign({ task: this }, jsonResponse) + await eventSource.fireEvent(EVENT_UNEXPECTED_RESPONSE, event) + if ("continueWith" in event) { + jsonResponse = await Promise.resolve(event.continueWith) + } + if (typeof jsonResponse?.task !== "number") { + const err = new Error(jsonResponse?.detail || "Endpoint response does not contains a task ID.") + this.abort(err) + throw err + } + } + this._setId(jsonResponse.task) + if (jsonResponse.stream) { + this.streamUrl = jsonResponse.stream + } this._setStatus(TaskStatus.waiting) - - return res + return jsonResponse } checkReqBody() {} enqueue(progressCallback) { @@ -1087,6 +1102,51 @@ yield progressCallback?.call(this, { detail: e.message }) throw e } + + try { + // Wait for task to start on server. + yield this.waitUntil({ + callback: function() { + return progressCallback?.call(this, {}) + }, + status: TaskStatus.processing, + }) + } catch (e) { + this.abort(err) + throw e + } + + // Task started! + // Open the reader. + const reader = this.reader + const task = this + reader.onError = function(response) { + if (progressCallback) { + task.abort(new Error(response.statusText)) + return progressCallback.call(task, { response, reader }) + } + return Task.prototype.onError.call(task, response) + } + yield progressCallback?.call(this, { reader }) + + //Start streaming the results. + const streamGenerator = reader.open() + let value = undefined + let done = undefined + yield progressCallback?.call(this, { stream: streamGenerator }) + do { + ;({ value, done } = yield streamGenerator.next()) + if (typeof value !== "object") { + continue + } + if (value.status !== undefined) { + yield progressCallback?.call(this, value) + if (value.status === "succeeded" || value.status === "failed") { + done = true + } + } + } while (!done) + return value } static start(task, progressCallback) { if (typeof task !== "object") { diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 0b936066..3bfc3233 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -5,6 +5,9 @@ const MIN_GPUS_TO_SHOW_SELECTION = 2 const IMAGE_REGEX = new RegExp("data:image/[A-Za-z]+;base64") const htmlTaskMap = new WeakMap() +const spinnerPacmanHtml = + '' + const taskConfigSetup = { taskConfig: { seed: { value: ({ seed }) => seed, label: "Seed" }, @@ -412,6 +415,7 @@ function showImages(reqBody, res, outputContainer, livePreview) {
+ ` outputContainer.appendChild(imageItemElem) @@ -488,6 +492,7 @@ function showImages(reqBody, res, outputContainer, livePreview) { const imageSeedLabel = imageItemElem.querySelector(".imgSeedLabel") imageSeedLabel.innerText = "Seed: " + req.seed + const imageUndoBuffer = [] let buttons = [ { text: "Use as Input", on_click: onUseAsInputClick }, [ @@ -505,8 +510,9 @@ function showImages(reqBody, res, outputContainer, livePreview) { { text: "Make Similar Images", on_click: onMakeSimilarClick }, { text: "Draw another 25 steps", on_click: onContinueDrawingClick }, [ - { text: "Upscale", on_click: onUpscaleClick, filter: (req, img) => !req.use_upscale }, - { text: "Fix Faces", on_click: onFixFacesClick, filter: (req, img) => !req.use_face_correction }, + { text: "Undo", on_click: onUndoFilter }, + { text: "Upscale", on_click: onUpscaleClick }, + { text: "Fix Faces", on_click: onFixFacesClick }, ], ] @@ -515,6 +521,13 @@ function showImages(reqBody, res, outputContainer, livePreview) { const imgItemInfo = imageItemElem.querySelector(".imgItemInfo") const img = imageItemElem.querySelector("img") + const spinner = imageItemElem.querySelector(".spinner") + const spinnerStatus = imageItemElem.querySelector(".spinnerStatus") + const tools = { + spinner: spinner, + spinnerStatus: spinnerStatus, + undoBuffer: imageUndoBuffer, + } const createButton = function(btnInfo) { if (Array.isArray(btnInfo)) { const wrapper = document.createElement("div") @@ -540,8 +553,12 @@ function showImages(reqBody, res, outputContainer, livePreview) { if (btnInfo.on_click || !isLabel) { newButton.addEventListener("click", function(event) { - btnInfo.on_click(req, img, event) + btnInfo.on_click.bind(newButton)(req, img, event, tools) }) + if (btnInfo.on_click === onUndoFilter) { + tools["undoButton"] = newButton + newButton.classList.add("displayNone") + } } if (btnInfo.class !== undefined) { @@ -656,16 +673,64 @@ function enqueueImageVariationTask(req, img, reqDiff) { createTask(newTaskRequest) } -function onUpscaleClick(req, img) { - enqueueImageVariationTask(req, img, { - use_upscale: upscaleModelField.value, +function applyInlineFilter(filterName, path, filterParams, img, statusText, tools) { + const filterReq = { + image: img.src, + filter: filterName, + model_paths: {}, + filter_params: filterParams, + } + filterReq.model_paths[filterName] = path + + tools.spinnerStatus.innerText = statusText + tools.spinner.classList.remove("displayNone") + + SD.filter(filterReq, (e) => { + if (e.status === "succeeded") { + let prevImg = img.src + img.src = e.output[0] + tools.spinner.classList.add("displayNone") + tools.undoButton.classList.remove("displayNone") + + if (prevImg.length > 0) { + tools.undoBuffer.push(prevImg) + } + } else if (e.status == "failed") { + alert("Error running upscale: " + e.detail) + tools.spinner.classList.add("displayNone") + } }) } -function onFixFacesClick(req, img) { - enqueueImageVariationTask(req, img, { - use_face_correction: gfpganModelField.value, - }) +function onUndoFilter(req, img, e, tools) { + if (tools.undoBuffer.length === 0) { + this.classList.add("displayNone") + return + } + + let src = tools.undoBuffer.pop() + if (src.length > 0) { + img.src = src + } + + if (tools.undoBuffer.length === 0) { + this.classList.add("displayNone") + } +} + +function onUpscaleClick(req, img, e, tools) { + let path = upscaleModelField.value + let scale = parseInt(upscaleAmountField.value) + let filterName = path.toLowerCase().includes("realesrgan") ? "realesrgan" : "latent_upscaler" + let statusText = "Upscaling by " + scale + "x using " + filterName + applyInlineFilter(filterName, path, { scale: scale }, img, statusText, tools) +} + +function onFixFacesClick(req, img, e, tools) { + let path = gfpganModelField.value + let filterName = path.toLowerCase().includes("gfpgan") ? "gfpgan" : "codeformer" + let statusText = "Fixing faces with " + filterName + applyInlineFilter(filterName, path, {}, img, statusText, tools) } function onContinueDrawingClick(req, img) { @@ -909,7 +974,9 @@ function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) { Windows or Linux.
3. Try restarting your computer.
` - } else if (msg.includes("RuntimeError: output with shape [320, 320] doesn't match the broadcast shape")) { + } else if ( + msg.includes("RuntimeError: output with shape [320, 320] doesn't match the broadcast shape") + ) { msg += `

Reason: You tried to use a LORA that was trained for a different Stable Diffusion model version!

@@ -2171,7 +2238,10 @@ function updateEmbeddingsList(filter = "") { } else { let subdir = html(m[1], prefix + m[0] + "/", filter) if (subdir != "") { - folders += `

${prefix}${m[0]}

` + subdir + '
' + folders += + `

${prefix}${m[0]}

` + + subdir + + "
" } } }) @@ -2293,7 +2363,6 @@ embeddingsCollapsiblesBtn.addEventListener("click", (e) => { } }) - if (testDiffusers.checked) { document.getElementById("embeddings-container").classList.remove("displayNone") } From c906c5d14a7df7f6c8819f1698cc1dc2b7bf92df Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 09:14:00 +0530 Subject: [PATCH 23/39] Don't rely on old keys to exist in the request --- ui/easydiffusion/types.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/easydiffusion/types.py b/ui/easydiffusion/types.py index b5f6b21a..a37da9ef 100644 --- a/ui/easydiffusion/types.py +++ b/ui/easydiffusion/types.py @@ -217,11 +217,11 @@ def convert_legacy_render_req_to_new(old_req: dict): # move the model params if model_paths["stable-diffusion"]: - model_params["stable-diffusion"] = {"clip_skip": bool(old_req["clip_skip"])} + model_params["stable-diffusion"] = {"clip_skip": bool(old_req.get("clip_skip", False))} # move the filter params if model_paths["realesrgan"]: - filter_params["realesrgan"] = {"scale": int(old_req["upscale_amount"])} + filter_params["realesrgan"] = {"scale": int(old_req.get("upscale_amount", 4))} if model_paths["latent_upscaler"]: filter_params["latent_upscaler"] = { "prompt": old_req["prompt"], @@ -232,8 +232,8 @@ def convert_legacy_render_req_to_new(old_req: dict): } if model_paths["codeformer"]: filter_params["codeformer"] = { - "upscale_faces": bool(old_req["codeformer_upscale_faces"]), - "codeformer_fidelity": float(old_req["codeformer_fidelity"]), + "upscale_faces": bool(old_req.get("codeformer_upscale_faces", True)), + "codeformer_fidelity": float(old_req.get("codeformer_fidelity", 0.5)), } # set the filters From 8301cafb37e5e0bd143d1d213203458c6c1d51ca Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 09:23:15 +0530 Subject: [PATCH 24/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 3d72d8f1..9774b89e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.47 - 29 Jul 2023 - Significantly faster `Fix Faces` and `Upscale` buttons (on the image). They no longer need to generate the image from scratch, instead they just upscale/fix the generated image in-place. * 2.5.47 - 28 Jul 2023 - Lots of internal code reorganization, in preparation for supporting Controlnets. No user-facing changes. * 2.5.46 - 27 Jul 2023 - (beta-only) Full support for SD-XL models (base and refiner)! * 2.5.45 - 24 Jul 2023 - (beta-only) Hide the samplers that won't be supported in the new diffusers version. From ed84a23f36b194d4a9154cd43b1a345a4e04ed77 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 10:07:41 +0530 Subject: [PATCH 25/39] Redo button for image filters, limit undo buffer size to 5 --- ui/media/css/main.css | 2 +- ui/media/js/main.js | 43 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 4d7a0f62..1272a0ff 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1763,7 +1763,7 @@ body.wait-pause { padding: 0; background: var(--background-color3); - opacity: 0.8; + opacity: 0.95; border-radius: 5px; padding: 4pt; } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 3bfc3233..811a4b9b 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -163,6 +163,7 @@ let imagePreviewContent = document.querySelector("#preview-content") let undoButton = document.querySelector("#undo") let undoBuffer = [] const UNDO_LIMIT = 20 +const MAX_IMG_UNDO_ENTRIES = 5 let loraModels = [] @@ -493,6 +494,7 @@ function showImages(reqBody, res, outputContainer, livePreview) { imageSeedLabel.innerText = "Seed: " + req.seed const imageUndoBuffer = [] + const imageRedoBuffer = [] let buttons = [ { text: "Use as Input", on_click: onUseAsInputClick }, [ @@ -510,7 +512,8 @@ function showImages(reqBody, res, outputContainer, livePreview) { { text: "Make Similar Images", on_click: onMakeSimilarClick }, { text: "Draw another 25 steps", on_click: onContinueDrawingClick }, [ - { text: "Undo", on_click: onUndoFilter }, + { html: ' Undo', on_click: onUndoFilter }, + { html: ' Redo', on_click: onRedoFilter }, { text: "Upscale", on_click: onUpscaleClick }, { text: "Fix Faces", on_click: onFixFacesClick }, ], @@ -527,6 +530,7 @@ function showImages(reqBody, res, outputContainer, livePreview) { spinner: spinner, spinnerStatus: spinnerStatus, undoBuffer: imageUndoBuffer, + redoBuffer: imageRedoBuffer, } const createButton = function(btnInfo) { if (Array.isArray(btnInfo)) { @@ -559,6 +563,10 @@ function showImages(reqBody, res, outputContainer, livePreview) { tools["undoButton"] = newButton newButton.classList.add("displayNone") } + if (btnInfo.on_click === onRedoFilter) { + tools["redoButton"] = newButton + newButton.classList.add("displayNone") + } } if (btnInfo.class !== undefined) { @@ -690,10 +698,18 @@ function applyInlineFilter(filterName, path, filterParams, img, statusText, tool let prevImg = img.src img.src = e.output[0] tools.spinner.classList.add("displayNone") - tools.undoButton.classList.remove("displayNone") if (prevImg.length > 0) { tools.undoBuffer.push(prevImg) + tools.redoBuffer = [] + + if (tools.undoBuffer.length > MAX_IMG_UNDO_ENTRIES) { + let n = tools.undoBuffer.length + tools.undoBuffer.splice(0, n - MAX_IMG_UNDO_ENTRIES) + } + + tools.undoButton.classList.remove("displayNone") + tools.redoButton.classList.add("displayNone") } } else if (e.status == "failed") { alert("Error running upscale: " + e.detail) @@ -702,20 +718,31 @@ function applyInlineFilter(filterName, path, filterParams, img, statusText, tool }) } -function onUndoFilter(req, img, e, tools) { - if (tools.undoBuffer.length === 0) { - this.classList.add("displayNone") +function moveImageBetweenBuffers(img, fromBuffer, toBuffer, fromButton, toButton) { + if (fromBuffer.length === 0) { return } - let src = tools.undoBuffer.pop() + let src = fromBuffer.pop() if (src.length > 0) { + toBuffer.push(img.src) img.src = src } - if (tools.undoBuffer.length === 0) { - this.classList.add("displayNone") + if (fromBuffer.length === 0) { + fromButton.classList.add("displayNone") } + if (toBuffer.length > 0) { + toButton.classList.remove("displayNone") + } +} + +function onUndoFilter(req, img, e, tools) { + moveImageBetweenBuffers(img, tools.undoBuffer, tools.redoBuffer, tools.undoButton, tools.redoButton) +} + +function onRedoFilter(req, img, e, tools) { + moveImageBetweenBuffers(img, tools.redoBuffer, tools.undoBuffer, tools.redoButton, tools.undoButton) } function onUpscaleClick(req, img, e, tools) { From a9960ded01b22931b8020470b15b151909cfc19d Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 10:14:52 +0530 Subject: [PATCH 26/39] Styling --- ui/media/css/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 1272a0ff..41c6f196 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1766,6 +1766,8 @@ body.wait-pause { opacity: 0.95; border-radius: 5px; padding: 4pt; + border: 1px solid var(--button-color); + box-shadow: 0px 0px 4px black; } .imgContainer .spinnerStatus { font-size: 10pt; From a9f1000af8f9aa77f8d8909d8a789693f1bfa272 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 11:41:44 +0530 Subject: [PATCH 27/39] Install button for TensorRT - displayed only if an NVIDIA gpu is active --- ui/index.html | 7 +++++++ ui/media/js/parameters.js | 41 ++++++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/ui/index.html b/ui/index.html index 776eb627..370ecbea 100644 --- a/ui/index.html +++ b/ui/index.html @@ -360,6 +360,13 @@

+
+
+
+

Accelerate Easy Diffusion

+
+
+


Share Easy Diffusion

diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 60f053b9..d7694774 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -16,6 +16,7 @@ var ParameterType = { */ let parametersTable = document.querySelector("#system-settings-table") let networkParametersTable = document.querySelector("#system-settings-network-table") +let installExtrasTable = document.querySelector("#system-settings-install-extras-table") /** * JSDoc style @@ -241,6 +242,17 @@ var PARAMETERS = [ render: () => '', table: networkParametersTable, }, + { + id: "nvidia_tensorrt", + type: ParameterType.custom, + label: "NVIDIA TensorRT", + note: `Faster image generation by converting your Stable Diffusion models to the NVIDIA TensorRT format. You can choose the + models to convert. Requires an NVIDIA graphics card.

+ Early access version: support for LoRA is still under development.`, + icon: "fa-angles-up", + render: () => '', + table: installExtrasTable, + }, ] function getParameterSettingsEntry(id) { @@ -582,6 +594,25 @@ function setDeviceInfo(devices) { systemInfoEl.querySelector("#system-info-cpu").innerText = cpu systemInfoEl.querySelector("#system-info-gpus-all").innerHTML = allGPUs.join("
") systemInfoEl.querySelector("#system-info-rendering-devices").innerHTML = activeGPUs.join("
") + + // tensorRT + if (devices.active) { + console.log(devices.active) + let nvidiaGPUs = Object.keys(devices.active).filter((d) => { + let gpuName = devices.active[d].name + gpuName = gpuName.toLowerCase() + console.log(gpuName) + return ( + gpuName.includes("nvidia") || + gpuName.includes("geforce") || + gpuName.includes("quadro") || + gpuName.includes("tesla") + ) + }) + if (nvidiaGPUs.length > 0) { + document.querySelector("#install-extras-container").classList.remove("displayNone") + } + } } function setHostInfo(hosts) { @@ -744,10 +775,10 @@ 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') +useBetaChannelField.addEventListener("change", (e) => { + if (e.target.checked) { + getParameterSettingsEntry("test_diffusers").classList.remove("displayNone") + } else { + getParameterSettingsEntry("test_diffusers").classList.add("displayNone") } }) From 3b53b5ebaf4b90a694d17e062e401b5b3492c413 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 12:42:34 +0530 Subject: [PATCH 28/39] sdkit 1.0.144 - use prompts for SDXL refiner; use VAE slicing and VAE tiling for larger images --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 1519845b..5d6d315a 100644 --- a/scripts/check_modules.py +++ b/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.143", + "sdkit": "1.0.144", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From 2e3059a7c8efba2d045607120634c843da242d13 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 21:09:27 +0530 Subject: [PATCH 29/39] UI for TensorRT installation and conversion --- scripts/check_modules.py | 2 +- ui/easydiffusion/app.py | 2 + ui/easydiffusion/package_manager.py | 93 +++++++++++++++++++++ ui/easydiffusion/server.py | 30 ++++++- ui/easydiffusion/task_manager.py | 6 ++ ui/easydiffusion/tasks/render_images.py | 14 +++- ui/easydiffusion/types.py | 5 +- ui/index.html | 12 ++- ui/media/js/main.js | 102 +++++++++++++++++++++--- ui/media/js/parameters.js | 8 +- 10 files changed, 251 insertions(+), 23 deletions(-) create mode 100644 ui/easydiffusion/package_manager.py diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 1519845b..4ee0d830 100644 --- a/scripts/check_modules.py +++ b/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.143", + "sdkit": "1.0.146", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", diff --git a/ui/easydiffusion/app.py b/ui/easydiffusion/app.py index 921886f1..e181f9b8 100644 --- a/ui/easydiffusion/app.py +++ b/ui/easydiffusion/app.py @@ -32,6 +32,8 @@ logging.basicConfig( SD_DIR = os.getcwd() +ROOT_DIR = os.path.abspath(os.path.join(SD_DIR, "..")) + SD_UI_DIR = os.getenv("SD_UI_PATH", None) CONFIG_DIR = os.path.abspath(os.path.join(SD_UI_DIR, "..", "scripts")) diff --git a/ui/easydiffusion/package_manager.py b/ui/easydiffusion/package_manager.py new file mode 100644 index 00000000..2ec83893 --- /dev/null +++ b/ui/easydiffusion/package_manager.py @@ -0,0 +1,93 @@ +import sys +import os +import platform +from importlib.metadata import version as pkg_version + +from sdkit.utils import log + +from easydiffusion import app + +# future home of scripts/check_modules.py + +manifest = { + "tensorrt": { + "install": ["nvidia-cudnn", "tensorrt-libs", "tensorrt"], + "uninstall": ["tensorrt"], + # TODO also uninstall tensorrt-libs and nvidia-cudnn, but do it upon restarting (avoid 'file in use' error) + } +} +installing = [] + +# remove this once TRT releases on pypi +if platform.system() == "Windows": + trt_dir = os.path.join(app.ROOT_DIR, "tensorrt") + if os.path.exists(trt_dir): + files = os.listdir(trt_dir) + + packages = manifest["tensorrt"]["install"] + packages = tuple(p.replace("-", "_") for p in packages) + + wheels = [] + for p in packages: + f = next((f for f in files if f.startswith(p) and f.endswith((".whl", ".tar.gz"))), None) + if f: + wheels.append(os.path.join(trt_dir, f)) + + manifest["tensorrt"]["install"] = wheels + + +def get_installed_packages() -> list: + return {module_name: version(module_name) for module_name in manifest if is_installed(module_name)} + + +def is_installed(module_name) -> bool: + return version(module_name) is not None + + +def install(module_name): + if is_installed(module_name): + log.info(f"{module_name} has already been installed!") + return + if module_name in installing: + log.info(f"{module_name} is already installing!") + return + + if module_name not in manifest: + raise RuntimeError(f"Can't install unknown package: {module_name}!") + + commands = manifest[module_name]["install"] + commands = [f"python -m pip install --upgrade {cmd}" for cmd in commands] + + installing.append(module_name) + + try: + for cmd in commands: + print(">", cmd) + if os.system(cmd) != 0: + raise RuntimeError(f"Error while running {cmd}. Please check the logs in the command-line.") + finally: + installing.remove(module_name) + + +def uninstall(module_name): + if not is_installed(module_name): + log.info(f"{module_name} hasn't been installed!") + return + + if module_name not in manifest: + raise RuntimeError(f"Can't uninstall unknown package: {module_name}!") + + commands = manifest[module_name]["uninstall"] + commands = [f"python -m pip uninstall -y {cmd}" for cmd in commands] + + for cmd in commands: + print(">", cmd) + if os.system(cmd) != 0: + raise RuntimeError(f"Error while running {cmd}. Please check the logs in the command-line.") + + +def version(module_name: str) -> str: + try: + return pkg_version(module_name) + except: + return None diff --git a/ui/easydiffusion/server.py b/ui/easydiffusion/server.py index 0f1890c3..a8f848fd 100644 --- a/ui/easydiffusion/server.py +++ b/ui/easydiffusion/server.py @@ -8,7 +8,7 @@ import os import traceback from typing import List, Union -from easydiffusion import app, model_manager, task_manager +from easydiffusion import app, model_manager, task_manager, package_manager from easydiffusion.tasks import RenderTask, FilterTask from easydiffusion.types import ( GenerateImageRequest, @@ -135,6 +135,10 @@ def init(): def stop_cloudflare_tunnel(req: dict): return stop_cloudflare_tunnel_internal(req) + @server_api.post("/package/{package_name:str}") + def modify_package(package_name: str, req: dict): + return modify_package_internal(package_name, req) + @server_api.get("/") def read_root(): return FileResponse(os.path.join(app.SD_UI_DIR, "index.html"), headers=NOCACHE_HEADERS) @@ -226,16 +230,24 @@ def ping_internal(session_id: str = None): if task_manager.current_state_error: raise HTTPException(status_code=500, detail=str(task_manager.current_state_error)) raise HTTPException(status_code=500, detail="Render thread is dead.") + if task_manager.current_state_error and not isinstance(task_manager.current_state_error, StopAsyncIteration): raise HTTPException(status_code=500, detail=str(task_manager.current_state_error)) + # Alive response = {"status": str(task_manager.current_state)} + if session_id: session = task_manager.get_cached_session(session_id, update_ttl=True) response["tasks"] = {id(t): t.status for t in session.tasks} + response["devices"] = task_manager.get_devices() + response["packages_installed"] = package_manager.get_installed_packages() + response["packages_installing"] = package_manager.installing + if cloudflare.address != None: response["cloudflare"] = cloudflare.address + return JSONResponse(response, headers=NOCACHE_HEADERS) @@ -423,3 +435,19 @@ def stop_cloudflare_tunnel_internal(req: dict): log.error(str(e)) log.error(traceback.format_exc()) return HTTPException(status_code=500, detail=str(e)) + + +def modify_package_internal(package_name: str, req: dict): + try: + cmd = req["command"] + if cmd not in ("install", "uninstall"): + raise RuntimeError(f"Unknown command: {cmd}") + + cmd = getattr(package_manager, cmd) + cmd(package_name) + + return JSONResponse({"status": "OK"}, headers=NOCACHE_HEADERS) + except Exception as e: + log.error(str(e)) + log.error(traceback.format_exc()) + return HTTPException(status_code=500, detail=str(e)) diff --git a/ui/easydiffusion/task_manager.py b/ui/easydiffusion/task_manager.py index 27b53b6f..699b4494 100644 --- a/ui/easydiffusion/task_manager.py +++ b/ui/easydiffusion/task_manager.py @@ -373,6 +373,12 @@ def get_devices(): finally: manager_lock.release() + # temp until TRT releases + import os + from easydiffusion import app + + devices["enable_trt"] = os.path.exists(os.path.join(app.ROOT_DIR, "tensorrt")) + return devices diff --git a/ui/easydiffusion/tasks/render_images.py b/ui/easydiffusion/tasks/render_images.py index 42bcc76a..bbc36aa5 100644 --- a/ui/easydiffusion/tasks/render_images.py +++ b/ui/easydiffusion/tasks/render_images.py @@ -60,7 +60,11 @@ class RenderTask(Task): model_manager.resolve_model_paths(self.models_data) models_to_force_reload = [] - if runtime.set_vram_optimizations(context) or self.has_clip_skip_changed(context): + if ( + runtime.set_vram_optimizations(context) + or self.has_param_changed(context, "clip_skip") + or self.has_param_changed(context, "convert_to_tensorrt") + ): models_to_force_reload.append("stable-diffusion") model_manager.reload_models_if_necessary(context, self.models_data, models_to_force_reload) @@ -78,13 +82,15 @@ class RenderTask(Task): step_callback, ) - def has_clip_skip_changed(self, context): + def has_param_changed(self, context, param_name): if not context.test_diffusers: return False + if "stable-diffusion" not in context.models or "params" not in context.models["stable-diffusion"]: + return True model = context.models["stable-diffusion"] - new_clip_skip = self.models_data.model_params.get("stable-diffusion", {}).get("clip_skip", False) - return model["clip_skip"] != new_clip_skip + new_val = self.models_data.model_params.get("stable-diffusion", {}).get(param_name, False) + return model["params"].get(param_name) != new_val def make_images( diff --git a/ui/easydiffusion/types.py b/ui/easydiffusion/types.py index a37da9ef..b1d55f5a 100644 --- a/ui/easydiffusion/types.py +++ b/ui/easydiffusion/types.py @@ -217,7 +217,10 @@ def convert_legacy_render_req_to_new(old_req: dict): # move the model params if model_paths["stable-diffusion"]: - model_params["stable-diffusion"] = {"clip_skip": bool(old_req.get("clip_skip", False))} + model_params["stable-diffusion"] = { + "clip_skip": bool(old_req.get("clip_skip", False)), + "convert_to_tensorrt": bool(old_req.get("convert_to_tensorrt", False)), + } # move the filter params if model_paths["realesrgan"]: diff --git a/ui/index.html b/ui/index.html index 370ecbea..2d47433e 100644 --- a/ui/index.html +++ b/ui/index.html @@ -146,6 +146,14 @@ Click to learn more about custom models + + + + + Click to learn more about TensorRT + + + @@ -363,7 +371,7 @@

-

Accelerate Easy Diffusion

+

Optional Packages

@@ -677,7 +685,7 @@ async function init() { events: { statusChange: setServerStatus, idle: onIdle, - ping: tunnelUpdate + ping: onPing } }) splashScreen() diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 811a4b9b..fa42d3ff 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -275,24 +275,24 @@ function setServerStatus(event) { // e : MouseEvent // prompt : Text to be shown as prompt. Should be a question to which "yes" is a good answer. // fn : function to be called if the user confirms the dialog or has the shift key pressed +// allowSkip: Allow skipping the dialog using the shift key or the confirm_dangerous_actions setting (default: true) // // If the user had the shift key pressed while clicking, the function fn will be executed. // If the setting "confirm_dangerous_actions" in the system settings is disabled, the function // fn will be executed. // Otherwise, a confirmation dialog is shown. If the user confirms, the function fn will also // be executed. -function shiftOrConfirm(e, prompt, fn) { +function shiftOrConfirm(e, prompt, fn, allowSkip = true) { e.stopPropagation() - if (e.shiftKey || !confirmDangerousActionsField.checked) { + let tip = allowSkip + ? 'Tip: To skip this dialog, use shift-click or disable the "Confirm dangerous actions" setting in the Settings tab.' + : "" + if (allowSkip && (e.shiftKey || !confirmDangerousActionsField.checked)) { fn(e) } else { - confirm( - 'Tip: To skip this dialog, use shift-click or disable the "Confirm dangerous actions" setting in the Settings tab.', - prompt, - () => { - fn(e) - } - ) + confirm(tip, prompt, () => { + fn(e) + }) } } @@ -1417,6 +1417,11 @@ function getCurrentUserRequest() { newTask.reqBody.lora_alpha = modelStrengths } } + if (testDiffusers.checked && document.getElementById("toggle-tensorrt-install").innerHTML == "Uninstall") { + // TRT is installed + newTask.reqBody.convert_to_tensorrt = document.querySelector("#convert_to_tensorrt").checked + } + return newTask } @@ -2217,6 +2222,11 @@ resumeBtn.addEventListener("click", function() { document.body.classList.remove("wait-pause") }) +function onPing(event) { + tunnelUpdate(event) + packagesUpdate(event) +} + function tunnelUpdate(event) { if ("cloudflare" in event) { document.getElementById("cloudflare-off").classList.add("displayNone") @@ -2230,6 +2240,23 @@ function tunnelUpdate(event) { } } +function packagesUpdate(event) { + let trtBtn = document.getElementById("toggle-tensorrt-install") + let trtInstalled = "packages_installed" in event && "tensorrt" in event["packages_installed"] + + if ("packages_installing" in event && event["packages_installing"].includes("tensorrt")) { + trtBtn.innerHTML = "Installing.." + trtBtn.disabled = true + } else { + trtBtn.innerHTML = trtInstalled ? "Uninstall" : "Install" + trtBtn.disabled = false + } + + if (document.getElementById("toggle-tensorrt-install").innerHTML == "Uninstall") { + document.querySelector("#enable_trt_config").classList.remove("displayNone") + } +} + document.getElementById("toggle-cloudflare-tunnel").addEventListener("click", async function() { let command = "stop" if (document.getElementById("toggle-cloudflare-tunnel").innerHTML == "Start") { @@ -2249,6 +2276,63 @@ document.getElementById("toggle-cloudflare-tunnel").addEventListener("click", as console.log(`Cloudflare tunnel ${command} result:`, res) }) +document.getElementById("toggle-tensorrt-install").addEventListener("click", function(e) { + if (this.disabled === true) { + return + } + + let command = this.innerHTML.toLowerCase() + let self = this + + shiftOrConfirm( + e, + "Are you sure you want to " + command + " TensorRT?", + async function() { + showToast(`TensorRT ${command} started. Please wait.`) + + self.disabled = true + + if (command === "install") { + self.innerHTML = "Installing.." + } else if (command === "uninstall") { + self.innerHTML = "Uninstalling.." + } + + if (command === "installing..") { + alert("Already installing TensorRT!") + return + } + if (command !== "install" && command !== "uninstall") { + return + } + + let res = await fetch("/package/tensorrt", { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + command: command, + }), + }) + res = await res.json() + + self.disabled = false + + if (res.status === "OK") { + alert("TensorRT " + command + "ed successfully!") + self.innerHTML = command === "install" ? "Uninstall" : "Install" + } else if (res.status_code === 500) { + alert("TensorselfRT failed to " + command + ": " + res.detail) + self.innerHTML = command === "install" ? "Install" : "Uninstall" + } + + console.log(`Package ${command} result:`, res) + }, + false + ) +}) + /* Embeddings */ function updateEmbeddingsList(filter = "") { diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index d7694774..1980f1a1 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -247,10 +247,10 @@ var PARAMETERS = [ type: ParameterType.custom, label: "NVIDIA TensorRT", note: `Faster image generation by converting your Stable Diffusion models to the NVIDIA TensorRT format. You can choose the - models to convert. Requires an NVIDIA graphics card.

+ models to convert. Download size: approximately 2 GB.

Early access version: support for LoRA is still under development.`, icon: "fa-angles-up", - render: () => '', + render: () => '', table: installExtrasTable, }, ] @@ -596,12 +596,10 @@ function setDeviceInfo(devices) { systemInfoEl.querySelector("#system-info-rendering-devices").innerHTML = activeGPUs.join("
") // tensorRT - if (devices.active) { - console.log(devices.active) + if (devices.active && testDiffusers.checked && devices.enable_trt === true) { let nvidiaGPUs = Object.keys(devices.active).filter((d) => { let gpuName = devices.active[d].name gpuName = gpuName.toLowerCase() - console.log(gpuName) return ( gpuName.includes("nvidia") || gpuName.includes("geforce") || From 13592fae1ad46fb5f30cb5560a28db57a0d6a5b6 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 21:29:24 +0530 Subject: [PATCH 30/39] sdkit 1.0.147 - diffusers 0.19.2 - fix red specs in SDXL images --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 4ee0d830..5b5d65fa 100644 --- a/scripts/check_modules.py +++ b/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.146", + "sdkit": "1.0.147", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From eedf6f0aad579496429d46e73eea3408028924d0 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 21:30:43 +0530 Subject: [PATCH 31/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 9774b89e..96142b30 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.47 - 29 Jul 2023 - (beta-only) Fix red dots in some SDXL images. * 2.5.47 - 29 Jul 2023 - Significantly faster `Fix Faces` and `Upscale` buttons (on the image). They no longer need to generate the image from scratch, instead they just upscale/fix the generated image in-place. * 2.5.47 - 28 Jul 2023 - Lots of internal code reorganization, in preparation for supporting Controlnets. No user-facing changes. * 2.5.46 - 27 Jul 2023 - (beta-only) Full support for SD-XL models (base and refiner)! From 4d3f55622abc544a62ecb0e75e97a517eba3d18d Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sat, 29 Jul 2023 18:12:48 +0200 Subject: [PATCH 32/39] Support more image sizes (#1441) * Support more image sizes With diffusers, width and height must be a multiple of 8 (instead of 64), allowing more resolution values. * Add swap button * Change popup button icon --- ui/index.html | 57 +++++------------ ui/media/css/main.css | 33 ++++++++++ ui/media/js/main.js | 125 ++++++++++++++++++++++++++++++++++++++ ui/media/js/parameters.js | 4 ++ 4 files changed, 176 insertions(+), 43 deletions(-) diff --git a/ui/index.html b/ui/index.html index 2d47433e..59b74cb3 100644 --- a/ui/index.html +++ b/ui/index.html @@ -191,51 +191,22 @@ Click to learn more about samplers - - + + - + Swap width and height + +
+ Recent sizes +
+ Upscale:
+   
+ Recently used:
+
+
+
+
Small image sizes can cause bad image quality
diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 41c6f196..53424f53 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1754,6 +1754,38 @@ body.wait-pause { font-size: 10pt; } +input#width, input#height { + width: 47pt; +} + +div#recent-resolutions-container { + position: relative; + display:inline-block; +} + +div#recent-resolutions-popup { + position: absolute; + right: 0px; + margin: 3px; + padding: 0.2em 1em 0.4em 1em; + z-index: 1; + background: var(--background-color3); + border-radius: 4px; + box-shadow: 0 20px 28px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15); +} + +div#recent-resolutions-popup small { + opacity: 0.7; +} + +td#image-size-options small { + margin-right: 0px !important; +} + +.clickable { + cursor: pointer; +} + .imgContainer .spinner { position: absolute; left: 50%; @@ -1769,6 +1801,7 @@ body.wait-pause { border: 1px solid var(--button-color); box-shadow: 0px 0px 4px black; } + .imgContainer .spinnerStatus { font-size: 10pt; } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index fa42d3ff..67d4a251 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -77,6 +77,13 @@ let randomSeedField = document.querySelector("#random_seed") let seedField = document.querySelector("#seed") let widthField = document.querySelector("#width") let heightField = document.querySelector("#height") +let recentResolutionsButton = document.querySelector("#recent-resolutions-button") +let recentResolutionsPopup = document.querySelector("#recent-resolutions-popup") +let recentResolutionList = document.querySelector("#recent-resolution-list") +let upscale15Button = document.querySelector("#upscale15") +let upscale2Button = document.querySelector("#upscale2") +let upscale3Button = document.querySelector("#upscale3") +let swapWidthHeightButton = document.querySelector("#swap-width-height") let smallImageWarning = document.querySelector("#small_image_warning") let initImageSelector = document.querySelector("#init_image") let initImagePreview = document.querySelector("#init_image_preview") @@ -2570,3 +2577,121 @@ createLoraEntries() // } // document.querySelectorAll("input[type=number]").forEach(showSpinnerOnlyOnHover) + +////////////////////////////// Image Size Widget ////////////////////////////////////////// + +function roundToMultiple(number, n) { + if (n=="") { n=1 } + return Math.round(number / n) * n; +} + +function upscaleImageSize(factor) { + let step = width.step + width.value = roundToMultiple(width.value*factor, step) + height.value = roundToMultiple(height.value*factor, step) +} + + +function makeResolutionButtons() { + recentResolutionList.innerHTML = "" + recentResolutionsValues.forEach( el => { + let button = document.createElement("button") + button.classList.add("tertiaryButton") + button.style.width="8em" + button.innerHTML = `${el.w}×${el.h}` + button.addEventListener("click", () => { + width.value=el.w + height.value=el.h + width.dispatchEvent(new Event("change")) + height.dispatchEvent(new Event("change")) + recentResolutionsPopup.classList.add("displayNone") + }) + recentResolutionList.appendChild(button) + recentResolutionList.appendChild(document.createElement("br")) + }) + localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) +} + +let recentResolutionsValues = [] + +;(function() { ///// Init resolutions dropdown + upscale15Button.addEventListener("click", () => { + upscaleImageSize(1.5) + recentResolutionsPopup.classList.add("displayNone") + }) + + upscale2Button.addEventListener("click", () => { + upscaleImageSize(2) + recentResolutionsPopup.classList.add("displayNone") + }) + + upscale3Button.addEventListener("click", () => { + upscaleImageSize(3) + recentResolutionsPopup.classList.add("displayNone") + }) + + width.addEventListener("change", () => { + let w = width.value + width.value = roundToMultiple(w, width.step) + if (w!=width.value) { + showToast(`Rounded width to the closest multiple of ${width.step}.`) + } + }) + + height.addEventListener("change", () => { + let h = height.value + height.value = roundToMultiple(h, height.step) + if (h!=height.value) { + showToast(`Rounded height to the closest multiple of ${height.step}.`) + } + }) + + makeImageBtn.addEventListener("click", () => { + let w = width.value + let h = height.value + + recentResolutionsValues = recentResolutionsValues.filter(el => (el.w!=w || el.h!=h)) + recentResolutionsValues.unshift({w: w, h:h}) + recentResolutionsValues = recentResolutionsValues.slice(0,8) + + localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) + makeResolutionButtons() + }) + + let _jsonstring = localStorage.recentResolutionsValues + if (_jsonstring==undefined) { + recentResolutionsValues = [ + {w:512,h:512}, + {w:640,h:448}, + {w:448,h:640}, + {w:512,h:768}, + {w:768,h:512}, + {w:1024,h:768}, + {w:768,h:1024}, + ] + localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) + } else { + recentResolutionsValues = JSON.parse(localStorage.recentResolutionsValues) + } + makeResolutionButtons() + + function processClick(e) { + if (!recentResolutionsPopup.contains(e.target)) { + recentResolutionsPopup.classList.add("displayNone") + } + document.removeEventListener("click", processClick) + } + + recentResolutionsButton.addEventListener("click", (event) => { + recentResolutionsPopup.classList.toggle("displayNone") + event.stopPropagation() + document.addEventListener("click", processClick) + }) + + swapWidthHeightButton.addEventListener("click", (event) => { + let temp = width.value + width.value = height.value + height.value = temp + }) +})() + diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 1980f1a1..0dae628b 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -453,6 +453,8 @@ async function getAppConfig() { document.querySelectorAll("#sampler_name option.diffusers-only").forEach((option) => { option.style.display = "none" }) + width.step=64 + height.step=64 } else { document.querySelector("#lora_model_container").style.display = "" document.querySelector("#tiling_container").style.display = "" @@ -463,6 +465,8 @@ async function getAppConfig() { document.querySelector("#clip_skip_config").classList.remove("displayNone") document.querySelector("#embeddings-button").classList.remove("displayNone") document.querySelector("#negative-embeddings-button").classList.remove("displayNone") + width.step=8 + height.step=8 } console.log("get config status response", config) From 11fb83a2a798baf4c195949469e1c718949dfc08 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 22:03:39 +0530 Subject: [PATCH 33/39] sdkit 1.0.148 - fix watermarking which is causing image artifacts in SDXL; fix SDXL long prompts with compel 2.0.1 --- scripts/check_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 5b5d65fa..7a59a7b4 100644 --- a/scripts/check_modules.py +++ b/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.147", + "sdkit": "1.0.148", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", From 14679586a8111238f9c695ce53130b32f4f36d94 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 22:04:03 +0530 Subject: [PATCH 34/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 96142b30..84554b22 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.47 - 29 Jul 2023 - (beta-only) Fix long prompts with SDXL. * 2.5.47 - 29 Jul 2023 - (beta-only) Fix red dots in some SDXL images. * 2.5.47 - 29 Jul 2023 - Significantly faster `Fix Faces` and `Upscale` buttons (on the image). They no longer need to generate the image from scratch, instead they just upscale/fix the generated image in-place. * 2.5.47 - 28 Jul 2023 - Lots of internal code reorganization, in preparation for supporting Controlnets. No user-facing changes. From 1e2c9ecb41b3945071d840bdf5313938d3beb64f Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 29 Jul 2023 22:24:34 +0530 Subject: [PATCH 35/39] Use nvidia pypi index url for linux --- ui/easydiffusion/package_manager.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/easydiffusion/package_manager.py b/ui/easydiffusion/package_manager.py index 2ec83893..c246c54d 100644 --- a/ui/easydiffusion/package_manager.py +++ b/ui/easydiffusion/package_manager.py @@ -11,7 +11,11 @@ from easydiffusion import app manifest = { "tensorrt": { - "install": ["nvidia-cudnn", "tensorrt-libs", "tensorrt"], + "install": [ + "nvidia-cudnn --extra-index-url=https://pypi.ngc.nvidia.com --trusted-host pypi.ngc.nvidia.com", + "tensorrt-libs --extra-index-url=https://pypi.ngc.nvidia.com --trusted-host pypi.ngc.nvidia.com", + "tensorrt --extra-index-url=https://pypi.ngc.nvidia.com --trusted-host pypi.ngc.nvidia.com", + ], "uninstall": ["tensorrt"], # TODO also uninstall tensorrt-libs and nvidia-cudnn, but do it upon restarting (avoid 'file in use' error) } @@ -29,6 +33,7 @@ if platform.system() == "Windows": wheels = [] for p in packages: + p = p.split(" ")[0] f = next((f for f in files if f.startswith(p) and f.endswith((".whl", ".tar.gz"))), None) if f: wheels.append(os.path.join(trt_dir, f)) From 2e849827d10ac46c89110e9be0064c5c0c27296f Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 30 Jul 2023 06:46:04 +0200 Subject: [PATCH 36/39] Restore width/height dropdown (#1445) --- ui/index.html | 54 +++++- ui/media/css/main.css | 14 +- ui/media/js/main.js | 158 ++++++++++++------ ui/media/js/parameters.js | 8 +- .../ui/image-editor-improvements.plugin.js | 6 +- 5 files changed, 176 insertions(+), 64 deletions(-) diff --git a/ui/index.html b/ui/index.html index 59b74cb3..8d5b0f11 100644 --- a/ui/index.html +++ b/ui/index.html @@ -192,16 +192,62 @@ Click to learn more about samplers - + Swap width and height - +
Recent sizes
- Upscale:
-   
+ Custom size:
+ + × +
+ + Enlarge:
+
  
+ Recently used:
diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 53424f53..5e1cee43 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1754,7 +1754,7 @@ body.wait-pause { font-size: 10pt; } -input#width, input#height { +input#custom-width, input#custom-height { width: 47pt; } @@ -1782,6 +1782,18 @@ td#image-size-options small { margin-right: 0px !important; } +td#image-size-options { + white-space: nowrap; +} + +div#recent-resolution-list { + text-align: center; +} + +div#enlarge-buttons { + text-align: center; +} + .clickable { cursor: pointer; } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 67d4a251..d903fad3 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -77,12 +77,14 @@ let randomSeedField = document.querySelector("#random_seed") let seedField = document.querySelector("#seed") let widthField = document.querySelector("#width") let heightField = document.querySelector("#height") +let customWidthField = document.querySelector("#custom-width") +let customHeightField = document.querySelector("#custom-height") let recentResolutionsButton = document.querySelector("#recent-resolutions-button") let recentResolutionsPopup = document.querySelector("#recent-resolutions-popup") let recentResolutionList = document.querySelector("#recent-resolution-list") -let upscale15Button = document.querySelector("#upscale15") -let upscale2Button = document.querySelector("#upscale2") -let upscale3Button = document.querySelector("#upscale3") +let enlarge15Button = document.querySelector("#enlarge15") +let enlarge2Button = document.querySelector("#enlarge2") +let enlarge3Button = document.querySelector("#enlarge3") let swapWidthHeightButton = document.querySelector("#swap-width-height") let smallImageWarning = document.querySelector("#small_image_warning") let initImageSelector = document.querySelector("#init_image") @@ -2585,70 +2587,100 @@ function roundToMultiple(number, n) { return Math.round(number / n) * n; } -function upscaleImageSize(factor) { - let step = width.step - width.value = roundToMultiple(width.value*factor, step) - height.value = roundToMultiple(height.value*factor, step) +function addImageSizeOption(size) { + let sizes = Object.values(widthField.options).map(o => o.value) + if (!sizes.includes(String(size))) { + sizes.push(String(size)) + sizes.sort( (a,b) => Number(a)-Number(b) ) + + let option = document.createElement("option") + option.value = size + option.text = `${size}` + + widthField.add(option, sizes.indexOf(String(size))) + heightField.add(option.cloneNode(true), sizes.indexOf(String(size))) + } + } +function setImageWidthHeight(w,h) { + let step = customWidthField.step + w = roundToMultiple(w, step) + h = roundToMultiple(h, step) -function makeResolutionButtons() { - recentResolutionList.innerHTML = "" - recentResolutionsValues.forEach( el => { - let button = document.createElement("button") - button.classList.add("tertiaryButton") - button.style.width="8em" - button.innerHTML = `${el.w}×${el.h}` - button.addEventListener("click", () => { - width.value=el.w - height.value=el.h - width.dispatchEvent(new Event("change")) - height.dispatchEvent(new Event("change")) - recentResolutionsPopup.classList.add("displayNone") - }) - recentResolutionList.appendChild(button) - recentResolutionList.appendChild(document.createElement("br")) - }) - localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) + addImageSizeOption(w) + addImageSizeOption(h) + + widthField.value=w + heightField.value=h + widthField.dispatchEvent(new Event("change")) + heightField.dispatchEvent(new Event("change")) +} + +function enlargeImageSize(factor) { + let step = customWidthField.step + + let w = roundToMultiple(widthField.value*factor, step) + let h = roundToMultiple(heightField.value*factor, step) + customWidthField.value = w + customHeightField.value = h } let recentResolutionsValues = [] ;(function() { ///// Init resolutions dropdown - upscale15Button.addEventListener("click", () => { - upscaleImageSize(1.5) - recentResolutionsPopup.classList.add("displayNone") + function makeResolutionButtons() { + recentResolutionList.innerHTML = "" + recentResolutionsValues.forEach( el => { + let button = document.createElement("button") + button.classList.add("tertiaryButton") + button.style.width="8em" + button.innerHTML = `${el.w}×${el.h}` + button.addEventListener("click", () => { + customWidthField.value=el.w + customHeightField.value=el.h + hidePopup() + }) + recentResolutionList.appendChild(button) + recentResolutionList.appendChild(document.createElement("br")) + }) + localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) + } + + enlarge15Button.addEventListener("click", () => { + enlargeImageSize(1.5) + hidePopup() }) - upscale2Button.addEventListener("click", () => { - upscaleImageSize(2) - recentResolutionsPopup.classList.add("displayNone") + enlarge2Button.addEventListener("click", () => { + enlargeImageSize(2) + hidePopup() }) - upscale3Button.addEventListener("click", () => { - upscaleImageSize(3) - recentResolutionsPopup.classList.add("displayNone") + enlarge3Button.addEventListener("click", () => { + enlargeImageSize(3) + hidePopup() }) - width.addEventListener("change", () => { - let w = width.value - width.value = roundToMultiple(w, width.step) - if (w!=width.value) { - showToast(`Rounded width to the closest multiple of ${width.step}.`) + customWidthField.addEventListener("change", () => { + let w = customWidthField.value + customWidthField.value = roundToMultiple(w, customWidthField.step) + if (w!=customWidthField.value) { + showToast(`Rounded width to the closest multiple of ${customWidthField.step}.`) } }) - height.addEventListener("change", () => { - let h = height.value - height.value = roundToMultiple(h, height.step) - if (h!=height.value) { - showToast(`Rounded height to the closest multiple of ${height.step}.`) + customHeightField.addEventListener("change", () => { + let h = customHeightField.value + customHeightField.value = roundToMultiple(h, customHeightField.step) + if (h!=customHeightField.value) { + showToast(`Rounded height to the closest multiple of ${customHeightField.step}.`) } }) makeImageBtn.addEventListener("click", () => { - let w = width.value - let h = height.value + let w = widthField.value + let h = heightField.value recentResolutionsValues = recentResolutionsValues.filter(el => (el.w!=w || el.h!=h)) recentResolutionsValues.unshift({w: w, h:h}) @@ -2675,23 +2707,43 @@ let recentResolutionsValues = [] } makeResolutionButtons() + recentResolutionsValues.forEach( val => { + addImageSizeOption(val.w) + addImageSizeOption(val.h) + }) + function processClick(e) { if (!recentResolutionsPopup.contains(e.target)) { - recentResolutionsPopup.classList.add("displayNone") + hidePopup() } + } + + function showPopup() { + customWidthField.value = widthField.value + customHeightField.value = heightField.value + recentResolutionsPopup.classList.remove("displayNone") + document.addEventListener("click", processClick) + } + + function hidePopup() { + recentResolutionsPopup.classList.add("displayNone") + setImageWidthHeight(customWidthField.value, customHeightField.value) document.removeEventListener("click", processClick) } recentResolutionsButton.addEventListener("click", (event) => { - recentResolutionsPopup.classList.toggle("displayNone") - event.stopPropagation() - document.addEventListener("click", processClick) + if (recentResolutionsPopup.classList.contains("displayNone")) { + showPopup() + event.stopPropagation() + } else { + hidePopup() + } }) swapWidthHeightButton.addEventListener("click", (event) => { - let temp = width.value - width.value = height.value - height.value = temp + let temp = widthField.value + widthField.value = heightField.value + heightField.value = temp }) })() diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 0dae628b..19892c94 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -453,8 +453,8 @@ async function getAppConfig() { document.querySelectorAll("#sampler_name option.diffusers-only").forEach((option) => { option.style.display = "none" }) - width.step=64 - height.step=64 + customWidthField.step=64 + customHeightField.step=64 } else { document.querySelector("#lora_model_container").style.display = "" document.querySelector("#tiling_container").style.display = "" @@ -465,8 +465,8 @@ async function getAppConfig() { document.querySelector("#clip_skip_config").classList.remove("displayNone") document.querySelector("#embeddings-button").classList.remove("displayNone") document.querySelector("#negative-embeddings-button").classList.remove("displayNone") - width.step=8 - height.step=8 + customWidthField.step=8 + customHeightField.step=8 } console.log("get config status response", config) diff --git a/ui/plugins/ui/image-editor-improvements.plugin.js b/ui/plugins/ui/image-editor-improvements.plugin.js index 4d682f3d..7435df8b 100644 --- a/ui/plugins/ui/image-editor-improvements.plugin.js +++ b/ui/plugins/ui/image-editor-improvements.plugin.js @@ -109,8 +109,10 @@ imageObj.onload = function() { // Calculate the maximum cropped dimensions - const maxCroppedWidth = Math.floor(this.width / 64) * 64; - const maxCroppedHeight = Math.floor(this.height / 64) * 64; + const step = customWidthField.step + + const maxCroppedWidth = Math.floor(this.width / step) * step; + const maxCroppedHeight = Math.floor(this.height / step) * step; canvas.width = maxCroppedWidth; canvas.height = maxCroppedHeight; From 1d6742f4638c8319e4ff322d46085fafcc65156b Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 30 Jul 2023 13:51:19 +0530 Subject: [PATCH 37/39] sdkit 1.0.151 - An option to use strict mask borders --- scripts/check_modules.py | 2 +- ui/easydiffusion/types.py | 1 + ui/index.html | 1 + ui/media/js/image-editor.js | 1 + ui/media/js/main.js | 72 +++++++++++++++++++++---------------- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/scripts/check_modules.py b/scripts/check_modules.py index 7a59a7b4..bad46943 100644 --- a/scripts/check_modules.py +++ b/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.148", + "sdkit": "1.0.151", "stable-diffusion-sdkit": "2.1.4", "rich": "12.6.0", "uvicorn": "0.19.0", diff --git a/ui/easydiffusion/types.py b/ui/easydiffusion/types.py index b1d55f5a..894867b8 100644 --- a/ui/easydiffusion/types.py +++ b/ui/easydiffusion/types.py @@ -21,6 +21,7 @@ class GenerateImageRequest(BaseModel): control_alpha: Union[float, List[float]] = None prompt_strength: float = 0.8 preserve_init_image_color_profile = False + strict_mask_border = False sampler_name: str = None # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms" hypernetwork_strength: float = 0 diff --git a/ui/index.html b/ui/index.html index 8d5b0f11..0fcb807d 100644 --- a/ui/index.html +++ b/ui/index.html @@ -109,6 +109,7 @@
+
diff --git a/ui/media/js/image-editor.js b/ui/media/js/image-editor.js index 30026e02..dac172fd 100644 --- a/ui/media/js/image-editor.js +++ b/ui/media/js/image-editor.js @@ -626,6 +626,7 @@ class ImageEditor { .getImageData(0, 0, this.width, this.height) .data.some((channel) => channel !== 0) maskSetting.checked = !is_blank + maskSetting.dispatchEvent(new Event("change")) } this.hide() } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index d903fad3..de518c4c 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -49,6 +49,7 @@ const taskConfigSetup = { use_lora_model: { label: "Lora Model", visible: ({ reqBody }) => !!reqBody?.use_lora_model }, lora_alpha: { label: "Lora Strength", visible: ({ reqBody }) => !!reqBody?.use_lora_model }, preserve_init_image_color_profile: "Preserve Color Profile", + strict_mask_border: "Strict Mask Border", }, pluginTaskConfig: {}, getCSSKey: (key) => @@ -93,7 +94,9 @@ let initImageSizeBox = document.querySelector("#init_image_size_box") let maskImageSelector = document.querySelector("#mask") let maskImagePreview = document.querySelector("#mask_preview") let applyColorCorrectionField = document.querySelector("#apply_color_correction") +let strictMaskBorderField = document.querySelector("#strict_mask_border") let colorCorrectionSetting = document.querySelector("#apply_color_correction_setting") +let strictMaskBorderSetting = document.querySelector("#strict_mask_border_setting") let promptStrengthSlider = document.querySelector("#prompt_strength_slider") let promptStrengthField = document.querySelector("#prompt_strength") let samplerField = document.querySelector("#sampler_name") @@ -1386,6 +1389,7 @@ function getCurrentUserRequest() { // } if (maskSetting.checked) { newTask.reqBody.mask = imageInpainter.getImg() + newTask.reqBody.strict_mask_border = strictMaskBorderField.checked } newTask.reqBody.preserve_init_image_color_profile = applyColorCorrectionField.checked if (!testDiffusers.checked) { @@ -2091,6 +2095,7 @@ function img2imgLoad() { } initImagePreviewContainer.classList.add("has-image") colorCorrectionSetting.style.display = "" + strictMaskBorderSetting.style.display = maskSetting.checked ? "" : "none" initImageSizeBox.textContent = initImagePreview.naturalWidth + " x " + initImagePreview.naturalHeight imageEditor.setImage(this.src, initImagePreview.naturalWidth, initImagePreview.naturalHeight) @@ -2108,6 +2113,7 @@ function img2imgUnload() { } initImagePreviewContainer.classList.remove("has-image") colorCorrectionSetting.style.display = "none" + strictMaskBorderSetting.style.display = "none" imageEditor.setImage(null, parseInt(widthField.value), parseInt(heightField.value)) } initImagePreview.addEventListener("load", img2imgLoad) @@ -2116,6 +2122,9 @@ initImageClearBtn.addEventListener("click", img2imgUnload) maskSetting.addEventListener("click", function() { onDimensionChange() }) +maskSetting.addEventListener("change", function() { + strictMaskBorderSetting.style.display = this.checked ? "" : "none" +}) promptsFromFileBtn.addEventListener("click", function() { promptsFromFileSelector.click() @@ -2583,27 +2592,28 @@ createLoraEntries() ////////////////////////////// Image Size Widget ////////////////////////////////////////// function roundToMultiple(number, n) { - if (n=="") { n=1 } - return Math.round(number / n) * n; + if (n == "") { + n = 1 + } + return Math.round(number / n) * n } function addImageSizeOption(size) { - let sizes = Object.values(widthField.options).map(o => o.value) + let sizes = Object.values(widthField.options).map((o) => o.value) if (!sizes.includes(String(size))) { sizes.push(String(size)) - sizes.sort( (a,b) => Number(a)-Number(b) ) + sizes.sort((a, b) => Number(a) - Number(b)) let option = document.createElement("option") option.value = size option.text = `${size}` - + widthField.add(option, sizes.indexOf(String(size))) heightField.add(option.cloneNode(true), sizes.indexOf(String(size))) } - } -function setImageWidthHeight(w,h) { +function setImageWidthHeight(w, h) { let step = customWidthField.step w = roundToMultiple(w, step) h = roundToMultiple(h, step) @@ -2611,8 +2621,8 @@ function setImageWidthHeight(w,h) { addImageSizeOption(w) addImageSizeOption(h) - widthField.value=w - heightField.value=h + widthField.value = w + heightField.value = h widthField.dispatchEvent(new Event("change")) heightField.dispatchEvent(new Event("change")) } @@ -2620,25 +2630,26 @@ function setImageWidthHeight(w,h) { function enlargeImageSize(factor) { let step = customWidthField.step - let w = roundToMultiple(widthField.value*factor, step) - let h = roundToMultiple(heightField.value*factor, step) + let w = roundToMultiple(widthField.value * factor, step) + let h = roundToMultiple(heightField.value * factor, step) customWidthField.value = w customHeightField.value = h } let recentResolutionsValues = [] -;(function() { ///// Init resolutions dropdown +;(function() { + ///// Init resolutions dropdown function makeResolutionButtons() { recentResolutionList.innerHTML = "" - recentResolutionsValues.forEach( el => { + recentResolutionsValues.forEach((el) => { let button = document.createElement("button") button.classList.add("tertiaryButton") - button.style.width="8em" + button.style.width = "8em" button.innerHTML = `${el.w}×${el.h}` button.addEventListener("click", () => { - customWidthField.value=el.w - customHeightField.value=el.h + customWidthField.value = el.w + customHeightField.value = el.h hidePopup() }) recentResolutionList.appendChild(button) @@ -2665,7 +2676,7 @@ let recentResolutionsValues = [] customWidthField.addEventListener("change", () => { let w = customWidthField.value customWidthField.value = roundToMultiple(w, customWidthField.step) - if (w!=customWidthField.value) { + if (w != customWidthField.value) { showToast(`Rounded width to the closest multiple of ${customWidthField.step}.`) } }) @@ -2673,7 +2684,7 @@ let recentResolutionsValues = [] customHeightField.addEventListener("change", () => { let h = customHeightField.value customHeightField.value = roundToMultiple(h, customHeightField.step) - if (h!=customHeightField.value) { + if (h != customHeightField.value) { showToast(`Rounded height to the closest multiple of ${customHeightField.step}.`) } }) @@ -2682,24 +2693,24 @@ let recentResolutionsValues = [] let w = widthField.value let h = heightField.value - recentResolutionsValues = recentResolutionsValues.filter(el => (el.w!=w || el.h!=h)) - recentResolutionsValues.unshift({w: w, h:h}) - recentResolutionsValues = recentResolutionsValues.slice(0,8) + recentResolutionsValues = recentResolutionsValues.filter((el) => el.w != w || el.h != h) + recentResolutionsValues.unshift({ w: w, h: h }) + recentResolutionsValues = recentResolutionsValues.slice(0, 8) localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) makeResolutionButtons() }) let _jsonstring = localStorage.recentResolutionsValues - if (_jsonstring==undefined) { + if (_jsonstring == undefined) { recentResolutionsValues = [ - {w:512,h:512}, - {w:640,h:448}, - {w:448,h:640}, - {w:512,h:768}, - {w:768,h:512}, - {w:1024,h:768}, - {w:768,h:1024}, + { w: 512, h: 512 }, + { w: 640, h: 448 }, + { w: 448, h: 640 }, + { w: 512, h: 768 }, + { w: 768, h: 512 }, + { w: 1024, h: 768 }, + { w: 768, h: 1024 }, ] localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues) } else { @@ -2707,7 +2718,7 @@ let recentResolutionsValues = [] } makeResolutionButtons() - recentResolutionsValues.forEach( val => { + recentResolutionsValues.forEach((val) => { addImageSizeOption(val.w) addImageSizeOption(val.h) }) @@ -2746,4 +2757,3 @@ let recentResolutionsValues = [] heightField.value = temp }) })() - From 9c06e2612a72e792117b798947e35eca48f1f8ab Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 30 Jul 2023 13:53:27 +0530 Subject: [PATCH 38/39] changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 84554b22..1ac36410 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ 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.47 - 30 Jul 2023 - An option to use `Strict Mask Border` while inpainting, to avoid touching areas outside the mask. But this might show a slight outline of the mask, which you will have to touch up separately. * 2.5.47 - 29 Jul 2023 - (beta-only) Fix long prompts with SDXL. * 2.5.47 - 29 Jul 2023 - (beta-only) Fix red dots in some SDXL images. * 2.5.47 - 29 Jul 2023 - Significantly faster `Fix Faces` and `Upscale` buttons (on the image). They no longer need to generate the image from scratch, instead they just upscale/fix the generated image in-place. From 432fd575818f3f60878f79b9b642817b4a24b2a3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 30 Jul 2023 14:06:31 +0530 Subject: [PATCH 39/39] Use the desired output format and quality while applying the quick filter --- ui/media/js/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/media/js/main.js b/ui/media/js/main.js index de518c4c..1c76543a 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -699,6 +699,9 @@ function applyInlineFilter(filterName, path, filterParams, img, statusText, tool filter: filterName, model_paths: {}, filter_params: filterParams, + output_format: outputFormatField.value, + output_quality: parseInt(outputQualityField.value), + output_lossless: outputLosslessField.checked, } filterReq.model_paths[filterName] = path