From 9f6b4e73050651c9fe171be32f24495548d16ba0 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Sun, 1 Jan 2023 22:39:20 -0300 Subject: [PATCH 01/19] separate hooks by platform Signed-off-by: Victor Seiji Hariki --- .devtools/sethooks.sh | 2 +- .githooks/{ => linux}/pre-commit | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .githooks/{ => linux}/pre-commit (100%) diff --git a/.devtools/sethooks.sh b/.devtools/sethooks.sh index 7df28b7..ddb6619 100755 --- a/.devtools/sethooks.sh +++ b/.devtools/sethooks.sh @@ -1,3 +1,3 @@ #!/usr/bin/sh -git config core.hooksPath .githooks \ No newline at end of file +git config core.hooksPath .githooks/linux \ No newline at end of file diff --git a/.githooks/pre-commit b/.githooks/linux/pre-commit similarity index 100% rename from .githooks/pre-commit rename to .githooks/linux/pre-commit From 431061f531da65777c869253d23ca103fbdc3dbe Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Sun, 1 Jan 2023 22:41:02 -0300 Subject: [PATCH 02/19] initial scripts Signed-off-by: Victor Seiji Hariki --- .devtools/updatehashes.bat | 128 +++++++++++++++++++++++++++++++++++ .githooks/windows/pre-commit | 9 +++ 2 files changed, 137 insertions(+) create mode 100755 .devtools/updatehashes.bat create mode 100755 .githooks/windows/pre-commit diff --git a/.devtools/updatehashes.bat b/.devtools/updatehashes.bat new file mode 100755 index 0000000..e52c675 --- /dev/null +++ b/.devtools/updatehashes.bat @@ -0,0 +1,128 @@ +#!/usr/bin/bash +# +# Updates html files with cache busting urls including file hashes. + +# Setup colors +# Reset +Color_Off='\033[0m' # Text Reset + +# Regular Colors +Black='\033[0;30m' # Black +Red='\033[0;31m' # Red +Green='\033[0;32m' # Green +Yellow='\033[0;33m' # Yellow +Blue='\033[0;34m' # Blue +Purple='\033[0;35m' # Purple +Cyan='\033[0;36m' # Cyan +White='\033[0;37m' # White + +# Bold +BBlack='\033[1;30m' # Black +BRed='\033[1;31m' # Red +BGreen='\033[1;32m' # Green +BYellow='\033[1;33m' # Yellow +BBlue='\033[1;34m' # Blue +BPurple='\033[1;35m' # Purple +BCyan='\033[1;36m' # Cyan +BWhite='\033[1;37m' # White + +# Underline +UBlack='\033[4;30m' # Black +URed='\033[4;31m' # Red +UGreen='\033[4;32m' # Green +UYellow='\033[4;33m' # Yellow +UBlue='\033[4;34m' # Blue +UPurple='\033[4;35m' # Purple +UCyan='\033[4;36m' # Cyan +UWhite='\033[4;37m' # White + +# Background +On_Black='\033[40m' # Black +On_Red='\033[41m' # Red +On_Green='\033[42m' # Green +On_Yellow='\033[43m' # Yellow +On_Blue='\033[44m' # Blue +On_Purple='\033[45m' # Purple +On_Cyan='\033[46m' # Cyan +On_White='\033[47m' # White + +# High Intensity +IBlack='\033[0;90m' # Black +IRed='\033[0;91m' # Red +IGreen='\033[0;92m' # Green +IYellow='\033[0;93m' # Yellow +IBlue='\033[0;94m' # Blue +IPurple='\033[0;95m' # Purple +ICyan='\033[0;96m' # Cyan +IWhite='\033[0;97m' # White + +# Bold High Intensity +BIBlack='\033[1;90m' # Black +BIRed='\033[1;91m' # Red +BIGreen='\033[1;92m' # Green +BIYellow='\033[1;93m' # Yellow +BIBlue='\033[1;94m' # Blue +BIPurple='\033[1;95m' # Purple +BICyan='\033[1;96m' # Cyan +BIWhite='\033[1;97m' # White + +# High Intensity backgrounds +On_IBlack='\033[0;100m' # Black +On_IRed='\033[0;101m' # Red +On_IGreen='\033[0;102m' # Green +On_IYellow='\033[0;103m' # Yellow +On_IBlue='\033[0;104m' # Blue +On_IPurple='\033[0;105m' # Purple +On_ICyan='\033[0;106m' # Cyan +On_IWhite='\033[0;107m' # White + +# Check requirements +if ! which echo > /dev/null +then + exit -1 +fi + +required_programs=(find grep cut sed sha1sum) + +for program in $required_programs +do + if ! which $program > /dev/null + then + echo -e "${Red}[error] Requires '$program' command to be installed${Color_Off}" + exit -1 + fi +done + +# Actual file processing +for htmlfile in $(find -type f -name \*.html -not -path "./node_modules/*") +do + echo -e "${BIBlue}[info] Processing '${htmlfile}' for cache busting...${Color_Off}" + + LIST=$(find -type f -regex '.*\.css\|.*\.js' -not -path "./node_modules/*" | sed 's/\.\///g') + + if [ "$1" = "gitadd" ] + then + LIST=$(git status -s | grep -oE "[A-Z] .+" | cut -d" " -f3) + fi + + for resourcefile in $LIST + do + # Check if resource is used in html file + resourceusage=$(grep -i "$resourcefile" "$htmlfile") + if [ $? -eq 0 ] + then + # This is just for cache busting... + # If 7 first characters of SHA1 is okay for git, it should be more than enough for us + hash="$(sha1sum $resourcefile | cut -d' ' -f1 | head -c 7)" + + # Check if resource hash is already correct + if ! echo "$resourceusage" | grep -i "=$hash\"" > /dev/null + then + escaped=$(echo $resourcefile | sed 's/\//\\\//g' | sed 's/\./\\./g') + sed -Ei "s/${escaped}(\?v=[a-z0-9]+)?/${escaped}?v=${hash}/g" "$htmlfile" + + echo -e "${BIBlue}[info]${Color_Off} Updated resource ${resourcefile} to hash ${hash}" + fi + fi + done +done \ No newline at end of file diff --git a/.githooks/windows/pre-commit b/.githooks/windows/pre-commit new file mode 100755 index 0000000..b78afe4 --- /dev/null +++ b/.githooks/windows/pre-commit @@ -0,0 +1,9 @@ +#!/bin/sh +# +# Script to perform some basic operations to the code before committing. + +# Adds file hashes to html script imports for cache busting purposes +powershell .devtools/updatehashes.bat gitadd + +# Adds file to current commit +git add "**.html" \ No newline at end of file From 61c261585b038b130173e917510b33432e46f890 Mon Sep 17 00:00:00 2001 From: Victor Seiji Hariki Date: Mon, 2 Jan 2023 00:37:00 -0300 Subject: [PATCH 03/19] Add some git attributes to avoid using CRLF on Win --- .devtools/sethooks.ps1 | 4 + .devtools/updatehashes.ps1 | 27 ++++++ .gitattributes | 1 + index.html | 171 ++++++++++++++++++++++++++++++------- pages/configuration.html | 55 +++++++++--- pages/embed.test.html | 2 +- 6 files changed, 218 insertions(+), 42 deletions(-) create mode 100644 .devtools/sethooks.ps1 create mode 100644 .devtools/updatehashes.ps1 create mode 100644 .gitattributes diff --git a/.devtools/sethooks.ps1 b/.devtools/sethooks.ps1 new file mode 100644 index 0000000..930a120 --- /dev/null +++ b/.devtools/sethooks.ps1 @@ -0,0 +1,4 @@ +git config core.eol lf +git config core.autocrlf input + +git config core.hooksPath .githooks/windows \ No newline at end of file diff --git a/.devtools/updatehashes.ps1 b/.devtools/updatehashes.ps1 new file mode 100644 index 0000000..afd8f26 --- /dev/null +++ b/.devtools/updatehashes.ps1 @@ -0,0 +1,27 @@ +# Updates html files with cache busting urls including file hashes. + +# Actual file processing +$htmlfiles = Get-ChildItem -Path . -Recurse -Filter "*.html" | Resolve-path -relative +foreach ($htmlfile in $htmlfiles) { + Write-Host "[info] Processing '${htmlfile}' for cache busting..." -ForegroundColor Blue + + $resfiles = (@(Get-ChildItem -Path . -Recurse -Filter "*.css") + (Get-ChildItem -Path . -Recurse -Filter "*.js")) | Resolve-Path -relative + + if ($args[0] -eq "gitadd") { + $resfiles = (git status -s | Select-String -Pattern "[A-Z] .+") | ForEach-Object { -split $_.Line | Select-Object -Last 1 } + } + + foreach ($resfile in $resfiles) { + $resfile = $resfile -replace '\\', '/' -replace '\./', '' + # Check if resource is used in html file + if ($null -ne (Select-String -Path $htmlfile -Pattern $resfile)) { + $hash = (Get-FileHash $resfile -Algorithm SHA1).Hash + + # This is just for cache busting... + # If 7 first characters of SHA1 is okay for git, it should be more than enough for us + $hash = $hash.Substring(0, 7).ToLower() + + (Get-Content -Raw -Path $htmlfile).replace('\r\n', "\n") -replace "$resfile(\?v=[a-z0-9]+)?", "${resfile}?v=$hash" | Set-Content $htmlfile + } + } +} diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..07764a7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf \ No newline at end of file diff --git a/index.html b/index.html index b58a5dd..9491f31 100644 --- a/index.html +++ b/index.html @@ -4,22 +4,22 @@ openOutpaint 🐠 - - + + - - + + - + - - - + + + - - - + + + @@ -308,7 +308,7 @@
- + @@ -316,17 +316,17 @@ - - - - - + + + + + - - + + @@ -345,39 +345,150 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/configuration.html b/pages/configuration.html index 313a527..f89147b 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -4,22 +4,22 @@ openOutpaint 🐠 - - + + - - + + - + - - - + + + - - - + + + @@ -88,3 +88,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/embed.test.html b/pages/embed.test.html index 6917689..8a8775f 100644 --- a/pages/embed.test.html +++ b/pages/embed.test.html @@ -8,7 +8,7 @@ - + - + diff --git a/js/index.js b/js/index.js index fb68673..23988ad 100644 --- a/js/index.js +++ b/js/index.js @@ -106,8 +106,10 @@ var stableDiffusionData = { inpainting_fill: 2, enable_hr: false, restore_faces: false, - firstphase_width: 0, - firstphase_height: 0, + //firstphase_width: 0, + //firstphase_height: 0, //20230102 welp looks like the entire way HRfix is implemented has become bonkersly different + hr_scale: 2.0, + hr_upscaler: "None", styles: [], // here's some more fields that might be useful @@ -552,6 +554,14 @@ const upscalerAutoComplete = createAutoComplete( document.getElementById("upscaler-ac-select") ); +const hrFixUpscalerAutoComplete = createAutoComplete( + "HRfix Upscaler", + document.getElementById("hrFixUpscaler") +); +hrFixUpscalerAutoComplete.onchange.on(({value}) => { + stableDiffusionData.hr_upscaler = value; +}); + const resSlider = makeSlider( "Resolution", document.getElementById("resolution"), @@ -563,8 +573,6 @@ const resSlider = makeSlider( 2, (v) => { stableDiffusionData.width = stableDiffusionData.height = v; - stableDiffusionData.firstphase_width = - stableDiffusionData.firstphase_height = v / 2; toolbar.currentTool && toolbar.currentTool.redraw && @@ -621,15 +629,16 @@ makeSlider( 1 ); +// 20230102 grumble grumble makeSlider( - "HRfix Lock Px.", - document.getElementById("hrFixLock"), - "hr_fix_lock_px", - 0.0, - 768.0, - 256.0, - 0.0, - 1.0 + "HRfix Scale", + document.getElementById("hrFixScale"), + "hr_scale", + 1.0, + 4.0, + 0.1, + 2.0, + 0.1 ); function changeMaskBlur() { @@ -649,6 +658,20 @@ function changeHiResFix() { document.getElementById("cbxHRFix").checked ); localStorage.setItem("openoutpaint/enable_hr", stableDiffusionData.enable_hr); + var hrfSlider = document.getElementById("hrFixScale"); + var hrfOpotions = document.getElementById("hrFixUpscaler"); + var hrfLabel = document.getElementById("hrFixLabel"); + if (stableDiffusionData.enable_hr) { + hrfSlider.classList.remove("invisible"); + hrfOpotions.classList.remove("invisible"); + hrfLabel.classList.remove("invisible"); + //state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.add("invisible"); + } else { + hrfSlider.classList.add("invisible"); + hrfOpotions.classList.add("invisible"); + hrfLabel.classList.add("invisible"); + //state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.remove("invisible"); + } } function changeRestoreFaces() { @@ -743,17 +766,23 @@ async function getUpscalers() { "[index] purposefully_incorrect_data response, ignore above error" ); // result = purposefully_incorrect_data response: Invalid upscaler, needs to be on of these: None , Lanczos , Nearest , LDSR , BSRGAN , R-ESRGAN General 4xV3 , R-ESRGAN 4x+ Anime6B , ScuNET , ScuNET PSNR , SwinIR_4x - const upscalers = data.detail + const upscalersPlusNone = data.detail .split(": ")[1] .split(",") - .map((v) => v.trim()) - .filter((v) => v !== "None"); // converting the result to a list of upscalers + .map((v) => v.trim()); // need "None" for stupid hrfix changes razza frazza + const upscalers = upscalersPlusNone.filter((v) => v !== "None"); // converting the result to a list of upscalers + upscalersPlusNone.push("Latent"); + upscalersPlusNone.push("Latent (nearest)"); // GRUMBLE GRUMBLE upscalerAutoComplete.options = upscalers.map((u) => { return {name: u, value: u}; }); + hrFixUpscalerAutoComplete.options = upscalersPlusNone.map((u) => { + return {name: u, value: u}; + }); upscalerAutoComplete.value = upscalers[0]; + hrFixUpscalerAutoComplete.value = upscalersPlusNone[0]; } catch (e) { console.warn("[index] Failed to fetch upscalers:"); console.warn(e); diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index f0e1fab..3a3bd53 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -1387,18 +1387,6 @@ const dreamTool = () => h: stableDiffusionData.height, }; - //hacky set non-square auto hrfix values - let hrLockPx = - localStorage.getItem("openoutpaint/hr_fix_lock_px") ?? 0; - stableDiffusionData.firstphase_height = - hrLockPx == 0 || resolution.h / 2 <= hrLockPx - ? resolution.h / 2 - : hrLockPx; - stableDiffusionData.firstphase_width = - hrLockPx == 0 || resolution.w / 2 <= hrLockPx - ? resolution.w / 2 - : hrLockPx; - if (global.connection === "online") { dream_generate_callback(bb, resolution, state); } else { @@ -1492,8 +1480,14 @@ const dreamTool = () => state.ctxmenu.keepUnmaskedBlurSlider.classList.remove( "invisible" ); + state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.add( + "invisible" + ); } else { state.ctxmenu.keepUnmaskedBlurSlider.classList.add("invisible"); + state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.remove( + "invisible" + ); } } ).label; @@ -1511,6 +1505,12 @@ const dreamTool = () => } ).slider; + state.ctxmenu.keepUnmaskedBlurSliderLinebreak = + document.createElement("br"); + state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.add( + "invisible" + ); + // Preserve Brushed Masks Checkbox state.ctxmenu.preserveMasksLabel = _toolbar_input.checkbox( state, @@ -1552,6 +1552,7 @@ const dreamTool = () => menu.appendChild(document.createElement("br")); menu.appendChild(state.ctxmenu.keepUnmaskedLabel); menu.appendChild(state.ctxmenu.keepUnmaskedBlurSlider); + menu.appendChild(state.ctxmenu.keepUnmaskedBlurSliderLinebreak); menu.appendChild(state.ctxmenu.preserveMasksLabel); menu.appendChild(document.createElement("br")); menu.appendChild(state.ctxmenu.overMaskPxLabel); From 8aa0007c2cc205c5c718a5ce2f802f1b74b6a2a0 Mon Sep 17 00:00:00 2001 From: zero01101 Date: Mon, 2 Jan 2023 19:54:27 +0000 Subject: [PATCH 05/19] Fixed resource hashes --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 503a723..976b608 100644 --- a/index.html +++ b/index.html @@ -339,7 +339,7 @@ - + - + From 8962d75c608c19596ff3c335d2a4637d2fe4c0ba Mon Sep 17 00:00:00 2001 From: tim h Date: Mon, 2 Jan 2023 14:49:47 -0600 Subject: [PATCH 06/19] optionally implements dishonesty to POST request data to make new HRfix actually useful to our needs --- index.html | 4 ++-- js/ui/tool/dream.js | 16 ++++++++++++++++ pages/configuration.html | 12 ++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 976b608..789bf7c 100644 --- a/index.html +++ b/index.html @@ -313,7 +313,7 @@
+ src="pages/configuration.html?v=3d710ce"> @@ -353,7 +353,7 @@ src="js/ui/tool/generic.js?v=2bcd36d" type="text/javascript"> - + diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index 3a3bd53..53428a1 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -130,6 +130,22 @@ const _dream = async (endpoint, request) => { let data = null; try { generating = true; + if ( + endpoint == "txt2img" && + request.enable_hr && + localStorage.getItem("openoutpaint/settings.hrfix-liar") == "true" + ) { + /** + * try and make the new HRfix method useful for our purposes + * since it now returns an image that's been upscaled x the hr_scale parameter, + * we cheekily lie to SD and tell it that the original dimensions are _divided_ + * by the scale factor so it returns something about the same size as we wanted initially + */ + var newWidth = Math.floor(request.width / request.hr_scale); + var newHeight = Math.floor(request.height / request.hr_scale); + request.width = newWidth; + request.height = newHeight; + } const response = await fetch(apiURL, { method: "POST", headers: { diff --git a/pages/configuration.html b/pages/configuration.html index 2adff2a..81409ec 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -84,6 +84,10 @@ step="0.1" value="30.0" /> +

Refresh the page to apply settings.

From 6e14e3741f4c449649080bb6e7a6ee867f339abd Mon Sep 17 00:00:00 2001 From: zero01101 Date: Mon, 2 Jan 2023 20:50:10 +0000 Subject: [PATCH 07/19] Fixed resource hashes --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 789bf7c..65d1524 100644 --- a/index.html +++ b/index.html @@ -353,7 +353,7 @@ src="js/ui/tool/generic.js?v=2bcd36d" type="text/javascript"> - + From 69205e5647bbb9bf0a507965738dcbf19ea06544 Mon Sep 17 00:00:00 2001 From: tim h Date: Mon, 2 Jan 2023 17:18:50 -0600 Subject: [PATCH 08/19] adds denoising slider for hrfix --- index.html | 5 +++-- js/index.js | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 65d1524..03da147 100644 --- a/index.html +++ b/index.html @@ -103,6 +103,7 @@
+
- Alpha release v0.0.12.3 + Alpha release v0.0.12.5
@@ -339,7 +340,7 @@ - + - + - + - + - + - + - - - - + + + + - - + + @@ -348,33 +348,33 @@ src="js/ui/tool/generic.js?v=f1a19a4" type="text/javascript"> - + - + @@ -472,6 +472,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pages/configuration.html b/pages/configuration.html index f89147b..dbf33b0 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -4,22 +4,22 @@ openOutpaint 🐠 - - + + - - + + - + - - - + + + - - - + + + @@ -108,6 +108,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 955a809953569ceb71470c9b27335e217396431d Mon Sep 17 00:00:00 2001 From: tim h Date: Mon, 2 Jan 2023 19:49:19 -0600 Subject: [PATCH 16/19] wat --- index.html | 300 +-------------------------------------- pages/configuration.html | 77 ---------- 2 files changed, 3 insertions(+), 374 deletions(-) diff --git a/index.html b/index.html index 0e26542..5871f01 100644 --- a/index.html +++ b/index.html @@ -308,7 +308,9 @@
- + @@ -381,299 +383,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pages/configuration.html b/pages/configuration.html index dbf33b0..313a527 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -88,80 +88,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f9fc1fa974f04ada4ca3a5bc54297184102d536f Mon Sep 17 00:00:00 2001 From: seijihariki Date: Tue, 3 Jan 2023 02:20:37 +0000 Subject: [PATCH 17/19] Fixed resource hashes --- docs/02-sample.png | Bin 6960206 -> 6960123 bytes docs/03-arbimg.png | Bin 1194267 -> 1194245 bytes docs/04-catsonaspacestation.png | Bin 4643682 -> 4643619 bytes docs/05-openOutpaintFish.png | Bin 474544 -> 474539 bytes docs/06-desert.png | Bin 682553 -> 682538 bytes index.html | 4 ++-- res/fonts/OpenSans.ttf | Bin 217360 -> 217347 bytes 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/02-sample.png b/docs/02-sample.png index 6bc24a754bc377bedf1d8d54de3878eb48c2d3cf..d702989400fdf6f531acb8c528285e5806bc1137 100644 GIT binary patch delta 795 zcmWN=dr%7i90%}QYfMckvj}OaWtB*nEX!l9Jz85!hS7RVTRS!96`k(bAAY!S{Zo#! zlRGCICwKbhpB%Z1ovWjZd7SgQ^NJkj**t!qyU)PePT|;_PGRIhYe~^Q(N&S)yBT4# zz-oZGU7!@A@wnhr8>Z$&)ZHZi*9b0z|7+y$*JuujHh;kTzH#WoX&T>9fVlqg?l$b+ zDE=d%Mz5Gp;88ppjb4eal6r#@J`ugan7xZpAczf*ApcXW--YY8NwKvw*fWX8@pwKN zgFVt49%_|OL91M*e?pJLGM<3P;i)YmxFe=TKgG6Z)5e_eX%a)Vq(76$r}G(nCQstC zpg)sbb%oB`zj5-{?9p5to}1c~MB?I9o(6HT!Y-%EdIc)$ z)2~U9=udy~k;1+?T#2wRBmX7xY?&j`P*h}gMN!C;$+P%eggn^`?_%PjdFmNtD4oaW z^BfpT7v$f-{`lMtR(e&P%NOER^`g$7)Z$o-7Kh4YMyONud=IXrEjbhit!l}IA$*R? zYc8M$V;*0M2BW&jPTd`9ba&)m+)6I#GPtCg*Ge*IG`xT>=PO{)tjvg`?Ut2%71#1Y zuETaqQI{Wz`$gF!DDTzxNGWDW&kcwfG9DFD;DM2wcrgMG%%f#El2PJIq`%q{{MB00 zQjuC`8FfQ?&vG>i!6%lXo9%&sHIsq?D=$SbU^6Hoy=_yMkX2U3SHmhRmleY8D9`6Ki2E(aoOe2I`OT~F(AUNJC3t+u=$JQ zQ8wx18~8@(nwPDd*L4Ajuq?lj{8%O=gZGMo?ch= z`Ptmd>;X3GXC8}7t9dMaF05&1MSH?$@38LPgaZ{Gl}}h)N5hH-@T7(n_UZ!i^;2Fo zOYr>Y1{#HLJG|@m!`@Es3T9v3an4^q?5nQgfQ`Th_)>M1Usfsd{bPQBOZ{V;E+wL0 z!SY{QhUH)Vo2+oJVYB~9^bHSg1_6Kv0%>?KXvBtmWB3+o4Cm*}B6hCvK`=SjwqEzb z-a-$7?;LD?FL0N@#p;kL<}5{52-pTf!FCV^c95b=SoR3@R%1A|8bxLG*t7CNl&OG| z{)sfJaMPcit~mI#TzozZy-Qj#kkFDg!WfQqT5SZS)kZ!JLXZ1$S^2jE_}?q9!hg1-pTQ#07g&Mo=r|#U0b5 zHdG!5;%TTnq31W&R#PHbO-e2Ej=ep~4-Ig$BALLx zCVb<^>+Bfj4MoE_gSZFB%$ppLOEYgY&6p`i<)j8^!9l8=%ySi@w@8|A4?)eDkx$MH zokWb>vQ6izfM;Ln25?W*GOL@w47OW3^fI*G=+J`#y3t|C#jnykr$LpEJda-p4iS%k zn4gJ!l<9EXH`t^-lKd9+HldN)ghky_#42qOskFt5_YsSK6_fba(VSZJ)>us$%*gbO znqD%abn&^VI|`P3H%-T&cU^c49H(`m*=a}qS&P{(3w}LmcHe@>?IkJ>?0v2zg1JU{ zX9*}Jd1slc59?4vIfWW5Sr{QIKV=!kD3fH`!ejnV`Or$rhbP#~RjPKMyyr%4K~@25 Lppq73Rl%J9oLp+V diff --git a/docs/03-arbimg.png b/docs/03-arbimg.png index 3893d454b743f5223798e318310a9b83a796e8e6..ed2e127e6f4ef4ddf19f2cea6cbfd5a489e81266 100644 GIT binary patch delta 172 zcmV;d08{^)@<@g9NCb&cPDil?-=nkTqp!BNm0AH46^E&B0f(t?0*9$@1GlMf1lJw6 zfsF*n!naCL1#w}wys-tm4Yzr}1x)(4#<>RgrnkRf2W}CEE^-IAE^-KyT8F~S2)Dw_ z36O|~Q&kGLQ&kJ89=H8-3kT@81zZf)p|{-q4B@JWzNihizNilDAh)Z@4mx_b=0gv{ a0=KC~4>ie$-wzPC-wzQH^SAK=5-K);Ay8fb delta 215 zcmZqub*LJs1?v-*tweO3$*x{@>C4XihnRr$R5yOplR!16_yx9~;ujSB3>3S~B&1~q0QjX*J^%m! diff --git a/docs/04-catsonaspacestation.png b/docs/04-catsonaspacestation.png index 7cae7a9dc684647a2ef9771d72a86ef1d0c780ce..09e6c7385fc4d4e307cbe729633cd2a9844b2bd2 100644 GIT binary patch delta 566 zcmWN=O-Pe*90zdJO)Yaaw`b){U9;Sads=SR=C-EJ(sI(`8jSEV$& zk;CS)n=revSxAvFl?P*L%dKNHXU@l*Su)vyi}xh@C%D~I5N<(zpy1~z(k~T2zqEC= zi_~pWsM`u9VN~VGK1-2RBGdf^uaIvj!1MBxQtEZe(d*>SS+F2*+J5Bz<6g_~L88cx zQ+!c@_~N!T56wHbvqh{D^UmU+K;D^Rb_cvOB^4s_M@!gJ_@iY5kD+K&nH)GWp?beW z+|W*NL+Wu0ref;h8M1Yiv%A>cuys}N5p-xYfgV~9X;>}RL%QxFTz#nvb5s`Bp)9U{ zREc+K{r4$MO;#?vfWO0Ve~t_~p4|h3&KPmyYp2l_B^AFHD!yu@9+68`tz#(6FkSDY zfM8Xg08rwBY-l^fvQf#G$ zwIQ}*SL9J5ZAT*Q7;K?-_W{<4c6aTX7p>E^zXhDo*8RwW)lm0qnaY**C|9~hui)9R eYwSD@FT3gFohXz8%(%Di> zaYz_h?L(ssmQBwvg5C%s2(m9JL^Cub5ebK<)z+P=~hC!8Wj+LR&lB3vk*6327I0-aUzW(!$cDMLOP$RSoy0hG)n- zH5tL(rL`7morGcyz5^(YFT3@$r@$SAo?1K{A(uiZ;qUgBePYCEftb8E9&6A zEe-{>IFuKxaG%^teRpzpL-}5g3`;Na_C^Fby2#tcszGlnNdxJL=Y;&Wurxbf#J&WgwA2?JHY1&)z0P;E=TsOMw#L&bmjs{`@? diff --git a/docs/05-openOutpaintFish.png b/docs/05-openOutpaintFish.png index e03a6e86a99b91aa48bed890f3e1f172ac5d7979..73fa60e42f7884ddfbb88023d892f10cb464072e 100644 GIT binary patch delta 61 zcmdn+TW0ld8J5lfKlet~R#wKXtV|NN?Q*tE+vRMTkF>WxKEe#dEZZL+VO_x0-g2IG Rd&_yYD`MLtpRt990|4pG8C3uP delta 70 zcmZ4eTV}&=8P?7KKX=|nmR1(Vtt?Cuwv4>(GPX?HWo(&`v;)}>jxYl;%k~FHSQl^s X`3>h;w>O+;yCTNOyFKI?TX;ACX$Tp9 diff --git a/docs/06-desert.png b/docs/06-desert.png index f44776d409998b8870b40a332f9ccb9f185557c0..27e528f0986bad5081f1088236b09dfe36dd9b46 100644 GIT binary patch delta 108 zcmV-y0F(c@)G4aeDFlg7PDil?gkheDT2#OH5 O!2<~f|F_5j3UOzVvM-AO delta 137 zcmZ2=MRVsBP1eo;KX=}ZEUht&yqh~?mRbWTy&1{fGu f^s*$5<_SPr^D{@60Fd6y%*pm2Nbh9gDoh6e*RwFu diff --git a/index.html b/index.html index 857556c..853d66d 100644 --- a/index.html +++ b/index.html @@ -319,7 +319,7 @@ - + @@ -348,7 +348,7 @@ diff --git a/res/fonts/OpenSans.ttf b/res/fonts/OpenSans.ttf index db433349b7047f72f40072630c1bc110620bf09e..79a43850d2041344b437e7e58f7b2fc77c954a2c 100644 GIT binary patch delta 111 zcmV-#0FeKXq78$h4X{%y4GIYh2@eni3IPoQ3=FekD^q&2wxxFklP;^zv;M2E470Ad zMJTiM;HwI=pzD+qvo-&p1gF&l0SK4y4*?dp>CQJGO}`W$ga&h4+b8Ru}b i@NzM8Oh3oXC^LPjIO7#Y-u6lfMj&R|UMa!cWdQ)9MJS>G From 3f2bbf02ef1d93edd5bcdd5a64c59616dd746950 Mon Sep 17 00:00:00 2001 From: tim h Date: Mon, 2 Jan 2023 21:30:20 -0600 Subject: [PATCH 18/19] checks for nonexistent option in newer webUI on startup --- js/index.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/index.js b/js/index.js index b22d37b..ab002f0 100644 --- a/js/index.js +++ b/js/index.js @@ -343,6 +343,12 @@ async function testHostConnection() { const response = await fetch( document.getElementById("host").value + "/sdapi/v1/options" ); + const optionsdata = await response.json(); + if (optionsdata["use_scale_latent_for_hires_fix"]) { + const message = `You are using an outdated version of A1111 webUI.\nThe HRfix options will not work until you update to at least commit ef27a18\n(https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ef27a18b6b7cb1a8eebdc9b2e88d25baf2c2414d)\nor newer.`; + console.error(message); + alert(message); + } switch (response.status) { case 200: { setConnectionStatus("online"); From 0376324666a3cca3500da9026a09e9258cc33f9e Mon Sep 17 00:00:00 2001 From: zero01101 Date: Tue, 3 Jan 2023 03:30:45 +0000 Subject: [PATCH 19/19] Fixed resource hashes --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 89164ba..c9d9462 100644 --- a/index.html +++ b/index.html @@ -340,7 +340,7 @@ - +