From 906d90c304bb4f152fa87493c9ad0d74ac8f6529 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 09:36:09 +0530 Subject: [PATCH 1/7] v2.16 --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ebe093a..e38b43a3 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,23 @@ [![Discord Server](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md) -️‍🔥🎉 **New!** Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added! +️‍🔥🎉 **New!** Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added! This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 becomes publicly available, the model in this distribution will be updated. # Features in the new v2 Version: - **No Dependencies or Technical Knowledge Required**: 1-click install for Windows 10/11 and Linux. *No dependencies*, no need for WSL or Docker or Conda or technical setup. Just download and run! - **Face Correction (GFPGAN) and Upscaling (RealESRGAN)** +- **In-Painting** +- **Live Preview**: See the image as the AI is drawing it +- **Lots of Samplers** - **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly. - **New UI**: with cleaner design - Supports "*Text to Image*" and "*Image to Image*" - **NSFW Setting**: A setting in the UI to control *NSFW content* - **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU. - **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project. +- **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM! ![Screenshot](media/shot-v8.jpg?raw=true) From 858a1c7ae00e5e16c9d62a7e7fa876f70d2a79cd Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 13:23:04 +0530 Subject: [PATCH 2/7] Include C:\Windows\System32 in the path anyway, to avoid the errors some users have --- scripts/on_env_start.bat | 2 ++ scripts/on_sd_start.bat | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 068231ff..16312a5a 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -2,6 +2,8 @@ @echo. & echo "Stable Diffusion UI - v2" & echo. +set PATH=C:\Windows\System32;%PATH% + @cd .. if exist "scripts\config.bat" ( diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 1a694da5..b8ef042b 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -79,6 +79,8 @@ @echo conda_sd_env_created >> ..\scripts\install_status.txt ) +set PATH=C:\Windows\System32;%PATH% + @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Packages necessary for GFPGAN (Face Correction) were already installed" From 4f58a485a6caf00d9cac7ab588dcad7569991340 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 13:44:10 +0530 Subject: [PATCH 3/7] Catch invalid JSON entries --- ui/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 4d9b498c..7f38417d 100644 --- a/ui/index.html +++ b/ui/index.html @@ -952,7 +952,13 @@ async function doMakeImage(reqBody, batchCount) { res = undefined progressBar.style.display = 'none' } else { - res = JSON.parse(finalJSON) + try { + res = JSON.parse(finalJSON) + } catch (e) { + console.log('Parse error, invalid JSON', finalJSON) + throw e + } + progressBar.style.display = 'none' if (res.status !== 'succeeded') { From 011f283067346927a1fcb4c8f7113e0a5cc30ab0 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 13:54:18 +0530 Subject: [PATCH 4/7] Another debugging aid --- ui/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/index.html b/ui/index.html index 7f38417d..2de3d16a 100644 --- a/ui/index.html +++ b/ui/index.html @@ -932,6 +932,7 @@ async function doMakeImage(reqBody, batchCount) { } } } catch (e) { + console.log('error doing something', jsonStr) finalJSON += jsonStr } From 3822058daf0dfe5dd7dfcc522798c37502c97b30 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 14:05:45 +0530 Subject: [PATCH 5/7] More debugging --- ui/sd_internal/runtime.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py index 3083e3ca..d1025293 100644 --- a/ui/sd_internal/runtime.py +++ b/ui/sd_internal/runtime.py @@ -393,6 +393,7 @@ def do_mk_img(req: Request): progress['output'] = partial_images + print(' sending progress update', json.dumps(progress)) yield json.dumps(progress) if stop_processing: From 661cf440f3b0d625dc94b0f6950779b118adeaf3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 14:11:26 +0530 Subject: [PATCH 6/7] Remove debugging log --- ui/sd_internal/runtime.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py index d1025293..3083e3ca 100644 --- a/ui/sd_internal/runtime.py +++ b/ui/sd_internal/runtime.py @@ -393,7 +393,6 @@ def do_mk_img(req: Request): progress['output'] = partial_images - print(' sending progress update', json.dumps(progress)) yield json.dumps(progress) if stop_processing: From 5231eb62e1465bdd3bccdd9595e1dd25a2f80266 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 15:29:04 +0530 Subject: [PATCH 7/7] Remove debugging line --- ui/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 2de3d16a..7f38417d 100644 --- a/ui/index.html +++ b/ui/index.html @@ -932,7 +932,6 @@ async function doMakeImage(reqBody, batchCount) { } } } catch (e) { - console.log('error doing something', jsonStr) finalJSON += jsonStr }