From 53371537616925ceaf13a2e55a55397eeaf684ad Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Thu, 15 Sep 2022 15:14:48 +0530
Subject: [PATCH 01/35] Remove the use of activate.d for the windows installer,
 since it allows for easier debugging later on

---
 build.bat                             |  8 +++-----
 build.sh                              |  3 +++
 scripts/Start Stable Diffusion UI.cmd | 11 ++++++++++-
 scripts/start.sh                      |  3 +++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/build.bat b/build.bat
index d1bcaab7..0cc6cf3f 100644
--- a/build.bat
+++ b/build.bat
@@ -8,6 +8,8 @@
 set /p answer=Are you a developer of this project (Y/N)?
 if /i "%answer:~,1%" NEQ "Y" exit /b
 
+@set PYTHONNOUSERSITE=1
+
 @mkdir dist\stable-diffusion-ui
 
 @echo "Downloading components for the installer.."
@@ -15,11 +17,6 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @call conda env create --prefix installer -f environment.yaml
 @call conda activate .\installer
 
-@echo "Setting up startup scripts.."
-
-@mkdir installer\etc\conda\activate.d
-@copy scripts\post_activate.bat installer\etc\conda\activate.d\
-
 @echo "Creating a distributable package.."
 
 @call conda install -c conda-forge -y conda-pack
@@ -37,6 +34,7 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @copy ..\..\LICENSE .
 @copy "..\..\CreativeML Open RAIL-M License" .
 @copy "..\..\How to install and run.txt" .
+@echo "" > scripts\install_status.txt
 
 @echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
 
diff --git a/build.sh b/build.sh
index 04579d1f..577dcb8b 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,8 @@ case $yn in
     * ) exit;;
 esac
 
+export PYTHONNOUSERSITE=1
+
 mkdir -p dist/stable-diffusion-ui
 
 echo "Downloading components for the installer.."
@@ -38,6 +40,7 @@ cp ../../scripts/start.sh .
 cp ../../LICENSE .
 cp "../../CreativeML Open RAIL-M License" .
 cp "../../How to install and run.txt" .
+echo "" > scripts/install_status.txt
 
 chmod u+x start.sh
 
diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index 4f67c7bf..6bf6b290 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -1 +1,10 @@
-installer\Scripts\activate.bat
+@call installer\Scripts\activate.bat
+
+@call conda-unpack
+
+@call conda --version
+@call git --version
+
+@call scripts\on_env_start.bat
+
+@pause
\ No newline at end of file
diff --git a/scripts/start.sh b/scripts/start.sh
index d6c75ad8..e077593a 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -4,4 +4,7 @@ source installer/bin/activate
 
 conda-unpack
 
+conda --version
+git --version
+
 scripts/on_env_start.sh

From 5facba441946bb62555591fa3cf8b6c1438b5f11 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sat, 24 Sep 2022 23:23:35 +0530
Subject: [PATCH 02/35] [installer] No need to go back a folder now, we're
 already in the right location

---
 build.bat                | 2 +-
 scripts/on_env_start.bat | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.bat b/build.bat
index 0cc6cf3f..96232c0a 100644
--- a/build.bat
+++ b/build.bat
@@ -34,7 +34,7 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @copy ..\..\LICENSE .
 @copy "..\..\CreativeML Open RAIL-M License" .
 @copy "..\..\How to install and run.txt" .
-@echo "" > scripts\install_status.txt
+@echo. > scripts\install_status.txt
 
 @echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
 
diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 16312a5a..959b5e20 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -4,8 +4,6 @@
 
 set PATH=C:\Windows\System32;%PATH%
 
-@cd ..
-
 if exist "scripts\config.bat" (
     @call scripts\config.bat
 )

From d14a13fcaf18a4eb83072172691a36b283e1f9ca Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sat, 24 Sep 2022 23:38:56 +0530
Subject: [PATCH 03/35] Temporarily revert the System32 patch

---
 scripts/on_env_start.bat | 2 +-
 scripts/on_sd_start.bat  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 16312a5a..8e46c62c 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -2,7 +2,7 @@
 
 @echo. & echo "Stable Diffusion UI - v2" & echo.
 
-set PATH=C:\Windows\System32;%PATH%
+@REM set PATH=C:\Windows\System32;%PATH%
 
 @cd ..
 
diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index b8ef042b..8c422865 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -79,7 +79,7 @@
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
-set PATH=C:\Windows\System32;%PATH%
+@REM set PATH=C:\Windows\System32;%PATH%
 
 @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (

From 1bcb6738bba4653f1c38cda40f23d2b5e42c9fca Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sat, 24 Sep 2022 23:56:59 +0530
Subject: [PATCH 04/35] Temporarily disable check for whether uvicorn is
 installed

---
 scripts/on_sd_start.bat | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 8c422865..3b6d1648 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -148,13 +148,13 @@
     )
 )
 
-call WHERE uvicorn > .tmp
-@>nul grep -c "uvicorn" .tmp
-@if "%ERRORLEVEL%" NEQ "0" (
-    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-    pause
-    exit /b
-)
+@REM call WHERE uvicorn > .tmp
+@REM @>nul grep -c "uvicorn" .tmp
+@REM @if "%ERRORLEVEL%" NEQ "0" (
+@REM     @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+@REM     pause
+@REM     exit /b
+@REM )
 
 @>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (

From 489aae7a468675de7bafee007cd666faad6dc4ca Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sun, 25 Sep 2022 00:03:15 +0530
Subject: [PATCH 05/35] Put back the System32 fix

---
 scripts/on_env_start.bat | 2 +-
 scripts/on_sd_start.bat  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 8e46c62c..16312a5a 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -2,7 +2,7 @@
 
 @echo. & echo "Stable Diffusion UI - v2" & echo.
 
-@REM set PATH=C:\Windows\System32;%PATH%
+set PATH=C:\Windows\System32;%PATH%
 
 @cd ..
 
diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 8c422865..b8ef042b 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -79,7 +79,7 @@
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
-@REM set PATH=C:\Windows\System32;%PATH%
+set PATH=C:\Windows\System32;%PATH%
 
 @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (

From e107037011b84adf3000f26e33af09a067921776 Mon Sep 17 00:00:00 2001
From: mrbusysky <58412572+mrbusysky@users.noreply.github.com>
Date: Sat, 24 Sep 2022 22:00:42 -0700
Subject: [PATCH 06/35] Updated links to add the reddit

---
 ui/index.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index e720a335..83f71d2c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -21,8 +21,9 @@
             <li class="dropdown">
                 <span><i class="fa fa-comments icon"></i> Help & Community</span>
                 <ul id="community-links" class="dropdown-content">
-                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
                     <li><a href="https://discord.com/invite/u9yhsFmEkB" target="_blank"><i class="fa-brands fa-discord fa-fw"></i> Discord user community</a></li>
+                    <li><a href="https://www.reddit.com/r/StableDiffusionUI/" target="_blank"><i class="fa-brands fa-reddit fa-fw"></i> Reddit community</a></li>
+                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
                     <li><a href="https://github.com/cmdr2/stable-diffusion-ui" target="_blank"><i class="fa-brands fa-github fa-fw"></i> Source code on GitHub</a></li>
                 </ul>
             </li>
@@ -121,7 +122,7 @@
                             <option value="1536">1536</option>
                             <option value="1792">1792</option>
                             <option value="2048">2048</option>
-                        </select> <label for="width"><small>(width)</small></label> 
+                        </select> <label for="width"><small>(width)</small></label>
                         <select id="height" name="height" value="512">
                             <option value="128">128 (*)</option>
                             <option value="192">192</option>
@@ -170,7 +171,7 @@
             <div id="editor-modifiers" class="panel-box">
                 <h4 class="collapsible">Image Modifiers (art styles, tags etc)</h4>
                 <div id="editor-modifiers-entries" class="collapsible-content">
-                    <label for="preview-image">Image Style:</label> 
+                    <label for="preview-image">Image Style:</label>
                     <select id="preview-image" name="preview-image" value="portrait">
                         <option value="portrait" selected="">Face</option>
                         <option value="landscape">Landscape</option>

From 547e640b579ebe2ca3b647f00131164b9c27b0f2 Mon Sep 17 00:00:00 2001
From: mrbusysky <58412572+mrbusysky@users.noreply.github.com>
Date: Sat, 24 Sep 2022 22:21:19 -0700
Subject: [PATCH 07/35] Readme was not updated to have the new downloads

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf88a8e5..6cd735ec 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 be
 You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.
 
 # Installation
-1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.05/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.05/stable-diffusion-ui-linux.tar.xz).
+1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).
 
 2. **Extract**:
   - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).

From d9fa2c4a62293217cde295e2c26941a00ed5d0d7 Mon Sep 17 00:00:00 2001
From: JeLuF <jf@mormo.org>
Date: Sun, 25 Sep 2022 10:31:04 +0200
Subject: [PATCH 08/35] Advanced settings have been renamed

The advanced settings have been renamed to image settings and system settings in the Web UI.
---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cf88a8e5..8b18d9b9 100644
--- a/README.md
+++ b/README.md
@@ -77,12 +77,17 @@ You can use Face Correction or Upscaling to improve the image further.
 ## Problems? Troubleshooting
 Please try the common [troubleshooting](Troubleshooting.md) steps. If that doesn't fix it, please ask on the [discord server](https://discord.com/invite/u9yhsFmEkB), or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
 
-# Advanced Settings
-You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Advanced settings'.
+# Image Settings
+You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Image settings'.
 
 Use the same `seed` number to get the same image for a certain prompt. This is useful for refining a prompt without losing the basic image design. Enable the `random images` checkbox to get random images.
 
 ![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+
+# System Settings
+The system settings are reachable via the cogwheel symbol on the top right. It can be used to configure whether all generated images should 
+saved be automically, or to tune the Stable Diffusion image generation.
+
 ![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
 
 # Image Modifiers

From b3e9b266fa2b9a958bc384ef1f4f20fa6178c7e4 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 12:05:07 +0530
Subject: [PATCH 09/35] Use python 3.8.13 instead of 3.8.5, since 3.8.5 seems
 to be missing openssl in some pip repositories

---
 ui/sd_internal/env_yaml.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch
index cc140ef1..ba4d2a19 100644
--- a/ui/sd_internal/env_yaml.patch
+++ b/ui/sd_internal/env_yaml.patch
@@ -1,7 +1,16 @@
 diff --git a/environment.yaml b/environment.yaml
-index 7f25da8..306750f 100644
+index 7f25da8..19ddcd8 100644
 --- a/environment.yaml
 +++ b/environment.yaml
+@@ -3,7 +3,7 @@ channels:
+   - pytorch
+   - defaults
+ dependencies:
+-  - python=3.8.5
++  - python=3.8.13
+   - pip=20.3
+   - cudatoolkit=11.3
+   - pytorch=1.11.0
 @@ -23,6 +23,8 @@ dependencies:
      - torch-fidelity==0.3.0
      - transformers==4.19.2

From 2a46f6b225ea9cd4f357582af0277fe7b5d1b5fc Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 19:19:11 +0530
Subject: [PATCH 10/35] Make the new installer work with existing installations
 (made with the old installer)

---
 scripts/Start Stable Diffusion UI.cmd | 9 +++++++++
 scripts/on_env_start.bat              | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index 6bf6b290..e34c2b36 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -1,3 +1,10 @@
+@echo off
+
+@REM Delete the post-activate hook from the old installer
+@if exist "installer\etc\conda\activate.d\post_activate.bat" (
+    del "installer\etc\conda\activate.d\post_activate.bat"
+)
+
 @call installer\Scripts\activate.bat
 
 @call conda-unpack
@@ -5,6 +12,8 @@
 @call conda --version
 @call git --version
 
+@cd installer
+
 @call scripts\on_env_start.bat
 
 @pause
\ No newline at end of file
diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 959b5e20..16312a5a 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -4,6 +4,8 @@
 
 set PATH=C:\Windows\System32;%PATH%
 
+@cd ..
+
 if exist "scripts\config.bat" (
     @call scripts\config.bat
 )

From 300159c03b85b4388d33c9055fcb89da959729ad Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 19:40:52 +0530
Subject: [PATCH 11/35] Temporarily disable the check for whitelisted ckpt
 weights

---
 scripts/on_sd_start.bat | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 3b6d1648..7d633757 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -165,16 +165,17 @@
 
 @if exist "sd-v1-4.ckpt" (
     for %%I in ("sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
-        echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
+        echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 4 GB Model."
     ) else (
         for %%J in ("sd-v1-4.ckpt") do if "%%~zJ" EQU "7703807346" (
-            echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
+            echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 7 GB Model."
         ) else (
             for %%K in ("sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
-                echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
+                echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
             ) else (
-                echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
-                del "sd-v1-4.ckpt"
+                @REM echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
+                @REM del "sd-v1-4.ckpt"
+                echo. & echo "It looks like you're using a custom weights file. File size: %%~zK bytes" & echo.
             )
         )
     )

From ca704e1d517997509934b21cb9ebe4751517f1d9 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 20:07:04 +0530
Subject: [PATCH 12/35] Revert "Merge pull request #250 from
 cmdr2/win-installer-no-activate"

This reverts commit 04eb356c891530b9f5dfe6a7e4e4098367b700b7, reversing
changes made to 300159c03b85b4388d33c9055fcb89da959729ad.
---
 build.bat                             |  8 +++++---
 build.sh                              |  3 ---
 scripts/Start Stable Diffusion UI.cmd | 20 +-------------------
 scripts/on_env_start.bat              |  2 +-
 scripts/on_sd_start.bat               |  2 +-
 scripts/start.sh                      |  3 ---
 ui/sd_internal/env_yaml.patch         | 11 +----------
 7 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/build.bat b/build.bat
index 96232c0a..d1bcaab7 100644
--- a/build.bat
+++ b/build.bat
@@ -8,8 +8,6 @@
 set /p answer=Are you a developer of this project (Y/N)?
 if /i "%answer:~,1%" NEQ "Y" exit /b
 
-@set PYTHONNOUSERSITE=1
-
 @mkdir dist\stable-diffusion-ui
 
 @echo "Downloading components for the installer.."
@@ -17,6 +15,11 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @call conda env create --prefix installer -f environment.yaml
 @call conda activate .\installer
 
+@echo "Setting up startup scripts.."
+
+@mkdir installer\etc\conda\activate.d
+@copy scripts\post_activate.bat installer\etc\conda\activate.d\
+
 @echo "Creating a distributable package.."
 
 @call conda install -c conda-forge -y conda-pack
@@ -34,7 +37,6 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @copy ..\..\LICENSE .
 @copy "..\..\CreativeML Open RAIL-M License" .
 @copy "..\..\How to install and run.txt" .
-@echo. > scripts\install_status.txt
 
 @echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
 
diff --git a/build.sh b/build.sh
index 577dcb8b..04579d1f 100755
--- a/build.sh
+++ b/build.sh
@@ -11,8 +11,6 @@ case $yn in
     * ) exit;;
 esac
 
-export PYTHONNOUSERSITE=1
-
 mkdir -p dist/stable-diffusion-ui
 
 echo "Downloading components for the installer.."
@@ -40,7 +38,6 @@ cp ../../scripts/start.sh .
 cp ../../LICENSE .
 cp "../../CreativeML Open RAIL-M License" .
 cp "../../How to install and run.txt" .
-echo "" > scripts/install_status.txt
 
 chmod u+x start.sh
 
diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index e34c2b36..4f67c7bf 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -1,19 +1 @@
-@echo off
-
-@REM Delete the post-activate hook from the old installer
-@if exist "installer\etc\conda\activate.d\post_activate.bat" (
-    del "installer\etc\conda\activate.d\post_activate.bat"
-)
-
-@call installer\Scripts\activate.bat
-
-@call conda-unpack
-
-@call conda --version
-@call git --version
-
-@cd installer
-
-@call scripts\on_env_start.bat
-
-@pause
\ No newline at end of file
+installer\Scripts\activate.bat
diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 16312a5a..8e46c62c 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -2,7 +2,7 @@
 
 @echo. & echo "Stable Diffusion UI - v2" & echo.
 
-set PATH=C:\Windows\System32;%PATH%
+@REM set PATH=C:\Windows\System32;%PATH%
 
 @cd ..
 
diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 1c7b8644..7d633757 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -79,7 +79,7 @@
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
-set PATH=C:\Windows\System32;%PATH%
+@REM set PATH=C:\Windows\System32;%PATH%
 
 @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
diff --git a/scripts/start.sh b/scripts/start.sh
index e077593a..d6c75ad8 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -4,7 +4,4 @@ source installer/bin/activate
 
 conda-unpack
 
-conda --version
-git --version
-
 scripts/on_env_start.sh
diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch
index ba4d2a19..cc140ef1 100644
--- a/ui/sd_internal/env_yaml.patch
+++ b/ui/sd_internal/env_yaml.patch
@@ -1,16 +1,7 @@
 diff --git a/environment.yaml b/environment.yaml
-index 7f25da8..19ddcd8 100644
+index 7f25da8..306750f 100644
 --- a/environment.yaml
 +++ b/environment.yaml
-@@ -3,7 +3,7 @@ channels:
-   - pytorch
-   - defaults
- dependencies:
--  - python=3.8.5
-+  - python=3.8.13
-   - pip=20.3
-   - cudatoolkit=11.3
-   - pytorch=1.11.0
 @@ -23,6 +23,8 @@ dependencies:
      - torch-fidelity==0.3.0
      - transformers==4.19.2

From e67843638fafeea7cff3334d909c81c2f2b3f6f4 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 20:11:33 +0530
Subject: [PATCH 13/35] Fix errors with the new installer

---
 scripts/Start Stable Diffusion UI.cmd | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index e34c2b36..f3af626c 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -1,9 +1,7 @@
 @echo off
 
 @REM Delete the post-activate hook from the old installer
-@if exist "installer\etc\conda\activate.d\post_activate.bat" (
-    del "installer\etc\conda\activate.d\post_activate.bat"
-)
+echo. > installer\etc\conda\activate.d\post_activate.bat
 
 @call installer\Scripts\activate.bat
 
@@ -14,6 +12,6 @@
 
 @cd installer
 
-@call scripts\on_env_start.bat
+@call ..\scripts\on_env_start.bat
 
 @pause
\ No newline at end of file

From 939dd0b2079be371733893f8d1611bace555883d Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 23:02:03 +0530
Subject: [PATCH 14/35] Empty the post-activate hook only if it exists

---
 scripts/Start Stable Diffusion UI.cmd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd
index f3af626c..2f3e32f9 100644
--- a/scripts/Start Stable Diffusion UI.cmd	
+++ b/scripts/Start Stable Diffusion UI.cmd	
@@ -1,7 +1,9 @@
 @echo off
 
 @REM Delete the post-activate hook from the old installer
-echo. > installer\etc\conda\activate.d\post_activate.bat
+if exist "installer\etc\conda\activate.d\post_activate.bat" (
+    echo. > installer\etc\conda\activate.d\post_activate.bat
+)
 
 @call installer\Scripts\activate.bat
 

From a10c4f7a34670f765139fb8b7a6dd200e5f25d6b Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Mon, 26 Sep 2022 23:11:21 +0530
Subject: [PATCH 15/35] v2.16 links

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf88a8e5..6cd735ec 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 be
 You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.
 
 # Installation
-1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.05/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.05/stable-diffusion-ui-linux.tar.xz).
+1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).
 
 2. **Extract**:
   - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).

From 926ffefac8f7aff41198b0539cbb4956b0b95b7d Mon Sep 17 00:00:00 2001
From: mrbusysky <58412572+mrbusysky@users.noreply.github.com>
Date: Mon, 26 Sep 2022 21:24:20 -0700
Subject: [PATCH 16/35] Correction of link position

and correction of the label being on the wrong line.
---
 ui/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 83f71d2c..846b1d0f 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -21,9 +21,9 @@
             <li class="dropdown">
                 <span><i class="fa fa-comments icon"></i> Help & Community</span>
                 <ul id="community-links" class="dropdown-content">
+                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
                     <li><a href="https://discord.com/invite/u9yhsFmEkB" target="_blank"><i class="fa-brands fa-discord fa-fw"></i> Discord user community</a></li>
                     <li><a href="https://www.reddit.com/r/StableDiffusionUI/" target="_blank"><i class="fa-brands fa-reddit fa-fw"></i> Reddit community</a></li>
-                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
                     <li><a href="https://github.com/cmdr2/stable-diffusion-ui" target="_blank"><i class="fa-brands fa-github fa-fw"></i> Source code on GitHub</a></li>
                 </ul>
             </li>
@@ -122,7 +122,8 @@
                             <option value="1536">1536</option>
                             <option value="1792">1792</option>
                             <option value="2048">2048</option>
-                        </select> <label for="width"><small>(width)</small></label>
+                        </select>
+                        <label for="width"><small>(width)</small></label>
                         <select id="height" name="height" value="512">
                             <option value="128">128 (*)</option>
                             <option value="192">192</option>

From fac8e8aa8bf8887b942fbe7309083e4eb32b5b90 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 13:48:50 +0530
Subject: [PATCH 17/35] Insert the latest batch of images on top

---
 ui/index.html    | 2 +-
 ui/media/main.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 846b1d0f..9713c9e4 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -212,7 +212,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=4"></script>
+<script src="media/main.js?v=5"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index 7633b7ee..1f80f3c1 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -260,7 +260,7 @@ function makeImageElement(width, height) {
     img.height = parseInt(height)
 
     imgItem.appendChild(img)
-    imagesContainer.appendChild(imgItem)
+    imagesContainer.insertBefore(imgItem, imagesContainer.firstChild)
 
     return imgItem
 }

From a2b9ee59880852a760db2941ff159dbf3491a963 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 13:56:17 +0530
Subject: [PATCH 18/35] Stop the images from jumping while rendering

---
 ui/index.html     |  2 +-
 ui/media/main.css |  1 +
 ui/media/main.js  | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 9713c9e4..083dbc40 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" type="image/png" href="/media/favicon-16x16.png" sizes="16x16">
     <link rel="icon" type="image/png" href="/media/favicon-32x32.png" sizes="32x32">
-    <link rel="stylesheet" href="/media/main.css?v=3">
+    <link rel="stylesheet" href="/media/main.css?v=4">
     <link rel="stylesheet" href="/media/modifier-thumbnails.css?v=1">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
     <link rel="stylesheet" href="/media/drawingboard.min.css">
diff --git a/ui/media/main.css b/ui/media/main.css
index 388c8ccd..840bf6f4 100644
--- a/ui/media/main.css
+++ b/ui/media/main.css
@@ -56,6 +56,7 @@ label {
 }
 #outputMsg {
     font-size: small;
+    padding-bottom: 3pt;
 }
 #progressBar {
     font-size: small;
diff --git a/ui/media/main.js b/ui/media/main.js
index 1f80f3c1..ebab4ece 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -327,12 +327,12 @@ async function doMakeImage(reqBody, batchCount) {
                         timeRemaining = (timeTaken === -1 ? '' : stepsRemaining * timeTaken) // ms
 
                         outputMsg.innerHTML = `Batch ${batchesDone+1} of ${batchCount}`
-                        progressBar.innerHTML = `Generating image(s): ${percent}%`
+                        outputMsg.innerHTML += `. Generating image(s): ${percent}%`
 
-                        if (timeTaken !== -1) {
-                            progressBar.innerHTML += `<br>Time remaining (approx): ${millisecondsToStr(timeRemaining)}`
-                        }
-                        progressBar.style.display = 'block'
+                        timeRemaining = (timeTaken !== -1 ? millisecondsToStr(timeRemaining) : '')
+
+                        outputMsg.innerHTML += `. Time remaining (approx): ${timeRemaining}`
+                        outputMsg.style.display = 'block'
 
                         if (stepUpdate.output !== undefined) {
                             makeImageContainers(numOutputs)
@@ -381,7 +381,6 @@ async function doMakeImage(reqBody, batchCount) {
             }
 
             res = JSON.parse(finalJSON)
-            progressBar.style.display = 'none'
 
             if (res.status !== 'succeeded') {
                 let msg = ''
@@ -609,11 +608,12 @@ async function makeImage() {
         batchesDone++
 
         if (success) {
-            outputMsg.innerText = 'Processed batch ' + (i+1) + '/' + batchCount
             successCount++
         }
     }
 
+    progressBar.style.display = 'none'
+
     makeImageBtn.innerText = 'Make Image'
     makeImageBtn.disabled = false
     makeImageBtn.style.display = 'block'

From 396e54bad0e0ac8197e354f5aa6d9d4ee27c4c96 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 14:15:49 +0530
Subject: [PATCH 19/35] Use the correct installer build scripts from main

---
 build.bat | 8 +++-----
 build.sh  | 3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.bat b/build.bat
index d1bcaab7..96232c0a 100644
--- a/build.bat
+++ b/build.bat
@@ -8,6 +8,8 @@
 set /p answer=Are you a developer of this project (Y/N)?
 if /i "%answer:~,1%" NEQ "Y" exit /b
 
+@set PYTHONNOUSERSITE=1
+
 @mkdir dist\stable-diffusion-ui
 
 @echo "Downloading components for the installer.."
@@ -15,11 +17,6 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @call conda env create --prefix installer -f environment.yaml
 @call conda activate .\installer
 
-@echo "Setting up startup scripts.."
-
-@mkdir installer\etc\conda\activate.d
-@copy scripts\post_activate.bat installer\etc\conda\activate.d\
-
 @echo "Creating a distributable package.."
 
 @call conda install -c conda-forge -y conda-pack
@@ -37,6 +34,7 @@ if /i "%answer:~,1%" NEQ "Y" exit /b
 @copy ..\..\LICENSE .
 @copy "..\..\CreativeML Open RAIL-M License" .
 @copy "..\..\How to install and run.txt" .
+@echo. > scripts\install_status.txt
 
 @echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
 
diff --git a/build.sh b/build.sh
index 04579d1f..577dcb8b 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,8 @@ case $yn in
     * ) exit;;
 esac
 
+export PYTHONNOUSERSITE=1
+
 mkdir -p dist/stable-diffusion-ui
 
 echo "Downloading components for the installer.."
@@ -38,6 +40,7 @@ cp ../../scripts/start.sh .
 cp ../../LICENSE .
 cp "../../CreativeML Open RAIL-M License" .
 cp "../../How to install and run.txt" .
+echo "" > scripts/install_status.txt
 
 chmod u+x start.sh
 

From 30c46c08583ea5934386eb4c4233a495490d0aef Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 14:18:56 +0530
Subject: [PATCH 20/35] Missing changes from main in beta, bad merge

---
 scripts/on_env_start.bat |  2 +-
 scripts/on_sd_start.bat  | 21 ++++++++++-----------
 scripts/start.sh         |  3 +++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat
index 8e46c62c..16312a5a 100644
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@@ -2,7 +2,7 @@
 
 @echo. & echo "Stable Diffusion UI - v2" & echo.
 
-@REM set PATH=C:\Windows\System32;%PATH%
+set PATH=C:\Windows\System32;%PATH%
 
 @cd ..
 
diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat
index 7d633757..34ccdf83 100644
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@@ -79,7 +79,7 @@
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
-@REM set PATH=C:\Windows\System32;%PATH%
+set PATH=C:\Windows\System32;%PATH%
 
 @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
@@ -148,13 +148,13 @@
     )
 )
 
-@REM call WHERE uvicorn > .tmp
-@REM @>nul grep -c "uvicorn" .tmp
-@REM @if "%ERRORLEVEL%" NEQ "0" (
-@REM     @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-@REM     pause
-@REM     exit /b
-@REM )
+call WHERE uvicorn > .tmp
+@>nul grep -c "uvicorn" .tmp
+@if "%ERRORLEVEL%" NEQ "0" (
+    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+    pause
+    exit /b
+)
 
 @>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
@@ -173,9 +173,8 @@
             for %%K in ("sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
                 echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
             ) else (
-                @REM echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
-                @REM del "sd-v1-4.ckpt"
-                echo. & echo "It looks like you're using a custom weights file. File size: %%~zK bytes" & echo.
+                echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
+                del "sd-v1-4.ckpt"
             )
         )
     )
diff --git a/scripts/start.sh b/scripts/start.sh
index d6c75ad8..e077593a 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -4,4 +4,7 @@ source installer/bin/activate
 
 conda-unpack
 
+conda --version
+git --version
+
 scripts/on_env_start.sh

From 864fc848993b053f00fa2550a3d6bfcab87d1938 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 14:28:29 +0530
Subject: [PATCH 21/35] Hide the image info when the mouse isn't over it

---
 ui/index.html    | 2 +-
 ui/media/main.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 083dbc40..906576f1 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -212,7 +212,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=5"></script>
+<script src="media/main.js?v=6"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index ebab4ece..bc9fe29f 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -439,6 +439,7 @@ async function doMakeImage(reqBody, batchCount) {
 
         let imgItemInfo = document.createElement('span')
         imgItemInfo.className = 'imgItemInfo'
+        imgItemInfo.style.opacity = 0
 
         let imgSeedLabel = document.createElement('span')
         imgSeedLabel.className = 'imgSeedLabel'
@@ -485,7 +486,7 @@ async function doMakeImage(reqBody, batchCount) {
         })
 
         imgItem.addEventListener('mouseleave', function() {
-            imgItemInfo.style.opacity = 0.5
+            imgItemInfo.style.opacity = 0
         })
     }
 

From 05a4701d985932c5c0982a44032cee755cb51792 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 18:09:07 +0530
Subject: [PATCH 22/35] Allow queuing up of tasks

---
 ui/index.html     |  20 ++-
 ui/media/main.css |  49 ++++++-
 ui/media/main.js  | 325 ++++++++++++++++++++++++++++++++++------------
 3 files changed, 291 insertions(+), 103 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 906576f1..1b1557b7 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" type="image/png" href="/media/favicon-16x16.png" sizes="16x16">
     <link rel="icon" type="image/png" href="/media/favicon-32x32.png" sizes="32x32">
-    <link rel="stylesheet" href="/media/main.css?v=4">
+    <link rel="stylesheet" href="/media/main.css?v=10">
     <link rel="stylesheet" href="/media/modifier-thumbnails.css?v=1">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
     <link rel="stylesheet" href="/media/drawingboard.min.css">
@@ -78,7 +78,7 @@
                 </div>
 
                 <button id="makeImage">Make Image</button>
-                <button id="stopImage">Stop</button>
+                <button id="stopImage" class="secondaryButton">Stop All</button>
             </div>
 
             <div class="line-separator">&nbsp;</div>
@@ -154,7 +154,7 @@
                     <br/>
 
                     <li><b class="settings-subheader">Render Settings</b></li>
-                    <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview of the image <small>(consumes more VRAM, slightly slower image generation)</small></label></li>
+                    <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview of the image <small>(uses more VRAM, slightly slower image creation)</small></label></li>
                     <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox" checked> <label for="use_face_correction">Fix incorrect faces and eyes <small>(uses GFPGAN)</small></label></li>
                     <li class="pl-5">
                         <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Upscale the image to 4x resolution using </label>
@@ -185,15 +185,11 @@
         </div>
 
         <div id="preview" class="col-free">
-            <div id="preview-prompt">
-                <div id="initial-text">
-                    Type a prompt and press the "Make Image" button.<br/><br/>You can set an "Initial Image" if you want to guide the AI.<br/><br/>You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section and selecting the desired modifiers.<br/><br/>Click "Advanced Settings" for additional settings like seed, image size, number of images to generate etc.<br/><br/>Enjoy! :)
-                </div>
+            <div id="initial-text">
+                Type a prompt and press the "Make Image" button.<br/><br/>You can set an "Initial Image" if you want to guide the AI.<br/><br/>You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section and selecting the desired modifiers.<br/><br/>Click "Advanced Settings" for additional settings like seed, image size, number of images to generate etc.<br/><br/>Enjoy! :)
             </div>
-
-            <div id="outputMsg"></div>
-            <div id="progressBar"></div>
-            <div id="current-images" class="img-preview">
+            <div id="preview-tools">
+                <button id="clear-all-previews" class="secondaryButton"><i class="fa-solid fa-trash-can"></i> Clear All</button>
             </div>
         </div>
     </div>
@@ -212,7 +208,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=6"></script>
+<script src="media/main.js?v=10"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.css b/ui/media/main.css
index 840bf6f4..77c09a88 100644
--- a/ui/media/main.css
+++ b/ui/media/main.css
@@ -54,7 +54,7 @@ label {
 .editor-slider {
     vertical-align: middle;
 }
-#outputMsg {
+.outputMsg {
     font-size: small;
     padding-bottom: 3pt;
 }
@@ -165,7 +165,7 @@ label {
     display: none;
 }
 #stopImage:hover {
-    background: rgb(214, 32, 0);
+    background: rgb(177, 27, 0);
 }
 .flex-container {
     display: flex;
@@ -174,7 +174,7 @@ label {
     flex: 50%;
 }
 .col-fixed-10 {
-    flex: 0 0 400pt;
+    flex: 0 0 380pt;
 }
 .col-free {
     flex: 1;
@@ -212,7 +212,7 @@ label {
     padding-bottom: 10pt;
 }
 #preview {
-    margin-left: 20pt;
+    margin-left: 10pt;
 }
 img {
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15);
@@ -246,7 +246,7 @@ img {
     padding-left: 2pt;
     font-size: 10pt;
 }
-#preview-prompt {
+.preview-prompt {
     font-size: 16pt;
     margin-bottom: 10pt;
 }
@@ -365,4 +365,43 @@ img {
 }
 .dropdown:hover .dropdown-content {
     display: block;
+}
+
+.imageTaskContainer {
+    border: 1px solid #333;
+    margin-bottom: 10pt;
+    padding: 5pt;
+    border-radius: 5pt;
+    box-shadow: 0 20px 28px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15);
+}
+.taskStatusLabel {
+    float: left;
+    font-size: 8pt;
+    background:rgb(44, 45, 48);
+    border: 1px solid rgb(61, 62, 66);
+    padding: 2pt 4pt;
+    border-radius: 2pt;
+    margin-right: 5pt;
+}
+.secondaryButton {
+    background: rgb(132, 8, 0);
+    border: 1px solid rgb(122, 29, 0);
+    color: rgb(255, 221, 255);
+    padding: 3pt 6pt;
+    border-radius: 5px;
+}
+.secondaryButton:hover {
+    background: rgb(177, 27, 0);
+}
+.stopTask {
+    float: right;
+}
+#preview-tools {
+    display: none;
+    padding: 4pt;
+}
+.taskConfig {
+    font-size: 10pt;
+    color: #aaa;
+    margin-bottom: 5pt;
 }
\ No newline at end of file
diff --git a/ui/media/main.js b/ui/media/main.js
index bc9fe29f..b0ee0610 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -57,6 +57,10 @@ let initImagePreviewContainer = document.querySelector('#init_image_preview_cont
 let initImageClearBtn = document.querySelector('.init_image_clear')
 let promptStrengthContainer = document.querySelector('#prompt_strength_container')
 
+let initialText = document.querySelector("#initial-text")
+let previewTools = document.querySelector("#preview-tools")
+let clearAllPreviewsBtn = document.querySelector("#clear-all-previews")
+
 // let maskSetting = document.querySelector('#editor-inputs-mask_setting')
 // let maskImagePreviewContainer = document.querySelector('#mask_preview_container')
 // let maskImageClearBtn = document.querySelector('#mask_clear')
@@ -66,18 +70,19 @@ let editorModifierEntries = document.querySelector('#editor-modifiers-entries')
 let editorModifierTagsList = document.querySelector('#editor-inputs-tags-list')
 let editorTagsContainer = document.querySelector('#editor-inputs-tags-container')
 
+let imagePreview = document.querySelector("#preview")
 let previewImageField = document.querySelector('#preview-image')
 previewImageField.onchange = () => changePreviewImages(previewImageField.value);
 
 let modifierCardSizeSlider = document.querySelector('#modifier-card-size-slider')
 modifierCardSizeSlider.onchange = () => resizeModifierCards(modifierCardSizeSlider.value);
 
-let previewPrompt = document.querySelector('#preview-prompt')
+// let previewPrompt = document.querySelector('#preview-prompt')
 
 let showConfigToggle = document.querySelector('#configToggleBtn')
 // let configBox = document.querySelector('#config')
-let outputMsg = document.querySelector('#outputMsg')
-let progressBar = document.querySelector("#progressBar")
+// let outputMsg = document.querySelector('#outputMsg')
+// let progressBar = document.querySelector("#progressBar")
 
 let soundToggle = document.querySelector('#sound_toggle')
 
@@ -108,8 +113,8 @@ let serverStatus = 'offline'
 let activeTags = []
 let modifiers = []
 let lastPromptUsed = ''
-let taskStopped = true
-let batchesDone = 0
+
+let taskQueue = []
 
 const modifierThumbnailPath = 'media/modifier-thumbnails';
 const activeCardClass = 'modifier-card-active';
@@ -211,7 +216,7 @@ function setStatus(statusType, msg, msgType) {
     }
 }
 
-function logMsg(msg, level) {
+function logMsg(msg, level, outputMsg) {
     if (level === 'error') {
         outputMsg.innerHTML = '<span style="color: red">Error: ' + msg + '</span>'
     } else if (level === 'warn') {
@@ -223,8 +228,8 @@ function logMsg(msg, level) {
     console.log(level, msg)
 }
 
-function logError(msg, res) {
-    logMsg(msg, 'error')
+function logError(msg, res, outputMsg) {
+    logMsg(msg, 'error', outputMsg)
 
     console.log('request error', res)
     setStatus('request', 'error', 'error')
@@ -251,7 +256,7 @@ async function healthCheck() {
     }
 }
 
-function makeImageElement(width, height) {
+function makeImageElement(width, height, outputContainer) {
     let imgItem = document.createElement('div')
     imgItem.className = 'imgItem'
 
@@ -260,17 +265,25 @@ function makeImageElement(width, height) {
     img.height = parseInt(height)
 
     imgItem.appendChild(img)
-    imagesContainer.insertBefore(imgItem, imagesContainer.firstChild)
+    outputContainer.insertBefore(imgItem, outputContainer.firstChild)
 
     return imgItem
 }
 
 // makes a single image. don't call this directly, use makeImage() instead
-async function doMakeImage(reqBody, batchCount) {
-    if (taskStopped) {
+async function doMakeImage(task) {
+    if (task.stopped) {
         return
     }
 
+    const reqBody = task.reqBody
+    const batchCount = task.batchCount
+    const outputContainer = task.outputContainer
+
+    const outputMsg = task['outputMsg']
+    const previewPrompt = task['previewPrompt']
+    const progressBar = task['progressBar']
+
     let res = ''
     let seed = reqBody['seed']
     let numOutputs = parseInt(reqBody['num_outputs'])
@@ -279,7 +292,7 @@ async function doMakeImage(reqBody, batchCount) {
 
     function makeImageContainers(numImages) {
         for (let i = images.length; i < numImages; i++) {
-            images.push(makeImageElement(reqBody.width, reqBody.height))
+            images.push(makeImageElement(reqBody.width, reqBody.height, outputContainer))
         }
     }
 
@@ -316,7 +329,7 @@ async function doMakeImage(reqBody, batchCount) {
                         finalJSON += jsonStr
                     } else {
                         let batchSize = stepUpdate.total_steps
-                        let overallStepCount = stepUpdate.step + batchesDone * batchSize
+                        let overallStepCount = stepUpdate.step + task.batchesDone * batchSize
                         let totalSteps = batchCount * batchSize
                         let percent = 100 * (overallStepCount / totalSteps)
                         percent = (percent > 100 ? 100 : percent)
@@ -326,7 +339,7 @@ async function doMakeImage(reqBody, batchCount) {
                         stepsRemaining = (stepsRemaining < 0 ? 0 : stepsRemaining)
                         timeRemaining = (timeTaken === -1 ? '' : stepsRemaining * timeTaken) // ms
 
-                        outputMsg.innerHTML = `Batch ${batchesDone+1} of ${batchCount}`
+                        outputMsg.innerHTML = `Batch ${task.batchesDone+1} of ${batchCount}`
                         outputMsg.innerHTML += `. Generating image(s): ${percent}%`
 
                         timeRemaining = (timeTaken !== -1 ? millisecondsToStr(timeRemaining) : '')
@@ -351,7 +364,7 @@ async function doMakeImage(reqBody, batchCount) {
 
                 prevTime = t
             } catch (e) {
-                logError('Stable Diffusion had an error. Please check the logs in the command-line window.', res)
+                logError('Stable Diffusion had an error. Please check the logs in the command-line window.', res, outputMsg)
                 res = undefined
                 throw e
             }
@@ -359,9 +372,9 @@ async function doMakeImage(reqBody, batchCount) {
 
         if (res.status != 200) {
             if (serverStatus === 'online') {
-                logError('Stable Diffusion had an error: ' + await res.text(), res)
+                logError('Stable Diffusion had an error: ' + await res.text(), res, outputMsg)
             } else {
-                logError("Stable Diffusion is still starting up, please wait. If this goes on beyond a few minutes, Stable Diffusion has probably crashed. Please check the error message in the command-line window.", res)
+                logError("Stable Diffusion is still starting up, please wait. If this goes on beyond a few minutes, Stable Diffusion has probably crashed. Please check the error message in the command-line window.", res, outputMsg)
             }
             res = undefined
             progressBar.style.display = 'none'
@@ -398,13 +411,13 @@ async function doMakeImage(reqBody, batchCount) {
                 } else {
                     msg = res
                 }
-                logError(msg, res)
+                logError(msg, res, outputMsg)
                 res = undefined
             }
         }
     } catch (e) {
         console.log('request error', e)
-        logError('Stable Diffusion had an error. Please check the logs in the command-line window. <br/><br/>' + e + '<br/><pre>' + e.stack + '</pre>', res)
+        logError('Stable Diffusion had an error. Please check the logs in the command-line window. <br/><br/>' + e + '<br/><pre>' + e.stack + '</pre>', res, outputMsg)
         setStatus('request', 'error', 'error')
         progressBar.style.display = 'none'
         res = undefined
@@ -493,48 +506,107 @@ async function doMakeImage(reqBody, batchCount) {
     return true
 }
 
-function validateInput() {
-    let width = parseInt(widthField.value)
-    let height = parseInt(heightField.value)
+// function validateInput() {
+//     let width = parseInt(widthField.value)
+//     let height = parseInt(heightField.value)
 
-    if (IMAGE_REGEX.test(initImagePreview.src)) {
-        if (initImagePreview.naturalWidth > MAX_INIT_IMAGE_DIMENSION || initImagePreview.naturalHeight > MAX_INIT_IMAGE_DIMENSION) {
-            return {'isValid': false, 'warning': `The dimensions of your initial image are very large, and can cause 'Out of Memory' errors! Please ensure that its dimensions are equal (or smaller) than the desired output image.
-                    <br/><br/>
-                    Your initial image size is ${initImagePreview.naturalWidth}x${initImagePreview.naturalHeight} pixels. Please try to keep it smaller than ${MAX_INIT_IMAGE_DIMENSION}x${MAX_INIT_IMAGE_DIMENSION}.`}
-        }
-    }
+//     if (IMAGE_REGEX.test(initImagePreview.src)) {
+//         if (initImagePreview.naturalWidth > MAX_INIT_IMAGE_DIMENSION || initImagePreview.naturalHeight > MAX_INIT_IMAGE_DIMENSION) {
+//             return {'isValid': false, 'warning': `The dimensions of your initial image are very large, and can cause 'Out of Memory' errors! Please ensure that its dimensions are equal (or smaller) than the desired output image.
+//                     <br/><br/>
+//                     Your initial image size is ${initImagePreview.naturalWidth}x${initImagePreview.naturalHeight} pixels. Please try to keep it smaller than ${MAX_INIT_IMAGE_DIMENSION}x${MAX_INIT_IMAGE_DIMENSION}.`}
+//         }
+//     }
 
-    return {'isValid': true}
-}
+//     return {'isValid': true}
+// }
 
-async function makeImage() {
-    if (serverStatus !== 'online') {
-        logError('The server is still starting up..')
+async function checkTasks() {
+    if (taskQueue.length === 0) {
+        setStatus('request', 'done', 'success')
+        setTimeout(checkTasks, 500)
+        stopImageBtn.style.display = 'none'
+        makeImageBtn.innerHTML = 'Make Image'
         return
     }
 
-    let validation = validateInput()
-    if (validation['isValid']) {
-        outputMsg.innerHTML = 'Starting..'
-    } else {
-        if (validation['error']) {
-            logError(validation['error'])
-            return
-        } else if (validation['warning']) {
-            logMsg(validation['warning'], 'warn')
-        }
-    }
-
     setStatus('request', 'fetching..')
 
-    makeImageBtn.innerHTML = 'Processing..'
-    makeImageBtn.disabled = true
-    makeImageBtn.style.display = 'none'
     stopImageBtn.style.display = 'block'
+    makeImageBtn.innerHTML = 'Enqueue Next Image'
 
-    taskStopped = false
-    batchesDone = 0
+    previewTools.style.display = 'block'
+
+    let task = taskQueue.pop()
+
+    let time = new Date().getTime()
+
+    let successCount = 0
+
+    task.isProcessing = true
+    task['stopTask'].innerHTML = '<i class="fa-solid fa-circle-stop"></i> Stop'
+    task['taskStatusLabel'].style.display = 'none'
+
+    for (let i = 0; i < task.batchCount; i++) {
+        task.reqBody['seed'] = task.seed + (i * task.reqBody['num_outputs'])
+
+        let success = await doMakeImage(task)
+        task.batchesDone++
+
+        if (success) {
+            successCount++
+        }
+    }
+
+    task.isProcessing = false
+    task['stopTask'].innerHTML = '<i class="fa-solid fa-trash-can"></i> Remove'
+
+    time = new Date().getTime() - time
+    time /= 1000
+
+    if (successCount === task.batchCount) {
+        task.outputMsg.innerText = 'Processed ' + task.numOutputsTotal + ' images in ' + time + ' seconds'
+
+        // setStatus('request', 'done', 'success')
+    }
+
+    if (randomSeedField.checked) {
+        seedField.value = task.seed
+    }
+
+    setTimeout(checkTasks, 10)
+}
+setTimeout(checkTasks, 0)
+
+async function makeImage() {
+    if (serverStatus !== 'online') {
+        alert('The server is still starting up..')
+        return
+    }
+
+    // let validation = validateInput()
+    // if (validation['isValid']) {
+    //     // outputMsg.innerHTML = 'Starting..'
+    // } else {
+    //     if (validation['error']) {
+    //         logError(validation['error'])
+    //         return
+    //     } else if (validation['warning']) {
+    //         logMsg(validation['warning'], 'warn')
+    //     }
+    // }
+
+    // setStatus('request', 'fetching..')
+
+    // makeImageBtn.innerHTML = 'Processing..'
+    // makeImageBtn.disabled = true
+    // makeImageBtn.style.display = 'none'
+    // stopImageBtn.style.display = 'block'
+
+    let task = {
+        stopped: false,
+        batchesDone: 0
+    }
 
     let seed = (randomSeedField.checked ? Math.floor(Math.random() * 10000000) : parseInt(seedField.value))
     let numOutputsTotal = parseInt(numOutputsTotalField.value)
@@ -550,8 +622,6 @@ async function makeImage() {
         prompt += ", " + promptTags;
     }
 
-    previewPrompt.innerText = prompt
-
     let reqBody = {
         session_id: sessionId,
         prompt: prompt,
@@ -597,45 +667,107 @@ async function makeImage() {
         reqBody['use_upscale'] = upscaleModelField.value
     }
 
-    let time = new Date().getTime()
-    imagesContainer.innerHTML = ''
+    let taskConfig = `Seed: ${seed}, Sampler: ${reqBody['sampler']}, Inference Steps: ${numInferenceStepsField.value}, Guidance Scale: ${guidanceScaleField.value}`
 
-    let successCount = 0
+    if (reqBody['init_image'] !== undefined) {
+        taskConfig += `, Prompt Strength: ${promptStrengthField.value}`
+    }
 
-    for (let i = 0; i < batchCount; i++) {
-        reqBody['seed'] = seed + (i * batchSize)
+    if (useFaceCorrectionField.checked) {
+        taskConfig += `, Fix Faces: ${reqBody['use_face_correction']}`
+    }
 
-        let success = await doMakeImage(reqBody, batchCount)
-        batchesDone++
+    if (useUpscalingField.checked) {
+        taskConfig += `, Upscale: ${reqBody['use_upscale']}`
+    }
 
-        if (success) {
-            successCount++
+    task['reqBody'] = reqBody
+    task['seed'] = seed
+    task['batchCount'] = batchCount
+    task['isProcessing'] = false
+
+    let taskEntry = document.createElement('div')
+    taskEntry.className = 'imageTaskContainer'
+    taskEntry.innerHTML = ` <div class="taskStatusLabel">Enqueued</div>
+                            <button class="secondaryButton stopTask"><i class="fa-solid fa-trash-can"></i> Remove</button>
+                            <div class="preview-prompt"></div>
+                            <div class="taskConfig">${taskConfig}</div>
+                            <div class="outputMsg"></div>
+                            <div class="progressBar"></div>
+                            <div class="img-preview">`
+
+    task['numOutputsTotal'] = numOutputsTotal
+    task['taskStatusLabel'] = taskEntry.querySelector('.taskStatusLabel')
+    task['outputContainer'] = taskEntry.querySelector('.img-preview')
+    task['outputMsg'] = taskEntry.querySelector('.outputMsg')
+    task['previewPrompt'] = taskEntry.querySelector('.preview-prompt')
+    task['progressBar'] = taskEntry.querySelector('.progressBar')
+    task['stopTask'] = taskEntry.querySelector('.stopTask')
+
+    task['stopTask'].addEventListener('click', async function() {
+        if (task['isProcessing']) {
+            try {
+                let res = await fetch('/image/stop')
+            } catch (e) {
+                console.log(e)
+            }
+        } else {
+            let idx = taskQueue.indexOf(task)
+            if (idx >= 0) {
+                taskQueue.splice(idx, 1)
+            }
+
+            taskEntry.remove()
         }
-    }
+    })
 
-    progressBar.style.display = 'none'
+    imagePreview.insertBefore(taskEntry, previewTools.nextSibling)
 
-    makeImageBtn.innerText = 'Make Image'
-    makeImageBtn.disabled = false
-    makeImageBtn.style.display = 'block'
-    stopImageBtn.style.display = 'none'
+    task['previewPrompt'].innerText = prompt
 
-    if (isSoundEnabled()) {
-        playSound()
-    }
+    taskQueue.unshift(task)
 
-    time = new Date().getTime() - time
-    time /= 1000
+    initialText.style.display = 'none'
 
-    if (successCount === batchCount) {
-        outputMsg.innerText = 'Processed ' + numOutputsTotal + ' images in ' + time + ' seconds'
+    // let time = new Date().getTime()
+    // imagesContainer.innerHTML = ''
 
-        setStatus('request', 'done', 'success')
-    }
+    // let successCount = 0
 
-    if (randomSeedField.checked) {
-        seedField.value = seed
-    }
+    // for (let i = 0; i < batchCount; i++) {
+    //     reqBody['seed'] = seed + (i * batchSize)
+
+    //     let success = await doMakeImage(reqBody, batchCount)
+    //     batchesDone++
+
+    //     if (success) {
+    //         successCount++
+    //     }
+    // }
+
+    // progressBar.style.display = 'none'
+
+    // makeImageBtn.innerText = 'Make Image'
+    // makeImageBtn.disabled = false
+    // makeImageBtn.style.display = 'block'
+    // stopImageBtn.style.display = 'none'
+
+    // if (isSoundEnabled()) {
+    //     playSound()
+    // }
+
+    // time = new Date().getTime() - time
+    // time /= 1000
+
+    // if (successCount === batchCount) {
+    //     outputMsg.innerText = 'Processed ' + numOutputsTotal + ' images in ' + time + ' seconds'
+
+    //     setStatus('request', 'done', 'success')
+    // }
+
+    // if (randomSeedField.checked) {
+    //     seedField.value = seed
+    // }
 }
 
 // create a file name with embedded prompt and metadata
@@ -674,17 +806,38 @@ function createFileName() {
     return fileName
 }
 
-stopImageBtn.addEventListener('click', async function() {
+async function stopAllTasks() {
+    taskQueue.forEach(task => {
+        task.isProcessing = false
+    })
+    taskQueue = []
+
     try {
         let res = await fetch('/image/stop')
     } catch (e) {
         console.log(e)
     }
+}
 
-    stopImageBtn.style.display = 'none'
-    makeImageBtn.style.display = 'block'
+clearAllPreviewsBtn.addEventListener('click', async function() {
+    await stopAllTasks()
 
-    taskStopped = true
+    let taskEntries = document.querySelectorAll('.imageTaskContainer')
+    taskEntries.forEach(task => {
+        task.remove()
+    })
+
+    previewTools.style.display = 'none'
+    initialText.style.display = 'block'
+})
+
+stopImageBtn.addEventListener('click', async function() {
+    await stopAllTasks()
+
+    // stopImageBtn.style.display = 'none'
+    // makeImageBtn.style.display = 'block'
+
+    // taskStopped = true
 })
 
 soundToggle.addEventListener('click', handleBoolSettingChange(SOUND_ENABLED_KEY))
@@ -781,7 +934,7 @@ updatePromptStrength()
 
 useBetaChannelField.addEventListener('click', async function(e) {
     if (serverStatus !== 'online') {
-        logError('The server is still starting up..')
+        // logError('The server is still starting up..')
         alert('The server is still starting up..')
         e.preventDefault()
         return false

From acbf2a8ab0f04544578ef8a91157913080cdd3a9 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 18:10:32 +0530
Subject: [PATCH 23/35] Bump version

---
 ui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/index.html b/ui/index.html
index 1b1557b7..d0af6c71 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -15,7 +15,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.17 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.18 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <ul id="top-nav-items">
             <li class="dropdown">

From 828a7aabd7a96bed6dce14216c5c56cd7ecd2cbb Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 18:37:21 +0530
Subject: [PATCH 24/35] Show a processing label

---
 ui/index.html     | 2 +-
 ui/media/main.css | 5 +++++
 ui/media/main.js  | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index d0af6c71..b0be3e8b 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -208,7 +208,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=10"></script>
+<script src="media/main.js?v=11"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.css b/ui/media/main.css
index 77c09a88..089f81e0 100644
--- a/ui/media/main.css
+++ b/ui/media/main.css
@@ -383,6 +383,11 @@ img {
     border-radius: 2pt;
     margin-right: 5pt;
 }
+.activeTaskLabel {
+    background:rgb(0, 90, 30);
+    border: 1px solid rgb(0, 75, 19);
+    color:rgb(204, 255, 217)
+}
 .secondaryButton {
     background: rgb(132, 8, 0);
     border: 1px solid rgb(122, 29, 0);
diff --git a/ui/media/main.js b/ui/media/main.js
index b0ee0610..c48c4476 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -545,7 +545,9 @@ async function checkTasks() {
 
     task.isProcessing = true
     task['stopTask'].innerHTML = '<i class="fa-solid fa-circle-stop"></i> Stop'
-    task['taskStatusLabel'].style.display = 'none'
+    task['taskStatusLabel'].innerText = "Processing"
+    task['taskStatusLabel'].className += " activeTaskLabel"
+    console.log(task['taskStatusLabel'].className)
 
     for (let i = 0; i < task.batchCount; i++) {
         task.reqBody['seed'] = task.seed + (i * task.reqBody['num_outputs'])
@@ -560,6 +562,7 @@ async function checkTasks() {
 
     task.isProcessing = false
     task['stopTask'].innerHTML = '<i class="fa-solid fa-trash-can"></i> Remove'
+    task['taskStatusLabel'].style.display = 'none'
 
     time = new Date().getTime() - time
     time /= 1000

From faf455a37cdff81453f60e5a7f7830ab5ee82f86 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 19:09:28 +0530
Subject: [PATCH 25/35] Support negative prompts

---
 ui/index.html              | 9 +++++++--
 ui/media/main.js           | 6 ++++++
 ui/sd_internal/__init__.py | 3 +++
 ui/sd_internal/runtime.py  | 2 +-
 ui/server.py               | 2 ++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index b0be3e8b..1143f6dc 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -15,7 +15,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.18 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.19 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <ul id="top-nav-items">
             <li class="dropdown">
@@ -153,6 +153,11 @@
 
                     <br/>
 
+                    <li><b class="settings-subheader">Prompt Settings</b></li>
+                    <li class="pl-5"><label for="negative_prompt">Negative Prompt:</label> <input id="negative_prompt" name="negative_prompt" size="55"></li>
+
+                    <br/>
+
                     <li><b class="settings-subheader">Render Settings</b></li>
                     <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview of the image <small>(uses more VRAM, slightly slower image creation)</small></label></li>
                     <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox" checked> <label for="use_face_correction">Fix incorrect faces and eyes <small>(uses GFPGAN)</small></label></li>
@@ -208,7 +213,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=11"></script>
+<script src="media/main.js?v=12"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index c48c4476..9c3eb3b6 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -18,6 +18,7 @@ const IMAGE_REGEX = new RegExp('data:image/[A-Za-z]+;base64')
 let sessionId = new Date().getTime()
 
 let promptField = document.querySelector('#prompt')
+let negativePromptField = document.querySelector('#negative_prompt')
 let numOutputsTotalField = document.querySelector('#num_outputs_total')
 let numOutputsParallelField = document.querySelector('#num_outputs_parallel')
 let numInferenceStepsField = document.querySelector('#num_inference_steps')
@@ -628,6 +629,7 @@ async function makeImage() {
     let reqBody = {
         session_id: sessionId,
         prompt: prompt,
+        negative_prompt: negativePromptField.value.trim(),
         num_outputs: batchSize,
         num_inference_steps: numInferenceStepsField.value,
         guidance_scale: guidanceScaleField.value,
@@ -672,6 +674,10 @@ async function makeImage() {
 
     let taskConfig = `Seed: ${seed}, Sampler: ${reqBody['sampler']}, Inference Steps: ${numInferenceStepsField.value}, Guidance Scale: ${guidanceScaleField.value}`
 
+    if (negativePromptField.value.trim() !== '') {
+        taskConfig += `, Negative Prompt: ${negativePromptField.value.trim()}`
+    }
+
     if (reqBody['init_image'] !== undefined) {
         taskConfig += `, Prompt Strength: ${promptStrengthField.value}`
     }
diff --git a/ui/sd_internal/__init__.py b/ui/sd_internal/__init__.py
index e7630a1a..28f2e6b1 100644
--- a/ui/sd_internal/__init__.py
+++ b/ui/sd_internal/__init__.py
@@ -3,6 +3,7 @@ import json
 class Request:
     session_id: str = "session"
     prompt: str = ""
+    negative_prompt: str = ""
     init_image: str = None # base64
     mask: str = None # base64
     num_outputs: int = 1
@@ -30,6 +31,7 @@ class Request:
         return {
             "session_id": self.session_id,
             "prompt": self.prompt,
+            "negative_prompt": self.negative_prompt,
             "num_outputs": self.num_outputs,
             "num_inference_steps": self.num_inference_steps,
             "guidance_scale": self.guidance_scale,
@@ -46,6 +48,7 @@ class Request:
         return f'''
     session_id: {self.session_id}
     prompt: {self.prompt}
+    negative_prompt: {self.negative_prompt}
     seed: {self.seed}
     num_inference_steps: {self.num_inference_steps}
     sampler: {self.sampler}
diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py
index 3083e3ca..eb456c36 100644
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@@ -343,7 +343,7 @@ def do_mk_img(req: Request):
                     modelCS.to(device)
                     uc = None
                     if opt_scale != 1.0:
-                        uc = modelCS.get_learned_conditioning(batch_size * [""])
+                        uc = modelCS.get_learned_conditioning(batch_size * [req.negative_prompt])
                     if isinstance(prompts, tuple):
                         prompts = list(prompts)
 
diff --git a/ui/server.py b/ui/server.py
index bdb252d8..c8c7324f 100644
--- a/ui/server.py
+++ b/ui/server.py
@@ -39,6 +39,7 @@ app.mount('/media', StaticFiles(directory=os.path.join(SD_UI_DIR, 'media/')), na
 class ImageRequest(BaseModel):
     session_id: str = "session"
     prompt: str = ""
+    negative_prompt: str = ""
     init_image: str = None # base64
     mask: str = None # base64
     num_outputs: int = 1
@@ -100,6 +101,7 @@ def image(req : ImageRequest):
     r = Request()
     r.session_id = req.session_id
     r.prompt = req.prompt
+    r.negative_prompt = req.negative_prompt
     r.init_image = req.init_image
     r.mask = req.mask
     r.num_outputs = req.num_outputs

From 008b4228d21f859be7cd87da0008e8f63d933a23 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 19:09:28 +0530
Subject: [PATCH 26/35] Support negative prompts. Credit for the approach:
 https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Negative-prompt

---
 ui/index.html              | 9 +++++++--
 ui/media/main.js           | 6 ++++++
 ui/sd_internal/__init__.py | 3 +++
 ui/sd_internal/runtime.py  | 2 +-
 ui/server.py               | 2 ++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index b0be3e8b..1143f6dc 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -15,7 +15,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.18 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.19 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <ul id="top-nav-items">
             <li class="dropdown">
@@ -153,6 +153,11 @@
 
                     <br/>
 
+                    <li><b class="settings-subheader">Prompt Settings</b></li>
+                    <li class="pl-5"><label for="negative_prompt">Negative Prompt:</label> <input id="negative_prompt" name="negative_prompt" size="55"></li>
+
+                    <br/>
+
                     <li><b class="settings-subheader">Render Settings</b></li>
                     <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview of the image <small>(uses more VRAM, slightly slower image creation)</small></label></li>
                     <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox" checked> <label for="use_face_correction">Fix incorrect faces and eyes <small>(uses GFPGAN)</small></label></li>
@@ -208,7 +213,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=11"></script>
+<script src="media/main.js?v=12"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index c48c4476..9c3eb3b6 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -18,6 +18,7 @@ const IMAGE_REGEX = new RegExp('data:image/[A-Za-z]+;base64')
 let sessionId = new Date().getTime()
 
 let promptField = document.querySelector('#prompt')
+let negativePromptField = document.querySelector('#negative_prompt')
 let numOutputsTotalField = document.querySelector('#num_outputs_total')
 let numOutputsParallelField = document.querySelector('#num_outputs_parallel')
 let numInferenceStepsField = document.querySelector('#num_inference_steps')
@@ -628,6 +629,7 @@ async function makeImage() {
     let reqBody = {
         session_id: sessionId,
         prompt: prompt,
+        negative_prompt: negativePromptField.value.trim(),
         num_outputs: batchSize,
         num_inference_steps: numInferenceStepsField.value,
         guidance_scale: guidanceScaleField.value,
@@ -672,6 +674,10 @@ async function makeImage() {
 
     let taskConfig = `Seed: ${seed}, Sampler: ${reqBody['sampler']}, Inference Steps: ${numInferenceStepsField.value}, Guidance Scale: ${guidanceScaleField.value}`
 
+    if (negativePromptField.value.trim() !== '') {
+        taskConfig += `, Negative Prompt: ${negativePromptField.value.trim()}`
+    }
+
     if (reqBody['init_image'] !== undefined) {
         taskConfig += `, Prompt Strength: ${promptStrengthField.value}`
     }
diff --git a/ui/sd_internal/__init__.py b/ui/sd_internal/__init__.py
index e7630a1a..28f2e6b1 100644
--- a/ui/sd_internal/__init__.py
+++ b/ui/sd_internal/__init__.py
@@ -3,6 +3,7 @@ import json
 class Request:
     session_id: str = "session"
     prompt: str = ""
+    negative_prompt: str = ""
     init_image: str = None # base64
     mask: str = None # base64
     num_outputs: int = 1
@@ -30,6 +31,7 @@ class Request:
         return {
             "session_id": self.session_id,
             "prompt": self.prompt,
+            "negative_prompt": self.negative_prompt,
             "num_outputs": self.num_outputs,
             "num_inference_steps": self.num_inference_steps,
             "guidance_scale": self.guidance_scale,
@@ -46,6 +48,7 @@ class Request:
         return f'''
     session_id: {self.session_id}
     prompt: {self.prompt}
+    negative_prompt: {self.negative_prompt}
     seed: {self.seed}
     num_inference_steps: {self.num_inference_steps}
     sampler: {self.sampler}
diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py
index 3083e3ca..eb456c36 100644
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@@ -343,7 +343,7 @@ def do_mk_img(req: Request):
                     modelCS.to(device)
                     uc = None
                     if opt_scale != 1.0:
-                        uc = modelCS.get_learned_conditioning(batch_size * [""])
+                        uc = modelCS.get_learned_conditioning(batch_size * [req.negative_prompt])
                     if isinstance(prompts, tuple):
                         prompts = list(prompts)
 
diff --git a/ui/server.py b/ui/server.py
index bdb252d8..c8c7324f 100644
--- a/ui/server.py
+++ b/ui/server.py
@@ -39,6 +39,7 @@ app.mount('/media', StaticFiles(directory=os.path.join(SD_UI_DIR, 'media/')), na
 class ImageRequest(BaseModel):
     session_id: str = "session"
     prompt: str = ""
+    negative_prompt: str = ""
     init_image: str = None # base64
     mask: str = None # base64
     num_outputs: int = 1
@@ -100,6 +101,7 @@ def image(req : ImageRequest):
     r = Request()
     r.session_id = req.session_id
     r.prompt = req.prompt
+    r.negative_prompt = req.negative_prompt
     r.init_image = req.init_image
     r.mask = req.mask
     r.num_outputs = req.num_outputs

From 32bafd8b012c5f01ead3ab70a6eadfc04510737f Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Tue, 27 Sep 2022 20:05:22 +0530
Subject: [PATCH 27/35] Stop batched tasks properly

---
 ui/media/main.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ui/media/main.js b/ui/media/main.js
index 9c3eb3b6..6a887b87 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -116,6 +116,7 @@ let modifiers = []
 let lastPromptUsed = ''
 
 let taskQueue = []
+let currentTask = null
 
 const modifierThumbnailPath = 'media/modifier-thumbnails';
 const activeCardClass = 'modifier-card-active';
@@ -528,6 +529,8 @@ async function checkTasks() {
         setTimeout(checkTasks, 500)
         stopImageBtn.style.display = 'none'
         makeImageBtn.innerHTML = 'Make Image'
+
+        currentTask = null
         return
     }
 
@@ -539,6 +542,7 @@ async function checkTasks() {
     previewTools.style.display = 'block'
 
     let task = taskQueue.pop()
+    currentTask = task
 
     let time = new Date().getTime()
 
@@ -556,6 +560,10 @@ async function checkTasks() {
         let success = await doMakeImage(task)
         task.batchesDone++
 
+        if (!task.isProcessing) {
+            break
+        }
+
         if (success) {
             successCount++
         }
@@ -572,12 +580,16 @@ async function checkTasks() {
         task.outputMsg.innerText = 'Processed ' + task.numOutputsTotal + ' images in ' + time + ' seconds'
 
         // setStatus('request', 'done', 'success')
+    } else {
+        task.outputMsg.innerText = 'Task ended after ' + time + ' seconds'
     }
 
     if (randomSeedField.checked) {
         seedField.value = task.seed
     }
 
+    currentTask = null
+
     setTimeout(checkTasks, 10)
 }
 setTimeout(checkTasks, 0)
@@ -715,6 +727,7 @@ async function makeImage() {
 
     task['stopTask'].addEventListener('click', async function() {
         if (task['isProcessing']) {
+            task.isProcessing = false
             try {
                 let res = await fetch('/image/stop')
             } catch (e) {
@@ -821,6 +834,10 @@ async function stopAllTasks() {
     })
     taskQueue = []
 
+    if (currentTask !== null) {
+        currentTask.isProcessing = false
+    }
+
     try {
         let res = await fetch('/image/stop')
     } catch (e) {

From 4c08c692ea1610d7211546125a5fba0c106a21d4 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 12:22:36 +0530
Subject: [PATCH 28/35] Opening the conda environment

---
 Troubleshooting.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Troubleshooting.md b/Troubleshooting.md
index cab1783e..1b087914 100644
--- a/Troubleshooting.md
+++ b/Troubleshooting.md
@@ -44,3 +44,27 @@ After this, you can access the server at `http://localhost:1337` (where 1337 is
 Please ensure that you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), and that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877).
 
 Also, if you are using WSL (Windows), please ensure you have the latest WSL kernel by running `wsl --shutdown` and then `wsl --update`. (Thanks [AndrWeisR](https://github.com/AndrWeisR))
+
+# For support queries
+## Entering a conda environment in an existing installation
+This will give you an activated conda environment in the terminal, so you can run commands and force-install any packages, if required.
+
+Users don't need to have the Anaconda Prompt installed to do this anymore, since the installer bundles a portable version of conda inside it. Just follow these steps.
+
+**Windows:**
+1. Open the terminal: Press Win+R, type "cmd", and press "Run"
+2. Type `cd C:\stable-diffusion-ui` and press enter (or wherever you've installed it)
+3. Type `installer\Scripts\activate.bat` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate .\env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+**Windows:**
+1. Open the terminal
+2. Type `cd /path/to/stable-diffusion-ui` and press enter
+3. Type `installer/bin/activate` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate ./env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+This will give you an activated conda environment. To confirm, type `python --version` and press enter. You should see 3.8.5.

From 17d92d8b79ec9b1bb405747e9c32167a5d2ce513 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 13:04:25 +0530
Subject: [PATCH 29/35] Update Troubleshooting.md

---
 Troubleshooting.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Troubleshooting.md b/Troubleshooting.md
index 1b087914..1955a424 100644
--- a/Troubleshooting.md
+++ b/Troubleshooting.md
@@ -9,6 +9,11 @@ Additionally, a common reason for this error is that you're using an initial ima
 
 Also try generating smaller sized images.
 
+## basicsr module not found
+For Windows: Please download and extract basicsr from [here](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/basicsr-win64.zip), and place the `basicsr` folder inside the `stable-diffusion-ui\stable-diffusion\env\lib\site-packages` folder. Then run the `Start Stable Diffusion UI.cmd` file again.
+
+For Linux: Please contact on the [discord server](https://discord.com/invite/u9yhsFmEkB).
+
 ## No ldm found, or antlr4 or any other missing module, or ClobberError: This transaction has incompatible packages due to a shared path
 On Windows, please ensure that you had placed the `stable-diffusion-ui` folder after unzipping to the root of C: or D: (or any drive). For e.g. `C:\stable-diffusion-ui`. **Note:** This has to be done **before** you start the installation process. If you have already installed (and are facing this error), please delete the installed folder, and start fresh by unzipping and placing the folder at the top of your drive.
 

From 38ebb95e6343a263594f4b3b992d484067f92d1c Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 13:17:45 +0530
Subject: [PATCH 30/35] Bring the bell back

---
 ui/index.html    |  2 +-
 ui/media/main.js | 89 ++++++------------------------------------------
 2 files changed, 11 insertions(+), 80 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 1143f6dc..36239d47 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -213,7 +213,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=12"></script>
+<script src="media/main.js?v=13"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index 6a887b87..e14230ba 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -114,6 +114,7 @@ let serverStatus = 'offline'
 let activeTags = []
 let modifiers = []
 let lastPromptUsed = ''
+let bellPending = false
 
 let taskQueue = []
 let currentTask = null
@@ -508,21 +509,6 @@ async function doMakeImage(task) {
     return true
 }
 
-// function validateInput() {
-//     let width = parseInt(widthField.value)
-//     let height = parseInt(heightField.value)
-
-//     if (IMAGE_REGEX.test(initImagePreview.src)) {
-//         if (initImagePreview.naturalWidth > MAX_INIT_IMAGE_DIMENSION || initImagePreview.naturalHeight > MAX_INIT_IMAGE_DIMENSION) {
-//             return {'isValid': false, 'warning': `The dimensions of your initial image are very large, and can cause 'Out of Memory' errors! Please ensure that its dimensions are equal (or smaller) than the desired output image.
-//                     <br/><br/>
-//                     Your initial image size is ${initImagePreview.naturalWidth}x${initImagePreview.naturalHeight} pixels. Please try to keep it smaller than ${MAX_INIT_IMAGE_DIMENSION}x${MAX_INIT_IMAGE_DIMENSION}.`}
-//         }
-//     }
-
-//     return {'isValid': true}
-// }
-
 async function checkTasks() {
     if (taskQueue.length === 0) {
         setStatus('request', 'done', 'success')
@@ -531,6 +517,14 @@ async function checkTasks() {
         makeImageBtn.innerHTML = 'Make Image'
 
         currentTask = null
+
+        if (bellPending) {
+            if (isSoundEnabled()) {
+                playSound()
+            }
+            bellPending = false
+        }
+
         return
     }
 
@@ -538,6 +532,7 @@ async function checkTasks() {
 
     stopImageBtn.style.display = 'block'
     makeImageBtn.innerHTML = 'Enqueue Next Image'
+    bellPending = true
 
     previewTools.style.display = 'block'
 
@@ -600,25 +595,6 @@ async function makeImage() {
         return
     }
 
-    // let validation = validateInput()
-    // if (validation['isValid']) {
-    //     // outputMsg.innerHTML = 'Starting..'
-    // } else {
-    //     if (validation['error']) {
-    //         logError(validation['error'])
-    //         return
-    //     } else if (validation['warning']) {
-    //         logMsg(validation['warning'], 'warn')
-    //     }
-    // }
-
-    // setStatus('request', 'fetching..')
-
-    // makeImageBtn.innerHTML = 'Processing..'
-    // makeImageBtn.disabled = true
-    // makeImageBtn.style.display = 'none'
-    // stopImageBtn.style.display = 'block'
-
     let task = {
         stopped: false,
         batchesDone: 0
@@ -750,46 +726,6 @@ async function makeImage() {
     taskQueue.unshift(task)
 
     initialText.style.display = 'none'
-
-    // let time = new Date().getTime()
-    // imagesContainer.innerHTML = ''
-
-    // let successCount = 0
-
-    // for (let i = 0; i < batchCount; i++) {
-    //     reqBody['seed'] = seed + (i * batchSize)
-
-    //     let success = await doMakeImage(reqBody, batchCount)
-    //     batchesDone++
-
-    //     if (success) {
-    //         successCount++
-    //     }
-    // }
-
-    // progressBar.style.display = 'none'
-
-    // makeImageBtn.innerText = 'Make Image'
-    // makeImageBtn.disabled = false
-    // makeImageBtn.style.display = 'block'
-    // stopImageBtn.style.display = 'none'
-
-    // if (isSoundEnabled()) {
-    //     playSound()
-    // }
-
-    // time = new Date().getTime() - time
-    // time /= 1000
-
-    // if (successCount === batchCount) {
-    //     outputMsg.innerText = 'Processed ' + numOutputsTotal + ' images in ' + time + ' seconds'
-
-    //     setStatus('request', 'done', 'success')
-    // }
-
-    // if (randomSeedField.checked) {
-    //     seedField.value = seed
-    // }
 }
 
 // create a file name with embedded prompt and metadata
@@ -859,11 +795,6 @@ clearAllPreviewsBtn.addEventListener('click', async function() {
 
 stopImageBtn.addEventListener('click', async function() {
     await stopAllTasks()
-
-    // stopImageBtn.style.display = 'none'
-    // makeImageBtn.style.display = 'block'
-
-    // taskStopped = true
 })
 
 soundToggle.addEventListener('click', handleBoolSettingChange(SOUND_ENABLED_KEY))

From 553525a0fb9f7ec260854e9dd559999919feab9a Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 13:44:48 +0530
Subject: [PATCH 31/35] Make the task entries collapsible

---
 ui/index.html    |  2 +-
 ui/media/main.js | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 36239d47..8cfde5f9 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -213,7 +213,7 @@
 </div>
 </body>
 
-<script src="media/main.js?v=13"></script>
+<script src="media/main.js?v=14"></script>
 <script>
 async function init() {
     await loadModifiers()
diff --git a/ui/media/main.js b/ui/media/main.js
index e14230ba..4d00cab3 100644
--- a/ui/media/main.js
+++ b/ui/media/main.js
@@ -687,11 +687,15 @@ async function makeImage() {
     taskEntry.className = 'imageTaskContainer'
     taskEntry.innerHTML = ` <div class="taskStatusLabel">Enqueued</div>
                             <button class="secondaryButton stopTask"><i class="fa-solid fa-trash-can"></i> Remove</button>
-                            <div class="preview-prompt"></div>
+                            <div class="preview-prompt collapsible active"></div>
                             <div class="taskConfig">${taskConfig}</div>
-                            <div class="outputMsg"></div>
-                            <div class="progressBar"></div>
-                            <div class="img-preview">`
+                            <div class="collapsible-content" style="display: block">
+                                <div class="outputMsg"></div>
+                                <div class="progressBar"></div>
+                                <div class="img-preview">
+                            </div>`
+
+    createCollapsibles(taskEntry)
 
     task['numOutputsTotal'] = numOutputsTotal
     task['taskStatusLabel'] = taskEntry.querySelector('.taskStatusLabel')
@@ -1052,6 +1056,22 @@ function millisecondsToStr(milliseconds) {
     return s;
 }
 
+// https://gomakethings.com/finding-the-next-and-previous-sibling-elements-that-match-a-selector-with-vanilla-js/
+function getNextSibling(elem, selector) {
+	// Get the next sibling element
+	var sibling = elem.nextElementSibling
+
+	// If there's no selector, return the first sibling
+	if (!selector) return sibling
+
+	// If the sibling matches our selector, use it
+	// If not, jump to the next sibling and continue the loop
+	while (sibling) {
+		if (sibling.matches(selector)) return sibling
+		sibling = sibling.nextElementSibling
+	}
+}
+
 function createCollapsibles(node) {
     if (!node) {
         node = document
@@ -1071,7 +1091,7 @@ function createCollapsibles(node) {
 
         c.addEventListener('click', function() {
             this.classList.toggle("active")
-            let content = this.nextElementSibling
+            let content = getNextSibling(this, '.collapsible-content')
             if (content.style.display === "block") {
                 content.style.display = "none"
                 handle.innerHTML = '&#x2795;' // plus

From 4edbd8719cdf2ccff06df1f35383f9f39554d875 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 14:43:04 +0530
Subject: [PATCH 32/35] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17043da2..d493be61 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
 
-️‍🔥🎉 **New!** Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
+️‍🔥🎉 **New!** Task Queue, Negative Prompt, 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.
 
@@ -17,6 +17,8 @@ This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 be
 - **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
 - **In-Painting**
 - **Live Preview**: See the image as the AI is drawing it
+- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
+- **Negative Prompt**: Specify aspects of the image to *remove*.
 - **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
 - **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
 - **New UI**: with cleaner design

From 2696da733756f6a45286e9a92273d4ff8dada178 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 15:10:05 +0530
Subject: [PATCH 33/35] Allow using a custom ckpt model

---
 ui/server.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/server.py b/ui/server.py
index c8c7324f..67c84949 100644
--- a/ui/server.py
+++ b/ui/server.py
@@ -84,7 +84,10 @@ async def ping():
         model_is_loading = True
 
         from sd_internal import runtime
-        runtime.load_model_ckpt(ckpt_to_use="sd-v1-4")
+
+        custom_weight_path = os.path.join(SCRIPT_DIR, 'custom-model.ckpt')
+        ckpt_to_use = "sd-v1-4" if not os.path.exists(custom_weight_path) else "custom-model"
+        runtime.load_model_ckpt(ckpt_to_use=ckpt_to_use)
 
         model_loaded = True
         model_is_loading = False

From 34023f66f0cbf9c8d05de7ed79f4874613be21b3 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 15:10:24 +0530
Subject: [PATCH 34/35] Bump version

---
 ui/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/index.html b/ui/index.html
index 8cfde5f9..ed35db3c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -15,7 +15,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.19 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.195 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <ul id="top-nav-items">
             <li class="dropdown">

From b4c68a8ae5e6af357b55327121ad6d0538127a7e Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Wed, 28 Sep 2022 18:33:08 +0530
Subject: [PATCH 35/35] Save the negative prompt in the text file

---
 ui/sd_internal/runtime.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/sd_internal/runtime.py b/ui/sd_internal/runtime.py
index eb456c36..d492b269 100644
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@@ -444,7 +444,7 @@ def do_mk_img(req: Request):
                             if return_orig_img:
                                 save_image(img, img_out_path)
 
-                            save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_strength, opt_use_face_correction, opt_use_upscale, opt_sampler_name)
+                            save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_strength, opt_use_face_correction, opt_use_upscale, opt_sampler_name, req.negative_prompt)
 
                         if return_orig_img:
                             img_data = img_to_base64_str(img)
@@ -505,8 +505,8 @@ def save_image(img, img_out_path):
     except:
         print('could not save the file', traceback.format_exc())
 
-def save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_prompt_strength, opt_correct_face, opt_upscale, sampler_name):
-    metadata = f"{prompts[0]}\nWidth: {opt_W}\nHeight: {opt_H}\nSeed: {opt_seed}\nSteps: {opt_ddim_steps}\nGuidance Scale: {opt_scale}\nPrompt Strength: {opt_prompt_strength}\nUse Face Correction: {opt_correct_face}\nUse Upscaling: {opt_upscale}\nSampler: {sampler_name}"
+def save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_prompt_strength, opt_correct_face, opt_upscale, sampler_name, negative_prompt):
+    metadata = f"{prompts[0]}\nWidth: {opt_W}\nHeight: {opt_H}\nSeed: {opt_seed}\nSteps: {opt_ddim_steps}\nGuidance Scale: {opt_scale}\nPrompt Strength: {opt_prompt_strength}\nUse Face Correction: {opt_correct_face}\nUse Upscaling: {opt_upscale}\nSampler: {sampler_name}\nNegative Prompt: {negative_prompt}"
 
     try:
         with open(meta_out_path, 'w') as f: