mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2025-05-17 14:50:46 +02:00
v2.6.0 (beta) - switch beta to use diffusers by default
This commit is contained in:
parent
fcb59c68d4
commit
2d2a75f23c
@ -60,6 +60,7 @@ APP_CONFIG_DEFAULTS = {
|
|||||||
"ui": {
|
"ui": {
|
||||||
"open_browser_on_start": True,
|
"open_browser_on_start": True,
|
||||||
},
|
},
|
||||||
|
"test_diffusers": True,
|
||||||
}
|
}
|
||||||
|
|
||||||
IMAGE_EXTENSIONS = [
|
IMAGE_EXTENSIONS = [
|
||||||
@ -115,7 +116,7 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
|
|||||||
|
|
||||||
def set_config_on_startup(config: dict):
|
def set_config_on_startup(config: dict):
|
||||||
if getConfig.__test_diffusers_on_startup is None:
|
if getConfig.__test_diffusers_on_startup is None:
|
||||||
getConfig.__test_diffusers_on_startup = config.get("test_diffusers", False)
|
getConfig.__test_diffusers_on_startup = config.get("test_diffusers", True)
|
||||||
config["config_on_startup"] = {"test_diffusers": getConfig.__test_diffusers_on_startup}
|
config["config_on_startup"] = {"test_diffusers": getConfig.__test_diffusers_on_startup}
|
||||||
|
|
||||||
if os.path.isfile(config_yaml_path):
|
if os.path.isfile(config_yaml_path):
|
||||||
|
@ -31,7 +31,7 @@ def init(device):
|
|||||||
|
|
||||||
app_config = app.getConfig()
|
app_config = app.getConfig()
|
||||||
context.test_diffusers = (
|
context.test_diffusers = (
|
||||||
app_config.get("test_diffusers", False) and app_config.get("update_branch", "main") != "main"
|
app_config.get("test_diffusers", True) and app_config.get("update_branch", "main") != "main"
|
||||||
)
|
)
|
||||||
|
|
||||||
log.info("Device usage during initialization:")
|
log.info("Device usage during initialization:")
|
||||||
|
@ -63,7 +63,7 @@ class SetAppConfigRequest(BaseModel, extra=Extra.allow):
|
|||||||
ui_open_browser_on_start: bool = None
|
ui_open_browser_on_start: bool = None
|
||||||
listen_to_network: bool = None
|
listen_to_network: bool = None
|
||||||
listen_port: int = None
|
listen_port: int = None
|
||||||
test_diffusers: bool = False
|
test_diffusers: bool = True
|
||||||
|
|
||||||
|
|
||||||
def init():
|
def init():
|
||||||
|
@ -219,7 +219,7 @@ def get_printable_request(req: GenerateImageRequest, task_data: TaskData, output
|
|||||||
task_data_metadata.update(output_format.dict())
|
task_data_metadata.update(output_format.dict())
|
||||||
|
|
||||||
app_config = app.getConfig()
|
app_config = app.getConfig()
|
||||||
using_diffusers = app_config.get("test_diffusers", False)
|
using_diffusers = app_config.get("test_diffusers", True)
|
||||||
|
|
||||||
# Save the metadata in the order defined in TASK_TEXT_MAPPING
|
# Save the metadata in the order defined in TASK_TEXT_MAPPING
|
||||||
metadata = {}
|
metadata = {}
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
<h1>
|
<h1>
|
||||||
<img id="logo_img" src="/media/images/icon-512x512.png" >
|
<img id="logo_img" src="/media/images/icon-512x512.png" >
|
||||||
Easy Diffusion
|
Easy Diffusion
|
||||||
<small><span id="version">v2.5.48</span> <span id="updateBranchLabel"></span></small>
|
<small><span id="version">v2.6.0</span> <span id="updateBranchLabel"></span></small>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
<div id="server-status">
|
<div id="server-status">
|
||||||
|
@ -2648,10 +2648,6 @@ embeddingsCollapsiblesBtn.addEventListener("click", (e) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
if (testDiffusers.checked) {
|
|
||||||
document.getElementById("embeddings-container").classList.remove("displayNone")
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Pause function */
|
/* Pause function */
|
||||||
document.querySelectorAll(".tab").forEach(linkTabContents)
|
document.querySelectorAll(".tab").forEach(linkTabContents)
|
||||||
|
|
||||||
|
@ -229,11 +229,11 @@ var PARAMETERS = [
|
|||||||
{
|
{
|
||||||
id: "test_diffusers",
|
id: "test_diffusers",
|
||||||
type: ParameterType.checkbox,
|
type: ParameterType.checkbox,
|
||||||
label: "Test Diffusers",
|
label: "Use the new v2.6 engine (diffusers)",
|
||||||
note:
|
note:
|
||||||
"<b>Experimental! Can have bugs!</b> Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.",
|
"Use our new v2.6 engine, with additional features like LoRA, ControlNet, Embeddings, Tiling and lots more! Please press Save, then restart the program after changing this.",
|
||||||
icon: "fa-bolt",
|
icon: "fa-bolt",
|
||||||
default: false,
|
default: true,
|
||||||
saveInAppConfig: true,
|
saveInAppConfig: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -454,7 +454,10 @@ async function getAppConfig() {
|
|||||||
listenPortField.value = config.net.listen_port
|
listenPortField.value = config.net.listen_port
|
||||||
}
|
}
|
||||||
|
|
||||||
const testDiffusersEnabled = config.test_diffusers && config.update_branch !== "main"
|
let testDiffusersEnabled = config.update_branch !== "main"
|
||||||
|
if (config.test_diffusers === false) {
|
||||||
|
testDiffusersEnabled = false
|
||||||
|
}
|
||||||
testDiffusers.checked = testDiffusersEnabled
|
testDiffusers.checked = testDiffusersEnabled
|
||||||
|
|
||||||
if (config.config_on_startup) {
|
if (config.config_on_startup) {
|
||||||
|
Loading…
Reference in New Issue
Block a user