Merge pull request #1344 from easydiffusion/beta

Beta

.gitignore

@@ -3,3 +3,4 @@ installer
 installer.tar
 dist
 .idea/*
+node_modules/*

.prettierignore

@@ -0,0 +1,9 @@
+*.min.*
+*.py
+*.json
+*.html
+/*
+!/ui
+/ui/easydiffusion
+!/ui/plugins
+!/ui/media

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+    "printWidth": 120,
+    "tabWidth": 4,
+    "semi": false,
+    "arrowParens": "always",
+    "trailingComma": "es5"
+}

CHANGES.md

@@ -2,8 +2,9 @@
 
 ## 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
+- **Nearly twice as fast** - significantly faster speed of image generation. Code contributions are welcome to make our project even faster: https://github.com/easydiffusion/sdkit/#is-it-fast
 - **Mac M1/M2 support** - Experimental support for Mac M1/M2. Thanks @michaelgallacher, @JeLuf and vishae.
+- **AMD support for Linux** - Experimental support for AMD GPUs on Linux. Thanks @DianaNites and @JeLuf.
 - **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 Stable Diffusion 2.1 models, with the same low VRAM optimizations that we've always had for SD 1.4. Please note, the SD 2.0 and 2.1 models require more GPU and System RAM, as compared to the SD 1.4 and 1.5 models.
 - **11 new samplers!** - explore the new samplers, some of which can generate great images in less than 10 inference steps! We've added the Karras and UniPC samplers. Thanks @Schorny for the UniPC samplers.
@@ -21,7 +22,27 @@
 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.34 - 22 Apr 2023 - Nothing, just keeping this line warm.
+* 2.5.41 - 13 Jun 2023 - Fix multi-gpu bug with "low" VRAM usage mode while generating images.
+* 2.5.41 - 12 Jun 2023 - Fix multi-gpu bug with CodeFormer.
+* 2.5.41 - 6 Jun 2023 - Allow changing the strength of CodeFormer, and slightly improved styling of the CodeFormer options.
+* 2.5.41 - 5 Jun 2023 - Allow sharing an Easy Diffusion instance via https://try.cloudflare.com/ . You can find this option at the bottom of the Settings tab. Thanks @JeLuf.
+* 2.5.41 - 5 Jun 2023 - Show an option to download for tiled images. Shows a button on the generated image. Creates larger images by tiling them with the image generated by Easy Diffusion. Thanks @JeLuf.
+* 2.5.41 - 5 Jun 2023 - (beta-only) Allow LoRA strengths between -2 and 2. Thanks @ogmaresca.
+* 2.5.40 - 5 Jun 2023 - Reduce the VRAM usage of Latent Upscaling when using "balanced" VRAM usage mode.
+* 2.5.40 - 5 Jun 2023 - Fix the "realesrgan" key error when using CodeFormer with more than 1 image in a batch.
+* 2.5.40 - 3 Jun 2023 - Added CodeFormer as another option for fixing faces and eyes. CodeFormer tends to perform better than GFPGAN for many images. Thanks @patriceac for the implementation, and for contacting the CodeFormer team (who were supportive of it being integrated into Easy Diffusion).
+* 2.5.39 - 25 May 2023 - (beta-only) Seamless Tiling - make seamlessly tiled images, e.g. rock and grass textures. Thanks @JeLuf.
+* 2.5.38 - 24 May 2023 - Better reporting of errors, and show an explanation if the user cannot disable the "Use CPU" setting.
+* 2.5.38 - 23 May 2023 - Add Latent Upscaler as another option for upscaling images. Thanks @JeLuf for the implementation of the Latent Upscaler model.
+* 2.5.37 - 19 May 2023 - (beta-only) Two more samplers: DDPM and DEIS. Also disables the samplers that aren't working yet in the Diffusers version. Thanks @ogmaresca.
+* 2.5.37 - 19 May 2023 - (beta-only) Support CLIP-Skip. You can set this option under the models dropdown. Thanks @JeLuf.
+* 2.5.37 - 19 May 2023 - (beta-only) More VRAM optimizations for all modes in diffusers. The VRAM usage for diffusers in "low" and "balanced" should now be equal or less than the non-diffusers version. Performs softmax in half precision, like sdkit does.
+* 2.5.36 - 16 May 2023 - (beta-only) More VRAM optimizations for "balanced" VRAM usage mode.
+* 2.5.36 - 11 May 2023 - (beta-only) More VRAM optimizations for "low" VRAM usage mode.
+* 2.5.36 - 10 May 2023 - (beta-only) Bug fix for "meta" error when using a LoRA in 'low' VRAM usage mode.
+* 2.5.35 - 8 May 2023 - Allow dragging a zoomed-in image (after opening an image with the "expand" button). Thanks @ogmaresca.
+* 2.5.35 - 3 May 2023 - (beta-only) First round of VRAM Optimizations for the "Test Diffusers" version. This change significantly reduces the amount of VRAM used by the diffusers version during image generation. The VRAM usage is still not equal to the "non-diffusers" version, but more optimizations are coming soon.
+* 2.5.34 - 22 Apr 2023 - Don't start the browser in an incognito new profile (on Windows). Thanks @JeLuf.
 * 2.5.33 - 21 Apr 2023 - Install PyTorch 2.0 on new installations (on Windows and Linux).
 * 2.5.32 - 19 Apr 2023 - Automatically check for black images, and set full-precision if necessary (for attn). This means custom models based on Stable Diffusion v2.1 will just work, without needing special command-line arguments or editing of yaml config files.
 * 2.5.32 - 18 Apr 2023 - Automatic support for AMD graphics cards on Linux. Thanks @DianaNites and @JeLuf.

How to install and run.txt

@@ -5,10 +5,10 @@ If you haven't downloaded Stable Diffusion UI yet, please download from https://
 After downloading, to install please follow these instructions:
 
 For Windows:
-- Please double-click the "Start Stable Diffusion UI.cmd" file inside the "stable-diffusion-ui" folder.
+- Please double-click the "Easy-Diffusion-Windows.exe" file and follow the instructions.
 
 For Linux:
-- Please open a terminal, and go to the "stable-diffusion-ui" directory. Then run ./start.sh
+- Please open a terminal, unzip the Easy-Diffusion-Linux.zip file and go to the "easy-diffusion" directory. Then run ./start.sh
 
 That file will automatically install everything. After that it will start the Stable Diffusion interface in a web browser.
 
@@ -21,4 +21,4 @@ If you have any problems, please:
 3. Or, file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
 
 Thanks
-cmdr2 (and contributors to the project)
+cmdr2 (and contributors to the project)

PRIVACY.md

@@ -0,0 +1,9 @@
+// placeholder until a more formal and legal-sounding privacy policy document is written. but the information below is true.
+
+This is a summary of whether Easy Diffusion uses your data or tracks you:
+* The short answer is - Easy Diffusion does *not* use your data, and does *not* track you.
+* Easy Diffusion does not send your prompts or usage or analytics to anyone. There is no tracking. We don't even know how many people use Easy Diffusion, let alone their prompts.
+* Easy Diffusion fetches updates to the code whenever it starts up. It does this by contacting GitHub directly, via SSL (secure connection). Only your computer and GitHub and [this repository](https://github.com/cmdr2/stable-diffusion-ui) are involved, and no third party is involved. Some countries intercepts SSL connections, that's not something we can do much about. GitHub does *not* share statistics (even with me) about how many people fetched code updates.
+* Easy Diffusion fetches the models from huggingface.co and github.com, if they don't exist on your PC. For e.g. if the safety checker (NSFW) model doesn't exist, it'll try to download it.
+* Easy Diffusion fetches code packages from pypi.org, which is the standard hosting service for all Python projects. That's where packages installed via `pip install` are stored.
+* Occasionally, antivirus software are known to *incorrectly* flag and delete some model files, which will result in Easy Diffusion re-downloading `pytorch_model.bin`. This *incorrect deletion* affects other Stable Diffusion UIs as well, like Invoke AI - https://itch.io/post/7509488

README.md

@@ -1,5 +1,5 @@
 # Easy Diffusion 2.5
-### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer.
+### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your computer.
 
 Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community.
 
@@ -16,6 +16,14 @@ Click the download button for your operating system:
   <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Mac.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-mac.png" width="200" /></a>
 </p>
 
+**Hardware requirements:**
+- **Windows:** NVIDIA graphics card (minimum 2 GB RAM), or run on your CPU.
+- **Linux:** NVIDIA or AMD graphics card (minimum 2 GB RAM), or run on your CPU.
+- **Mac:** M1 or M2, or run on your CPU.
+- Minimum 8 GB of system RAM.
+- Atleast 25 GB of space on the hard disk.
+
+
 The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance.
 
 ## On Windows:
@@ -53,7 +61,7 @@ Just delete the `EasyDiffusion` folder to uninstall all the downloaded packages.
 
 ### Image generation
 - **Supports**: "*Text to Image*" and "*Image to Image*".
-- **19 Samplers**: `ddim`, `plms`, `heun`, `euler`, `euler_a`, `dpm2`, `dpm2_a`, `lms`, `dpm_solver_stability`, `dpmpp_2s_a`, `dpmpp_2m`, `dpmpp_sde`, `dpm_fast`, `dpm_adaptive`, `unipc_snr`, `unipc_tu`, `unipc_tq`, `unipc_snr_2`, `unipc_tu_2`.
+- **21 Samplers**: `ddim`, `plms`, `heun`, `euler`, `euler_a`, `dpm2`, `dpm2_a`, `lms`, `dpm_solver_stability`, `dpmpp_2s_a`, `dpmpp_2m`, `dpmpp_sde`, `dpm_fast`, `dpm_adaptive`, `ddpm`, `deis`, `unipc_snr`, `unipc_tu`, `unipc_tq`, `unipc_snr_2`, `unipc_tu_2`.
 - **In-Painting**: Specify areas of your image to paint into.
 - **Simple Drawing Tool**: Draw basic images to guide the AI, without needing an external drawing program.
 - **Face Correction (GFPGAN)**
@@ -79,7 +87,7 @@ Just delete the `EasyDiffusion` folder to uninstall all the downloaded packages.
 
 ### Performance and security
 - **Fast**: Creates a 512x512 image with euler_a in 5 seconds, on an NVIDIA 3060 12GB.
-- **Low Memory Usage**: Create 512x512 images with less than 3 GB of GPU RAM, and 768x768 images with less than 4 GB of GPU RAM!
+- **Low Memory Usage**: Create 512x512 images with less than 2 GB of GPU RAM, and 768x768 images with less than 3 GB of GPU RAM!
 - **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
 - **Multi-GPU support**: Automatically spreads your tasks across multiple GPUs (if available), for faster performance!
 - **Auto scan for malicious models**: Uses picklescan to prevent malicious models.
@@ -108,14 +116,6 @@ Useful for judging (and stopping) an image quickly, without waiting for it to fi
 ![Screenshot of task queue](https://user-images.githubusercontent.com/844287/217043984-0b35f73b-1318-47cb-9eed-a2a91b430490.png)
 
 
-
-# System Requirements
-1. Windows 10/11, or Linux. Experimental support for Mac is coming soon.
-2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. If you don't have a compatible graphics card, it'll automatically run in the slower "CPU Mode".
-3. Minimum 8 GB of RAM and 25GB of disk space.
-
-You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
-
 ----
 
 # How to use?

package.json

@@ -0,0 +1,9 @@
+{
+  "scripts": {
+    "prettier-fix": "npx prettier --write \"./**/*.js\"",
+    "prettier-check": "npx prettier --check \"./**/*.js\""
+  },
+  "devDependencies": {
+    "prettier": "^1.19.1"
+  }
+}

scripts/check_models.py

@@ -1,101 +0,0 @@
-# this script runs inside the legacy "stable-diffusion" folder
-
-from sdkit.models import download_model, get_model_info_from_db
-from sdkit.utils import hash_file_quick
-
-import os
-import shutil
-from glob import glob
-import traceback
-
-models_base_dir = os.path.abspath(os.path.join("..", "models"))
-
-models_to_check = {
-    "stable-diffusion": [
-        {"file_name": "sd-v1-4.ckpt", "model_id": "1.4"},
-    ],
-    "gfpgan": [
-        {"file_name": "GFPGANv1.4.pth", "model_id": "1.4"},
-    ],
-    "realesrgan": [
-        {"file_name": "RealESRGAN_x4plus.pth", "model_id": "x4plus"},
-        {"file_name": "RealESRGAN_x4plus_anime_6B.pth", "model_id": "x4plus_anime_6"},
-    ],
-    "vae": [
-        {"file_name": "vae-ft-mse-840000-ema-pruned.ckpt", "model_id": "vae-ft-mse-840000-ema-pruned"},
-    ],
-}
-MODEL_EXTENSIONS = {  # copied from easydiffusion/model_manager.py
-    "stable-diffusion": [".ckpt", ".safetensors"],
-    "vae": [".vae.pt", ".ckpt", ".safetensors"],
-    "hypernetwork": [".pt", ".safetensors"],
-    "gfpgan": [".pth"],
-    "realesrgan": [".pth"],
-    "lora": [".ckpt", ".safetensors"],
-}
-
-
-def download_if_necessary(model_type: str, file_name: str, model_id: str):
-    model_path = os.path.join(models_base_dir, model_type, file_name)
-    expected_hash = get_model_info_from_db(model_type=model_type, model_id=model_id)["quick_hash"]
-
-    other_models_exist = any_model_exists(model_type)
-    known_model_exists = os.path.exists(model_path)
-    known_model_is_corrupt = known_model_exists and hash_file_quick(model_path) != expected_hash
-
-    if known_model_is_corrupt or (not other_models_exist and not known_model_exists):
-        print("> download", model_type, model_id)
-        download_model(model_type, model_id, download_base_dir=models_base_dir)
-
-
-def init():
-    migrate_legacy_model_location()
-
-    for model_type, models in models_to_check.items():
-        for model in models:
-            try:
-                download_if_necessary(model_type, model["file_name"], model["model_id"])
-            except:
-                traceback.print_exc()
-                fail(model_type)
-
-        print(model_type, "model(s) found.")
-
-
-### utilities
-def any_model_exists(model_type: str) -> bool:
-    extensions = MODEL_EXTENSIONS.get(model_type, [])
-    for ext in extensions:
-        if any(glob(f"{models_base_dir}/{model_type}/**/*{ext}", recursive=True)):
-            return True
-
-    return False
-
-
-def migrate_legacy_model_location():
-    'Move the models inside the legacy "stable-diffusion" folder, to their respective folders'
-
-    for model_type, models in models_to_check.items():
-        for model in models:
-            file_name = model["file_name"]
-            if os.path.exists(file_name):
-                dest_dir = os.path.join(models_base_dir, model_type)
-                os.makedirs(dest_dir, exist_ok=True)
-                shutil.move(file_name, os.path.join(dest_dir, file_name))
-
-
-def fail(model_name):
-    print(
-        f"""Error downloading the {model_name} model. Sorry about that, please try to:
-1. Run this installer again.
-2. If that doesn't fix it, please try to download the file manually. The address to download from, and the destination to save to are printed above this message.
-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
-4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
-Thanks!"""
-    )
-    exit(1)
-
-
-### start
-
-init()

scripts/check_modules.py

@@ -18,13 +18,15 @@ os_name = platform.system()
 modules_to_check = {
     "torch": ("1.11.0", "1.13.1", "2.0.0"),
     "torchvision": ("0.12.0", "0.14.1", "0.15.1"),
-    "sdkit": "1.0.81",
+    "sdkit": "1.0.106",
     "stable-diffusion-sdkit": "2.1.4",
     "rich": "12.6.0",
     "uvicorn": "0.19.0",
     "fastapi": "0.85.1",
+    "pycloudflared": "0.2.0",
     # "xformers": "0.0.16",
 }
+modules_to_log = ["torch", "torchvision", "sdkit", "stable-diffusion-sdkit"]
 
 
 def version(module_name: str) -> str:
@@ -89,7 +91,8 @@ def init():
                 traceback.print_exc()
                 fail(module_name)
 
-        print(f"{module_name}: {version(module_name)}")
+        if module_name in modules_to_log:
+            print(f"{module_name}: {version(module_name)}")
 
 
 ### utilities
@@ -130,10 +133,13 @@ def include_cuda_versions(module_versions: tuple) -> tuple:
 
 def is_amd_on_linux():
     if os_name == "Linux":
-        with open("/proc/bus/pci/devices", "r") as f:
+        try:
-            device_info = f.read()
+            with open("/proc/bus/pci/devices", "r") as f:
-            if "amdgpu" in device_info and "nvidia" not in device_info:
+                device_info = f.read()
-                return True
+                if "amdgpu" in device_info and "nvidia" not in device_info:
+                    return True
+        except:
+            return False
 
     return False
 

scripts/developer_console.sh

@@ -39,6 +39,8 @@ if [ "$0" == "bash" ]; then
     export PYTHONPATH="$(pwd)/stable-diffusion/env/lib/python3.8/site-packages"
   fi
 
+  export PYTHONNOUSERSITE=y
+
   which python
   python --version
 

scripts/get_config.py

@@ -0,0 +1,46 @@
+import os
+import argparse
+import sys
+
+# The config file is in the same directory as this script
+config_directory = os.path.dirname(__file__)
+config_yaml = os.path.join(config_directory, "config.yaml")
+config_json = os.path.join(config_directory, "config.json")
+
+parser = argparse.ArgumentParser(description='Get values from config file')
+parser.add_argument('--default', dest='default', action='store',
+                     help='default value, to be used if the setting is not defined in the config file')
+parser.add_argument('key', metavar='key', nargs='+',
+                    help='config key to return')
+
+args = parser.parse_args()
+
+
+if os.path.isfile(config_yaml):
+    import yaml
+    with open(config_yaml, 'r') as configfile:
+        try:
+            config = yaml.safe_load(configfile)
+        except Exception as e:
+            print(e, file=sys.stderr)
+            config = {}
+elif os.path.isfile(config_json):
+    import json
+    with open(config_json, 'r') as configfile:
+        try:
+            config = json.load(configfile)
+        except Exception as e:
+            print(e, file=sys.stderr)
+            config = {}
+else:
+    config = {}
+
+for k in args.key:
+    if k in config:
+        config = config[k]
+    else:
+        if args.default != None:
+            print(args.default)
+            exit()
+
+print(config)

scripts/on_env_start.bat

@@ -12,6 +12,16 @@ if exist "scripts\user_config.bat" (
     @call scripts\user_config.bat
 )
 
+if exist "stable-diffusion\env" (
+    @set PYTHONPATH=%PYTHONPATH%;%cd%\stable-diffusion\env\lib\site-packages
+)
+
+if exist "scripts\get_config.py" (
+    @FOR /F "tokens=* USEBACKQ" %%F IN (`python scripts\get_config.py --default=main update_branch`) DO (
+        @SET update_branch=%%F
+    )
+)
+
 if "%update_branch%"=="" (
     set update_branch=main
 )
@@ -57,7 +67,7 @@ if "%update_branch%"=="" (
 @xcopy sd-ui-files\ui ui /s /i /Y /q
 @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
 @copy sd-ui-files\scripts\check_modules.py scripts\ /Y
-@copy sd-ui-files\scripts\check_models.py scripts\ /Y
+@copy sd-ui-files\scripts\get_config.py scripts\ /Y
 @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
 @copy "sd-ui-files\scripts\Developer Console.cmd" . /Y
 

scripts/on_env_start.sh

@@ -4,6 +4,8 @@ source ./scripts/functions.sh
 
 printf "\n\nEasy Diffusion\n\n"
 
+export PYTHONNOUSERSITE=y
+
 if [ -f "scripts/config.sh" ]; then
     source scripts/config.sh
 fi
@@ -12,6 +14,11 @@ if [ -f "scripts/user_config.sh" ]; then
     source scripts/user_config.sh
 fi
 
+export PYTHONPATH=$(pwd)/installer_files/env/lib/python3.8/site-packages:$(pwd)/stable-diffusion/env/lib/python3.8/site-packages
+
+if [ -f "scripts/get_config.py" ]; then
+   export update_branch="$( python scripts/get_config.py --default=main update_branch )"
+fi
 
 if [ "$update_branch" == "" ]; then
     export update_branch="main"
@@ -43,7 +50,7 @@ cp -Rf sd-ui-files/ui .
 cp sd-ui-files/scripts/on_sd_start.sh scripts/
 cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/check_modules.py scripts/
-cp sd-ui-files/scripts/check_models.py scripts/
+cp sd-ui-files/scripts/get_config.py scripts/
 cp sd-ui-files/scripts/start.sh .
 cp sd-ui-files/scripts/developer_console.sh .
 cp sd-ui-files/scripts/functions.sh scripts/

scripts/on_sd_start.bat

@@ -5,10 +5,10 @@
 
 @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y
 @copy sd-ui-files\scripts\check_modules.py scripts\ /Y
-@copy sd-ui-files\scripts\check_models.py scripts\ /Y
+@copy sd-ui-files\scripts\get_config.py scripts\ /Y
 
 if exist "%cd%\profile" (
-    set USERPROFILE=%cd%\profile
+    set HF_HOME=%cd%\profile\.cache\huggingface
 )
 
 @rem set the correct installer path (current vs legacy)
@@ -78,13 +78,6 @@ call WHERE uvicorn > .tmp
     @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )
 
-@rem Download the required models
-call python ..\scripts\check_models.py
-if "%ERRORLEVEL%" NEQ "0" (
-    pause
-    exit /b
-)
-
 @>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
     @echo sd_weights_downloaded >> ..\scripts\install_status.txt
@@ -103,14 +96,25 @@ call python --version
 
 @cd ..
 @set SD_UI_PATH=%cd%\ui
+
+@FOR /F "tokens=* USEBACKQ" %%F IN (`python scripts\get_config.py --default=9000 net listen_port`) DO (
+    @SET ED_BIND_PORT=%%F
+)
+
+@FOR /F "tokens=* USEBACKQ" %%F IN (`python scripts\get_config.py --default=False net listen_to_network`) DO (
+    if "%%F" EQU "True" (
+        @SET ED_BIND_IP=0.0.0.0    
+    ) else (
+        @SET ED_BIND_IP=127.0.0.1
+    )
+)
+
 @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
+@uvicorn main:server_api --app-dir "%SD_UI_PATH%" --port %ED_BIND_PORT% --host %ED_BIND_IP% --log-level error
-@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
 
 
 @pause

scripts/on_sd_start.sh

@@ -4,7 +4,7 @@ cp sd-ui-files/scripts/functions.sh scripts/
 cp sd-ui-files/scripts/on_env_start.sh scripts/
 cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/check_modules.py scripts/
-cp sd-ui-files/scripts/check_models.py scripts/
+cp sd-ui-files/scripts/get_config.py scripts/
 
 source ./scripts/functions.sh
 
@@ -50,12 +50,6 @@ if ! command -v uvicorn &> /dev/null; then
     fail "UI packages not found!"
 fi
 
-# Download the required models
-if ! python ../scripts/check_models.py; then
-    read -p "Press any key to continue"
-    exit 1
-fi
-
 if [ `grep -c sd_install_complete ../scripts/install_status.txt` -gt "0" ]; then
     echo sd_weights_downloaded >> ../scripts/install_status.txt
     echo sd_install_complete >> ../scripts/install_status.txt
@@ -74,8 +68,17 @@ python --version
 
 cd ..
 export SD_UI_PATH=`pwd`/ui
+export ED_BIND_PORT="$( python scripts/get_config.py --default=9000 net listen_port )"
+case "$( python scripts/get_config.py --default=False net listen_to_network )" in
+    "True")
+        export ED_BIND_IP=0.0.0.0
+        ;;
+    "False")
+        export ED_BIND_IP=127.0.0.1
+        ;;
+esac
 cd stable-diffusion
 
-uvicorn main:server_api --app-dir "$SD_UI_PATH" --port ${SD_UI_BIND_PORT:-9000} --host ${SD_UI_BIND_IP:-0.0.0.0} --log-level error
+uvicorn main:server_api --app-dir "$SD_UI_PATH" --port "$ED_BIND_PORT" --host "$ED_BIND_IP" --log-level error
 
 read -p "Press any key to continue"

ui/easydiffusion/app.py

@@ -1,17 +1,18 @@
+import json
+import logging
 import os
 import socket
 import sys
-import json
 import traceback
-import logging
-import shlex
 import urllib
-from rich.logging import RichHandler
+import warnings
-
-from sdkit.utils import log as sdkit_log  # hack, so we can overwrite the log config
 
 from easydiffusion import task_manager
 from easydiffusion.utils import log
+from rich.logging import RichHandler
+from rich.console import Console
+from rich.panel import Panel
+from sdkit.utils import log as sdkit_log  # hack, so we can overwrite the log config
 
 # Remove all handlers associated with the root logger object.
 for handler in logging.root.handlers[:]:
@@ -55,15 +56,42 @@ APP_CONFIG_DEFAULTS = {
     },
 }
 
-IMAGE_EXTENSIONS = [".png", ".apng", ".jpg", ".jpeg", ".jfif", ".pjpeg", ".pjp", ".jxl", ".gif", ".webp", ".avif", ".svg"]
+IMAGE_EXTENSIONS = [
+    ".png",
+    ".apng",
+    ".jpg",
+    ".jpeg",
+    ".jfif",
+    ".pjpeg",
+    ".pjp",
+    ".jxl",
+    ".gif",
+    ".webp",
+    ".avif",
+    ".svg",
+]
 CUSTOM_MODIFIERS_DIR = os.path.abspath(os.path.join(SD_DIR, "..", "modifiers"))
-CUSTOM_MODIFIERS_PORTRAIT_EXTENSIONS=[".portrait", "_portrait", " portrait", "-portrait"]
+CUSTOM_MODIFIERS_PORTRAIT_EXTENSIONS = [
-CUSTOM_MODIFIERS_LANDSCAPE_EXTENSIONS=[".landscape", "_landscape", " landscape", "-landscape"]
+    ".portrait",
+    "_portrait",
+    " portrait",
+    "-portrait",
+]
+CUSTOM_MODIFIERS_LANDSCAPE_EXTENSIONS = [
+    ".landscape",
+    "_landscape",
+    " landscape",
+    "-landscape",
+]
+
 
 def init():
     os.makedirs(USER_UI_PLUGINS_DIR, exist_ok=True)
     os.makedirs(USER_SERVER_PLUGINS_DIR, exist_ok=True)
 
+    # https://pytorch.org/docs/stable/storage.html
+    warnings.filterwarnings("ignore", category=UserWarning, message="TypedStorage is deprecated")
+
     load_server_plugins()
 
     update_render_threads()
@@ -81,14 +109,10 @@ def getConfig(default_val=APP_CONFIG_DEFAULTS):
             config["net"] = {}
         if os.getenv("SD_UI_BIND_PORT") is not None:
             config["net"]["listen_port"] = int(os.getenv("SD_UI_BIND_PORT"))
-        else:
-            config["net"]["listen_port"] = 9000
         if os.getenv("SD_UI_BIND_IP") is not None:
             config["net"]["listen_to_network"] = os.getenv("SD_UI_BIND_IP") == "0.0.0.0"
-        else:
-            config["net"]["listen_to_network"] = True
         return config
-    except Exception as e:
+    except Exception:
         log.warn(traceback.format_exc())
         return default_val
 
@@ -101,50 +125,6 @@ def setConfig(config):
     except:
         log.error(traceback.format_exc())
 
-    try:  # config.bat
-        config_bat_path = os.path.join(CONFIG_DIR, "config.bat")
-        config_bat = []
-
-        if "update_branch" in config:
-            config_bat.append(f"@set update_branch={config['update_branch']}")
-
-        config_bat.append(f"@set SD_UI_BIND_PORT={config['net']['listen_port']}")
-        bind_ip = "0.0.0.0" if config["net"]["listen_to_network"] else "127.0.0.1"
-        config_bat.append(f"@set SD_UI_BIND_IP={bind_ip}")
-
-        # Preserve these variables if they are set
-        for var in PRESERVE_CONFIG_VARS:
-            if os.getenv(var) is not None:
-                config_bat.append(f"@set {var}={os.getenv(var)}")
-
-        if len(config_bat) > 0:
-            with open(config_bat_path, "w", encoding="utf-8") as f:
-                f.write("\n".join(config_bat))
-    except:
-        log.error(traceback.format_exc())
-
-    try:  # config.sh
-        config_sh_path = os.path.join(CONFIG_DIR, "config.sh")
-        config_sh = ["#!/bin/bash"]
-
-        if "update_branch" in config:
-            config_sh.append(f"export update_branch={config['update_branch']}")
-
-        config_sh.append(f"export SD_UI_BIND_PORT={config['net']['listen_port']}")
-        bind_ip = "0.0.0.0" if config["net"]["listen_to_network"] else "127.0.0.1"
-        config_sh.append(f"export SD_UI_BIND_IP={bind_ip}")
-
-        # Preserve these variables if they are set
-        for var in PRESERVE_CONFIG_VARS:
-            if os.getenv(var) is not None:
-                config_bat.append(f'export {var}="{shlex.quote(os.getenv(var))}"')
-
-        if len(config_sh) > 1:
-            with open(config_sh_path, "w", encoding="utf-8") as f:
-                f.write("\n".join(config_sh))
-    except:
-        log.error(traceback.format_exc())
-
 
 def save_to_config(ckpt_model_name, vae_model_name, hypernetwork_model_name, vram_usage_level):
     config = getConfig()
@@ -233,18 +213,56 @@ def getIPConfig():
 def open_browser():
     config = getConfig()
     ui = config.get("ui", {})
-    net = config.get("net", {"listen_port": 9000})
+    net = config.get("net", {})
     port = net.get("listen_port", 9000)
+
     if ui.get("open_browser_on_start", True):
         import webbrowser
 
         webbrowser.open(f"http://localhost:{port}")
 
+    Console().print(
+        Panel(
+            "\n"
+            + "[white]Easy Diffusion is ready to serve requests.\n\n"
+            + "A new browser tab should have been opened by now.\n"
+            + f"If not, please open your web browser and navigate to [bold yellow underline]http://localhost:{port}/\n",
+            title="Easy Diffusion is ready",
+            style="bold yellow on blue",
+        )
+    )
+
+
+def fail_and_die(fail_type: str, data: str):
+    suggestions = [
+        "Run this installer again.",
+        "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",
+        "If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues",
+    ]
+
+    if fail_type == "model_download":
+        fail_label = f"Error downloading the {data} model"
+        suggestions.insert(
+            1,
+            "If that doesn't fix it, please try to download the file manually. The address to download from, and the destination to save to are printed above this message.",
+        )
+    else:
+        fail_label = "Error while installing Easy Diffusion"
+
+    msg = [f"{fail_label}. Sorry about that, please try to:"]
+    for i, suggestion in enumerate(suggestions):
+        msg.append(f"{i+1}. {suggestion}")
+    msg.append("Thanks!")
+
+    print("\n".join(msg))
+    exit(1)
+
+
 def get_image_modifiers():
     modifiers_json_path = os.path.join(SD_UI_DIR, "modifiers.json")
 
     modifier_categories = {}
-    original_category_order=[]
+    original_category_order = []
     with open(modifiers_json_path, "r", encoding="utf-8") as f:
         modifiers_file = json.load(f)
 
@@ -254,14 +272,14 @@ def get_image_modifiers():
 
         # convert modifiers from a list of objects to a dict of dicts
         for category_item in modifiers_file:
-            category_name = category_item['category']
+            category_name = category_item["category"]
             original_category_order.append(category_name)
             category = {}
-            for modifier_item in category_item['modifiers']:
+            for modifier_item in category_item["modifiers"]:
                 modifier = {}
-                for preview_item in modifier_item['previews']:
+                for preview_item in modifier_item["previews"]:
-                    modifier[preview_item['name']] = preview_item['path']
+                    modifier[preview_item["name"]] = preview_item["path"]
-                category[modifier_item['modifier']] = modifier
+                category[modifier_item["modifier"]] = modifier
             modifier_categories[category_name] = category
 
     def scan_directory(directory_path: str, category_name="Modifiers"):
@@ -274,12 +292,27 @@ def get_image_modifiers():
                 modifier_name = entry.name[: -len(file_extension[0])]
                 modifier_path = f"custom/{entry.path[len(CUSTOM_MODIFIERS_DIR) + 1:]}"
                 # URL encode path segments
-                modifier_path = "/".join(map(lambda segment: urllib.parse.quote(segment), modifier_path.split("/")))
+                modifier_path = "/".join(
+                    map(
+                        lambda segment: urllib.parse.quote(segment),
+                        modifier_path.split("/"),
+                    )
+                )
                 is_portrait = True
                 is_landscape = True
 
-                portrait_extension = list(filter(lambda e: modifier_name.lower().endswith(e), CUSTOM_MODIFIERS_PORTRAIT_EXTENSIONS))
+                portrait_extension = list(
-                landscape_extension = list(filter(lambda e: modifier_name.lower().endswith(e), CUSTOM_MODIFIERS_LANDSCAPE_EXTENSIONS))
+                    filter(
+                        lambda e: modifier_name.lower().endswith(e),
+                        CUSTOM_MODIFIERS_PORTRAIT_EXTENSIONS,
+                    )
+                )
+                landscape_extension = list(
+                    filter(
+                        lambda e: modifier_name.lower().endswith(e),
+                        CUSTOM_MODIFIERS_LANDSCAPE_EXTENSIONS,
+                    )
+                )
 
                 if len(portrait_extension) > 0:
                     is_landscape = False
@@ -287,24 +320,24 @@ def get_image_modifiers():
                 elif len(landscape_extension) > 0:
                     is_portrait = False
                     modifier_name = modifier_name[: -len(landscape_extension[0])]
-                
+
-                if (category_name not in modifier_categories):
+                if category_name not in modifier_categories:
                     modifier_categories[category_name] = {}
-                
+
                 category = modifier_categories[category_name]
 
-                if (modifier_name not in category):
+                if modifier_name not in category:
                     category[modifier_name] = {}
 
-                if (is_portrait or "portrait" not in category[modifier_name]):
+                if is_portrait or "portrait" not in category[modifier_name]:
                     category[modifier_name]["portrait"] = modifier_path
-                
+
-                if (is_landscape or "landscape" not in category[modifier_name]):
+                if is_landscape or "landscape" not in category[modifier_name]:
                     category[modifier_name]["landscape"] = modifier_path
             elif entry.is_dir():
                 scan_directory(
                     entry.path,
-                    entry.name if directory_path==CUSTOM_MODIFIERS_DIR else f"{category_name}/{entry.name}",
+                    entry.name if directory_path == CUSTOM_MODIFIERS_DIR else f"{category_name}/{entry.name}",
                 )
 
     scan_directory(CUSTOM_MODIFIERS_DIR)
@@ -317,12 +350,12 @@ def get_image_modifiers():
     # convert the modifiers back into a list of objects
     modifier_categories_list = []
     for category_name in [*original_category_order, *custom_categories]:
-        category = { 'category': category_name, 'modifiers': [] }
+        category = {"category": category_name, "modifiers": []}
         for modifier_name in sorted(modifier_categories[category_name].keys(), key=str.casefold):
-            modifier = { 'modifier': modifier_name, 'previews': [] }
+            modifier = {"modifier": modifier_name, "previews": []}
             for preview_name, preview_path in modifier_categories[category_name][modifier_name].items():
-                modifier['previews'].append({ 'name': preview_name, 'path': preview_path })
+                modifier["previews"].append({"name": preview_name, "path": preview_path})
-            category['modifiers'].append(modifier)
+            category["modifiers"].append(modifier)
         modifier_categories_list.append(category)
 
     return modifier_categories_list

ui/easydiffusion/device_manager.py

@@ -1,9 +1,9 @@
 import os
 import platform
-import torch
-import traceback
 import re
+import traceback
 
+import torch
 from easydiffusion.utils import log
 
 """
@@ -118,7 +118,10 @@ def auto_pick_devices(currently_active_devices):
     #    These already-running devices probably aren't terrible, since they were picked in the past.
     #    Worst case, the user can restart the program and that'll get rid of them.
     devices = list(
-        filter((lambda x: x["mem_free"] > mem_free_threshold or x["device"] in currently_active_devices), devices)
+        filter(
+            (lambda x: x["mem_free"] > mem_free_threshold or x["device"] in currently_active_devices),
+            devices,
+        )
     )
     devices = list(map(lambda x: x["device"], devices))
     return devices
@@ -162,6 +165,7 @@ def needs_to_force_full_precision(context):
         and (
             " 1660" in device_name
             or " 1650" in device_name
+            or " 1630" in device_name
             or " t400" in device_name
             or " t550" in device_name
             or " t600" in device_name
@@ -221,9 +225,9 @@ def is_device_compatible(device):
     try:
         _, mem_total = torch.cuda.mem_get_info(device)
         mem_total /= float(10**9)
-        if mem_total < 3.0:
+        if mem_total < 1.9:
             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")
+                log.warn(f"GPU {device} with less than 2 GB of VRAM is not compatible with Stable Diffusion")
                 is_device_compatible.history[device] = 1
             return False
     except RuntimeError as e:

ui/easydiffusion/model_manager.py

@@ -1,13 +1,24 @@
 import os
+import shutil
+from glob import glob
+import traceback
 
 from easydiffusion import app
 from easydiffusion.types import TaskData
 from easydiffusion.utils import log
-
 from sdkit import Context
-from sdkit.models import load_model, unload_model, scan_model
+from sdkit.models import load_model, scan_model, unload_model, download_model, get_model_info_from_db
+from sdkit.utils import hash_file_quick
 
-KNOWN_MODEL_TYPES = ["stable-diffusion", "vae", "hypernetwork", "gfpgan", "realesrgan", "lora"]
+KNOWN_MODEL_TYPES = [
+    "stable-diffusion",
+    "vae",
+    "hypernetwork",
+    "gfpgan",
+    "realesrgan",
+    "lora",
+    "codeformer",
+]
 MODEL_EXTENSIONS = {
     "stable-diffusion": [".ckpt", ".safetensors"],
     "vae": [".vae.pt", ".ckpt", ".safetensors"],
@@ -15,14 +26,22 @@ MODEL_EXTENSIONS = {
     "gfpgan": [".pth"],
     "realesrgan": [".pth"],
     "lora": [".ckpt", ".safetensors"],
+    "codeformer": [".pth"],
 }
 DEFAULT_MODELS = {
-    "stable-diffusion": [  # needed to support the legacy installations
+    "stable-diffusion": [
-        "custom-model",  # only one custom model file was supported initially, creatively named 'custom-model'
+        {"file_name": "sd-v1-4.ckpt", "model_id": "1.4"},
-        "sd-v1-4",  # Default fallback.
+    ],
+    "gfpgan": [
+        {"file_name": "GFPGANv1.4.pth", "model_id": "1.4"},
+    ],
+    "realesrgan": [
+        {"file_name": "RealESRGAN_x4plus.pth", "model_id": "x4plus"},
+        {"file_name": "RealESRGAN_x4plus_anime_6B.pth", "model_id": "x4plus_anime_6"},
+    ],
+    "vae": [
+        {"file_name": "vae-ft-mse-840000-ema-pruned.ckpt", "model_id": "vae-ft-mse-840000-ema-pruned"},
     ],
-    "gfpgan": ["GFPGANv1.3"],
-    "realesrgan": ["RealESRGAN_x4plus"],
 }
 MODELS_TO_LOAD_ON_START = ["stable-diffusion", "vae", "hypernetwork", "lora"]
 
@@ -31,6 +50,8 @@ known_models = {}
 
 def init():
     make_model_folders()
+    migrate_legacy_model_location()  # if necessary
+    download_default_models_if_necessary()
     getModels()  # run this once, to cache the picklescan results
 
 
@@ -39,29 +60,42 @@ 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)
+        context.model_paths[model_type] = resolve_model_to_use(model_type=model_type, fail_if_not_found=False)
         try:
             load_model(
                 context,
                 model_type,
-                scan_model = context.model_paths[model_type] != None and not context.model_paths[model_type].endswith('.safetensors')
+                scan_model=context.model_paths[model_type] != None
+                and not context.model_paths[model_type].endswith(".safetensors"),
             )
+            if model_type in context.model_load_errors:
+                del context.model_load_errors[model_type]
         except Exception as e:
             log.error(f"[red]Error while loading {model_type} model: {context.model_paths[model_type]}[/red]")
-            log.exception(e)
+            if "DefaultCPUAllocator: not enough memory" in str(e):
+                log.error(
+                    f"[red]Your PC is low on system RAM. Please add some virtual memory (or swap space) by following the instructions at this link: https://www.ibm.com/docs/en/opw/8.2.0?topic=tuning-optional-increasing-paging-file-size-windows-computers[/red]"
+                )
+            else:
+                log.exception(e)
             del context.model_paths[model_type]
 
+            context.model_load_errors[model_type] = str(e)  # storing the entire Exception can lead to memory leaks
+
+
 def unload_all(context: Context):
     for model_type in KNOWN_MODEL_TYPES:
         unload_model(context, model_type)
+        if model_type in context.model_load_errors:
+            del context.model_load_errors[model_type]
 
 
-def resolve_model_to_use(model_name: str = None, model_type: str = None):
+def resolve_model_to_use(model_name: str = None, model_type: str = None, fail_if_not_found: bool = True):
     model_extensions = MODEL_EXTENSIONS.get(model_type, [])
     default_models = DEFAULT_MODELS.get(model_type, [])
     config = app.getConfig()
 
-    model_dirs = [os.path.join(app.MODELS_DIR, model_type), app.SD_DIR]
+    model_dir = os.path.join(app.MODELS_DIR, model_type)
     if not model_name:  # When None try user configured model.
         # config = getConfig()
         if "model" in config and model_type in config["model"]:
@@ -69,42 +103,42 @@ def resolve_model_to_use(model_name: str = None, model_type: str = None):
 
     if model_name:
         # Check models directory
-        models_dir_path = os.path.join(app.MODELS_DIR, model_type, model_name)
+        model_path = os.path.join(model_dir, model_name)
+        if os.path.exists(model_path):
+            return model_path
         for model_extension in model_extensions:
-            if os.path.exists(models_dir_path + model_extension):
+            if os.path.exists(model_path + model_extension):
-                return models_dir_path + model_extension
+                return model_path + model_extension
             if os.path.exists(model_name + model_extension):
                 return os.path.abspath(model_name + model_extension)
 
-    # Default locations
-    if model_name in default_models:
-        default_model_path = os.path.join(app.SD_DIR, model_name)
-        for model_extension in model_extensions:
-            if os.path.exists(default_model_path + model_extension):
-                return default_model_path + model_extension
-
     # Can't find requested model, check the default paths.
-    for default_model in default_models:
+    if model_type == "stable-diffusion" and not fail_if_not_found:
-        for model_dir in model_dirs:
+        for default_model in default_models:
-            default_model_path = os.path.join(model_dir, default_model)
+            default_model_path = os.path.join(model_dir, default_model["file_name"])
-            for model_extension in model_extensions:
+            if os.path.exists(default_model_path):
-                if os.path.exists(default_model_path + model_extension):
+                if model_name is not None:
-                    if model_name is not None:
+                    log.warn(
-                        log.warn(
+                        f"Could not find the configured custom model {model_name}. Using the default one: {default_model_path}"
-                            f"Could not find the configured custom model {model_name}{model_extension}. Using the default one: {default_model_path}{model_extension}"
+                    )
-                        )
+                return default_model_path
-                    return default_model_path + model_extension
 
-    return None
+    if model_name and fail_if_not_found:
+        raise Exception(f"Could not find the desired model {model_name}! Is it present in the {model_dir} folder?")
 
 
 def reload_models_if_necessary(context: Context, task_data: TaskData):
+    face_fix_lower = task_data.use_face_correction.lower() if task_data.use_face_correction else ""
+    upscale_lower = task_data.use_upscale.lower() if task_data.use_upscale else ""
+
     model_paths_in_req = {
         "stable-diffusion": task_data.use_stable_diffusion_model,
         "vae": task_data.use_vae_model,
         "hypernetwork": task_data.use_hypernetwork_model,
-        "gfpgan": task_data.use_face_correction,
+        "codeformer": task_data.use_face_correction if "codeformer" in face_fix_lower else None,
-        "realesrgan": task_data.use_upscale,
+        "gfpgan": task_data.use_face_correction if "gfpgan" in face_fix_lower else None,
+        "realesrgan": task_data.use_upscale if "realesrgan" in upscale_lower else None,
+        "latent_upscaler": True if "latent_upscaler" in upscale_lower else None,
         "nsfw_checker": True if task_data.block_nsfw else None,
         "lora": task_data.use_lora_model,
     }
@@ -114,14 +148,28 @@ def reload_models_if_necessary(context: Context, task_data: TaskData):
         if context.model_paths.get(model_type) != path
     }
 
-    if set_vram_optimizations(context):  # reload SD
+    if task_data.codeformer_upscale_faces:
+        if "realesrgan" not in models_to_reload and "realesrgan" not in context.models:
+            default_realesrgan = DEFAULT_MODELS["realesrgan"][0]["file_name"]
+            models_to_reload["realesrgan"] = resolve_model_to_use(default_realesrgan, "realesrgan")
+        elif "realesrgan" in models_to_reload and models_to_reload["realesrgan"] is None:
+            del models_to_reload["realesrgan"]  # don't unload realesrgan
+
+    if set_vram_optimizations(context) or set_clip_skip(context, task_data):  # reload SD
         models_to_reload["stable-diffusion"] = model_paths_in_req["stable-diffusion"]
 
     for model_type, model_path_in_req in models_to_reload.items():
         context.model_paths[model_type] = model_path_in_req
 
         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
+        try:
+            action_fn(context, model_type, scan_model=False)  # we've scanned them already
+            if model_type in context.model_load_errors:
+                del context.model_load_errors[model_type]
+        except Exception as e:
+            log.exception(e)
+            if action_fn == load_model:
+                context.model_load_errors[model_type] = str(e)  # storing the entire Exception can lead to memory leaks
 
 
 def resolve_model_paths(task_data: TaskData):
@@ -133,11 +181,49 @@ def resolve_model_paths(task_data: TaskData):
     task_data.use_lora_model = resolve_model_to_use(task_data.use_lora_model, model_type="lora")
 
     if task_data.use_face_correction:
-        task_data.use_face_correction = resolve_model_to_use(task_data.use_face_correction, "gfpgan")
+        if "gfpgan" in task_data.use_face_correction.lower():
-    if task_data.use_upscale:
+            model_type = "gfpgan"
+        elif "codeformer" in task_data.use_face_correction.lower():
+            model_type = "codeformer"
+            download_if_necessary("codeformer", "codeformer.pth", "codeformer-0.1.0")
+
+        task_data.use_face_correction = resolve_model_to_use(task_data.use_face_correction, model_type)
+    if task_data.use_upscale and "realesrgan" in task_data.use_upscale.lower():
         task_data.use_upscale = resolve_model_to_use(task_data.use_upscale, "realesrgan")
 
 
+def fail_if_models_did_not_load(context: Context):
+    for model_type in KNOWN_MODEL_TYPES:
+        if model_type in context.model_load_errors:
+            e = context.model_load_errors[model_type]
+            raise Exception(f"Could not load the {model_type} model! Reason: " + e)
+
+
+def download_default_models_if_necessary():
+    for model_type, models in DEFAULT_MODELS.items():
+        for model in models:
+            try:
+                download_if_necessary(model_type, model["file_name"], model["model_id"])
+            except:
+                traceback.print_exc()
+                app.fail_and_die(fail_type="model_download", data=model_type)
+
+        print(model_type, "model(s) found.")
+
+
+def download_if_necessary(model_type: str, file_name: str, model_id: str):
+    model_path = os.path.join(app.MODELS_DIR, model_type, file_name)
+    expected_hash = get_model_info_from_db(model_type=model_type, model_id=model_id)["quick_hash"]
+
+    other_models_exist = any_model_exists(model_type)
+    known_model_exists = os.path.exists(model_path)
+    known_model_is_corrupt = known_model_exists and hash_file_quick(model_path) != expected_hash
+
+    if known_model_is_corrupt or (not other_models_exist and not known_model_exists):
+        print("> download", model_type, model_id)
+        download_model(model_type, model_id, download_base_dir=app.MODELS_DIR)
+
+
 def set_vram_optimizations(context: Context):
     config = app.getConfig()
     vram_usage_level = config.get("vram_usage_level", "balanced")
@@ -149,6 +235,36 @@ def set_vram_optimizations(context: Context):
     return False
 
 
+def migrate_legacy_model_location():
+    'Move the models inside the legacy "stable-diffusion" folder, to their respective folders'
+
+    for model_type, models in DEFAULT_MODELS.items():
+        for model in models:
+            file_name = model["file_name"]
+            legacy_path = os.path.join(app.SD_DIR, file_name)
+            if os.path.exists(legacy_path):
+                shutil.move(legacy_path, os.path.join(app.MODELS_DIR, model_type, file_name))
+
+
+def any_model_exists(model_type: str) -> bool:
+    extensions = MODEL_EXTENSIONS.get(model_type, [])
+    for ext in extensions:
+        if any(glob(f"{app.MODELS_DIR}/{model_type}/**/*{ext}", recursive=True)):
+            return True
+
+    return False
+
+
+def set_clip_skip(context: Context, task_data: TaskData):
+    clip_skip = task_data.clip_skip
+
+    if clip_skip != context.clip_skip:
+        context.clip_skip = clip_skip
+        return True
+
+    return False
+
+
 def make_model_folders():
     for model_type in KNOWN_MODEL_TYPES:
         model_dir_path = os.path.join(app.MODELS_DIR, model_type)
@@ -170,13 +286,23 @@ def is_malicious_model(file_path):
         if scan_result.issues_count > 0 or scan_result.infected_files > 0:
             log.warn(
                 ":warning: [bold red]Scan %s: %d scanned, %d issue, %d infected.[/bold red]"
-                % (file_path, scan_result.scanned_files, scan_result.issues_count, scan_result.infected_files)
+                % (
+                    file_path,
+                    scan_result.scanned_files,
+                    scan_result.issues_count,
+                    scan_result.infected_files,
+                )
             )
             return True
         else:
             log.debug(
                 "Scan %s: [green]%d scanned, %d issue, %d infected.[/green]"
-                % (file_path, scan_result.scanned_files, scan_result.issues_count, scan_result.infected_files)
+                % (
+                    file_path,
+                    scan_result.scanned_files,
+                    scan_result.issues_count,
+                    scan_result.infected_files,
+                )
             )
             return False
     except Exception as e:
@@ -186,17 +312,12 @@ def is_malicious_model(file_path):
 
 def getModels():
     models = {
-        "active": {
-            "stable-diffusion": "sd-v1-4",
-            "vae": "",
-            "hypernetwork": "",
-            "lora": "",
-        },
         "options": {
             "stable-diffusion": ["sd-v1-4"],
             "vae": [],
             "hypernetwork": [],
             "lora": [],
+            "codeformer": ["codeformer"],
         },
     }
 
@@ -204,13 +325,13 @@ def getModels():
 
     class MaliciousModelException(Exception):
         "Raised when picklescan reports a problem with a model"
-        pass
 
     def scan_directory(directory, suffixes, directoriesFirst: bool = True):
         nonlocal models_scanned
         tree = []
         for entry in sorted(
-            os.scandir(directory), key=lambda entry: (entry.is_file() == directoriesFirst, entry.name.lower())
+            os.scandir(directory),
+            key=lambda entry: (entry.is_file() == directoriesFirst, entry.name.lower()),
         ):
             if entry.is_file():
                 matching_suffix = list(filter(lambda s: entry.name.endswith(s), suffixes))
@@ -257,9 +378,4 @@ def getModels():
     if models_scanned > 0:
         log.info(f"[green]Scanned {models_scanned} models. Nothing infected[/]")
 
-    # legacy
-    custom_weight_path = os.path.join(app.SD_DIR, "custom-model.ckpt")
-    if os.path.exists(custom_weight_path):
-        models["options"]["stable-diffusion"].append("custom-model")
-
     return models

ui/easydiffusion/renderer.py

@@ -1,21 +1,25 @@
-import queue
-import time
 import json
 import pprint
+import queue
+import time
 
 from easydiffusion import device_manager
-from easydiffusion.types import TaskData, Response, Image as ResponseImage, UserInitiatedStop, GenerateImageRequest
+from easydiffusion.types import GenerateImageRequest
-from easydiffusion.utils import get_printable_request, save_images_to_disk, log
+from easydiffusion.types import Image as ResponseImage
-
+from easydiffusion.types import Response, TaskData, UserInitiatedStop
+from easydiffusion.model_manager import DEFAULT_MODELS, resolve_model_to_use
+from easydiffusion.utils import get_printable_request, log, save_images_to_disk
 from sdkit import Context
-from sdkit.generate import generate_images
 from sdkit.filter import apply_filters
+from sdkit.generate import generate_images
+from sdkit.models import load_model
 from sdkit.utils import (
-    img_to_buffer,
-    img_to_base64_str,
-    latent_samples_to_images,
     diffusers_latent_samples_to_images,
     gc,
+    img_to_base64_str,
+    img_to_buffer,
+    latent_samples_to_images,
+    get_device_usage,
 )
 
 context = Context()  # thread-local
@@ -31,6 +35,8 @@ def init(device):
     context.stop_processing = False
     context.temp_images = {}
     context.partial_x_samples = None
+    context.model_load_errors = {}
+    context.enable_codeformer = True
 
     from easydiffusion import app
 
@@ -39,18 +45,29 @@ def init(device):
         app_config.get("test_diffusers", False) and app_config.get("update_branch", "main") != "main"
     )
 
+    log.info("Device usage during initialization:")
+    get_device_usage(device, log_info=True, process_usage_only=False)
+
     device_manager.device_init(context, device)
 
 
 def make_images(
-    req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback
+    req: GenerateImageRequest,
+    task_data: TaskData,
+    data_queue: queue.Queue,
+    task_temp_images: list,
+    step_callback,
 ):
     context.stop_processing = False
     print_task_info(req, task_data)
 
     images, seeds = make_images_internal(req, task_data, data_queue, task_temp_images, step_callback)
 
-    res = Response(req, task_data, images=construct_response(images, seeds, 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")
@@ -59,14 +76,18 @@ def make_images(
 
 
 def print_task_info(req: GenerateImageRequest, task_data: TaskData):
-    req_str = pprint.pformat(get_printable_request(req)).replace("[", "\[")
+    req_str = pprint.pformat(get_printable_request(req, task_data)).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
+    req: GenerateImageRequest,
+    task_data: TaskData,
+    data_queue: queue.Queue,
+    task_temp_images: list,
+    step_callback,
 ):
     images, user_stopped = generate_images_internal(
         req,
@@ -78,7 +99,7 @@ def make_images_internal(
         task_data.stream_image_progress_interval,
     )
     gc(context)
-    filtered_images = filter_images(task_data, images, user_stopped)
+    filtered_images = filter_images(req, task_data, images, user_stopped)
 
     if task_data.save_to_disk_path is not None:
         save_images_to_disk(images, filtered_images, req, task_data)
@@ -134,28 +155,66 @@ def generate_images_internal(
     return images, user_stopped
 
 
-def filter_images(task_data: TaskData, images: list, user_stopped):
+def filter_images(req: GenerateImageRequest, task_data: TaskData, images: list, user_stopped):
     if user_stopped:
         return images
 
-    filters_to_apply = []
     if task_data.block_nsfw:
-        filters_to_apply.append("nsfw_checker")
+        images = apply_filters(context, "nsfw_checker", images)
-    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")
 
-    if len(filters_to_apply) == 0:
+    if task_data.use_face_correction and "codeformer" in task_data.use_face_correction.lower():
-        return images
+        default_realesrgan = DEFAULT_MODELS["realesrgan"][0]["file_name"]
+        prev_realesrgan_path = None
+        if task_data.codeformer_upscale_faces and default_realesrgan not in context.model_paths["realesrgan"]:
+            prev_realesrgan_path = context.model_paths["realesrgan"]
+            context.model_paths["realesrgan"] = resolve_model_to_use(default_realesrgan, "realesrgan")
+            load_model(context, "realesrgan")
 
-    return apply_filters(context, filters_to_apply, images, scale=task_data.upscale_amount)
+        try:
+            images = apply_filters(
+                context,
+                "codeformer",
+                images,
+                upscale_faces=task_data.codeformer_upscale_faces,
+                codeformer_fidelity=task_data.codeformer_fidelity,
+            )
+        finally:
+            if prev_realesrgan_path:
+                context.model_paths["realesrgan"] = prev_realesrgan_path
+                load_model(context, "realesrgan")
+    elif task_data.use_face_correction and "gfpgan" in task_data.use_face_correction.lower():
+        images = apply_filters(context, "gfpgan", images)
+
+    if task_data.use_upscale:
+        if "realesrgan" in task_data.use_upscale.lower():
+            images = apply_filters(context, "realesrgan", images, scale=task_data.upscale_amount)
+        elif task_data.use_upscale == "latent_upscaler":
+            images = apply_filters(
+                context,
+                "latent_upscaler",
+                images,
+                scale=task_data.upscale_amount,
+                latent_upscaler_options={
+                    "prompt": req.prompt,
+                    "negative_prompt": req.negative_prompt,
+                    "seed": req.seed,
+                    "num_inference_steps": task_data.latent_upscaler_steps,
+                    "guidance_scale": 0,
+                },
+            )
+
+    return images
 
 
 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, task_data.output_lossless),
+            data=img_to_base64_str(
+                img,
+                task_data.output_format,
+                task_data.output_quality,
+                task_data.output_lossless,
+            ),
             seed=seed,
         )
         for img, seed in zip(images, seeds)

ui/easydiffusion/server.py

@@ -2,28 +2,31 @@
 Notes:
     async endpoints always run on the main thread. Without they run on the thread pool.
 """
+import datetime
+import mimetypes
 import os
 import traceback
-import datetime
 from typing import List, Union
 
+from easydiffusion import app, model_manager, task_manager
+from easydiffusion.types import GenerateImageRequest, MergeRequest, TaskData
+from easydiffusion.utils import log
 from fastapi import FastAPI, HTTPException
 from fastapi.staticfiles import StaticFiles
-from starlette.responses import FileResponse, JSONResponse, StreamingResponse
 from pydantic import BaseModel, Extra
-
+from starlette.responses import FileResponse, JSONResponse, StreamingResponse
-from easydiffusion import app, model_manager, task_manager
+from pycloudflared import try_cloudflare
-from easydiffusion.types import TaskData, GenerateImageRequest, MergeRequest
-from easydiffusion.utils import log
-
-import mimetypes
 
 log.info(f"started in {app.SD_DIR}")
 log.info(f"started at {datetime.datetime.now():%x %X}")
 
 server_api = FastAPI()
 
-NOCACHE_HEADERS = {"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
+NOCACHE_HEADERS = {
+    "Cache-Control": "no-cache, no-store, must-revalidate",
+    "Pragma": "no-cache",
+    "Expires": "0",
+}
 
 
 class NoCacheStaticFiles(StaticFiles):
@@ -65,11 +68,17 @@ def init():
             name="custom-thumbnails",
         )
 
-    server_api.mount("/media", NoCacheStaticFiles(directory=os.path.join(app.SD_UI_DIR, "media")), name="media")
+    server_api.mount(
+        "/media",
+        NoCacheStaticFiles(directory=os.path.join(app.SD_UI_DIR, "media")),
+        name="media",
+    )
 
     for plugins_dir, dir_prefix in app.UI_PLUGINS_SOURCES:
         server_api.mount(
-            f"/plugins/{dir_prefix}", NoCacheStaticFiles(directory=plugins_dir), name=f"plugins-{dir_prefix}"
+            f"/plugins/{dir_prefix}",
+            NoCacheStaticFiles(directory=plugins_dir),
+            name=f"plugins-{dir_prefix}",
         )
 
     @server_api.post("/app_config")
@@ -105,6 +114,14 @@ def init():
     def get_image(task_id: int, img_id: int):
         return get_image_internal(task_id, img_id)
 
+    @server_api.post("/tunnel/cloudflare/start")
+    def start_cloudflare_tunnel(req: dict):
+        return start_cloudflare_tunnel_internal(req)
+
+    @server_api.post("/tunnel/cloudflare/stop")
+    def stop_cloudflare_tunnel(req: dict):
+        return stop_cloudflare_tunnel_internal(req)
+
     @server_api.get("/")
     def read_root():
         return FileResponse(os.path.join(app.SD_UI_DIR, "index.html"), headers=NOCACHE_HEADERS)
@@ -203,6 +220,8 @@ def ping_internal(session_id: str = None):
         session = task_manager.get_cached_session(session_id, update_ttl=True)
         response["tasks"] = {id(t): t.status for t in session.tasks}
     response["devices"] = task_manager.get_devices()
+    if cloudflare.address != None:
+        response["cloudflare"] = cloudflare.address
     return JSONResponse(response, headers=NOCACHE_HEADERS)
 
 
@@ -246,8 +265,8 @@ def render_internal(req: dict):
 
 def model_merge_internal(req: dict):
     try:
-        from sdkit.train import merge_models
         from easydiffusion.utils.save_utils import filename_regex
+        from sdkit.train import merge_models
 
         mergeReq: MergeRequest = MergeRequest.parse_obj(req)
 
@@ -255,7 +274,11 @@ def model_merge_internal(req: dict):
             model_manager.resolve_model_to_use(mergeReq.model0, "stable-diffusion"),
             model_manager.resolve_model_to_use(mergeReq.model1, "stable-diffusion"),
             mergeReq.ratio,
-            os.path.join(app.MODELS_DIR, "stable-diffusion", filename_regex.sub("_", mergeReq.out_path)),
+            os.path.join(
+                app.MODELS_DIR,
+                "stable-diffusion",
+                filename_regex.sub("_", mergeReq.out_path),
+            ),
             mergeReq.use_fp16,
         )
         return JSONResponse({"status": "OK"}, headers=NOCACHE_HEADERS)
@@ -310,3 +333,47 @@ def get_image_internal(task_id: int, img_id: int):
         return StreamingResponse(img_data, media_type="image/jpeg")
     except KeyError as e:
         raise HTTPException(status_code=500, detail=str(e))
+
+#---- Cloudflare Tunnel ----
+class CloudflareTunnel:
+    def __init__(self):
+        config = app.getConfig()
+        self.urls = None
+        self.port = config.get("net", {}).get("listen_port")
+
+    def start(self):
+        if self.port:
+            self.urls = try_cloudflare(self.port)
+
+    def stop(self):
+        if self.urls:
+            try_cloudflare.terminate(self.port)
+            self.urls = None
+
+    @property
+    def address(self):
+        if self.urls:
+            return self.urls.tunnel
+        else:
+            return None
+
+cloudflare = CloudflareTunnel()
+
+def start_cloudflare_tunnel_internal(req: dict):
+   try:
+      cloudflare.start()
+      log.info(f"- Started cloudflare tunnel. Using address: {cloudflare.address}")
+      return JSONResponse({"address":cloudflare.address})
+   except Exception as e:
+      log.error(str(e))
+      log.error(traceback.format_exc())
+      return HTTPException(status_code=500, detail=str(e))
+
+def stop_cloudflare_tunnel_internal(req: dict):
+   try:
+      cloudflare.stop()
+   except Exception as e:
+      log.error(str(e))
+      log.error(traceback.format_exc())
+      return HTTPException(status_code=500, detail=str(e))
+

ui/easydiffusion/task_manager.py

@@ -7,16 +7,18 @@ Notes:
 import json
 import traceback
 
-TASK_TTL = 15 * 60  # seconds, Discard last session's task timeout
+TASK_TTL = 30 * 60  # seconds, Discard last session's task timeout
 
-import torch
+import queue
-import queue, threading, time, weakref
+import threading
+import time
+import weakref
 from typing import Any, Hashable
 
+import torch
 from easydiffusion import device_manager
-from easydiffusion.types import TaskData, GenerateImageRequest
+from easydiffusion.types import GenerateImageRequest, TaskData
 from easydiffusion.utils import log
-
 from sdkit.utils import gc
 
 THREAD_NAME_PREFIX = ""
@@ -167,7 +169,7 @@ class DataCache:
             raise Exception("DataCache.put" + ERR_LOCK_FAILED)
         try:
             self._base[key] = (self._get_ttl_time(ttl), value)
-        except Exception as e:
+        except Exception:
             log.error(traceback.format_exc())
             return False
         else:
@@ -264,7 +266,7 @@ def thread_get_next_task():
 def thread_render(device):
     global current_state, current_state_error
 
-    from easydiffusion import renderer, model_manager
+    from easydiffusion import model_manager, renderer
 
     try:
         renderer.init(device)
@@ -334,10 +336,15 @@ def thread_render(device):
             current_state = ServerStates.LoadingModel
             model_manager.resolve_model_paths(task.task_data)
             model_manager.reload_models_if_necessary(renderer.context, task.task_data)
+            model_manager.fail_if_models_did_not_load(renderer.context)
 
             current_state = ServerStates.Rendering
             task.response = renderer.make_images(
-                task.render_request, task.task_data, task.buffer_queue, task.temp_images, step_callback
+                task.render_request,
+                task.task_data,
+                task.buffer_queue,
+                task.temp_images,
+                step_callback,
             )
             # Before looping back to the generator, mark cache as still alive.
             task_cache.keep(id(task), TASK_TTL)

ui/easydiffusion/types.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel
 from typing import Any
 
+from pydantic import BaseModel
+
 
 class GenerateImageRequest(BaseModel):
     prompt: str = ""
@@ -22,6 +23,7 @@ class GenerateImageRequest(BaseModel):
     sampler_name: str = None  # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms"
     hypernetwork_strength: float = 0
     lora_alpha: float = 0
+    tiling: str = "none"  # "none", "x", "y", "xy"
 
 
 class TaskData(BaseModel):
@@ -31,8 +33,9 @@ class TaskData(BaseModel):
     vram_usage_level: str = "balanced"  # or "low" or "medium"
 
     use_face_correction: str = None  # or "GFPGANv1.3"
-    use_upscale: str = None  # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B"
+    use_upscale: str = None  # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B" or "latent_upscaler"
     upscale_amount: int = 4  # or 2
+    latent_upscaler_steps: int = 10
     use_stable_diffusion_model: str = "sd-v1-4"
     # use_stable_diffusion_config: str = "v1-inference"
     use_vae_model: str = None
@@ -47,6 +50,9 @@ class TaskData(BaseModel):
     metadata_output_format: str = "txt"  # or "json"
     stream_image_progress: bool = False
     stream_image_progress_interval: int = 5
+    clip_skip: bool = False
+    codeformer_upscale_faces: bool = False
+    codeformer_fidelity: float = 0.5
 
 
 class MergeRequest(BaseModel):

ui/easydiffusion/utils/save_utils.py

@@ -1,14 +1,13 @@
 import os
-import time
 import re
+import time
+from datetime import datetime
+from functools import reduce
 
 from easydiffusion import app
-from easydiffusion.types import TaskData, GenerateImageRequest
+from easydiffusion.types import GenerateImageRequest, TaskData
-from functools import reduce
-from datetime import datetime
-
-from sdkit.utils import save_images, save_dicts
 from numpy import base_repr
+from sdkit.utils import save_dicts, save_images
 
 filename_regex = re.compile("[^a-zA-Z0-9._-]")
 img_number_regex = re.compile("([0-9]{5,})")
@@ -16,23 +15,26 @@ img_number_regex = re.compile("([0-9]{5,})")
 # keep in sync with `ui/media/js/dnd.js`
 TASK_TEXT_MAPPING = {
     "prompt": "Prompt",
+    "negative_prompt": "Negative Prompt",
+    "seed": "Seed",
+    "use_stable_diffusion_model": "Stable Diffusion model",
+    "clip_skip": "Clip Skip",
+    "use_vae_model": "VAE model",
+    "sampler_name": "Sampler",
     "width": "Width",
     "height": "Height",
-    "seed": "Seed",
     "num_inference_steps": "Steps",
     "guidance_scale": "Guidance Scale",
     "prompt_strength": "Prompt Strength",
+    "use_lora_model": "LoRA model",
+    "lora_alpha": "LoRA Strength",
+    "use_hypernetwork_model": "Hypernetwork model",
+    "hypernetwork_strength": "Hypernetwork Strength",
+    "tiling": "Seamless Tiling",
     "use_face_correction": "Use Face Correction",
     "use_upscale": "Use Upscaling",
     "upscale_amount": "Upscale By",
-    "sampler_name": "Sampler",
+    "latent_upscaler_steps": "Latent Upscaler Steps"
-    "negative_prompt": "Negative Prompt",
-    "use_stable_diffusion_model": "Stable Diffusion model",
-    "use_vae_model": "VAE model",
-    "use_hypernetwork_model": "Hypernetwork model",
-    "hypernetwork_strength": "Hypernetwork Strength",
-    "use_lora_model": "LoRA model",
-    "lora_alpha": "LoRA Strength",
 }
 
 time_placeholders = {
@@ -50,6 +52,7 @@ other_placeholders = {
     "$s": lambda req, task_data: str(req.seed),
 }
 
+
 class ImageNumber:
     _factory = None
     _evaluated = False
@@ -57,12 +60,14 @@ class ImageNumber:
     def __init__(self, factory):
         self._factory = factory
         self._evaluated = None
+
     def __call__(self) -> int:
         if self._evaluated is None:
             self._evaluated = self._factory()
         return self._evaluated
 
-def format_placeholders(format: str, req: GenerateImageRequest, task_data: TaskData, now = None):
+
+def format_placeholders(format: str, req: GenerateImageRequest, task_data: TaskData, now=None):
     if now is None:
         now = time.time()
 
@@ -75,10 +80,12 @@ def format_placeholders(format: str, req: GenerateImageRequest, task_data: TaskD
 
     return format
 
+
 def format_folder_name(format: str, req: GenerateImageRequest, task_data: TaskData):
     format = format_placeholders(format, req, task_data)
     return filename_regex.sub("_", format)
 
+
 def format_file_name(
     format: str,
     req: GenerateImageRequest,
@@ -88,19 +95,22 @@ def format_file_name(
     folder_img_number: ImageNumber,
 ):
     format = format_placeholders(format, req, task_data, now)
-    
+
     if "$n" in format:
         format = format.replace("$n", f"{folder_img_number():05}")
-    
+
     if "$tsb64" in format:
-        img_id = base_repr(int(now * 10000), 36)[-7:] + base_repr(int(batch_file_number), 36) # Base 36 conversion, 0-9, A-Z
+        img_id = base_repr(int(now * 10000), 36)[-7:] + base_repr(
+            int(batch_file_number), 36
+        )  # Base 36 conversion, 0-9, A-Z
         format = format.replace("$tsb64", img_id)
-    
+
     if "$ts" in format:
         format = format.replace("$ts", str(int(now * 1000) + batch_file_number))
 
     return filename_regex.sub("_", format)
 
+
 def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData):
     now = time.time()
     app_config = app.getConfig()
@@ -126,7 +136,7 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             output_lossless=task_data.output_lossless,
         )
         if task_data.metadata_output_format:
-            for metadata_output_format in task_data.metadata_output_format.split(','):
+            for metadata_output_format in task_data.metadata_output_format.split(","):
                 if metadata_output_format.lower() in ["json", "txt", "embed"]:
                     save_dicts(
                         metadata_entries,
@@ -142,7 +152,8 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             task_data,
             file_number,
             now=now,
-            suffix="filtered")
+            suffix="filtered",
+        )
 
         save_images(
             images,
@@ -160,41 +171,23 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             output_quality=task_data.output_quality,
             output_lossless=task_data.output_lossless,
         )
-        if task_data.metadata_output_format.lower() in ["json", "txt", "embed"]:
+        if task_data.metadata_output_format:
-            save_dicts(
+            for metadata_output_format in task_data.metadata_output_format.split(","):
-                metadata_entries,
+                if metadata_output_format.lower() in ["json", "txt", "embed"]:
-                save_dir_path,
+                    save_dicts(
-                file_name=make_filter_filename,
+                        metadata_entries,
-                output_format=task_data.metadata_output_format,
+                        save_dir_path,
-                file_format=task_data.output_format,
+                        file_name=make_filter_filename,
-            )
+                        output_format=task_data.metadata_output_format,
+                        file_format=task_data.output_format,
+                    )
 
 
 def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskData):
-    metadata = get_printable_request(req)
+    metadata = get_printable_request(req, task_data)
-    metadata.update(
-        {
-            "use_stable_diffusion_model": task_data.use_stable_diffusion_model,
-            "use_vae_model": task_data.use_vae_model,
-            "use_hypernetwork_model": task_data.use_hypernetwork_model,
-            "use_lora_model": task_data.use_lora_model,
-            "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 task_data.use_hypernetwork_model is None:
-        del metadata["hypernetwork_strength"]
-    if task_data.use_lora_model is None:
-        if "lora_alpha" in metadata:
-            del metadata["lora_alpha"]
-        app_config = app.getConfig()
-        if not app_config.get("test_diffusers", False) and "use_lora_model" in metadata:
-            del metadata["use_lora_model"]
 
     # if text, format it in the text format expected by the UI
-    is_txt_format = task_data.metadata_output_format.lower() == "txt"
+    is_txt_format = task_data.metadata_output_format and "txt" in task_data.metadata_output_format.lower().split(",")
     if is_txt_format:
         metadata = {TASK_TEXT_MAPPING[key]: val for key, val in metadata.items() if key in TASK_TEXT_MAPPING}
 
@@ -205,12 +198,35 @@ def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskD
     return entries
 
 
-def get_printable_request(req: GenerateImageRequest):
+def get_printable_request(req: GenerateImageRequest, task_data: TaskData):
-    metadata = req.dict()
+    req_metadata = req.dict()
-    del metadata["init_image"]
+    task_data_metadata = task_data.dict()
-    del metadata["init_image_mask"]
+
-    if req.init_image is None:
+    # Save the metadata in the order defined in TASK_TEXT_MAPPING
+    metadata = {}
+    for key in TASK_TEXT_MAPPING.keys():
+        if key in req_metadata:
+            metadata[key] = req_metadata[key]
+        elif key in task_data_metadata:
+            metadata[key] = task_data_metadata[key]
+    
+    # Clean up the metadata
+    if req.init_image is None and "prompt_strength" in metadata:
         del metadata["prompt_strength"]
+    if task_data.use_upscale is None and "upscale_amount" in metadata:
+        del metadata["upscale_amount"]
+    if task_data.use_hypernetwork_model is None and "hypernetwork_strength" in metadata:
+        del metadata["hypernetwork_strength"]
+    if task_data.use_lora_model is None and "lora_alpha" in metadata:
+        del metadata["lora_alpha"]
+    if task_data.use_upscale != "latent_upscaler" and "latent_upscaler_steps" in metadata:
+        del metadata["latent_upscaler_steps"]
+
+    app_config = app.getConfig()
+    if not app_config.get("test_diffusers", False):
+        for key in (x for x in ["use_lora_model", "lora_alpha", "clip_skip", "tiling", "latent_upscaler_steps"] if x in metadata):
+            del metadata[key]
+
     return metadata
 
 
@@ -233,27 +249,28 @@ def make_filename_callback(
 
     return make_filename
 
+
 def _calculate_img_number(save_dir_path: str, task_data: TaskData):
     def get_highest_img_number(accumulator: int, file: os.DirEntry) -> int:
         if not file.is_file:
             return accumulator
-        
+
         if len(list(filter(lambda e: file.name.endswith(e), app.IMAGE_EXTENSIONS))) == 0:
             return accumulator
-        
+
         get_highest_img_number.number_of_images = get_highest_img_number.number_of_images + 1
-        
+
         number_match = img_number_regex.match(file.name)
         if not number_match:
             return accumulator
-        
+
-        file_number = number_match.group().lstrip('0')
+        file_number = number_match.group().lstrip("0")
-        
+
         # Handle 00000
         return int(file_number) if file_number else 0
-    
+
     get_highest_img_number.number_of_images = 0
-    
+
     highest_file_number = -1
 
     if os.path.isdir(save_dir_path):
@@ -267,13 +284,15 @@ def _calculate_img_number(save_dir_path: str, task_data: TaskData):
             _calculate_img_number.session_img_numbers[task_data.session_id],
             calculated_img_number,
         )
-    
+
     calculated_img_number = calculated_img_number + 1
-    
+
     _calculate_img_number.session_img_numbers[task_data.session_id] = calculated_img_number
     return calculated_img_number
 
+
 _calculate_img_number.session_img_numbers = {}
 
+
 def calculate_img_number(save_dir_path: str, task_data: TaskData):
     return ImageNumber(lambda: _calculate_img_number(save_dir_path, task_data))

ui/index.html

@@ -30,7 +30,7 @@
             <h1>
                 <img id="logo_img" src="/media/images/icon-512x512.png" >
                 Easy Diffusion
-                <small>v2.5.34 <span id="updateBranchLabel"></span></small>
+                <small>v2.5.41 <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">
@@ -135,11 +135,14 @@
                         <button id="reload-models" class="secondaryButton reloadModels"><i class='fa-solid fa-rotate'></i></button>
                         <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Custom-Models" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about custom models</span></i></a>
                     </td></tr>
-                    <!-- <tr id="modelConfigSelection" class="pl-5"><td><label for="model_config">Model Config:</i></label></td><td>
+                    <tr class="pl-5 displayNone" id="clip_skip_config">
-                        <select id="model_config" name="model_config">
+                        <td><label for="clip_skip">Clip Skip:</label></td>
-                        </select>
+                        <td>
-                    </td></tr> -->
+                            <input id="clip_skip" name="clip_skip" type="checkbox">
-                    <tr class="pl-5"><td><label for="vae_model">Custom VAE:</i></label></td><td>
+                            <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Clip-Skip" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Clip Skip</span></i></a>
+                        </td>
+                    </tr>
+                    <tr class="pl-5"><td><label for="vae_model">Custom VAE:</label></td><td>
                         <input id="vae_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
                         <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about VAEs</span></i></a>
                     </td></tr>
@@ -154,16 +157,18 @@
                             <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">DPM++ 2s Ancestral (Karras)</option>
+                            <option value="dpmpp_2s_a" class="k_diffusion-only">DPM++ 2s Ancestral (Karras)</option>
                             <option value="dpmpp_2m">DPM++ 2m (Karras)</option>
-                            <option value="dpmpp_sde">DPM++ SDE (Karras)</option>
+                            <option value="dpmpp_sde" class="k_diffusion-only">DPM++ SDE (Karras)</option>
-                            <option value="dpm_fast">DPM Fast (Karras)</option>
+                            <option value="dpm_fast" class="k_diffusion-only">DPM Fast (Karras)</option>
-                            <option value="dpm_adaptive">DPM Adaptive (Karras)</option>
+                            <option value="dpm_adaptive" class="k_diffusion-only">DPM Adaptive (Karras)</option>
-                            <option value="unipc_snr">UniPC SNR</option>
+                            <option value="ddpm" class="diffusers-only">DDPM</option>
+                            <option value="deis" class="diffusers-only">DEIS</option>
+                            <option value="unipc_snr" class="k_diffusion-only">UniPC SNR</option>
                             <option value="unipc_tu">UniPC TU</option>
-                            <option value="unipc_snr_2">UniPC SNR 2</option>
+                            <option value="unipc_snr_2" class="k_diffusion-only">UniPC SNR 2</option>
-                            <option value="unipc_tu_2">UniPC TU 2</option>
+                            <option value="unipc_tu_2" class="k_diffusion-only">UniPC TU 2</option>
-                            <option value="unipc_tq">UniPC TQ</option>
+                            <option value="unipc_tq" class="k_diffusion-only">UniPC TQ</option>
                         </select>
                         <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use#samplers" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about samplers</span></i></a>
                     </td></tr>
@@ -217,20 +222,32 @@
                     <tr class="pl-5"><td><label for="num_inference_steps">Inference Steps:</label></td><td> <input id="num_inference_steps" name="num_inference_steps" size="4" value="25" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="11" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr id="prompt_strength_container" class="pl-5"><td><label for="prompt_strength_slider">Prompt Strength:</label></td><td> <input id="prompt_strength_slider" name="prompt_strength_slider" class="editor-slider" value="80" type="range" min="0" max="99"> <input id="prompt_strength" name="prompt_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td></tr>
-                    <tr id="lora_model_container" class="pl-5"><td><label for="lora_model">LoRA:</i></label></td><td>
+                    <tr id="lora_model_container" class="pl-5"><td><label for="lora_model">LoRA:</label></td><td>
                         <input id="lora_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
                     </td></tr>
                     <tr id="lora_alpha_container" class="pl-5">
                         <td><label for="lora_alpha_slider">LoRA Strength:</label></td>
-                        <td> <input id="lora_alpha_slider" name="lora_alpha_slider" class="editor-slider" value="50" type="range" min="0" max="100"> <input id="lora_alpha" name="lora_alpha" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td>
+                        <td>
+                            <small>-2</small> <input id="lora_alpha_slider" name="lora_alpha_slider" class="editor-slider" value="50" type="range" min="-200" max="200"> <small>2</small> &nbsp;
+                            <input id="lora_alpha" name="lora_alpha" size="4" pattern="^-?[0-9]*\.?[0-9]*$" onkeypress="preventNonNumericalInput(event)"><br/>
+                        </td>
                     </tr>
-                    <tr class="pl-5"><td><label for="hypernetwork_model">Hypernetwork:</i></label></td><td>
+                    <tr class="pl-5"><td><label for="hypernetwork_model">Hypernetwork:</label></td><td>
                         <input id="hypernetwork_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
                     </td></tr>
                     <tr id="hypernetwork_strength_container" class="pl-5">
                         <td><label for="hypernetwork_strength_slider">Hypernetwork Strength:</label></td>
                         <td> <input id="hypernetwork_strength_slider" name="hypernetwork_strength_slider" class="editor-slider" value="100" type="range" min="0" max="100"> <input id="hypernetwork_strength" name="hypernetwork_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td>
                     </tr>
+                    <tr id="tiling_container" class="pl-5"><td><label for="tiling">Seamless Tiling:</label></td><td>
+                        <select id="tiling" name="tiling">
+                            <option value="none" selected>None</option>
+                            <option value="x">Horizontal</option>
+                            <option value="y">Vertical</option>
+                            <option value="xy">Both</option>
+                        </select>
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Seamless-Tiling" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Seamless Tiling</span></i></a>
+                    </td></tr>
                     <tr class="pl-5"><td><label for="output_format">Output Format:</label></td><td>
                         <select id="output_format" name="output_format">
                             <option value="jpeg" selected>jpeg</option>
@@ -238,7 +255,7 @@
                             <option value="webp">webp</option>
                         </select>
                         <span id="output_lossless_container" class="displayNone">
-                            <input id="output_lossless" name="output_lossless" type="checkbox"><label for="output_lossless">Lossless</label></td></tr>
+                            <input id="output_lossless" name="output_lossless" type="checkbox"><label for="output_lossless">Lossless</label>
                         </span>
                     </td></tr>
                     <tr class="pl-5" id="output_quality_row"><td><label for="output_quality">Image Quality:</label></td><td>
@@ -249,18 +266,28 @@
                     <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 class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox"> <label for="use_face_correction">Fix incorrect faces and eyes</label> <div style="display:inline-block;"><input id="gfpgan_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" /></div></li>
+                    <li class="pl-5" id="use_face_correction_container">
+                        <input id="use_face_correction" name="use_face_correction" type="checkbox"> <label for="use_face_correction">Fix incorrect faces and eyes</label> <div style="display:inline-block;"><input id="gfpgan_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" /></div>
+                        <table id="codeformer_settings" class="displayNone sub-settings">
+                            <tr class="pl-5"><td><label for="codeformer_fidelity_slider">Strength:</label></td><td><input id="codeformer_fidelity_slider" name="codeformer_fidelity_slider" class="editor-slider" value="5" type="range" min="0" max="10"> <input id="codeformer_fidelity" name="codeformer_fidelity" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
+                            <tr class="pl-5"><td><label for="codeformer_upscale_faces">Upscale Faces:</label></td><td><input id="codeformer_upscale_faces" name="codeformer_upscale_faces" type="checkbox" checked> <label><small>(improves the resolution of faces)</small></label></td></tr>
+                        </table>
+                    </li>
                     <li class="pl-5">
                         <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 id="upscale_amount_2x" value="2">2x</option>
-                            <option value="4" selected>4x</option>
+                            <option id="upscale_amount_4x" 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>
+                            <option value="latent_upscaler">Latent Upscaler 2x</option>
                         </select>
+                        <table id="latent_upscaler_settings" class="displayNone sub-settings">
+                            <tr class="pl-5"><td><label for="latent_upscaler_steps_slider">Upscaling Steps:</label></td><td><input id="latent_upscaler_steps_slider" name="latent_upscaler_steps_slider" class="editor-slider" value="10" type="range" min="1" max="50"> <input id="latent_upscaler_steps" name="latent_upscaler_steps" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
+                        </table>
                     </li>
                     <li class="pl-5"><input id="show_only_filtered_image" name="show_only_filtered_image" type="checkbox" checked> <label for="show_only_filtered_image">Show only the corrected/upscaled image</label></li>
                     </ul></div>
@@ -338,10 +365,16 @@
         <div id="tab-content-settings" class="tab-content">
             <div id="system-settings" class="tab-content-inner">
                 <h1>System Settings</h1>
-                <div class="parameters-table"></div>
+                <div class="parameters-table" id="system-settings-table"></div>
                 <br/>
                 <button id="save-system-settings-btn" class="primaryButton">Save</button>
                 <br/><br/>
+                <div id="share-easy-diffusion">
+                   <h3><i class="fa fa-user-group"></i> Share Easy Diffusion</h3>
+                   <div class="parameters-table" id="system-settings-network-table">
+                   </div>
+                </div>
+                <br/><br/>
                 <div>
                     <h3><i class="fa fa-microchip icon"></i> System Info</h3>
                     <div id="system-info">
@@ -516,7 +549,8 @@ async function init() {
     SD.init({
         events: {
             statusChange: setServerStatus,
-            idle: onIdle
+            idle: onIdle,
+            ping: tunnelUpdate
         }
     })
 

ui/media/css/auto-save.css

@@ -69,13 +69,15 @@
 }
 
 .parameters-table > div:first-child {
-    border-radius: 12px 12px 0px 0px;
+    border-top-left-radius: 12px;
+    border-top-right-radius: 12px;
 }
 
 .parameters-table > div:last-child {
-    border-radius: 0px 0px 12px 12px;
+    border-bottom-left-radius: 12px;
+    border-bottom-right-radius: 12px;
 }
 
 .parameters-table .fa-fire {
     color: #F7630C;
-}
+}

ui/media/css/image-editor.css

@@ -96,7 +96,7 @@
 
 .editor-controls-center {
 	/* background: var(--background-color2); */
-	flex: 1;
+	flex: 0;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -105,6 +105,8 @@
 .editor-controls-center > div {
 	position: relative;
 	background: black;
+	margin: 20pt;
+	margin-top: 40pt;
 }
 
 .editor-controls-center canvas {
@@ -164,8 +166,10 @@
 	margin: var(--popup-margin);
 	padding: var(--popup-padding);
 	min-height: calc(99h - (2 * var(--popup-margin)));
-	max-width: none;
+	max-width: fit-content;
 	min-width: fit-content;
+	margin-left: auto;
+	margin-right: auto;
 }
 
 .image-editor-popup h1 {

ui/media/css/image-modal.css

@@ -70,6 +70,14 @@
     max-height: calc(100vh - (var(--popup-padding) * 2) - 4px);
 }
 
+#viewFullSizeImgModal img:not(.natural-zoom) {
+    cursor: grab;
+}
+
+#viewFullSizeImgModal .grabbing img:not(.natural-zoom) {
+    cursor: grabbing;
+}
+
 #viewFullSizeImgModal .content > div::-webkit-scrollbar-track, #viewFullSizeImgModal .content > div::-webkit-scrollbar-corner {
     background: rgba(0, 0, 0, .5)
 }

ui/media/css/main.css

@@ -1302,3 +1302,83 @@ body.wait-pause {
 .displayNone {
     display:none !important;
 }
+
+.sub-settings {
+    padding-top: 3pt;
+    padding-bottom: 3pt;
+    padding-left: 5pt;
+}
+
+#cloudflare-address {
+    background-color: var(--background-color3);
+    padding: 6px;
+    border-radius: var(--input-border-radius);
+    border: var(--input-border-size) solid var(--input-border-color);
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    display: inline-block;
+}
+
+#copy-cloudflare-address {
+    padding: 4px 8px;
+    margin-left: 0.5em;
+}
+
+.expandedSettingRow {
+    background: var(--background-color1);
+    width: 95%;
+    border-radius: 4pt;
+    margin-top: 5pt;
+    margin-bottom: 3pt;
+}
+
+/* TOAST NOTIFICATIONS */
+.toast-notification {
+    position: fixed;
+    bottom: 10px;
+    right: -300px;
+    width: 300px;
+    background-color: #333;
+    color: #fff;
+    padding: 10px 20px;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+    z-index: 9999;
+    animation: slideInRight 0.5s ease forwards;
+    transition: bottom 0.5s ease; /* Add a transition to smoothly reposition the toasts */
+}
+
+.toast-notification-error {
+    color: red;
+}
+
+@keyframes slideInRight {
+    from {
+        right: -300px;
+    }
+    to {
+        right: 10px;
+    }
+}
+
+.toast-notification.hide {
+    animation: slideOutRight 0.5s ease forwards;
+}
+
+@keyframes slideOutRight {
+    from {
+        right: 10px;
+    }
+    to {
+        right: -300px;
+    }
+}
+
+@keyframes slideDown {
+    from {
+        bottom: 10px;
+    }
+    to {
+        bottom: 0;
+    }
+}

ui/media/css/searchable-models.css

@@ -58,7 +58,7 @@
     font-size: 10pt;
     font-weight: normal;
     transition: none;
-    transition:property: none;
+    transition-property: none;
     cursor: default;
 }
 

ui/media/css/themes.css

@@ -33,7 +33,7 @@
     --input-height: 18px;
 	--tertiary-background-color: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) + (2 * var(--value-step))));
     --tertiary-border-color: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) + (3 * var(--value-step))));
-    --tertiary-color: var(--input-text-color)
+    --tertiary-color: var(--input-text-color);
 
     /* Main theme color, hex color fallback. */
     --theme-color-fallback: #673AB6;

ui/media/js/auto-save.js

@@ -13,6 +13,7 @@ const SETTINGS_IDS_LIST = [
     "num_outputs_total",
     "num_outputs_parallel",
     "stable_diffusion_model",
+    "clip_skip",
     "vae_model",
     "hypernetwork_model",
     "lora_model",
@@ -24,6 +25,7 @@ const SETTINGS_IDS_LIST = [
     "prompt_strength",
     "hypernetwork_strength",
     "lora_alpha",
+    "tiling",
     "output_format",
     "output_quality",
     "output_lossless",
@@ -33,6 +35,7 @@ const SETTINGS_IDS_LIST = [
     "gfpgan_model",
     "use_upscale",
     "upscale_amount",
+    "latent_upscaler_steps",
     "block_nsfw",
     "show_only_filtered_image",
     "upscale_model",
@@ -52,27 +55,27 @@ const SETTINGS_IDS_LIST = [
     "auto_scroll",
     "zip_toggle",
     "tree_toggle",
-    "json_toggle"
+    "json_toggle",
 ]
 
-const IGNORE_BY_DEFAULT = [
+const IGNORE_BY_DEFAULT = ["prompt"]
-    "prompt"
-]
 
-const SETTINGS_SECTIONS = [ // gets the "keys" property filled in with an ordered list of settings in this section via initSettings
+const SETTINGS_SECTIONS = [
-    { id: "editor-inputs",   name: "Prompt" },
+    // gets the "keys" property filled in with an ordered list of settings in this section via initSettings
+    { id: "editor-inputs", name: "Prompt" },
     { id: "editor-settings", name: "Image Settings" },
     { id: "system-settings", name: "System Settings" },
-    { id: "container",       name: "Other" }
+    { id: "container", name: "Other" },
 ]
 
 async function initSettings() {
-    SETTINGS_IDS_LIST.forEach(id => {
+    SETTINGS_IDS_LIST.forEach((id) => {
         var element = document.getElementById(id)
         if (!element) {
             console.error(`Missing settings element ${id}`)
         }
-        if (id in SETTINGS) { // don't create it again
+        if (id in SETTINGS) {
+            // don't create it again
             return
         }
         SETTINGS[id] = {
@@ -81,28 +84,28 @@ async function initSettings() {
             label: getSettingLabel(element),
             default: getSetting(element),
             value: getSetting(element),
-            ignore: IGNORE_BY_DEFAULT.includes(id)
+            ignore: IGNORE_BY_DEFAULT.includes(id),
         }
         element.addEventListener("input", settingChangeHandler)
         element.addEventListener("change", settingChangeHandler)
     })
     var unsorted_settings_ids = [...SETTINGS_IDS_LIST]
-    SETTINGS_SECTIONS.forEach(section => {
+    SETTINGS_SECTIONS.forEach((section) => {
         var name = section.name
         var element = document.getElementById(section.id)
-        var unsorted_ids = unsorted_settings_ids.map(id => `#${id}`).join(",")
+        var unsorted_ids = unsorted_settings_ids.map((id) => `#${id}`).join(",")
-        var children = unsorted_ids == "" ? [] : Array.from(element.querySelectorAll(unsorted_ids));
+        var children = unsorted_ids == "" ? [] : Array.from(element.querySelectorAll(unsorted_ids))
         section.keys = []
-        children.forEach(e => {
+        children.forEach((e) => {
             section.keys.push(e.id)
         })
-        unsorted_settings_ids = unsorted_settings_ids.filter(id => children.find(e => e.id == id) == undefined)
+        unsorted_settings_ids = unsorted_settings_ids.filter((id) => children.find((e) => e.id == id) == undefined)
     })
     loadSettings()
 }
 
 function getSetting(element) {
-    if (element.dataset && 'path' in element.dataset) {
+    if (element.dataset && "path" in element.dataset) {
         return element.dataset.path
     }
     if (typeof element === "string" || element instanceof String) {
@@ -114,7 +117,7 @@ function getSetting(element) {
     return element.value
 }
 function setSetting(element, value) {
-    if (element.dataset && 'path' in element.dataset) {
+    if (element.dataset && "path" in element.dataset) {
         element.dataset.path = value
         return // no need to dispatch any event here because the models are not loaded yet
     }
@@ -127,8 +130,7 @@ function setSetting(element, value) {
     }
     if (element.type == "checkbox") {
         element.checked = value
-    }
+    } else {
-    else {
         element.value = value
     }
     element.dispatchEvent(new Event("input"))
@@ -136,11 +138,11 @@ function setSetting(element, value) {
 }
 
 function saveSettings() {
-    var saved_settings = Object.values(SETTINGS).map(setting => {
+    var saved_settings = Object.values(SETTINGS).map((setting) => {
         return {
             key: setting.key,
             value: setting.value,
-            ignore: setting.ignore
+            ignore: setting.ignore,
         }
     })
     localStorage.setItem(SETTINGS_KEY, JSON.stringify(saved_settings))
@@ -151,16 +153,16 @@ function loadSettings() {
     var saved_settings_text = localStorage.getItem(SETTINGS_KEY)
     if (saved_settings_text) {
         var saved_settings = JSON.parse(saved_settings_text)
-        if (saved_settings.find(s => s.key == "auto_save_settings")?.value == false) {
+        if (saved_settings.find((s) => s.key == "auto_save_settings")?.value == false) {
             setSetting("auto_save_settings", false)
             return
         }
         CURRENTLY_LOADING_SETTINGS = true
-        saved_settings.forEach(saved_setting => {
+        saved_settings.forEach((saved_setting) => {
             var setting = SETTINGS[saved_setting.key]
             if (!setting) {
-                console.warn(`Attempted to load setting ${saved_setting.key}, but no setting found`);
+                console.warn(`Attempted to load setting ${saved_setting.key}, but no setting found`)
-                return null;
+                return null
             }
             setting.ignore = saved_setting.ignore
             if (!setting.ignore) {
@@ -169,10 +171,25 @@ function loadSettings() {
             }
         })
         CURRENTLY_LOADING_SETTINGS = false
-    }
+    } else if (localStorage.length < 2) {
-    else {
+        // localStorage is too short for OldSettings
+        // So this is likely the first time Easy Diffusion is running.
+        // Initialize vram_usage_level based on the available VRAM
+        function initGPUProfile(event) {
+            if (    "detail" in event 
+                && "active" in event.detail
+                && "cuda:0" in event.detail.active
+                && event.detail.active["cuda:0"].mem_total <4.5 )
+            {
+               vramUsageLevelField.value = "low"
+               vramUsageLevelField.dispatchEvent(new Event("change"))
+            }
+            document.removeEventListener("system_info_update", initGPUProfile)
+        }
+        document.addEventListener("system_info_update", initGPUProfile)
+    } else {
         CURRENTLY_LOADING_SETTINGS = true
-        tryLoadOldSettings();
+        tryLoadOldSettings()
         CURRENTLY_LOADING_SETTINGS = false
         saveSettings()
     }
@@ -180,9 +197,9 @@ function loadSettings() {
 
 function loadDefaultSettingsSection(section_id) {
     CURRENTLY_LOADING_SETTINGS = true
-    var section = SETTINGS_SECTIONS.find(s => s.id == section_id);
+    var section = SETTINGS_SECTIONS.find((s) => s.id == section_id)
-    section.keys.forEach(key => {
+    section.keys.forEach((key) => {
-        var setting = SETTINGS[key];
+        var setting = SETTINGS[key]
         setting.value = setting.default
         setSetting(setting.element, setting.value)
     })
@@ -218,10 +235,10 @@ function getSettingLabel(element) {
 
 function fillSaveSettingsConfigTable() {
     saveSettingsConfigTable.textContent = ""
-    SETTINGS_SECTIONS.forEach(section => {
+    SETTINGS_SECTIONS.forEach((section) => {
         var section_row = `<tr><th>${section.name}</th><td></td></tr>`
         saveSettingsConfigTable.insertAdjacentHTML("beforeend", section_row)
-        section.keys.forEach(key => {
+        section.keys.forEach((key) => {
             var setting = SETTINGS[key]
             var element = setting.element
             var checkbox_id = `shouldsave_${element.id}`
@@ -234,7 +251,7 @@ function fillSaveSettingsConfigTable() {
             var newrow = `<tr><td><label for="${checkbox_id}">${setting.label}</label></td><td><input id="${checkbox_id}" name="${checkbox_id}" ${is_checked} type="checkbox" ></td><td><small>(${value})</small></td></tr>`
             saveSettingsConfigTable.insertAdjacentHTML("beforeend", newrow)
             var checkbox = document.getElementById(checkbox_id)
-            checkbox.addEventListener("input", event => {
+            checkbox.addEventListener("input", (event) => {
                 setting.ignore = !checkbox.checked
                 saveSettings()
             })
@@ -245,9 +262,6 @@ function fillSaveSettingsConfigTable() {
 
 // configureSettingsSaveBtn
 
-
-
-
 var autoSaveSettings = document.getElementById("auto_save_settings")
 var configSettingsButton = document.createElement("button")
 configSettingsButton.textContent = "Configure"
@@ -256,33 +270,32 @@ autoSaveSettings.insertAdjacentElement("beforebegin", configSettingsButton)
 autoSaveSettings.addEventListener("change", () => {
     configSettingsButton.style.display = autoSaveSettings.checked ? "block" : "none"
 })
-configSettingsButton.addEventListener('click', () => {
+configSettingsButton.addEventListener("click", () => {
     fillSaveSettingsConfigTable()
     saveSettingsConfigOverlay.classList.add("active")
 })
-resetImageSettingsButton.addEventListener('click', event => {
+resetImageSettingsButton.addEventListener("click", (event) => {
-    loadDefaultSettingsSection("editor-settings");
+    loadDefaultSettingsSection("editor-settings")
     event.stopPropagation()
 })
 
-
 function tryLoadOldSettings() {
     console.log("Loading old user settings")
     // load v1 auto-save.js settings
     var old_map = {
-        "guidance_scale_slider": "guidance_scale",
+        guidance_scale_slider: "guidance_scale",
-        "prompt_strength_slider": "prompt_strength"
+        prompt_strength_slider: "prompt_strength",
     }
     var settings_key_v1 = "user_settings"
     var saved_settings_text = localStorage.getItem(settings_key_v1)
     if (saved_settings_text) {
         var saved_settings = JSON.parse(saved_settings_text)
-        Object.keys(saved_settings.should_save).forEach(key => {
+        Object.keys(saved_settings.should_save).forEach((key) => {
             key = key in old_map ? old_map[key] : key
             if (!(key in SETTINGS)) return
             SETTINGS[key].ignore = !saved_settings.should_save[key]
-        });
+        })
-        Object.keys(saved_settings.values).forEach(key => {
+        Object.keys(saved_settings.values).forEach((key) => {
             key = key in old_map ? old_map[key] : key
             if (!(key in SETTINGS)) return
             var setting = SETTINGS[key]
@@ -290,38 +303,42 @@ function tryLoadOldSettings() {
                 setting.value = saved_settings.values[key]
                 setSetting(setting.element, setting.value)
             }
-        });
+        })
         localStorage.removeItem(settings_key_v1)
     }
 
     // load old individually stored items
-    var individual_settings_map = { // maps old localStorage-key to new SETTINGS-key
+    var individual_settings_map = {
-        "soundEnabled": "sound_toggle",
+        // maps old localStorage-key to new SETTINGS-key
-        "saveToDisk": "save_to_disk",
+        soundEnabled: "sound_toggle",
-        "useCPU": "use_cpu",
+        saveToDisk: "save_to_disk",
-        "diskPath": "diskPath",
+        useCPU: "use_cpu",
-        "useFaceCorrection": "use_face_correction",
+        diskPath: "diskPath",
-        "useUpscaling": "use_upscale",
+        useFaceCorrection: "use_face_correction",
-        "showOnlyFilteredImage": "show_only_filtered_image",
+        useUpscaling: "use_upscale",
-        "streamImageProgress": "stream_image_progress",
+        showOnlyFilteredImage: "show_only_filtered_image",
-        "outputFormat": "output_format",
+        streamImageProgress: "stream_image_progress",
-        "autoSaveSettings": "auto_save_settings",
+        outputFormat: "output_format",
-    };
+        autoSaveSettings: "auto_save_settings",
-    Object.keys(individual_settings_map).forEach(localStorageKey => {
+    }
-        var localStorageValue = localStorage.getItem(localStorageKey);
+    Object.keys(individual_settings_map).forEach((localStorageKey) => {
+        var localStorageValue = localStorage.getItem(localStorageKey)
         if (localStorageValue !== null) {
             let key = individual_settings_map[localStorageKey]
             var setting = SETTINGS[key]
             if (!setting) {
-                console.warn(`Attempted to map old setting ${key}, but no setting found`);
+                console.warn(`Attempted to map old setting ${key}, but no setting found`)
-                return null;
+                return null
             }
-            if (setting.element.type == "checkbox" && (typeof localStorageValue === "string" || localStorageValue instanceof String)) {
+            if (
+                setting.element.type == "checkbox" &&
+                (typeof localStorageValue === "string" || localStorageValue instanceof String)
+            ) {
                 localStorageValue = localStorageValue == "true"
             }
             setting.value = localStorageValue
             setSetting(setting.element, setting.value)
-            localStorage.removeItem(localStorageKey);
+            localStorage.removeItem(localStorageKey)
         }
     })
 }

ui/media/js/dnd.js

@@ -1,25 +1,25 @@
 "use strict" // Opt in to a restricted variant of JavaScript
 
 const EXT_REGEX = /(?:\.([^.]+))?$/
-const TEXT_EXTENSIONS = ['txt', 'json']
+const TEXT_EXTENSIONS = ["txt", "json"]
-const IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'png', 'bmp', 'tiff', 'tif', 'tga', 'webp']
+const IMAGE_EXTENSIONS = ["jpg", "jpeg", "png", "bmp", "tiff", "tif", "tga", "webp"]
 
 function parseBoolean(stringValue) {
-    if (typeof stringValue === 'boolean') {
+    if (typeof stringValue === "boolean") {
         return stringValue
     }
-    if (typeof stringValue === 'number') {
+    if (typeof stringValue === "number") {
         return stringValue !== 0
     }
-    if (typeof stringValue !== 'string') {
+    if (typeof stringValue !== "string") {
         return false
     }
-    switch(stringValue?.toLowerCase()?.trim()) {
+    switch (stringValue?.toLowerCase()?.trim()) {
         case "true":
         case "yes":
         case "on":
         case "1":
-          return true;
+            return true
 
         case "false":
         case "no":
@@ -28,67 +28,77 @@ function parseBoolean(stringValue) {
         case "none":
         case null:
         case undefined:
-          return false;
+            return false
     }
     try {
-        return Boolean(JSON.parse(stringValue));
+        return Boolean(JSON.parse(stringValue))
     } catch {
         return Boolean(stringValue)
     }
 }
 
+// keep in sync with `ui/easydiffusion/utils/save_utils.py`
 const TASK_MAPPING = {
-    prompt: { name: 'Prompt',
+    prompt: {
+        name: "Prompt",
         setUI: (prompt) => {
             promptField.value = prompt
         },
         readUI: () => promptField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    negative_prompt: { name: 'Negative Prompt',
+    negative_prompt: {
+        name: "Negative Prompt",
         setUI: (negative_prompt) => {
             negativePromptField.value = negative_prompt
         },
         readUI: () => negativePromptField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    active_tags: { name: "Image Modifiers",
+    active_tags: {
+        name: "Image Modifiers",
         setUI: (active_tags) => {
             refreshModifiersState(active_tags)
         },
-        readUI: () => activeTags.map(x => x.name),
+        readUI: () => activeTags.map((x) => x.name),
-        parse: (val) => val
+        parse: (val) => val,
     },
-    inactive_tags: { name: "Inactive Image Modifiers",
+    inactive_tags: {
+        name: "Inactive Image Modifiers",
         setUI: (inactive_tags) => {
             refreshInactiveTags(inactive_tags)
         },
-        readUI: () => activeTags.filter(tag => tag.inactive === true).map(x => x.name),
+        readUI: () => activeTags.filter((tag) => tag.inactive === true).map((x) => x.name),
-        parse: (val) => val
+        parse: (val) => val,
     },
-    width: { name: 'Width',
+    width: {
+        name: "Width",
         setUI: (width) => {
             const oldVal = widthField.value
             widthField.value = width
             if (!widthField.value) {
                 widthField.value = oldVal
             }
+            widthField.dispatchEvent(new Event("change"))
         },
         readUI: () => parseInt(widthField.value),
-        parse: (val) => parseInt(val)
+        parse: (val) => parseInt(val),
     },
-    height: { name: 'Height',
+    height: {
+        name: "Height",
         setUI: (height) => {
             const oldVal = heightField.value
             heightField.value = height
             if (!heightField.value) {
                 heightField.value = oldVal
             }
+            heightField.dispatchEvent(new Event("change"))
         },
         readUI: () => parseInt(heightField.value),
-        parse: (val) => parseInt(val)
+        parse: (val) => parseInt(val),
     },
-    seed: { name: 'Seed',
+    seed: {
+        name: "Seed",
         setUI: (seed) => {
             if (!seed) {
                 randomSeedField.checked = true
@@ -97,89 +107,108 @@ const TASK_MAPPING = {
                 return
             }
             randomSeedField.checked = false
-            randomSeedField.dispatchEvent(new Event('change')) // let plugins know that the state of the random seed toggle changed
+            randomSeedField.dispatchEvent(new Event("change")) // let plugins know that the state of the random seed toggle changed
             seedField.disabled = false
             seedField.value = seed
         },
         readUI: () => parseInt(seedField.value), // just return the value the user is seeing in the UI
-        parse: (val) => parseInt(val)
+        parse: (val) => parseInt(val),
     },
-    num_inference_steps: { name: 'Steps',
+    num_inference_steps: {
+        name: "Steps",
         setUI: (num_inference_steps) => {
             numInferenceStepsField.value = num_inference_steps
         },
         readUI: () => parseInt(numInferenceStepsField.value),
-        parse: (val) => parseInt(val)
+        parse: (val) => parseInt(val),
     },
-    guidance_scale: { name: 'Guidance Scale',
+    guidance_scale: {
+        name: "Guidance Scale",
         setUI: (guidance_scale) => {
             guidanceScaleField.value = guidance_scale
             updateGuidanceScaleSlider()
         },
         readUI: () => parseFloat(guidanceScaleField.value),
-        parse: (val) => parseFloat(val)
+        parse: (val) => parseFloat(val),
     },
-    prompt_strength: { name: 'Prompt Strength',
+    prompt_strength: {
+        name: "Prompt Strength",
         setUI: (prompt_strength) => {
             promptStrengthField.value = prompt_strength
             updatePromptStrengthSlider()
         },
         readUI: () => parseFloat(promptStrengthField.value),
-        parse: (val) => parseFloat(val)
+        parse: (val) => parseFloat(val),
     },
 
-    init_image:  { name: 'Initial Image',
+    init_image: {
+        name: "Initial Image",
         setUI: (init_image) => {
             initImagePreview.src = init_image
         },
         readUI: () => initImagePreview.src,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    mask:  { name: 'Mask',
+    mask: {
+        name: "Mask",
         setUI: (mask) => {
-            setTimeout(() => { // add a delay to insure this happens AFTER the main image loads (which reloads the inpainter)
+            setTimeout(() => {
+                // add a delay to insure this happens AFTER the main image loads (which reloads the inpainter)
                 imageInpainter.setImg(mask)
             }, 250)
             maskSetting.checked = Boolean(mask)
         },
         readUI: () => (maskSetting.checked ? imageInpainter.getImg() : undefined),
-        parse: (val) => val
+        parse: (val) => val,
     },
-    preserve_init_image_color_profile: { name: 'Preserve Color Profile',
+    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)
+        parse: (val) => parseBoolean(val),
     },
-    
+
-    use_face_correction: { name: 'Use Face Correction',
+    use_face_correction: {
+        name: "Use Face Correction",
         setUI: (use_face_correction) => {
             const oldVal = gfpganModelField.value
-            gfpganModelField.value = getModelPath(use_face_correction, ['.pth'])
+            console.log("use face correction", use_face_correction)
-            if (gfpganModelField.value) { // Is a valid value for the field.
+            if (use_face_correction == null || use_face_correction == "None") {
-                useFaceCorrectionField.checked = true
-                gfpganModelField.disabled = false
-            } else { // Not a valid value, restore the old value and disable the filter.
                 gfpganModelField.disabled = true
-                gfpganModelField.value = oldVal
                 useFaceCorrectionField.checked = false
+            } else {
+                gfpganModelField.value = getModelPath(use_face_correction, [".pth"])
+                if (gfpganModelField.value) {
+                    // Is a valid value for the field.
+                    useFaceCorrectionField.checked = true
+                    gfpganModelField.disabled = false
+                } else {
+                    // Not a valid value, restore the old value and disable the filter.
+                    gfpganModelField.disabled = true
+                    gfpganModelField.value = oldVal
+                    useFaceCorrectionField.checked = false
+                }
             }
 
             //useFaceCorrectionField.checked = parseBoolean(use_face_correction)
         },
         readUI: () => (useFaceCorrectionField.checked ? gfpganModelField.value : undefined),
-        parse: (val) => val
+        parse: (val) => val,
     },
-    use_upscale: { name: 'Use Upscaling',
+    use_upscale: {
+        name: "Use Upscaling",
         setUI: (use_upscale) => {
             const oldVal = upscaleModelField.value
-            upscaleModelField.value = getModelPath(use_upscale, ['.pth'])
+            upscaleModelField.value = getModelPath(use_upscale, [".pth"])
-            if (upscaleModelField.value) { // Is a valid value for the field.
+            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.
+            } else {
+                // Not a valid value, restore the old value and disable the filter.
                 upscaleModelField.disabled = true
                 upscaleAmountField.disabled = true
                 upscaleModelField.value = oldVal
@@ -187,27 +216,38 @@ const TASK_MAPPING = {
             }
         },
         readUI: () => (useUpscalingField.checked ? upscaleModelField.value : undefined),
-        parse: (val) => val
+        parse: (val) => val,
     },
-    upscale_amount: { name: 'Upscale By',
+    upscale_amount: {
+        name: "Upscale By",
         setUI: (upscale_amount) => {
             upscaleAmountField.value = upscale_amount
         },
         readUI: () => upscaleAmountField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    sampler_name: { name: 'Sampler',
+    latent_upscaler_steps: {
+        name: "Latent Upscaler Steps",
+        setUI: (latent_upscaler_steps) => {
+            latentUpscalerStepsField.value = latent_upscaler_steps
+        },
+        readUI: () => latentUpscalerStepsField.value,
+        parse: (val) => val,
+    },
+    sampler_name: {
+        name: "Sampler",
         setUI: (sampler_name) => {
             samplerField.value = sampler_name
         },
         readUI: () => samplerField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    use_stable_diffusion_model: { name: 'Stable Diffusion model',
+    use_stable_diffusion_model: {
+        name: "Stable Diffusion model",
         setUI: (use_stable_diffusion_model) => {
             const oldVal = stableDiffusionModelField.value
 
-            use_stable_diffusion_model = getModelPath(use_stable_diffusion_model, ['.ckpt', '.safetensors'])
+            use_stable_diffusion_model = getModelPath(use_stable_diffusion_model, [".ckpt", ".safetensors"])
             stableDiffusionModelField.value = use_stable_diffusion_model
 
             if (!stableDiffusionModelField.value) {
@@ -215,126 +255,162 @@ const TASK_MAPPING = {
             }
         },
         readUI: () => stableDiffusionModelField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    use_vae_model: { name: 'VAE model',
+    clip_skip: {
+        name: "Clip Skip",
+        setUI: (value) => {
+            clip_skip.checked = value
+        },
+        readUI: () => clip_skip.checked,
+        parse: (val) => Boolean(val),
+    },
+    tiling: {
+        name: "Tiling",
+        setUI: (val) => {
+            tilingField.value = val
+        },
+        readUI: () => tilingField.value,
+        parse: (val) => val,
+    },
+    use_vae_model: {
+        name: "VAE model",
         setUI: (use_vae_model) => {
             const oldVal = vaeModelField.value
-            use_vae_model = (use_vae_model === undefined || use_vae_model === null || use_vae_model === 'None' ? '' : use_vae_model)
+            use_vae_model =
+                use_vae_model === undefined || use_vae_model === null || use_vae_model === "None" ? "" : use_vae_model
 
-            if (use_vae_model !== '') {
+            if (use_vae_model !== "") {
-                use_vae_model = getModelPath(use_vae_model, ['.vae.pt', '.ckpt'])
+                use_vae_model = getModelPath(use_vae_model, [".vae.pt", ".ckpt"])
-                use_vae_model = use_vae_model !== '' ? use_vae_model : oldVal
+                use_vae_model = use_vae_model !== "" ? use_vae_model : oldVal
             }
             vaeModelField.value = use_vae_model
         },
         readUI: () => vaeModelField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    use_lora_model: { name: 'LoRA model',
+    use_lora_model: {
+        name: "LoRA model",
         setUI: (use_lora_model) => {
             const oldVal = loraModelField.value
-            use_lora_model = (use_lora_model === undefined || use_lora_model === null || use_lora_model === 'None' ? '' : use_lora_model)
+            use_lora_model =
+                use_lora_model === undefined || use_lora_model === null || use_lora_model === "None"
+                    ? ""
+                    : use_lora_model
 
-            if (use_lora_model !== '') {
+            if (use_lora_model !== "") {
-                use_lora_model = getModelPath(use_lora_model, ['.ckpt', '.safetensors'])
+                use_lora_model = getModelPath(use_lora_model, [".ckpt", ".safetensors"])
-                use_lora_model = use_lora_model !== '' ? use_lora_model : oldVal
+                use_lora_model = use_lora_model !== "" ? use_lora_model : oldVal
             }
             loraModelField.value = use_lora_model
         },
         readUI: () => loraModelField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    lora_alpha: { name: 'LoRA Strength',
+    lora_alpha: {
+        name: "LoRA Strength",
         setUI: (lora_alpha) => {
             loraAlphaField.value = lora_alpha
             updateLoraAlphaSlider()
         },
         readUI: () => parseFloat(loraAlphaField.value),
-        parse: (val) => parseFloat(val)
+        parse: (val) => parseFloat(val),
     },
-    use_hypernetwork_model: { name: 'Hypernetwork model',
+    use_hypernetwork_model: {
+        name: "Hypernetwork model",
         setUI: (use_hypernetwork_model) => {
             const oldVal = hypernetworkModelField.value
-            use_hypernetwork_model = (use_hypernetwork_model === undefined || use_hypernetwork_model === null || use_hypernetwork_model === 'None' ? '' : use_hypernetwork_model)
+            use_hypernetwork_model =
+                use_hypernetwork_model === undefined ||
+                use_hypernetwork_model === null ||
+                use_hypernetwork_model === "None"
+                    ? ""
+                    : use_hypernetwork_model
 
-            if (use_hypernetwork_model !== '') {
+            if (use_hypernetwork_model !== "") {
-                use_hypernetwork_model = getModelPath(use_hypernetwork_model, ['.pt'])
+                use_hypernetwork_model = getModelPath(use_hypernetwork_model, [".pt"])
-                use_hypernetwork_model = use_hypernetwork_model !== '' ? use_hypernetwork_model : oldVal
+                use_hypernetwork_model = use_hypernetwork_model !== "" ? use_hypernetwork_model : oldVal
             }
             hypernetworkModelField.value = use_hypernetwork_model
-            hypernetworkModelField.dispatchEvent(new Event('change'))
+            hypernetworkModelField.dispatchEvent(new Event("change"))
         },
         readUI: () => hypernetworkModelField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    hypernetwork_strength: { name: 'Hypernetwork Strength',
+    hypernetwork_strength: {
+        name: "Hypernetwork Strength",
         setUI: (hypernetwork_strength) => {
             hypernetworkStrengthField.value = hypernetwork_strength
             updateHypernetworkStrengthSlider()
         },
         readUI: () => parseFloat(hypernetworkStrengthField.value),
-        parse: (val) => parseFloat(val)
+        parse: (val) => parseFloat(val),
     },
 
-    num_outputs: { name: 'Parallel Images',
+    num_outputs: {
+        name: "Parallel Images",
         setUI: (num_outputs) => {
             numOutputsParallelField.value = num_outputs
         },
         readUI: () => parseInt(numOutputsParallelField.value),
-        parse: (val) => val
+        parse: (val) => val,
     },
 
-    use_cpu: { name: 'Use CPU',
+    use_cpu: {
+        name: "Use CPU",
         setUI: (use_cpu) => {
             useCPUField.checked = use_cpu
         },
         readUI: () => useCPUField.checked,
-        parse: (val) => val
+        parse: (val) => val,
     },
 
-    stream_image_progress: { name: 'Stream Image Progress',
+    stream_image_progress: {
+        name: "Stream Image Progress",
         setUI: (stream_image_progress) => {
-            streamImageProgressField.checked = (parseInt(numOutputsTotalField.value) > 50 ? false : stream_image_progress)
+            streamImageProgressField.checked = parseInt(numOutputsTotalField.value) > 50 ? false : stream_image_progress
         },
         readUI: () => streamImageProgressField.checked,
-        parse: (val) => Boolean(val)
+        parse: (val) => Boolean(val),
     },
-    show_only_filtered_image: { name: 'Show only the corrected/upscaled image',
+    show_only_filtered_image: {
+        name: "Show only the corrected/upscaled image",
         setUI: (show_only_filtered_image) => {
             showOnlyFilteredImageField.checked = show_only_filtered_image
         },
         readUI: () => showOnlyFilteredImageField.checked,
-        parse: (val) => Boolean(val)
+        parse: (val) => Boolean(val),
     },
-    output_format: { name: 'Output Format',
+    output_format: {
+        name: "Output Format",
         setUI: (output_format) => {
             outputFormatField.value = output_format
         },
         readUI: () => outputFormatField.value,
-        parse: (val) => val
+        parse: (val) => val,
     },
-    save_to_disk_path: { name: 'Save to disk path',
+    save_to_disk_path: {
+        name: "Save to disk path",
         setUI: (save_to_disk_path) => {
             saveToDiskField.checked = Boolean(save_to_disk_path)
             diskPathField.value = save_to_disk_path
         },
         readUI: () => diskPathField.value,
-        parse: (val) => val
+        parse: (val) => val,
-    }
+    },
 }
 
 function restoreTaskToUI(task, fieldsToSkip) {
     fieldsToSkip = fieldsToSkip || []
 
-    if ('numOutputsTotal' in task) {
+    if ("numOutputsTotal" in task) {
         numOutputsTotalField.value = task.numOutputsTotal
     }
-    if ('seed' in task) {
+    if ("seed" in task) {
         randomSeedField.checked = false
         seedField.value = task.seed
     }
-    if (!('reqBody' in task)) {
+    if (!("reqBody" in task)) {
         return
     }
     for (const key in TASK_MAPPING) {
@@ -344,31 +420,32 @@ function restoreTaskToUI(task, fieldsToSkip) {
     }
 
     // properly reset fields not present in the task
-    if (!('use_hypernetwork_model' in task.reqBody)) {
+    if (!("use_hypernetwork_model" in task.reqBody)) {
         hypernetworkModelField.value = ""
         hypernetworkModelField.dispatchEvent(new Event("change"))
     }
-    
+
-    if (!('use_lora_model' in task.reqBody)) {
+    if (!("use_lora_model" in task.reqBody)) {
         loraModelField.value = ""
         loraModelField.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)) {
+    if (!("original_prompt" in task.reqBody)) {
         promptField.value = task.reqBody.prompt
     }
-    
+    promptField.dispatchEvent(new Event("input"))
+
     // properly reset checkboxes
-    if (!('use_face_correction' in task.reqBody)) {
+    if (!("use_face_correction" in task.reqBody)) {
         useFaceCorrectionField.checked = false
         gfpganModelField.disabled = true
     }
-    if (!('use_upscale' in task.reqBody)) {
+    if (!("use_upscale" in task.reqBody)) {
         useUpscalingField.checked = false
     }
-    if (!('mask' in task.reqBody) && maskSetting.checked) {
+    if (!("mask" in task.reqBody) && maskSetting.checked) {
         maskSetting.checked = false
         maskSetting.dispatchEvent(new Event("click"))
     }
@@ -379,15 +456,18 @@ function restoreTaskToUI(task, fieldsToSkip) {
     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) {
-    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() {
+        initImagePreview.addEventListener(
-            if (Boolean(task.reqBody.mask)) {
+            "load",
-                imageInpainter.setImg(task.reqBody.mask)
+            function() {
-                maskSetting.checked = true
+                if (Boolean(task.reqBody.mask)) {
-            }
+                    imageInpainter.setImg(task.reqBody.mask)
-        }, { once: true })
+                    maskSetting.checked = true
+                }
+            },
+            { once: true }
+        )
         initImagePreview.src = task.reqBody.init_image
     }
 }
@@ -397,28 +477,26 @@ function readUI() {
         reqBody[key] = TASK_MAPPING[key].readUI()
     }
     return {
-        'numOutputsTotal': parseInt(numOutputsTotalField.value),
+        numOutputsTotal: parseInt(numOutputsTotalField.value),
-        'seed': TASK_MAPPING['seed'].readUI(),
+        seed: TASK_MAPPING["seed"].readUI(),
-        'reqBody': reqBody
+        reqBody: reqBody,
     }
 }
-function getModelPath(filename, extensions)
+function getModelPath(filename, extensions) {
-{
     if (typeof filename !== "string") {
         return
     }
-    
+
     let pathIdx
-    if (filename.includes('/models/stable-diffusion/')) {
+    if (filename.includes("/models/stable-diffusion/")) {
-        pathIdx = filename.indexOf('/models/stable-diffusion/') + 25 // Linux, Mac paths
+        pathIdx = filename.indexOf("/models/stable-diffusion/") + 25 // Linux, Mac paths
-    }
+    } else if (filename.includes("\\models\\stable-diffusion\\")) {
-    else if (filename.includes('\\models\\stable-diffusion\\')) {
+        pathIdx = filename.indexOf("\\models\\stable-diffusion\\") + 25 // Linux, Mac paths
-        pathIdx = filename.indexOf('\\models\\stable-diffusion\\') + 25 // Linux, Mac paths
     }
     if (pathIdx >= 0) {
         filename = filename.slice(pathIdx)
     }
-    extensions.forEach(ext => {
+    extensions.forEach((ext) => {
         if (filename.endsWith(ext)) {
             filename = filename.slice(0, filename.length - ext.length)
         }
@@ -427,26 +505,26 @@ function getModelPath(filename, extensions)
 }
 
 const TASK_TEXT_MAPPING = {
-    prompt: 'Prompt',
+    prompt: "Prompt",
-    width: 'Width',
+    width: "Width",
-    height: 'Height',
+    height: "Height",
-    seed: 'Seed',
+    seed: "Seed",
-    num_inference_steps: 'Steps',
+    num_inference_steps: "Steps",
-    guidance_scale: 'Guidance Scale',
+    guidance_scale: "Guidance Scale",
-    prompt_strength: 'Prompt Strength',
+    prompt_strength: "Prompt Strength",
-    use_face_correction: 'Use Face Correction',
+    use_face_correction: "Use Face Correction",
-    use_upscale: 'Use Upscaling',
+    use_upscale: "Use Upscaling",
-    upscale_amount: 'Upscale By',
+    upscale_amount: "Upscale By",
-    sampler_name: 'Sampler',
+    sampler_name: "Sampler",
-    negative_prompt: 'Negative Prompt',
+    negative_prompt: "Negative Prompt",
-    use_stable_diffusion_model: 'Stable Diffusion model',
+    use_stable_diffusion_model: "Stable Diffusion model",
-    use_hypernetwork_model: 'Hypernetwork model',
+    use_hypernetwork_model: "Hypernetwork model",
-    hypernetwork_strength: 'Hypernetwork Strength'
+    hypernetwork_strength: "Hypernetwork Strength",
 }
 function parseTaskFromText(str) {
     const taskReqBody = {}
 
-    const lines = str.split('\n')
+    const lines = str.split("\n")
     if (lines.length === 0) {
         return
     }
@@ -454,14 +532,14 @@ function parseTaskFromText(str) {
     // Prompt
     let knownKeyOnFirstLine = false
     for (let key in TASK_TEXT_MAPPING) {
-        if (lines[0].startsWith(TASK_TEXT_MAPPING[key] + ':')) {
+        if (lines[0].startsWith(TASK_TEXT_MAPPING[key] + ":")) {
             knownKeyOnFirstLine = true
             break
         }
     }
     if (!knownKeyOnFirstLine) {
         taskReqBody.prompt = lines[0]
-        console.log('Prompt:', taskReqBody.prompt)
+        console.log("Prompt:", taskReqBody.prompt)
     }
 
     for (const key in TASK_TEXT_MAPPING) {
@@ -469,18 +547,18 @@ function parseTaskFromText(str) {
             continue
         }
 
-        const name = TASK_TEXT_MAPPING[key];
+        const name = TASK_TEXT_MAPPING[key]
         let val = undefined
 
-        const reName = new RegExp(`${name}\\ *:\\ *(.*)(?:\\r\\n|\\r|\\n)*`, 'igm')
+        const reName = new RegExp(`${name}\\ *:\\ *(.*)(?:\\r\\n|\\r|\\n)*`, "igm")
-        const match = reName.exec(str);
+        const match = reName.exec(str)
         if (match) {
             str = str.slice(0, match.index) + str.slice(match.index + match[0].length)
             val = match[1]
         }
         if (val !== undefined) {
             taskReqBody[key] = TASK_MAPPING[key].parse(val.trim())
-            console.log(TASK_MAPPING[key].name + ':', taskReqBody[key])
+            console.log(TASK_MAPPING[key].name + ":", taskReqBody[key])
             if (!str) {
                 break
             }
@@ -490,18 +568,19 @@ function parseTaskFromText(str) {
         return undefined
     }
     const task = { reqBody: taskReqBody }
-    if ('seed' in taskReqBody) {
+    if ("seed" in taskReqBody) {
         task.seed = taskReqBody.seed
     }
     return task
 }
 
 async function parseContent(text) {
-    text = text.trim();
+    text = text.trim()
-    if (text.startsWith('{') && text.endsWith('}')) {
+    if (text.startsWith("{") && text.endsWith("}")) {
         try {
             const task = JSON.parse(text)
-            if (!('reqBody' in task)) { // support the format saved to the disk, by the UI
+            if (!("reqBody" in task)) {
+                // support the format saved to the disk, by the UI
                 task.reqBody = Object.assign({}, task)
             }
             restoreTaskToUI(task)
@@ -513,7 +592,8 @@ async function parseContent(text) {
     }
     // Normal txt file.
     const task = parseTaskFromText(text)
-    if (text.toLowerCase().includes('seed:') && task) { // only parse valid task content
+    if (text.toLowerCase().includes("seed:") && task) {
+        // only parse valid task content
         restoreTaskToUI(task)
         return true
     } else {
@@ -530,21 +610,25 @@ async function readFile(file, i) {
 }
 
 function dropHandler(ev) {
-    console.log('Content dropped...')
+    console.log("Content dropped...")
     let items = []
 
-    if (ev?.dataTransfer?.items) { // Use DataTransferItemList interface
+    if (ev?.dataTransfer?.items) {
+        // Use DataTransferItemList interface
         items = Array.from(ev.dataTransfer.items)
-        items = items.filter(item => item.kind === 'file')
+        items = items.filter((item) => item.kind === "file")
-        items = items.map(item => item.getAsFile())
+        items = items.map((item) => item.getAsFile())
-    } else if (ev?.dataTransfer?.files) { // Use DataTransfer interface
+    } else if (ev?.dataTransfer?.files) {
+        // Use DataTransfer interface
         items = Array.from(ev.dataTransfer.files)
     }
 
-    items.forEach(item => {item.file_ext = EXT_REGEX.exec(item.name.toLowerCase())[1]})
+    items.forEach((item) => {
+        item.file_ext = EXT_REGEX.exec(item.name.toLowerCase())[1]
+    })
 
-    let text_items = items.filter(item => TEXT_EXTENSIONS.includes(item.file_ext))
+    let text_items = items.filter((item) => TEXT_EXTENSIONS.includes(item.file_ext))
-    let image_items = items.filter(item => IMAGE_EXTENSIONS.includes(item.file_ext))
+    let image_items = items.filter((item) => IMAGE_EXTENSIONS.includes(item.file_ext))
 
     if (image_items.length > 0 && ev.target == initImageSelector) {
         return // let the event bubble up, so that the Init Image filepicker can receive this
@@ -554,7 +638,7 @@ function dropHandler(ev) {
     text_items.forEach(readFile)
 }
 function dragOverHandler(ev) {
-    console.log('Content in drop zone')
+    console.log("Content in drop zone")
 
     // Prevent default behavior (Prevent file/content from being opened)
     ev.preventDefault()
@@ -562,73 +646,72 @@ function dragOverHandler(ev) {
     ev.dataTransfer.dropEffect = "copy"
 
     let img = new Image()
-    img.src = '//' + location.host + '/media/images/favicon-32x32.png'
+    img.src = "//" + location.host + "/media/images/favicon-32x32.png"
     ev.dataTransfer.setDragImage(img, 16, 16)
 }
 
 document.addEventListener("drop", dropHandler)
 document.addEventListener("dragover", dragOverHandler)
 
-const TASK_REQ_NO_EXPORT = [
+const TASK_REQ_NO_EXPORT = ["use_cpu", "save_to_disk_path"]
-    "use_cpu",
+const resetSettings = document.getElementById("reset-image-settings")
-    "save_to_disk_path"
-]
-const resetSettings = document.getElementById('reset-image-settings')
 
-function checkReadTextClipboardPermission (result) {
+function checkReadTextClipboardPermission(result) {
     if (result.state != "granted" && result.state != "prompt") {
         return
     }
     // PASTE ICON
-    const pasteIcon = document.createElement('i')
+    const pasteIcon = document.createElement("i")
-    pasteIcon.className = 'fa-solid fa-paste section-button'
+    pasteIcon.className = "fa-solid fa-paste section-button"
     pasteIcon.innerHTML = `<span class="simple-tooltip top-left">Paste Image Settings</span>`
-    pasteIcon.addEventListener('click', async (event) => {
+    pasteIcon.addEventListener("click", async (event) => {
         event.stopPropagation()
         // Add css class 'active'
-        pasteIcon.classList.add('active')
+        pasteIcon.classList.add("active")
         // In 350 ms remove the 'active' class
-        asyncDelay(350).then(() => pasteIcon.classList.remove('active'))
+        asyncDelay(350).then(() => pasteIcon.classList.remove("active"))
 
         // Retrieve clipboard content and try to parse it
-        const text = await navigator.clipboard.readText();
+        const text = await navigator.clipboard.readText()
         await parseContent(text)
     })
     resetSettings.parentNode.insertBefore(pasteIcon, resetSettings)
 }
-navigator.permissions.query({ name: "clipboard-read" }).then(checkReadTextClipboardPermission, (reason) => console.log('clipboard-read is not available. %o', reason))
+navigator.permissions
+    .query({ name: "clipboard-read" })
+    .then(checkReadTextClipboardPermission, (reason) => console.log("clipboard-read is not available. %o", reason))
 
-document.addEventListener('paste', async (event) => {
+document.addEventListener("paste", async (event) => {
     if (event.target) {
         const targetTag = event.target.tagName.toLowerCase()
         // Disable when targeting input elements.
-        if (targetTag === 'input' || targetTag === 'textarea') {
+        if (targetTag === "input" || targetTag === "textarea") {
             return
         }
     }
-    const paste = (event.clipboardData || window.clipboardData).getData('text')
+    const paste = (event.clipboardData || window.clipboardData).getData("text")
     const selection = window.getSelection()
-    if (paste != "" && selection.toString().trim().length <= 0 && await parseContent(paste)) {
+    if (paste != "" && selection.toString().trim().length <= 0 && (await parseContent(paste))) {
         event.preventDefault()
         return
     }
 })
 
 // Adds a copy and a paste icon if the browser grants permission to write to clipboard.
-function checkWriteToClipboardPermission (result) {
+function checkWriteToClipboardPermission(result) {
     if (result.state != "granted" && result.state != "prompt") {
         return
     }
     // COPY ICON
-    const copyIcon = document.createElement('i')
+    const copyIcon = document.createElement("i")
-    copyIcon.className = 'fa-solid fa-clipboard section-button'
+    copyIcon.className = "fa-solid fa-clipboard section-button"
     copyIcon.innerHTML = `<span class="simple-tooltip top-left">Copy Image Settings</span>`
-    copyIcon.addEventListener('click', (event) => {
+    copyIcon.addEventListener("click", (event) => {
         event.stopPropagation()
         // Add css class 'active'
-        copyIcon.classList.add('active')
+        copyIcon.classList.add("active")
         // In 350 ms remove the 'active' class
-        asyncDelay(350).then(() => copyIcon.classList.remove('active'))
+        asyncDelay(350).then(() => copyIcon.classList.remove("active"))
         const uiState = readUI()
         TASK_REQ_NO_EXPORT.forEach((key) => delete uiState.reqBody[key])
         if (uiState.reqBody.init_image && !IMAGE_REGEX.test(uiState.reqBody.init_image)) {
@@ -641,8 +724,8 @@ function checkWriteToClipboardPermission (result) {
 }
 // Determine which access we have to the clipboard. Clipboard access is only available on localhost or via TLS.
 navigator.permissions.query({ name: "clipboard-write" }).then(checkWriteToClipboardPermission, (e) => {
-    if (e instanceof TypeError && typeof navigator?.clipboard?.writeText === 'function') {
+    if (e instanceof TypeError && typeof navigator?.clipboard?.writeText === "function") {
         // Fix for firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1560373
-        checkWriteToClipboardPermission({state:"granted"})
+        checkWriteToClipboardPermission({ state: "granted" })
     }
 })

ui/media/js/image-modal.js

@@ -11,56 +11,35 @@
  * @type {(() => (string | ImageModalRequest) | string | ImageModalRequest) => {}}
  */
 const imageModal = (function() {
-    const backElem = createElement(
+    const backElem = createElement("i", undefined, ["fa-solid", "fa-arrow-left", "tertiaryButton"])
-        'i',
-        undefined,
-        ['fa-solid', 'fa-arrow-left', 'tertiaryButton'],
-    )
 
-    const forwardElem = createElement(
+    const forwardElem = createElement("i", undefined, ["fa-solid", "fa-arrow-right", "tertiaryButton"])
-        'i',
-        undefined,
-        ['fa-solid', 'fa-arrow-right', 'tertiaryButton'],
-    )
 
-    const zoomElem = createElement(
+    const zoomElem = createElement("i", undefined, ["fa-solid", "tertiaryButton"])
-        'i',
-        undefined,
-        ['fa-solid', 'tertiaryButton'],
-    )
 
-    const closeElem = createElement(
+    const closeElem = createElement("i", undefined, ["fa-solid", "fa-xmark", "tertiaryButton"])
-        'i',
-        undefined,
-        ['fa-solid', 'fa-xmark', 'tertiaryButton'],
-    )
 
-    const menuBarElem = createElement('div', undefined, 'menu-bar', [backElem, forwardElem, zoomElem, closeElem])
+    const menuBarElem = createElement("div", undefined, "menu-bar", [backElem, forwardElem, zoomElem, closeElem])
 
-    const imageContainer = createElement('div', undefined, 'image-wrapper')
+    const imageContainer = createElement("div", undefined, "image-wrapper")
 
-    const backdrop = createElement('div', undefined, 'backdrop')
+    const backdrop = createElement("div", undefined, "backdrop")
 
-    const modalContainer = createElement('div', undefined, 'content', [menuBarElem, imageContainer])
+    const modalContainer = createElement("div", undefined, "content", [menuBarElem, imageContainer])
 
-    const modalElem = createElement(
+    const modalElem = createElement("div", { id: "viewFullSizeImgModal" }, ["popup"], [backdrop, modalContainer])
-        'div',
-        { id: 'viewFullSizeImgModal' },
-        ['popup'],
-        [backdrop, modalContainer],
-    )
     document.body.appendChild(modalElem)
 
     const setZoomLevel = (value) => {
-        const img = imageContainer.querySelector('img')
+        const img = imageContainer.querySelector("img")
 
         if (value) {
-            zoomElem.classList.remove('fa-magnifying-glass-plus')
+            zoomElem.classList.remove("fa-magnifying-glass-plus")
-            zoomElem.classList.add('fa-magnifying-glass-minus')
+            zoomElem.classList.add("fa-magnifying-glass-minus")
             if (img) {
-                img.classList.remove('natural-zoom')
+                img.classList.remove("natural-zoom")
 
-                let zoomLevel = typeof value === 'number' ? value : img.dataset.zoomLevel
+                let zoomLevel = typeof value === "number" ? value : img.dataset.zoomLevel
                 if (!zoomLevel) {
                     zoomLevel = 100
                 }
@@ -70,36 +49,93 @@ const imageModal = (function() {
                 img.height = img.naturalHeight * (+zoomLevel / 100)
             }
         } else {
-            zoomElem.classList.remove('fa-magnifying-glass-minus')
+            zoomElem.classList.remove("fa-magnifying-glass-minus")
-            zoomElem.classList.add('fa-magnifying-glass-plus')
+            zoomElem.classList.add("fa-magnifying-glass-plus")
             if (img) {
-                img.classList.add('natural-zoom')
+                img.classList.add("natural-zoom")
-                img.removeAttribute('width')
+                img.removeAttribute("width")
-                img.removeAttribute('height')
+                img.removeAttribute("height")
             }
         }
     }
 
-    zoomElem.addEventListener(
+    zoomElem.addEventListener("click", () =>
-        'click',
+        setZoomLevel(imageContainer.querySelector("img")?.classList?.contains("natural-zoom"))
-        () => setZoomLevel(imageContainer.querySelector('img')?.classList?.contains('natural-zoom')),
     )
 
-    const state = {
+    const initialState = () => ({
         previous: undefined,
         next: undefined,
+
+        start: {
+            x: 0,
+            y: 0,
+        },
+
+        scroll: {
+            x: 0,
+            y: 0,
+        },
+    })
+
+    const state = initialState()
+
+    // Allow grabbing the image to scroll
+    const stopGrabbing = (e) => {
+        if(imageContainer.classList.contains("grabbing")) {
+            imageContainer.classList.remove("grabbing")
+            e?.preventDefault()
+            console.log(`stopGrabbing()`, e)
+        }
+    }
+
+    const addImageGrabbing = (image) => {
+        image?.addEventListener('mousedown', (e) => {
+            if (!image.classList.contains("natural-zoom")) {
+                e.stopPropagation()
+                e.stopImmediatePropagation()
+                e.preventDefault()
+
+                imageContainer.classList.add("grabbing")
+                state.start.x = e.pageX - imageContainer.offsetLeft
+                state.scroll.x = imageContainer.scrollLeft
+                state.start.y = e.pageY - imageContainer.offsetTop
+                state.scroll.y = imageContainer.scrollTop
+            }
+        })
+
+        image?.addEventListener('mouseup', stopGrabbing)
+        image?.addEventListener('mouseleave', stopGrabbing)
+        image?.addEventListener('mousemove', (e) => {
+            if(imageContainer.classList.contains("grabbing")) {
+                e.stopPropagation()
+                e.stopImmediatePropagation()
+                e.preventDefault()
+
+                // Might need to increase this multiplier based on the image size to window size ratio
+                // The default 1:1 is pretty slow
+                const multiplier = 1.0
+
+                const deltaX = e.pageX - imageContainer.offsetLeft - state.start.x
+                imageContainer.scrollLeft = state.scroll.x - (deltaX * multiplier)
+                const deltaY = e.pageY - imageContainer.offsetTop - state.start.y
+                imageContainer.scrollTop = state.scroll.y - (deltaY * multiplier)
+            }
+        })
     }
 
     const clear = () => {
-        imageContainer.innerHTML = ''
+        imageContainer.innerHTML = ""
 
-        Object.keys(state).forEach(key => delete state[key])
+        Object.entries(initialState()).forEach(([key, value]) => state[key] = value)
+
+        stopGrabbing()
     }
 
     const close = () => {
         clear()
-        modalElem.classList.remove('active')
+        modalElem.classList.remove("active")
-        document.body.style.overflow = 'initial'
+        document.body.style.overflow = "initial"
     }
 
     /**
@@ -113,27 +149,28 @@ const imageModal = (function() {
 
         clear()
 
-        const options = typeof optionsFactory === 'function' ? optionsFactory() : optionsFactory
+        const options = typeof optionsFactory === "function" ? optionsFactory() : optionsFactory
-        const src = typeof options === 'string' ? options : options.src
+        const src = typeof options === "string" ? options : options.src
 
-        const imgElem = createElement('img', { src }, 'natural-zoom')
+        const imgElem = createElement("img", { src }, "natural-zoom")
+        addImageGrabbing(imgElem)
         imageContainer.appendChild(imgElem)
-        modalElem.classList.add('active')
+        modalElem.classList.add("active")
-        document.body.style.overflow = 'hidden'
+        document.body.style.overflow = "hidden"
         setZoomLevel(false)
 
-        if (typeof options === 'object' && options.previous) {
+        if (typeof options === "object" && options.previous) {
             state.previous = options.previous
-            backElem.style.display = 'unset'
+            backElem.style.display = "unset"
         } else {
-            backElem.style.display = 'none'
+            backElem.style.display = "none"
         }
 
-        if (typeof options === 'object' && options.next) {
+        if (typeof options === "object" && options.next) {
             state.next = options.next
-            forwardElem.style.display = 'unset'
+            forwardElem.style.display = "unset"
         } else {
-            forwardElem.style.display = 'none'
+            forwardElem.style.display = "none"
         }
     }
 
@@ -141,7 +178,7 @@ const imageModal = (function() {
         if (state.previous) {
             init(state.previous)
         } else {
-            backElem.style.display = 'none'
+            backElem.style.display = "none"
         }
     }
 
@@ -149,27 +186,27 @@ const imageModal = (function() {
         if (state.next) {
             init(state.next)
         } else {
-            forwardElem.style.display = 'none'
+            forwardElem.style.display = "none"
         }
     }
 
-    window.addEventListener('keydown', (e) => {
+    window.addEventListener("keydown", (e) => {
-        if (modalElem.classList.contains('active')) {
+        if (modalElem.classList.contains("active")) {
             switch (e.key) {
-                case 'Escape':
+                case "Escape":
                     close()
                     break
-                case 'ArrowLeft':
+                case "ArrowLeft":
                     back()
                     break
-                case 'ArrowRight':
+                case "ArrowRight":
                     forward()
                     break
             }
         }
     })
-    window.addEventListener('click', (e) => {
+    window.addEventListener("click", (e) => {
-        if (modalElem.classList.contains('active')) {
+        if (modalElem.classList.contains("active")) {
             if (e.target === backdrop || e.target === closeElem) {
                 close()
             }
@@ -180,9 +217,9 @@ const imageModal = (function() {
         }
     })
 
-    backElem.addEventListener('click', back)
+    backElem.addEventListener("click", back)
 
-    forwardElem.addEventListener('click', forward)
+    forwardElem.addEventListener("click", forward)
 
     /**
      * @param {() => (string | ImageModalRequest) | string | ImageModalRequest} optionsFactory

ui/media/js/image-modifiers.js

@@ -3,26 +3,26 @@ let modifiers = []
 let customModifiersGroupElement = undefined
 let customModifiersInitialContent
 
-let editorModifierEntries = document.querySelector('#editor-modifiers-entries')
+let editorModifierEntries = document.querySelector("#editor-modifiers-entries")
-let editorModifierTagsList = document.querySelector('#editor-inputs-tags-list')
+let editorModifierTagsList = document.querySelector("#editor-inputs-tags-list")
-let editorTagsContainer = document.querySelector('#editor-inputs-tags-container')
+let editorTagsContainer = document.querySelector("#editor-inputs-tags-container")
-let modifierCardSizeSlider = document.querySelector('#modifier-card-size-slider')
+let modifierCardSizeSlider = document.querySelector("#modifier-card-size-slider")
-let previewImageField = document.querySelector('#preview-image')
+let previewImageField = document.querySelector("#preview-image")
-let modifierSettingsBtn = document.querySelector('#modifier-settings-btn')
+let modifierSettingsBtn = document.querySelector("#modifier-settings-btn")
-let modifierSettingsOverlay = document.querySelector('#modifier-settings-config')
+let modifierSettingsOverlay = document.querySelector("#modifier-settings-config")
-let customModifiersTextBox = document.querySelector('#custom-modifiers-input')
+let customModifiersTextBox = document.querySelector("#custom-modifiers-input")
-let customModifierEntriesToolbar = document.querySelector('#editor-modifiers-entries-toolbar')
+let customModifierEntriesToolbar = document.querySelector("#editor-modifiers-entries-toolbar")
 
-const modifierThumbnailPath = 'media/modifier-thumbnails'
+const modifierThumbnailPath = "media/modifier-thumbnails"
-const activeCardClass = 'modifier-card-active'
+const activeCardClass = "modifier-card-active"
 const CUSTOM_MODIFIERS_KEY = "customModifiers"
 
 function createModifierCard(name, previews, removeBy) {
-    const modifierCard = document.createElement('div')
+    const modifierCard = document.createElement("div")
     let style = previewImageField.value
-    let styleIndex = (style=='portrait') ? 0 : 1
+    let styleIndex = style == "portrait" ? 0 : 1
 
-    modifierCard.className = 'modifier-card'
+    modifierCard.className = "modifier-card"
     modifierCard.innerHTML = `
     <div class="modifier-card-overlay"></div>
     <div class="modifier-card-image-container">
@@ -34,35 +34,35 @@ function createModifierCard(name, previews, removeBy) {
         <div class="modifier-card-label"><p></p></div>
     </div>`
 
-    const image = modifierCard.querySelector('.modifier-card-image')
+    const image = modifierCard.querySelector(".modifier-card-image")
-    const errorText =  modifierCard.querySelector('.modifier-card-error-label')
+    const errorText = modifierCard.querySelector(".modifier-card-error-label")
-    const label = modifierCard.querySelector('.modifier-card-label')
+    const label = modifierCard.querySelector(".modifier-card-label")
 
-    errorText.innerText = 'No Image'
+    errorText.innerText = "No Image"
 
-    if (typeof previews == 'object') {
+    if (typeof previews == "object") {
-        image.src = previews[styleIndex]; // portrait
+        image.src = previews[styleIndex] // portrait
-        image.setAttribute('preview-type', style)
+        image.setAttribute("preview-type", style)
     } else {
         image.remove()
     }
 
     const maxLabelLength = 30
-    const cardLabel = removeBy ? name.replace('by ', '') : name
+    const cardLabel = removeBy ? name.replace("by ", "") : name
 
-    if(cardLabel.length <= maxLabelLength) {
+    if (cardLabel.length <= maxLabelLength) {
-        label.querySelector('p').innerText = cardLabel
+        label.querySelector("p").innerText = cardLabel
     } else {
-        const tooltipText = document.createElement('span')
+        const tooltipText = document.createElement("span")
-        tooltipText.className = 'tooltip-text'
+        tooltipText.className = "tooltip-text"
         tooltipText.innerText = name
 
-        label.classList.add('tooltip')
+        label.classList.add("tooltip")
         label.appendChild(tooltipText)
 
-        label.querySelector('p').innerText = cardLabel.substring(0, maxLabelLength) + '...'
+        label.querySelector("p").innerText = cardLabel.substring(0, maxLabelLength) + "..."
     }
-    label.querySelector('p').dataset.fullName = name // preserve the full name
+    label.querySelector("p").dataset.fullName = name // preserve the full name
 
     return modifierCard
 }
@@ -71,55 +71,58 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
     const title = modifierGroup.category
     const modifiers = modifierGroup.modifiers
 
-    const titleEl = document.createElement('h5')
+    const titleEl = document.createElement("h5")
-    titleEl.className = 'collapsible'
+    titleEl.className = "collapsible"
     titleEl.innerText = title
 
-    const modifiersEl = document.createElement('div')
+    const modifiersEl = document.createElement("div")
-    modifiersEl.classList.add('collapsible-content', 'editor-modifiers-leaf')
+    modifiersEl.classList.add("collapsible-content", "editor-modifiers-leaf")
 
     if (initiallyExpanded === true) {
-        titleEl.className += ' active'
+        titleEl.className += " active"
     }
 
-    modifiers.forEach(modObj => {
+    modifiers.forEach((modObj) => {
         const modifierName = modObj.modifier
-        const modifierPreviews = modObj?.previews?.map(preview => `${IMAGE_REGEX.test(preview.image) ? preview.image : modifierThumbnailPath + '/' + preview.path}`)
+        const modifierPreviews = modObj?.previews?.map(
+            (preview) =>
+                `${IMAGE_REGEX.test(preview.image) ? preview.image : modifierThumbnailPath + "/" + preview.path}`
+        )
 
         const modifierCard = createModifierCard(modifierName, modifierPreviews, removeBy)
 
-        if(typeof modifierCard == 'object') {
+        if (typeof modifierCard == "object") {
             modifiersEl.appendChild(modifierCard)
             const trimmedName = trimModifiers(modifierName)
 
-            modifierCard.addEventListener('click', () => {
+            modifierCard.addEventListener("click", () => {
-                if (activeTags.map(x => trimModifiers(x.name)).includes(trimmedName)) {
+                if (activeTags.map((x) => trimModifiers(x.name)).includes(trimmedName)) {
                     // remove modifier from active array
-                    activeTags = activeTags.filter(x => trimModifiers(x.name) != trimmedName)
+                    activeTags = activeTags.filter((x) => trimModifiers(x.name) != trimmedName)
                     toggleCardState(trimmedName, false)
                 } else {
                     // add modifier to active array
                     activeTags.push({
-                        'name': modifierName,
+                        name: modifierName,
-                        'element': modifierCard.cloneNode(true),
+                        element: modifierCard.cloneNode(true),
-                        'originElement': modifierCard,
+                        originElement: modifierCard,
-                        'previews': modifierPreviews
+                        previews: modifierPreviews,
                     })
                     toggleCardState(trimmedName, true)
                 }
 
                 refreshTagsList()
-                document.dispatchEvent(new Event('refreshImageModifiers'))
+                document.dispatchEvent(new Event("refreshImageModifiers"))
             })
         }
     })
 
-    let brk = document.createElement('br')
+    let brk = document.createElement("br")
-    brk.style.clear = 'both'
+    brk.style.clear = "both"
     modifiersEl.appendChild(brk)
 
-    let e = document.createElement('div')
+    let e = document.createElement("div")
-    e.className = 'modifier-category'
+    e.className = "modifier-category"
     e.appendChild(titleEl)
     e.appendChild(modifiersEl)
 
@@ -130,87 +133,98 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
 
 function trimModifiers(tag) {
     // Remove trailing '-' and/or '+'
-    tag = tag.replace(/[-+]+$/, '');
+    tag = tag.replace(/[-+]+$/, "")
     // Remove parentheses at beginning and end
-    return tag.replace(/^[(]+|[\s)]+$/g, '');
+    return tag.replace(/^[(]+|[\s)]+$/g, "")
 }
 
 async function loadModifiers() {
     try {
-        let res = await fetch('/get/modifiers')
+        let res = await fetch("/get/modifiers")
         if (res.status === 200) {
             res = await res.json()
 
-            modifiers = res; // update global variable
+            modifiers = res // update global variable
 
             res.reverse()
 
             res.forEach((modifierGroup, idx) => {
-                createModifierGroup(modifierGroup, idx === res.length - 1, modifierGroup === 'Artist' ? true : false) // only remove "By " for artists
+                createModifierGroup(modifierGroup, idx === res.length - 1, modifierGroup === "Artist" ? true : false) // only remove "By " for artists
             })
 
             createCollapsibles(editorModifierEntries)
         }
     } catch (e) {
-        console.error('error fetching modifiers', e)
+        console.error("error fetching modifiers", e)
     }
 
     loadCustomModifiers()
     resizeModifierCards(modifierCardSizeSlider.value)
-    document.dispatchEvent(new Event('loadImageModifiers'))
+    document.dispatchEvent(new Event("loadImageModifiers"))
 }
 
 function refreshModifiersState(newTags, inactiveTags) {
     // clear existing modifiers
-    document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
+    document
-        const modifierName = modifierCard.querySelector('.modifier-card-label p').dataset.fullName // pick the full modifier name
+        .querySelector("#editor-modifiers")
-        if (activeTags.map(x => x.name).includes(modifierName)) {
+        .querySelectorAll(".modifier-card")
-            modifierCard.classList.remove(activeCardClass)
+        .forEach((modifierCard) => {
-            modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+            const modifierName = modifierCard.querySelector(".modifier-card-label p").dataset.fullName // pick the full modifier name
-        }
+            if (activeTags.map((x) => x.name).includes(modifierName)) {
-    })
+                modifierCard.classList.remove(activeCardClass)
+                modifierCard.querySelector(".modifier-card-image-overlay").innerText = "+"
+            }
+        })
     activeTags = []
 
     // set new modifiers
-    newTags.forEach(tag => {
+    newTags.forEach((tag) => {
         let found = false
-        document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
+        document
-            const modifierName = modifierCard.querySelector('.modifier-card-label p').dataset.fullName
+            .querySelector("#editor-modifiers")
-            const shortModifierName = modifierCard.querySelector('.modifier-card-label p').innerText
+            .querySelectorAll(".modifier-card")
-            if (trimModifiers(tag) == trimModifiers(modifierName)) {
+            .forEach((modifierCard) => {
-                // add modifier to active array
+                const modifierName = modifierCard.querySelector(".modifier-card-label p").dataset.fullName
-                if (!activeTags.map(x => x.name).includes(tag)) { // only add each tag once even if several custom modifier cards share the same tag
+                const shortModifierName = modifierCard.querySelector(".modifier-card-label p").innerText
-                    const imageModifierCard = modifierCard.cloneNode(true)
+                if (trimModifiers(tag) == trimModifiers(modifierName)) {
-                    imageModifierCard.querySelector('.modifier-card-label p').innerText = tag.replace(modifierName, shortModifierName)
+                    // add modifier to active array
-                    activeTags.push({
+                    if (!activeTags.map((x) => x.name).includes(tag)) {
-                        'name': tag,
+                        // only add each tag once even if several custom modifier cards share the same tag
-                        'element': imageModifierCard,
+                        const imageModifierCard = modifierCard.cloneNode(true)
-                        'originElement': modifierCard
+                        imageModifierCard.querySelector(".modifier-card-label p").innerText = tag.replace(
-                    })
+                            modifierName,
+                            shortModifierName
+                        )
+                        activeTags.push({
+                            name: tag,
+                            element: imageModifierCard,
+                            originElement: modifierCard,
+                        })
+                    }
+                    modifierCard.classList.add(activeCardClass)
+                    modifierCard.querySelector(".modifier-card-image-overlay").innerText = "-"
+                    found = true
                 }
-                modifierCard.classList.add(activeCardClass)
+            })
-                modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
+        if (found == false) {
-                found = true
+            // custom tag went missing, create one here
-            }
-        })
-        if (found == false) { // custom tag went missing, create one here
             let modifierCard = createModifierCard(tag, undefined, false) // create a modifier card for the missing tag, no image
-            
+
-            modifierCard.addEventListener('click', () => {
+            modifierCard.addEventListener("click", () => {
-                if (activeTags.map(x => x.name).includes(tag)) {
+                if (activeTags.map((x) => x.name).includes(tag)) {
                     // remove modifier from active array
-                    activeTags = activeTags.filter(x => x.name != tag)
+                    activeTags = activeTags.filter((x) => x.name != tag)
                     modifierCard.classList.remove(activeCardClass)
 
-                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+                    modifierCard.querySelector(".modifier-card-image-overlay").innerText = "+"
                 }
                 refreshTagsList()
             })
 
             activeTags.push({
-                'name': tag,
+                name: tag,
-                'element': modifierCard,
+                element: modifierCard,
-                'originElement': undefined  // no origin element for missing tags
+                originElement: undefined, // no origin element for missing tags
             })
         }
     })
@@ -220,41 +234,44 @@ function refreshModifiersState(newTags, inactiveTags) {
 function refreshInactiveTags(inactiveTags) {
     // update inactive tags
     if (inactiveTags !== undefined && inactiveTags.length > 0) {
-        activeTags.forEach (tag => {
+        activeTags.forEach((tag) => {
-            if (inactiveTags.find(element => element === tag.name) !== undefined) {
+            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')
+    let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay")
-    overlays.forEach (i => {
+    overlays.forEach((i) => {
-        let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName
+        let modifierName = i.parentElement.getElementsByClassName("modifier-card-label")[0].getElementsByTagName("p")[0]
-        if (inactiveTags?.find(element => element === modifierName) !== undefined) {
+            .dataset.fullName
-            i.parentElement.classList.add('modifier-toggle-inactive')
+        if (inactiveTags?.find((element) => trimModifiers(element) === modifierName) !== undefined) {
+            i.parentElement.classList.add("modifier-toggle-inactive")
         }
     })
 }
 
 function refreshTagsList(inactiveTags) {
-    editorModifierTagsList.innerHTML = ''
+    editorModifierTagsList.innerHTML = ""
 
     if (activeTags.length == 0) {
-        editorTagsContainer.style.display = 'none'
+        editorTagsContainer.style.display = "none"
         return
     } else {
-        editorTagsContainer.style.display = 'block'
+        editorTagsContainer.style.display = "block"
     }
 
     activeTags.forEach((tag, index) => {
-        tag.element.querySelector('.modifier-card-image-overlay').innerText = '-'
+        tag.element.querySelector(".modifier-card-image-overlay").innerText = "-"
-        tag.element.classList.add('modifier-card-tiny')
+        tag.element.classList.add("modifier-card-tiny")
 
         editorModifierTagsList.appendChild(tag.element)
 
-        tag.element.addEventListener('click', () => {
+        tag.element.addEventListener("click", () => {
-            let idx = activeTags.findIndex(o => { return o.name === tag.name })            
+            let idx = activeTags.findIndex((o) => {
+                return o.name === tag.name
+            })
 
             if (idx !== -1) {
                 toggleCardState(activeTags[idx].name, false)
@@ -262,88 +279,91 @@ function refreshTagsList(inactiveTags) {
                 activeTags.splice(idx, 1)
                 refreshTagsList()
             }
-            document.dispatchEvent(new Event('refreshImageModifiers'))
+            document.dispatchEvent(new Event("refreshImageModifiers"))
         })
     })
 
-    let brk = document.createElement('br')
+    let brk = document.createElement("br")
-    brk.style.clear = 'both'
+    brk.style.clear = "both"
     editorModifierTagsList.appendChild(brk)
     refreshInactiveTags(inactiveTags)
-    document.dispatchEvent(new Event('refreshImageModifiers')) // notify plugins that the image tags have been refreshed 
+    document.dispatchEvent(new Event("refreshImageModifiers")) // notify plugins that the image tags have been refreshed
 }
 
 function toggleCardState(modifierName, makeActive) {
-    document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(card => {
+    document
-        const name = card.querySelector('.modifier-card-label').innerText
+        .querySelector("#editor-modifiers")
-        if (   trimModifiers(modifierName) == trimModifiers(name)
+        .querySelectorAll(".modifier-card")
-            || trimModifiers(modifierName) == 'by ' + trimModifiers(name)) {
+        .forEach((card) => {
-            if(makeActive) {
+            const name = card.querySelector(".modifier-card-label").innerText
-                card.classList.add(activeCardClass)
+            if (
-                card.querySelector('.modifier-card-image-overlay').innerText = '-'
+                trimModifiers(modifierName) == trimModifiers(name) ||
+                trimModifiers(modifierName) == "by " + trimModifiers(name)
+            ) {
+                if (makeActive) {
+                    card.classList.add(activeCardClass)
+                    card.querySelector(".modifier-card-image-overlay").innerText = "-"
+                } else {
+                    card.classList.remove(activeCardClass)
+                    card.querySelector(".modifier-card-image-overlay").innerText = "+"
+                }
             }
-            else{
+        })
-                card.classList.remove(activeCardClass)
-                card.querySelector('.modifier-card-image-overlay').innerText = '+'
-            }
-        }
-    })
 }
 
 function changePreviewImages(val) {
-    const previewImages = document.querySelectorAll('.modifier-card-image-container img')
+    const previewImages = document.querySelectorAll(".modifier-card-image-container img")
 
     let previewArr = []
 
-    modifiers.map(x => x.modifiers).forEach(x => previewArr.push(...x.map(m => m.previews)))
+    modifiers.map((x) => x.modifiers).forEach((x) => previewArr.push(...x.map((m) => m.previews)))
-    
+
-    previewArr = previewArr.map(x => {
+    previewArr = previewArr.map((x) => {
         let obj = {}
 
-        x.forEach(preview => {
+        x.forEach((preview) => {
             obj[preview.name] = preview.path
         })
-        
+
         return obj
     })
 
-    previewImages.forEach(previewImage => {
+    previewImages.forEach((previewImage) => {
-        const currentPreviewType = previewImage.getAttribute('preview-type')
+        const currentPreviewType = previewImage.getAttribute("preview-type")
-        const relativePreviewPath = previewImage.src.split(modifierThumbnailPath + '/').pop()
+        const relativePreviewPath = previewImage.src.split(modifierThumbnailPath + "/").pop()
 
-        const previews = previewArr.find(preview => relativePreviewPath == preview[currentPreviewType])
+        const previews = previewArr.find((preview) => relativePreviewPath == preview[currentPreviewType])
 
-        if(typeof previews == 'object') {
+        if (typeof previews == "object") {
             let preview = null
 
-            if (val == 'portrait') {
+            if (val == "portrait") {
                 preview = previews.portrait
-            }
+            } else if (val == "landscape") {
-            else if (val == 'landscape') {
                 preview = previews.landscape
             }
 
-            if(preview != null) {
+            if (preview != null) {
                 previewImage.src = `${modifierThumbnailPath}/${preview}`
-                previewImage.setAttribute('preview-type', val)
+                previewImage.setAttribute("preview-type", val)
             }
         }
     })
 }
 
 function resizeModifierCards(val) {
-    const cardSizePrefix = 'modifier-card-size_'
+    const cardSizePrefix = "modifier-card-size_"
-    const modifierCardClass = 'modifier-card'
+    const modifierCardClass = "modifier-card"
 
     const modifierCards = document.querySelectorAll(`.${modifierCardClass}`)
-    const cardSize = n => `${cardSizePrefix}${n}`
+    const cardSize = (n) => `${cardSizePrefix}${n}`
 
-    modifierCards.forEach(card => {
+    modifierCards.forEach((card) => {
         // remove existing size classes
-        const classes = card.className.split(' ').filter(c => !c.startsWith(cardSizePrefix))
+        const classes = card.className.split(" ").filter((c) => !c.startsWith(cardSizePrefix))
-        card.className = classes.join(' ').trim()
+        card.className = classes.join(" ").trim()
 
-        if(val != 0) {
+        if (val != 0) {
             card.classList.add(cardSize(val))
         }
     })
@@ -352,7 +372,7 @@ function resizeModifierCards(val) {
 modifierCardSizeSlider.onchange = () => resizeModifierCards(modifierCardSizeSlider.value)
 previewImageField.onchange = () => changePreviewImages(previewImageField.value)
 
-modifierSettingsBtn.addEventListener('click', function(e) {
+modifierSettingsBtn.addEventListener("click", function(e) {
     modifierSettingsOverlay.classList.add("active")
     customModifiersTextBox.setSelectionRange(0, 0)
     customModifiersTextBox.focus()
@@ -360,7 +380,7 @@ modifierSettingsBtn.addEventListener('click', function(e) {
     e.stopPropagation()
 })
 
-modifierSettingsOverlay.addEventListener('keydown', function(e) {
+modifierSettingsOverlay.addEventListener("keydown", function(e) {
     switch (e.key) {
         case "Escape": // Escape to cancel
             customModifiersTextBox.value = customModifiersInitialContent // undo the changes
@@ -368,7 +388,8 @@ modifierSettingsOverlay.addEventListener('keydown', function(e) {
             e.stopPropagation()
             break
         case "Enter":
-            if (e.ctrlKey) { // Ctrl+Enter to confirm
+            if (e.ctrlKey) {
+                // Ctrl+Enter to confirm
                 modifierSettingsOverlay.classList.remove("active")
                 e.stopPropagation()
                 break
@@ -383,7 +404,7 @@ function saveCustomModifiers() {
 }
 
 function loadCustomModifiers() {
-    PLUGINS['MODIFIERS_LOAD'].forEach(fn=>fn.loader.call())
+    PLUGINS["MODIFIERS_LOAD"].forEach((fn) => fn.loader.call())
 }
 
-customModifiersTextBox.addEventListener('change', saveCustomModifiers)
+customModifiersTextBox.addEventListener("change", saveCustomModifiers)

ui/media/js/parameters.js

@@ -9,7 +9,13 @@ var ParameterType = {
     select_multiple: "select_multiple",
     slider: "slider",
     custom: "custom",
-};
+}
+
+/**
+ * Element shortcuts
+ */
+let parametersTable = document.querySelector("#system-settings-table")
+let networkParametersTable = document.querySelector("#system-settings-network-table")
 
 /**
  * JSDoc style
@@ -24,7 +30,6 @@ var ParameterType = {
  * @property {boolean?} saveInAppConfig
  */
 
-
 /** @type {Array.<Parameter>} */
 var PARAMETERS = [
     {
@@ -33,13 +38,14 @@ var PARAMETERS = [
         label: "Theme",
         default: "theme-default",
         note: "customize the look and feel of the ui",
-        options: [ // Note: options expanded dynamically
+        options: [
+            // Note: options expanded dynamically
             {
                 value: "theme-default",
-                label: "Default"
+                label: "Default",
-            }
+            },
         ],
-        icon: "fa-palette"
+        icon: "fa-palette",
     },
     {
         id: "save_to_disk",
@@ -55,7 +61,7 @@ var PARAMETERS = [
         label: "Save Location",
         render: (parameter) => {
             return `<input id="${parameter.id}" name="${parameter.id}" size="30" disabled>`
-        }
+        },
     },
     {
         id: "metadata_output_format",
@@ -66,19 +72,19 @@ var PARAMETERS = [
         options: [
             {
                 value: "none",
-                label: "none"
+                label: "none",
             },
             {
                 value: "txt",
-                label: "txt"
+                label: "txt",
             },
             {
                 value: "json",
-                label: "json"
+                label: "json",
             },
             {
                 value: "embed",
-                label: "embed"
+                label: "embed",
             },
             {
                 value: "embed,txt",
@@ -127,16 +133,17 @@ var PARAMETERS = [
         id: "vram_usage_level",
         type: ParameterType.select,
         label: "GPU Memory Usage",
-        note: "Faster performance requires more GPU memory (VRAM)<br/><br/>" +
+        note:
-              "<b>Balanced:</b> nearly as fast as High, much lower VRAM usage<br/>" +
+            "Faster performance requires more GPU memory (VRAM)<br/><br/>" +
-              "<b>High:</b> fastest, maximum GPU memory usage</br>" +
+            "<b>Balanced:</b> nearly as fast as High, much lower VRAM usage<br/>" +
-              "<b>Low:</b> slowest, recommended for GPUs with 3 to 4 GB memory",
+            "<b>High:</b> fastest, maximum GPU memory usage</br>" +
+            "<b>Low:</b> slowest, recommended for GPUs with 3 to 4 GB memory",
         icon: "fa-forward",
         default: "balanced",
         options: [
-            {value: "balanced", label: "Balanced"},
+            { value: "balanced", label: "Balanced" },
-            {value: "high", label: "High"},
+            { value: "high", label: "High" },
-            {value: "low", label: "Low"}
+            { value: "low", label: "Low" },
         ],
     },
     {
@@ -172,7 +179,8 @@ var PARAMETERS = [
         id: "confirm_dangerous_actions",
         type: ParameterType.checkbox,
         label: "Confirm dangerous actions",
-        note: "Actions that might lead to data loss must either be clicked with the shift key pressed, or confirmed in an 'Are you sure?' dialog",
+        note:
+            "Actions that might lead to data loss must either be clicked with the shift key pressed, or confirmed in an 'Are you sure?' dialog",
         icon: "fa-check-double",
         default: true,
     },
@@ -180,27 +188,31 @@ var PARAMETERS = [
         id: "listen_to_network",
         type: ParameterType.checkbox,
         label: "Make Stable Diffusion available on your network",
-        note: "Other devices on your network can access this web page",
+        note: "Other devices on your network can access this web page. Please restart the program after changing this.",
         icon: "fa-network-wired",
         default: true,
         saveInAppConfig: true,
+        table: networkParametersTable,
     },
     {
         id: "listen_port",
         type: ParameterType.custom,
         label: "Network port",
-        note: "Port that this server listens to. The '9000' part in 'http://localhost:9000'",
+        note:
+            "Port that this server listens to. The '9000' part in 'http://localhost:9000'. Please restart the program after changing this.",
         icon: "fa-anchor",
         render: (parameter) => {
             return `<input id="${parameter.id}" name="${parameter.id}" size="6" value="9000" onkeypress="preventNonNumericalInput(event)">`
         },
         saveInAppConfig: true,
+        table: networkParametersTable,
     },
     {
         id: "use_beta_channel",
         type: ParameterType.checkbox,
         label: "Beta channel",
-        note: "Get the latest features immediately (but could be less stable). Please restart the program after changing this.",
+        note:
+            "Get the latest features immediately (but could be less stable). Please restart the program after changing this.",
         icon: "fa-fire",
         default: false,
     },
@@ -208,15 +220,31 @@ var PARAMETERS = [
         id: "test_diffusers",
         type: ParameterType.checkbox,
         label: "Test Diffusers",
-        note: "<b>Experimental! Can have bugs!</b> Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.",
+        note:
+            "<b>Experimental! Can have bugs!</b> Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.",
         icon: "fa-bolt",
         default: false,
         saveInAppConfig: true,
     },
-];
+    {
+        id: "cloudflare",
+        type: ParameterType.custom,
+        label: "Cloudflare tunnel",
+        note: `<span id="cloudflare-off">Create a VPN tunnel to share your Easy Diffusion instance with your friends. This will
+               generate a web server address on the public Internet for your Easy Diffusion instance. </span>
+               <div id="cloudflare-on" class="displayNone"><div>This Easy Diffusion server is available on the Internet using the
+               address:</div><div><div id="cloudflare-address"></div><button id="copy-cloudflare-address">Copy</button></div></div>
+               <b>Anyone knowing this address can access your server.</b> The address of your server will change each time
+               you share a session.<br>
+               Uses <a href="https://try.cloudflare.com/" target="_blank">Cloudflare services</a>.`,
+        icon: ["fa-brands", "fa-cloudflare"],
+        render: () => '<button id="toggle-cloudflare-tunnel" class="primaryButton">Start</button>',
+        table: networkParametersTable,
+    }
+]
 
 function getParameterSettingsEntry(id) {
-    let parameter = PARAMETERS.filter(p => p.id === id)
+    let parameter = PARAMETERS.filter((p) => p.id === id)
     if (parameter.length === 0) {
         return
     }
@@ -224,72 +252,76 @@ function getParameterSettingsEntry(id) {
 }
 
 function sliderUpdate(event) {
-    if (event.srcElement.id.endsWith('-input')) {
+    if (event.srcElement.id.endsWith("-input")) {
-        let slider = document.getElementById(event.srcElement.id.slice(0,-6))
+        let slider = document.getElementById(event.srcElement.id.slice(0, -6))
         slider.value = event.srcElement.value
         slider.dispatchEvent(new Event("change"))
     } else {
-        let field = document.getElementById(event.srcElement.id+'-input')
+        let field = document.getElementById(event.srcElement.id + "-input")
         field.value = event.srcElement.value
         field.dispatchEvent(new Event("change"))
     }
 }
 
 /**
- * @param {Parameter} parameter 
+ * @param {Parameter} parameter
  * @returns {string | HTMLElement}
  */
 function getParameterElement(parameter) {
     switch (parameter.type) {
         case ParameterType.checkbox:
-            var is_checked = parameter.default ? " checked" : "";
+            var is_checked = parameter.default ? " checked" : ""
             return `<input id="${parameter.id}" name="${parameter.id}"${is_checked} type="checkbox">`
         case ParameterType.select:
         case ParameterType.select_multiple:
-            var options = (parameter.options || []).map(option => `<option value="${option.value}">${option.label}</option>`).join("")
+            var options = (parameter.options || [])
-            var multiple = (parameter.type == ParameterType.select_multiple ? 'multiple' : '')
+                .map((option) => `<option value="${option.value}">${option.label}</option>`)
+                .join("")
+            var multiple = parameter.type == ParameterType.select_multiple ? "multiple" : ""
             return `<select id="${parameter.id}" name="${parameter.id}" ${multiple}>${options}</select>`
         case ParameterType.slider:
             return `<input id="${parameter.id}" name="${parameter.id}" class="editor-slider" type="range" value="${parameter.default}" min="${parameter.slider_min}" max="${parameter.slider_max}" oninput="sliderUpdate(event)"> <input id="${parameter.id}-input" name="${parameter.id}-input" size="4" value="${parameter.default}" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)" oninput="sliderUpdate(event)">&nbsp;${parameter.slider_unit}`
         case ParameterType.custom:
             return parameter.render(parameter)
         default:
-            console.error(`Invalid type ${parameter.type} for parameter ${parameter.id}`);
+            console.error(`Invalid type ${parameter.type} for parameter ${parameter.id}`)
             return "ERROR: Invalid Type"
     }
 }
 
-let parametersTable = document.querySelector("#system-settings .parameters-table")
 /**
  * fill in the system settings popup table
  * @param {Array<Parameter> | undefined} parameters
  * */
 function initParameters(parameters) {
-    parameters.forEach(parameter => {
+    parameters.forEach((parameter) => {
         const element = getParameterElement(parameter)
-        const elementWrapper = createElement('div')
+        const elementWrapper = createElement("div")
         if (element instanceof Node) {
             elementWrapper.appendChild(element)
         } else {
             elementWrapper.innerHTML = element
         }
 
-        const note = typeof parameter.note === 'function' ? parameter.note(parameter) : parameter.note
+        const note = typeof parameter.note === "function" ? parameter.note(parameter) : parameter.note
         const noteElements = []
         if (note) {
-            const noteElement = createElement('small')
+            const noteElement = createElement("small")
             if (note instanceof Node) {
                 noteElement.appendChild(note)
             } else {
-                noteElement.innerHTML = note || ''
+                noteElement.innerHTML = note || ""
             }
             noteElements.push(noteElement)
         }
 
-        const icon = parameter.icon ? [createElement('i', undefined, ['fa', parameter.icon])] : []
+        if (typeof(parameter.icon) == "string") {
+            parameter.icon = [parameter.icon]
+        }
+        const icon = parameter.icon ? [createElement("i", undefined, ["fa", ...parameter.icon])] : []
 
-        const label = typeof parameter.label === 'function' ? parameter.label(parameter) : parameter.label
+        const label = typeof parameter.label === "function" ? parameter.label(parameter) : parameter.label
-        const labelElement = createElement('label', { for: parameter.id })
+        const labelElement = createElement("label", { for: parameter.id })
         if (label instanceof Node) {
             labelElement.appendChild(label)
         } else {
@@ -297,16 +329,22 @@ function initParameters(parameters) {
         }
 
         const newrow = createElement(
-            'div',
+            "div",
-            { 'data-setting-id': parameter.id, 'data-save-in-app-config': parameter.saveInAppConfig },
+            { "data-setting-id": parameter.id, "data-save-in-app-config": parameter.saveInAppConfig },
             undefined,
             [
-                createElement('div', undefined, undefined, icon),
+                createElement("div", undefined, undefined, icon),
-                createElement('div', undefined, undefined, [labelElement, ...noteElements]),
+                createElement("div", undefined, undefined, [labelElement, ...noteElements]),
                 elementWrapper,
             ]
         )
-        parametersTable.appendChild(newrow)
+
+        let p = parametersTable
+        if (parameter.table) {
+            p = parameter.table
+        } 
+        p.appendChild(newrow)
+
         parameter.settingsEntry = newrow
     })
 }
@@ -314,22 +352,25 @@ function initParameters(parameters) {
 initParameters(PARAMETERS)
 
 // listen to parameters from plugins
-PARAMETERS.addEventListener('push', (...items) => {
+PARAMETERS.addEventListener("push", (...items) => {
     initParameters(items)
-    
+
-    if (items.find(item => item.saveInAppConfig)) {
+    if (items.find((item) => item.saveInAppConfig)) {
-        console.log('Reloading app config for new parameters', items.map(p => p.id))
+        console.log(
+            "Reloading app config for new parameters",
+            items.map((p) => p.id)
+        )
         getAppConfig()
     }
 })
 
-let vramUsageLevelField = document.querySelector('#vram_usage_level')
+let vramUsageLevelField = document.querySelector("#vram_usage_level")
-let useCPUField = document.querySelector('#use_cpu')
+let useCPUField = document.querySelector("#use_cpu")
-let autoPickGPUsField = document.querySelector('#auto_pick_gpus')
+let autoPickGPUsField = document.querySelector("#auto_pick_gpus")
-let useGPUsField = document.querySelector('#use_gpus')
+let useGPUsField = document.querySelector("#use_gpus")
-let saveToDiskField = document.querySelector('#save_to_disk')
+let saveToDiskField = document.querySelector("#save_to_disk")
-let diskPathField = document.querySelector('#diskPath')
+let diskPathField = document.querySelector("#diskPath")
-let metadataOutputFormatField = document.querySelector('#metadata_output_format')
+let metadataOutputFormatField = document.querySelector("#metadata_output_format")
 let listenToNetworkField = document.querySelector("#listen_to_network")
 let listenPortField = document.querySelector("#listen_port")
 let useBetaChannelField = document.querySelector("#use_beta_channel")
@@ -337,35 +378,34 @@ let uiOpenBrowserOnStartField = document.querySelector("#ui_open_browser_on_star
 let confirmDangerousActionsField = document.querySelector("#confirm_dangerous_actions")
 let testDiffusers = document.querySelector("#test_diffusers")
 
-let saveSettingsBtn = document.querySelector('#save-system-settings-btn')
+let saveSettingsBtn = document.querySelector("#save-system-settings-btn")
-
 
 async function changeAppConfig(configDelta) {
     try {
-        let res = await fetch('/app_config', {
+        let res = await fetch("/app_config", {
-            method: 'POST',
+            method: "POST",
             headers: {
-                'Content-Type': 'application/json'
+                "Content-Type": "application/json",
             },
-            body: JSON.stringify(configDelta)
+            body: JSON.stringify(configDelta),
         })
         res = await res.json()
 
-        console.log('set config status response', res)
+        console.log("set config status response", res)
     } catch (e) {
-        console.log('set config status error', e)
+        console.log("set config status error", e)
     }
 }
 
 async function getAppConfig() {
     try {
-        let res = await fetch('/get/app_config')
+        let res = await fetch("/get/app_config")
         const config = await res.json()
 
         applySettingsFromConfig(config)
 
         // custom overrides
-        if (config.update_branch === 'beta') {
+        if (config.update_branch === "beta") {
             useBetaChannelField.checked = true
             document.querySelector("#updateBranchLabel").innerText = "(beta)"
         } else {
@@ -380,45 +420,60 @@ async function getAppConfig() {
         if (config.net && config.net.listen_port !== undefined) {
             listenPortField.value = config.net.listen_port
         }
-        if (config.test_diffusers === undefined || config.update_branch === 'main') {
+
-            testDiffusers.checked = false
+        const testDiffusersEnabled = config.test_diffusers && config.update_branch !== "main"
-            document.querySelector("#lora_model_container").style.display = 'none'
+        testDiffusers.checked = testDiffusersEnabled
-            document.querySelector("#lora_alpha_container").style.display = 'none'
+
+        if (!testDiffusersEnabled) {
+            document.querySelector("#lora_model_container").style.display = "none"
+            document.querySelector("#lora_alpha_container").style.display = "none"
+            document.querySelector("#tiling_container").style.display = "none"
+
+            document.querySelectorAll("#sampler_name option.diffusers-only").forEach((option) => {
+                option.style.display = "none"
+            })
         } else {
-            testDiffusers.checked = config.test_diffusers && config.update_branch !== 'main'
+            document.querySelector("#lora_model_container").style.display = ""
-            document.querySelector("#lora_model_container").style.display = (testDiffusers.checked ? '' : 'none')
+            document.querySelector("#lora_alpha_container").style.display = loraModelField.value ? "" : "none"
-            document.querySelector("#lora_alpha_container").style.display = (testDiffusers.checked && loraModelField.value !== "" ? '' : 'none')
+            document.querySelector("#tiling_container").style.display = ""
+
+            document.querySelectorAll("#sampler_name option.k_diffusion-only").forEach((option) => {
+                option.disabled = true
+            })
+            document.querySelector("#clip_skip_config").classList.remove("displayNone")
         }
 
-        console.log('get config status response', config)
+        console.log("get config status response", config)
 
         return config
     } catch (e) {
-        console.log('get config status error', e)
+        console.log("get config status error", e)
 
         return {}
     }
 }
 
 function applySettingsFromConfig(config) {
-    Array.from(parametersTable.children).forEach(parameterRow => {
+    Array.from(parametersTable.children).forEach((parameterRow) => {
-        if (parameterRow.dataset.settingId in config && parameterRow.dataset.saveInAppConfig === 'true') {
+        if (parameterRow.dataset.settingId in config && parameterRow.dataset.saveInAppConfig === "true") {
             const configValue = config[parameterRow.dataset.settingId]
-            const parameterElement = document.getElementById(parameterRow.dataset.settingId) ||
+            const parameterElement =
-                parameterRow.querySelector('input') || parameterRow.querySelector('select')
+                document.getElementById(parameterRow.dataset.settingId) ||
+                parameterRow.querySelector("input") ||
+                parameterRow.querySelector("select")
 
             switch (parameterElement?.tagName) {
-                case 'INPUT':
+                case "INPUT":
-                    if (parameterElement.type === 'checkbox') {
+                    if (parameterElement.type === "checkbox") {
                         parameterElement.checked = configValue
                     } else {
                         parameterElement.value = configValue
                     }
-                    parameterElement.dispatchEvent(new Event('change'))
+                    parameterElement.dispatchEvent(new Event("change"))
                     break
-                case 'SELECT':
+                case "SELECT":
                     if (Array.isArray(configValue)) {
-                        Array.from(parameterElement.options).forEach(option => {
+                        Array.from(parameterElement.options).forEach((option) => {
                             if (configValue.includes(option.value || option.text)) {
                                 option.selected = true
                             }
@@ -426,82 +481,85 @@ function applySettingsFromConfig(config) {
                     } else {
                         parameterElement.value = configValue
                     }
-                    parameterElement.dispatchEvent(new Event('change'))
+                    parameterElement.dispatchEvent(new Event("change"))
                     break
             }
         }
     })
 }
 
-saveToDiskField.addEventListener('change', function(e) {
+saveToDiskField.addEventListener("change", function(e) {
     diskPathField.disabled = !this.checked
     metadataOutputFormatField.disabled = !this.checked
 })
 
 function getCurrentRenderDeviceSelection() {
-    let selectedGPUs = $('#use_gpus').val()
+    let selectedGPUs = $("#use_gpus").val()
 
     if (useCPUField.checked && !autoPickGPUsField.checked) {
-        return 'cpu'
+        return "cpu"
     }
     if (autoPickGPUsField.checked || selectedGPUs.length == 0) {
-        return 'auto'
+        return "auto"
     }
 
-    return selectedGPUs.join(',')
+    return selectedGPUs.join(",")
 }
 
-useCPUField.addEventListener('click', function() {
+useCPUField.addEventListener("click", function() {
-    let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
+    let gpuSettingEntry = getParameterSettingsEntry("use_gpus")
-    let autoPickGPUSettingEntry = getParameterSettingsEntry('auto_pick_gpus')
+    let autoPickGPUSettingEntry = getParameterSettingsEntry("auto_pick_gpus")
     if (this.checked) {
-        gpuSettingEntry.style.display = 'none'
+        gpuSettingEntry.style.display = "none"
-        autoPickGPUSettingEntry.style.display = 'none'
+        autoPickGPUSettingEntry.style.display = "none"
-        autoPickGPUsField.setAttribute('data-old-value', autoPickGPUsField.checked)
+        autoPickGPUsField.setAttribute("data-old-value", autoPickGPUsField.checked)
         autoPickGPUsField.checked = false
     } else if (useGPUsField.options.length >= MIN_GPUS_TO_SHOW_SELECTION) {
-        gpuSettingEntry.style.display = ''
+        gpuSettingEntry.style.display = ""
-        autoPickGPUSettingEntry.style.display = ''
+        autoPickGPUSettingEntry.style.display = ""
-        let oldVal = autoPickGPUsField.getAttribute('data-old-value')
+        let oldVal = autoPickGPUsField.getAttribute("data-old-value")
-        if (oldVal === null || oldVal === undefined) { // the UI started with CPU selected by default
+        if (oldVal === null || oldVal === undefined) {
+            // the UI started with CPU selected by default
             autoPickGPUsField.checked = true
         } else {
-            autoPickGPUsField.checked = (oldVal === 'true')
+            autoPickGPUsField.checked = oldVal === "true"
         }
-        gpuSettingEntry.style.display = (autoPickGPUsField.checked ? 'none' : '')
+        gpuSettingEntry.style.display = autoPickGPUsField.checked ? "none" : ""
     }
 })
 
-useGPUsField.addEventListener('click', function() {
+useGPUsField.addEventListener("click", function() {
-    let selectedGPUs = $('#use_gpus').val()
+    let selectedGPUs = $("#use_gpus").val()
-    autoPickGPUsField.checked = (selectedGPUs.length === 0)
+    autoPickGPUsField.checked = selectedGPUs.length === 0
 })
 
-autoPickGPUsField.addEventListener('click', function() {
+autoPickGPUsField.addEventListener("click", function() {
     if (this.checked) {
-        $('#use_gpus').val([])
+        $("#use_gpus").val([])
     }
 
-    let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
+    let gpuSettingEntry = getParameterSettingsEntry("use_gpus")
-    gpuSettingEntry.style.display = (this.checked ? 'none' : '')
+    gpuSettingEntry.style.display = this.checked ? "none" : ""
 })
 
-async function setDiskPath(defaultDiskPath, force=false) {
+async function setDiskPath(defaultDiskPath, force = false) {
     var diskPath = getSetting("diskPath")
-    if (force || diskPath == '' || diskPath == undefined || diskPath == "undefined") {
+    if (force || diskPath == "" || diskPath == undefined || diskPath == "undefined") {
         setSetting("diskPath", defaultDiskPath)
     }
 }
 
 function setDeviceInfo(devices) {
     let cpu = devices.all.cpu.name
-    let allGPUs = Object.keys(devices.all).filter(d => d != 'cpu')
+    let allGPUs = Object.keys(devices.all).filter((d) => d != "cpu")
     let activeGPUs = Object.keys(devices.active)
 
     function ID_TO_TEXT(d) {
         let info = devices.all[d]
         if ("mem_free" in info && "mem_total" in info) {
-            return `${info.name} <small>(${d}) (${info.mem_free.toFixed(1)}Gb free / ${info.mem_total.toFixed(1)} Gb total)</small>`
+            return `${info.name} <small>(${d}) (${info.mem_free.toFixed(1)}Gb free / ${info.mem_total.toFixed(
+                1
+            )} Gb total)</small>`
         } else {
             return `${info.name} <small>(${d}) (no memory info)</small>`
         }
@@ -510,122 +568,155 @@ function setDeviceInfo(devices) {
     allGPUs = allGPUs.map(ID_TO_TEXT)
     activeGPUs = activeGPUs.map(ID_TO_TEXT)
 
-    let systemInfoEl = document.querySelector('#system-info')
+    let systemInfoEl = document.querySelector("#system-info")
-    systemInfoEl.querySelector('#system-info-cpu').innerText = cpu
+    systemInfoEl.querySelector("#system-info-cpu").innerText = cpu
-    systemInfoEl.querySelector('#system-info-gpus-all').innerHTML = allGPUs.join('</br>')
+    systemInfoEl.querySelector("#system-info-gpus-all").innerHTML = allGPUs.join("</br>")
-    systemInfoEl.querySelector('#system-info-rendering-devices').innerHTML = activeGPUs.join('</br>')
+    systemInfoEl.querySelector("#system-info-rendering-devices").innerHTML = activeGPUs.join("</br>")
 }
 
 function setHostInfo(hosts) {
     let port = listenPortField.value
-    hosts = hosts.map(addr => `http://${addr}:${port}/`).map(url => `<div><a href="${url}">${url}</a></div>`)
+    hosts = hosts.map((addr) => `http://${addr}:${port}/`).map((url) => `<div><a href="${url}">${url}</a></div>`)
-    document.querySelector('#system-info-server-hosts').innerHTML = hosts.join('')
+    document.querySelector("#system-info-server-hosts").innerHTML = hosts.join("")
 }
 
 async function getSystemInfo() {
     try {
         const res = await SD.getSystemInfo()
-        let devices = res['devices']
+        let devices = res["devices"]
 
-        let allDeviceIds = Object.keys(devices['all']).filter(d => d !== 'cpu')
+        let allDeviceIds = Object.keys(devices["all"]).filter((d) => d !== "cpu")
-        let activeDeviceIds = Object.keys(devices['active']).filter(d => d !== 'cpu')
+        let activeDeviceIds = Object.keys(devices["active"]).filter((d) => d !== "cpu")
 
         if (activeDeviceIds.length === 0) {
             useCPUField.checked = true
         }
 
         if (allDeviceIds.length < MIN_GPUS_TO_SHOW_SELECTION || useCPUField.checked) {
-            let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
+            let gpuSettingEntry = getParameterSettingsEntry("use_gpus")
-            gpuSettingEntry.style.display = 'none'
+            gpuSettingEntry.style.display = "none"
-            let autoPickGPUSettingEntry = getParameterSettingsEntry('auto_pick_gpus')
+            let autoPickGPUSettingEntry = getParameterSettingsEntry("auto_pick_gpus")
-            autoPickGPUSettingEntry.style.display = 'none'
+            autoPickGPUSettingEntry.style.display = "none"
         }
 
         if (allDeviceIds.length === 0) {
             useCPUField.checked = true
             useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
+
+            getParameterSettingsEntry("use_cpu").addEventListener("click", function() {
+                alert(
+                    "Sorry, we could not find a compatible graphics card! Easy Diffusion supports graphics cards with minimum 2 GB of RAM. " +
+                        "Only NVIDIA cards are supported on Windows. NVIDIA and AMD cards are supported on Linux.<br/><br/>" +
+                        "If you have a compatible graphics card, please try updating to the latest drivers.<br/><br/>" +
+                        "Only the CPU can be used for generating images, without a compatible graphics card.",
+                    "No compatible graphics card found!"
+                )
+            })
         }
 
-        autoPickGPUsField.checked = (devices['config'] === 'auto')
+        autoPickGPUsField.checked = devices["config"] === "auto"
 
-        useGPUsField.innerHTML = ''
+        useGPUsField.innerHTML = ""
-        allDeviceIds.forEach(device => {
+        allDeviceIds.forEach((device) => {
-            let deviceName = devices['all'][device]['name']
+            let deviceName = devices["all"][device]["name"]
             let deviceOption = `<option value="${device}">${deviceName} (${device})</option>`
-            useGPUsField.insertAdjacentHTML('beforeend', deviceOption)
+            useGPUsField.insertAdjacentHTML("beforeend", deviceOption)
         })
 
         if (autoPickGPUsField.checked) {
-            let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
+            let gpuSettingEntry = getParameterSettingsEntry("use_gpus")
-            gpuSettingEntry.style.display = 'none'
+            gpuSettingEntry.style.display = "none"
         } else {
-            $('#use_gpus').val(activeDeviceIds)
+            $("#use_gpus").val(activeDeviceIds)
         }
 
-        setDeviceInfo(devices)
+        document.dispatchEvent(new CustomEvent("system_info_update", { detail: devices }))
-        setHostInfo(res['hosts'])
+        setHostInfo(res["hosts"])
         let force = false
-        if (res['enforce_output_dir'] !== undefined) {
+        if (res["enforce_output_dir"] !== undefined) {
-            force = res['enforce_output_dir']
+            force = res["enforce_output_dir"]
             if (force == true) {
-               saveToDiskField.checked = true
+                saveToDiskField.checked = true
-               metadataOutputFormatField.disabled = false
+                metadataOutputFormatField.disabled = false
             }
             saveToDiskField.disabled = force
             diskPathField.disabled = force
         }
-        setDiskPath(res['default_output_dir'], force)
+        setDiskPath(res["default_output_dir"], force)
     } catch (e) {
-        console.log('error fetching devices', e)
+        console.log("error fetching devices", e)
     }
 }
 
-saveSettingsBtn.addEventListener('click', function() {
+saveSettingsBtn.addEventListener("click", function() {
-    if (listenPortField.value == '') {
+    if (listenPortField.value == "") {
-        alert('The network port field must not be empty.')
+        alert("The network port field must not be empty.")
         return
     }
     if (listenPortField.value < 1 || listenPortField.value > 65535) {
-        alert('The network port must be a number from 1 to 65535')
+        alert("The network port must be a number from 1 to 65535")
         return
     }
-    const updateBranch = (useBetaChannelField.checked ? 'beta' : 'main')
+    const updateBranch = useBetaChannelField.checked ? "beta" : "main"
 
     const updateAppConfigRequest = {
-        'render_devices': getCurrentRenderDeviceSelection(),
+        render_devices: getCurrentRenderDeviceSelection(),
-        'update_branch': updateBranch,
+        update_branch: updateBranch,
     }
 
-    Array.from(parametersTable.children).forEach(parameterRow => {
+    Array.from(parametersTable.children).forEach((parameterRow) => {
-        if (parameterRow.dataset.saveInAppConfig === 'true') {
+        if (parameterRow.dataset.saveInAppConfig === "true") {
-            const parameterElement = document.getElementById(parameterRow.dataset.settingId) ||
+            const parameterElement =
-                parameterRow.querySelector('input') || parameterRow.querySelector('select')
+                document.getElementById(parameterRow.dataset.settingId) ||
+                parameterRow.querySelector("input") ||
+                parameterRow.querySelector("select")
 
             switch (parameterElement?.tagName) {
-                case 'INPUT':
+                case "INPUT":
-                    if (parameterElement.type === 'checkbox') {
+                    if (parameterElement.type === "checkbox") {
                         updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.checked
                     } else {
                         updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.value
                     }
                     break
-                case 'SELECT':
+                case "SELECT":
                     if (parameterElement.multiple) {
                         updateAppConfigRequest[parameterRow.dataset.settingId] = Array.from(parameterElement.options)
-                            .filter(option => option.selected)
+                            .filter((option) => option.selected)
-                            .map(option => option.value || option.text)
+                            .map((option) => option.value || option.text)
                     } else {
                         updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.value
                     }
                     break
                 default:
-                    console.error(`Setting parameter ${parameterRow.dataset.settingId} couldn't be saved to app.config - element #${parameter.id} is a <${parameterElement?.tagName} /> instead of a <input /> or a <select />!`)
+                    console.error(
+                        `Setting parameter ${parameterRow.dataset.settingId} couldn't be saved to app.config - element #${parameter.id} is a <${parameterElement?.tagName} /> instead of a <input /> or a <select />!`
+                    )
                     break
             }
         }
     })
 
     const savePromise = changeAppConfig(updateAppConfigRequest)
-    saveSettingsBtn.classList.add('active')
+    showToast("Settings saved")
-    Promise.all([savePromise, asyncDelay(300)]).then(() => saveSettingsBtn.classList.remove('active'))
+    saveSettingsBtn.classList.add("active")
+    Promise.all([savePromise, asyncDelay(300)]).then(() => saveSettingsBtn.classList.remove("active"))
 })
+
+listenToNetworkField.addEventListener("change", debounce( ()=>{
+    saveSettingsBtn.click()
+}, 1000))
+
+listenPortField.addEventListener("change", debounce( ()=>{
+    saveSettingsBtn.click()
+}, 1000))
+
+let copyCloudflareAddressBtn = document.querySelector("#copy-cloudflare-address")
+let cloudflareAddressField = document.getElementById("cloudflare-address")
+
+copyCloudflareAddressBtn.addEventListener("click", (e) => {
+    navigator.clipboard.writeText(cloudflareAddressField.innerHTML)
+    showToast("Copied server address to clipboard")
+})
+
+document.addEventListener("system_info_update", (e) => setDeviceInfo(e.detail))

ui/media/js/plugins.js

@@ -3,7 +3,7 @@ const PLUGIN_API_VERSION = "1.0"
 const PLUGINS = {
     /**
      * Register new buttons to show on each output image.
-     * 
+     *
      * Example:
      * PLUGINS['IMAGE_INFO_BUTTONS'].push({
      *   text: 'Make a Similar Image',
@@ -29,14 +29,20 @@ const PLUGINS = {
     MODIFIERS_LOAD: [],
     TASK_CREATE: [],
     OUTPUTS_FORMATS: new ServiceContainer(
-        function png() { return (reqBody) => new SD.RenderTask(reqBody) }
+        function png() {
-        , function jpeg() { return (reqBody) => new SD.RenderTask(reqBody) }
+            return (reqBody) => new SD.RenderTask(reqBody)
-        , function webp() { return (reqBody) => new SD.RenderTask(reqBody) }
+        },
+        function jpeg() {
+            return (reqBody) => new SD.RenderTask(reqBody)
+        },
+        function webp() {
+            return (reqBody) => new SD.RenderTask(reqBody)
+        }
     ),
 }
 PLUGINS.OUTPUTS_FORMATS.register = function(...args) {
     const service = ServiceContainer.prototype.register.apply(this, args)
-    if (typeof outputFormatField !== 'undefined') {
+    if (typeof outputFormatField !== "undefined") {
         const newOption = document.createElement("option")
         newOption.setAttribute("value", service.name)
         newOption.innerText = service.name
@@ -46,13 +52,13 @@ PLUGINS.OUTPUTS_FORMATS.register = function(...args) {
 }
 
 function loadScript(url) {
-    const script = document.createElement('script')
+    const script = document.createElement("script")
     const promiseSrc = new PromiseSource()
-    script.addEventListener('error', () => promiseSrc.reject(new Error(`Script "${url}" couldn't be loaded.`)))
+    script.addEventListener("error", () => promiseSrc.reject(new Error(`Script "${url}" couldn't be loaded.`)))
-    script.addEventListener('load', () => promiseSrc.resolve(url))
+    script.addEventListener("load", () => promiseSrc.resolve(url))
-    script.src = url + '?t=' + Date.now()
+    script.src = url + "?t=" + Date.now()
 
-    console.log('loading script', url)
+    console.log("loading script", url)
     document.head.appendChild(script)
 
     return promiseSrc.promise
@@ -60,7 +66,7 @@ function loadScript(url) {
 
 async function loadUIPlugins() {
     try {
-        const res = await fetch('/get/ui_plugins')
+        const res = await fetch("/get/ui_plugins")
         if (!res.ok) {
             console.error(`Error HTTP${res.status} while loading plugins list. - ${res.statusText}`)
             return
@@ -69,6 +75,6 @@ async function loadUIPlugins() {
         const loadingPromises = plugins.map(loadScript)
         return await Promise.allSettled(loadingPromises)
     } catch (e) {
-        console.log('error fetching plugin paths', e)
+        console.log("error fetching plugin paths", e)
     }
 }

ui/media/js/searchable-models.js

@@ -21,14 +21,13 @@ let hypernetworkModelField = new ModelDropdown(document.querySelector('#hypernet
 
 3) Model dropdowns will be refreshed automatically when the reload models button is invoked.
 */
-class ModelDropdown
+class ModelDropdown {
-{
     modelFilter //= document.querySelector("#model-filter")
     modelFilterArrow //= document.querySelector("#model-filter-arrow")
     modelList //= document.querySelector("#model-list")
     modelResult //= document.querySelector("#model-result")
     modelNoResult //= document.querySelector("#model-no-result")
-    
+
     currentSelection //= { elem: undefined, value: '', path: ''}
     highlightedModelEntry //= undefined
     activeModel //= undefined
@@ -39,6 +38,8 @@ class ModelDropdown
     noneEntry //= ''
     modelFilterInitialized //= undefined
 
+    sorted //= true
+
     /* MIMIC A REGULAR INPUT FIELD */
     get parentElement() {
         return this.modelFilter.parentElement
@@ -59,11 +60,11 @@ class ModelDropdown
     set disabled(state) {
         this.modelFilter.disabled = state
         if (this.modelFilterArrow) {
-            this.modelFilterArrow.style.color = state ? 'dimgray' : ''
+            this.modelFilterArrow.style.color = state ? "dimgray" : ""
         }
     }
     get modelElements() {
-        return this.modelList.querySelectorAll('.model-file')
+        return this.modelList.querySelectorAll(".model-file")
     }
     addEventListener(type, listener, options) {
         return this.modelFilter.addEventListener(type, listener, options)
@@ -82,21 +83,39 @@ class ModelDropdown
         }
     }
 
-    /* SEARCHABLE INPUT */    
+    /* SEARCHABLE INPUT */
-    constructor (input, modelKey, noneEntry = '') {
+
+    constructor(input, modelKey, noneEntry = "", sorted = true) {
         this.modelFilter = input
         this.noneEntry = noneEntry
         this.modelKey = modelKey
+        this.sorted = sorted
 
-        if (modelsOptions !== undefined) { // reuse models from cache (only useful for plugins, which are loaded after models)
+        if (modelsOptions !== undefined) {
-            this.inputModels = modelsOptions[this.modelKey]
+            // reuse models from cache (only useful for plugins, which are loaded after models)
+            this.inputModels = []
+            let modelKeys = Array.isArray(this.modelKey) ? this.modelKey : [this.modelKey]
+            for (let i = 0; i < modelKeys.length; i++) {
+                let key = modelKeys[i]
+                let k = Array.isArray(modelsOptions[key]) ? modelsOptions[key] : [modelsOptions[key]]
+                this.inputModels.push(...k)
+            }
             this.populateModels()
         }
-        document.addEventListener("refreshModels", this.bind(function(e) {
+        document.addEventListener(
-            // reload the models
+            "refreshModels",
-            this.inputModels = modelsOptions[this.modelKey]
+            this.bind(function(e) {
-            this.populateModels()
+                // reload the models
-        }, this))
+                this.inputModels = []
+                let modelKeys = Array.isArray(this.modelKey) ? this.modelKey : [this.modelKey]
+                for (let i = 0; i < modelKeys.length; i++) {
+                    let key = modelKeys[i]
+                    let k = Array.isArray(modelsOptions[key]) ? modelsOptions[key] : [modelsOptions[key]]
+                    this.inputModels.push(...k)
+                }
+                this.populateModels()
+            }, this)
+        )
     }
 
     saveCurrentSelection(elem, value, path) {
@@ -105,13 +124,13 @@ class ModelDropdown
         this.currentSelection.path = path
         this.modelFilter.dataset.path = path
         this.modelFilter.value = value
-        this.modelFilter.dispatchEvent(new Event('change'))
+        this.modelFilter.dispatchEvent(new Event("change"))
     }
-    
+
     processClick(e) {
         e.preventDefault()
-        if (e.srcElement.classList.contains('model-file') || e.srcElement.classList.contains('fa-file')) {
+        if (e.srcElement.classList.contains("model-file") || e.srcElement.classList.contains("fa-file")) {
-            const elem = e.srcElement.classList.contains('model-file') ? e.srcElement : e.srcElement.parentElement
+            const elem = e.srcElement.classList.contains("model-file") ? e.srcElement : e.srcElement.parentElement
             this.saveCurrentSelection(elem, elem.innerText, elem.dataset.path)
             this.hideModelList()
             this.modelFilter.focus()
@@ -126,66 +145,67 @@ class ModelDropdown
             return undefined
         }
 
-        return modelElements.slice(0, index).reverse().find(e => e.style.display === 'list-item')
+        return modelElements
+            .slice(0, index)
+            .reverse()
+            .find((e) => e.style.display === "list-item")
     }
 
     getLastVisibleChild(elem) {
         let lastElementChild = elem.lastElementChild
-        if (lastElementChild.style.display == 'list-item') return lastElementChild
+        if (lastElementChild.style.display == "list-item") return lastElementChild
         return this.getPreviousVisibleSibling(lastElementChild)
     }
-    
+
     getNextVisibleSibling(elem) {
         const modelElements = Array.from(this.modelElements)
         const index = modelElements.indexOf(elem)
-        return modelElements.slice(index + 1).find(e => e.style.display === 'list-item')
+        return modelElements.slice(index + 1).find((e) => e.style.display === "list-item")
     }
-    
+
     getFirstVisibleChild(elem) {
         let firstElementChild = elem.firstElementChild
-        if (firstElementChild.style.display == 'list-item') return firstElementChild
+        if (firstElementChild.style.display == "list-item") return firstElementChild
         return this.getNextVisibleSibling(firstElementChild)
     }
-    
+
     selectModelEntry(elem) {
         if (elem) {
             if (this.highlightedModelEntry !== undefined) {
-                this.highlightedModelEntry.classList.remove('selected')
+                this.highlightedModelEntry.classList.remove("selected")
             }
             this.saveCurrentSelection(elem, elem.innerText, elem.dataset.path)
-            elem.classList.add('selected')
+            elem.classList.add("selected")
-            elem.scrollIntoView({block: 'nearest'})
+            elem.scrollIntoView({ block: "nearest" })
             this.highlightedModelEntry = elem
         }
     }
-    
+
     selectPreviousFile() {
         const elem = this.getPreviousVisibleSibling(this.highlightedModelEntry)
         if (elem) {
             this.selectModelEntry(elem)
-        }
+        } else {
-        else
-        {
             //this.highlightedModelEntry.parentElement.parentElement.scrollIntoView({block: 'nearest'})
-            this.highlightedModelEntry.closest('.model-list').scrollTop = 0
+            this.highlightedModelEntry.closest(".model-list").scrollTop = 0
         }
         this.modelFilter.select()
     }
-    
+
     selectNextFile() {
         this.selectModelEntry(this.getNextVisibleSibling(this.highlightedModelEntry))
         this.modelFilter.select()
     }
-    
+
     selectFirstFile() {
-        this.selectModelEntry(this.modelList.querySelector('.model-file'))
+        this.selectModelEntry(this.modelList.querySelector(".model-file"))
-        this.highlightedModelEntry.scrollIntoView({block: 'nearest'})
+        this.highlightedModelEntry.scrollIntoView({ block: "nearest" })
         this.modelFilter.select()
     }
-    
+
     selectLastFile() {
-        const elems = this.modelList.querySelectorAll('.model-file:last-child')
+        const elems = this.modelList.querySelectorAll(".model-file:last-child")
-        this.selectModelEntry(elems[elems.length -1])
+        this.selectModelEntry(elems[elems.length - 1])
         this.modelFilter.select()
     }
 
@@ -198,57 +218,57 @@ class ModelDropdown
     }
 
     validEntrySelected() {
-        return (this.modelNoResult.style.display === 'none')
+        return this.modelNoResult.style.display === "none"
     }
-    
+
     processKey(e) {
         switch (e.key) {
-            case 'Escape':
+            case "Escape":
                 e.preventDefault()
                 this.resetSelection()
                 break
-            case 'Enter':
+            case "Enter":
                 e.preventDefault()
                 if (this.validEntrySelected()) {
-                    if (this.modelList.style.display != 'block') {
+                    if (this.modelList.style.display != "block") {
                         this.showModelList()
-                    }
+                    } else {
-                    else
+                        this.saveCurrentSelection(
-                    {
+                            this.highlightedModelEntry,
-                        this.saveCurrentSelection(this.highlightedModelEntry, this.highlightedModelEntry.innerText, this.highlightedModelEntry.dataset.path)
+                            this.highlightedModelEntry.innerText,
+                            this.highlightedModelEntry.dataset.path
+                        )
                         this.hideModelList()
                         this.showAllEntries()
                     }
                     this.modelFilter.focus()
-                }
+                } else {
-                else
-                {
                     this.resetSelection()
                 }
                 break
-            case 'ArrowUp':
+            case "ArrowUp":
                 e.preventDefault()
                 if (this.validEntrySelected()) {
                     this.selectPreviousFile()
                 }
                 break
-            case 'ArrowDown':
+            case "ArrowDown":
                 e.preventDefault()
                 if (this.validEntrySelected()) {
                     this.selectNextFile()
                 }
                 break
-            case 'ArrowLeft':
+            case "ArrowLeft":
-                if (this.modelList.style.display != 'block') {
+                if (this.modelList.style.display != "block") {
                     e.preventDefault()
                 }
                 break
-            case 'ArrowRight':
+            case "ArrowRight":
-                if (this.modelList.style.display != 'block') {
+                if (this.modelList.style.display != "block") {
                     e.preventDefault()
                 }
                 break
-            case 'PageUp':
+            case "PageUp":
                 e.preventDefault()
                 if (this.validEntrySelected()) {
                     this.selectPreviousFile()
@@ -261,7 +281,7 @@ class ModelDropdown
                     this.selectPreviousFile()
                 }
                 break
-            case 'PageDown':
+            case "PageDown":
                 e.preventDefault()
                 if (this.validEntrySelected()) {
                     this.selectNextFile()
@@ -274,201 +294,195 @@ class ModelDropdown
                     this.selectNextFile()
                 }
                 break
-            case 'Home':
+            case "Home":
                 //if (this.modelList.style.display != 'block') {
-                    e.preventDefault()
+                e.preventDefault()
-                    if (this.validEntrySelected()) {
+                if (this.validEntrySelected()) {
-                        this.selectFirstFile()
+                    this.selectFirstFile()
-                    }
+                }
                 //}
                 break
-            case 'End':
+            case "End":
                 //if (this.modelList.style.display != 'block') {
-                    e.preventDefault()
+                e.preventDefault()
-                    if (this.validEntrySelected()) {
+                if (this.validEntrySelected()) {
-                        this.selectLastFile()
+                    this.selectLastFile()
-                    }
+                }
                 //}
                 break
             default:
-                //console.log(e.key)
+            //console.log(e.key)
         }
     }
-    
+
     modelListFocus() {
         this.selectEntry()
         this.showAllEntries()
     }
-    
+
     showModelList() {
-        this.modelList.style.display = 'block'
+        this.modelList.style.display = "block"
         this.selectEntry()
         this.showAllEntries()
         //this.modelFilter.value = ''
         this.modelFilter.select() // preselect the entire string so user can just start typing.
         this.modelFilter.focus()
-        this.modelFilter.style.cursor = 'auto'
+        this.modelFilter.style.cursor = "auto"
     }
-    
+
     hideModelList() {
-        this.modelList.style.display = 'none'
+        this.modelList.style.display = "none"
         this.modelFilter.value = this.currentSelection.value
-        this.modelFilter.style.cursor = ''
+        this.modelFilter.style.cursor = ""
     }
-    
+
     toggleModelList(e) {
         e.preventDefault()
         if (!this.modelFilter.disabled) {
-            if (this.modelList.style.display != 'block') {
+            if (this.modelList.style.display != "block") {
                 this.showModelList()
-            }
+            } else {
-            else
-            {
                 this.hideModelList()
                 this.modelFilter.select()
             }
         }
     }
-    
+
     selectEntry(path) {
         if (path !== undefined) {
-            const entries = this.modelElements;
+            const entries = this.modelElements
 
             for (const elem of entries) {
                 if (elem.dataset.path == path) {
                     this.saveCurrentSelection(elem, elem.innerText, elem.dataset.path)
                     this.highlightedModelEntry = elem
-                    elem.scrollIntoView({block: 'nearest'})
+                    elem.scrollIntoView({ block: "nearest" })
                     break
                 }
             }
         }
-        
+
         if (this.currentSelection.elem !== undefined) {
             // select the previous element
             if (this.highlightedModelEntry !== undefined && this.highlightedModelEntry != this.currentSelection.elem) {
-                this.highlightedModelEntry.classList.remove('selected')
+                this.highlightedModelEntry.classList.remove("selected")
             }
-            this.currentSelection.elem.classList.add('selected')
+            this.currentSelection.elem.classList.add("selected")
             this.highlightedModelEntry = this.currentSelection.elem
-            this.currentSelection.elem.scrollIntoView({block: 'nearest'})
+            this.currentSelection.elem.scrollIntoView({ block: "nearest" })
-        }
+        } else {
-        else
-        {
             this.selectFirstFile()
         }
     }
-    
+
     highlightModelAtPosition(e) {
         let elem = document.elementFromPoint(e.clientX, e.clientY)
-        
+
-        if (elem.classList.contains('model-file')) {
+        if (elem.classList.contains("model-file")) {
             this.highlightModel(elem)
         }
     }
-    
+
     highlightModel(elem) {
-        if (elem.classList.contains('model-file')) {
+        if (elem.classList.contains("model-file")) {
             if (this.highlightedModelEntry !== undefined && this.highlightedModelEntry != elem) {
-                this.highlightedModelEntry.classList.remove('selected')
+                this.highlightedModelEntry.classList.remove("selected")
             }
-            elem.classList.add('selected')
+            elem.classList.add("selected")
             this.highlightedModelEntry = elem
         }
     }
-    
+
     showAllEntries() {
-        this.modelList.querySelectorAll('li').forEach(function(li) {
+        this.modelList.querySelectorAll("li").forEach(function(li) {
-            if (li.id !== 'model-no-result') {
+            if (li.id !== "model-no-result") {
-                li.style.display = 'list-item'
+                li.style.display = "list-item"
             }
         })
-        this.modelNoResult.style.display = 'none'
+        this.modelNoResult.style.display = "none"
     }
-    
+
     filterList(e) {
         const filter = this.modelFilter.value.toLowerCase()
         let found = false
         let showAllChildren = false
-        
+
-        this.modelList.querySelectorAll('li').forEach(function(li) {
+        this.modelList.querySelectorAll("li").forEach(function(li) {
-            if (li.classList.contains('model-folder')) {
+            if (li.classList.contains("model-folder")) {
                 showAllChildren = false
             }
-            if (filter == '') {
+            if (filter == "") {
-                li.style.display = 'list-item'
+                li.style.display = "list-item"
                 found = true
             } else if (showAllChildren || li.textContent.toLowerCase().match(filter)) {
-                li.style.display = 'list-item'
+                li.style.display = "list-item"
-                if (li.classList.contains('model-folder') && li.firstChild.textContent.toLowerCase().match(filter)) {
+                if (li.classList.contains("model-folder") && li.firstChild.textContent.toLowerCase().match(filter)) {
                     showAllChildren = true
                 }
                 found = true
             } else {
-                li.style.display = 'none'
+                li.style.display = "none"
             }
         })
-    
+
         if (found) {
-            this.modelResult.style.display = 'list-item'
+            this.modelResult.style.display = "list-item"
-            this.modelNoResult.style.display = 'none'
+            this.modelNoResult.style.display = "none"
-            const elem = this.getNextVisibleSibling(this.modelList.querySelector('.model-file'))
+            const elem = this.getNextVisibleSibling(this.modelList.querySelector(".model-file"))
             this.highlightModel(elem)
-            elem.scrollIntoView({block: 'nearest'})
+            elem.scrollIntoView({ block: "nearest" })
+        } else {
+            this.modelResult.style.display = "none"
+            this.modelNoResult.style.display = "list-item"
         }
-        else
+        this.modelList.style.display = "block"
-        {
-            this.modelResult.style.display = 'none'
-            this.modelNoResult.style.display = 'list-item'
-        }
-        this.modelList.style.display = 'block'
     }
 
     /* MODEL LOADER */
     getElementDimensions(element) {
         // Clone the element
         const clone = element.cloneNode(true)
-        
+
         // Copy the styles of the original element to the cloned element
         const originalStyles = window.getComputedStyle(element)
         for (let i = 0; i < originalStyles.length; i++) {
             const property = originalStyles[i]
             clone.style[property] = originalStyles.getPropertyValue(property)
         }
-        
+
         // Set its visibility to hidden and display to inline-block
         clone.style.visibility = "hidden"
         clone.style.display = "inline-block"
-        
+
         // Put the cloned element next to the original element
         element.parentNode.insertBefore(clone, element.nextSibling)
-        
+
         // Get its width and height
         const width = clone.offsetWidth
         const height = clone.offsetHeight
-        
+
         // Remove it from the DOM
         clone.remove()
-        
+
         // Return its width and height
         return { width, height }
     }
-    
+
     /**
-     * @param {Array<string>} models 
+     * @param {Array<string>} models
      */
     sortStringArray(models) {
-        models.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' }))
+        models.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: "base" }))
     }
 
     populateModels() {
         this.activeModel = this.modelFilter.dataset.path
-        
+
-        this.currentSelection = { elem: undefined, value: '', path: ''}
+        this.currentSelection = { elem: undefined, value: "", path: "" }
         this.highlightedModelEntry = undefined
         this.flatModelList = []
 
-        if(this.modelList !== undefined) {
+        if (this.modelList !== undefined) {
             this.modelList.remove()
             this.modelFilterArrow.remove()
         }
@@ -478,39 +492,39 @@ class ModelDropdown
     createDropdown() {
         // create dropdown entries
         let rootModelList = this.createRootModelList(this.inputModels)
-        this.modelFilter.insertAdjacentElement('afterend', rootModelList)
+        this.modelFilter.insertAdjacentElement("afterend", rootModelList)
         this.modelFilter.insertAdjacentElement(
-            'afterend',
+            "afterend",
-            createElement(
+            createElement("i", { id: `${this.modelFilter.id}-model-filter-arrow` }, [
-                'i',
+                "model-selector-arrow",
-                { id: `${this.modelFilter.id}-model-filter-arrow` },
+                "fa-solid",
-                ['model-selector-arrow', 'fa-solid', 'fa-angle-down'],
+                "fa-angle-down",
-            ),
+            ])
         )
-        this.modelFilter.classList.add('model-selector')
+        this.modelFilter.classList.add("model-selector")
         this.modelFilterArrow = document.querySelector(`#${this.modelFilter.id}-model-filter-arrow`)
         if (this.modelFilterArrow) {
-            this.modelFilterArrow.style.color = this.modelFilter.disabled ? 'dimgray' : ''
+            this.modelFilterArrow.style.color = this.modelFilter.disabled ? "dimgray" : ""
         }
         this.modelList = document.querySelector(`#${this.modelFilter.id}-model-list`)
         this.modelResult = document.querySelector(`#${this.modelFilter.id}-model-result`)
         this.modelNoResult = document.querySelector(`#${this.modelFilter.id}-model-no-result`)
-        
+
         if (this.modelFilterInitialized !== true) {
-            this.modelFilter.addEventListener('input', this.bind(this.filterList, this))
+            this.modelFilter.addEventListener("input", this.bind(this.filterList, this))
-            this.modelFilter.addEventListener('focus', this.bind(this.modelListFocus, this))
+            this.modelFilter.addEventListener("focus", this.bind(this.modelListFocus, this))
-            this.modelFilter.addEventListener('blur', this.bind(this.hideModelList, this))
+            this.modelFilter.addEventListener("blur", this.bind(this.hideModelList, this))
-            this.modelFilter.addEventListener('click', this.bind(this.showModelList, this))
+            this.modelFilter.addEventListener("click", this.bind(this.showModelList, this))
-            this.modelFilter.addEventListener('keydown', this.bind(this.processKey, this))
+            this.modelFilter.addEventListener("keydown", this.bind(this.processKey, this))
 
             this.modelFilterInitialized = true
         }
-        this.modelFilterArrow.addEventListener('mousedown', this.bind(this.toggleModelList, this))
+        this.modelFilterArrow.addEventListener("mousedown", this.bind(this.toggleModelList, this))
-        this.modelList.addEventListener('mousemove', this.bind(this.highlightModelAtPosition, this))
+        this.modelList.addEventListener("mousemove", this.bind(this.highlightModelAtPosition, this))
-        this.modelList.addEventListener('mousedown', this.bind(this.processClick, this))
+        this.modelList.addEventListener("mousedown", this.bind(this.processClick, this))
 
         let mf = this.modelFilter
-        this.modelFilter.addEventListener('focus', function() {
+        this.modelFilter.addEventListener("focus", function() {
             let modelFilterStyle = window.getComputedStyle(mf)
             rootModelList.style.minWidth = modelFilterStyle.width
         })
@@ -520,74 +534,66 @@ class ModelDropdown
 
     /**
      * @param {Array<string | object} modelTree
-     * @param {string} folderName 
+     * @param {string} folderName
-     * @param {boolean} isRootFolder 
+     * @param {boolean} isRootFolder
      * @returns {HTMLElement}
      */
     createModelNodeList(folderName, modelTree, isRootFolder) {
-        const listElement = createElement('ul')
+        const listElement = createElement("ul")
 
         const foldersMap = new Map()
         const modelsMap = new Map()
 
-        modelTree.forEach(model => {
+        modelTree.forEach((model) => {
             if (Array.isArray(model)) {
                 const [childFolderName, childModels] = model
                 foldersMap.set(
                     childFolderName,
-                    this.createModelNodeList(
+                    this.createModelNodeList(`${folderName || ""}/${childFolderName}`, childModels, false)
-                        `${folderName || ''}/${childFolderName}`,
-                        childModels,
-                        false,
-                    ),
                 )
             } else {
-                const classes = ['model-file']
+                const classes = ["model-file"]
                 if (isRootFolder) {
-                    classes.push('in-root-folder')
+                    classes.push("in-root-folder")
                 }
                 // Remove the leading slash from the model path
                 const fullPath = folderName ? `${folderName.substring(1)}/${model}` : model
                 modelsMap.set(
                     model,
-                    createElement(
+                    createElement("li", { "data-path": fullPath }, classes, [
-                        'li',
+                        createElement("i", undefined, ["fa-regular", "fa-file", "icon"]),
-                        { 'data-path': fullPath },
+                        model,
-                        classes,
+                    ])
-                        [
-                            createElement('i', undefined, ['fa-regular', 'fa-file', 'icon']),
-                            model,
-                        ],
-                    ),
                 )
             }
         })
 
         const childFolderNames = Array.from(foldersMap.keys())
-        this.sortStringArray(childFolderNames)
+        if (this.sorted) {
-        const folderElements = childFolderNames.map(name => foldersMap.get(name))
+            this.sortStringArray(childFolderNames)
+        }
+        const folderElements = childFolderNames.map((name) => foldersMap.get(name))
 
         const modelNames = Array.from(modelsMap.keys())
-        this.sortStringArray(modelNames)
+        if (this.sorted) {
-        const modelElements = modelNames.map(name => modelsMap.get(name))
+            this.sortStringArray(modelNames)
+        }
+        const modelElements = modelNames.map((name) => modelsMap.get(name))
 
         if (modelElements.length && folderName) {
             listElement.appendChild(
                 createElement(
-                    'li',
+                    "li",
                     undefined,
-                    ['model-folder'],
+                    ["model-folder"],
-                    [
+                    [createElement("i", undefined, ["fa-regular", "fa-folder-open", "icon"]), folderName.substring(1)]
-                        createElement('i', undefined, ['fa-regular', 'fa-folder-open', 'icon']),
-                        folderName.substring(1),
-                    ],
                 )
             )
         }
 
         // const allModelElements = isRootFolder ? [...folderElements, ...modelElements] : [...modelElements, ...folderElements]
         const allModelElements = [...modelElements, ...folderElements]
-        allModelElements.forEach(e => listElement.appendChild(e))
+        allModelElements.forEach((e) => listElement.appendChild(e))
         return listElement
     }
 
@@ -596,37 +602,21 @@ class ModelDropdown
      * @returns {HTMLElement}
      */
     createRootModelList(modelTree) {
-        const rootList = createElement(
+        const rootList = createElement("ul", { id: `${this.modelFilter.id}-model-list` }, ["model-list"])
-            'ul',
-            { id: `${this.modelFilter.id}-model-list` },
-            ['model-list'],
-        )
         rootList.appendChild(
-            createElement(
+            createElement("li", { id: `${this.modelFilter.id}-model-no-result` }, ["model-no-result"], "No result")
-                'li',
-                { id: `${this.modelFilter.id}-model-no-result` },
-                ['model-no-result'],
-                'No result'
-            ),
         )
 
         if (this.noneEntry) {
             rootList.appendChild(
-                createElement(
+                createElement("li", { "data-path": "" }, ["model-file", "in-root-folder"], this.noneEntry)
-                    'li',
-                    { 'data-path': '' },
-                    ['model-file', 'in-root-folder'],
-                    this.noneEntry,
-                ),
             )
         }
 
         if (modelTree.length > 0) {
-            const containerListItem = createElement(
+            const containerListItem = createElement("li", { id: `${this.modelFilter.id}-model-result` }, [
-                'li',
+                "model-result",
-                { id: `${this.modelFilter.id}-model-result` },
+            ])
-                ['model-result'],
-            )
             //console.log(containerListItem)
             containerListItem.appendChild(this.createModelNodeList(undefined, modelTree, true))
             rootList.appendChild(containerListItem)
@@ -640,13 +630,16 @@ class ModelDropdown
 async function getModels() {
     try {
         modelsCache = await SD.getModels()
-        modelsOptions = modelsCache['options']
+        modelsOptions = modelsCache["options"]
         if ("scan-error" in modelsCache) {
             // let previewPane = document.getElementById('tab-content-wrapper')
-            let previewPane = document.getElementById('preview')
+            let previewPane = document.getElementById("preview")
-            previewPane.style.background="red"
+            previewPane.style.background = "red"
-            previewPane.style.textAlign="center"
+            previewPane.style.textAlign = "center"
-            previewPane.innerHTML = '<H1>🔥Malware alert!🔥</H1><h2>The file <i>' + modelsCache['scan-error'] + '</i> in your <tt>models/stable-diffusion</tt> folder is probably malware infected.</h2><h2>Please delete this file from the folder before proceeding!</h2>After deleting the file, reload this page.<br><br><button onClick="window.location.reload();">Reload Page</button>'
+            previewPane.innerHTML =
+                "<H1>🔥Malware alert!🔥</H1><h2>The file <i>" +
+                modelsCache["scan-error"] +
+                '</i> in your <tt>models/stable-diffusion</tt> folder is probably malware infected.</h2><h2>Please delete this file from the folder before proceeding!</h2>After deleting the file, reload this page.<br><br><button onClick="window.location.reload();">Reload Page</button>'
             makeImageBtn.disabled = true
         }
 
@@ -667,11 +660,11 @@ async function getModels() {
         */
 
         // notify ModelDropdown objects to refresh
-        document.dispatchEvent(new Event('refreshModels'))
+        document.dispatchEvent(new Event("refreshModels"))
     } catch (e) {
-        console.log('get models error', e)
+        console.log("get models error", e)
     }
 }
 
 // reload models button
-document.querySelector('#reload-models').addEventListener('click', getModels)
+document.querySelector("#reload-models").addEventListener("click", getModels)

ui/media/js/themes.js

@@ -1,82 +1,85 @@
-const themeField = document.getElementById("theme");
+const themeField = document.getElementById("theme")
-var DEFAULT_THEME = {};
+var DEFAULT_THEME = {}
-var THEMES = []; // initialized in initTheme from data in css
+var THEMES = [] // initialized in initTheme from data in css
 
 function getThemeName(theme) {
-    theme = theme.replace("theme-", "");
+    theme = theme.replace("theme-", "")
-    theme = theme.split("-").map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+    theme = theme
-    return theme;
+        .split("-")
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(" ")
+    return theme
 }
 // init themefield
 function initTheme() {
     Array.from(document.styleSheets)
-        .filter(sheet => sheet.href?.startsWith(window.location.origin))
+        .filter((sheet) => sheet.href?.startsWith(window.location.origin))
-        .flatMap(sheet => Array.from(sheet.cssRules))
+        .flatMap((sheet) => Array.from(sheet.cssRules))
-        .forEach(rule => {
+        .forEach((rule) => {
-            var selector = rule.selectorText;
+            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)
+                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))
+                        .filter((cssVariable) => !Array.from(rule.style).includes(cssVariable))
-                        .forEach(cssVariable => {
+                        .forEach((cssVariable) => {
-                        rule.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable));
+                            rule.style.setProperty(cssVariable, DEFAULT_THEME.rule.style.getPropertyValue(cssVariable))
-                    });
+                        })
                 }
-                var theme_key = selector.substring(1);
+                var theme_key = selector.substring(1)
                 THEMES.push({
                     key: theme_key,
                     name: getThemeName(theme_key),
-                    rule: rule
+                    rule: rule,
                 })
             }
             if (selector && selector == ":root") {
                 DEFAULT_THEME = {
                     key: "theme-default",
                     name: "Default",
-                    rule: rule
+                    rule: rule,
-                };
+                }
             }
-    });
+        })
-    
+
-    THEMES.forEach(theme => {
+    THEMES.forEach((theme) => {
-        var new_option = document.createElement("option");
+        var new_option = document.createElement("option")
-        new_option.setAttribute("value", theme.key);
+        new_option.setAttribute("value", theme.key)
-        new_option.innerText = theme.name;
+        new_option.innerText = theme.name
-        themeField.appendChild(new_option);
+        themeField.appendChild(new_option)
-    });
+    })
 
-    
     // setup the style transitions a second after app initializes, so initial style is instant
     setTimeout(() => {
-        var body = document.querySelector("body");
+        var body = document.querySelector("body")
-        var style = document.createElement('style');
+        var style = document.createElement("style")
-        style.innerHTML = "* { transition: background 0.5s, color 0.5s, background-color 0.5s; }";
+        style.innerHTML = "* { transition: background 0.5s, color 0.5s, background-color 0.5s; }"
-        body.appendChild(style);
+        body.appendChild(style)
-    }, 1000);
+    }, 1000)
 }
-initTheme();
+initTheme()
 
 function themeFieldChanged() {
-    var theme_key = themeField.value;
+    var theme_key = themeField.value
 
-    var body = document.querySelector("body");
+    var body = document.querySelector("body")
-    body.classList.remove(...THEMES.map(theme => theme.key));
+    body.classList.remove(...THEMES.map((theme) => theme.key))
-    body.classList.add(theme_key);
+    body.classList.add(theme_key)
-    
-    // 
 
-    body.style = "";
+    //
-    var theme = THEMES.find(t => t.key == theme_key);
+
+    body.style = ""
+    var theme = THEMES.find((t) => t.key == theme_key)
     let borderColor = undefined
     if (theme) {
-        borderColor = theme.rule.style.getPropertyValue('--input-border-color').trim()
+        borderColor = theme.rule.style.getPropertyValue("--input-border-color").trim()
-        if (!borderColor.startsWith('#')) {
+        if (!borderColor.startsWith("#")) {
-            borderColor = theme.rule.style.getPropertyValue('--theme-color-fallback')
+            borderColor = theme.rule.style.getPropertyValue("--theme-color-fallback")
         }
     } else {
-        borderColor = DEFAULT_THEME.rule.style.getPropertyValue('--theme-color-fallback')
+        borderColor = DEFAULT_THEME.rule.style.getPropertyValue("--theme-color-fallback")
     }
     document.querySelector('meta[name="theme-color"]').setAttribute("content", borderColor)
 }
 
-themeField.addEventListener('change', themeFieldChanged);
+themeField.addEventListener("change", themeFieldChanged)

ui/media/js/utils.js

@@ -1,4 +1,4 @@
-"use strict";
+"use strict"
 
 // https://gomakethings.com/finding-the-next-and-previous-sibling-elements-that-match-a-selector-with-vanilla-js/
 function getNextSibling(elem, selector) {
@@ -20,33 +20,34 @@ function getNextSibling(elem, selector) {
     }
 }
 
-
 /* Panel Stuff */
 
 // true = open
-let COLLAPSIBLES_INITIALIZED = false;
+let COLLAPSIBLES_INITIALIZED = false
-const COLLAPSIBLES_KEY = "collapsibles";
+const COLLAPSIBLES_KEY = "collapsibles"
-const COLLAPSIBLE_PANELS = []; // filled in by createCollapsibles with all the elements matching .collapsible
+const COLLAPSIBLE_PANELS = [] // filled in by createCollapsibles with all the elements matching .collapsible
 
 // on-init call this for any panels that are marked open
 function toggleCollapsible(element) {
-    const collapsibleHeader = element.querySelector(".collapsible");
+    const collapsibleHeader = element.querySelector(".collapsible")
-    const handle = element.querySelector(".collapsible-handle");
+    const handle = element.querySelector(".collapsible-handle")
     collapsibleHeader.classList.toggle("active")
-    let content = getNextSibling(collapsibleHeader, '.collapsible-content')
+    let content = getNextSibling(collapsibleHeader, ".collapsible-content")
     if (!collapsibleHeader.classList.contains("active")) {
         content.style.display = "none"
-        if (handle != null) {  // render results don't have a handle
+        if (handle != null) {
-            handle.innerHTML = '➕' // plus
+            // render results don't have a handle
+            handle.innerHTML = "➕" // plus
         }
     } else {
         content.style.display = "block"
-        if (handle != null) {  // render results don't have a handle
+        if (handle != null) {
-            handle.innerHTML = '➖' // minus
+            // render results don't have a handle
+            handle.innerHTML = "➖" // minus
         }
     }
-    document.dispatchEvent(new CustomEvent('collapsibleClick', { detail: collapsibleHeader }))
+    document.dispatchEvent(new CustomEvent("collapsibleClick", { detail: collapsibleHeader }))
-    
+
     if (COLLAPSIBLES_INITIALIZED && COLLAPSIBLE_PANELS.includes(element)) {
         saveCollapsibles()
     }
@@ -54,7 +55,7 @@ function toggleCollapsible(element) {
 
 function saveCollapsibles() {
     let values = {}
-    COLLAPSIBLE_PANELS.forEach(element => {
+    COLLAPSIBLE_PANELS.forEach((element) => {
         let value = element.querySelector(".collapsible").className.indexOf("active") !== -1
         values[element.id] = value
     })
@@ -72,31 +73,31 @@ function createCollapsibles(node) {
         if (save && c.parentElement.id) {
             COLLAPSIBLE_PANELS.push(c.parentElement)
         }
-        let handle = document.createElement('span')
+        let handle = document.createElement("span")
-        handle.className = 'collapsible-handle'
+        handle.className = "collapsible-handle"
 
         if (c.classList.contains("active")) {
-            handle.innerHTML = '➖' // minus
+            handle.innerHTML = "➖" // minus
         } else {
-            handle.innerHTML = '➕' // plus
+            handle.innerHTML = "➕" // plus
         }
         c.insertBefore(handle, c.firstChild)
 
-        c.addEventListener('click', function() {
+        c.addEventListener("click", function() {
             toggleCollapsible(c.parentElement)
         })
     })
     if (save) {
         let saved = localStorage.getItem(COLLAPSIBLES_KEY)
-        if (!saved) { 
+        if (!saved) {
-            saved = tryLoadOldCollapsibles();
+            saved = tryLoadOldCollapsibles()
         }
         if (!saved) {
             saveCollapsibles()
             saved = localStorage.getItem(COLLAPSIBLES_KEY)
         }
         let values = JSON.parse(saved)
-        COLLAPSIBLE_PANELS.forEach(element => {
+        COLLAPSIBLE_PANELS.forEach((element) => {
             let value = element.querySelector(".collapsible").className.indexOf("active") !== -1
             if (values[element.id] != value) {
                 toggleCollapsible(element)
@@ -108,24 +109,24 @@ function createCollapsibles(node) {
 
 function tryLoadOldCollapsibles() {
     const old_map = {
-        "advancedPanelOpen": "editor-settings",
+        advancedPanelOpen: "editor-settings",
-        "modifiersPanelOpen": "editor-modifiers",
+        modifiersPanelOpen: "editor-modifiers",
-        "negativePromptPanelOpen": "editor-inputs-prompt"
+        negativePromptPanelOpen: "editor-inputs-prompt",
-    };
+    }
     if (localStorage.getItem(Object.keys(old_map)[0])) {
-        let result = {};
+        let result = {}
-        Object.keys(old_map).forEach(key => {
+        Object.keys(old_map).forEach((key) => {
-            const value = localStorage.getItem(key);
+            const value = localStorage.getItem(key)
             if (value !== null) {
-                result[old_map[key]] = (value == true || value == "true")
+                result[old_map[key]] = value == true || value == "true"
                 localStorage.removeItem(key)
             }
-        });
+        })
         result = JSON.stringify(result)
         localStorage.setItem(COLLAPSIBLES_KEY, result)
         return result
     }
-    return null;
+    return null
 }
 
 function permute(arr) {
@@ -134,10 +135,12 @@ function permute(arr) {
     let n_permutations = Math.pow(2, n)
     for (let i = 0; i < n_permutations; i++) {
         let perm = []
-        let mask = Number(i).toString(2).padStart(n, '0')
+        let mask = Number(i)
+            .toString(2)
+            .padStart(n, "0")
 
         for (let idx = 0; idx < mask.length; idx++) {
-            if (mask[idx] === '1' && arr[idx].trim() !== '') {
+            if (mask[idx] === "1" && arr[idx].trim() !== "") {
                 perm.push(arr[idx])
             }
         }
@@ -152,23 +155,23 @@ function permute(arr) {
 
 // https://stackoverflow.com/a/8212878
 function millisecondsToStr(milliseconds) {
-    function numberEnding (number) {
+    function numberEnding(number) {
-        return (number > 1) ? 's' : ''
+        return number > 1 ? "s" : ""
     }
 
     let temp = Math.floor(milliseconds / 1000)
     let hours = Math.floor((temp %= 86400) / 3600)
-    let s = ''
+    let s = ""
     if (hours) {
-        s += hours + ' hour' + numberEnding(hours) + ' '
+        s += hours + " hour" + numberEnding(hours) + " "
     }
     let minutes = Math.floor((temp %= 3600) / 60)
     if (minutes) {
-        s += minutes + ' minute' + numberEnding(minutes) + ' '
+        s += minutes + " minute" + numberEnding(minutes) + " "
     }
     let seconds = temp % 60
     if (!hours && minutes < 4 && seconds) {
-        s += seconds + ' second' + numberEnding(seconds)
+        s += seconds + " second" + numberEnding(seconds)
     }
 
     return s
@@ -176,101 +179,82 @@ function millisecondsToStr(milliseconds) {
 
 // https://rosettacode.org/wiki/Brace_expansion#JavaScript
 function BraceExpander() {
-    'use strict'
+    "use strict"
 
     // Index of any closing brace matching the opening
     // brace at iPosn,
     // with the indices of any immediately-enclosed commas.
     function bracePair(tkns, iPosn, iNest, lstCommas) {
-        if (iPosn >= tkns.length || iPosn < 0) return null;
+        if (iPosn >= tkns.length || iPosn < 0) return null
 
         let t = tkns[iPosn],
-            n = (t === '{') ? (
+            n = t === "{" ? iNest + 1 : t === "}" ? iNest - 1 : iNest,
-                iNest + 1
+            lst = t === "," && iNest === 1 ? lstCommas.concat(iPosn) : lstCommas
-            ) : (t === '}' ? (
-                iNest - 1
-            ) : iNest),
-            lst = (t === ',' && iNest === 1) ? (
-                lstCommas.concat(iPosn)
-            ) : lstCommas;
 
-        return n ? bracePair(tkns, iPosn + 1, n, lst) : {
+        return n
-            close: iPosn,
+            ? bracePair(tkns, iPosn + 1, n, lst)
-            commas: lst
+            : {
-        };
+                  close: iPosn,
+                  commas: lst,
+              }
     }
 
     // Parse of a SYNTAGM subtree
     function andTree(dctSofar, tkns) {
-        if (!tkns.length) return [dctSofar, []];
+        if (!tkns.length) return [dctSofar, []]
-
-        let dctParse = dctSofar ? dctSofar : {
-                fn: and,
-                args: []
-            },
 
+        let dctParse = dctSofar
+                ? dctSofar
+                : {
+                      fn: and,
+                      args: [],
+                  },
             head = tkns[0],
             tail = head ? tkns.slice(1) : [],
+            dctBrace = head === "{" ? bracePair(tkns, 0, 0, []) : null,
+            lstOR = dctBrace && dctBrace.close && dctBrace.commas.length ? splitAt(dctBrace.close + 1, tkns) : null
 
-            dctBrace = head === '{' ? bracePair(
+        return andTree(
-                tkns, 0, 0, []
+            {
-            ) : null,
+                fn: and,
-
+                args: dctParse.args.concat(lstOR ? orTree(dctParse, lstOR[0], dctBrace.commas) : head),
-            lstOR = dctBrace && (
+            },
-                dctBrace.close
+            lstOR ? lstOR[1] : tail
-            ) && dctBrace.commas.length ? (
+        )
-                splitAt(dctBrace.close + 1, tkns)
-            ) : null;
-
-        return andTree({
-            fn: and,
-            args: dctParse.args.concat(
-                lstOR ? (
-                    orTree(dctParse, lstOR[0], dctBrace.commas)
-                ) : head
-            )
-        }, lstOR ? (
-            lstOR[1]
-        ) : tail);
     }
 
     // Parse of a PARADIGM subtree
     function orTree(dctSofar, tkns, lstCommas) {
-        if (!tkns.length) return [dctSofar, []];
+        if (!tkns.length) return [dctSofar, []]
-        let iLast = lstCommas.length;
+        let iLast = lstCommas.length
 
         return {
             fn: or,
-            args: splitsAt(
+            args: splitsAt(lstCommas, tkns)
-                lstCommas, tkns
+                .map(function(x, i) {
-            ).map(function (x, i) {
+                    let ts = x.slice(1, i === iLast ? -1 : void 0)
-                let ts = x.slice(
-                    1, i === iLast ? (
-                        -1
-                    ) : void 0
-                );
 
-                return ts.length ? ts : [''];
+                    return ts.length ? ts : [""]
-            }).map(function (ts) {
+                })
-                return ts.length > 1 ? (
+                .map(function(ts) {
-                    andTree(null, ts)[0]
+                    return ts.length > 1 ? andTree(null, ts)[0] : ts[0]
-                ) : ts[0];
+                }),
-            })
+        }
-        };
     }
 
     // List of unescaped braces and commas, and remaining strings
     function tokens(str) {
         // Filter function excludes empty splitting artefacts
-        let toS = function (x) {
+        let toS = function(x) {
-            return x.toString();
+            return x.toString()
-        };
+        }
 
-        return str.split(/(\\\\)/).filter(toS).reduce(function (a, s) {
+        return str
-            return a.concat(s.charAt(0) === '\\' ? s : s.split(
+            .split(/(\\\\)/)
-                /(\\*[{,}])/
+            .filter(toS)
-            ).filter(toS));
+            .reduce(function(a, s) {
-        }, []);
+                return a.concat(s.charAt(0) === "\\" ? s : s.split(/(\\*[{,}])/).filter(toS))
+            }, [])
     }
 
     // PARSE TREE OPERATOR (1 of 2)
@@ -278,76 +262,75 @@ function BraceExpander() {
     function and(args) {
         let lng = args.length,
             head = lng ? args[0] : null,
-            lstHead = "string" === typeof head ? (
+            lstHead = "string" === typeof head ? [head] : head
-                [head]
-            ) : head;
 
-        return lng ? (
+        return lng
-            1 < lng ? lstHead.reduce(function (a, h) {
+            ? 1 < lng
-                return a.concat(
+                ? lstHead.reduce(function(a, h) {
-                    and(args.slice(1)).map(function (t) {
+                      return a.concat(
-                        return h + t;
+                          and(args.slice(1)).map(function(t) {
-                    })
+                              return h + t
-                );
+                          })
-            }, []) : lstHead
+                      )
-        ) : [];
+                  }, [])
+                : lstHead
+            : []
     }
 
     // PARSE TREE OPERATOR (2 of 2)
     // Each option flattened
     function or(args) {
-        return args.reduce(function (a, b) {
+        return args.reduce(function(a, b) {
-            return a.concat(b);
+            return a.concat(b)
-        }, []);
+        }, [])
     }
 
     // One list split into two (first sublist length n)
     function splitAt(n, lst) {
-        return n < lst.length + 1 ? [
+        return n < lst.length + 1 ? [lst.slice(0, n), lst.slice(n)] : [lst, []]
-            lst.slice(0, n), lst.slice(n)
-        ] : [lst, []];
     }
 
     // One list split into several (sublist lengths [n])
     function splitsAt(lstN, lst) {
-        return lstN.reduceRight(function (a, x) {
+        return lstN.reduceRight(
-            return splitAt(x, a[0]).concat(a.slice(1));
+            function(a, x) {
-        }, [lst]);
+                return splitAt(x, a[0]).concat(a.slice(1))
+            },
+            [lst]
+        )
     }
 
     // Value of the parse tree
     function evaluated(e) {
-        return typeof e === 'string' ? e :
+        return typeof e === "string" ? e : e.fn(e.args.map(evaluated))
-            e.fn(e.args.map(evaluated));
     }
 
     // JSON prettyprint (for parse tree, token list etc)
     function pp(e) {
-        return JSON.stringify(e, function (k, v) {
+        return JSON.stringify(
-            return typeof v === 'function' ? (
+            e,
-                '[function ' + v.name + ']'
+            function(k, v) {
-            ) : v;
+                return typeof v === "function" ? "[function " + v.name + "]" : v
-        }, 2)
+            },
+            2
+        )
     }
 
-
     // ----------------------- MAIN ------------------------
 
     // s -> [s]
     this.expand = function(s) {
         // BRACE EXPRESSION PARSED
-        let dctParse = andTree(null, tokens(s))[0];
+        let dctParse = andTree(null, tokens(s))[0]
 
         // ABSTRACT SYNTAX TREE LOGGED
         // console.log(pp(dctParse));
 
         // AST EVALUATED TO LIST OF STRINGS
-        return evaluated(dctParse);
+        return evaluated(dctParse)
     }
-
 }
 
-
 /** Pause the execution of an async function until timer elapse.
  * @Returns a promise that will resolve after the specified timeout.
  */
@@ -360,12 +343,12 @@ function asyncDelay(timeout) {
 function PromiseSource() {
     const srcPromise = new Promise((resolve, reject) => {
         Object.defineProperties(this, {
-            resolve: { value: resolve, writable: false }
+            resolve: { value: resolve, writable: false },
-            , reject: { value: reject, writable: false }
+            reject: { value: reject, writable: false },
         })
     })
     Object.defineProperties(this, {
-        promise: {value: makeQuerablePromise(srcPromise), writable: false}
+        promise: { value: makeQuerablePromise(srcPromise), writable: false },
     })
 }
 
@@ -375,7 +358,7 @@ function PromiseSource() {
  * If `immediate` is passed, trigger the function on the leading edge, instead of the trailing.
  * @Returns a promise that will resolve to func return value.
  */
-function debounce (func, wait, immediate) {
+function debounce(func, wait, immediate) {
     if (typeof wait === "undefined") {
         wait = 40
     }
@@ -399,11 +382,11 @@ function debounce (func, wait, immediate) {
     }
     return function(...args) {
         const callNow = Boolean(immediate && !timeout)
-        const context = this;
+        const context = this
         if (timeout) {
             clearTimeout(timeout)
         }
-        timeout = setTimeout(function () {
+        timeout = setTimeout(function() {
             if (!immediate) {
                 applyFn(context, args)
             }
@@ -418,14 +401,14 @@ function debounce (func, wait, immediate) {
 }
 
 function preventNonNumericalInput(e) {
-    e = e || window.event;
+    e = e || window.event
-    let charCode = (typeof e.which == "undefined") ? e.keyCode : e.which;
+    const charCode = typeof e.which == "undefined" ? e.keyCode : e.which
-    let charStr = String.fromCharCode(charCode);
+    const charStr = String.fromCharCode(charCode)
-    let re = e.target.getAttribute('pattern') || '^[0-9]+$'
+    const newInputValue = `${e.target.value}${charStr}`
-    re = new RegExp(re)
+    const re = new RegExp(e.target.getAttribute("pattern") || "^[0-9]+$")
 
-    if (!charStr.match(re)) {
+    if (!re.test(charStr) && !re.test(newInputValue)) {
-        e.preventDefault();
+        e.preventDefault()
     }
 }
 
@@ -434,15 +417,15 @@ function preventNonNumericalInput(e) {
  * @Notes Allows unit testing and use of the engine outside of a browser.
  */
 function getGlobal() {
-    if (typeof globalThis === 'object') {
+    if (typeof globalThis === "object") {
         return globalThis
-    } else if (typeof global === 'object') {
+    } else if (typeof global === "object") {
         return global
-    } else if (typeof self === 'object') {
+    } else if (typeof self === "object") {
         return self
     }
     try {
-        return Function('return this')()
+        return Function("return this")()
     } catch {
         // If the Function constructor fails, we're in a browser with eval disabled by CSP headers.
         return window
@@ -453,18 +436,18 @@ function getGlobal() {
  * @Returns true if x is an Array or a TypedArray, false otherwise.
  */
 function isArrayOrTypedArray(x) {
-    return Boolean(typeof x === 'object' && (Array.isArray(x) || (ArrayBuffer.isView(x) && !(x instanceof DataView))))
+    return Boolean(typeof x === "object" && (Array.isArray(x) || (ArrayBuffer.isView(x) && !(x instanceof DataView))))
 }
 
 function makeQuerablePromise(promise) {
-    if (typeof promise !== 'object') {
+    if (typeof promise !== "object") {
-        throw new Error('promise is not an object.')
+        throw new Error("promise is not an object.")
     }
     if (!(promise instanceof Promise)) {
-        throw new Error('Argument is not a promise.')
+        throw new Error("Argument is not a promise.")
     }
     // Don't modify a promise that's been already modified.
-    if ('isResolved' in promise || 'isRejected' in promise || 'isPending' in promise) {
+    if ("isResolved" in promise || "isRejected" in promise || "isPending" in promise) {
         return promise
     }
     let isPending = true
@@ -473,13 +456,13 @@ function makeQuerablePromise(promise) {
     let isResolved = false
     let resolvedValue = undefined
     const qurPro = promise.then(
-        function(val){
+        function(val) {
             isResolved = true
             isPending = false
             resolvedValue = val
             return val
-        }
+        },
-        , function(reason) {
+        function(reason) {
             rejectReason = reason
             isRejected = true
             isPending = false
@@ -487,46 +470,46 @@ function makeQuerablePromise(promise) {
         }
     )
     Object.defineProperties(qurPro, {
-        'isResolved': {
+        isResolved: {
-            get: () => isResolved
+            get: () => isResolved,
-        }
+        },
-        , 'resolvedValue': {
+        resolvedValue: {
-            get: () => resolvedValue
+            get: () => resolvedValue,
-        }
+        },
-        , 'isPending': {
+        isPending: {
-            get: () => isPending
+            get: () => isPending,
-        }
+        },
-        , 'isRejected': {
+        isRejected: {
-            get: () => isRejected
+            get: () => isRejected,
-        }
+        },
-        , 'rejectReason': {
+        rejectReason: {
-            get: () => rejectReason
+            get: () => rejectReason,
-        }
+        },
     })
     return qurPro
 }
 
 /* inserts custom html to allow prettifying of inputs */
 function prettifyInputs(root_element) {
-    root_element.querySelectorAll(`input[type="checkbox"]`).forEach(element => {
+    root_element.querySelectorAll(`input[type="checkbox"]`).forEach((element) => {
         if (element.style.display === "none") {
             return
         }
-        var parent = element.parentNode;
+        var parent = element.parentNode
         if (!parent.classList.contains("input-toggle")) {
-            var wrapper = document.createElement("div");
+            var wrapper = document.createElement("div")
-            wrapper.classList.add("input-toggle");
+            wrapper.classList.add("input-toggle")
-            parent.replaceChild(wrapper, element);
+            parent.replaceChild(wrapper, element)
-            wrapper.appendChild(element);
+            wrapper.appendChild(element)
-            var label = document.createElement("label");
+            var label = document.createElement("label")
-            label.htmlFor = element.id;
+            label.htmlFor = element.id
-            wrapper.appendChild(label);
+            wrapper.appendChild(label)
         }
     })
 }
 
 class GenericEventSource {
-    #events = {};
+    #events = {}
     #types = []
     constructor(...eventsTypes) {
         if (Array.isArray(eventsTypes) && eventsTypes.length === 1 && Array.isArray(eventsTypes[0])) {
@@ -541,7 +524,7 @@ class GenericEventSource {
      */
     addEventListener(name, handler) {
         if (!this.#types.includes(name)) {
-            throw new Error('Invalid event name.')
+            throw new Error("Invalid event name.")
         }
         if (this.#events.hasOwnProperty(name)) {
             this.#events[name].push(handler)
@@ -574,13 +557,15 @@ class GenericEventSource {
         if (evs.length <= 0) {
             return Promise.resolve()
         }
-        return Promise.allSettled(evs.map((callback) => {
+        return Promise.allSettled(
-            try {
+            evs.map((callback) => {
-                return Promise.resolve(callback.apply(SD, args))
+                try {
-            } catch (ex) {
+                    return Promise.resolve(callback.apply(SD, args))
-                return Promise.reject(ex)
+                } catch (ex) {
-            }
+                    return Promise.reject(ex)
-        }))
+                }
+            })
+        )
     }
 }
 
@@ -590,7 +575,7 @@ class ServiceContainer {
     constructor(...servicesParams) {
         servicesParams.forEach(this.register.bind(this))
     }
-    get services () {
+    get services() {
         return this.#services
     }
     get singletons() {
@@ -598,54 +583,52 @@ class ServiceContainer {
     }
     register(params) {
         if (ServiceContainer.isConstructor(params)) {
-            if (typeof params.name !== 'string') {
+            if (typeof params.name !== "string") {
-                throw new Error('params.name is not a string.')
+                throw new Error("params.name is not a string.")
             }
-            params = {name:params.name, definition:params}
+            params = { name: params.name, definition: params }
         }
-        if (typeof params !== 'object') {
+        if (typeof params !== "object") {
-            throw new Error('params is not an object.')
+            throw new Error("params is not an object.")
         }
-        [   'name',
+        ;["name", "definition"].forEach((key) => {
-            'definition',
-        ].forEach((key) => {
             if (!(key in params)) {
-                console.error('Invalid service %o registration.', params)
+                console.error("Invalid service %o registration.", params)
                 throw new Error(`params.${key} is not defined.`)
             }
         })
-        const opts = {definition: params.definition}
+        const opts = { definition: params.definition }
-        if ('dependencies' in params) {
+        if ("dependencies" in params) {
             if (Array.isArray(params.dependencies)) {
                 params.dependencies.forEach((dep) => {
-                    if (typeof dep !== 'string') {
+                    if (typeof dep !== "string") {
-                        throw new Error('dependency name is not a string.')
+                        throw new Error("dependency name is not a string.")
                     }
                 })
                 opts.dependencies = params.dependencies
             } else {
-                throw new Error('params.dependencies is not an array.')
+                throw new Error("params.dependencies is not an array.")
             }
         }
         if (params.singleton) {
             opts.singleton = true
         }
         this.#services.set(params.name, opts)
-        return Object.assign({name: params.name}, opts)
+        return Object.assign({ name: params.name }, opts)
     }
     get(name) {
         const ctorInfos = this.#services.get(name)
         if (!ctorInfos) {
             return
         }
-        if(!ServiceContainer.isConstructor(ctorInfos.definition)) {
+        if (!ServiceContainer.isConstructor(ctorInfos.definition)) {
             return ctorInfos.definition
         }
-        if(!ctorInfos.singleton) {
+        if (!ctorInfos.singleton) {
             return this._createInstance(ctorInfos)
         }
         const singletonInstance = this.#singletons.get(name)
-        if(singletonInstance) {
+        if (singletonInstance) {
             return singletonInstance
         }
         const newSingletonInstance = this._createInstance(ctorInfos)
@@ -655,7 +638,7 @@ class ServiceContainer {
 
     _getResolvedDependencies(service) {
         let classDependencies = []
-        if(service.dependencies) {
+        if (service.dependencies) {
             classDependencies = service.dependencies.map(this.get.bind(this))
         }
         return classDependencies
@@ -671,10 +654,14 @@ class ServiceContainer {
     }
 
     static isClass(definition) {
-        return typeof definition === 'function' && Boolean(definition.prototype) && definition.prototype.constructor === definition
+        return (
+            typeof definition === "function" &&
+            Boolean(definition.prototype) &&
+            definition.prototype.constructor === definition
+        )
     }
     static isConstructor(definition) {
-        return typeof definition === 'function'
+        return typeof definition === "function"
     }
 }
 
@@ -693,14 +680,14 @@ function createElement(tagName, attributes, classes, textOrElements) {
             if (value !== undefined && value !== null) {
                 element.setAttribute(key, value)
             }
-        });
+        })
     }
     if (classes) {
-        (Array.isArray(classes) ? classes : [classes]).forEach(className => element.classList.add(className))
+        ;(Array.isArray(classes) ? classes : [classes]).forEach((className) => element.classList.add(className))
     }
     if (textOrElements) {
         const children = Array.isArray(textOrElements) ? textOrElements : [textOrElements]
-        children.forEach(textOrElem => {
+        children.forEach((textOrElem) => {
             if (textOrElem instanceof Node) {
                 element.appendChild(textOrElem)
             } else {
@@ -720,9 +707,219 @@ Array.prototype.addEventListener = function(method, callback) {
     const originalFunction = this[method]
     if (originalFunction) {
         this[method] = function() {
-            console.log(`Array.${method}()`, arguments)
             originalFunction.apply(this, arguments)
             callback.apply(this, arguments)
         }
     }
 }
+
+/**
+ * @typedef {object} TabOpenDetails
+ * @property {HTMLElement} contentElement
+ * @property {HTMLElement} labelElement
+ * @property {number} timesOpened
+ * @property {boolean} firstOpen
+ */
+
+/**
+ * @typedef {object} CreateTabRequest
+ * @property {string} id
+ * @property {string | Node | (() => (string | Node))} label
+ * Label text or an HTML element
+ * @property {string} icon
+ * @property {string | Node | Promise<string | Node> | (() => (string | Node | Promise<string | Node>)) | undefined} content
+ * HTML string or HTML element
+ * @property {((TabOpenDetails, Event) => (undefined | string | Node | Promise<string | Node>)) | undefined} onOpen
+ * If an HTML string or HTML element is returned, then that will replace the tab content
+ * @property {string | undefined} css
+ */
+
+/**
+ * @param {CreateTabRequest} request
+ */
+function createTab(request) {
+    if (!request?.id) {
+        console.error("createTab() error - id is required", Error().stack)
+        return
+    }
+
+    if (!request.label) {
+        console.error("createTab() error - label is required", Error().stack)
+        return
+    }
+
+    if (!request.icon) {
+        console.error("createTab() error - icon is required", Error().stack)
+        return
+    }
+
+    if (!request.content && !request.onOpen) {
+        console.error("createTab() error - content or onOpen required", Error().stack)
+        return
+    }
+
+    const tabsContainer = document.querySelector(".tab-container")
+    if (!tabsContainer) {
+        return
+    }
+
+    const tabsContentWrapper = document.querySelector("#tab-content-wrapper")
+    if (!tabsContentWrapper) {
+        return
+    }
+
+    // console.debug('creating tab: ', request)
+
+    if (request.css) {
+        document
+            .querySelector("body")
+            .insertAdjacentElement(
+                "beforeend",
+                createElement("style", { id: `tab-${request.id}-css` }, undefined, request.css)
+            )
+    }
+
+    const label = typeof request.label === "function" ? request.label() : request.label
+    const labelElement = label instanceof Node ? label : createElement("span", undefined, undefined, label)
+
+    const tab = createElement(
+        "span",
+        { id: `tab-${request.id}`, "data-times-opened": 0 },
+        ["tab"],
+        createElement("span", undefined, undefined, [
+            createElement("i", { style: "margin-right: 0.25em" }, [
+                "fa-solid",
+                `${request.icon.startsWith("fa-") ? "" : "fa-"}${request.icon}`,
+                "icon",
+            ]),
+            labelElement,
+        ])
+    )
+
+    tabsContainer.insertAdjacentElement("beforeend", tab)
+
+    const wrapper = createElement("div", { id: request.id }, ["tab-content-inner"], "Loading..")
+
+    const tabContent = createElement("div", { id: `tab-content-${request.id}` }, ["tab-content"], wrapper)
+    tabsContentWrapper.insertAdjacentElement("beforeend", tabContent)
+
+    linkTabContents(tab)
+
+    function replaceContent(resultFactory) {
+        if (resultFactory === undefined || resultFactory === null) {
+            return
+        }
+        const result = typeof resultFactory === "function" ? resultFactory() : resultFactory
+        if (result instanceof Promise) {
+            result.then(replaceContent)
+        } else if (result instanceof Node) {
+            wrapper.replaceChildren(result)
+        } else {
+            wrapper.innerHTML = result
+        }
+    }
+
+    replaceContent(request.content)
+
+    tab.addEventListener("click", (e) => {
+        const timesOpened = +(tab.dataset.timesOpened || 0) + 1
+        tab.dataset.timesOpened = timesOpened
+
+        if (request.onOpen) {
+            const result = request.onOpen(
+                {
+                    contentElement: wrapper,
+                    labelElement,
+                    timesOpened,
+                    firstOpen: timesOpened === 1,
+                },
+                e
+            )
+
+            replaceContent(result)
+        }
+    })
+}
+
+/* TOAST NOTIFICATIONS */
+function showToast(message, duration = 5000, error = false) {
+    const toast = document.createElement("div")
+    toast.classList.add("toast-notification")
+    if (error === true) {
+        toast.classList.add("toast-notification-error")
+    }
+    toast.innerHTML = message
+    document.body.appendChild(toast)
+
+    // Set the position of the toast on the screen
+    const toastCount = document.querySelectorAll(".toast-notification").length
+    const toastHeight = toast.offsetHeight
+    const previousToastsHeight = Array.from(document.querySelectorAll(".toast-notification"))
+        .slice(0, -1) // exclude current toast
+        .reduce((totalHeight, toast) => totalHeight + toast.offsetHeight + 10, 0) // add 10 pixels for spacing
+    toast.style.bottom = `${10 + previousToastsHeight}px`
+    toast.style.right = "10px"
+
+    // Delay the removal of the toast until animation has completed
+    const removeToast = () => {
+        toast.classList.add("hide")
+        const removeTimeoutId = setTimeout(() => {
+            toast.remove()
+            // Adjust the position of remaining toasts
+            const remainingToasts = document.querySelectorAll(".toast-notification")
+            const removedToastBottom = toast.getBoundingClientRect().bottom
+
+            remainingToasts.forEach((toast) => {
+                if (toast.getBoundingClientRect().bottom < removedToastBottom) {
+                    toast.classList.add("slide-down")
+                }
+            })
+
+            // Wait for the slide-down animation to complete
+            setTimeout(() => {
+                // Remove the slide-down class after the animation has completed
+                const slidingToasts = document.querySelectorAll(".slide-down")
+                slidingToasts.forEach((toast) => {
+                    toast.classList.remove("slide-down")
+                })
+
+                // Adjust the position of remaining toasts again, in case there are multiple toasts being removed at once
+                const remainingToastsDown = document.querySelectorAll(".toast-notification")
+                let heightSoFar = 0
+                remainingToastsDown.forEach((toast) => {
+                    toast.style.bottom = `${10 + heightSoFar}px`
+                    heightSoFar += toast.offsetHeight + 10 // add 10 pixels for spacing
+                })
+            }, 0) // The duration of the slide-down animation (in milliseconds)
+        }, 500)
+    }
+
+    // Remove the toast after specified duration
+    setTimeout(removeToast, duration)
+}
+
+function alert(msg, title) {
+    title = title || ""
+    $.alert({
+        theme: "modern",
+        title: title,
+        useBootstrap: false,
+        animateFromElement: false,
+        content: msg,
+    })
+}
+
+function confirm(msg, title, fn) {
+    title = title || ""
+    $.confirm({
+        theme: "modern",
+        title: title,
+        useBootstrap: false,
+        animateFromElement: false,
+        content: msg,
+        buttons: {
+            yes: fn,
+            cancel: () => {},
+        },
+    })
+}

ui/plugins/ui/Autoscroll.plugin.js

@@ -1,28 +1,32 @@
-(function () {
+;(function() {
     "use strict"
 
     let autoScroll = document.querySelector("#auto_scroll")
 
     // observe for changes in the preview pane
-    var observer = new MutationObserver(function (mutations) {
+    var observer = new MutationObserver(function(mutations) {
-        mutations.forEach(function (mutation) {
+        mutations.forEach(function(mutation) {
-            if (mutation.target.className == 'img-batch') {
+            if (mutation.target.className == "img-batch") {
                 Autoscroll(mutation.target)
             }
         })
     })
-    
+
-    observer.observe(document.getElementById('preview'), {
+    observer.observe(document.getElementById("preview"), {
-            childList: true,
+        childList: true,
-            subtree: true
+        subtree: true,
     })
 
     function Autoscroll(target) {
         if (autoScroll.checked && target !== null) {
-            const img = target.querySelector('img')
+            const img = target.querySelector("img")
-            img.addEventListener('load', function() {
+            img.addEventListener(
-                img.closest('.imageTaskContainer').scrollIntoView()
+                "load",
-            }, { once: true })
+                function() {
+                    img?.closest(".imageTaskContainer").scrollIntoView()
+                },
+                { once: true }
+            )
         }
     }
 })()

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

@@ -1,93 +1,116 @@
-(function () { "use strict"
+;(function() {
-    if (typeof editorModifierTagsList !== 'object') {
+    "use strict"
-        console.error('editorModifierTagsList missing...')
+    if (typeof editorModifierTagsList !== "object") {
+        console.error("editorModifierTagsList missing...")
         return
     }
 
-    const styleSheet = document.createElement("style");
+    const styleSheet = document.createElement("style")
     styleSheet.textContent = `
         .modifier-card-tiny.drag-sort-active {
             background: transparent;
             border: 2px dashed white;
             opacity:0.2;
         }
-    `;
+    `
-    document.head.appendChild(styleSheet);
+    document.head.appendChild(styleSheet)
 
     // observe for changes in tag list
-    const observer = new MutationObserver(function (mutations) {
+    const observer = new MutationObserver(function(mutations) {
-    //    mutations.forEach(function (mutation) {
+        //    mutations.forEach(function (mutation) {
-            if (editorModifierTagsList.childNodes.length > 0) {
+        if (editorModifierTagsList.childNodes.length > 0) {
-                ModifierDragAndDrop(editorModifierTagsList)
+            ModifierDragAndDrop(editorModifierTagsList)
-            }
+        }
-    //    })
+        //    })
     })
-    
+
     observer.observe(editorModifierTagsList, {
-            childList: true
+        childList: true,
     })
 
     let current
     function ModifierDragAndDrop(target) {
-        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
+        let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay")
-        overlays.forEach (i => {
+        overlays.forEach((i) => {
-            i.parentElement.draggable = true;
+            i.parentElement.draggable = true
-            
+
             i.parentElement.ondragstart = (e) => {
                 current = i
-                i.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].innerText = ''
+                i.parentElement.getElementsByClassName("modifier-card-image-overlay")[0].innerText = ""
                 i.parentElement.draggable = true
-                i.parentElement.classList.add('drag-sort-active')
+                i.parentElement.classList.add("drag-sort-active")
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
+                for (let item of document
-                    if (item.parentElement.parentElement.getElementsByClassName('modifier-card-overlay')[0] != current) {
+                    .querySelector("#editor-inputs-tags-list")
-                        item.parentElement.parentElement.getElementsByClassName('modifier-card-image-overlay')[0].style.opacity = 0
+                    .getElementsByClassName("modifier-card-image-overlay")) {
-                        if(item.parentElement.getElementsByClassName('modifier-card-image').length > 0) {
+                    if (
-                            item.parentElement.getElementsByClassName('modifier-card-image')[0].style.filter = 'none'
+                        item.parentElement.parentElement.getElementsByClassName("modifier-card-overlay")[0] != current
+                    ) {
+                        item.parentElement.parentElement.getElementsByClassName(
+                            "modifier-card-image-overlay"
+                        )[0].style.opacity = 0
+                        if (item.parentElement.getElementsByClassName("modifier-card-image").length > 0) {
+                            item.parentElement.getElementsByClassName("modifier-card-image")[0].style.filter = "none"
                         }
-                        item.parentElement.parentElement.style.transform = 'none'
+                        item.parentElement.parentElement.style.transform = "none"
-                        item.parentElement.parentElement.style.boxShadow = 'none'
+                        item.parentElement.parentElement.style.boxShadow = "none"
                     }
-                    item.innerText = ''
+                    item.innerText = ""
                 }
             }
-            
+
             i.ondragenter = (e) => {
                 e.preventDefault()
                 if (i != current) {
-                    let currentPos = 0, droppedPos = 0;
+                    let currentPos = 0,
+                        droppedPos = 0
                     for (let it = 0; it < overlays.length; it++) {
-                        if (current == overlays[it]) { currentPos = it; }
+                        if (current == overlays[it]) {
-                        if (i == overlays[it]) { droppedPos = it; }
+                            currentPos = it
+                        }
+                        if (i == overlays[it]) {
+                            droppedPos = it
+                        }
                     }
 
                     if (i.parentElement != current.parentElement) {
-                        let currentPos = 0, droppedPos = 0
+                        let currentPos = 0,
+                            droppedPos = 0
                         for (let it = 0; it < overlays.length; it++) {
-                            if (current == overlays[it]) { currentPos = it }
+                            if (current == overlays[it]) {
-                            if (i == overlays[it]) { droppedPos = it }
+                                currentPos = it
+                            }
+                            if (i == overlays[it]) {
+                                droppedPos = it
+                            }
                         }
                         if (currentPos < droppedPos) {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement.nextSibling).getElementsByClassName('modifier-card-overlay')[0]
+                            current = i.parentElement.parentNode
+                                .insertBefore(current.parentElement, i.parentElement.nextSibling)
+                                .getElementsByClassName("modifier-card-overlay")[0]
                         } else {
-                            current = i.parentElement.parentNode.insertBefore(current.parentElement, i.parentElement).getElementsByClassName('modifier-card-overlay')[0]
+                            current = i.parentElement.parentNode
+                                .insertBefore(current.parentElement, i.parentElement)
+                                .getElementsByClassName("modifier-card-overlay")[0]
                         }
                         // update activeTags
                         const tag = activeTags.splice(currentPos, 1)
                         activeTags.splice(droppedPos, 0, tag[0])
-                        document.dispatchEvent(new Event('refreshImageModifiers'))
+                        document.dispatchEvent(new Event("refreshImageModifiers"))
                     }
                 }
-            };
+            }
 
             i.ondragover = (e) => {
                 e.preventDefault()
             }
-            
+
             i.parentElement.ondragend = (e) => {
-                i.parentElement.classList.remove('drag-sort-active')
+                i.parentElement.classList.remove("drag-sort-active")
-                for(let item of document.querySelector('#editor-inputs-tags-list').getElementsByClassName('modifier-card-image-overlay')) {
+                for (let item of document
-                    item.style.opacity = ''
+                    .querySelector("#editor-inputs-tags-list")
-                    item.innerText = '-'
+                    .getElementsByClassName("modifier-card-image-overlay")) {
+                    item.style.opacity = ""
+                    item.innerText = "-"
                 }
             }
         })

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

@@ -1,35 +1,37 @@
-(function () {
+;(function() {
     "use strict"
 
     const MAX_WEIGHT = 5
-    
+
-    if (typeof editorModifierTagsList !== 'object') {
+    if (typeof editorModifierTagsList !== "object") {
-        console.error('editorModifierTagsList missing...')
+        console.error("editorModifierTagsList missing...")
         return
     }
 
     // observe for changes in tag list
-    const observer = new MutationObserver(function (mutations) {
+    const observer = new MutationObserver(function(mutations) {
-    //    mutations.forEach(function (mutation) {
+        //    mutations.forEach(function (mutation) {
-            if (editorModifierTagsList.childNodes.length > 0) {
+        if (editorModifierTagsList.childNodes.length > 0) {
-                ModifierMouseWheel(editorModifierTagsList)
+            ModifierMouseWheel(editorModifierTagsList)
-            }
+        }
-    //    })
+        //    })
     })
-    
+
     observer.observe(editorModifierTagsList, {
-            childList: true
+        childList: true,
     })
 
     function ModifierMouseWheel(target) {
-        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
+        let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay")
-        overlays.forEach (i => {
+        overlays.forEach((i) => {
             i.onwheel = (e) => {
                 if (e.ctrlKey == true) {
                     e.preventDefault()
-    
+
                     const delta = Math.sign(event.deltaY)
-                    let s = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText
+                    let s = i.parentElement
+                        .getElementsByClassName("modifier-card-label")[0]
+                        .getElementsByTagName("p")[0].innerText
                     let t
                     // find the corresponding tag
                     for (let it = 0; it < overlays.length; it++) {
@@ -38,43 +40,40 @@
                             break
                         }
                     }
-                    if (s.charAt(0) !== '(' && s.charAt(s.length - 1) !== ')' && s.trim().includes(' ')) {
+                    if (s.charAt(0) !== "(" && s.charAt(s.length - 1) !== ")" && s.trim().includes(" ")) {
-                        s = '(' + s + ')'
+                        s = "(" + s + ")"
-                        t = '(' + t + ')'
+                        t = "(" + t + ")"
                     }
                     if (delta < 0) {
                         // wheel scrolling up
-                        if (s.substring(s.length - 1) == '-') {
+                        if (s.substring(s.length - 1) == "-") {
                             s = s.substring(0, s.length - 1)
                             t = t.substring(0, t.length - 1)
-                        }
+                        } else {
-                        else
+                            if (s.substring(s.length - MAX_WEIGHT) !== "+".repeat(MAX_WEIGHT)) {
-                        {
+                                s = s + "+"
-                            if (s.substring(s.length - MAX_WEIGHT) !== '+'.repeat(MAX_WEIGHT)) {
+                                t = t + "+"
-                                s = s + '+'
-                                t = t + '+'
                             }
                         }
-                    }
+                    } else {
-                    else{
                         // wheel scrolling down
-                        if (s.substring(s.length - 1) == '+') {
+                        if (s.substring(s.length - 1) == "+") {
                             s = s.substring(0, s.length - 1)
                             t = t.substring(0, t.length - 1)
-                        }
+                        } else {
-                        else
+                            if (s.substring(s.length - MAX_WEIGHT) !== "-".repeat(MAX_WEIGHT)) {
-                        {
+                                s = s + "-"
-                            if (s.substring(s.length - MAX_WEIGHT) !== '-'.repeat(MAX_WEIGHT)) {
+                                t = t + "-"
-                                s = s + '-'
-                                t = t + '-'
                             }
                         }
                     }
-                    if (s.charAt(0) === '(' && s.charAt(s.length - 1) === ')') {
+                    if (s.charAt(0) === "(" && s.charAt(s.length - 1) === ")") {
                         s = s.substring(1, s.length - 1)
                         t = t.substring(1, t.length - 1)
                     }
-                    i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText = s
+                    i.parentElement
+                        .getElementsByClassName("modifier-card-label")[0]
+                        .getElementsByTagName("p")[0].innerText = s
                     // update activeTags
                     for (let it = 0; it < overlays.length; it++) {
                         if (i == overlays[it]) {
@@ -82,7 +81,7 @@
                             break
                         }
                     }
-                    document.dispatchEvent(new Event('refreshImageModifiers'))
+                    document.dispatchEvent(new Event("refreshImageModifiers"))
                 }
             }
         })

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

@@ -1,31 +1,31 @@
-(function() {
+;(function() {
-    PLUGINS['MODIFIERS_LOAD'].push({
+    PLUGINS["MODIFIERS_LOAD"].push({
         loader: function() {
-            let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, '')
+            let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, "")
             customModifiersTextBox.value = customModifiers
 
             if (customModifiersGroupElement !== undefined) {
                 customModifiersGroupElement.remove()
             }
 
-            if (customModifiers && customModifiers.trim() !== '') {
+            if (customModifiers && customModifiers.trim() !== "") {
-                customModifiers = customModifiers.split('\n')
+                customModifiers = customModifiers.split("\n")
-                customModifiers = customModifiers.filter(m => m.trim() !== '')
+                customModifiers = customModifiers.filter((m) => m.trim() !== "")
                 customModifiers = customModifiers.map(function(m) {
                     return {
-                        "modifier": m
+                        modifier: m,
                     }
                 })
 
                 let customGroup = {
-                    'category': 'Custom Modifiers',
+                    category: "Custom Modifiers",
-                    'modifiers': customModifiers
+                    modifiers: customModifiers,
                 }
 
                 customModifiersGroupElement = createModifierGroup(customGroup, true)
 
                 createCollapsibles(customModifiersGroupElement)
             }
-        }
+        },
     })
 })()

ui/plugins/ui/jasmine/boot0.js

@@ -26,39 +26,39 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  after `jasmine.js` and `jasmine_html.js`, but before `boot1.js` or any project
  source files or spec files are loaded.
  */
-(function() {
+;(function() {
-  const jasmineRequire = window.jasmineRequire || require('./jasmine.js');
+    const jasmineRequire = window.jasmineRequire || require("./jasmine.js")
 
-  /**
+    /**
-   * ## Require & Instantiate
+     * ## Require & Instantiate
-   *
+     *
-   * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
+     * Require Jasmine's core files. Specifically, this requires and attaches all of Jasmine's code to the `jasmine` reference.
-   */
+     */
-  const jasmine = jasmineRequire.core(jasmineRequire),
+    const jasmine = jasmineRequire.core(jasmineRequire),
-    global = jasmine.getGlobal();
+        global = jasmine.getGlobal()
-  global.jasmine = jasmine;
+    global.jasmine = jasmine
 
-  /**
+    /**
-   * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
+     * Since this is being run in a browser and the results should populate to an HTML page, require the HTML-specific Jasmine code, injecting the same reference.
-   */
+     */
-  jasmineRequire.html(jasmine);
+    jasmineRequire.html(jasmine)
 
-  /**
+    /**
-   * Create the Jasmine environment. This is used to run all specs in a project.
+     * Create the Jasmine environment. This is used to run all specs in a project.
-   */
+     */
-  const env = jasmine.getEnv();
+    const env = jasmine.getEnv()
 
-  /**
+    /**
-   * ## The Global Interface
+     * ## The Global Interface
-   *
+     *
-   * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
+     * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
-   */
+     */
-  const jasmineInterface = jasmineRequire.interface(jasmine, env);
+    const jasmineInterface = jasmineRequire.interface(jasmine, env)
 
-  /**
+    /**
-   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
+     * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
-   */
+     */
-  for (const property in jasmineInterface) {
+    for (const property in jasmineInterface) {
-    global[property] = jasmineInterface[property];
+        global[property] = jasmineInterface[property]
-  }
+    }
-})();
+})()

ui/plugins/ui/jasmine/boot1.js

@@ -33,100 +33,98 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  after `boot0.js` is loaded and before this file is loaded.
  */
 
-(function() {
+;(function() {
-  const env = jasmine.getEnv();
+    const env = jasmine.getEnv()
 
-  /**
+    /**
-   * ## Runner Parameters
+     * ## Runner Parameters
-   *
+     *
-   * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface.
+     * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface.
-   */
+     */
 
-  const queryString = new jasmine.QueryString({
+    const queryString = new jasmine.QueryString({
-    getWindowLocation: function() {
+        getWindowLocation: function() {
-      return window.location;
+            return window.location
+        },
+    })
+
+    const filterSpecs = !!queryString.getParam("spec")
+
+    const config = {
+        stopOnSpecFailure: queryString.getParam("stopOnSpecFailure"),
+        stopSpecOnExpectationFailure: queryString.getParam("stopSpecOnExpectationFailure"),
+        hideDisabled: queryString.getParam("hideDisabled"),
     }
-  });
 
-  const filterSpecs = !!queryString.getParam('spec');
+    const random = queryString.getParam("random")
 
-  const config = {
+    if (random !== undefined && random !== "") {
-    stopOnSpecFailure: queryString.getParam('stopOnSpecFailure'),
+        config.random = random
-    stopSpecOnExpectationFailure: queryString.getParam(
-      'stopSpecOnExpectationFailure'
-    ),
-    hideDisabled: queryString.getParam('hideDisabled')
-  };
-
-  const random = queryString.getParam('random');
-
-  if (random !== undefined && random !== '') {
-    config.random = random;
-  }
-
-  const seed = queryString.getParam('seed');
-  if (seed) {
-    config.seed = seed;
-  }
-
-  /**
-   * ## Reporters
-   * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
-   */
-  const htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    navigateWithNewParam: function(key, value) {
-      return queryString.navigateWithNewParam(key, value);
-    },
-    addToExistingQueryString: function(key, value) {
-      return queryString.fullStringWithNewParam(key, value);
-    },
-    getContainer: function() {
-      return document.body;
-    },
-    createElement: function() {
-      return document.createElement.apply(document, arguments);
-    },
-    createTextNode: function() {
-      return document.createTextNode.apply(document, arguments);
-    },
-    timer: new jasmine.Timer(),
-    filterSpecs: filterSpecs
-  });
-
-  /**
-   * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
-   */
-  env.addReporter(jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  /**
-   * Filter which specs will be run by matching the start of the full name against the `spec` query param.
-   */
-  const specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() {
-      return queryString.getParam('spec');
     }
-  });
 
-  config.specFilter = function(spec) {
+    const seed = queryString.getParam("seed")
-    return specFilter.matches(spec.getFullName());
+    if (seed) {
-  };
+        config.seed = seed
-
-  env.configure(config);
-
-  /**
-   * ## Execution
-   *
-   * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
-   */
-  const currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
     }
-    htmlReporter.initialize();
+
-    env.execute();
+    /**
-  };
+     * ## Reporters
-})();
+     * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
+     */
+    const htmlReporter = new jasmine.HtmlReporter({
+        env: env,
+        navigateWithNewParam: function(key, value) {
+            return queryString.navigateWithNewParam(key, value)
+        },
+        addToExistingQueryString: function(key, value) {
+            return queryString.fullStringWithNewParam(key, value)
+        },
+        getContainer: function() {
+            return document.body
+        },
+        createElement: function() {
+            return document.createElement.apply(document, arguments)
+        },
+        createTextNode: function() {
+            return document.createTextNode.apply(document, arguments)
+        },
+        timer: new jasmine.Timer(),
+        filterSpecs: filterSpecs,
+    })
+
+    /**
+     * The `jsApiReporter` also receives spec results, and is used by any environment that needs to extract the results  from JavaScript.
+     */
+    env.addReporter(jsApiReporter)
+    env.addReporter(htmlReporter)
+
+    /**
+     * Filter which specs will be run by matching the start of the full name against the `spec` query param.
+     */
+    const specFilter = new jasmine.HtmlSpecFilter({
+        filterString: function() {
+            return queryString.getParam("spec")
+        },
+    })
+
+    config.specFilter = function(spec) {
+        return specFilter.matches(spec.getFullName())
+    }
+
+    env.configure(config)
+
+    /**
+     * ## Execution
+     *
+     * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
+     */
+    const currentWindowOnload = window.onload
+
+    window.onload = function() {
+        if (currentWindowOnload) {
+            currentWindowOnload()
+        }
+        htmlReporter.initialize()
+        env.execute()
+    }
+})()

ui/plugins/ui/jasmineSpec.js

@@ -2,34 +2,34 @@
 
 const JASMINE_SESSION_ID = `jasmine-${String(Date.now()).slice(8)}`
 
-beforeEach(function () {
+beforeEach(function() {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * 60 * 1000 // Test timeout after 15 minutes
     jasmine.addMatchers({
-        toBeOneOf: function () {
+        toBeOneOf: function() {
             return {
-                compare: function (actual, expected) {
+                compare: function(actual, expected) {
                     return {
-                        pass: expected.includes(actual)
+                        pass: expected.includes(actual),
                     }
-                }
+                },
             }
-        }
+        },
     })
 })
-describe('stable-diffusion-ui', function() {
+describe("stable-diffusion-ui", function() {
     beforeEach(function() {
-        expect(typeof SD).toBe('object')
+        expect(typeof SD).toBe("object")
-        expect(typeof SD.serverState).toBe('object')
+        expect(typeof SD.serverState).toBe("object")
-        expect(typeof SD.serverState.status).toBe('string')
+        expect(typeof SD.serverState.status).toBe("string")
     })
-    it('should be able to reach the backend', async function() {
+    it("should be able to reach the backend", async function() {
         expect(SD.serverState.status).toBe(SD.ServerStates.unavailable)
         SD.sessionId = JASMINE_SESSION_ID
         await SD.init()
         expect(SD.isServerAvailable()).toBeTrue()
     })
 
-    it('enfore the current task state', function() {
+    it("enfore the current task state", function() {
         const task = new SD.Task()
         expect(task.status).toBe(SD.TaskStatus.init)
         expect(task.isPending).toBeTrue()
@@ -65,149 +65,161 @@ describe('stable-diffusion-ui', function() {
             task._setStatus(SD.TaskStatus.completed)
         }).toThrowError()
     })
-    it('should be able to run tasks', async function() {
+    it("should be able to run tasks", async function() {
-        expect(typeof SD.Task.run).toBe('function')
+        expect(typeof SD.Task.run).toBe("function")
         const promiseGenerator = (function*(val) {
-            expect(val).toBe('start')
+            expect(val).toBe("start")
             expect(yield 1 + 1).toBe(4)
             expect(yield 2 + 2).toBe(8)
             yield asyncDelay(500)
             expect(yield 3 + 3).toBe(12)
             expect(yield 4 + 4).toBe(16)
             return 8 + 8
-        })('start')
+        })("start")
-        const callback = function({value, done}) {
+        const callback = function({ value, done }) {
-            return {value: 2 * value, done}
+            return { value: 2 * value, done }
         }
-        expect(await SD.Task.run(promiseGenerator, {callback})).toBe(32)
+        expect(await SD.Task.run(promiseGenerator, { callback })).toBe(32)
     })
-    it('should be able to queue tasks', async function() {
+    it("should be able to queue tasks", async function() {
-        expect(typeof SD.Task.enqueue).toBe('function')
+        expect(typeof SD.Task.enqueue).toBe("function")
         const promiseGenerator = (function*(val) {
-            expect(val).toBe('start')
+            expect(val).toBe("start")
             expect(yield 1 + 1).toBe(4)
             expect(yield 2 + 2).toBe(8)
             yield asyncDelay(500)
             expect(yield 3 + 3).toBe(12)
             expect(yield 4 + 4).toBe(16)
             return 8 + 8
-        })('start')
+        })("start")
-        const callback = function({value, done}) {
+        const callback = function({ value, done }) {
-            return {value: 2 * value, done}
+            return { value: 2 * value, done }
         }
-        const gen = SD.Task.asGenerator({generator: promiseGenerator, callback})
+        const gen = SD.Task.asGenerator({ generator: promiseGenerator, callback })
         expect(await SD.Task.enqueue(gen)).toBe(32)
     })
-    it('should be able to chain handlers', async function() {
+    it("should be able to chain handlers", async function() {
-        expect(typeof SD.Task.enqueue).toBe('function')
+        expect(typeof SD.Task.enqueue).toBe("function")
         const promiseGenerator = (function*(val) {
-            expect(val).toBe('start')
+            expect(val).toBe("start")
-            expect(yield {test: '1'}).toEqual({test: '1', foo: 'bar'})
+            expect(yield { test: "1" }).toEqual({ test: "1", foo: "bar" })
             expect(yield 2 + 2).toEqual(8)
             yield asyncDelay(500)
             expect(yield 3 + 3).toEqual(12)
-            expect(yield {test: 4}).toEqual({test: 8, foo: 'bar'})
+            expect(yield { test: 4 }).toEqual({ test: 8, foo: "bar" })
-            return {test: 8}
+            return { test: 8 }
-        })('start')
+        })("start")
-        const gen1 = SD.Task.asGenerator({generator: promiseGenerator, callback: function({value, done}) {
+        const gen1 = SD.Task.asGenerator({
-            if (typeof value === "object") {
+            generator: promiseGenerator,
-                value['foo'] = 'bar'
+            callback: function({ value, done }) {
-            }
+                if (typeof value === "object") {
-            return {value, done}
+                    value["foo"] = "bar"
-        }})
+                }
-        const gen2 = SD.Task.asGenerator({generator: gen1, callback: function({value, done}) {
+                return { value, done }
-            if (typeof value === 'number') {
+            },
-                value = 2 * value
+        })
-            }
+        const gen2 = SD.Task.asGenerator({
-            if (typeof value === 'object' && typeof value.test === 'number') {
+            generator: gen1,
-                value.test = 2 * value.test
+            callback: function({ value, done }) {
-            }
+                if (typeof value === "number") {
-            return {value, done}
+                    value = 2 * value
-        }})
+                }
-        expect(await SD.Task.enqueue(gen2)).toEqual({test:32, foo: 'bar'})
+                if (typeof value === "object" && typeof value.test === "number") {
+                    value.test = 2 * value.test
+                }
+                return { value, done }
+            },
+        })
+        expect(await SD.Task.enqueue(gen2)).toEqual({ test: 32, foo: "bar" })
     })
-    describe('ServiceContainer', function() {
+    describe("ServiceContainer", function() {
-        it('should be able to register providers', function() {
+        it("should be able to register providers", function() {
             const cont = new ServiceContainer(
                 function foo() {
-                    this.bar = ''
+                    this.bar = ""
                 },
                 function bar() {
                     return () => 0
                 },
-                { name: 'zero', definition: 0 },
+                { name: "zero", definition: 0 },
-                { name: 'ctx', definition: () => Object.create(null), singleton: true },
+                { name: "ctx", definition: () => Object.create(null), singleton: true },
-                { name: 'test',
+                {
+                    name: "test",
                     definition: (ctx, missing, one, foo) => {
-                        expect(ctx).toEqual({ran: true})
+                        expect(ctx).toEqual({ ran: true })
                         expect(one).toBe(1)
-                        expect(typeof foo).toBe('object')
+                        expect(typeof foo).toBe("object")
                         expect(foo.bar).toBeDefined()
-                        expect(typeof missing).toBe('undefined')
+                        expect(typeof missing).toBe("undefined")
-                        return {foo: 'bar'}
+                        return { foo: "bar" }
-                    }, dependencies: ['ctx', 'missing', 'one', 'foo']
+                    },
+                    dependencies: ["ctx", "missing", "one", "foo"],
                 }
             )
-            const fooObj = cont.get('foo')
+            const fooObj = cont.get("foo")
-            expect(typeof fooObj).toBe('object')
+            expect(typeof fooObj).toBe("object")
             fooObj.ran = true
 
-            const ctx = cont.get('ctx')
+            const ctx = cont.get("ctx")
             expect(ctx).toEqual({})
             ctx.ran = true
 
-            const bar = cont.get('bar')
+            const bar = cont.get("bar")
-            expect(typeof bar).toBe('function')
+            expect(typeof bar).toBe("function")
             expect(bar()).toBe(0)
 
-            cont.register({name: 'one', definition: 1})
+            cont.register({ name: "one", definition: 1 })
-            const test = cont.get('test')
+            const test = cont.get("test")
-            expect(typeof test).toBe('object')
+            expect(typeof test).toBe("object")
-            expect(test.foo).toBe('bar')
+            expect(test.foo).toBe("bar")
         })
     })
-    it('should be able to stream data in chunks', async function() {
+    it("should be able to stream data in chunks", async function() {
         expect(SD.isServerAvailable()).toBeTrue()
         const nbr_steps = 15
-        let res = await fetch('/render', {
+        let res = await fetch("/render", {
-            method: 'POST',
+            method: "POST",
             headers: {
-                'Content-Type': 'application/json'
+                "Content-Type": "application/json",
             },
             body: JSON.stringify({
-                "prompt": "a photograph of an astronaut riding a horse",
+                prompt: "a photograph of an astronaut riding a horse",
-                "negative_prompt": "",
+                negative_prompt: "",
-                "width": 128,
+                width: 128,
-                "height": 128,
+                height: 128,
-                "seed": Math.floor(Math.random() * 10000000),
+                seed: Math.floor(Math.random() * 10000000),
 
-                "sampler": "plms",
+                sampler: "plms",
-                "use_stable_diffusion_model": "sd-v1-4",
+                use_stable_diffusion_model: "sd-v1-4",
-                "num_inference_steps": nbr_steps,
+                num_inference_steps: nbr_steps,
-                "guidance_scale": 7.5,
+                guidance_scale: 7.5,
 
-                "numOutputsParallel": 1,
+                numOutputsParallel: 1,
-                "stream_image_progress": true,
+                stream_image_progress: true,
-                "show_only_filtered_image": true,
+                show_only_filtered_image: true,
-                "output_format": "jpeg",
+                output_format: "jpeg",
 
-                "session_id": JASMINE_SESSION_ID,
+                session_id: JASMINE_SESSION_ID,
             }),
         })
         expect(res.ok).toBeTruthy()
         const renderRequest = await res.json()
-        expect(typeof renderRequest.stream).toBe('string')
+        expect(typeof renderRequest.stream).toBe("string")
         expect(renderRequest.task).toBeDefined()
 
         // Wait for server status to update.
-        await SD.waitUntil(() => {
+        await SD.waitUntil(
-            console.log('Waiting for %s to be received...', renderRequest.task)
+            () => {
-            return (!SD.serverState.tasks || SD.serverState.tasks[String(renderRequest.task)])
+                console.log("Waiting for %s to be received...", renderRequest.task)
-        }, 250, 10 * 60 * 1000)
+                return !SD.serverState.tasks || SD.serverState.tasks[String(renderRequest.task)]
+            },
+            250,
+            10 * 60 * 1000
+        )
         // Wait for task to start on server.
         await SD.waitUntil(() => {
-            console.log('Waiting for %s to start...', renderRequest.task)
+            console.log("Waiting for %s to start...", renderRequest.task)
-            return !SD.serverState.tasks || SD.serverState.tasks[String(renderRequest.task)] !== 'pending'
+            return !SD.serverState.tasks || SD.serverState.tasks[String(renderRequest.task)] !== "pending"
         }, 250)
 
         const reader = new SD.ChunkedStreamReader(renderRequest.stream)
@@ -217,24 +229,24 @@ describe('stable-diffusion-ui', function() {
             if (!value || value.length <= 0) {
                 return
             }
-            return reader.readStreamAsJSON(value.join(''))
+            return reader.readStreamAsJSON(value.join(""))
         }
-        reader.onNext = function({done, value}) {
+        reader.onNext = function({ done, value }) {
             console.log(value)
-            if (typeof value === 'object' && 'status' in value) {
+            if (typeof value === "object" && "status" in value) {
                 done = true
             }
-            return {done, value}
+            return { done, value }
         }
         let lastUpdate = undefined
         let stepCount = 0
         let complete = false
         //for await (const stepUpdate of reader) {
         for await (const stepUpdate of reader.open()) {
-            console.log('ChunkedStreamReader received ', stepUpdate)
+            console.log("ChunkedStreamReader received ", stepUpdate)
             lastUpdate = stepUpdate
             if (complete) {
-                expect(stepUpdate.status).toBe('succeeded')
+                expect(stepUpdate.status).toBe("succeeded")
                 expect(stepUpdate.output).toHaveSize(1)
             } else {
                 expect(stepUpdate.total_steps).toBe(nbr_steps)
@@ -246,70 +258,76 @@ describe('stable-diffusion-ui', function() {
                 }
             }
         }
-        for(let i=1; i <= 5; ++i) {
+        for (let i = 1; i <= 5; ++i) {
             res = await fetch(renderRequest.stream)
             expect(res.ok).toBeTruthy()
             const cachedResponse = await res.json()
-            console.log('Cache test %s received %o', i, cachedResponse)
+            console.log("Cache test %s received %o", i, cachedResponse)
             expect(lastUpdate).toEqual(cachedResponse)
         }
     })
 
-    describe('should be able to make renders', function() {
+    describe("should be able to make renders", function() {
         beforeEach(function() {
             expect(SD.isServerAvailable()).toBeTrue()
         })
-        it('basic inline request', async function() {
+        it("basic inline request", async function() {
             let stepCount = 0
             let complete = false
-            const result = await SD.render({
+            const result = await SD.render(
-                "prompt": "a photograph of an astronaut riding a horse",
+                {
-                "width": 128,
+                    prompt: "a photograph of an astronaut riding a horse",
-                "height": 128,
+                    width: 128,
-                "num_inference_steps": 10,
+                    height: 128,
-                "show_only_filtered_image": false,
+                    num_inference_steps: 10,
-                //"use_face_correction": 'GFPGANv1.3',
+                    show_only_filtered_image: false,
-                "use_upscale": "RealESRGAN_x4plus",
+                    //"use_face_correction": 'GFPGANv1.3',
-                "session_id": JASMINE_SESSION_ID,
+                    use_upscale: "RealESRGAN_x4plus",
-            }, function(event) {
+                    session_id: JASMINE_SESSION_ID,
-                console.log(this, event)
+                },
-                if ('update' in event) {
+                function(event) {
-                    const stepUpdate = event.update
+                    console.log(this, event)
-                    if (complete || (stepUpdate.status && stepUpdate.step === stepUpdate.total_steps)) {
+                    if ("update" in event) {
-                        expect(stepUpdate.status).toBe('succeeded')
+                        const stepUpdate = event.update
-                        expect(stepUpdate.output).toHaveSize(2)
+                        if (complete || (stepUpdate.status && stepUpdate.step === stepUpdate.total_steps)) {
-                    } else {
+                            expect(stepUpdate.status).toBe("succeeded")
-                        expect(stepUpdate.step).toBe(stepCount)
+                            expect(stepUpdate.output).toHaveSize(2)
-                        if (stepUpdate.step === stepUpdate.total_steps) {
-                            complete = true
                         } else {
-                            stepCount++
+                            expect(stepUpdate.step).toBe(stepCount)
+                            if (stepUpdate.step === stepUpdate.total_steps) {
+                                complete = true
+                            } else {
+                                stepCount++
+                            }
                         }
                     }
                 }
-            })
+            )
             console.log(result)
-            expect(result.status).toBe('succeeded')
+            expect(result.status).toBe("succeeded")
             expect(result.output).toHaveSize(2)
         })
-        it('post and reader request', async function() {
+        it("post and reader request", async function() {
             const renderTask = new SD.RenderTask({
-                "prompt": "a photograph of an astronaut riding a horse",
+                prompt: "a photograph of an astronaut riding a horse",
-                "width": 128,
+                width: 128,
-                "height": 128,
+                height: 128,
-                "seed": SD.MAX_SEED_VALUE,
+                seed: SD.MAX_SEED_VALUE,
-                "num_inference_steps": 10,
+                num_inference_steps: 10,
-                "session_id": JASMINE_SESSION_ID,
+                session_id: JASMINE_SESSION_ID,
             })
             expect(renderTask.status).toBe(SD.TaskStatus.init)
 
             const timeout = -1
             const renderRequest = await renderTask.post(timeout)
-            expect(typeof renderRequest.stream).toBe('string')
+            expect(typeof renderRequest.stream).toBe("string")
             expect(renderTask.status).toBe(SD.TaskStatus.waiting)
             expect(renderTask.streamUrl).toBe(renderRequest.stream)
 
-            await renderTask.waitUntil({state: SD.TaskStatus.processing, callback: () => console.log('Waiting for render task to start...') })
+            await renderTask.waitUntil({
+                state: SD.TaskStatus.processing,
+                callback: () => console.log("Waiting for render task to start..."),
+            })
             expect(renderTask.status).toBe(SD.TaskStatus.processing)
 
             let stepCount = 0
@@ -318,7 +336,7 @@ describe('stable-diffusion-ui', function() {
             for await (const stepUpdate of renderTask.reader.open()) {
                 console.log(stepUpdate)
                 if (complete || (stepUpdate.status && stepUpdate.step === stepUpdate.total_steps)) {
-                    expect(stepUpdate.status).toBe('succeeded')
+                    expect(stepUpdate.status).toBe("succeeded")
                     expect(stepUpdate.output).toHaveSize(1)
                 } else {
                     expect(stepUpdate.step).toBe(stepCount)
@@ -330,28 +348,28 @@ describe('stable-diffusion-ui', function() {
                 }
             }
             expect(renderTask.status).toBe(SD.TaskStatus.completed)
-            expect(renderTask.result.status).toBe('succeeded')
+            expect(renderTask.result.status).toBe("succeeded")
             expect(renderTask.result.output).toHaveSize(1)
         })
-        it('queued request', async function() {
+        it("queued request", async function() {
             let stepCount = 0
             let complete = false
             const renderTask = new SD.RenderTask({
-                "prompt": "a photograph of an astronaut riding a horse",
+                prompt: "a photograph of an astronaut riding a horse",
-                "width": 128,
+                width: 128,
-                "height": 128,
+                height: 128,
-                "num_inference_steps": 10,
+                num_inference_steps: 10,
-                "show_only_filtered_image": false,
+                show_only_filtered_image: false,
                 //"use_face_correction": 'GFPGANv1.3',
-                "use_upscale": "RealESRGAN_x4plus",
+                use_upscale: "RealESRGAN_x4plus",
-                "session_id": JASMINE_SESSION_ID,
+                session_id: JASMINE_SESSION_ID,
             })
             await renderTask.enqueue(function(event) {
                 console.log(this, event)
-                if ('update' in event) {
+                if ("update" in event) {
                     const stepUpdate = event.update
                     if (complete || (stepUpdate.status && stepUpdate.step === stepUpdate.total_steps)) {
-                        expect(stepUpdate.status).toBe('succeeded')
+                        expect(stepUpdate.status).toBe("succeeded")
                         expect(stepUpdate.output).toHaveSize(2)
                     } else {
                         expect(stepUpdate.step).toBe(stepCount)
@@ -364,12 +382,12 @@ describe('stable-diffusion-ui', function() {
                 }
             })
             console.log(renderTask.result)
-            expect(renderTask.result.status).toBe('succeeded')
+            expect(renderTask.result.status).toBe("succeeded")
             expect(renderTask.result.output).toHaveSize(2)
         })
     })
-    describe('# Special cases', function() {
+    describe("# Special cases", function() {
-        it('should throw an exception on set for invalid sessionId', function() {
+        it("should throw an exception on set for invalid sessionId", function() {
             expect(function() {
                 SD.sessionId = undefined
             }).toThrowError("Can't set sessionId to undefined.")
@@ -386,16 +404,17 @@ if (!PLUGINS.SELFTEST) {
     PLUGINS.SELFTEST = {}
 }
 loadUIPlugins().then(function() {
-    console.log('loadCompleted', loadEvent)
+    console.log("loadCompleted", loadEvent)
-    describe('@Plugins', function() {
+    describe("@Plugins", function() {
-        it('exposes hooks to overide', function() {
+        it("exposes hooks to overide", function() {
-            expect(typeof PLUGINS.IMAGE_INFO_BUTTONS).toBe('object')
+            expect(typeof PLUGINS.IMAGE_INFO_BUTTONS).toBe("object")
-            expect(typeof PLUGINS.TASK_CREATE).toBe('object')
+            expect(typeof PLUGINS.TASK_CREATE).toBe("object")
         })
-        describe('supports selftests', function() { // Hook to allow plugins to define tests.
+        describe("supports selftests", function() {
+            // Hook to allow plugins to define tests.
             const pluginsTests = Object.keys(PLUGINS.SELFTEST).filter((key) => PLUGINS.SELFTEST.hasOwnProperty(key))
             if (!pluginsTests || pluginsTests.length <= 0) {
-                it('but nothing loaded...', function() {
+                it("but nothing loaded...", function() {
                     expect(true).toBeTruthy()
                 })
                 return

ui/plugins/ui/merge.plugin.js

@@ -1,4 +1,4 @@
-(function() {
+;(function() {
     "use strict"
 
     ///////////////////// Function section
@@ -18,146 +18,133 @@
         return y
     }
     function getCurrentTime() {
-        const now = new Date();
+        const now = new Date()
-        let hours = now.getHours();
+        let hours = now.getHours()
-        let minutes = now.getMinutes();
+        let minutes = now.getMinutes()
-        let seconds = now.getSeconds();
+        let seconds = now.getSeconds()
 
-        hours = hours < 10 ? `0${hours}` : hours;
+        hours = hours < 10 ? `0${hours}` : hours
-        minutes = minutes < 10 ? `0${minutes}` : minutes;
+        minutes = minutes < 10 ? `0${minutes}` : minutes
-        seconds = seconds < 10 ? `0${seconds}` : seconds;
+        seconds = seconds < 10 ? `0${seconds}` : seconds
 
-        return `${hours}:${minutes}:${seconds}`;
+        return `${hours}:${minutes}:${seconds}`
     }
 
     function addLogMessage(message) {
-        const logContainer = document.getElementById('merge-log');
+        const logContainer = document.getElementById("merge-log")
-        logContainer.innerHTML += `<i>${getCurrentTime()}</i> ${message}<br>`;
+        logContainer.innerHTML += `<i>${getCurrentTime()}</i> ${message}<br>`
 
         // Scroll to the bottom of the log
-        logContainer.scrollTop = logContainer.scrollHeight;
+        logContainer.scrollTop = logContainer.scrollHeight
 
-        document.querySelector('#merge-log-container').style.display = 'block'
+        document.querySelector("#merge-log-container").style.display = "block"
-    }    
+    }
 
     function addLogSeparator() {
-        const logContainer = document.getElementById('merge-log');
+        const logContainer = document.getElementById("merge-log")
-        logContainer.innerHTML += '<hr>'
+        logContainer.innerHTML += "<hr>"
 
-        logContainer.scrollTop = logContainer.scrollHeight;
+        logContainer.scrollTop = logContainer.scrollHeight
     }
 
     function drawDiagram(fn) {
         const SIZE = 300
-        const canvas = document.getElementById('merge-canvas');
+        const canvas = document.getElementById("merge-canvas")
         canvas.height = canvas.width = SIZE
-        const ctx = canvas.getContext('2d');
+        const ctx = canvas.getContext("2d")
 
         // Draw coordinate system
-        ctx.scale(1, -1);
+        ctx.scale(1, -1)
-        ctx.translate(0, -canvas.height);
+        ctx.translate(0, -canvas.height)
-        ctx.lineWidth = 1;
+        ctx.lineWidth = 1
-        ctx.beginPath();
+        ctx.beginPath()
 
-        ctx.strokeStyle = 'white'
+        ctx.strokeStyle = "white"
-        ctx.moveTo(0,0); ctx.lineTo(0,SIZE); ctx.lineTo(SIZE,SIZE); ctx.lineTo(SIZE,0); ctx.lineTo(0,0); ctx.lineTo(SIZE,SIZE);
+        ctx.moveTo(0, 0)
+        ctx.lineTo(0, SIZE)
+        ctx.lineTo(SIZE, SIZE)
+        ctx.lineTo(SIZE, 0)
+        ctx.lineTo(0, 0)
+        ctx.lineTo(SIZE, SIZE)
         ctx.stroke()
         ctx.beginPath()
-        ctx.setLineDash([1,2])
+        ctx.setLineDash([1, 2])
         const n = SIZE / 10
-        for (let i=n; i<SIZE; i+=n) {
+        for (let i = n; i < SIZE; i += n) {
-            ctx.moveTo(0,i)
+            ctx.moveTo(0, i)
-            ctx.lineTo(SIZE,i)
+            ctx.lineTo(SIZE, i)
-            ctx.moveTo(i,0)
+            ctx.moveTo(i, 0)
-            ctx.lineTo(i,SIZE)
+            ctx.lineTo(i, SIZE)
         }
         ctx.stroke()
         ctx.beginPath()
         ctx.setLineDash([])
-        ctx.beginPath();
+        ctx.beginPath()
-        ctx.strokeStyle = 'black'
+        ctx.strokeStyle = "black"
-        ctx.lineWidth = 3;
+        ctx.lineWidth = 3
         // Plot function
-        const numSamples = 20;
+        const numSamples = 20
         for (let i = 0; i <= numSamples; i++) {
-            const x = i / numSamples;
+            const x = i / numSamples
-            const y = fn(x);
+            const y = fn(x)
-        
+
-            const canvasX = x * SIZE;
+            const canvasX = x * SIZE
-            const canvasY = y * SIZE;
+            const canvasY = y * SIZE
 
             if (i === 0) {
-                ctx.moveTo(canvasX, canvasY);
+                ctx.moveTo(canvasX, canvasY)
             } else {
-                ctx.lineTo(canvasX, canvasY);
+                ctx.lineTo(canvasX, canvasY)
             }
         }
         ctx.stroke()
         // Plot alpha values (yellow boxes)
-        let start = parseFloat( document.querySelector('#merge-start').value )
+        let start = parseFloat(document.querySelector("#merge-start").value)
-        let step = parseFloat( document.querySelector('#merge-step').value )
+        let step = parseFloat(document.querySelector("#merge-step").value)
-        let iterations = document.querySelector('#merge-count').value>>0
+        let iterations = document.querySelector("#merge-count").value >> 0
         ctx.beginPath()
         ctx.fillStyle = "yellow"
-        for (let i=0; i< iterations; i++) {
+        for (let i = 0; i < iterations; i++) {
-            const alpha = ( start + i * step ) / 100
+            const alpha = (start + i * step) / 100
-            const x = alpha*SIZE
+            const x = alpha * SIZE
             const y = fn(alpha) * SIZE
             if (x <= SIZE) {
-                ctx.rect(x-3,y-3,6,6)
+                ctx.rect(x - 3, y - 3, 6, 6)
                 ctx.fill()
             } else {
-                ctx.strokeStyle = 'red'
+                ctx.strokeStyle = "red"
-                ctx.moveTo(0,0); ctx.lineTo(0,SIZE); ctx.lineTo(SIZE,SIZE); ctx.lineTo(SIZE,0); ctx.lineTo(0,0); ctx.lineTo(SIZE,SIZE);
+                ctx.moveTo(0, 0)
+                ctx.lineTo(0, SIZE)
+                ctx.lineTo(SIZE, SIZE)
+                ctx.lineTo(SIZE, 0)
+                ctx.lineTo(0, 0)
+                ctx.lineTo(SIZE, SIZE)
                 ctx.stroke()
-                addLogMessage('<i>Warning: maximum ratio is &#8805; 100%</i>')
+                addLogMessage("<i>Warning: maximum ratio is &#8805; 100%</i>")
             }
         }
     }
 
     function updateChart() {
         let fn = (x) => x
-        switch (document.querySelector('#merge-interpolation').value) {
+        switch (document.querySelector("#merge-interpolation").value) {
-            case 'SmoothStep':
+            case "SmoothStep":
                 fn = smoothstep
                 break
-            case 'SmootherStep':
+            case "SmootherStep":
                 fn = smootherstep
                 break
-            case 'SmoothestStep':
+            case "SmoothestStep":
                 fn = smootheststep
                 break
         }
         drawDiagram(fn)
     }
-
+    createTab({
-    /////////////////////// Tab implementation
+        id: "merge",
-    document.querySelector('.tab-container')?.insertAdjacentHTML('beforeend', `
+        icon: "fa-code-merge",
-        <span id="tab-merge" class="tab">
+        label: "Merge models",
-            <span><i class="fa fa-code-merge icon"></i> Merge models</span>
+        css: `
-        </span>
-    `)
-
-    document.querySelector('#tab-content-wrapper')?.insertAdjacentHTML('beforeend', `
-        <div id="tab-content-merge" class="tab-content">
-            <div id="merge" class="tab-content-inner">
-                Loading..
-            </div>
-        </div>
-    `)
-
-    const tabMerge = document.querySelector('#tab-merge')
-    if (tabMerge) {
-        linkTabContents(tabMerge)
-    }
-    const merge = document.querySelector('#merge')
-    if (!merge) {
-        // merge tab not found, dont exec plugin code.
-        return
-    }
-
-    document.querySelector('body').insertAdjacentHTML('beforeend', `
-        <style>
         #tab-content-merge .tab-content-inner {
             max-width: 100%;
             padding: 10pt;
@@ -233,226 +220,235 @@
         }
         .merge-container #merge-warning {
             color: rgb(153, 153, 153);
-        }
+        }`,
-        </style>
+        content: `
-    `)
+        <div class="merge-container panel-box">
-
+          <div class="merge-input">
-    merge.innerHTML = `
+             <p><label for="#mergeModelA">Select Model A:</label></p>
-    <div class="merge-container panel-box">
+             <input id="mergeModelA" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
-      <div class="merge-input">
+             <p><label for="#mergeModelB">Select Model B:</label></p>
-         <p><label for="#mergeModelA">Select Model A:</label></p>
+             <input id="mergeModelB" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
-         <input id="mergeModelA" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
+             <br/><br/>
-         <p><label for="#mergeModelB">Select Model B:</label></p>
+             <p id="merge-warning"><small><b>Important:</b> Please merge models of similar type.<br/>For e.g. <code>SD 1.4</code> models with only <code>SD 1.4/1.5</code> models,<br/><code>SD 2.0</code> with <code>SD 2.0</code>-type, and <code>SD 2.1</code> with <code>SD 2.1</code>-type models.</small></p>
-         <input id="mergeModelB" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
+             <br/>
-         <br/><br/>
+             <table>
-         <p id="merge-warning"><small><b>Important:</b> Please merge models of similar type.<br/>For e.g. <code>SD 1.4</code> models with only <code>SD 1.4/1.5</code> models,<br/><code>SD 2.0</code> with <code>SD 2.0</code>-type, and <code>SD 2.1</code> with <code>SD 2.1</code>-type models.</small></p>
+                <tr>
-         <br/>
+                    <td><label for="#merge-filename">Output file name:</label></td>
-         <table>
+                    <td><input id="merge-filename" size=24> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Base name of the output file.<br>Mix ratio and file suffix will be appended to this.</span></i></td>
-            <tr>
+                </tr>
-                <td><label for="#merge-filename">Output file name:</label></td>
+                <tr>
-                <td><input id="merge-filename" size=24> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Base name of the output file.<br>Mix ratio and file suffix will be appended to this.</span></i></td>
+                    <td><label for="#merge-fp">Output precision:</label></td>
-            </tr>
+                    <td><select id="merge-fp">
-            <tr>
+                        <option value="fp16">fp16 (smaller file size)</option>
-                <td><label for="#merge-fp">Output precision:</label></td>
+                        <option value="fp32">fp32 (larger file size)</option>
-                <td><select id="merge-fp">
+                    </select>
-                    <option value="fp16">fp16 (smaller file size)</option>
+                    <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Image generation uses fp16, so it's a good choice.<br>Use fp32 if you want to use the result models for more mixes</span></i>
-                    <option value="fp32">fp32 (larger file size)</option>
+                    </td>
-                </select>
+                </tr>
-                <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Image generation uses fp16, so it's a good choice.<br>Use fp32 if you want to use the result models for more mixes</span></i>
+                <tr>
-                </td>
+                    <td><label for="#merge-format">Output file format:</label></td>
-            </tr>
+                    <td><select id="merge-format">
-            <tr>
+                        <option value="safetensors">Safetensors (recommended)</option>
-                <td><label for="#merge-format">Output file format:</label></td>
+                        <option value="ckpt">CKPT/Pickle (legacy format)</option>
-                <td><select id="merge-format">
+                    </select>
-                    <option value="safetensors">Safetensors (recommended)</option>
+                    </td>
-                    <option value="ckpt">CKPT/Pickle (legacy format)</option>
+                </tr>
-                </select>
+             </table>
-                </td>
+             <br/>
-            </tr>
+             <div id="merge-log-container">
-         </table>
+                <p><label for="#merge-log">Log messages:</label></p>
-         <br/>
+                <div id="merge-log"></div>
-         <div id="merge-log-container">
+             </div>
-            <p><label for="#merge-log">Log messages:</label></p>
+          </div>
-            <div id="merge-log"></div>
+          <div class="merge-config">
-         </div>
+             <div class="tab-container">
-      </div>
+                <span id="tab-merge-opts-single" class="tab active">
-      <div class="merge-config">
+                    <span>Make a single file</small></span>
-         <div class="tab-container">
+                </span>
-            <span id="tab-merge-opts-single" class="tab active">
+                <span id="tab-merge-opts-batch" class="tab">
-                <span>Make a single file</small></span>
+                    <span>Make multiple variations</small></span>
-            </span>
+                </span>
-            <span id="tab-merge-opts-batch" class="tab">
+             </div>
-                <span>Make multiple variations</small></span>
+             <div>
-            </span>
+                <div id="tab-content-merge-opts-single" class="tab-content active">
-         </div>
+                    <div class="tab-content-inner">
-         <div>
+                        <small>Saves a single merged model file, at the specified merge ratio.</small><br/><br/>
-            <div id="tab-content-merge-opts-single" class="tab-content active">
+                        <label for="#single-merge-ratio-slider">Merge ratio:</label>
-                <div class="tab-content-inner">
+                        <input id="single-merge-ratio-slider" name="single-merge-ratio-slider" class="editor-slider" value="50" type="range" min="1" max="1000">
-                    <small>Saves a single merged model file, at the specified merge ratio.</small><br/><br/>
+                        <input id="single-merge-ratio" size=2 value="5">%
-                    <label for="#single-merge-ratio-slider">Merge ratio:</label>
+                        <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Model A's contribution to the mix. The rest will be from Model B.</span></i>
-                    <input id="single-merge-ratio-slider" name="single-merge-ratio-slider" class="editor-slider" value="50" type="range" min="1" max="1000">
+                    </div>
-                    <input id="single-merge-ratio" size=2 value="5">%
-                    <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Model A's contribution to the mix. The rest will be from Model B.</span></i>
                 </div>
-            </div>
+                <div id="tab-content-merge-opts-batch" class="tab-content">
-            <div id="tab-content-merge-opts-batch" class="tab-content">
+                    <div class="tab-content-inner">
-                <div class="tab-content-inner">
+                        <small>Saves multiple variations of the model, at different merge ratios.<br/>Each variation will be saved as a separate file.</small><br/><br/>
-                    <small>Saves multiple variations of the model, at different merge ratios.<br/>Each variation will be saved as a separate file.</small><br/><br/>
+                        <table>
-                    <table>
+                            <tr><td><label for="#merge-count">Number of variations:</label></td>
-                        <tr><td><label for="#merge-count">Number of variations:</label></td>
+                                <td> <input id="merge-count" size=2 value="5"></td>
-                            <td> <input id="merge-count" size=2 value="5"></td>
+                                <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Number of models to create</span></i></td></tr>
-                            <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Number of models to create</span></i></td></tr>
+                            <tr><td><label for="#merge-start">Starting merge ratio:</label></td>
-                        <tr><td><label for="#merge-start">Starting merge ratio:</label></td>
+                                <td> <input id="merge-start" size=2 value="5">%</td>
-                            <td> <input id="merge-start" size=2 value="5">%</td>
+                                <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Smallest share of model A in the mix</span></i></td></tr>
-                            <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Smallest share of model A in the mix</span></i></td></tr>
+                            <tr><td><label for="#merge-step">Increment each step:</label></td>
-                        <tr><td><label for="#merge-step">Increment each step:</label></td>
+                                <td> <input id="merge-step" size=2 value="10">%</td>
-                            <td> <input id="merge-step" size=2 value="10">%</td>
+                                <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Share of model A added into the mix per step</span></i></td></tr>
-                            <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Share of model A added into the mix per step</span></i></td></tr>
+                            <tr><td><label for="#merge-interpolation">Interpolation model:</label></td>
-                        <tr><td><label for="#merge-interpolation">Interpolation model:</label></td>
+                                <td> <select id="merge-interpolation">
-                            <td> <select id="merge-interpolation">
+                                    <option>Exact</option>
-                                <option>Exact</option>
+                                    <option>SmoothStep</option>
-                                <option>SmoothStep</option>
+                                    <option>SmootherStep</option>
-                                <option>SmootherStep</option>
+                                    <option>SmoothestStep</option>
-                                <option>SmoothestStep</option>
+                                </select></td>
-                            </select></td>
+                                <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Sigmoid function to be applied to the model share before mixing</span></i></td></tr>
-                            <td> <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Sigmoid function to be applied to the model share before mixing</span></i></td></tr>
+                        </table>
-                    </table>
+                        <br/>
-                    <br/>
+                        <small>Preview of variation ratios:</small><br/>
-                    <small>Preview of variation ratios:</small><br/>
+                        <canvas id="merge-canvas" width="400" height="400"></canvas>
-                    <canvas id="merge-canvas" width="400" height="400"></canvas>
+                    </div>
                 </div>
-            </div>
+             </div>
-         </div>
+          </div>
-      </div>
+          <div class="merge-buttons">
-      <div class="merge-buttons">
+             <button id="merge-button" class="primaryButton">Merge models</button>
-         <button id="merge-button" class="primaryButton">Merge models</button>
+          </div>
-      </div>
+        </div>`,
-    </div>`
+        onOpen: ({ firstOpen }) => {
-
+            if (!firstOpen) {
-    const tabSettingsSingle = document.querySelector('#tab-merge-opts-single')
+                return
-    const tabSettingsBatch = document.querySelector('#tab-merge-opts-batch')
-    linkTabContents(tabSettingsSingle)
-    linkTabContents(tabSettingsBatch)
-
-    console.log('Activate')
-    let mergeModelAField = new ModelDropdown(document.querySelector('#mergeModelA'), 'stable-diffusion')
-    let mergeModelBField = new ModelDropdown(document.querySelector('#mergeModelB'), 'stable-diffusion')
-    updateChart()
-
-    // slider
-    const singleMergeRatioField = document.querySelector('#single-merge-ratio')
-    const singleMergeRatioSlider = document.querySelector('#single-merge-ratio-slider')
-
-    function updateSingleMergeRatio() {
-        singleMergeRatioField.value = singleMergeRatioSlider.value / 10
-        singleMergeRatioField.dispatchEvent(new Event("change"))
-    }
-
-    function updateSingleMergeRatioSlider() {
-        if (singleMergeRatioField.value < 0) {
-            singleMergeRatioField.value = 0
-        } else if (singleMergeRatioField.value > 100) {
-            singleMergeRatioField.value = 100
-        }
-
-        singleMergeRatioSlider.value = singleMergeRatioField.value * 10
-        singleMergeRatioSlider.dispatchEvent(new Event("change"))
-    }
-
-    singleMergeRatioSlider.addEventListener('input', updateSingleMergeRatio)
-    singleMergeRatioField.addEventListener('input', updateSingleMergeRatioSlider)
-    updateSingleMergeRatio()
-
-    document.querySelector('.merge-config').addEventListener('change', updateChart)
-
-    document.querySelector('#merge-button').addEventListener('click', async function(e) {
-        // Build request template
-        let model0 = mergeModelAField.value
-        let model1 = mergeModelBField.value
-        let request = { model0: model0, model1: model1 }
-        request['use_fp16'] = document.querySelector('#merge-fp').value == 'fp16'
-        let iterations = document.querySelector('#merge-count').value>>0
-        let start = parseFloat( document.querySelector('#merge-start').value )
-        let step = parseFloat( document.querySelector('#merge-step').value )
-
-        if (isTabActive(tabSettingsSingle)) {
-            start = parseFloat(singleMergeRatioField.value)
-            step = 0
-            iterations = 1
-            addLogMessage(`merge ratio = ${start}%`)
-        } else {
-            addLogMessage(`start = ${start}%`)
-            addLogMessage(`step  = ${step}%`)
-        }
-
-        if (start + (iterations-1) * step >= 100) {
-            addLogMessage('<i>Aborting: maximum ratio is &#8805; 100%</i>')
-            addLogMessage('Reduce the number of variations or the step size')
-            addLogSeparator()
-            document.querySelector('#merge-count').focus()
-            return
-        }
-
-        if (document.querySelector('#merge-filename').value == "") {
-            addLogMessage('<i>Aborting: No output file name specified</i>')
-            addLogSeparator()
-            document.querySelector('#merge-filename').focus()
-            return
-        }
-        
-        // Disable merge button
-        e.target.disabled=true
-        e.target.classList.add('disabled')
-        let cursor = $("body").css("cursor");
-        let label = document.querySelector('#merge-button').innerHTML
-        $("body").css("cursor", "progress");
-        document.querySelector('#merge-button').innerHTML = 'Merging models ...'
-
-        addLogMessage("Merging models")
-        addLogMessage("Model A: "+model0)
-        addLogMessage("Model B: "+model1)
-
-        // Batch main loop
-        for (let i=0; i<iterations; i++) {
-            let alpha = ( start + i * step ) / 100
-            switch (document.querySelector('#merge-interpolation').value) {
-                case 'SmoothStep':
-                    alpha = smoothstep(alpha)
-                    break
-                case 'SmootherStep':
-                    alpha = smootherstep(alpha)
-                    break
-                case 'SmoothestStep':
-                    alpha = smootheststep(alpha)
-                    break
             }
-            addLogMessage(`merging batch job ${i+1}/${iterations}, alpha = ${alpha.toFixed(5)}...`)
 
-            request['out_path'] = document.querySelector('#merge-filename').value
+            const tabSettingsSingle = document.querySelector("#tab-merge-opts-single")
-            request['out_path'] += '-' + alpha.toFixed(5) + '.' + document.querySelector('#merge-format').value
+            const tabSettingsBatch = document.querySelector("#tab-merge-opts-batch")
-            addLogMessage(`&nbsp;&nbsp;filename: ${request['out_path']}`)
+            linkTabContents(tabSettingsSingle)
+            linkTabContents(tabSettingsBatch)
 
-            request['ratio'] = alpha
+            console.log("Activate")
-            let res = await fetch('/model/merge', {
+            let mergeModelAField = new ModelDropdown(document.querySelector("#mergeModelA"), "stable-diffusion")
-                  method: 'POST',
+            let mergeModelBField = new ModelDropdown(document.querySelector("#mergeModelB"), "stable-diffusion")
-                  headers: { 'Content-Type': 'application/json' },
+            updateChart()
-                  body: JSON.stringify(request) })
-            const data = await res.json();
-            addLogMessage(JSON.stringify(data))
-        }
-        addLogMessage("<b>Done.</b> The models have been saved to your <tt>models/stable-diffusion</tt> folder.")
-        addLogSeparator()
-        // Re-enable merge button
-        $("body").css("cursor", cursor);
-        document.querySelector('#merge-button').innerHTML = label
-        e.target.disabled=false
-        e.target.classList.remove('disabled')
 
-        // Update model list
+            // slider
-        stableDiffusionModelField.innerHTML = ''
+            const singleMergeRatioField = document.querySelector("#single-merge-ratio")
-        vaeModelField.innerHTML = ''
+            const singleMergeRatioSlider = document.querySelector("#single-merge-ratio-slider")
-        hypernetworkModelField.innerHTML = ''
+
-        await getModels()
+            function updateSingleMergeRatio() {
+                singleMergeRatioField.value = singleMergeRatioSlider.value / 10
+                singleMergeRatioField.dispatchEvent(new Event("change"))
+            }
+
+            function updateSingleMergeRatioSlider() {
+                if (singleMergeRatioField.value < 0) {
+                    singleMergeRatioField.value = 0
+                } else if (singleMergeRatioField.value > 100) {
+                    singleMergeRatioField.value = 100
+                }
+
+                singleMergeRatioSlider.value = singleMergeRatioField.value * 10
+                singleMergeRatioSlider.dispatchEvent(new Event("change"))
+            }
+
+            singleMergeRatioSlider.addEventListener("input", updateSingleMergeRatio)
+            singleMergeRatioField.addEventListener("input", updateSingleMergeRatioSlider)
+            updateSingleMergeRatio()
+
+            document.querySelector(".merge-config").addEventListener("change", updateChart)
+
+            document.querySelector("#merge-button").addEventListener("click", async function(e) {
+                // Build request template
+                let model0 = mergeModelAField.value
+                let model1 = mergeModelBField.value
+                let request = { model0: model0, model1: model1 }
+                request["use_fp16"] = document.querySelector("#merge-fp").value == "fp16"
+                let iterations = document.querySelector("#merge-count").value >> 0
+                let start = parseFloat(document.querySelector("#merge-start").value)
+                let step = parseFloat(document.querySelector("#merge-step").value)
+
+                if (isTabActive(tabSettingsSingle)) {
+                    start = parseFloat(singleMergeRatioField.value)
+                    step = 0
+                    iterations = 1
+                    addLogMessage(`merge ratio = ${start}%`)
+                } else {
+                    addLogMessage(`start = ${start}%`)
+                    addLogMessage(`step  = ${step}%`)
+                }
+
+                if (start + (iterations - 1) * step >= 100) {
+                    addLogMessage("<i>Aborting: maximum ratio is &#8805; 100%</i>")
+                    addLogMessage("Reduce the number of variations or the step size")
+                    addLogSeparator()
+                    document.querySelector("#merge-count").focus()
+                    return
+                }
+
+                if (document.querySelector("#merge-filename").value == "") {
+                    addLogMessage("<i>Aborting: No output file name specified</i>")
+                    addLogSeparator()
+                    document.querySelector("#merge-filename").focus()
+                    return
+                }
+
+                // Disable merge button
+                e.target.disabled = true
+                e.target.classList.add("disabled")
+                let cursor = $("body").css("cursor")
+                let label = document.querySelector("#merge-button").innerHTML
+                $("body").css("cursor", "progress")
+                document.querySelector("#merge-button").innerHTML = "Merging models ..."
+
+                addLogMessage("Merging models")
+                addLogMessage("Model A: " + model0)
+                addLogMessage("Model B: " + model1)
+
+                // Batch main loop
+                for (let i = 0; i < iterations; i++) {
+                    let alpha = (start + i * step) / 100
+
+                    if (isTabActive(tabSettingsBatch)) {
+                        switch (document.querySelector("#merge-interpolation").value) {
+                            case "SmoothStep":
+                                alpha = smoothstep(alpha)
+                                break
+                            case "SmootherStep":
+                                alpha = smootherstep(alpha)
+                                break
+                            case "SmoothestStep":
+                                alpha = smootheststep(alpha)
+                                break
+                        }
+                    }
+                    addLogMessage(`merging batch job ${i + 1}/${iterations}, alpha = ${alpha.toFixed(5)}...`)
+
+                    request["out_path"] = document.querySelector("#merge-filename").value
+                    request["out_path"] += "-" + alpha.toFixed(5) + "." + document.querySelector("#merge-format").value
+                    addLogMessage(`&nbsp;&nbsp;filename: ${request["out_path"]}`)
+
+                    // sdkit documentation: "ratio - the ratio of the second model. 1 means only the second model will be used."
+                    request["ratio"] = 1-alpha 
+                    let res = await fetch("/model/merge", {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify(request),
+                    })
+                    const data = await res.json()
+                    addLogMessage(JSON.stringify(data))
+                }
+                addLogMessage(
+                    "<b>Done.</b> The models have been saved to your <tt>models/stable-diffusion</tt> folder."
+                )
+                addLogSeparator()
+                // Re-enable merge button
+                $("body").css("cursor", cursor)
+                document.querySelector("#merge-button").innerHTML = label
+                e.target.disabled = false
+                e.target.classList.remove("disabled")
+
+                // Update model list
+                stableDiffusionModelField.innerHTML = ""
+                vaeModelField.innerHTML = ""
+                hypernetworkModelField.innerHTML = ""
+                await getModels()
+            })
+        },
     })
-
 })()

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

@@ -1,52 +1,52 @@
-(function () {
+;(function() {
     "use strict"
 
-    var styleSheet = document.createElement("style");
+    var styleSheet = document.createElement("style")
     styleSheet.textContent = `
         .modifier-card-tiny.modifier-toggle-inactive {
             background: transparent;
             border: 2px dashed red;
             opacity:0.2;
         }
-    `;
+    `
-    document.head.appendChild(styleSheet);
+    document.head.appendChild(styleSheet)
 
     // observe for changes in tag list
-    var observer = new MutationObserver(function (mutations) {
+    var observer = new MutationObserver(function(mutations) {
-    //    mutations.forEach(function (mutation) {
+        //    mutations.forEach(function (mutation) {
-            if (editorModifierTagsList.childNodes.length > 0) {
+        if (editorModifierTagsList.childNodes.length > 0) {
-                ModifierToggle()
+            ModifierToggle()
-            }
+        }
-    //    })
+        //    })
     })
 
     observer.observe(editorModifierTagsList, {
-            childList: true
+        childList: true,
     })
 
     function ModifierToggle() {
-        let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
+        let overlays = document.querySelector("#editor-inputs-tags-list").querySelectorAll(".modifier-card-overlay")
-        overlays.forEach (i => {
+        overlays.forEach((i) => {
             i.oncontextmenu = (e) => {
                 e.preventDefault()
 
-                if (i.parentElement.classList.contains('modifier-toggle-inactive')) {
+                if (i.parentElement.classList.contains("modifier-toggle-inactive")) {
-                    i.parentElement.classList.remove('modifier-toggle-inactive')
+                    i.parentElement.classList.remove("modifier-toggle-inactive")
-                }
+                } else {
-                else
+                    i.parentElement.classList.add("modifier-toggle-inactive")
-                {
-                    i.parentElement.classList.add('modifier-toggle-inactive')
                 }
                 // refresh activeTags
-                let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName
+                let modifierName = i.parentElement
-                activeTags = activeTags.map(obj => {
+                    .getElementsByClassName("modifier-card-label")[0]
+                    .getElementsByTagName("p")[0].dataset.fullName
+                activeTags = activeTags.map((obj) => {
                     if (trimModifiers(obj.name) === trimModifiers(modifierName)) {
-                        return {...obj, inactive: (obj.element.classList.contains('modifier-toggle-inactive'))};
+                        return { ...obj, inactive: obj.element.classList.contains("modifier-toggle-inactive") }
                     }
-                    
+
-                    return obj;
+                    return obj
-                });
+                })
-                document.dispatchEvent(new Event('refreshImageModifiers'))
+                document.dispatchEvent(new Event("refreshImageModifiers"))
             }
         })
     }

ui/plugins/ui/release-notes.plugin.js

@@ -1,64 +1,53 @@
-(function() {
+;(function() {
     // Register selftests when loaded by jasmine.
-    if (typeof PLUGINS?.SELFTEST === 'object') {
+    if (typeof PLUGINS?.SELFTEST === "object") {
         PLUGINS.SELFTEST["release-notes"] = function() {
-            it('should be able to fetch CHANGES.md', async function() {
+            it("should be able to fetch CHANGES.md", async function() {
-                let releaseNotes = await fetch(`https://raw.githubusercontent.com/cmdr2/stable-diffusion-ui/main/CHANGES.md`)
+                let releaseNotes = await fetch(
+                    `https://raw.githubusercontent.com/cmdr2/stable-diffusion-ui/main/CHANGES.md`
+                )
                 expect(releaseNotes.status).toBe(200)
             })
         }
     }
 
-    document.querySelector('.tab-container')?.insertAdjacentHTML('beforeend', `
+    createTab({
-        <span id="tab-news" class="tab">
+        id: "news",
-            <span><i class="fa fa-bolt icon"></i> What's new?</span>
+        icon: "fa-bolt",
-        </span>
+        label: "What's new",
-    `)
+        css: `
-
-    document.querySelector('#tab-content-wrapper')?.insertAdjacentHTML('beforeend', `
-        <div id="tab-content-news" class="tab-content">
-            <div id="news" class="tab-content-inner">
-                Loading..
-            </div>
-        </div>
-    `)
-
-    const tabNews = document.querySelector('#tab-news')
-    if (tabNews) {
-        linkTabContents(tabNews)
-    }
-    const news = document.querySelector('#news')
-    if (!news) {
-        // news tab not found, dont exec plugin code.
-        return
-    }
-
-    document.querySelector('body').insertAdjacentHTML('beforeend', `
-        <style>
         #tab-content-news .tab-content-inner {
             max-width: 100%;
             text-align: left;
             padding: 10pt;
         }
-        </style>
+        `,
-    `)
+        onOpen: async ({ firstOpen }) => {
+            if (firstOpen) {
+                const loadMarkedScriptPromise = loadScript("/media/js/marked.min.js")
 
-    loadScript('/media/js/marked.min.js').then(async function() {
+                let appConfig = await fetch("/get/app_config")
-        let appConfig = await fetch('/get/app_config')
+                if (!appConfig.ok) {
-        if (!appConfig.ok) {
+                    console.error("[release-notes] Failed to get app_config.")
-            console.error('[release-notes] Failed to get app_config.')
+                    return
-            return
+                }
-        }
+                appConfig = await appConfig.json()
-        appConfig = await appConfig.json()
 
-        const updateBranch = appConfig.update_branch || 'main'
+                const updateBranch = appConfig.update_branch || "main"
 
-        let releaseNotes = await fetch(`https://raw.githubusercontent.com/cmdr2/stable-diffusion-ui/${updateBranch}/CHANGES.md`)
+                let releaseNotes = await fetch(
-        if (!releaseNotes.ok) {
+                    `https://raw.githubusercontent.com/cmdr2/stable-diffusion-ui/${updateBranch}/CHANGES.md`
-            console.error('[release-notes] Failed to get CHANGES.md.')
+                )
-            return
+                if (!releaseNotes.ok) {
-        }
+                    console.error("[release-notes] Failed to get CHANGES.md.")
-        releaseNotes = await releaseNotes.text()
+                    return
-        news.innerHTML = marked.parse(releaseNotes)
+                }
+                releaseNotes = await releaseNotes.text()
+
+                await loadMarkedScriptPromise
+
+                return marked.parse(releaseNotes)
+            }
+        },
     })
-})()
+})()

ui/plugins/ui/selftest.plugin_.js

@@ -1,6 +1,7 @@
 /* SD-UI Selftest Plugin.js
  */
-(function() { "use strict"
+;(function() {
+    "use strict"
     const ID_PREFIX = "selftest-plugin"
 
     const links = document.getElementById("community-links")
@@ -10,16 +11,18 @@
     }
 
     // Add link to Jasmine SpecRunner
-    const pluginLink = document.createElement('li')
+    const pluginLink = document.createElement("li")
     const options = {
-        'stopSpecOnExpectationFailure': "true",
+        stopSpecOnExpectationFailure: "true",
-        'stopOnSpecFailure': 'false',
+        stopOnSpecFailure: "false",
-        'random': 'false',
+        random: "false",
-        'hideDisabled': 'false'
+        hideDisabled: "false",
     }
-    const optStr = Object.entries(options).map(([key, val]) => `${key}=${val}`).join('&')
+    const optStr = Object.entries(options)
+        .map(([key, val]) => `${key}=${val}`)
+        .join("&")
     pluginLink.innerHTML = `<a id="${ID_PREFIX}-starttest" href="${location.protocol}/plugins/core/SpecRunner.html?${optStr}" target="_blank"><i class="fa-solid fa-vial-circle-check"></i> Start SelfTest</a>`
     links.appendChild(pluginLink)
 
-    console.log('%s loaded!', ID_PREFIX)
+    console.log("%s loaded!", ID_PREFIX)
 })()

ui/plugins/ui/tiled-image-download.plugin.js

@@ -0,0 +1,326 @@
+;(function(){
+    "use strict";
+    const PAPERSIZE = [
+        {id: "a3p",  width: 297, height: 420, unit: "mm"},
+        {id: "a3l",  width: 420, height: 297, unit: "mm"},
+        {id: "a4p",  width: 210, height: 297, unit: "mm"},
+        {id: "a4l",  width: 297, height: 210, unit: "mm"},
+        {id: "ll", width: 279, height: 216, unit: "mm"},
+        {id: "lp",  width: 216, height: 279, unit: "mm"},
+        {id: "hd", width: 1920, height: 1080, unit: "pixels"},
+        {id: "4k", width: 3840, height: 2160, unit: "pixels"},
+    ]
+
+    // ---- Register plugin
+    PLUGINS['IMAGE_INFO_BUTTONS'].push({ 
+        html: '<i class="fa-solid fa-table-cells-large"></i> Download tiled image',
+        on_click: onDownloadTiledImage,
+        filter: (req, img) => req.tiling != "none",
+    })
+
+    var thisImage
+
+    function onDownloadTiledImage(req, img) {
+        document.getElementById("download-tiled-image-dialog").showModal()
+        thisImage = new Image()
+        thisImage.src = img.src
+        thisImage.dataset["prompt"] = img.dataset["prompt"]
+    }
+
+    // ---- Add HTML
+    document.getElementById('container').lastElementChild.insertAdjacentHTML("afterend",
+        `<dialog id="download-tiled-image-dialog">
+            <h1>Download tiled image</h1>
+            <div class="download-tiled-image dtim-container">
+                <div class="download-tiled-image-top">
+                    <div class="tab-container">
+                       <span id="tab-image-tiles" class="tab active">
+                           <span>Number of tiles</small></span>
+                       </span>
+                       <span id="tab-image-size" class="tab">
+                           <span>Image dimensions</span>
+                       </span>
+                    </div>
+                    <div>
+                        <div id="tab-content-image-tiles" class="tab-content active">
+                            <div class="tab-content-inner">
+                                <label for="dtim1-width">Width:</label> <input id="dtim1-width" min="1" max="99" type="number" value="2">
+                                <label for="dtim1-height">Height:</label> <input id="dtim1-height" min="1" max="99" type="number" value="2">
+                            </div>
+                        </div>
+                        <div id="tab-content-image-size" class="tab-content">
+                            <div class="tab-content-inner">
+                                <div class="method-2-options">
+                                    <label for="dtim2-width">Width:</label> <input id="dtim2-width" size="3" value="1920">
+                                    <label for="dtim2-height">Height:</label> <input id="dtim2-height" size="3" value="1080">
+                                    <select id="dtim2-unit">
+                                        <option>pixels</option>
+                                        <option>mm</option>
+                                        <option>inches</option>
+                                    </select>
+                                </div>
+                                <div class="method-2-dpi">
+                                    <label for="dtim2-dpi">DPI:</label> <input id="dtim2-dpi" size="3" value="72">
+                                </div>
+                                <div class="method-2-paper">
+                                    <i>Some standard sizes:</i><br>
+                                    <button id="dtim2-a3p">A3 portrait</button><button id="dtim2-a3l">A3 landscape</button><br>
+                                    <button id="dtim2-a4p">A4 portrait</button><button id="dtim2-a4l">A4 landscape</button><br>
+                                    <button id="dtim2-lp">Letter portrait</button><button id="dtim2-ll">Letter landscape</button><br>
+                                    <button id="dtim2-hd">Full HD</button><button id="dtim2-4k">4K</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="download-tiled-image-placement">
+                    <div class="tab-container">
+                        <span id="tab-image-placement" class="tab active">
+                            <span>Tile placement</span>
+                        </span>
+                    </div>
+                    <div>
+                        <div id="tab-content-image-placement" class="tab-content active">
+                            <div class="tab-content-inner">
+                                <img id="dtim-1tl" class="active" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUCAgKIhobRz89vMJ7s6uo9PDx4d3ewra0bHR1dXV19NrLa2Nj+/f29u7uWlJQuLi7ws27qAAAACXBIWXMAAAsTAAALEwEAmpwYAAABlUlEQVQ4y7VUMU7DQBCckpYCJEpS0ByhcecuUZQUtvIHGku0vICSDtHkA9eltCylOEBKFInCRworXToK3kDJ7jpn2SYmgGESeWyPRuudvTugHTyC72momKDGMMJDLIhmgK+nWmuPXxtlxkhjExszRKqU6uRuTW7TYTwh6HTpR25+JLcngBJ5jL5wIecqu9nFbid3t27N7vhrtypqV2SfP4zc5pfu/Msb3P6U4fru1eXpVg7tcmnDZ1gb0s1ceAEcSPI3uM2B9xLf7Z3YLlfJ/WCppF1QbbqxeW0brlztjXzprBhJrW8nu4HWGlt/xz1qcrervfmT2ma3WxpTjfK5ZUioNg+VsUL+tiXuI8YJLrd8KHyENyaqPWC8QGiwwlJ4LtyvNtb9vFKrqZXXeebkrEiN3ZUNXHJnO3aJkxt2aH2gDRNTLdyzJvee1CZXUTSJrhA55itlfszUdqDrxCQmGIEu9KfFFCRJYnpIgyB4JJlPWM6cY6MjN+UW5MjdM7FKavF/pFbfRD9zv8rjBa6FT5EJn0HoA8lOiD4+8B3mAAAAAElFTkSuQmCC" />
+                                <img id="dtim-1tr" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUCAgKIhobRz89vMJ7s6uo9PDx4d3ewra0bHR1dXV19NrLa2Nj+/f29u7uWlJQuLi7ws27qAAAACXBIWXMAAAsTAAALEwEAmpwYAAABoUlEQVQ4y61UsU7CUBQ9o6uGmJgwNSQOLS7dOndrGfwEDWnC4tQNB8duxoUfYGN86fZgIWy+iVUnwwYf4Oi9lxa0tFSpB9IDXM6775773gUaYWjbtoO+IrI1VsIKnjt2CYCllJqir7Wt7SlWWmn+m+t53sQbU5hAamtJrxRr/mppUnuZOgszOlgJK7gCUS93YVbzKqx2q9U2q71Mbf1Qbxc/qqadu7y509W7nX8Pt/K6JwwKO+HCGLRNKPy4oA9mkYUnwGeSJM9IBDknOJN+PNV2rEy9XyXLvaGcktuY0FBux9AP5rVYd96SofCsWFje0NJwUd2rUse/UTfLPTspd83iFFZZYY4xbKoRsKlmaypjjoaICA+4ZYrO8SJ8mfEV0PF9P0Tb94U3wj7eheaHJ3VZLKxbcs4P6uartz/nMYlKbFnzYtWe5ze0wtSjDd1Ph7iReheucS0aRYM78pwoiiDPUc6Dpg19S9N0ipYOgiClw5TqgN6I6aGD7S2RkcsbppnKbLPnPHt7VZOpxvN/cq1cHf9BbeFeqIsL4Wt8CN/gC1XPfwv6U6jJAAAAAElFTkSuQmCC" /><br>
+                                <img id="dtim-1bl" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUCAgKIhobRz89vMJ7s6uo9PDx4d3ewra0bHR1dXV19NrLa2Nj+/f29u7uWlJQuLi7ws27qAAAACXBIWXMAAAsTAAALEwEAmpwYAAABjElEQVQ4y7WUsU7DMBCG/5GVoUiMMLC4ZcmWrVXVDq7yDiyRuvIEjGyIpS/graMVKYMBqVUkhoYOUTc2Bp6BEd+5qdI2SasGLpE/KZc/d76LD/i6JrvFPfMKGfMGDOCTGUMwA/SYA8yL7iEM8w2yzH1AHderh9D1alGuXmmtBaVGchFgQe8J69bOHZnIyCHsYu8AUkZRZLpYSClf0dAm4zCchGOEOWkNW7ggAO0+2QcY/SUS5ozZ+6uqNVHHR9Q8q1Bnm9+B1B17HdGxbDe1zn7sA1V7DskucbfmObOFb0LThrZTsjlGzHcw0iXcU6woQxFv9i3rah5UdSxvSa/+EMn6hp6iroy9+s/YL2mSjlxRE1fUkX2wZNqiPjrDTwmfDnbsjNeH0q9Y9ZRN2diJjeliJ+ksj+2v3W5j3d2N+R5b4T/fcjuvqppMvqfsdbqaxF7VCc3Vho9eUd0pZi6q1cpThemwdYB9NVVK2cy1NsLYmaqNNmZgZ6sQa7VPmWuavQG9ZkkjV+u42QH8BWe+iD71TSARAAAAAElFTkSuQmCC" />
+                                <img id="dtim-1br" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUCAgKIhobRz89vMJ7s6uo9PDx4d3ewra0bHR1dXV19NrLa2Nj+/f29u7uWlJQuLi7ws27qAAAACXBIWXMAAAsTAAALEwEAmpwYAAABkklEQVQ4y7VULU/DUBQ9EgtZSEimliWIt2Lmnq5rJ/gJkKXJDGquCGQdwewPzE2+PPeGWeaomgVF6tgPmOTe2zWkox8LC6dLT/ZuTs9957UXPQbuhTxcCF/jU/gGYBpgLH/7yIQNYuHXctniS9hhWlU+Wh03qVX1wwt1+eGKyoZXl8iYFbdmlFIj4N1au0THBUFgLTLrAvphSjcXUPk0RLNocodbpiiC3GcFT4C+7/shur4vvBX28SG0+o/UTHNqrZnXe3uVrW3oKtScuVeUvZYTK3lvyq21pBYRHihzxjlehC/3fHXqgQ5SArapAI9C63w1XR3GUuw75neuN6otV++78SOyza9Dv/lAj1Yf5T061XsQrjnUdSpMoYZ5qLSQvgG7JEmekQgOOWk9sV2l6kxqT4V3Nw1zb7IMyVsvBIcb6+w3lpfn1V+Jw1Awr5tMOq/XqzVdf1Mr9tZ7701JzZ+ia1ab352z6mc6cGO52hiapWPnlFM0U51ximbqUGu90KSOabTyyCWi5UyYO5/n6pPwDYr8fwvXgN7jAAAAAElFTkSuQmCC" /> <br>
+                                <img id="dtim-1center" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUBAQGPjY3Rz89DQ0O0sbHz8vJZJoFwbm6+vLxBHV10MqY6ODifnZ1XV1cdHR3c2trZIbFLAAAACXBIWXMAAAsTAAALEwEAmpwYAAACCElEQVQ4y7VVPWvjQBCVnZXt5JRT1LsQwwnS7YHrgLg6hTBsva4MSeUurX5CqqtTuXCVn6CAf0DgimvvJ4iFredmd2VZcqTYIWSap2V4+/HezMgDSAdgIw0cFhVeMQAPIAuUWfF44jAdOix8k8YsmCNXyEuGynzkQ4u68BE8LbKJsJGFDkvfYe6Lufe5ePi7unywUePY4Suhl4iMCaGlFOWQQGiRhw5Tc3b9MIiZe1Deehhkg3nXu5MirGW5NmnmkNjX9EFs1VKN7djgNg+bovae3a15cpg+ZIfquGP97J2h0viJ5cT6SoZaX+lspYyoX2doFBXjlyiaRtHV+XL5++5u+TiITExXQRR5XGeBQIkoyouNjadQSqm1Tn2pmg8bbe5NelFb0nQMKL25XxO7tsSoxmu/q80XbdXK/eZrs/2iR/OR4a53m1eO8ayPfWDJqHU2VuwywNbVnt6czflbttucVGOkmUbdUI2WSG0g0ZvepuNbiu22IM1NPAZ2uV2x7csnDf3FywFdhQPmttYUT6kkubv5D4+bWlOoFNWa5BRJHiJNDzTDQzUd21fqoaHdPaaO1/kp/d1mwwkdunfsIx2K7Q6lapmDIrVihqAsG41qiZ0tbq7ZFhw6jKsWtHPtz+z128zGT4c3z2cVXs5ujjn2773k9472j5vtf/pkYp2TKe/7E00A/gO7G7pwJRGqtAAAAABJRU5ErkJggg==" />
+                                <img id="dtim-4center" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA3BAMAAACiFTSCAAAAMFBMVEUBAQGbmppqLZZ8fHzRz8+LPMZ0MqXs6upTUVE+G1q5ublubm6iRedQInH9/Pze3NzAiv2WAAAACXBIWXMAAAsTAAALEwEAmpwYAAABuUlEQVQ4y6VVvU7CUBSmCEVQao0vQDrcWWcWhiYkDsICc3OS3pmhSbfiI7C6MfgAJo4sPoCDcSdhMGFDBhI24zn3tBjh2DTy3eEj9+P0/Pa05BtMrZQbzG7KJaZFIyLqrS82hqfOnszXnUquLFv3dvLOeiP57uT69teFfHcP5CKJ+QdyN0YsF5Ul8WpUI06SjmM4Ks0Mrk+Zn86Y70+YS8fha0VY2K8GL1XmwDHXnxj54y1GXgbwwNOBrT2lPNWiyFHIEitrhYdkDaB1ay/vsjY6yiiCJJMVykq0pkt+OPoQH44gGX8IskqtFYjWgODQQAwt8y1aAygPdN8GCkHt5LSoaTH75ylnRT0ON5cEtz4nvL81Dc8nlrm+wmEax9t4YQ/0MNRhn1iHYcuJt+PxOMoib5p8uGpySzAfUxbQKqcsSov9VmlRqSPyOHBR6Q9Sx9haKci3lvsNPGtyv8Hogc3c+nkFl3iwasNBOBz0q8yBk8RJvMRXsE3HrT8YTDK2Zs942kc29I6npbZi5ilZjZg/DpaHL++WqNDiypfzt+LfO3VTaO39c6dmsp9nPZJ9Z18i19r8+hJ9A3EAErhB3eXkAAAAAElFTkSuQmCC" /> <br>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="dtim-ok">
+                    <button class="primaryButton" id="dti-ok">Download</button>
+                </div>
+                <div class="dtim-newtab">
+                    <button class="primaryButton" id="dti-newtab">Open in new tab</button>
+                </div>
+                <div class="dtim-cancel">
+                    <button class="primaryButton" id="dti-cancel">Cancel</button>
+                </div>
+            </div>
+         </dialog>`)
+
+    let downloadTiledImageDialog = document.getElementById("download-tiled-image-dialog")
+    let dtim1_width = document.getElementById("dtim1-width")
+    let dtim1_height = document.getElementById("dtim1-height")
+    let dtim2_width = document.getElementById("dtim2-width")
+    let dtim2_height = document.getElementById("dtim2-height")
+    let dtim2_unit = document.getElementById("dtim2-unit")
+    let dtim2_dpi = document.getElementById("dtim2-dpi")
+    let tabTiledTilesOptions = document.getElementById("tab-image-tiles")
+    let tabTiledSizeOptions = document.getElementById("tab-image-size")
+
+    linkTabContents(tabTiledTilesOptions)
+    linkTabContents(tabTiledSizeOptions)
+
+    prettifyInputs(downloadTiledImageDialog)
+
+    // ---- Predefined image dimensions
+    PAPERSIZE.forEach( function(p) {
+        document.getElementById("dtim2-" + p.id).addEventListener("click", (e) => {
+            dtim2_unit.value = p.unit
+            dtim2_width.value = p.width
+            dtim2_height.value = p.height
+        })
+    })
+
+    // ---- Close popup
+    document.getElementById("dti-cancel").addEventListener("click", (e) => downloadTiledImageDialog.close())
+    downloadTiledImageDialog.addEventListener('click', function (event) {
+        var rect = downloadTiledImageDialog.getBoundingClientRect();
+        var isInDialog=(rect.top <= event.clientY && event.clientY <= rect.top + rect.height
+          && rect.left <= event.clientX && event.clientX <= rect.left + rect.width);
+        if (!isInDialog) {
+            downloadTiledImageDialog.close();
+        }
+    });
+
+    // ---- Stylesheet
+    const styleSheet = document.createElement("style")
+    styleSheet.textContent = `
+        dialog {
+          background: var(--background-color2);
+          color: var(--text-color);
+          border-radius: 7px;
+          border: 1px solid var(--background-color3);
+        }
+
+        dialog::backdrop {
+          background: rgba(0, 0, 0, 0.5);
+        }
+
+
+        button[disabled] {
+          opacity: 0.5;
+        }
+
+        .method-2-dpi {
+          margin-top: 1em;
+          margin-bottom: 1em;
+        }
+
+        .method-2-paper button {
+          width: 10em;
+          padding: 4px;
+          margin: 4px;
+        }
+        
+        .download-tiled-image .tab-content {
+          background: var(--background-color1);
+          border-radius: 3pt;
+        }
+
+        .dtim-container {  display: grid;
+          grid-template-columns: auto auto;
+          grid-template-rows: auto auto;
+          gap: 1em 0px;
+          grid-auto-flow: row;
+          grid-template-areas:
+            "dtim-tab dtim-tab dtim-plc"
+            "dtim-ok dtim-newtab dtim-cancel";
+        }
+
+        .download-tiled-image-top {
+          justify-self: center;
+          grid-area: dtim-tab;
+        }
+
+        .download-tiled-image-placement {
+          justify-self: center;
+          grid-area: dtim-plc;
+          margin-left: 1em;
+        }
+
+        .dtim-ok {
+          justify-self: center;
+          align-self: start;
+          grid-area: dtim-ok;
+        }
+
+        .dtim-newtab {
+          justify-self: center;
+          align-self: start;
+          grid-area: dtim-newtab;
+        }
+
+        .dtim-cancel {
+          justify-self: center;
+          align-self: start;
+          grid-area: dtim-cancel;
+        }
+
+        #tab-content-image-placement img {
+          margin: 4px;
+          opacity: 0.3;
+          border: solid 2px var(--background-color1);
+        }
+
+        #tab-content-image-placement img:hover {
+          margin: 4px;
+          opacity: 1;
+          border: solid 2px var(--accent-color);
+          filter: brightness(2);
+        }
+
+        #tab-content-image-placement img.active {
+          margin: 4px;
+          opacity: 1;
+          border: solid 2px var(--background-color1);
+        }
+
+    `
+    document.head.appendChild(styleSheet)
+
+    // ---- Placement widget
+
+    function updatePlacementWidget(event) {
+        document.querySelector("#tab-content-image-placement img.active").classList.remove("active")
+        event.target.classList.add("active")
+    }
+
+    document.querySelectorAll("#tab-content-image-placement img").forEach(
+        (i) => i.addEventListener("click", updatePlacementWidget)
+    )
+
+    function getPlacement() {
+        return document.querySelector("#tab-content-image-placement img.active").id.substr(5)
+    }
+        
+    // ---- Make the image
+    function downloadTiledImage(image, width, height, offsetX=0, offsetY=0, new_tab=false) {
+
+        const canvas = document.createElement('canvas')
+        canvas.width = width
+        canvas.height = height
+        const context = canvas.getContext('2d')
+
+        const w = image.width
+        const h = image.height
+
+        for (var x = offsetX; x < width; x += w) {
+            for (var y = offsetY; y < height; y += h) {
+                context.drawImage(image, x, y, w, h)
+            }
+        }
+        if (new_tab) {
+            var newTab = window.open("")
+            newTab.document.write(`<html><head><title>${width}×${height}, "${image.dataset["prompt"]}"</title></head><body><img src="${canvas.toDataURL()}"></body></html>`)
+        } else {
+            const link = document.createElement('a')
+            link.href = canvas.toDataURL()
+            link.download = image.dataset["prompt"].replace(/[^a-zA-Z0-9]+/g, "-").substr(0,22)+crypto.randomUUID()+".png"
+            link.click()
+        }
+    }
+
+    function onDownloadTiledImageClick(e, newtab=false) {
+        var width, height, offsetX, offsetY
+
+        if (isTabActive(tabTiledTilesOptions)) {
+            width = thisImage.width * dtim1_width.value
+            height = thisImage.height * dtim1_height.value
+        } else {
+            if ( dtim2_unit.value == "pixels" ) {
+                width = dtim2_width.value
+                height= dtim2_height.value
+            } else if ( dtim2_unit.value == "mm" ) {
+                width = Math.floor( dtim2_width.value * dtim2_dpi.value / 25.4 )
+                height = Math.floor( dtim2_height.value * dtim2_dpi.value / 25.4 )
+            } else { // inch
+                width = Math.floor( dtim2_width.value * dtim2_dpi.value )
+                height = Math.floor( dtim2_height.value * dtim2_dpi.value )
+            }
+        }
+
+        var placement = getPlacement()
+        if (placement == "1tl") {
+            offsetX = 0
+            offsetY = 0
+        } else if (placement == "1tr") {
+            offsetX = width - thisImage.width * Math.ceil( width / thisImage.width )
+            offsetY = 0
+        } else if (placement == "1bl") {
+            offsetX = 0
+            offsetY = height - thisImage.height * Math.ceil( height / thisImage.height )
+        } else if (placement == "1br") {
+            offsetX = width - thisImage.width * Math.ceil( width / thisImage.width )
+            offsetY = height - thisImage.height * Math.ceil( height / thisImage.height )
+        } else if (placement == "4center") {
+            offsetX = width/2 - thisImage.width * Math.ceil( width/2 / thisImage.width )
+            offsetY = height/2 - thisImage.height * Math.ceil( height/2 / thisImage.height )
+        } else if (placement == "1center") {
+            offsetX = width/2 - thisImage.width/2 - thisImage.width * Math.ceil( (width/2 - thisImage.width/2) / thisImage.width )
+            offsetY = height/2 - thisImage.height/2 - thisImage.height * Math.ceil( (height/2 - thisImage.height/2) / thisImage.height )
+        }
+        downloadTiledImage(thisImage, width, height, offsetX, offsetY, newtab)
+        downloadTiledImageDialog.close()
+    }
+
+    document.getElementById("dti-ok").addEventListener("click", onDownloadTiledImageClick)
+    document.getElementById("dti-newtab").addEventListener("click", (e) => onDownloadTiledImageClick(e,true))
+
+})()