From d9eab7f383ee97800924ba5843d2d0cb058cc5e6 Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Mon, 29 Aug 2022 09:47:45 -0700 Subject: [PATCH] use LF not CRLF for files, oh god --- static/dream_web/index.css | 138 ++++++++++---------- static/dream_web/index.html | 188 +++++++++++++------------- static/dream_web/index.js | 254 ++++++++++++++++++------------------ 3 files changed, 290 insertions(+), 290 deletions(-) diff --git a/static/dream_web/index.css b/static/dream_web/index.css index 2137b9907d..8b0f4785f7 100644 --- a/static/dream_web/index.css +++ b/static/dream_web/index.css @@ -1,69 +1,69 @@ -* { - font-family: 'Arial'; -} -#header { - text-decoration: dotted underline; -} -#search { - margin-top: 20vh; - margin-left: auto; - margin-right: auto; - max-width: 800px; - - text-align: center; -} -fieldset { - border: none; -} -#fieldset-search { - display: flex; -} -#scaling-inprocess-message{ - font-weight: bold; - font-style: italic; - display: none; -} -#prompt { - flex-grow: 1; - - border-radius: 20px 0px 0px 20px; - padding: 5px 10px 5px 10px; - border: 1px solid black; - border-right: none; - outline: none; -} -#submit { - border-radius: 0px 20px 20px 0px; - padding: 5px 10px 5px 10px; - border: 1px solid black; -} -#reset-all { - background-color: pink; -} -#results { - text-align: center; - max-width: 1000px; - margin: auto; - padding-top: 10px; -} -img { - cursor: pointer; - height: 30vh; - border-radius: 5px; - margin: 10px; -} -#fieldset-config { - line-height:2em; -} -input[type="number"] { - width: 60px; -} -#seed { - width: 150px; -} -hr { - width: 200px; -} -label { - white-space: nowrap; -} +* { + font-family: 'Arial'; +} +#header { + text-decoration: dotted underline; +} +#search { + margin-top: 20vh; + margin-left: auto; + margin-right: auto; + max-width: 800px; + + text-align: center; +} +fieldset { + border: none; +} +#fieldset-search { + display: flex; +} +#scaling-inprocess-message{ + font-weight: bold; + font-style: italic; + display: none; +} +#prompt { + flex-grow: 1; + + border-radius: 20px 0px 0px 20px; + padding: 5px 10px 5px 10px; + border: 1px solid black; + border-right: none; + outline: none; +} +#submit { + border-radius: 0px 20px 20px 0px; + padding: 5px 10px 5px 10px; + border: 1px solid black; +} +#reset-all { + background-color: pink; +} +#results { + text-align: center; + max-width: 1000px; + margin: auto; + padding-top: 10px; +} +img { + cursor: pointer; + height: 30vh; + border-radius: 5px; + margin: 10px; +} +#fieldset-config { + line-height:2em; +} +input[type="number"] { + width: 60px; +} +#seed { + width: 150px; +} +hr { + width: 200px; +} +label { + white-space: nowrap; +} diff --git a/static/dream_web/index.html b/static/dream_web/index.html index bd0040b15a..c145e5cd79 100644 --- a/static/dream_web/index.html +++ b/static/dream_web/index.html @@ -1,94 +1,94 @@ - - - Stable Diffusion Dream Server - - - - - - - - -
-
-

No results...

 -
-
- - + + + Stable Diffusion Dream Server + + + + + + + + +
+
+

No results...

 +
+
+ + diff --git a/static/dream_web/index.js b/static/dream_web/index.js index 839451c50b..8e6561ee76 100644 --- a/static/dream_web/index.js +++ b/static/dream_web/index.js @@ -1,127 +1,127 @@ -function toBase64(file) { - return new Promise((resolve, reject) => { - const r = new FileReader(); - r.readAsDataURL(file); - r.onload = () => resolve(r.result); - r.onerror = (error) => reject(error); - }); -} - -function appendOutput(src, seed, config) { - let outputNode = document.createElement("img"); - outputNode.src = src; - - let altText = seed.toString() + " | " + config.prompt; - outputNode.alt = altText; - outputNode.title = altText; - - // Reload image config - outputNode.addEventListener('click', () => { - let form = document.querySelector("#generate-form"); - for (const [k, v] of new FormData(form)) { - form.querySelector(`*[name=${k}]`).value = config[k]; - } - document.querySelector("#seed").value = seed; - - saveFields(document.querySelector("#generate-form")); - }); - - document.querySelector("#results").prepend(outputNode); -} - -function saveFields(form) { - for (const [k, v] of new FormData(form)) { - if (typeof v !== 'object') { // Don't save 'file' type - localStorage.setItem(k, v); - } - } -} - -function loadFields(form) { - for (const [k, v] of new FormData(form)) { - const item = localStorage.getItem(k); - if (item != null) { - form.querySelector(`*[name=${k}]`).value = item; - } - } -} - -function clearFields(form) { - localStorage.clear() - location.reload() -} - -async function generateSubmit(form) { - const prompt = document.querySelector("#prompt").value; - - // Convert file data to base64 - let formData = Object.fromEntries(new FormData(form)); - formData.initimg = formData.initimg.name !== '' ? await toBase64(formData.initimg) : null; - - document.querySelector('progress').setAttribute('max', formData.steps); - - // Post as JSON, using Fetch streaming to get results - fetch(form.action, { - method: form.method, - body: JSON.stringify(formData), - }).then(async (response) => { - const reader = response.body.getReader(); - - let noOutputs = true; - while (true) { - let {value, done} = await reader.read(); - value = new TextDecoder().decode(value); - if (done) break; - - for (let event of value.split('\n').filter(e => e !== '')) { - const data = JSON.parse(event); - - if (data.event == 'result') { - noOutputs = false; - document.querySelector("#no-results-message")?.remove(); - appendOutput(data.files[0],data.files[1],data.config) - } else if (data.event == 'upscaling-started') { - document.getElementById("processing_cnt").textContent=data.processed_file_cnt; - document.getElementById("scaling-inprocess-message").style.display = "block"; - } else if (data.event == 'upscaling-done') { - document.getElementById("scaling-inprocess-message").style.display = "none"; - } else if (data.event == 'step') { - document.querySelector('progress').setAttribute('value', data.step.toString()); - } - } - } - - // Re-enable form, remove no-results-message - form.querySelector('fieldset').removeAttribute('disabled'); - document.querySelector("#prompt").value = prompt; - document.querySelector('progress').setAttribute('value', '0'); - - if (noOutputs) { - alert("Error occurred while generating."); - } - }); - - // Disable form while generating - form.querySelector('fieldset').setAttribute('disabled',''); - document.querySelector("#prompt").value = `Generating: "${prompt}"`; -} - -window.onload = () => { - document.querySelector("#generate-form").addEventListener('submit', (e) => { - e.preventDefault(); - const form = e.target; - - generateSubmit(form); - }); - document.querySelector("#generate-form").addEventListener('change', (e) => { - saveFields(e.target.form); - }); - document.querySelector("#reset").addEventListener('click', (e) => { - document.querySelector("#seed").value = -1; - saveFields(e.target.form); - }); - document.querySelector("#reset-all").addEventListener('click', (e) => { - clearFields(e.target.form); - }); - loadFields(document.querySelector("#generate-form")); -}; +function toBase64(file) { + return new Promise((resolve, reject) => { + const r = new FileReader(); + r.readAsDataURL(file); + r.onload = () => resolve(r.result); + r.onerror = (error) => reject(error); + }); +} + +function appendOutput(src, seed, config) { + let outputNode = document.createElement("img"); + outputNode.src = src; + + let altText = seed.toString() + " | " + config.prompt; + outputNode.alt = altText; + outputNode.title = altText; + + // Reload image config + outputNode.addEventListener('click', () => { + let form = document.querySelector("#generate-form"); + for (const [k, v] of new FormData(form)) { + form.querySelector(`*[name=${k}]`).value = config[k]; + } + document.querySelector("#seed").value = seed; + + saveFields(document.querySelector("#generate-form")); + }); + + document.querySelector("#results").prepend(outputNode); +} + +function saveFields(form) { + for (const [k, v] of new FormData(form)) { + if (typeof v !== 'object') { // Don't save 'file' type + localStorage.setItem(k, v); + } + } +} + +function loadFields(form) { + for (const [k, v] of new FormData(form)) { + const item = localStorage.getItem(k); + if (item != null) { + form.querySelector(`*[name=${k}]`).value = item; + } + } +} + +function clearFields(form) { + localStorage.clear() + location.reload() +} + +async function generateSubmit(form) { + const prompt = document.querySelector("#prompt").value; + + // Convert file data to base64 + let formData = Object.fromEntries(new FormData(form)); + formData.initimg = formData.initimg.name !== '' ? await toBase64(formData.initimg) : null; + + document.querySelector('progress').setAttribute('max', formData.steps); + + // Post as JSON, using Fetch streaming to get results + fetch(form.action, { + method: form.method, + body: JSON.stringify(formData), + }).then(async (response) => { + const reader = response.body.getReader(); + + let noOutputs = true; + while (true) { + let {value, done} = await reader.read(); + value = new TextDecoder().decode(value); + if (done) break; + + for (let event of value.split('\n').filter(e => e !== '')) { + const data = JSON.parse(event); + + if (data.event == 'result') { + noOutputs = false; + document.querySelector("#no-results-message")?.remove(); + appendOutput(data.files[0],data.files[1],data.config) + } else if (data.event == 'upscaling-started') { + document.getElementById("processing_cnt").textContent=data.processed_file_cnt; + document.getElementById("scaling-inprocess-message").style.display = "block"; + } else if (data.event == 'upscaling-done') { + document.getElementById("scaling-inprocess-message").style.display = "none"; + } else if (data.event == 'step') { + document.querySelector('progress').setAttribute('value', data.step.toString()); + } + } + } + + // Re-enable form, remove no-results-message + form.querySelector('fieldset').removeAttribute('disabled'); + document.querySelector("#prompt").value = prompt; + document.querySelector('progress').setAttribute('value', '0'); + + if (noOutputs) { + alert("Error occurred while generating."); + } + }); + + // Disable form while generating + form.querySelector('fieldset').setAttribute('disabled',''); + document.querySelector("#prompt").value = `Generating: "${prompt}"`; +} + +window.onload = () => { + document.querySelector("#generate-form").addEventListener('submit', (e) => { + e.preventDefault(); + const form = e.target; + + generateSubmit(form); + }); + document.querySelector("#generate-form").addEventListener('change', (e) => { + saveFields(e.target.form); + }); + document.querySelector("#reset").addEventListener('click', (e) => { + document.querySelector("#seed").value = -1; + saveFields(e.target.form); + }); + document.querySelector("#reset-all").addEventListener('click', (e) => { + clearFields(e.target.form); + }); + loadFields(document.querySelector("#generate-form")); +};