extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2024-11-22 08:13:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from easydiffusion/beta

Browse Source 
Beta
This commit is contained in:
cmdr2 2023-08-31 22:28:03 +05:30 committed by GitHub
commit b8706da990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/easydiffusion/server.py
View File

@ -272,7 +272,7 @@ def render_internal(req: dict):
# Overwrite user specified save path # Overwrite user specified save path
config = app.getConfig() config = app.getConfig()
if "force_save_path" in config: if "force_save_path" in config:
task_data.save_to_disk_path = config["force_save_path"] save_data.save_to_disk_path = config["force_save_path"]
render_req.init_image_mask = req.get("mask") # hack: will rename this in the HTTP API in a future revision render_req.init_image_mask = req.get("mask") # hack: will rename this in the HTTP API in a future revision

46
ui/index.html
View File

@ -508,28 +508,45 @@
<div class="float-container"> <div class="float-container">
<div class="float-child"> <div class="float-child">
<h1>Help</h1> <h1>Help</h1>
<ul id="help-links"> <div id="help-links">
<li><span class="help-section">Using the software</span> <h4><span class="help-section"><b>Basics</b></span></h4>
<ul> <ul>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/How-To-Use" target="_blank"><i class="fa-solid fa-book fa-fw"></i> How to use</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/How-To-Use" target="_blank">How to use</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/UI-Overview" target="_blank"><i class="fa-solid fa-list fa-fw"></i> UI Overview</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Writing-Prompts" target="_blank">Writing prompts</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Writing-Prompts" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> Writing prompts</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Image-Modifers" target="_blank">Image Modifiers</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Inpainting" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Inpainting</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Inpainting" target="_blank">Inpainting</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Run-on-Multiple-GPUs" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Run on Multiple GPUs</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Samplers" target="_blank">Samplers</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/UI-Overview" target="_blank">Summary of every UI option</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Run-on-Multiple-GPUs" target="_blank">Run on Multiple GPUs</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Troubleshooting" target="_blank">Common error messages (and solutions)</a></li>
</ul> </ul>
<li><span class="help-section">Installation</span> <h4><span class="help-section"><b>Intermediate</b></span></h4>
<ul> <ul>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Troubleshooting" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Troubleshooting</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Custom-Models" target="_blank">Custom Models</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Prompt-Syntax" target="_blank">Prompt Syntax (weights, emphasis etc)</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Embeddings" target="_blank">Embeddings</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/LoRA" target="_blank">LoRA</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/SDXL" target="_blank">SDXL</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/ControlNet" target="_blank">ControlNet</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Seamless-Tiling" target="_blank">Seamless Tiling</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/xFormers" target="_blank">xFormers</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/The-beta-channel" target="_blank">The beta channel</a></li>
</ul> </ul>
<li><span class="help-section">Downloadable Content</span> <h4><span class="help-section"><b>Advanced topics</b></span></h4>
<ul> <ul>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Custom-Models" target="_blank"><i class="fa-solid fa-images fa-fw"></i> Custom Models</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/UI-Plugins" target="_blank">UI Plugins</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/UI-Plugins" target="_blank"><i class="fa-solid fa-puzzle-piece fa-fw"></i> UI Plugins</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Run-on-Multiple-GPUs" target="_blank">Run on Multiple GPUs</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/VAE-Variational-Auto-Encoder" target="_blank"><i class="fa-solid fa-hand-sparkles fa-fw"></i> VAE Variational Auto Encoder</a> <li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Model-Merging" target="_blank">Model Merging</a></li>
<li> <a href="https://github.com/easydiffusion/easydiffusion/wiki/Custom-Modifiers" target="_blank">Custom Modifiers</a></li>
</ul> </ul>
</ul>
<h4><span class="help-section"><b>Misc</b></span></h4>
<ul>
<li> <a href="https://theally.notion.site/The-Definitive-Stable-Diffusion-Glossary-1d1e6d15059c41e6a6b4306b4ecd9df9" target="_blank">Glossary of Stable Diffusion related terms</a></li>
</ul>
</div>
</div> </div>
<div class="float-child"> <div class="float-child">
@ -798,6 +815,7 @@
<p>This license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, <br/>spread misinformation and target vulnerable groups. For the full list of restrictions please read <a href="https://github.com/easydiffusion/easydiffusion/blob/main/LICENSE" target="_blank">the license</a>.</p> <p>This license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, <br/>spread misinformation and target vulnerable groups. For the full list of restrictions please read <a href="https://github.com/easydiffusion/easydiffusion/blob/main/LICENSE" target="_blank">the license</a>.</p>
<p>By using this software, you consent to the terms and conditions of the license.</p> <p>By using this software, you consent to the terms and conditions of the license.</p>
</div> </div>
<input id="test_diffusers" type="checkbox" style="display: none" checked />
</div> </div>
</div> </div>
</body> </body>

9
ui/media/css/main.css
View File

@ -609,11 +609,18 @@ div.img-preview img {
margin: auto; margin: auto;
padding: 0px; padding: 0px;
} }
#help-links ul {
list-style-type: disc;
padding-left: 12pt;
}
#help-links li { #help-links li {
padding-bottom: 12pt; padding-bottom: 6pt;
display: block; display: block;
font-size: 10pt; font-size: 10pt;
} }
#help-links ul li {
display: list-item;
}
#help-links li .fa-fw { #help-links li .fa-fw {
padding-right: 2pt; padding-right: 2pt;
} }

2
ui/media/js/main.js
View File

@ -1345,7 +1345,7 @@ function setEmbeddings(task) {
let prompt = task.reqBody.prompt let prompt = task.reqBody.prompt
let negativePrompt = task.reqBody.negative_prompt let negativePrompt = task.reqBody.negative_prompt
let overallPrompt = (prompt + " " + negativePrompt).toLowerCase() let overallPrompt = (prompt + " " + negativePrompt).toLowerCase()
overallPrompt = overallPrompt.replaceAll(/[^a-z0-9\.]/g, " ") // only allow alpha-numeric and dots overallPrompt = overallPrompt.replaceAll(/[^a-z0-9\-_\.]/g, " ") // only allow alpha-numeric, dots and hyphens
overallPrompt = overallPrompt.split(" ") overallPrompt = overallPrompt.split(" ")
let embeddingsTree = modelsOptions["embeddings"] let embeddingsTree = modelsOptions["embeddings"]

1
ui/media/js/parameters.js
View File

@ -469,6 +469,7 @@ async function getAppConfig() {
testDiffusersEnabled = false testDiffusersEnabled = false
} }
testDiffusers.checked = testDiffusersEnabled testDiffusers.checked = testDiffusersEnabled
document.querySelector("#test_diffusers").checked = testDiffusers.checked // don't break plugins
if (config.config_on_startup) { if (config.config_on_startup) {
if (config.config_on_startup?.use_v3_engine) { if (config.config_on_startup?.use_v3_engine) {