Bring back the default opacity of 0.4 for inpainting mask, even though it leads to some other bugs. It's not a good UX to have an inpainting mask with full opacity

Mdiller bugfixes

CHANGES.md

@@ -3,20 +3,38 @@
 ## v2.5
 ### Major Changes
 - **Nearly twice as fast** - significantly faster speed of image generation. We're now pretty close to automatic1111's speed. Code contributions are welcome to make our project even faster: https://github.com/easydiffusion/sdkit/#is-it-fast
-- **Full support for Stable Diffusion 2.1** - supports loading v1.4 or v2.0 or v2.1 models seamlessly. No need to enable "Test SD2", and no need to add `sd2_` to your SD 2.0 model file names.
-- **Memory optimized Stable Diffusion 2.1** - you can now use 768x768 models for SD 2.1, with the same low VRAM optimizations that we've always had for SD 1.4.
+- **Full support for Stable Diffusion 2.1 (including CPU)** - supports loading v1.4 or v2.0 or v2.1 models seamlessly. No need to enable "Test SD2", and no need to add `sd2_` to your SD 2.0 model file names. Works on CPU as well.
+- **Memory optimized Stable Diffusion 2.1** - you can now use 768x768 models for SD 2.1, with the same low VRAM optimizations that we've always had for SD 1.4. Please note, 4 GB graphics cards can still only support images upto 512x512 resolution.
 - **6 new samplers!** - explore the new samplers, some of which can generate great images in less than 10 inference steps!
 - **Model Merging** - You can now merge two models (`.ckpt` or `.safetensors`) and output `.ckpt` or `.safetensors` models, optionally in `fp16` precision. Details: https://github.com/cmdr2/stable-diffusion-ui/wiki/Model-Merging
 - **Fast loading/unloading of VAEs** - No longer needs to reload the entire Stable Diffusion model, each time you change the VAE
 - **Database of known models** - automatically picks the right configuration for known models. E.g. we automatically detect and apply "v" parameterization (required for some SD 2.0 models), and "fp32" attention precision (required for some SD 2.1 models).
 - **Color correction for img2img** - an option to preserve the color profile (histogram) of the initial image. This is especially useful if you're getting red-tinted images after inpainting/masking.
 - **Three GPU Memory Usage Settings** - `High` (fastest, maximum VRAM usage), `Balanced` (default - almost as fast, significantly lower VRAM usage), `Low` (slowest, very low VRAM usage). The `Low` setting is applied automatically for GPUs with less than 4 GB of VRAM.
+- **Find models in sub-folders** - This allows you to organize your models into sub-folders inside `models/stable-diffusion`, instead of keeping them all in a single folder.
 - **Save metadata as JSON** - You can now save the metadata files as either text or json files (choose in the Settings tab).
 - **Major rewrite of the code** - Most of the codebase has been reorganized and rewritten, to make it more manageable and easier for new developers to contribute features. We've separated our core engine into a new project called `sdkit`, which allows anyone to easily integrate Stable Diffusion (and related modules like GFPGAN etc) into their programming projects (via a simple `pip install sdkit`): https://github.com/easydiffusion/sdkit/
 - **Name change** - Last, and probably the least, the UI is now called "Easy Diffusion". It indicates the focus of this project - an easy way for people to play with Stable Diffusion.
 
 Our focus continues to remain on an easy installation experience, and an easy user-interface. While still remaining pretty powerful, in terms of features and speed.
 
+### Detailed changelog
+* 2.5.6 - 10 Jan 2022 - Find Stable Diffusion models in sub-folders inside `models/stable-diffusion`. This allows you to organize your models into sub-folders, instead of keeping them all in a single folder. Thanks @JeLuf.
+* 2.5.5 - 9 Jan 2022 - Lots of bug fixes. Thanks @patriceac and @JeLuf.
+* 2.5.4 - 29 Dec 2022 - Press Esc key on the keyboard to close the Image Editor. Thanks @patriceac.
+* 2.5.4 - 29 Dec 2022 - Lots of bug fixes in the UI. Thanks @patriceac.
+* 2.5.4 - 28 Dec 2022 - Full support for running tasks in parallel on multiple GPUs. Warning: 'Euler Ancestral', 'DPM2 Ancestral' and 'DPM++ 2s Ancestral' may produce slight variations in the image (if run in parallel), so we recommend using the other samplers.
+* 2.5.3 - 27 Dec 2022 - Fix broken drag-and-drop for text metadata files (as well as paste in clipboard).
+* 2.5.3 - 27 Dec 2022 - Allow upscaling by 2x as well as 4x.
+* 2.5.3 - 27 Dec 2022 - Fix broken renders on a second GPU.
+* 2.5.3 - 26 Dec 2022 - Add a `Remove` button on each image. Thanks @JeLuf.
+* 2.5.2 - 26 Dec 2022 - Fix broken inpainting if using non-square target images.
+* 2.5.2 - 26 Dec 2022 - Fix a bug where an incorrect model config would get used for some SD 2.1 models.
+* 2.5.2 - 26 Dec 2022 - Slight performance and memory improvement while rendering using SD 2.1 models.
+* 2.5.1 - 25 Dec 2022 - Allow custom config yaml files for models. You can put a config file (`.yaml`) next to the model file, with the same name as the model. For e.g. if you put `robo-diffusion-v2-base.yaml` next to `robo-diffusion-v2-base.ckpt`, it'll automatically use that config file.
+* 2.5.1 - 25 Dec 2022 - Fix broken rendering for SD 2.1-768 models. Fix broken rendering SD 2.0 safetensor models.
+* 2.5.0 - 25 Dec 2022 - Major new release! Nearly twice as fast, Full support for SD 2.1 (including low GPU RAM optimizations), 6 new samplers, Model Merging, Fast loading/unloading of VAEs, Database of known models, Color correction for img2img, Three GPU Memory Usage Settings, Save metadata as JSON, Major rewrite of the code, Name change.
+
 ## v2.4
 ### Major Changes
 - **Allow reordering the task queue** (by dragging and dropping tasks). Thanks @madrang
@@ -44,6 +62,8 @@ Our focus continues to remain on an easy installation experience, and an easy us
 - Support loading models in the safetensor format, for improved safety
 
 ### Detailed changelog
+* 2.4.24 - 9 Jan 2022 - Urgent fix for failures on old/long-term-support browsers. Thanks @JeLuf.
+* 2.4.23/22 - 29 Dec 2022 - Allow rolling back from the upcoming v2.5 change (in beta).
 * 2.4.21 - 23 Dec 2022 - Speed up image creation, by removing a delay (regression) of 4-5 seconds between clicking the `Make Image` button and calling the server.
 * 2.4.20 - 22 Dec 2022 - `Pause All` button to pause all the pending tasks. Thanks @JeLuf
 * 2.4.20 - 22 Dec 2022 - `Undo`/`Redo` buttons in the image editor. Thanks @JeLuf

README.md

@@ -13,7 +13,7 @@ Click the download button for your operating system:
 
 <p float="left">
   <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
-  <a href="https://github.com/cmdr2/stable-diffusion-ui#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
 </p>
 
 ## On Windows:

scripts/on_sd_start.bat

@@ -49,6 +49,18 @@ if exist "env" (
 if exist src rename src src-old
 if exist ldm rename ldm ldm-old
 
+if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
+if not exist "..\models\gfpgan" mkdir "..\models\gfpgan"
+if not exist "..\models\realesrgan" mkdir "..\models\realesrgan"
+if not exist "..\models\vae" mkdir "..\models\vae"
+
+@rem migrate the legacy models to the correct path (if already downloaded)
+if exist "sd-v1-4.ckpt" move sd-v1-4.ckpt ..\models\stable-diffusion\
+if exist "custom-model.ckpt" move custom-model.ckpt ..\models\stable-diffusion\
+if exist "GFPGANv1.3.pth" move GFPGANv1.3.pth ..\models\gfpgan\
+if exist "RealESRGAN_x4plus.pth" move RealESRGAN_x4plus.pth ..\models\realesrgan\
+if exist "RealESRGAN_x4plus_anime_6B.pth" move RealESRGAN_x4plus_anime_6B.pth ..\models\realesrgan\
+
 @rem install torch and torchvision
 call python ..\scripts\check_modules.py torch torchvision
 if "%ERRORLEVEL%" EQU "0" (
@@ -72,12 +84,15 @@ call python ..\scripts\check_modules.py sdkit sdkit.models ldm transformers nump
 if "%ERRORLEVEL%" EQU "0" (
     echo "sdkit is already installed."
 
-    @REM prevent from using packages from the user's home directory, to avoid conflicts
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
+    @rem skip sdkit upgrade if in developer-mode
+    if not exist "..\src\sdkit" (
+        @REM prevent from using packages from the user's home directory, to avoid conflicts
+        set PYTHONNOUSERSITE=1
+        set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
 
-    call >nul pip install --upgrade sdkit || (
-        echo "Error updating sdkit"
+        call pip install --upgrade sdkit -q || (
+            echo "Error updating sdkit"
+        )
     )
 ) else (
     echo "Installing sdkit: https://pypi.org/project/sdkit/"
@@ -93,6 +108,14 @@ if "%ERRORLEVEL%" EQU "0" (
     )
 )
 
+call python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
+
+@rem upgrade stable-diffusion-sdkit
+call pip install --upgrade stable-diffusion-sdkit -q || (
+    echo "Error updating stable-diffusion-sdkit"
+)
+call python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
+
 @rem install rich
 call python ..\scripts\check_modules.py rich
 if "%ERRORLEVEL%" EQU "0" (
@@ -141,34 +164,30 @@ call WHERE uvicorn > .tmp
     @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )
 
-
-
-if not exist "..\models\vae" mkdir "..\models\vae"
-
-@if exist "sd-v1-4.ckpt" (
-    for %%I in ("sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
+@if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
+    for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
         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" (
+        for %%J in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zJ" EQU "7703807346" (
             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" (
+            for %%K in ("..\models\stable-diffusion\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 (
-                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"
+                echo. & echo "The model file present at models\stable-diffusion\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
+                del "..\models\stable-diffusion\sd-v1-4.ckpt"
             )
         )
     )
 )
 
-@if not exist "sd-v1-4.ckpt" (
+@if not exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
     @echo. & echo "Downloading data files (weights) for Stable Diffusion.." & echo.
 
-    @call curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
+    @call curl -L -k https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ..\models\stable-diffusion\sd-v1-4.ckpt
 
-    @if exist "sd-v1-4.ckpt" (
-        for %%I in ("sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
+    @if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
+        for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
             echo. & echo "Error: The downloaded model file was invalid! Bytes downloaded: %%~zI" & echo.
             echo. & echo "Error downloading the data files (weights) for Stable Diffusion. 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/wiki/Troubleshooting" & 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
@@ -183,22 +202,22 @@ if not exist "..\models\vae" mkdir "..\models\vae"
 
 
 
-@if exist "GFPGANv1.3.pth" (
-    for %%I in ("GFPGANv1.3.pth") do if "%%~zI" EQU "348632874" (
+@if exist "..\models\gfpgan\GFPGANv1.3.pth" (
+    for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" EQU "348632874" (
         echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
     ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\GFPGANv1.3.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "GFPGANv1.3.pth"
+        echo. & echo "The GFPGAN model file present at models\gfpgan\GFPGANv1.3.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "..\models\gfpgan\GFPGANv1.3.pth"
     )
 )
 
-@if not exist "GFPGANv1.3.pth" (
+@if not exist "..\models\gfpgan\GFPGANv1.3.pth" (
     @echo. & echo "Downloading data files (weights) for GFPGAN (Face Correction).." & echo.
 
-    @call curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth
+    @call curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > ..\models\gfpgan\GFPGANv1.3.pth
 
-    @if exist "GFPGANv1.3.pth" (
-        for %%I in ("GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
+    @if exist "..\models\gfpgan\GFPGANv1.3.pth" (
+        for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
             echo. & echo "Error: The downloaded GFPGAN model file was invalid! Bytes downloaded: %%~zI" & echo.
             echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). 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/wiki/Troubleshooting" & 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
@@ -213,22 +232,22 @@ if not exist "..\models\vae" mkdir "..\models\vae"
 
 
 
-@if exist "RealESRGAN_x4plus.pth" (
-    for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
+@if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
+    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
     ) else (
-        echo. & echo "The RealESRGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "RealESRGAN_x4plus.pth"
+        echo. & echo "The RealESRGAN model file present at models\realesrgan\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "..\models\realesrgan\RealESRGAN_x4plus.pth"
     )
 )
 
-@if not exist "RealESRGAN_x4plus.pth" (
+@if not exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
     @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.." & echo.
 
-    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > ..\models\realesrgan\RealESRGAN_x4plus.pth
 
-    @if exist "RealESRGAN_x4plus.pth" (
-        for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
+    @if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
+        for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
             echo. & echo "Error: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: %%~zI" & echo.
             echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. 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/wiki/Troubleshooting" & 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
@@ -243,21 +262,21 @@ if not exist "..\models\vae" mkdir "..\models\vae"
 
 
 
-@if exist "RealESRGAN_x4plus_anime_6B.pth" (
-    for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
+@if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
+    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
     ) else (
-        echo. & echo "The RealESRGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "RealESRGAN_x4plus_anime_6B.pth"
+        echo. & echo "The RealESRGAN model file present at models\realesrgan\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth"
     )
 )
 
-@if not exist "RealESRGAN_x4plus_anime_6B.pth" (
+@if not exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
     @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.." & echo.
 
-    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth
 
-    @if exist "RealESRGAN_x4plus_anime_6B.pth" (
+    @if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
         for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
             echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo.
             echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. 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/wiki/Troubleshooting" & 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.
@@ -321,6 +340,9 @@ call python --version
 @set SD_UI_PATH=%cd%\ui
 @cd stable-diffusion
 
+@rem set any overrides
+set HF_HUB_DISABLE_SYMLINKS_WARNING=true
+
 @if NOT DEFINED SD_UI_BIND_PORT set SD_UI_BIND_PORT=9000
 @if NOT DEFINED SD_UI_BIND_IP set SD_UI_BIND_IP=0.0.0.0
 @uvicorn main:server_api --app-dir "%SD_UI_PATH%" --port %SD_UI_BIND_PORT% --host %SD_UI_BIND_IP% --log-level error

scripts/on_sd_start.sh

@@ -43,6 +43,18 @@ fi
 if [ -e "src" ]; then mv src src-old; fi
 if [ -e "ldm" ]; then mv ldm ldm-old; fi
 
+mkdir -p "../models/stable-diffusion"
+mkdir -p "../models/gfpgan"
+mkdir -p "../models/realesrgan"
+mkdir -p "../models/vae"
+
+# migrate the legacy models to the correct path (if already downloaded)
+if [ -e "sd-v1-4.ckpt" ]; then mv sd-v1-4.ckpt ../models/stable-diffusion/; fi
+if [ -e "custom-model.ckpt" ]; then mv custom-model.ckpt ../models/stable-diffusion/; fi
+if [ -e "GFPGANv1.3.pth" ]; then mv GFPGANv1.3.pth ../models/gfpgan/; fi
+if [ -e "RealESRGAN_x4plus.pth" ]; then mv RealESRGAN_x4plus.pth ../models/realesrgan/; fi
+if [ -e "RealESRGAN_x4plus_anime_6B.pth" ]; then mv RealESRGAN_x4plus_anime_6B.pth ../models/realesrgan/; fi
+
 # install torch and torchvision
 if python ../scripts/check_modules.py torch torchvision; then
     echo "torch and torchvision have already been installed."
@@ -63,10 +75,13 @@ fi
 if python ../scripts/check_modules.py sdkit sdkit.models ldm transformers numpy antlr4 gfpgan realesrgan ; then
     echo "sdkit is already installed."
 
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
+    # skip sdkit upgrade if in developer-mode
+    if [ ! -e "../src/sdkit" ]; then
+        export PYTHONNOUSERSITE=1
+        export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
 
-    pip install --upgrade sdkit > /dev/null
+        pip install --upgrade sdkit -q
+    fi
 else
     echo "Installing sdkit: https://pypi.org/project/sdkit/"
 
@@ -80,6 +95,12 @@ else
     fi
 fi
 
+python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
+
+# upgrade stable-diffusion-sdkit
+pip install --upgrade stable-diffusion-sdkit -q
+python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
+
 # install rich
 if python ../scripts/check_modules.py rich; then
     echo "rich has already been installed."
@@ -115,26 +136,24 @@ else
     fi
 fi
 
-mkdir -p "../models/vae"
-
-if [ -f "sd-v1-4.ckpt" ]; then
-    model_size=`find "sd-v1-4.ckpt" -printf "%s"`
+if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
+    model_size=`find "../models/stable-diffusion/sd-v1-4.ckpt" -printf "%s"`
 
     if [ "$model_size" -eq "4265380512" ] || [ "$model_size" -eq "7703807346" ] || [ "$model_size" -eq "7703810927" ]; then
         echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
     else
-        printf "\n\nThe model file present at $PWD/sd-v1-4.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm sd-v1-4.ckpt
+        printf "\n\nThe model file present at models/stable-diffusion/sd-v1-4.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/stable-diffusion/sd-v1-4.ckpt
     fi
 fi
 
-if [ ! -f "sd-v1-4.ckpt" ]; then
+if [ ! -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
     echo "Downloading data files (weights) for Stable Diffusion.."
 
-    curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
+    curl -L -k https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ../models/stable-diffusion/sd-v1-4.ckpt
 
-    if [ -f "sd-v1-4.ckpt" ]; then
-        model_size=`find "sd-v1-4.ckpt" -printf "%s"`
+    if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
+        model_size=`find "../models/stable-diffusion/sd-v1-4.ckpt" -printf "%s"`
         if [ ! "$model_size" == "4265380512" ]; then
 	    fail "The downloaded model file was invalid! Bytes downloaded: $model_size"
         fi
@@ -144,24 +163,24 @@ if [ ! -f "sd-v1-4.ckpt" ]; then
 fi
 
 
-if [ -f "GFPGANv1.3.pth" ]; then
-    model_size=`find "GFPGANv1.3.pth" -printf "%s"`
+if [ -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
+    model_size=`find "../models/gfpgan/GFPGANv1.3.pth" -printf "%s"`
 
     if [ "$model_size" -eq "348632874" ]; then
         echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
     else
-        printf "\n\nThe model file present at $PWD/GFPGANv1.3.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm GFPGANv1.3.pth
+        printf "\n\nThe model file present at models/gfpgan/GFPGANv1.3.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/gfpgan/GFPGANv1.3.pth
     fi
 fi
 
-if [ ! -f "GFPGANv1.3.pth" ]; then
+if [ ! -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
     echo "Downloading data files (weights) for GFPGAN (Face Correction).."
 
-    curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth
+    curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > ../models/gfpgan/GFPGANv1.3.pth
 
-    if [ -f "GFPGANv1.3.pth" ]; then
-        model_size=`find "GFPGANv1.3.pth" -printf "%s"`
+    if [ -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
+        model_size=`find "../models/gfpgan/GFPGANv1.3.pth" -printf "%s"`
         if [ ! "$model_size" -eq "348632874" ]; then
             fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
         fi
@@ -171,24 +190,24 @@ if [ ! -f "GFPGANv1.3.pth" ]; then
 fi
 
 
-if [ -f "RealESRGAN_x4plus.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
+if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
+    model_size=`find "../models/realesrgan/RealESRGAN_x4plus.pth" -printf "%s"`
 
     if [ "$model_size" -eq "67040989" ]; then
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
     else
-        printf "\n\nThe model file present at $PWD/RealESRGAN_x4plus.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm RealESRGAN_x4plus.pth
+        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/realesrgan/RealESRGAN_x4plus.pth
     fi
 fi
 
-if [ ! -f "RealESRGAN_x4plus.pth" ]; then
+if [ ! -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
     echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.."
 
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
+    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > ../models/realesrgan/RealESRGAN_x4plus.pth
 
-    if [ -f "RealESRGAN_x4plus.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
+    if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
+        model_size=`find "../models/realesrgan/RealESRGAN_x4plus.pth" -printf "%s"`
         if [ ! "$model_size" -eq "67040989" ]; then
             fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
         fi
@@ -198,24 +217,24 @@ if [ ! -f "RealESRGAN_x4plus.pth" ]; then
 fi
 
 
-if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
+if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
+    model_size=`find "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
 
     if [ "$model_size" -eq "17938799" ]; then
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
     else
-        printf "\n\nThe model file present at $PWD/RealESRGAN_x4plus_anime_6B.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm RealESRGAN_x4plus_anime_6B.pth
+        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus_anime_6B.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
     fi
 fi
 
-if [ ! -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
+if [ ! -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
     echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.."
 
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
+    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
 
-    if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
+    if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
+        model_size=`find "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
         if [ ! "$model_size" -eq "17938799" ]; then
             fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
         fi

scripts/start.sh

@@ -19,4 +19,5 @@ which conda
 conda --version || exit 1
 
 # Download the rest of the installer and UI
+chmod +x scripts/*.sh
 scripts/on_env_start.sh

ui/easydiffusion/device_manager.py

@@ -125,7 +125,7 @@ def needs_to_force_full_precision(context):
         return True
 
     device_name = context.device_name.lower()
-    return (('nvidia' in device_name or 'geforce' in device_name) and (' 1660' in device_name or ' 1650' in device_name)) or ('Quadro T2000' in device_name)
+    return (('nvidia' in device_name or 'geforce' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name)) or ('Quadro T2000' in device_name)
 
 def get_max_vram_usage_level(device):
     if device != 'cpu':
@@ -156,6 +156,8 @@ def is_device_compatible(device):
     '''
     Returns True/False, and prints any compatibility errors
     '''
+    # static variable "history". 
+    is_device_compatible.history = getattr(is_device_compatible, 'history', {})
     try:
         validate_device_id(device, log_prefix='is_device_compatible')
     except:
@@ -168,7 +170,9 @@ def is_device_compatible(device):
         _, mem_total = torch.cuda.mem_get_info(device)
         mem_total /= float(10**9)
         if mem_total < 3.0:
-            log.warn(f'GPU {device} with less than 3 GB of VRAM is not compatible with Stable Diffusion')
+            if is_device_compatible.history.get(device) == None:
+               log.warn(f'GPU {device} with less than 3 GB of VRAM is not compatible with Stable Diffusion')
+               is_device_compatible.history[device] = 1
             return False
     except RuntimeError as e:
         log.error(str(e))

ui/easydiffusion/model_manager.py

@@ -43,7 +43,14 @@ def load_default_models(context: Context):
     # init default model paths
     for model_type in MODELS_TO_LOAD_ON_START:
         context.model_paths[model_type] = resolve_model_to_use(model_type=model_type)
-        load_model(context, model_type)
+        set_model_config_path(context, model_type)
+        try:
+           load_model(context, model_type)
+        except Exception as e:
+           log.error(f'[red]Error while loading {model_type} model: {context.model_paths[model_type]}[/red]')
+           log.error(f'[red]Error: {e}[/red]')
+           log.error(f'[red]Consider to remove the model from the model folder.[red]')
+
 
 def unload_all(context: Context):
     for model_type in KNOWN_MODEL_TYPES:
@@ -101,16 +108,26 @@ def reload_models_if_necessary(context: Context, task_data: TaskData):
     if set_vram_optimizations(context): # reload SD
         models_to_reload['stable-diffusion'] = model_paths_in_req['stable-diffusion']
 
-    if 'stable-diffusion' in models_to_reload:
-        quick_hash = hash_file_quick(models_to_reload['stable-diffusion'])
-        known_model_info = get_model_info_from_db(quick_hash=quick_hash)
-
     for model_type, model_path_in_req in models_to_reload.items():
         context.model_paths[model_type] = model_path_in_req
+        set_model_config_path(context, model_type)
 
         action_fn = unload_model if context.model_paths[model_type] is None else load_model
         action_fn(context, model_type, scan_model=False) # we've scanned them already
 
+def set_model_config_path(context: Context, model_type: str):
+    if model_type != 'stable-diffusion':
+        return
+
+    context.model_configs['stable-diffusion'] = None # reset this, to avoid loading the last config
+
+    # look for a yaml file next to the model, otherwise let sdkit match it to a known model
+    model_path = context.model_paths['stable-diffusion']
+    file_path, _ = os.path.splitext(model_path)
+    config_path = file_path + '.yaml'
+    if os.path.exists(config_path):
+        context.model_configs['stable-diffusion'] = config_path
+
 def resolve_model_paths(task_data: TaskData):
     task_data.use_stable_diffusion_model = resolve_model_to_use(task_data.use_stable_diffusion_model, model_type='stable-diffusion')
     task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type='vae')
@@ -179,6 +196,30 @@ def getModels():
     }
 
     models_scanned = 0
+
+    class MaliciousModelException(Exception):
+        "Raised when picklescan reports a problem with a model"
+        pass
+
+    def scan_directory(directory, suffixes):
+        nonlocal models_scanned
+        tree = []
+        for entry in os.scandir(directory):
+            if entry.is_file() and True in [entry.name.endswith(s) for s in suffixes]:
+                mtime = entry.stat().st_mtime
+                mod_time = known_models[entry.path] if entry.path in known_models else -1
+                if mod_time != mtime:
+                    models_scanned += 1
+                    if is_malicious_model(entry.path):
+                        raise MaliciousModelException(entry.path)
+                known_models[entry.path] = mtime
+                tree.append(entry.name.rsplit('.',1)[0])
+            elif entry.is_dir():
+                scan=scan_directory(entry.path, suffixes) 
+                if len(scan) != 0:
+                    tree.append( (entry.name, scan ) )
+        return tree
+
     def listModels(model_type):
         nonlocal models_scanned
 
@@ -187,26 +228,10 @@ def getModels():
         if not os.path.exists(models_dir):
             os.makedirs(models_dir)
 
-        for file in os.listdir(models_dir):
-            for model_extension in model_extensions:
-                if not file.endswith(model_extension):
-                    continue
-
-                model_path = os.path.join(models_dir, file)
-                mtime = os.path.getmtime(model_path)
-                mod_time = known_models[model_path] if model_path in known_models else -1
-                if mod_time != mtime:
-                    models_scanned += 1
-                    if is_malicious_model(model_path):
-                        models['scan-error'] = file
-                        return
-                known_models[model_path] = mtime
-
-                model_name = file[:-len(model_extension)]
-                models['options'][model_type].append(model_name)
-
-        models['options'][model_type] = [*set(models['options'][model_type])] # remove duplicates
-        models['options'][model_type].sort()
+        try:
+            models['options'][model_type] = scan_directory(models_dir, model_extensions)
+        except MaliciousModelException as e:
+            models['scan-error'] = e
 
     # custom models
     listModels(model_type='stable-diffusion')

ui/easydiffusion/renderer.py

@@ -1,6 +1,7 @@
 import queue
 import time
 import json
+import pprint
 
 from easydiffusion import device_manager
 from easydiffusion.types import TaskData, Response, Image as ResponseImage, UserInitiatedStop, GenerateImageRequest
@@ -28,18 +29,23 @@ def init(device):
 
 def make_images(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback):
     context.stop_processing = False
-    log.info(f'request: {get_printable_request(req)}')
-    log.info(f'task data: {task_data.dict()}')
+    print_task_info(req, task_data)
 
-    images = make_images_internal(req, task_data, data_queue, task_temp_images, step_callback)
+    images, seeds = make_images_internal(req, task_data, data_queue, task_temp_images, step_callback)
 
-    res = Response(req, task_data, images=construct_response(images, task_data, base_seed=req.seed))
+    res = Response(req, task_data, images=construct_response(images, seeds, task_data, base_seed=req.seed))
     res = res.json()
     data_queue.put(json.dumps(res))
     log.info('Task completed')
 
     return res
 
+def print_task_info(req: GenerateImageRequest, task_data: TaskData):
+    req_str = pprint.pformat(get_printable_request(req)).replace("[","\[")
+    task_str = pprint.pformat(task_data.dict()).replace("[","\[")
+    log.info(f'request: {req_str}')
+    log.info(f'task data: {task_str}')
+
 def make_images_internal(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback):
     images, user_stopped = generate_images_internal(req, task_data, data_queue, task_temp_images, step_callback, task_data.stream_image_progress)
     filtered_images = filter_images(task_data, images, user_stopped)
@@ -47,7 +53,11 @@ def make_images_internal(req: GenerateImageRequest, task_data: TaskData, data_qu
     if task_data.save_to_disk_path is not None:
         save_images_to_disk(images, filtered_images, req, task_data)
 
-    return filtered_images if task_data.show_only_filtered_image else images + filtered_images
+    seeds = [*range(req.seed, req.seed + len(images))]
+    if task_data.show_only_filtered_image or filtered_images is images:
+        return filtered_images, seeds
+    else:
+        return images + filtered_images, seeds + seeds
 
 def generate_images_internal(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback, stream_image_progress: bool):
     context.temp_images.clear()
@@ -76,14 +86,14 @@ def filter_images(task_data: TaskData, images: list, user_stopped):
     if task_data.use_face_correction and 'gfpgan' in task_data.use_face_correction.lower(): filters_to_apply.append('gfpgan')
     if task_data.use_upscale and 'realesrgan' in task_data.use_upscale.lower(): filters_to_apply.append('realesrgan')
 
-    return apply_filters(context, filters_to_apply, images)
+    return apply_filters(context, filters_to_apply, images, scale=task_data.upscale_amount)
 
-def construct_response(images: list, task_data: TaskData, base_seed: int):
+def construct_response(images: list, seeds: list, task_data: TaskData, base_seed: int):
     return [
         ResponseImage(
             data=img_to_base64_str(img, task_data.output_format, task_data.output_quality),
-            seed=base_seed + i
-        ) for i, img in enumerate(images)
+            seed=seed,
+        ) for img, seed in zip(images, seeds)
     ]
 
 def make_step_callback(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback, stream_image_progress: bool):

ui/easydiffusion/types.py

@@ -29,8 +29,9 @@ class TaskData(BaseModel):
 
     use_face_correction: str = None # or "GFPGANv1.3"
     use_upscale: str = None # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B"
+    upscale_amount: int = 4 # or 2
     use_stable_diffusion_model: str = "sd-v1-4"
-    use_stable_diffusion_config: str = "v1-inference"
+    # use_stable_diffusion_config: str = "v1-inference"
     use_vae_model: str = None
     use_hypernetwork_model: str = None
 

ui/easydiffusion/utils/save_utils.py

@@ -20,6 +20,7 @@ TASK_TEXT_MAPPING = {
     'prompt_strength': 'Prompt Strength',
     'use_face_correction': 'Use Face Correction',
     'use_upscale': 'Use Upscaling',
+    'upscale_amount': 'Upscale By',
     'sampler_name': 'Sampler',
     'negative_prompt': 'Negative Prompt',
     'use_stable_diffusion_model': 'Stable Diffusion model',
@@ -28,16 +29,20 @@ TASK_TEXT_MAPPING = {
 }
 
 def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData):
+    now = time.time()
     save_dir_path = os.path.join(task_data.save_to_disk_path, filename_regex.sub('_', task_data.session_id))
     metadata_entries = get_metadata_entries_for_request(req, task_data)
+    make_filename = make_filename_callback(req, now=now)
 
-    if task_data.show_only_filtered_image or filtered_images == images:
-        save_images(filtered_images, save_dir_path, file_name=make_filename_callback(req), output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_dicts(metadata_entries, save_dir_path, file_name=make_filename_callback(req), output_format=task_data.metadata_output_format)
+    if task_data.show_only_filtered_image or filtered_images is images:
+        save_images(filtered_images, save_dir_path, file_name=make_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
+        save_dicts(metadata_entries, save_dir_path, file_name=make_filename, output_format=task_data.metadata_output_format)
     else:
-        save_images(images, save_dir_path, file_name=make_filename_callback(req), output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_images(filtered_images, save_dir_path, file_name=make_filename_callback(req, suffix='filtered'), output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_dicts(metadata_entries, save_dir_path, file_name=make_filename_callback(req, suffix='filtered'), output_format=task_data.metadata_output_format)
+        make_filter_filename = make_filename_callback(req, now=now, suffix='filtered')
+
+        save_images(images, save_dir_path, file_name=make_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
+        save_images(filtered_images, save_dir_path, file_name=make_filter_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
+        save_dicts(metadata_entries, save_dir_path, file_name=make_filter_filename, output_format=task_data.metadata_output_format)
 
 def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskData):
     metadata = get_printable_request(req)
@@ -48,6 +53,8 @@ def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskD
         'use_face_correction': task_data.use_face_correction,
         'use_upscale': task_data.use_upscale,
     })
+    if metadata['use_upscale'] is not None:
+        metadata['upscale_amount'] = task_data.upscale_amount
 
     # if text, format it in the text format expected by the UI
     is_txt_format = (task_data.metadata_output_format.lower() == 'txt')
@@ -66,9 +73,11 @@ def get_printable_request(req: GenerateImageRequest):
     del metadata['init_image_mask']
     return metadata
 
-def make_filename_callback(req: GenerateImageRequest, suffix=None):
+def make_filename_callback(req: GenerateImageRequest, suffix=None, now=None):
+    if now is None:
+        now = time.time()
     def make_filename(i):
-        img_id = base64.b64encode(int(time.time()+i).to_bytes(8, 'big')).decode() # Generate unique ID based on time.
+        img_id = base64.b64encode(int(now+i).to_bytes(8, 'big')).decode() # Generate unique ID based on time.
         img_id = img_id.translate({43:None, 47:None, 61:None})[-8:] # Remove + / = and keep last 8 chars.
 
         prompt_flattened = filename_regex.sub('_', req.prompt)[:50]
@@ -76,4 +85,4 @@ def make_filename_callback(req: GenerateImageRequest, suffix=None):
         name = name if suffix is None else f'{name}_{suffix}'
         return name
 
-    return make_filename
+    return make_filename

ui/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Stable Diffusion UI</title>
+    <title>Easy Diffusion</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="theme-color" content="#673AB6">
     <link rel="icon" type="image/png" href="/media/images/favicon-16x16.png" sizes="16x16">
@@ -25,7 +25,7 @@
         <div id="logo">
             <h1>
                 Easy Diffusion
-                <small>v2.5.0 <span id="updateBranchLabel"></span></small>
+                <small>v2.5.6 <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">
@@ -55,7 +55,7 @@
                     <input id="prompt_from_file" name="prompt_from_file" type="file" /> <!-- hidden -->
                     <label for="negative_prompt" class="collapsible" id="negative_prompt_handle">
                         Negative Prompt
-                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Writing-prompts#negative-prompts" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Negative Prompts</span></i></a>
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Writing-prompts#negative-prompts" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top">Click to learn more about Negative Prompts</span></i></a>
                         <small>(optional)</small>
                     </label>
                     <div class="collapsible-content">
@@ -92,10 +92,12 @@
                         </div>
                     </div>
 
+                    <div id="apply_color_correction_setting" class="pl-5"><input id="apply_color_correction" name="apply_color_correction" type="checkbox"> <label for="apply_color_correction">Preserve color profile <small>(helps during inpainting)</small></label></div>
+
                 </div>
 
                 <div id="editor-inputs-tags-container" class="row">
-                    <label>Image Modifiers <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">click an Image Modifier to remove it, use Ctrl+Mouse Wheel to adjust its weight</span></i>:</label>
+                    <label>Image Modifiers <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip right">click an Image Modifier to remove it, right-click to temporarily disable it, use Ctrl+Mouse Wheel to adjust its weight</span></i>:</label>
                     <div id="editor-inputs-tags-list"></div>
                 </div>
 
@@ -150,7 +152,7 @@
                             <option value="dpm2_a">DPM2 Ancestral</option>
                             <option value="lms">LMS</option>
                             <option value="dpm_solver_stability">DPM Solver (Stability AI)</option>
-                            <option value="dpmpp_2s_a" selected>DPM++ 2s Ancestral</option>
+                            <option value="dpmpp_2s_a">DPM++ 2s Ancestral</option>
                             <option value="dpmpp_2m">DPM++ 2m</option>
                             <option value="dpmpp_sde">DPM++ SDE</option>
                             <option value="dpm_fast">DPM Fast</option>
@@ -230,10 +232,14 @@
                     <div><ul>
                     <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 <small>(uses more VRAM, slower images)</small></label></li>
-                    <li id="apply_color_correction_setting" class="pl-5"><input id="apply_color_correction" name="apply_color_correction" type="checkbox"> <label for="apply_color_correction">Preserve color profile <small>(helps during inpainting)</small></label></li>
                     <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox"> <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 image by 4x with </label>
+                        <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Scale up by</label> 
+                        <select id="upscale_amount" name="upscale_amount">
+                            <option value="2">2x</option>
+                            <option value="4" selected>4x</option>
+                        </select>
+                        with 
                         <select id="upscale_model" name="upscale_model">
                             <option value="RealESRGAN_x4plus" selected>RealESRGAN_x4plus</option>
                             <option value="RealESRGAN_x4plus_anime_6B">RealESRGAN_x4plus_anime_6B</option>

ui/media/css/image-editor.css

@@ -2,12 +2,12 @@
 	padding-left: 32px;
 	text-align: left;
 	padding-bottom: 20px;
+	max-width: min-content;
 }
 
 .editor-options-container {
 	display: flex;
 	row-gap: 10px;
-	max-width: 210px;
 }
 
 .editor-options-container > * {

ui/media/css/main.css

@@ -251,6 +251,10 @@ button#resume {
 img {
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15);
 }
+div.img-preview img {
+    width:100%;
+    height: 100%;
+}
 .line-separator {
     background: var(--background-color3);
     height: 1pt;
@@ -876,10 +880,11 @@ input::file-selector-button {
 	font-size: 12px;
     background-color: var(--background-color3);
 
-	visibility: hidden;
+    visibility: hidden;
 	opacity: 0;
 	position: absolute;
-	white-space: nowrap;
+	width: max-content;
+	max-width: 300px;
 	padding: 8px 12px;
 	transition: 0.3s all;
 
@@ -895,7 +900,7 @@ input::file-selector-button {
 .simple-tooltip.right {
     right: 0px;
     top: 50%;
-    transform: translate(calc(100% - 15%), -50%);
+    transform: translate(100%, -50%);
 }
 :hover > .simple-tooltip.right {
     transform: translate(100%, -50%);
@@ -1099,11 +1104,11 @@ button:active {
 
 div.task-initimg > img {
     margin-right: 6px;
-    display:      block;
+    display: block;
 }
 div.task-fs-initimage {
-    display:  none;
-#    position: absolute;
+    display: none;
+    position: absolute;
 }
 div.task-initimg:hover div.task-fs-initimage {
     display: block;
@@ -1111,6 +1116,8 @@ div.task-initimg:hover div.task-fs-initimage {
     z-index: 9999;
     box-shadow: 0 0 30px #000;
     margin-top:-64px;
+    max-width: 75vw;
+    max-height: 75vh;
 }
 div.top-right {
     position: absolute;

ui/media/images/fa-eraser.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 576" width="24" height="24">
+<!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.-->
+  <path style="filter: drop-shadow(0px 0px 20px white)" d="M290.7 57.4 57.4 290.7c-25 25-25 65.5 0 90.5l80 80c12 12 28.3 18.7 45.3 18.7H512c17.7 0 32-14.3 32-32s-14.3-32-32-32H387.9l130.7-130.6c25-25 25-65.5 0-90.5L381.3 57.4c-25-25-65.5-25-90.5 0zm6.7 358.6H182.6l-80-80 124.7-124.7 137.4 137.4-67.3 67.3z"/>
+</svg>

ui/media/images/fa-eye-dropper.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
+<!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.-->
+  <path style="filter: drop-shadow(0px 0px 20px white)" d="M341.6 29.2 240.1 130.8l-9.4-9.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l160 160c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-9.4-9.4 101.5-101.6c39-39 39-102.2 0-141.1s-102.2-39-141.1 0zM55.4 323.3c-15 15-23.4 35.4-23.4 56.6v42.4L5.4 462.2c-8.5 12.7-6.8 29.6 4 40.4s27.7 12.5 40.4 4L89.7 480h42.4c21.2 0 41.6-8.4 56.6-23.4l120.7-120.7-45.3-45.3-120.7 120.7c-3 3-7.1 4.7-11.3 4.7H96v-36.1c0-4.2 1.7-8.3 4.7-11.3l120.7-120.7-45.3-45.3L55.4 323.3z"/>
+</svg>

ui/media/images/fa-fill.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 576" width="24" height="24">
+<!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.-->
+  <path style="filter: drop-shadow(0px 0px 20px white)" d="M118.6 9.4c-12.5-12.5-32.7-12.5-45.2 0s-12.5 32.8 0 45.3l81.3 81.3-92.1 92.1c-37.5 37.5-37.5 98.3 0 135.8l117.5 117.5c37.5 37.5 98.3 37.5 135.8 0l190.4-190.5c28.1-28.1 28.1-73.7 0-101.8L354.9 37.7c-28.1-28.1-73.7-28.1-101.8 0l-53.1 53-81.4-81.3zM200 181.3l49.4 49.4c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L245.3 136l53.1-53.1c3.1-3.1 8.2-3.1 11.3 0l151.4 151.4c3.1 3.1 3.1 8.2 0 11.3L418.7 288H99.5c1.4-5.4 4.2-10.4 8.4-14.6l92.1-92.1z"/>
+</svg>

ui/media/images/fa-pencil.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="24" height="24">
+<!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.-->
+  <path style="filter: drop-shadow(0px 0px 20px white)" d="m410.3 231 11.3-11.3-33.9-33.9-62.1-62.1-33.9-33.9-11.3 11.3-22.6 22.6L58.6 322.9c-10.4 10.4-18 23.3-22.2 37.4L1 480.7c-2.5 8.4-.2 17.5 6.1 23.7s15.3 8.5 23.7 6.1l120.3-35.4c14.1-4.2 27-11.8 37.4-22.2l199.2-199.2 22.6-22.7zM160 399.4l-9.1 22.7c-4 3.1-8.5 5.4-13.3 6.9l-78.2 23 23-78.1c1.4-4.9 3.8-9.4 6.9-13.3l22.7-9.1v32c0 8.8 7.2 16 16 16h32zM362.7 18.7l-14.4 14.5-22.6 22.6-11.4 11.3 33.9 33.9 62.1 62.1 33.9 33.9 11.3-11.3 22.6-22.6 14.5-14.5c25-25 25-65.5 0-90.5l-39.3-39.4c-25-25-65.5-25-90.5 0zm-47.4 168-144 144c-6.2 6.2-16.4 6.2-22.6 0s-6.2-16.4 0-22.6l144-144c6.2-6.2 16.4-6.2 22.6 0s6.2 16.4 0 22.6z"/>
+</svg>

ui/media/js/auto-save.js

@@ -28,6 +28,7 @@ const SETTINGS_IDS_LIST = [
     "stream_image_progress",
     "use_face_correction",
     "use_upscale",
+    "upscale_amount",
     "show_only_filtered_image",
     "upscale_model",
     "preview-image",
@@ -40,7 +41,8 @@ const SETTINGS_IDS_LIST = [
     "confirm_dangerous_actions",
     "metadata_output_format",
     "auto_save_settings",
-    "apply_color_correction"
+    "apply_color_correction",
+    "process_order_toggle"
 ]
 
 const IGNORE_BY_DEFAULT = [
@@ -278,7 +280,6 @@ function tryLoadOldSettings() {
         "soundEnabled": "sound_toggle",
         "saveToDisk": "save_to_disk",
         "useCPU": "use_cpu",
-        "useTurboMode": "turbo",
         "diskPath": "diskPath",
         "useFaceCorrection": "use_face_correction",
         "useUpscaling": "use_upscale",

ui/media/js/dnd.js

@@ -59,6 +59,13 @@ const TASK_MAPPING = {
         readUI: () => activeTags.map(x => x.name),
         parse: (val) => val
     },
+    inactive_tags: { name: "Inactive Image Modifiers",
+        setUI: (inactive_tags) => {
+            refreshInactiveTags(inactive_tags)
+        },
+        readUI: () => activeTags.filter(tag => tag.inactive === true).map(x => x.name),
+        parse: (val) => val
+    },
     width: { name: 'Width',
         setUI: (width) => {
             const oldVal = widthField.value
@@ -137,7 +144,14 @@ const TASK_MAPPING = {
         readUI: () => (maskSetting.checked ? imageInpainter.getImg() : undefined),
         parse: (val) => val
     },
-
+    preserve_init_image_color_profile: { name: 'Preserve Color Profile',
+        setUI: (preserve_init_image_color_profile) => {
+            applyColorCorrectionField.checked = parseBoolean(preserve_init_image_color_profile)
+        },
+        readUI: () => applyColorCorrectionField.checked,
+        parse: (val) => parseBoolean(val)
+    },
+    
     use_face_correction: { name: 'Use Face Correction',
         setUI: (use_face_correction) => {
             useFaceCorrectionField.checked = parseBoolean(use_face_correction)
@@ -148,12 +162,14 @@ const TASK_MAPPING = {
     use_upscale: { name: 'Use Upscaling',
         setUI: (use_upscale) => {
             const oldVal = upscaleModelField.value
-            upscaleModelField.value = use_upscale
+            upscaleModelField.value = getModelPath(use_upscale, ['.pth'])
             if (upscaleModelField.value) { // Is a valid value for the field.
                 useUpscalingField.checked = true
                 upscaleModelField.disabled = false
+                upscaleAmountField.disabled = false
             } else { // Not a valid value, restore the old value and disable the filter.
                 upscaleModelField.disabled = true
+                upscaleAmountField.disabled = true
                 upscaleModelField.value = oldVal
                 useUpscalingField.checked = false
             }
@@ -161,6 +177,13 @@ const TASK_MAPPING = {
         readUI: () => (useUpscalingField.checked ? upscaleModelField.value : undefined),
         parse: (val) => val
     },
+    upscale_amount: { name: 'Upscale By',
+        setUI: (upscale_amount) => {
+            upscaleAmountField.value = upscale_amount
+        },
+        readUI: () => upscaleAmountField.value,
+        parse: (val) => val
+    },
     sampler_name: { name: 'Sampler',
         setUI: (sampler_name) => {
             samplerField.value = sampler_name
@@ -235,13 +258,6 @@ const TASK_MAPPING = {
         readUI: () => useCPUField.checked,
         parse: (val) => val
     },
-    turbo: { name: 'Turbo',
-        setUI: (turbo) => {
-            turboField.checked = turbo
-        },
-        readUI: () => turboField.checked,
-        parse: (val) => Boolean(val)
-    },
 
     stream_image_progress: { name: 'Stream Image Progress',
         setUI: (stream_image_progress) => {
@@ -273,6 +289,7 @@ const TASK_MAPPING = {
         parse: (val) => val
     }
 }
+
 function restoreTaskToUI(task, fieldsToSkip) {
     fieldsToSkip = fieldsToSkip || []
 
@@ -292,9 +309,18 @@ function restoreTaskToUI(task, fieldsToSkip) {
         }
     }
 
-    // restore the original tag
-    promptField.value = task.reqBody.original_prompt || task.reqBody.prompt
+    // properly reset fields not present in the task
+    if (!('use_hypernetwork_model' in task.reqBody)) {
+        hypernetworkModelField.value = ""
+        hypernetworkModelField.dispatchEvent(new Event("change"))
+    }
 
+    // restore the original prompt if provided (e.g. use settings), fallback to prompt as needed (e.g. copy/paste or d&d)
+    promptField.value = task.reqBody.original_prompt
+    if (!('original_prompt' in task.reqBody)) {
+        promptField.value = task.reqBody.prompt
+    }
+    
     // properly reset checkboxes
     if (!('use_face_correction' in task.reqBody)) {
         useFaceCorrectionField.checked = false
@@ -302,19 +328,26 @@ function restoreTaskToUI(task, fieldsToSkip) {
     if (!('use_upscale' in task.reqBody)) {
         useUpscalingField.checked = false
     }
-    if (!('mask' in task.reqBody)) {
+    if (!('mask' in task.reqBody) && maskSetting.checked) {
         maskSetting.checked = false
+        maskSetting.dispatchEvent(new Event("click"))
     }
     upscaleModelField.disabled = !useUpscalingField.checked
+    upscaleAmountField.disabled = !useUpscalingField.checked
 
-    // Show the source picture if present
-    initImagePreview.src = (task.reqBody.init_image == undefined ? '' : task.reqBody.init_image)
-    if (IMAGE_REGEX.test(initImagePreview.src)) {
-        if (Boolean(task.reqBody.mask)) {
-            setTimeout(() => { // add a delay to insure this happens AFTER the main image loads (which reloads the inpainter)
+    // hide/show source picture as needed
+    if (IMAGE_REGEX.test(initImagePreview.src) && task.reqBody.init_image == undefined) {
+        // hide source image
+        initImageClearBtn.dispatchEvent(new Event("click"))
+    }
+    else if (task.reqBody.init_image !== undefined) {
+        // listen for inpainter loading event, which happens AFTER the main image loads (which reloads the inpainter)
+        initImagePreview.addEventListener('load', function() {
+            if (Boolean(task.reqBody.mask)) {
                 imageInpainter.setImg(task.reqBody.mask)
-            }, 250)
-        }
+            }
+        }, { once: true })
+        initImagePreview.src = task.reqBody.init_image
     }
 }
 function readUI() {
@@ -355,26 +388,39 @@ const TASK_TEXT_MAPPING = {
     prompt_strength: 'Prompt Strength',
     use_face_correction: 'Use Face Correction',
     use_upscale: 'Use Upscaling',
+    upscale_amount: 'Upscale By',
     sampler_name: 'Sampler',
     negative_prompt: 'Negative Prompt',
     use_stable_diffusion_model: 'Stable Diffusion model',
     use_hypernetwork_model: 'Hypernetwork model',
     hypernetwork_strength: 'Hypernetwork Strength'
 }
-const afterPromptRe = /^\s*Width\s*:\s*\d+\s*(?:\r\n|\r|\n)+\s*Height\s*:\s*\d+\s*(\r\n|\r|\n)+Seed\s*:\s*\d+\s*$/igm
 function parseTaskFromText(str) {
     const taskReqBody = {}
 
+    const lines = str.split('\n')
+    if (lines.length === 0) {
+        return
+    }
+
     // Prompt
-    afterPromptRe.lastIndex = 0
-    const match = afterPromptRe.exec(str)
-    if (match) {
-        let prompt = str.slice(0, match.index)
-        str = str.slice(prompt.length)
-        taskReqBody.prompt = prompt.trim()
+    let knownKeyOnFirstLine = false
+    for (let key in TASK_TEXT_MAPPING) {
+        if (lines[0].startsWith(TASK_TEXT_MAPPING[key] + ':')) {
+            knownKeyOnFirstLine = true
+            break
+        }
+    }
+    if (!knownKeyOnFirstLine) {
+        taskReqBody.prompt = lines[0]
         console.log('Prompt:', taskReqBody.prompt)
     }
+
     for (const key in TASK_TEXT_MAPPING) {
+        if (key in taskReqBody) {
+            continue
+        }
+
         const name = TASK_TEXT_MAPPING[key];
         let val = undefined
 
@@ -419,7 +465,7 @@ async function parseContent(text) {
     }
     // Normal txt file.
     const task = parseTaskFromText(text)
-    if (task) {
+    if (text.toLowerCase().includes('seed:') && task) { // only parse valid task content
         restoreTaskToUI(task)
         return true
     } else {
@@ -476,7 +522,6 @@ document.addEventListener("dragover", dragOverHandler)
 
 const TASK_REQ_NO_EXPORT = [
     "use_cpu",
-    "turbo",
     "save_to_disk_path"
 ]
 const resetSettings = document.getElementById('reset-image-settings')

ui/media/js/engine.js

@@ -727,7 +727,6 @@
         "stream_progress_updates": 'boolean',
         "stream_image_progress": 'boolean',
         "show_only_filtered_image": 'boolean',
-        "turbo": 'boolean',
         "output_format": 'string',
         "output_quality": 'number',
     }
@@ -742,7 +741,6 @@
         "stream_progress_updates": true,
         "stream_image_progress": true,
         "show_only_filtered_image": true,
-        "turbo": false,
         "output_format": "png",
         "output_quality": 75,
     }
@@ -837,10 +835,13 @@
          * @memberof Task
          */
         async post(timeout=-1) {
-            performance.mark('make-render-request')
-            if (performance.getEntriesByName('click-makeImage', 'mark').length > 0) {
-                console.log('delay between clicking and making the server request:', performance.measure('diff', 'click-makeImage', 'make-render-request').duration + ' ms')
+            if (typeof performance == "object" && performance.mark && performance.measure) {
+                performance.mark('make-render-request')
+                if (performance.getEntriesByName('click-makeImage', 'mark').length > 0) {
+                    console.log('delay between clicking and making the server request:', performance.measure('diff', 'click-makeImage', 'make-render-request').duration + ' ms')
+                }
             }
+
             let jsonResponse = await super.post('/render', timeout)
             if (typeof jsonResponse?.task !== 'number') {
                 console.warn('Endpoint error response: ', jsonResponse)

ui/media/js/image-editor.js

@@ -36,13 +36,14 @@ const defaultToolEnd = (editor, ctx, x, y, is_overlay = false) => {
 		ctx.clearRect(0, 0, editor.width, editor.height)
 	}
 }
+const toolDoNothing = (editor, ctx, x, y, is_overlay = false) => {}
 
 const IMAGE_EDITOR_TOOLS = [
 	{
 		id: "draw",
 		name: "Draw",
 		icon: "fa-solid fa-pencil",
-		cursor: "url(/media/images/fa-pencil.png) 0 24, pointer",
+		cursor: "url(/media/images/fa-pencil.svg) 0 24, pointer",
 		begin: defaultToolBegin,
 		move: defaultToolMove,
 		end: defaultToolEnd
@@ -51,7 +52,7 @@ const IMAGE_EDITOR_TOOLS = [
 		id: "erase",
 		name: "Erase",
 		icon: "fa-solid fa-eraser",
-		cursor: "url(/media/images/fa-eraser.png) 0 18, pointer",
+		cursor: "url(/media/images/fa-eraser.svg) 0 14, pointer",
 		begin: defaultToolBegin,
 		move: (editor, ctx, x, y, is_overlay = false) => {
 			ctx.lineTo(x, y)
@@ -78,27 +79,56 @@ const IMAGE_EDITOR_TOOLS = [
 		}
 	},
 	{
-		id: "colorpicker",
-		name: "Color Picker",
-		icon: "fa-solid fa-eye-dropper",
-		cursor: "url(/media/images/fa-eye-dropper.png) 0 24, pointer",
+		id: "fill",
+		name: "Fill",
+		icon: "fa-solid fa-fill",
+		cursor: "url(/media/images/fa-fill.svg) 20 6, pointer",
 		begin: (editor, ctx, x, y, is_overlay = false) => {
-			var img_rgb = editor.layers.background.ctx.getImageData(x, y, 1, 1).data
-			var drawn_rgb = editor.ctx_current.getImageData(x, y, 1, 1).data
-			var drawn_opacity = drawn_rgb[3] / 255
-			editor.custom_color_input.value = rgbToHex({ 
-				r: (drawn_rgb[0] * drawn_opacity) + (img_rgb[0] * (1 - drawn_opacity)),
-				g: (drawn_rgb[1] * drawn_opacity) + (img_rgb[1] * (1 - drawn_opacity)),
-				b: (drawn_rgb[2] * drawn_opacity) + (img_rgb[2] * (1 - drawn_opacity)),
-			})
-			editor.custom_color_input.dispatchEvent(new Event("change"))
+			if (!is_overlay) {
+				var color = hexToRgb(ctx.fillStyle)
+				color.a = parseInt(ctx.globalAlpha * 255) // layer.ctx.globalAlpha
+				flood_fill(editor, ctx, parseInt(x), parseInt(y), color)
+			}
 		},
-		move: (editor, ctx, x, y, is_overlay = false) => {},
-		end: (editor, ctx, x, y, is_overlay = false) => {}
+		move: toolDoNothing,
+		end: toolDoNothing
+	},
+	{
+		id: "colorpicker",
+		name: "Picker",
+		icon: "fa-solid fa-eye-dropper",
+		cursor: "url(/media/images/fa-eye-dropper.svg) 0 24, pointer",
+		begin: (editor, ctx, x, y, is_overlay = false) => {
+			if (!is_overlay) {
+				var img_rgb = editor.layers.background.ctx.getImageData(x, y, 1, 1).data
+				var drawn_rgb = editor.ctx_current.getImageData(x, y, 1, 1).data
+				var drawn_opacity = drawn_rgb[3] / 255
+				editor.custom_color_input.value = rgbToHex({ 
+					r: (drawn_rgb[0] * drawn_opacity) + (img_rgb[0] * (1 - drawn_opacity)),
+					g: (drawn_rgb[1] * drawn_opacity) + (img_rgb[1] * (1 - drawn_opacity)),
+					b: (drawn_rgb[2] * drawn_opacity) + (img_rgb[2] * (1 - drawn_opacity)),
+				})
+				editor.custom_color_input.dispatchEvent(new Event("change"))
+			}
+		},
+		move: toolDoNothing,
+		end: toolDoNothing
 	}
 ]
 
 const IMAGE_EDITOR_ACTIONS = [
+	{
+		id: "fill_all",
+		name: "Fill all",
+		icon: "fa-solid fa-paint-roller",
+		handler: (editor) => {
+			editor.ctx_current.globalCompositeOperation = "source-over"
+			editor.ctx_current.rect(0, 0, editor.width, editor.height)
+			editor.ctx_current.fill()
+			editor.setBrush()
+		},
+		trackHistory: true
+	},
 	{
 		id: "clear",
 		name: "Clear",
@@ -467,8 +497,8 @@ class ImageEditor {
 			width = (multiplier * width).toFixed()
 			height = (multiplier * height).toFixed()
 		}
-		this.width = width
-		this.height = height
+		this.width = parseInt(width)
+		this.height = parseInt(height)
 	
 		this.container.style.width = width + "px"
 		this.container.style.height = height + "px"
@@ -494,8 +524,10 @@ class ImageEditor {
 	}
 	setImage(url, width, height) {
 		this.setSize(width, height)
-		this.layers.drawing.ctx.clearRect(0, 0, this.width, this.height)
 		this.layers.background.ctx.clearRect(0, 0, this.width, this.height)
+		if (!(url && this.inpainter)) {
+			this.layers.drawing.ctx.clearRect(0, 0, this.width, this.height)
+		}
 		if (url) {
 			var image = new Image()
 			image.onload = () => { 
@@ -604,6 +636,9 @@ class ImageEditor {
 			if (event.key == "y" && event.ctrlKey) {
 				this.history.redo()
 			}
+			if (event.key === "Escape") {
+				this.hide()
+			}
 		}
 		
 		// dropper ctrl holding handler stuff
@@ -682,14 +717,6 @@ class ImageEditor {
 	}
 }
 
-function rgbToHex(rgb) {
-	function componentToHex(c) {
-		var hex = parseInt(c).toString(16)
-		return hex.length == 1 ? "0" + hex : hex
-	}
-	return "#" + componentToHex(rgb.r) + componentToHex(rgb.g) + componentToHex(rgb.b)
-}
-
 const imageEditor = new ImageEditor(document.getElementById("image-editor"))
 const imageInpainter = new ImageEditor(document.getElementById("image-inpainter"), true)
 
@@ -704,3 +731,107 @@ document.getElementById("init_image_button_inpaint").addEventListener("click", (
 })
 
 img2imgUnload() // no init image when the app starts
+
+
+function rgbToHex(rgb) {
+	function componentToHex(c) {
+		var hex = parseInt(c).toString(16)
+		return hex.length == 1 ? "0" + hex : hex
+	}
+	return "#" + componentToHex(rgb.r) + componentToHex(rgb.g) + componentToHex(rgb.b)
+}
+
+function hexToRgb(hex) {
+	var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+	return result ? {
+		r: parseInt(result[1], 16),
+		g: parseInt(result[2], 16),
+		b: parseInt(result[3], 16)
+	} : null;
+}
+
+function pixelCompare(int1, int2) {
+	return Math.abs(int1 - int2) < 4
+}
+
+// adapted from https://ben.akrin.com/canvas_fill/fill_04.html
+function flood_fill(editor, the_canvas_context, x, y, color) {
+	pixel_stack = [{x:x, y:y}] ;
+	pixels = the_canvas_context.getImageData( 0, 0, editor.width, editor.height ) ;
+	var linear_cords = ( y * editor.width + x ) * 4 ;
+	var original_color = {r:pixels.data[linear_cords],
+						g:pixels.data[linear_cords+1],
+						b:pixels.data[linear_cords+2],
+						a:pixels.data[linear_cords+3]} ;
+	
+	var opacity = color.a / 255;
+	var new_color = {
+		r: parseInt((color.r * opacity) + (original_color.r * (1 - opacity))),
+		g: parseInt((color.g * opacity) + (original_color.g * (1 - opacity))),
+		b: parseInt((color.b * opacity) + (original_color.b * (1 - opacity)))
+	}
+
+	if ((pixelCompare(new_color.r, original_color.r) &&
+		pixelCompare(new_color.g, original_color.g) &&
+		pixelCompare(new_color.b, original_color.b)))
+	{
+		return; // This color is already the color we want, so do nothing
+	}
+	var max_stack_size = editor.width * editor.height;
+	while( pixel_stack.length > 0 && pixel_stack.length < max_stack_size ) {
+		new_pixel = pixel_stack.shift() ;
+		x = new_pixel.x ;
+		y = new_pixel.y ;
+	
+		linear_cords = ( y * editor.width + x ) * 4 ;
+		while( y-->=0 &&
+			   (pixelCompare(pixels.data[linear_cords], original_color.r) &&
+				pixelCompare(pixels.data[linear_cords+1], original_color.g) &&
+				pixelCompare(pixels.data[linear_cords+2], original_color.b))) {
+			linear_cords -= editor.width * 4 ;
+		}
+		linear_cords += editor.width * 4 ;
+		y++ ;
+
+		var reached_left = false ;
+		var reached_right = false ;
+		while( y++<editor.height &&
+			   (pixelCompare(pixels.data[linear_cords], original_color.r) &&
+				pixelCompare(pixels.data[linear_cords+1], original_color.g) &&
+				pixelCompare(pixels.data[linear_cords+2], original_color.b))) {
+			pixels.data[linear_cords]   = new_color.r ;
+			pixels.data[linear_cords+1] = new_color.g ;
+			pixels.data[linear_cords+2] = new_color.b ;
+			pixels.data[linear_cords+3] = 255 ;
+
+			if( x>0 ) {
+				if( pixelCompare(pixels.data[linear_cords-4], original_color.r) &&
+					pixelCompare(pixels.data[linear_cords-4+1], original_color.g) &&
+					pixelCompare(pixels.data[linear_cords-4+2], original_color.b)) {
+					if( !reached_left ) {
+						pixel_stack.push( {x:x-1, y:y} ) ;
+						reached_left = true ;
+					}
+				} else if( reached_left ) {
+					reached_left = false ;
+				}
+			}
+		
+			if( x<editor.width-1 ) {
+				if( pixelCompare(pixels.data[linear_cords+4], original_color.r) &&
+					pixelCompare(pixels.data[linear_cords+4+1], original_color.g) &&
+					pixelCompare(pixels.data[linear_cords+4+2], original_color.b)) {
+					if( !reached_right ) {
+						pixel_stack.push( {x:x+1,y:y} ) ;
+						reached_right = true ;
+					}
+				} else if( reached_right ) {
+					reached_right = false ;
+				}
+			}
+			
+			linear_cords += editor.width * 4 ;
+		}
+	}
+	the_canvas_context.putImageData( pixels, 0, 0 ) ;
+}

ui/media/js/image-modifiers.js

@@ -104,6 +104,7 @@ function createModifierGroup(modifierGroup, initiallyExpanded) {
                 }
 
                 refreshTagsList()
+                document.dispatchEvent(new Event('refreshImageModifiers'))
             })
         }
     })
@@ -146,6 +147,7 @@ async function loadModifiers() {
     }
 
     loadCustomModifiers()
+    document.dispatchEvent(new Event('loadImageModifiers'))
 }
 
 function refreshModifiersState(newTags) {
@@ -202,6 +204,26 @@ function refreshModifiersState(newTags) {
     refreshTagsList()
 }
 
+function refreshInactiveTags(inactiveTags) {
+    // update inactive tags
+    if (inactiveTags !== undefined && inactiveTags.length > 0) {
+        activeTags.forEach (tag => {
+            if (inactiveTags.find(element => element === tag.name) !== undefined) {
+                tag.inactive = true
+            }
+        })
+    }
+    
+    // update cards
+    let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
+    overlays.forEach (i => {
+        let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText
+        if (inactiveTags.find(element => element === modifierName) !== undefined) {
+            i.parentElement.classList.add('modifier-toggle-inactive')
+        }
+    })
+}
+
 function refreshTagsList() {
     editorModifierTagsList.innerHTML = ''
 
@@ -227,6 +249,7 @@ function refreshTagsList() {
                 activeTags.splice(idx, 1)
                 refreshTagsList()
             }
+            document.dispatchEvent(new Event('refreshImageModifiers'))
         })
     })
 

ui/media/js/main.js

@@ -35,6 +35,7 @@ let samplerSelectionContainer = document.querySelector("#samplerSelection")
 let useFaceCorrectionField = document.querySelector("#use_face_correction")
 let useUpscalingField = document.querySelector("#use_upscale")
 let upscaleModelField = document.querySelector("#upscale_model")
+let upscaleAmountField = document.querySelector("#upscale_amount")
 let stableDiffusionModelField = document.querySelector('#stable_diffusion_model')
 let vaeModelField = document.querySelector('#vae_model')
 let hypernetworkModelField = document.querySelector('#hypernetwork_model')
@@ -287,6 +288,7 @@ function showImages(reqBody, res, outputContainer, livePreview) {
             imageSeedLabel.innerText = 'Seed: ' + req.seed
 
             let buttons = [
+                { text: 'Remove', on_click: onRemoveClick, class: 'secondaryButton' },
                 { text: 'Use as Input', on_click: onUseAsInputClick },
                 { text: 'Download', on_click: onDownloadImageClick },
                 { text: 'Make Similar Images', on_click: onMakeSimilarClick },
@@ -304,9 +306,12 @@ function showImages(reqBody, res, outputContainer, livePreview) {
                 const newButton = document.createElement('button')
                 newButton.classList.add('tasksBtns')
                 newButton.innerText = btnInfo.text
-                newButton.addEventListener('click', function() {
-                    btnInfo.on_click(req, img)
+                newButton.addEventListener('click', function(event) {
+                    btnInfo.on_click(req, img, event)
                 })
+                if (btnInfo.class !== undefined) {
+                   newButton.classList.add(btnInfo.class)
+                }
                 imgItemInfo.appendChild(newButton)
             }
             buttons.forEach(btn => {
@@ -320,6 +325,10 @@ function showImages(reqBody, res, outputContainer, livePreview) {
     })
 }
 
+function onRemoveClick(req, img, event) {
+    shiftOrConfirm(event, "Remove the image from the results?", () => { findClosestAncestor(img, '.imgItem').style.display='none' })
+}
+
 function onUseAsInputClick(req, img) {
     const imgData = img.src
 
@@ -431,7 +440,10 @@ function getUncompletedTaskEntries() {
 }
 
 function makeImage() {
-    performance.mark('click-makeImage')
+    if (typeof performance == "object" && performance.mark) {
+        performance.mark('click-makeImage')
+    }
+
     if (!SD.isServerAvailable()) {
         alert('The server is not available.')
         return
@@ -806,7 +818,7 @@ function createTask(task) {
         taskConfig += `, <b>Fix Faces:</b> ${task.reqBody.use_face_correction}`
     }
     if (task.reqBody.use_upscale) {
-        taskConfig += `, <b>Upscale:</b> ${task.reqBody.use_upscale}`
+        taskConfig += `, <b>Upscale:</b> ${task.reqBody.use_upscale} (${task.reqBody.upscale_amount || 4}x)`
     }
     if (task.reqBody.use_hypernetwork_model) {
         taskConfig += `, <b>Hypernetwork:</b> ${task.reqBody.use_hypernetwork_model}`
@@ -897,7 +909,7 @@ function createTask(task) {
     if (task.previewPrompt.innerText.trim() === '') {
         task.previewPrompt.innerHTML = '&nbsp;' // allows the results to be collapsed
     }
-
+    return taskEntry.id
 }
 
 function getCurrentUserRequest() {
@@ -931,7 +943,8 @@ function getCurrentUserRequest() {
             output_quality: parseInt(outputQualityField.value),
             metadata_output_format: document.querySelector('#metadata_output_format').value,
             original_prompt: promptField.value,
-            active_tags: (activeTags.map(x => x.name))
+            active_tags: (activeTags.map(x => x.name)),
+            inactive_tags: (activeTags.filter(tag => tag.inactive === true).map(x => x.name))
         }
     }
     if (IMAGE_REGEX.test(initImagePreview.src)) {
@@ -957,6 +970,7 @@ function getCurrentUserRequest() {
     }
     if (useUpscalingField.checked) {
         newTask.reqBody.use_upscale = upscaleModelField.value
+        newTask.reqBody.upscale_amount = upscaleAmountField.value
     }
     if (hypernetworkModelField.value) {
         newTask.reqBody.use_hypernetwork_model = hypernetworkModelField.value
@@ -1152,8 +1166,10 @@ function onDimensionChange() {
 diskPathField.disabled = !saveToDiskField.checked
 
 upscaleModelField.disabled = !useUpscalingField.checked
+upscaleAmountField.disabled = !useUpscalingField.checked
 useUpscalingField.addEventListener('change', function(e) {
     upscaleModelField.disabled = !this.checked
+    upscaleAmountField.disabled = !this.checked
 })
 
 makeImageBtn.addEventListener('click', makeImage)
@@ -1290,17 +1306,23 @@ async function getModels() {
         vaeOptions.unshift('') // add a None option
         hypernetworkOptions.unshift('') // add a None option
 
-        function createModelOptions(modelField, selectedModel) {
-            return function(modelName) {
-                const modelOption = document.createElement('option')
-                modelOption.value = modelName
-                modelOption.innerText = modelName !== '' ? modelName : 'None'
+        function createModelOptions(modelField, selectedModel, path="") {
+            return function fn(modelName) {
+                if (typeof(modelName) == 'string') {
+                    const modelOption = document.createElement('option')
+                    modelOption.value =  path + modelName
+                    modelOption.innerHTML = modelName !== '' ? (path != "" ? "&nbsp;&nbsp;"+modelName : modelName) : 'None'
 
-                if (modelName === selectedModel) {
-                    modelOption.selected = true
+                    if (modelName === selectedModel) {
+                        modelOption.selected = true
+                    }
+                    modelField.appendChild(modelOption)
+                } else {
+                    const modelGroup = document.createElement('optgroup')
+                    modelGroup.label = path + modelName[0]
+                    modelField.appendChild(modelGroup)
+                    modelName[1].forEach( createModelOptions(modelField, selectedModel, path + modelName[0] + "/" ) )
                 }
-
-                modelField.appendChild(modelOption)
             }
         }
 

ui/media/js/parameters.js

@@ -83,6 +83,7 @@ var PARAMETERS = [
         type: ParameterType.checkbox,
         label: "Process newest jobs first",
         note: "reverse the normal processing order",
+        icon: "fa-arrow-down-short-wide",
         default: false,
     },
     {
@@ -100,7 +101,7 @@ var PARAMETERS = [
         note: "Faster performance requires more GPU memory (VRAM)<br/><br/>" +
               "<b>Balanced:</b> nearly as fast as High, much lower VRAM usage<br/>" +
               "<b>High:</b> fastest, maximum GPU memory usage</br>" +
-              "<b>Low:</b> slowest, force-used for GPUs with 4 GB (or less) memory",
+              "<b>Low:</b> slowest, force-used for GPUs with 3 to 4 GB memory",
         icon: "fa-forward",
         default: "balanced",
         options: [

ui/media/js/themes.js

@@ -13,8 +13,15 @@ function initTheme() {
         .filter(sheet => sheet.href?.startsWith(window.location.origin))
         .flatMap(sheet => Array.from(sheet.cssRules))
         .forEach(rule => {
-            var selector = rule.selectorText; // TODO: also do selector == ":root", re-run un-set props
+            var selector = rule.selectorText;
             if (selector && selector.startsWith(".theme-") && !selector.includes(" ")) {
+                if (DEFAULT_THEME) { // re-add props that dont change (css needs this so they update correctly)
+                    Array.from(DEFAULT_THEME.rule.style)
+                        .filter(cssVariable => !Array.from(rule.style).includes(cssVariable))
+                        .forEach(cssVariable => {
+                        rule.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable));
+                    });
+                }
                 var theme_key = selector.substring(1);
                 THEMES.push({
                     key: theme_key,
@@ -62,12 +69,6 @@ function themeFieldChanged() {
     var theme = THEMES.find(t => t.key == theme_key);
     let borderColor = undefined
     if (theme) {
-        // refresh variables incase they are back referencing
-        Array.from(DEFAULT_THEME.rule.style)
-            .filter(cssVariable => !Array.from(theme.rule.style).includes(cssVariable))
-            .forEach(cssVariable => {
-            body.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable));
-        });
         borderColor = theme.rule.style.getPropertyValue('--input-border-color').trim()
         if (!borderColor.startsWith('#')) {
             borderColor = theme.rule.style.getPropertyValue('--theme-color-fallback')

ui/media/js/utils.js

@@ -20,6 +20,19 @@ function getNextSibling(elem, selector) {
     }
 }
 
+function findClosestAncestor(element, selector) {
+  if (!element || !element.parentNode) {
+      // reached the top of the DOM tree, return null
+      return null;
+  } else if (element.parentNode.matches(selector)) {
+      // found an ancestor that matches the selector, return it
+      return element.parentNode;
+  } else {
+      // continue searching upwards
+      return findClosestAncestor(element.parentNode, selector);
+  }
+}
+
 
 /* Panel Stuff */
 

ui/plugins/ui/Modifiers-dnd.plugin.js

@@ -74,6 +74,7 @@
                         // update activeTags
                         const tag = activeTags.splice(currentPos, 1)
                         activeTags.splice(droppedPos, 0, tag[0])
+                        document.dispatchEvent(new Event('refreshImageModifiers'))
                     }
                 }
             };

ui/plugins/ui/Modifiers-wheel.plugin.js

@@ -58,6 +58,7 @@
                             break
                         }
                     }
+                    document.dispatchEvent(new Event('refreshImageModifiers'))
                 }
             }
         })

ui/plugins/ui/modifiers-toggle.plugin.js

@@ -46,7 +46,7 @@
                     
                     return obj;
                 });
-                console.log(activeTags)
+                document.dispatchEvent(new Event('refreshImageModifiers'))
             }
         })
     }