`
- logError(msg, event, outputMsg)
}
break
}
@@ -885,15 +875,15 @@ function onTaskCompleted(task, reqBody, instance, outputContainer, stepUpdate) {
1. If you have set an initial image, please try reducing its dimension to ${MAX_INIT_IMAGE_DIMENSION}x${MAX_INIT_IMAGE_DIMENSION} or smaller.
2. Try picking a lower level in the 'GPU Memory Usage' setting (in the 'Settings' tab).
3. Try generating a smaller image. `
- } else if (msg.toLowerCase().includes("DefaultCPUAllocator: not enough memory")) {
+ } else if (msg.includes("DefaultCPUAllocator: not enough memory")) {
msg += `
Reason: Your computer is running out of system RAM!
-
+
Suggestions:
1. Try closing unnecessary programs and browser tabs.
2. If that doesn't help, please increase your computer's virtual memory by following these steps for
- Windows, or
+ Windows or
Linux.
3. Try restarting your computer. `
}
@@ -1268,6 +1258,10 @@ function getCurrentUserRequest() {
if (useUpscalingField.checked) {
newTask.reqBody.use_upscale = upscaleModelField.value
newTask.reqBody.upscale_amount = upscaleAmountField.value
+ if (upscaleModelField.value === "latent_upscaler") {
+ newTask.reqBody.upscale_amount = "2"
+ newTask.reqBody.latent_upscaler_steps = latentUpscalerStepsField.value
+ }
}
if (hypernetworkModelField.value) {
newTask.reqBody.use_hypernetwork_model = hypernetworkModelField.value
@@ -1582,6 +1576,20 @@ useUpscalingField.addEventListener("change", function(e) {
upscaleAmountField.disabled = !this.checked
})
+function onUpscaleModelChange() {
+ let upscale4x = document.querySelector("#upscale_amount_4x")
+ if (upscaleModelField.value === "latent_upscaler") {
+ upscale4x.disabled = true
+ upscaleAmountField.value = "2"
+ latentUpscalerSettings.classList.remove("displayNone")
+ } else {
+ upscale4x.disabled = false
+ latentUpscalerSettings.classList.add("displayNone")
+ }
+}
+upscaleModelField.addEventListener("change", onUpscaleModelChange)
+onUpscaleModelChange()
+
makeImageBtn.addEventListener("click", makeImage)
document.onkeydown = function(e) {
@@ -1591,6 +1599,27 @@ document.onkeydown = function(e) {
}
}
+/********************* Latent Upscaler Steps **************************/
+function updateLatentUpscalerSteps() {
+ latentUpscalerStepsField.value = latentUpscalerStepsSlider.value
+ latentUpscalerStepsField.dispatchEvent(new Event("change"))
+}
+
+function updateLatentUpscalerStepsSlider() {
+ if (latentUpscalerStepsField.value < 1) {
+ latentUpscalerStepsField.value = 1
+ } else if (latentUpscalerStepsField.value > 50) {
+ latentUpscalerStepsField.value = 50
+ }
+
+ latentUpscalerStepsSlider.value = latentUpscalerStepsField.value
+ latentUpscalerStepsSlider.dispatchEvent(new Event("change"))
+}
+
+latentUpscalerStepsSlider.addEventListener("input", updateLatentUpscalerSteps)
+latentUpscalerStepsField.addEventListener("input", updateLatentUpscalerStepsSlider)
+updateLatentUpscalerSteps()
+
/********************* Guidance **************************/
function updateGuidanceScale() {
guidanceScaleField.value = guidanceScaleSlider.value / 10
diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js
index f51b5290..4c7240eb 100644
--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@@ -191,7 +191,8 @@ var PARAMETERS = [
id: "listen_port",
type: ParameterType.custom,
label: "Network port",
- note: "Port that this server listens to. The '9000' part in 'http://localhost:9000'. Please restart the program after changing this.",
+ note:
+ "Port that this server listens to. The '9000' part in 'http://localhost:9000'. Please restart the program after changing this.",
icon: "fa-anchor",
render: (parameter) => {
return ``
@@ -396,14 +397,14 @@ async function getAppConfig() {
document.querySelector("#lora_model_container").style.display = "none"
document.querySelector("#lora_alpha_container").style.display = "none"
- document.querySelectorAll("#sampler_name option.diffusers-only").forEach(option => {
+ document.querySelectorAll("#sampler_name option.diffusers-only").forEach((option) => {
option.style.display = "none"
})
} else {
document.querySelector("#lora_model_container").style.display = ""
document.querySelector("#lora_alpha_container").style.display = loraModelField.value ? "" : "none"
- document.querySelectorAll("#sampler_name option.k_diffusion-only").forEach(option => {
+ document.querySelectorAll("#sampler_name option.k_diffusion-only").forEach((option) => {
option.disabled = true
})
document.querySelector("#clip_skip_config").classList.remove("displayNone")
@@ -568,6 +569,16 @@ async function getSystemInfo() {
if (allDeviceIds.length === 0) {
useCPUField.checked = true
useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
+
+ getParameterSettingsEntry("use_cpu").addEventListener("click", function() {
+ alert(
+ "Sorry, we could not find a compatible graphics card! Easy Diffusion supports graphics cards with minimum 2 GB of RAM. " +
+ "Only NVIDIA cards are supported on Windows. NVIDIA and AMD cards are supported on Linux.
" +
+ "If you have a compatible graphics card, please try updating to the latest drivers.
" +
+ "Only the CPU can be used for generating images, without a compatible graphics card.",
+ "No compatible graphics card found!"
+ )
+ })
}
autoPickGPUsField.checked = devices["config"] === "auto"
@@ -586,7 +597,7 @@ async function getSystemInfo() {
$("#use_gpus").val(activeDeviceIds)
}
- document.dispatchEvent(new CustomEvent("system_info_update", { detail: devices}))
+ document.dispatchEvent(new CustomEvent("system_info_update", { detail: devices }))
setHostInfo(res["hosts"])
let force = false
if (res["enforce_output_dir"] !== undefined) {
diff --git a/ui/media/js/utils.js b/ui/media/js/utils.js
index d1578d8e..6ddb0ae6 100644
--- a/ui/media/js/utils.js
+++ b/ui/media/js/utils.js
@@ -843,57 +843,83 @@ function createTab(request) {
/* TOAST NOTIFICATIONS */
function showToast(message, duration = 5000, error = false) {
- const toast = document.createElement("div");
- toast.classList.add("toast-notification");
+ const toast = document.createElement("div")
+ toast.classList.add("toast-notification")
if (error === true) {
- toast.classList.add("toast-notification-error");
+ toast.classList.add("toast-notification-error")
}
- toast.innerHTML = message;
- document.body.appendChild(toast);
+ toast.innerHTML = message
+ document.body.appendChild(toast)
// Set the position of the toast on the screen
- const toastCount = document.querySelectorAll(".toast-notification").length;
- const toastHeight = toast.offsetHeight;
+ const toastCount = document.querySelectorAll(".toast-notification").length
+ const toastHeight = toast.offsetHeight
const previousToastsHeight = Array.from(document.querySelectorAll(".toast-notification"))
.slice(0, -1) // exclude current toast
- .reduce((totalHeight, toast) => totalHeight + toast.offsetHeight + 10, 0); // add 10 pixels for spacing
- toast.style.bottom = `${10 + previousToastsHeight}px`;
- toast.style.right = "10px";
+ .reduce((totalHeight, toast) => totalHeight + toast.offsetHeight + 10, 0) // add 10 pixels for spacing
+ toast.style.bottom = `${10 + previousToastsHeight}px`
+ toast.style.right = "10px"
// Delay the removal of the toast until animation has completed
const removeToast = () => {
- toast.classList.add("hide");
+ toast.classList.add("hide")
const removeTimeoutId = setTimeout(() => {
- toast.remove();
+ toast.remove()
// Adjust the position of remaining toasts
- const remainingToasts = document.querySelectorAll(".toast-notification");
- const removedToastBottom = toast.getBoundingClientRect().bottom;
-
+ const remainingToasts = document.querySelectorAll(".toast-notification")
+ const removedToastBottom = toast.getBoundingClientRect().bottom
+
remainingToasts.forEach((toast) => {
if (toast.getBoundingClientRect().bottom < removedToastBottom) {
- toast.classList.add("slide-down");
+ toast.classList.add("slide-down")
}
- });
-
+ })
+
// Wait for the slide-down animation to complete
setTimeout(() => {
// Remove the slide-down class after the animation has completed
- const slidingToasts = document.querySelectorAll(".slide-down");
+ const slidingToasts = document.querySelectorAll(".slide-down")
slidingToasts.forEach((toast) => {
- toast.classList.remove("slide-down");
- });
-
+ toast.classList.remove("slide-down")
+ })
+
// Adjust the position of remaining toasts again, in case there are multiple toasts being removed at once
- const remainingToastsDown = document.querySelectorAll(".toast-notification");
- let heightSoFar = 0;
+ const remainingToastsDown = document.querySelectorAll(".toast-notification")
+ let heightSoFar = 0
remainingToastsDown.forEach((toast) => {
- toast.style.bottom = `${10 + heightSoFar}px`;
- heightSoFar += toast.offsetHeight + 10; // add 10 pixels for spacing
- });
- }, 0); // The duration of the slide-down animation (in milliseconds)
- }, 500);
- };
+ toast.style.bottom = `${10 + heightSoFar}px`
+ heightSoFar += toast.offsetHeight + 10 // add 10 pixels for spacing
+ })
+ }, 0) // The duration of the slide-down animation (in milliseconds)
+ }, 500)
+ }
// Remove the toast after specified duration
- setTimeout(removeToast, duration);
+ setTimeout(removeToast, duration)
+}
+
+function alert(msg, title) {
+ title = title || ""
+ $.alert({
+ theme: "modern",
+ title: title,
+ useBootstrap: false,
+ animateFromElement: false,
+ content: msg,
+ })
+}
+
+function confirm(msg, title, fn) {
+ title = title || ""
+ $.confirm({
+ theme: "modern",
+ title: title,
+ useBootstrap: false,
+ animateFromElement: false,
+ content: msg,
+ buttons: {
+ yes: fn,
+ cancel: () => {},
+ },
+ })
}
Easy Diffusion
- v2.5.37
+ v2.5.38