Correct PATH

Check for uvicorn and set the PATH env variable before checking
Don't check for ldm, since it doesn't register in the pkgutils
2025-08-14 10:15:31 +02:00 · 2022-10-10 21:07:30 +05:30 · 2022-10-10 21:04:23 +05:30 · 2022-10-10 20:59:43 +05:30 · 2022-10-10 20:20:53 +05:30 · 2022-10-10 20:17:05 +05:30
111 changed files with 2899 additions and 4940 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,3 @@
 __pycache__
-installer
-installer.tar
 dist
 .idea/*
--- a/Console.cmd
+++ b/Console.cmd
@ -0,0 +1,15 @@
+@echo off
+
+echo "Opening Stable Diffusion UI - Developer Console.." & echo.
+
+set SD_BASE_DIR=%cd%
+set MAMBA_ROOT_PREFIX=%SD_BASE_DIR%\env\mamba
+set INSTALL_ENV_DIR=%SD_BASE_DIR%\env\installer_env
+set PROJECT_ENV_DIR=%SD_BASE_DIR%\env\project_env
+
+call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat"
+
+call micromamba activate "%INSTALL_ENV_DIR%"
+call micromamba activate "%PROJECT_ENV_DIR%"
+
+cmd /k
--- a/run.txt
+++ b/run.txt
@ -1,24 +0,0 @@
-Congrats on downloading Stable Diffusion UI, version 2!
-
-If you haven't downloaded Stable Diffusion UI yet, please download from https://github.com/cmdr2/stable-diffusion-ui#installation
-
-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.
-
-For Linux:
- Please open a terminal, and go to the "stable-diffusion-ui" directory. Then run ./start.sh
-
-That file will automatically install everything. After that it will start the Stable Diffusion interface in a web browser.
-
-To start the UI in the future, please run the same command mentioned above.
-
-
-If you have any problems, please:
-1. Try the troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
-2. Or, seek help from the community at https://discord.com/invite/u9yhsFmEkB
-3. Or, file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
-
-Thanks
-cmdr2 (and contributors to the project)
--- a/THIS.txt
+++ b/THIS.txt
@ -1,8 +0,0 @@
-Hi there,
-
-What you have downloaded is meant for the developers of this project, not for users.
-
-If you only want to use the Stable Diffusion UI, you've downloaded the wrong file.
-Please download and follow the instructions at https://github.com/cmdr2/stable-diffusion-ui#installation
-
-Thanks
--- a/README.md
+++ b/README.md
@ -1,74 +1,46 @@
-# Stable Diffusion UI
-### Easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required. 1-click install, powerful features.
-
-[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
-
----
-
-## Step 1: Download the installer
+# Stable Diffusion UI v2
+### A simple 1-click way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required.

 <p float="left">
  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-win.png" width="200" /></a>
  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-linux.png" width="200" /></a>
 </p>

-## Step 2: Run the program
- On Windows: Double-click `Start Stable Diffusion UI.cmd`
- On Linux: Run `./start.sh` in a terminal
+[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)

-## Step 3: There is no step 3!
-It's simple to get started. You don't need to install or struggle with Python, Anaconda, Docker etc.
+️‍🔥🎉 **New!** Use Custom Weights, Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!

-The installer will take care of whatever is needed. A friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) will help you if you face any problems.
+This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 becomes publicly available, the model in this distribution will be updated.

----
-
-# Easy for new users, powerful features for advanced users
-### Features:
+# Features in the new v2 Version:
 - **No Dependencies or Technical Knowledge Required**: 1-click install for Windows 10/11 and Linux. *No dependencies*, no need for WSL or Docker or Conda or technical setup. Just download and run!
- **Clutter-free UI**: a friendly and simple UI, while providing a lot of powerful features
- Supports "*Text to Image*" and "*Image to Image*"
- **Custom Models**: Use your own `.ckpt` file, by placing it inside the `models/stable-diffusion` folder!
+- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
+- **In-Painting**
 - **Live Preview**: See the image as the AI is drawing it
 - **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
- **In-Painting**: Specify areas of your image to paint into
- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
- **Loopback**: Use the output image as the input image for the next img2img task
+- **Custom Weights**: Use your own `.ckpt` file, by placing it inside the `stable-diffusion` folder (rename it to `custom-model.ckpt`)
 - **Negative Prompt**: Specify aspects of the image to *remove*.
- **Attention/Emphasis:** () in the prompt increases the model's attention to enclosed words, and [] decreases it
- **Weighted Prompts:** Use weights for specific words in your prompt to change their importance, e.g. `red:2.4 dragon:1.2`
- **Prompt Matrix:** (in beta) Quickly create multiple variations of your prompt, e.g. `a photograph of an astronaut riding a horse | illustration | cinematic lighting`
 - **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
- **Multiple Prompts File:** Queue multiple prompts by entering one prompt per line, or by running a text file
+- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
+- **New UI**: with cleaner design
+- **Waifu Model Support**: Just replace the `stable-diffusion\sd-v1-4.ckpt` file after installation with the Waifu model
+- Supports "*Text to Image*" and "*Image to Image*"
 - **NSFW Setting**: A setting in the UI to control *NSFW content*
- **JPEG/PNG output**
- **Save generated images to disk**
 - **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
 - **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
 - **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM!
- **Developer Console**: A developer-mode for those who want to modify their Stable Diffusion code, and edit the conda environment.

-### Easy for new users:
-![Screenshot of the initial UI](media/shot-v10-simple.jpg?raw=true)
-
-### Powerful features for advanced users:
-![Screenshot of advanced settings](media/shot-v10.jpg?raw=true)
-
-### Live Preview
-Useful for judging (and stopping) an image quickly, without waiting for it to finish rendering.
+![Screenshot of advanced settings](media/shot-v9.jpg?raw=true)

+## Live Preview
 ![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)

-### Task Queue
-![Screenshot of task queue](media/task-queue-v1.jpg?raw=true)

 # 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.
+2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. But if you don't have a compatible graphics card, you can still use it with a "Use CPU" setting. It'll be very slow, but it should still work.

-You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
+You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.

 # Installation
 1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).
@ -85,19 +57,49 @@ This will automatically install Stable Diffusion, set it up, and start the inter

 **To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages.

-# How to use?
-Please use our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use) to understand how to use the features in this UI.
+
+# Usage
+Open http://localhost:9000 in your browser (after running step 3 previously). It may take a few moments for the back-end to be ready.
+
+## With a text description
+1. Enter a text prompt, like `a photograph of an astronaut riding a horse` in the textbox.
+2. Press `Make Image`. This will take some time, depending on your system's processing power.
+3. See the image generated using your prompt.
+
+## With an image
+1. Click `Browse..` next to `Initial Image`. Select your desired image.
+2. An optional text prompt can help you further describe the kind of image you want to generate.
+3. Press `Make Image`. See the image generated using your prompt.
+
+You can use Face Correction or Upscaling to improve the image further.
+
+**Pro tip:** You can also click `Use as Input` on a generated image, to use it as the input image for your next generation. This can be useful for sequentially refining the generated image with a single click.
+
+**Another tip:** Images with the same aspect ratio of your generated image work best. E.g. 1:1 if you're generating images sized 512x512.
+
+## Problems? Troubleshooting
+Please try the common [troubleshooting](Troubleshooting.md) steps. If that doesn't fix it, please ask on the [discord server](https://discord.com/invite/u9yhsFmEkB), or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+
+# Image Settings
+You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Image settings'.
+
+Use the same `seed` number to get the same image for a certain prompt. This is useful for refining a prompt without losing the basic image design. Enable the `random images` checkbox to get random images.
+
+![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+
+# System Settings
+The system settings are reachable via the cogwheel symbol on the top right. It can be used to configure whether all generated images should 
+saved be automically, or to tune the Stable Diffusion image generation.
+
+![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
+
+# Image Modifiers
+![Screenshot of advanced settings](media/modifiers-v1.jpg?raw=true)

 # Bugs reports and code contributions welcome
 If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).

-We could really use help on these aspects (click to view tasks that need your help):
-* [User Interface](https://github.com/users/cmdr2/projects/1/views/1)
-* [Engine](https://github.com/users/cmdr2/projects/3/views/1)
-* [Installer](https://github.com/users/cmdr2/projects/4/views/1)
-* [Documentation](https://github.com/users/cmdr2/projects/5/views/1)
-
-If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users.
+Also, please feel free to submit a pull request, if you have any code contributions in mind. Join the [discord server](https://discord.com/invite/u9yhsFmEkB) for development-related discussions, and for helping other users.

 # Disclaimer
 The authors of this project are not responsible for any content generated using this interface.
--- a/UI.cmd
+++ b/UI.cmd
@ -0,0 +1,25 @@
+@echo off
+
+echo. & echo "Stable Diffusion UI - v2.5" & echo.
+
+set PATH=C:\Windows\System32;%PATH%
+
+set SD_BASE_DIR=%cd%
+
+@rem Confirm or change the installation dir
+call installer\bootstrap\check-install-dir.bat
+
+@rem set the vars again, if the installer dir has changed
+set SD_BASE_DIR=%cd%
+
+echo Working in %SD_BASE_DIR%
+
+@rem Setup the packages required for the installer
+call installer\bootstrap\bootstrap.bat
+
+@rem Test the bootstrap
+call git --version
+call python --version
+
+@rem Download the rest of the installer and UI
+call installer\installer\start.bat
--- a/Troubleshooting.md
+++ b/Troubleshooting.md
@ -1 +1,75 @@
-Moved to https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
+Common issues and their solutions. If these solutions don't work, please feel free to ask at the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+
+## RuntimeError: CUDA out of memory
+This can happen if your PC has less than 6GB of VRAM.
+
+Try disabling the "Turbo mode" setting under "Advanced Settings", since that takes an additional 1 GB of VRAM (to increase the speed).
+
+Additionally, a common reason for this error is that you're using an initial image larger than 768x768 pixels. Try using a smaller initial image.
+
+Also try generating smaller sized images.
+
+## basicsr module not found
+For Windows: Please download and extract basicsr from [here](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/basicsr-win64.zip), and place the `basicsr` folder inside the `stable-diffusion-ui\stable-diffusion\env\lib\site-packages` folder. Then run the `Start Stable Diffusion UI.cmd` file again.
+
+For Linux: Please contact on the [discord server](https://discord.com/invite/u9yhsFmEkB).
+
+## No ldm found, or antlr4 or any other missing module, or ClobberError: This transaction has incompatible packages due to a shared path
+On Windows, please ensure that you had placed the `stable-diffusion-ui` folder after unzipping to the root of C: or D: (or any drive). For e.g. `C:\stable-diffusion-ui`. **Note:** This has to be done **before** you start the installation process. If you have already installed (and are facing this error), please delete the installed folder, and start fresh by unzipping and placing the folder at the top of your drive.
+
+This error can also be caused if you already have conda/miniconda/anaconda installed, due to package conflicts. Please open your Anaconda Prompt, and run `conda clean --all` to clean up unused packages.
+
+If nothing works, this could be due to a corrupted installation. Please try reinstalling this, by deleting the installed folder, and unzipping from the downloaded zip file.
+
+## Killed uvicorn server:app --app-dir ... --port 9000 --host 0.0.0.0
+This happens if your PC ran out of RAM. Stable Diffusion requires a lot of RAM, and requires atleast 10 GB of RAM to work well. You can also try closing all other applications before running Stable Diffusion UI.
+
+## Green image generated
+This usually happens if you're running NVIDIA 1650 or 1660 Super. To solve this, please close and run the Stable Diffusion command on your computer. If you're using the older Docker-based solution (v1), please upgrade to v2: https://github.com/cmdr2/stable-diffusion-ui/tree/v2#installation
+
+If you're still seeing this error, please try enabling "Full Precision" under "Advanced Settings" in the Stable Diffusion UI.
+
+## './docker-compose.yml' is invalid:
+> ERROR: The Compose file './docker-compose.yml' is invalid because:
+> services.stability-ai.deploy.resources.reservations value Additional properties are not allowed ('devices' was unexpected)
+
+Please ensure you have `docker-compose` version 1.29 or higher. Check `docker-compose --version`, and if required [update it to 1.29](https://docs.docker.com/compose/install/). (Thanks [HVRyan](https://github.com/HVRyan))
+
+## RuntimeError: Found no NVIDIA driver on your system:
+If you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), please ensure that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877). (Thanks [u/exintrovert420](https://www.reddit.com/user/exintrovert420/))
+
+## Some other process is already running at port 9000 / port 9000 could not be bound
+You can override the port used. Please change `docker-compose.yml` inside the project directory, and update the line `9000:9000` to `1337:9000` (where 1337 is whichever port number you want).
+
+After doing this, please restart your server, by running `./server restart`.
+
+After this, you can access the server at `http://localhost:1337` (where 1337 is the new port you specified earlier).
+
+## RuntimeError: CUDA error: unknown error
+Please ensure that you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), and that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877).
+
+Also, if you are using WSL (Windows), please ensure you have the latest WSL kernel by running `wsl --shutdown` and then `wsl --update`. (Thanks [AndrWeisR](https://github.com/AndrWeisR))
+
+# For support queries
+## Entering a conda environment in an existing installation
+This will give you an activated conda environment in the terminal, so you can run commands and force-install any packages, if required.
+
+Users don't need to have the Anaconda Prompt installed to do this anymore, since the installer bundles a portable version of conda inside it. Just follow these steps.
+
+**Windows:**
+1. Open the terminal: Press Win+R, type "cmd", and press "Run"
+2. Type `cd C:\stable-diffusion-ui` and press enter (or wherever you've installed it)
+3. Type `installer\Scripts\activate.bat` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate .\env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+**Linux:**
+1. Open the terminal
+2. Type `cd /path/to/stable-diffusion-ui` and press enter
+3. Type `installer/bin/activate` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate ./env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+This will give you an activated conda environment. To confirm, type `python --version` and press enter. You should see 3.8.5.
--- a/build.bat
+++ b/build.bat
@ -1,49 +0,0 @@
-@echo off
-
-@echo "Hi there, what you are running is meant for the developers of this project, not for users." & echo.
-@echo "If you only want to use the Stable Diffusion UI, you've downloaded the wrong file."
-@echo "Please download and follow the instructions at https://github.com/cmdr2/stable-diffusion-ui#installation" & echo.
-@echo "If you are actually a developer of this project, please type Y and press enter" & echo.
-
-set /p answer=Are you a developer of this project (Y/N)?
-if /i "%answer:~,1%" NEQ "Y" exit /b
-
-mkdir dist\win\stable-diffusion-ui\scripts
-@REM mkdir dist\linux-mac\stable-diffusion-ui\scripts
-
-@rem copy the installer files for Windows
-
-copy scripts\on_env_start.bat dist\win\stable-diffusion-ui\scripts\
-copy scripts\bootstrap.bat dist\win\stable-diffusion-ui\scripts\
-copy "scripts\Start Stable Diffusion UI.cmd" dist\win\stable-diffusion-ui\
-copy LICENSE dist\win\stable-diffusion-ui\
-copy "CreativeML Open RAIL-M License" dist\win\stable-diffusion-ui\
-copy "How to install and run.txt" dist\win\stable-diffusion-ui\
-echo. > dist\win\stable-diffusion-ui\scripts\install_status.txt
-
-@rem copy the installer files for Linux and Mac
-
-@REM copy scripts\on_env_start.sh dist\linux-mac\stable-diffusion-ui\scripts\
-@REM copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\
-@REM copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\
-@REM copy LICENSE dist\linux-mac\stable-diffusion-ui\
-@REM copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\
-@REM copy "How to install and run.txt" dist\linux-mac\stable-diffusion-ui\
-@REM echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt
-
-@rem make the zip
-
-cd dist\win
-call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-win-x64.zip
-cd ..\..
-
-@REM cd dist\linux-mac
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-x64.zip
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-arm64.zip
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-x64.zip
-@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-arm64.zip
-@REM cd ..\..
-
-echo "Build ready. Upload the zip files inside the 'dist' folder."
-
-pause
--- a/build.sh
+++ b/build.sh
@ -1,50 +0,0 @@
-#!/bin/bash
-
-printf "Hi there, what you are running is meant for the developers of this project, not for users.\n\n"
-printf "If you only want to use the Stable Diffusion UI, you've downloaded the wrong file.\n"
-printf "Please download and follow the instructions at https://github.com/cmdr2/stable-diffusion-ui#installation\n\n"
-printf "If you are actually a developer of this project, please type Y and press enter\n\n"
-
-read -p "Are you a developer of this project (Y/N) " yn
-case $yn in
-    [Yy]* ) ;;
-    * ) exit;;
-esac
-
-# mkdir -p dist/win/stable-diffusion-ui/scripts
-mkdir -p dist/linux-mac/stable-diffusion-ui/scripts
-
-# copy the installer files for Windows
-
-# cp scripts/on_env_start.bat dist/win/stable-diffusion-ui/scripts/
-# cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/
-# cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/
-# cp LICENSE dist/win/stable-diffusion-ui/
-# cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/
-# cp "How to install and run.txt" dist/win/stable-diffusion-ui/
-# echo "" > dist/win/stable-diffusion-ui/scripts/install_status.txt
-
-# copy the installer files for Linux and Mac
-
-cp scripts/on_env_start.sh dist/linux-mac/stable-diffusion-ui/scripts/
-cp scripts/bootstrap.sh dist/linux-mac/stable-diffusion-ui/scripts/
-cp scripts/start.sh dist/linux-mac/stable-diffusion-ui/
-cp LICENSE dist/linux-mac/stable-diffusion-ui/
-cp "CreativeML Open RAIL-M License" dist/linux-mac/stable-diffusion-ui/
-cp "How to install and run.txt" dist/linux-mac/stable-diffusion-ui/
-echo "" > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt
-
-# make the zip
-
-# cd dist/win
-# zip -r ../stable-diffusion-ui-win-x64.zip stable-diffusion-ui
-# cd ../..
-
-cd dist/linux-mac
-zip -r ../stable-diffusion-ui-linux-x64.zip stable-diffusion-ui
-zip -r ../stable-diffusion-ui-linux-arm64.zip stable-diffusion-ui
-zip -r ../stable-diffusion-ui-mac-x64.zip stable-diffusion-ui
-zip -r ../stable-diffusion-ui-mac-arm64.zip stable-diffusion-ui
-cd ../..
-
-echo "Build ready. Upload the zip files inside the 'dist' folder."
--- a/developer_console.sh
+++ b/developer_console.sh
@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ "$0" == "bash" ]; then
+  echo "Opening Stable Diffusion UI - Developer Console.."
+  echo ""
+
+  export SD_BASE_DIR=`pwd`
+  export MAMBA_ROOT_PREFIX="$SD_BASE_DIR/env/mamba"
+  export INSTALL_ENV_DIR="$SD_BASE_DIR/env/installer_env"
+  export PROJECT_ENV_DIR="$SD_BASE_DIR/env/project_env"
+
+  eval "$($MAMBA_ROOT_PREFIX/micromamba shell hook -s posix)"
+
+  micromamba activate "$INSTALL_ENV_DIR"
+  micromamba activate "$PROJECT_ENV_DIR"
+else
+  bash --init-file developer_console.sh
+fi
--- a/ui/sd_internal/init.py
+++ b/ui/sd_internal/init.py
@ -22,9 +22,7 @@ class Request:
    use_full_precision: bool = False
    use_face_correction: str = None # or "GFPGANv1.3"
    use_upscale: str = None # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B"
-    use_stable_diffusion_model: str = "sd-v1-4"
    show_only_filtered_image: bool = False
-    output_format: str = "jpeg" # or "png"

    stream_progress_updates: bool = False
    stream_image_progress: bool = False
@ -44,8 +42,6 @@ class Request:
            "sampler": self.sampler,
            "use_face_correction": self.use_face_correction,
            "use_upscale": self.use_upscale,
-            "use_stable_diffusion_model": self.use_stable_diffusion_model,
-            "output_format": self.output_format,
        }

    def to_string(self):
@ -66,9 +62,7 @@ class Request:
    use_full_precision: {self.use_full_precision}
    use_face_correction: {self.use_face_correction}
    use_upscale: {self.use_upscale}
-    use_stable_diffusion_model: {self.use_stable_diffusion_model}
    show_only_filtered_image: {self.show_only_filtered_image}
-    output_format: {self.output_format}

    stream_progress_updates: {self.stream_progress_updates}
    stream_image_progress: {self.stream_image_progress}'''
--- a/ui/sd_internal/runtime.py
+++ b/ui/sd_internal/runtime.py
@ -79,19 +79,18 @@ except:
    print('WARNING: No compatible GPU found. Using the CPU, but this will be very slow!')
    pass

-def load_model_ckpt(ckpt_to_use, device_to_use='cuda', turbo=False, unet_bs_to_use=1, precision_to_use='autocast'):
+def load_model_ckpt(ckpt_to_use, device_to_use='cuda', turbo=False, unet_bs_to_use=1, precision_to_use='autocast', half_model_fs=False):
    global ckpt_file, model, modelCS, modelFS, model_is_half, device, unet_bs, precision, model_fs_is_half

+    ckpt_file = ckpt_to_use
    device = device_to_use if has_valid_gpu else 'cpu'
    precision = precision_to_use if not force_full_precision else 'full'
    unet_bs = unet_bs_to_use

-    unload_model()
-
    if device == 'cpu':
        precision = 'full'

-    sd = load_model_from_config(f"{ckpt_to_use}.ckpt")
+    sd = load_model_from_config(f"{ckpt_file}.ckpt")
    li, lo = [], []
    for key, value in sd.items():
        sp = key.split(".")
@ -131,29 +130,18 @@ def load_model_ckpt(ckpt_to_use, device_to_use='cuda', turbo=False, unet_bs_to_u
    if device != "cpu" and precision == "autocast":
        model.half()
        modelCS.half()
-        modelFS.half()
        model_is_half = True
-        model_fs_is_half = True
    else:
        model_is_half = False
+
+    if half_model_fs:
+        modelFS.half()
+        model_fs_is_half = True
+    else:
        model_fs_is_half = False

-    ckpt_file = ckpt_to_use
-
    print('loaded ', ckpt_file, 'to', device, 'precision', precision)

-def unload_model():
-    global model, modelCS, modelFS
-
-    if model is not None:
-        del model
-        del modelCS
-        del modelFS
-
-    model = None
-    modelCS = None
-    modelFS = None
-
 def load_model_gfpgan(gfpgan_to_use):
    global gfpgan_file, model_gfpgan

@ -197,35 +185,6 @@ def load_model_real_esrgan(real_esrgan_to_use):

    print('loaded ', real_esrgan_to_use, 'to', device, 'precision', precision)

-def get_base_path(disk_path, session_id, prompt, img_id, ext, suffix=None):
-    if disk_path is None: return None
-    if session_id is None: return None
-    if ext is None: raise Exception('Missing ext')
-
-    session_out_path = os.path.join(disk_path, session_id)
-    os.makedirs(session_out_path, exist_ok=True)
-
-    prompt_flattened = filename_regex.sub('_', prompt)[:50]
-    
-
-    if suffix is not None:
-        return os.path.join(session_out_path, f"{prompt_flattened}_{img_id}_{suffix}.{ext}")
-    return os.path.join(session_out_path, f"{prompt_flattened}_{img_id}.{ext}")
-
-def apply_filters(filter_name, image_data):
-    print(f'Applying filter {filter_name}...')
-    gc()
-
-    if filter_name == 'gfpgan':
-        _, _, output = model_gfpgan.enhance(image_data[:,:,::-1], has_aligned=False, only_center_face=False, paste_back=True)
-        image_data = output[:,:,::-1]
-
-    if filter_name == 'real_esrgan':
-        output, _ = model_real_esrgan.enhance(image_data[:,:,::-1])
-        image_data = output[:,:,::-1]
-
-    return image_data
-
 def mk_img(req: Request):
    try:
        yield from do_mk_img(req)
@ -249,7 +208,6 @@ def mk_img(req: Request):
        })

 def do_mk_img(req: Request):
-    global ckpt_file
    global model, modelCS, modelFS, device
    global model_gfpgan, model_real_esrgan
    global stop_processing
@ -262,24 +220,14 @@ def do_mk_img(req: Request):

    temp_images.clear()

-    # custom model support:
-    #  the req.use_stable_diffusion_model needs to be a valid path
-    #  to the ckpt file (without the extension).
-
-    needs_model_reload = False
-    ckpt_to_use = ckpt_file
-    if ckpt_to_use != req.use_stable_diffusion_model:
-        ckpt_to_use = req.use_stable_diffusion_model
-        needs_model_reload = True
-
    model.turbo = req.turbo
    if req.use_cpu:
        if device != 'cpu':
            device = 'cpu'

            if model_is_half:
-                load_model_ckpt(ckpt_to_use, device)
-                needs_model_reload = False
+                del model, modelCS, modelFS
+                load_model_ckpt(ckpt_file, device)

            load_model_gfpgan(gfpgan_file)
            load_model_real_esrgan(real_esrgan_file)
@ -289,18 +237,17 @@ def do_mk_img(req: Request):
            device = 'cuda'

            if (precision == 'autocast' and (req.use_full_precision or not model_is_half)) or \
-                (precision == 'full' and not req.use_full_precision and not force_full_precision):
+                (precision == 'full' and not req.use_full_precision and not force_full_precision) or \
+                (req.init_image is None and model_fs_is_half) or \
+                (req.init_image is not None and not model_fs_is_half and not force_full_precision):

-                load_model_ckpt(ckpt_to_use, device, req.turbo, unet_bs, ('full' if req.use_full_precision else 'autocast'))
-                needs_model_reload = False
+                del model, modelCS, modelFS
+                load_model_ckpt(ckpt_file, device, req.turbo, unet_bs, ('full' if req.use_full_precision else 'autocast'), half_model_fs=(req.init_image is not None and not req.use_full_precision))

                if prev_device != device:
                    load_model_gfpgan(gfpgan_file)
                    load_model_real_esrgan(real_esrgan_file)

-    if needs_model_reload:
-        load_model_ckpt(ckpt_to_use, device, req.turbo, unet_bs, precision)
-
    if req.use_face_correction != gfpgan_file:
        load_model_gfpgan(req.use_face_correction)

@ -312,11 +259,23 @@ def do_mk_img(req: Request):

    opt_prompt = req.prompt
    opt_seed = req.seed
+    opt_n_samples = req.num_outputs
    opt_n_iter = 1
+    opt_scale = req.guidance_scale
    opt_C = 4
+    opt_H = req.height
+    opt_W = req.width
    opt_f = 8
+    opt_ddim_steps = req.num_inference_steps
    opt_ddim_eta = 0.0
+    opt_strength = req.prompt_strength
+    opt_save_to_disk_path = req.save_to_disk_path
    opt_init_img = req.init_image
+    opt_use_face_correction = req.use_face_correction
+    opt_use_upscale = req.use_upscale
+    opt_show_only_filtered = req.show_only_filtered_image
+    opt_format = 'png'
+    opt_sampler_name = req.sampler

    print(req.to_string(), '\n    device', device)

@ -324,7 +283,7 @@ def do_mk_img(req: Request):

    seed_everything(opt_seed)

-    batch_size = req.num_outputs
+    batch_size = opt_n_samples
    prompt = opt_prompt
    assert prompt is not None
    data = [batch_size * [prompt]]
@ -344,7 +303,7 @@ def do_mk_img(req: Request):
    else:
        handler = _img2img

-        init_image = load_img(req.init_image, req.width, req.height)
+        init_image = load_img(req.init_image, opt_W, opt_H)
        init_image = init_image.to(device)

        if device != "cpu" and precision == "autocast":
@ -356,7 +315,7 @@ def do_mk_img(req: Request):
        init_latent = modelFS.get_first_stage_encoding(modelFS.encode_first_stage(init_image))  # move to latent space

        if req.mask is not None:
-            mask = load_mask(req.mask, req.width, req.height, init_latent.shape[2], init_latent.shape[3], True).to(device)
+            mask = load_mask(req.mask, opt_W, opt_H, init_latent.shape[2], init_latent.shape[3], True).to(device)
            mask = mask[0][0].unsqueeze(0).repeat(4, 1, 1).unsqueeze(0)
            mask = repeat(mask, '1 ... -> b ...', b=batch_size)

@ -365,12 +324,12 @@ def do_mk_img(req: Request):

        move_fs_to_cpu()

-        assert 0. <= req.prompt_strength <= 1., 'can only work with strength in [0.0, 1.0]'
-        t_enc = int(req.prompt_strength * req.num_inference_steps)
+        assert 0. <= opt_strength <= 1., 'can only work with strength in [0.0, 1.0]'
+        t_enc = int(opt_strength * opt_ddim_steps)
        print(f"target t_enc is {t_enc} steps")

-    if req.save_to_disk_path is not None:
-        session_out_path = os.path.join(req.save_to_disk_path, req.session_id)
+    if opt_save_to_disk_path is not None:
+        session_out_path = os.path.join(opt_save_to_disk_path, req.session_id)
        os.makedirs(session_out_path, exist_ok=True)
    else:
        session_out_path = None
@ -383,7 +342,7 @@ def do_mk_img(req: Request):
                with precision_scope("cuda"):
                    modelCS.to(device)
                    uc = None
-                    if req.guidance_scale != 1.0:
+                    if opt_scale != 1.0:
                        uc = modelCS.get_learned_conditioning(batch_size * [req.negative_prompt])
                    if isinstance(prompts, tuple):
                        prompts = list(prompts)
@ -404,18 +363,14 @@ def do_mk_img(req: Request):
                    modelFS.to(device)

                    partial_x_samples = None
-                    last_callback_time = -1
                    def img_callback(x_samples, i):
-                        nonlocal partial_x_samples, last_callback_time
+                        nonlocal partial_x_samples

                        partial_x_samples = x_samples

                        if req.stream_progress_updates:
-                            n_steps = req.num_inference_steps if req.init_image is None else t_enc
-                            step_time = time.time() - last_callback_time if last_callback_time != -1 else -1
-                            last_callback_time = time.time()
-
-                            progress = {"step": i, "total_steps": n_steps, "step_time": step_time}
+                            n_steps = opt_ddim_steps if req.init_image is None else t_enc
+                            progress = {"step": i, "total_steps": n_steps}

                            if req.stream_image_progress and i % 5 == 0:
                                partial_images = []
@ -446,9 +401,9 @@ def do_mk_img(req: Request):
                    # run the handler
                    try:
                        if handler == _txt2img:
-                            x_samples = _txt2img(req.width, req.height, req.num_outputs, req.num_inference_steps, req.guidance_scale, None, opt_C, opt_f, opt_ddim_eta, c, uc, opt_seed, img_callback, mask, req.sampler)
+                            x_samples = _txt2img(opt_W, opt_H, opt_n_samples, opt_ddim_steps, opt_scale, None, opt_C, opt_f, opt_ddim_eta, c, uc, opt_seed, img_callback, mask, opt_sampler_name)
                        else:
-                            x_samples = _img2img(init_latent, t_enc, batch_size, req.guidance_scale, c, uc, req.num_inference_steps, opt_ddim_eta, opt_seed, img_callback, mask)
+                            x_samples = _img2img(init_latent, t_enc, batch_size, opt_scale, c, uc, opt_ddim_steps, opt_ddim_eta, opt_seed, img_callback, mask)

                        yield from x_samples

@ -461,8 +416,6 @@ def do_mk_img(req: Request):

                    print("saving images")
                    for i in range(batch_size):
-                        img_id = base64.b64encode(int(time.time()+i).to_bytes(8, 'big')).decode() # Generate unique ID based on time.
-                        img_id = img_id.translate({43:None, 47:None, 61:None})[-8:] # Remove + / = and keep last 8 chars.

                        x_samples_ddim = modelFS.decode_first_stage(x_samples[i].unsqueeze(0))
                        x_sample = torch.clamp((x_samples_ddim + 1.0) / 2.0, min=0.0, max=1.0)
@ -470,49 +423,69 @@ def do_mk_img(req: Request):
                        x_sample = x_sample.astype(np.uint8)
                        img = Image.fromarray(x_sample)

-                        has_filters =   (req.use_face_correction is not None and req.use_face_correction.startswith('GFPGAN')) or \
-                                        (req.use_upscale is not None and req.use_upscale.startswith('RealESRGAN'))
+                        has_filters =   (opt_use_face_correction is not None and opt_use_face_correction.startswith('GFPGAN')) or \
+                                        (opt_use_upscale is not None and opt_use_upscale.startswith('RealESRGAN'))

-                        return_orig_img = not has_filters or not req.show_only_filtered_image
+                        return_orig_img = not has_filters or not opt_show_only_filtered

                        if stop_processing:
                            return_orig_img = True

-                        if req.save_to_disk_path is not None:
+                        if opt_save_to_disk_path is not None:
+                            prompt_flattened = filename_regex.sub('_', prompts[0])
+                            prompt_flattened = prompt_flattened[:50]
+
+                            img_id = str(uuid.uuid4())[-8:]
+
+                            file_path = f"{prompt_flattened}_{img_id}"
+                            img_out_path = os.path.join(session_out_path, f"{file_path}.{opt_format}")
+                            meta_out_path = os.path.join(session_out_path, f"{file_path}.txt")
+
                            if return_orig_img:
-                                img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, req.output_format)
                                save_image(img, img_out_path)
-                            meta_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, 'txt')
-                            save_metadata(meta_out_path, req, prompts[0], opt_seed)
+
+                            save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_strength, opt_use_face_correction, opt_use_upscale, opt_sampler_name, req.negative_prompt)

                        if return_orig_img:
-                            img_data = img_to_base64_str(img, req.output_format)
+                            img_data = img_to_base64_str(img)
                            res_image_orig = ResponseImage(data=img_data, seed=opt_seed)
                            res.images.append(res_image_orig)

-                            if req.save_to_disk_path is not None:
+                            if opt_save_to_disk_path is not None:
                                res_image_orig.path_abs = img_out_path

                        del img

                        if has_filters and not stop_processing:
+                            print('Applying filters..')
+
+                            gc()
                            filters_applied = []
-                            if req.use_face_correction:
-                                x_sample = apply_filters('gfpgan', x_sample)
-                                filters_applied.append(req.use_face_correction)
-                            if req.use_upscale:
-                                x_sample = apply_filters('real_esrgan', x_sample)
-                                filters_applied.append(req.use_upscale)
-                            if (len(filters_applied) > 0):
-                                filtered_image = Image.fromarray(x_sample)
-                                filtered_img_data = img_to_base64_str(filtered_image, req.output_format)
-                                response_image = ResponseImage(data=filtered_img_data, seed=opt_seed)
-                                res.images.append(response_image)
-                                if req.save_to_disk_path is not None:
-                                    filtered_img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, req.output_format, "_".join(filters_applied))
-                                    save_image(filtered_image, filtered_img_out_path)
-                                    response_image.path_abs = filtered_img_out_path
-                                del filtered_image
+
+                            if opt_use_face_correction:
+                                _, _, output = model_gfpgan.enhance(x_sample[:,:,::-1], has_aligned=False, only_center_face=False, paste_back=True)
+                                x_sample = output[:,:,::-1]
+                                filters_applied.append(opt_use_face_correction)
+
+                            if opt_use_upscale:
+                                output, _ = model_real_esrgan.enhance(x_sample[:,:,::-1])
+                                x_sample = output[:,:,::-1]
+                                filters_applied.append(opt_use_upscale)
+
+                            filtered_image = Image.fromarray(x_sample)
+
+                            filtered_img_data = img_to_base64_str(filtered_image)
+                            res_image_filtered = ResponseImage(data=filtered_img_data, seed=opt_seed)
+                            res.images.append(res_image_filtered)
+
+                            filters_applied = "_".join(filters_applied)
+
+                            if opt_save_to_disk_path is not None:
+                                filtered_img_out_path = os.path.join(session_out_path, f"{file_path}_{filters_applied}.{opt_format}")
+                                save_image(filtered_image, filtered_img_out_path)
+                                res_image_filtered.path_abs = filtered_img_out_path
+
+                            del filtered_image

                        seeds += str(opt_seed) + ","
                        opt_seed += 1
@ -532,22 +505,11 @@ def save_image(img, img_out_path):
    except:
        print('could not save the file', traceback.format_exc())

-def save_metadata(meta_out_path, req, prompt, opt_seed):
-    metadata = f"""{prompt}
-Width: {req.width}
-Height: {req.height}
-Seed: {opt_seed}
-Steps: {req.num_inference_steps}
-Guidance Scale: {req.guidance_scale}
-Prompt Strength: {req.prompt_strength}
-Use Face Correction: {req.use_face_correction}
-Use Upscaling: {req.use_upscale}
-Sampler: {req.sampler}
-Negative Prompt: {req.negative_prompt}
-Stable Diffusion Model: {req.use_stable_diffusion_model + '.ckpt'}
-"""
+def save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_prompt_strength, opt_correct_face, opt_upscale, sampler_name, negative_prompt):
+    metadata = f"{prompts[0]}\nWidth: {opt_W}\nHeight: {opt_H}\nSeed: {opt_seed}\nSteps: {opt_ddim_steps}\nGuidance Scale: {opt_scale}\nPrompt Strength: {opt_prompt_strength}\nUse Face Correction: {opt_correct_face}\nUse Upscaling: {opt_upscale}\nSampler: {sampler_name}\nNegative Prompt: {negative_prompt}"
+
    try:
-        with open(meta_out_path, 'w', encoding='utf-8') as f:
+        with open(meta_out_path, 'w') as f:
            f.write(metadata)
    except:
        print('could not save the file', traceback.format_exc())
@ -680,9 +642,9 @@ def load_mask(mask_str, h0, w0, newH, newW, invert=False):
    return image

 # https://stackoverflow.com/a/61114178
-def img_to_base64_str(img, output_format="PNG"):
+def img_to_base64_str(img):
    buffered = BytesIO()
-    img.save(buffered, format=output_format)
+    img.save(buffered, format="PNG")
    buffered.seek(0)
    img_byte = buffered.getvalue()
    img_str = "data:image/png;base64," + base64.b64encode(img_byte).decode()
--- a/engine/server.py
+++ b/engine/server.py
@ -0,0 +1,237 @@
+import json
+import traceback
+
+import sys
+import os
+
+SCRIPT_DIR = os.getcwd()
+print('started in ', SCRIPT_DIR)
+
+SD_UI_DIR = os.getenv('SD_UI_PATH', None)
+sys.path.append(os.path.dirname(SD_UI_DIR))
+
+CONFIG_DIR = os.path.join(SD_UI_DIR, '..', 'scripts')
+
+OUTPUT_DIRNAME = "Stable Diffusion UI" # in the user's home folder
+
+from fastapi import FastAPI, HTTPException
+from fastapi.staticfiles import StaticFiles
+from starlette.responses import FileResponse, StreamingResponse
+from pydantic import BaseModel
+import logging
+
+from sd_internal import Request, Response
+
+app = FastAPI()
+
+model_loaded = False
+model_is_loading = False
+
+modifiers_cache = None
+outpath = os.path.join(os.path.expanduser("~"), OUTPUT_DIRNAME)
+
+# don't show access log entries for URLs that start with the given prefix
+ACCESS_LOG_SUPPRESS_PATH_PREFIXES = ['/ping', '/modifier-thumbnails']
+
+app.mount('/media', StaticFiles(directory=os.path.join(SD_UI_DIR, 'media/')), name="media")
+
+# defaults from https://huggingface.co/blog/stable_diffusion
+class ImageRequest(BaseModel):
+    session_id: str = "session"
+    prompt: str = ""
+    negative_prompt: str = ""
+    init_image: str = None # base64
+    mask: str = None # base64
+    num_outputs: int = 1
+    num_inference_steps: int = 50
+    guidance_scale: float = 7.5
+    width: int = 512
+    height: int = 512
+    seed: int = 42
+    prompt_strength: float = 0.8
+    sampler: str = None # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms"
+    # allow_nsfw: bool = False
+    save_to_disk_path: str = None
+    turbo: bool = True
+    use_cpu: bool = False
+    use_full_precision: bool = False
+    use_face_correction: str = None # or "GFPGANv1.3"
+    use_upscale: str = None # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B"
+    show_only_filtered_image: bool = False
+
+    stream_progress_updates: bool = False
+    stream_image_progress: bool = False
+
+class SetAppConfigRequest(BaseModel):
+    update_branch: str = "main"
+
+@app.get('/')
+def read_root():
+    headers = {"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
+    return FileResponse(os.path.join(SD_UI_DIR, 'index.html'), headers=headers)
+
+@app.get('/ping')
+async def ping():
+    global model_loaded, model_is_loading
+
+    try:
+        if model_loaded:
+            return {'OK'}
+
+        if model_is_loading:
+            return {'ERROR'}
+
+        model_is_loading = True
+
+        from sd_internal import runtime
+
+        custom_weight_path = os.path.join(SCRIPT_DIR, 'custom-model.ckpt')
+        ckpt_to_use = "sd-v1-4" if not os.path.exists(custom_weight_path) else "custom-model"
+        runtime.load_model_ckpt(ckpt_to_use=ckpt_to_use)
+
+        model_loaded = True
+        model_is_loading = False
+
+        return {'OK'}
+    except Exception as e:
+        print(traceback.format_exc())
+        return HTTPException(status_code=500, detail=str(e))
+
+@app.post('/image')
+def image(req : ImageRequest):
+    from sd_internal import runtime
+
+    r = Request()
+    r.session_id = req.session_id
+    r.prompt = req.prompt
+    r.negative_prompt = req.negative_prompt
+    r.init_image = req.init_image
+    r.mask = req.mask
+    r.num_outputs = req.num_outputs
+    r.num_inference_steps = req.num_inference_steps
+    r.guidance_scale = req.guidance_scale
+    r.width = req.width
+    r.height = req.height
+    r.seed = req.seed
+    r.prompt_strength = req.prompt_strength
+    r.sampler = req.sampler
+    # r.allow_nsfw = req.allow_nsfw
+    r.turbo = req.turbo
+    r.use_cpu = req.use_cpu
+    r.use_full_precision = req.use_full_precision
+    r.save_to_disk_path = req.save_to_disk_path
+    r.use_upscale: str = req.use_upscale
+    r.use_face_correction = req.use_face_correction
+    r.show_only_filtered_image = req.show_only_filtered_image
+
+    r.stream_progress_updates = True # the underlying implementation only supports streaming
+    r.stream_image_progress = req.stream_image_progress
+
+    try:
+        if not req.stream_progress_updates:
+            r.stream_image_progress = False
+
+        res = runtime.mk_img(r)
+
+        if req.stream_progress_updates:
+            return StreamingResponse(res, media_type='application/json')
+        else: # compatibility mode: buffer the streaming responses, and return the last one
+            last_result = None
+
+            for result in res:
+                last_result = result
+
+            return json.loads(last_result)
+    except Exception as e:
+        print(traceback.format_exc())
+        return HTTPException(status_code=500, detail=str(e))
+
+@app.get('/image/stop')
+def stop():
+    try:
+        if model_is_loading:
+            return {'ERROR'}
+
+        from sd_internal import runtime
+        runtime.stop_processing = True
+
+        return {'OK'}
+    except Exception as e:
+        print(traceback.format_exc())
+        return HTTPException(status_code=500, detail=str(e))
+
+@app.get('/image/tmp/{session_id}/{img_id}')
+def get_image(session_id, img_id):
+    from sd_internal import runtime
+    buf = runtime.temp_images[session_id + '/' + img_id]
+    buf.seek(0)
+    return StreamingResponse(buf, media_type='image/jpeg')
+
+@app.post('/app_config')
+async def setAppConfig(req : SetAppConfigRequest):
+    try:
+        config = {
+            'update_branch': req.update_branch
+        }
+
+        config_json_str = json.dumps(config)
+        config_bat_str = f'@set update_branch={req.update_branch}'
+        config_sh_str = f'export update_branch={req.update_branch}'
+
+        config_json_path = os.path.join(CONFIG_DIR, 'config.json')
+        config_bat_path = os.path.join(CONFIG_DIR, 'config.bat')
+        config_sh_path = os.path.join(CONFIG_DIR, 'config.sh')
+
+        with open(config_json_path, 'w') as f:
+            f.write(config_json_str)
+
+        with open(config_bat_path, 'w') as f:
+            f.write(config_bat_str)
+
+        with open(config_sh_path, 'w') as f:
+            f.write(config_sh_str)
+
+        return {'OK'}
+    except Exception as e:
+        print(traceback.format_exc())
+        return HTTPException(status_code=500, detail=str(e))
+
+@app.get('/app_config')
+def getAppConfig():
+    try:
+        config_json_path = os.path.join(CONFIG_DIR, 'config.json')
+
+        if not os.path.exists(config_json_path):
+            return HTTPException(status_code=500, detail="No config file")
+
+        with open(config_json_path, 'r') as f:
+            config_json_str = f.read()
+            config = json.loads(config_json_str)
+            return config
+    except Exception as e:
+        print(traceback.format_exc())
+        return HTTPException(status_code=500, detail=str(e))
+
+@app.get('/modifiers.json')
+def read_modifiers():
+    headers = {"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
+    return FileResponse(os.path.join(SD_UI_DIR, 'modifiers.json'), headers=headers)
+
+@app.get('/output_dir')
+def read_home_dir():
+    return {outpath}
+
+# don't log certain requests
+class LogSuppressFilter(logging.Filter):
+    def filter(self, record: logging.LogRecord) -> bool:
+        path = record.getMessage()
+        for prefix in ACCESS_LOG_SUPPRESS_PATH_PREFIXES:
+            if path.find(prefix) != -1:
+                return False
+
+        return True
+
+logging.getLogger('uvicorn.access').addFilter(LogSuppressFilter())
+
+# start the browser ui
+import webbrowser; webbrowser.open('http://localhost:9000')
--- a/installer/bin/micromamba_linux_arm64
+++ b/installer/bin/micromamba_linux_arm64
--- a/installer/bin/micromamba_linux_x64
+++ b/installer/bin/micromamba_linux_x64
--- a/installer/bin/micromamba_mac_arm64
+++ b/installer/bin/micromamba_mac_arm64
--- a/installer/bin/micromamba_mac_x64
+++ b/installer/bin/micromamba_mac_x64
--- a/installer/bin/micromamba_win_x64.exe
+++ b/installer/bin/micromamba_win_x64.exe
--- a/installer/bootstrap/bootstrap.bat
+++ b/installer/bootstrap/bootstrap.bat
@ -0,0 +1,34 @@
+@echo off
+
+@rem This file initializes micromamba and activates the env.
+@rem A similar bootstrap file needs to exist for each platform (win, linux, macOS)
+@rem Ready to hand-over to the platform-independent installer after this (written in python).
+
+set MAMBA_ROOT_PREFIX=%SD_BASE_DIR%\env\mamba
+set INSTALL_ENV_DIR=%SD_BASE_DIR%\env\installer_env
+set INSTALLER_YAML_FILE=%SD_BASE_DIR%\installer\yaml\installer-environment.yaml
+set MICROMAMBA_BINARY_FILE=%SD_BASE_DIR%\installer\bin\micromamba_win_x64.exe
+
+@rem initialize the mamba dir
+if not exist "%MAMBA_ROOT_PREFIX%" mkdir "%MAMBA_ROOT_PREFIX%"
+
+copy "%MICROMAMBA_BINARY_FILE%" "%MAMBA_ROOT_PREFIX%\micromamba.exe"
+
+@rem test the mamba binary
+echo Micromamba version:
+call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version
+
+@rem run the shell hook
+if not exist "%MAMBA_ROOT_PREFIX%\Scripts" (
+    call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook --log-level 4 -s cmd.exe
+)
+
+call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat"
+
+@rem create the installer env
+if not exist "%INSTALL_ENV_DIR%" (
+    call micromamba create -y --prefix "%INSTALL_ENV_DIR%" -f "%INSTALLER_YAML_FILE%"
+)
+
+@rem activate
+call micromamba activate "%INSTALL_ENV_DIR%"
--- a/installer/bootstrap/bootstrap.sh
+++ b/installer/bootstrap/bootstrap.sh
@ -0,0 +1,44 @@
+#!/bin/bash
+
+# This file initializes micromamba and activates the env.
+# A similar bootstrap file needs to exist for each platform (win, linux, macOS)
+# Ready to hand-over to the platform-independent installer after this (written in python).
+
+OS_NAME=$(uname -s)
+case "${OS_NAME}" in
+    Linux*)     OS_NAME="linux";;
+    Darwin*)    OS_NAME="mac";;
+    *)          echo "Unknown OS: $OS_NAME! This only runs on Linux or Mac" && exit
+esac
+
+OS_ARCH=$(uname -m)
+case "${OS_ARCH}" in
+    x86_64*)    OS_ARCH="x64";;
+    arm64*)     OS_ARCH="arm64";;
+    *)          echo "Unknown system architecture: $OS_ARCH! This only runs on x86_64 or arm64" && exit
+esac
+
+export MAMBA_ROOT_PREFIX=$SD_BASE_DIR/env/mamba
+INSTALL_ENV_DIR=$SD_BASE_DIR/env/installer_env
+INSTALLER_YAML_FILE=$SD_BASE_DIR/installer/yaml/installer-environment.yaml
+MICROMAMBA_BINARY_FILE=$SD_BASE_DIR/installer/bin/micromamba_${OS_NAME}_${OS_ARCH}
+
+# initialize the mamba dir
+mkdir -p "$MAMBA_ROOT_PREFIX"
+
+cp "$MICROMAMBA_BINARY_FILE" "$MAMBA_ROOT_PREFIX/micromamba"
+
+# test the mamba binary
+echo "Micromamba version:"
+"$MAMBA_ROOT_PREFIX/micromamba" --version
+
+# run the shell hook
+eval "$($MAMBA_ROOT_PREFIX/micromamba shell hook -s posix)"
+
+# create the installer env
+if [ ! -e "$INSTALL_ENV_DIR" ]; then
+    micromamba create -y --prefix "$INSTALL_ENV_DIR" -f "$INSTALLER_YAML_FILE"
+fi
+
+# activate
+micromamba activate "$INSTALL_ENV_DIR"
--- a/installer/bootstrap/check-install-dir.bat
+++ b/installer/bootstrap/check-install-dir.bat
@ -0,0 +1,21 @@
+@echo off
+
+if exist "%SD_BASE_DIR%\env" exit /b
+
+set suggested_dir=%~d0\stable-diffusion-ui
+
+echo "Please install Stable Diffusion UI at the root of your drive. This avoids problems with path length limits in Windows." & echo.
+set /p answer="Press Enter to install at %suggested_dir%, or type 'c' (without quotes) to install at the current location (press enter or type 'c'): "
+
+if /i "%answer:~,1%" NEQ "c" (
+    if exist "%suggested_dir%" (
+        echo. & echo "Sorry, %suggested_dir% already exists! Cannot overwrite that folder!" & echo.
+        pause
+        exit
+    )
+
+    xcopy "%SD_BASE_DIR%" "%suggested_dir%" /s /i /Y /Q
+    echo Please run the %START_CMD_FILENAME% file inside %suggested_dir% . Do not use this folder anymore > "%SD_BASE_DIR%/READ_ME - DO_NOT_USE_THIS_FOLDER.txt"
+
+    cd %suggested_dir%
+)
--- a/installer/developer/enable_dev_mode.py
+++ b/installer/developer/enable_dev_mode.py
@ -0,0 +1,78 @@
+import argparse
+import subprocess
+import sys
+import json
+import os
+import platform
+import shutil
+
+config_path = os.path.join('config.json')
+
+if not os.path.exists('LICENSE'):
+    print('Error: This script needs to be run from the root of the stable-diffusion-ui folder! Please cd to the correct folder, and run this again.')
+    exit(1)
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument(
+    "--symlink_dir", type=str, default=None, help="the absolute path to the project git repository (to link to)"
+)
+opt = parser.parse_args()
+
+def run(cmd):
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+
+    for c in iter(lambda: p.stdout.read(1), b""):
+        sys.stdout.buffer.write(c)
+        sys.stdout.flush()
+
+    p.wait()
+
+    return p.returncode == 0
+
+def get_config():
+    if not os.path.exists(config_path):
+        return {}
+
+    with open(config_path, "r") as f:
+        return json.load(f)
+
+def save_config(config):
+    with open(config_path, "w") as f:
+        json.dump(config, f)
+
+# set the `is_developer_mode` flag to `true` in the config
+config = get_config()
+config['is_developer_mode'] = True
+save_config(config)
+
+print('set is_developer_mode=true in config.json')
+
+# make the symlink, if requested
+if opt.symlink_dir is not None:
+    if not os.path.exists(opt.symlink_dir):
+        print(f'Symlink directory "{opt.symlink_dir}" was not found! Are you sure it has been escaped correctly?')
+        exit(1)
+
+    installer_target_path = os.path.join(opt.symlink_dir, 'installer')
+    ui_target_path = os.path.join(opt.symlink_dir, 'ui')
+    engine_target_path = os.path.join(opt.symlink_dir, 'engine')
+
+    shutil.rmtree('installer', ignore_errors=True)
+    shutil.rmtree('ui', ignore_errors=True)
+    shutil.rmtree('engine', ignore_errors=True)
+
+    if not os.path.exists(ui_target_path) or not os.path.exists(installer_target_path) or not os.path.exists(engine_target_path):
+        print('The target symlink directory does not contain the required {ui, installer, engine} folders. Are you sure it is the correct git repo for the project?')
+        exit(1)
+
+    if platform.system() == 'Windows':
+        run(f'mklink /J "installer" "{installer_target_path}"')
+        run(f'mklink /J "ui" "{ui_target_path}"')
+        run(f'mklink /J "engine" "{engine_target_path}"')
+    elif platform.system() in ('Linux', 'Darwin'):
+        run(f'ln -s "{installer_target_path}" "installer"')
+        run(f'ln -s "{ui_target_path}" "ui"')
+        run(f'ln -s "{engine_target_path}" "engine"')
+
+    print(f'Created symlinks! Your installation will now automatically use the files present in the repository at {opt.symlink_dir}')
--- a/installer/installer/init.py
+++ b/installer/installer/init.py
--- a/installer/installer/app.py
+++ b/installer/installer/app.py
@ -0,0 +1,70 @@
+import os
+import json
+import platform
+
+# config
+PROJECT_REPO_URL = 'https://github.com/cmdr2/stable-diffusion-ui.git'
+DEFAULT_PROJECT_BRANCH = 'installer_new'
+PROJECT_REPO_DIR_NAME = 'project_repo'
+
+STABLE_DIFFUSION_REPO_URL = 'https://github.com/basujindal/stable-diffusion.git'
+DEFAULT_STABLE_DIFFUSION_COMMIT = 'f6cfebffa752ee11a7b07497b8529d5971de916c'
+STABLE_DIFFUSION_REPO_DIR_NAME = 'stable-diffusion'
+
+PROJECT_ENV_DIR_NAME = 'project_env'
+
+START_CMD_FILE_NAME = "Start Stable Diffusion UI.cmd" if platform.system() == "Windows" else "start.sh"
+DEV_CONSOLE_CMD_FILE_NAME = "Developer Console.cmd" if platform.system() == "Windows" else "developer_console.sh"
+CONFIG_FILE_NAME = 'config.json'
+
+# top-level folders
+ENV_DIR_NAME = 'env'
+MODELS_DIR_NAME = 'models'
+
+INSTALLER_DIR_NAME = 'installer'
+UI_DIR_NAME = 'ui'
+ENGINE_DIR_NAME = 'engine'
+
+
+# env
+SD_BASE_DIR = os.environ['SD_BASE_DIR']
+
+
+# model folders
+STABLE_DIFFUSION_MODELS_DIR_NAME = "stable-diffusion"
+GFPGAN_MODELS_DIR_NAME = "gfpgan"
+RealESRGAN_MODELS_DIR_NAME = "realesrgan"
+
+# create references to dirs
+env_dir_path = os.path.join(SD_BASE_DIR, ENV_DIR_NAME)
+
+installer_dir_path = os.path.join(SD_BASE_DIR, INSTALLER_DIR_NAME)
+ui_dir_path = os.path.join(SD_BASE_DIR, UI_DIR_NAME)
+engine_dir_path = os.path.join(SD_BASE_DIR, ENGINE_DIR_NAME)
+
+project_repo_dir_path = os.path.join(env_dir_path, PROJECT_REPO_DIR_NAME)
+stable_diffusion_repo_dir_path = os.path.join(env_dir_path, STABLE_DIFFUSION_REPO_DIR_NAME)
+
+project_env_dir_path = os.path.join(env_dir_path, PROJECT_ENV_DIR_NAME)
+
+patches_dir_path = os.path.join(installer_dir_path, 'patches')
+
+models_dir_path = os.path.join(SD_BASE_DIR, MODELS_DIR_NAME)
+stable_diffusion_models_dir_path = os.path.join(models_dir_path, STABLE_DIFFUSION_MODELS_DIR_NAME)
+gfpgan_models_dir_path = os.path.join(models_dir_path, GFPGAN_MODELS_DIR_NAME)
+realesrgan_models_dir_path = os.path.join(models_dir_path, RealESRGAN_MODELS_DIR_NAME)
+
+
+# useful functions
+def get_config():
+    config_path = os.path.join(SD_BASE_DIR, CONFIG_FILE_NAME)
+    if not os.path.exists(config_path):
+        return {}
+
+    with open(config_path, "r") as f:
+        return json.load(f)
+
+
+# app context
+config = get_config()
+activated_env_dir_path = None
--- a/installer/installer/check_modules.py
+++ b/installer/installer/check_modules.py
@ -0,0 +1,18 @@
+'''
+This script is run by the `installer.helpers.modules_exist_in_env()` function
+'''
+
+import sys
+import pkgutil
+
+modules = sys.argv[1:]
+missing_modules = []
+for m in modules:
+    if pkgutil.find_loader(m) is None:
+        missing_modules.append(m)
+
+if len(missing_modules) == 0:
+    print('42')
+    exit()
+
+print('Missing modules', missing_modules)
--- a/installer/installer/helpers.py
+++ b/installer/installer/helpers.py
@ -0,0 +1,80 @@
+import os
+from os import path
+import subprocess
+import traceback
+
+from installer import app
+
+def run(cmd, run_in_folder=None, env=None, get_output=False, log_the_cmd=False):
+    if app.activated_env_dir_path is not None and 'micromamba activate' not in cmd:
+        cmd = f'micromamba activate "{app.activated_env_dir_path}" && {cmd}'
+
+    if run_in_folder is not None:
+        cmd = f'cd "{run_in_folder}" && {cmd}'
+
+    if log_the_cmd:
+        log('running: ' + cmd)
+
+    if get_output:
+        p = subprocess.Popen(cmd, shell=True, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    else:
+        p = subprocess.Popen(cmd, shell=True, env=env)
+
+    out, err = p.communicate()
+
+    out = out.decode('utf-8') if isinstance(out, bytes) else out
+    err = err.decode('utf-8') if isinstance(out, bytes) else err
+
+    if get_output:
+        return out, err
+
+def log(msg):
+    print(msg)
+
+def modules_exist_in_env(modules, env_dir_path=app.project_env_dir_path):
+    if not path.exists(env_dir_path):
+        return False
+
+    check_modules_script_path = path.join(app.installer_dir_path, 'installer', 'check_modules.py')
+    module_args = ' '.join(modules)
+    check_modules_cmd = f'python "{check_modules_script_path}" {module_args}'
+
+    env = os.environ.copy()
+    env['PYTHONPATH'] = app.stable_diffusion_repo_dir_path + ';' + os.path.join(app.project_env_dir_path, 'lib', 'site-packages')
+
+    if app.activated_env_dir_path != env_dir_path:
+        activate_cmd = f'micromamba activate "{env_dir_path}"'
+        check_modules_cmd = f'{activate_cmd} && {check_modules_cmd}'
+
+    # activate and run the modules checker
+    output, _ = run(check_modules_cmd, get_output=True, env=env)
+    if 'Missing' in output:
+        log(output)
+        return False
+
+    return True
+
+def fail_with_install_error(error_msg):
+    try:
+        log(traceback.format_stack())
+        log(f'''
+
+Error: {error_msg}. Sorry about that, please try to:
+  1. Run this installer again.
+  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md
+  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!''')
+    except:
+        pass
+
+    exit(1)
+
+def apply_git_patches(repo_dir_path, patch_file_names):
+    is_developer_mode = app.config.get('is_developer_mode', False)
+    if is_developer_mode:
+        return
+
+    for patch_file_name in patch_file_names:
+        patch_file_path = path.join(app.patches_dir_path, patch_file_name)
+        run(f"git apply {patch_file_path}", run_in_folder=repo_dir_path)
--- a/installer/installer/main.py
+++ b/installer/installer/main.py
@ -0,0 +1,34 @@
+import os
+import sys
+from datetime import datetime
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+from installer import helpers
+from installer.tasks import (
+    fetch_project_repo,
+    apply_project_update,
+    fetch_stable_diffusion_repo,
+    install_stable_diffusion_packages,
+    install_ui_packages,
+    download_weights,
+    start_ui_server,
+)
+
+tasks = [
+    fetch_project_repo,
+    apply_project_update,
+    fetch_stable_diffusion_repo,
+    install_stable_diffusion_packages,
+    install_ui_packages,
+    download_weights,
+    start_ui_server,
+]
+
+helpers.log(f'Starting Stable Diffusion UI at {datetime.now().strftime("%d/%m/%Y %H:%M:%S")}')
+
+def run_tasks():
+    for task in tasks:
+        task.run()
+
+run_tasks()
--- a/installer/installer/start.bat
+++ b/installer/installer/start.bat
@ -0,0 +1,8 @@
+@echo off
+rem Never edit this file. If you really, really have to, beware that a script doesn't like
+rem being overwritten while it is running (the auto-updater will do that).
+rem The trick is to update this file while another script is running, and vice versa.
+
+call python %SD_BASE_DIR%\installer\installer\main.py
+
+pause
--- a/installer/installer/start.sh
+++ b/installer/installer/start.sh
@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Never edit this file. If you really, really have to, beware that a script doesn't like
+# being overwritten while it is running (the auto-updater will do that).
+# The trick is to update this file while another script is running, and vice versa.
+
+python $SD_BASE_DIR/installer/installer/main.py
+
+read -p "Press enter to continue"
--- a/installer/installer/tasks/init.py
+++ b/installer/installer/tasks/init.py
--- a/installer/installer/tasks/apply_project_update.py
+++ b/installer/installer/tasks/apply_project_update.py
@ -0,0 +1,30 @@
+from os import path
+import shutil
+
+from installer import app
+
+def run():
+    is_developer_mode = app.config.get('is_developer_mode', False)
+    if is_developer_mode:
+        return
+
+    installer_src_path = path.join(app.project_repo_dir_path, 'installer')
+    ui_src_path = path.join(app.project_repo_dir_path, 'ui')
+    engine_src_path = path.join(app.project_repo_dir_path, 'engine')
+
+    start_cmd_src_path = path.join(app.project_repo_dir_path, app.START_CMD_FILE_NAME)
+    start_cmd_dst_path = path.join(app.SD_BASE_DIR, app.START_CMD_FILE_NAME)
+
+    dev_console_cmd_src_path = path.join(app.project_repo_dir_path, app.DEV_CONSOLE_CMD_FILE_NAME)
+    dev_console_cmd_dst_path = path.join(app.SD_BASE_DIR, app.DEV_CONSOLE_CMD_FILE_NAME)
+
+    shutil.rmtree(app.installer_dir_path, ignore_errors=True)
+    shutil.rmtree(app.ui_dir_path, ignore_errors=True)
+    shutil.rmtree(app.engine_dir_path, ignore_errors=True)
+
+    shutil.copytree(installer_src_path, app.installer_dir_path, dirs_exist_ok=True)
+    shutil.copytree(ui_src_path, app.ui_dir_path, dirs_exist_ok=True)
+    shutil.copytree(engine_src_path, app.engine_dir_path, dirs_exist_ok=True)
+
+    shutil.copy(start_cmd_src_path, start_cmd_dst_path)
+    shutil.copy(dev_console_cmd_src_path, dev_console_cmd_dst_path)
--- a/installer/installer/tasks/download_weights.py
+++ b/installer/installer/tasks/download_weights.py
@ -0,0 +1,46 @@
+import os
+
+from installer import app, helpers
+
+def run():
+    fetch_model('Stable Diffusion', 'sd-v1-4.ckpt', model_dir_path=app.stable_diffusion_models_dir_path, download_url='https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt', expected_file_sizes=[4265380512, 7703807346, 7703810927])
+    fetch_model('Face Correction (GFPGAN)', 'GFPGANv1.4.pth', model_dir_path=app.gfpgan_models_dir_path, download_url='https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth', expected_file_sizes=[348632874])
+    fetch_model('Resolution Upscale (RealESRGAN x4)', 'RealESRGAN_x4plus.pth', model_dir_path=app.realesrgan_models_dir_path, download_url='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth', expected_file_sizes=[67040989])
+    fetch_model('Resolution Upscale (RealESRGAN x4_anime)', 'RealESRGAN_x4plus_anime_6B.pth', model_dir_path=app.realesrgan_models_dir_path, download_url='https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth', expected_file_sizes=[17938799])
+
+def fetch_model(model_type, file_name, model_dir_path, download_url, expected_file_sizes):
+    os.makedirs(model_dir_path, exist_ok=True)
+
+    file_path = os.path.join(model_dir_path, file_name)
+
+    if model_exists(file_name, file_path, expected_file_sizes):
+        helpers.log(f'Data files (weights) necessary for {model_type} were already downloaded')
+        return
+
+    helpers.log(f'Downloading data files (weights) for {model_type}..')
+
+    helpers.run(f'curl -L -k "{download_url}" > "{file_path}"', log_the_cmd=True)
+
+def model_exists(file_name, file_path, expected_file_sizes):
+    legacy_file_path = os.path.join(app.stable_diffusion_repo_dir_path, file_name)
+
+    file_exists = os.path.exists(file_path)
+    legacy_file_exists = os.path.exists(legacy_file_path)
+
+    if legacy_file_exists:
+        file_size = os.path.getsize(legacy_file_path)
+        if file_size in expected_file_sizes:
+            return True
+
+        helpers.log(f'{file_name} is invalid. Was only {file_size} bytes in size. Downloading again..')
+        os.remove(legacy_file_path)
+
+    if file_exists:
+        file_size = os.path.getsize(file_path)
+        if file_size in expected_file_sizes:
+            return True
+
+        helpers.log(f'{file_name} is invalid. Was only {file_size} bytes in size. Downloading again..')
+        os.remove(file_path)
+
+    return False
--- a/installer/installer/tasks/fetch_project_repo.py
+++ b/installer/installer/tasks/fetch_project_repo.py
@ -0,0 +1,27 @@
+from os import path
+
+from installer import app, helpers
+
+project_repo_git_path = path.join(app.project_repo_dir_path, '.git')
+
+def run():
+    branch_name = app.config.get('update_branch', app.DEFAULT_PROJECT_BRANCH)
+
+    if path.exists(project_repo_git_path):
+        helpers.log(f"Stable Diffusion UI's git repository was already installed. Updating from {branch_name}..")
+
+        helpers.run("git reset --hard", run_in_folder=app.project_repo_dir_path)
+        helpers.run(f'git -c advice.detachedHead=false checkout "{branch_name}"', run_in_folder=app.project_repo_dir_path)
+        helpers.run("git pull", run_in_folder=app.project_repo_dir_path)
+    else:
+        helpers.log("\nDownloading Stable Diffusion UI..\n")
+        helpers.log(f"Using the {branch_name} channel\n")
+
+        helpers.run(f'git clone {app.PROJECT_REPO_URL} "{app.project_repo_dir_path}"')
+
+        if path.exists(project_repo_git_path):
+            helpers.log("Downloaded Stable Diffusion UI")
+        else:
+            helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion UI")
+
+        helpers.run(f'git -c advice.detachedHead=false checkout "{branch_name}"', run_in_folder=app.project_repo_dir_path)
--- a/installer/installer/tasks/fetch_stable_diffusion_repo.py
+++ b/installer/installer/tasks/fetch_stable_diffusion_repo.py
@ -0,0 +1,37 @@
+from os import path
+
+from installer import app, helpers
+
+stable_diffusion_repo_git_path = path.join(app.stable_diffusion_repo_dir_path, '.git')
+
+is_developer_mode = app.config.get('is_developer_mode', False)
+
+def run():
+    fetch_repo()
+
+    helpers.apply_git_patches(app.stable_diffusion_repo_dir_path, patch_file_names=(
+        "sd_custom.patch",
+    ))
+
+def fetch_repo():
+    commit_id = app.config.get('stable_diffusion_commit', app.DEFAULT_STABLE_DIFFUSION_COMMIT)
+
+    if path.exists(stable_diffusion_repo_git_path):
+        helpers.log(f"Stable Diffusion's git repository was already installed. Using commit: {commit_id}..")
+
+        if not is_developer_mode:
+            helpers.run("git reset --hard", run_in_folder=app.stable_diffusion_repo_dir_path)
+            helpers.run("git fetch origin", run_in_folder=app.stable_diffusion_repo_dir_path)
+            helpers.run(f'git -c advice.detachedHead=false checkout "{commit_id}"', run_in_folder=app.stable_diffusion_repo_dir_path)
+    else:
+        helpers.log("\nDownloading Stable Diffusion..\n")
+        helpers.log(f"Using commit: {commit_id}\n")
+
+        helpers.run(f'git clone {app.STABLE_DIFFUSION_REPO_URL} "{app.stable_diffusion_repo_dir_path}"')
+
+        if path.exists(stable_diffusion_repo_git_path):
+            helpers.log("Downloaded Stable Diffusion")
+        else:
+            helpers.fail_with_install_error(error_msg="Could not download Stable Diffusion")
+
+        helpers.run(f'git -c advice.detachedHead=false checkout "{commit_id}"', run_in_folder=app.stable_diffusion_repo_dir_path)
--- a/installer/installer/tasks/install_stable_diffusion_packages.py
+++ b/installer/installer/tasks/install_stable_diffusion_packages.py
@ -0,0 +1,59 @@
+import os
+import platform
+import shutil
+
+from installer import app, helpers
+
+def run():
+    environment_file_path = get_environment_file_path()
+    local_env_file_path = os.path.join(app.stable_diffusion_repo_dir_path, 'environment.yaml')
+
+    shutil.copy(environment_file_path, local_env_file_path)
+
+    if is_valid_env():
+        helpers.log("Packages necessary for Stable Diffusion were already installed")
+        return
+
+    log_installing_header()
+
+    env = os.environ.copy()
+    env['PYTHONNOUSERSITE'] = '1'
+
+    if not os.path.exists(app.project_env_dir_path):
+        helpers.run(f'micromamba create --prefix {app.project_env_dir_path}', log_the_cmd=True)
+
+    helpers.run(f'micromamba install -y --prefix {app.project_env_dir_path} -f {local_env_file_path}', env=env, log_the_cmd=True, run_in_folder=app.stable_diffusion_repo_dir_path)
+
+    if is_valid_env():
+        helpers.log("Installed the packages necessary for Stable Diffusion")
+
+        app.activated_env_dir_path = app.project_env_dir_path # so that future `run()` invocations will run in the activated env
+    else:
+        helpers.fail_with_install_error(error_msg="Could not install the packages necessary for Stable Diffusion")
+
+    apply_patches()
+
+def apply_patches():
+    gfpgan_repo_dir_path = os.path.join(app.stable_diffusion_repo_dir_path, 'src', 'gfpgan')
+    helpers.apply_git_patches(gfpgan_repo_dir_path, patch_file_names=(
+        "gfpgan_custom.patch",
+    ))
+
+def get_environment_file_path():
+    environment_file_name = 'sd-environment-win-linux-nvidia.yaml'
+    if platform.system() == 'Darwin':
+        environment_file_name = 'sd-environment-mac-nvidia.yaml'
+
+    return os.path.join(app.installer_dir_path, 'yaml', environment_file_name)
+
+def log_installing_header():
+    helpers.log('''
+
+Downloading packages necessary for Stable Diffusion..
+
+***** !! This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient *****
+
+''')
+
+def is_valid_env():
+    return helpers.modules_exist_in_env(('torch', 'antlr4', 'transformers', 'numpy', 'gfpgan', 'realesrgan', 'basicsr'))
--- a/installer/installer/tasks/install_ui_packages.py
+++ b/installer/installer/tasks/install_ui_packages.py
@ -0,0 +1,39 @@
+import os
+import shutil
+import platform
+
+from installer import app, helpers
+
+def run():
+    if is_valid_env():
+        helpers.log("Packages necessary for Stable Diffusion UI were already installed")
+        return
+
+    log_installing_header()
+
+    env = os.environ.copy()
+    env['PYTHONNOUSERSITE'] = '1'
+
+    helpers.run(f'micromamba install -y --prefix {app.project_env_dir_path} -c conda-forge uvicorn fastapi', env=env, log_the_cmd=True)
+
+    if is_valid_env():
+        helpers.log("Installed the packages necessary for Stable Diffusion UI")
+    else:
+        helpers.fail_with_install_error(error_msg="Could not install the packages necessary for Stable Diffusion UI")
+
+def log_installing_header():
+    helpers.log('''
+
+Downloading packages necessary for Stable Diffusion UI..
+
+''')
+
+def is_valid_env():
+    path = os.environ['PATH']
+    path += ';' + os.path.join(app.project_env_dir_path, 'Scripts' if platform.system() == 'Windows' else 'bin')
+
+    if shutil.which("uvicorn", path=path) is None:
+        helpers.log("uvicorn not found!")
+        return False
+
+    return helpers.modules_exist_in_env(('uvicorn', 'fastapi'))
--- a/installer/installer/tasks/start_ui_server.py
+++ b/installer/installer/tasks/start_ui_server.py
@ -0,0 +1,23 @@
+import os
+import platform
+
+from installer import app, helpers
+
+def run():
+    helpers.log("\nStable Diffusion is ready!\n")
+
+    env = os.environ.copy()
+    env['SD_DIR'] = app.stable_diffusion_repo_dir_path
+    env['PYTHONPATH'] = app.stable_diffusion_repo_dir_path + ';' + os.path.join(app.project_env_dir_path, 'lib', 'site-packages')
+    env['SD_UI_PATH'] = app.ui_dir_path
+    env['PATH'] += ';' + os.path.join(app.project_env_dir_path, 'Scripts' if platform.system() == 'Windows' else 'bin')
+
+    helpers.log(f'PYTHONPATH={env["PYTHONPATH"]}')
+    helpers.run('python --version', log_the_cmd=True)
+
+    host = app.config.get('host', 'localhost')
+    port = app.config.get('port', '9000')
+
+    ui_server_cmd = f'uvicorn server:app --app-dir "{app.ui_dir_path}" --port {port} --host {host}'
+
+    helpers.run(ui_server_cmd, run_in_folder=app.stable_diffusion_repo_dir_path, log_the_cmd=True, env=env)
--- a/installer/patches/gfpgan_custom.patch
+++ b/installer/patches/gfpgan_custom.patch
@ -0,0 +1,22 @@
+diff --git a/gfpgan/utils.py b/gfpgan/utils.py
+index 74ee5a8..1357f48 100644
+--- a/gfpgan/utils.py
+++ b/gfpgan/utils.py
+@@ -117,14 +117,14 @@ class GFPGANer():
+         # face restoration
+         for cropped_face in self.face_helper.cropped_faces:
+             # prepare data
+-            cropped_face_t = img2tensor(cropped_face / 255., bgr2rgb=True, float32=True)
+            cropped_face_t = img2tensor(cropped_face / 255., bgr2rgb=False, float32=True)
+             normalize(cropped_face_t, (0.5, 0.5, 0.5), (0.5, 0.5, 0.5), inplace=True)
+             cropped_face_t = cropped_face_t.unsqueeze(0).to(self.device)
+ 
+             try:
+-                output = self.gfpgan(cropped_face_t, return_rgb=False, weight=weight)[0]
+                output = self.gfpgan(cropped_face_t, return_rgb=True, weight=weight)[0]
+                 # convert to image
+-                restored_face = tensor2img(output.squeeze(0), rgb2bgr=True, min_max=(-1, 1))
+                restored_face = tensor2img(output.squeeze(0), rgb2bgr=False, min_max=(-1, 1))
+             except RuntimeError as error:
+                 print(f'\tFailed inference for GFPGAN: {error}.')
+                 restored_face = cropped_face
--- a/installer/patches/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142
+++ b/installer/patches/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142
--- a/ui/sd_internal/ddim_callback.patch
+++ b/ui/sd_internal/ddim_callback.patch
--- a/installer/patches/sd_env_yaml.patch
+++ b/installer/patches/sd_env_yaml.patch
--- a/installer/yaml/installer-environment.yaml
+++ b/installer/yaml/installer-environment.yaml
@ -3,5 +3,5 @@ channels:
  - defaults
  - conda-forge
 dependencies:
-  - conda
  - git
+  - python=3.10.5
--- a/installer/yaml/sd-environment-mac-nvidia.yaml
+++ b/installer/yaml/sd-environment-mac-nvidia.yaml
@ -0,0 +1,47 @@
+name: ldm
+channels:
+  - pytorch
+  - conda-forge
+dependencies:
+  - python==3.10.5
+  - pip==22.2.2
+
+  - pytorch
+  - torchvision
+
+  - albumentations==1.2.1
+  - coloredlogs==15.0.1
+  - einops==0.4.1
+  - grpcio==1.46.4
+  - humanfriendly==10.0
+  - imageio==2.21.2
+  - imageio-ffmpeg==0.4.7
+  - imgaug==0.4.0
+  - kornia==0.6.7
+  - mpmath==1.2.1
+  - nomkl
+  - numpy==1.23.2
+  - omegaconf==2.1.1
+  - onnx==1.12.0
+  - onnxruntime==1.12.1
+  - pudb==2022.1
+  - pytorch-lightning==1.6.5
+  - scipy==1.9.1
+  - streamlit==1.12.2
+  - sympy==1.10.1
+  - tensorboard==2.9.0
+  - torchmetrics==0.9.3
+  - antlr4-python3-runtime=4.8
+  - pip:
+    - opencv-python==4.6.0.66
+    - realesrgan==0.2.5.0
+    - test-tube==0.7.5
+    - transformers==4.21.2
+    - torch-fidelity==0.3.0
+    - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+    - -e git+https://github.com/openai/CLIP.git@main#egg=clip
+    - -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN
+    - -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan
+    - -e .
+variables:
+  PYTORCH_ENABLE_MPS_FALLBACK: 1
--- a/installer/yaml/sd-environment-win-linux-nvidia.yaml
+++ b/installer/yaml/sd-environment-win-linux-nvidia.yaml
@ -0,0 +1,33 @@
+name: ldm
+channels:
+  - pytorch
+  - defaults
+  - conda-forge
+dependencies:
+  - python=3.10.5
+  - pip=20.3
+  - cudatoolkit=11.3
+  - pytorch=1.11.0
+  - torchvision=0.12.0
+  - numpy=1.23.2
+  - antlr4-python3-runtime=4.8
+  - pip:
+    - albumentations==0.4.3
+    - opencv-python==4.6.0.66
+    - pudb==2019.2
+    - imageio==2.9.0
+    - imageio-ffmpeg==0.4.2
+    - pytorch-lightning==1.4.2
+    - omegaconf==2.1.1
+    - test-tube>=0.7.5
+    - streamlit>=0.73.1
+    - einops==0.3.0
+    - torch-fidelity==0.3.0
+    - transformers==4.19.2
+    - torchmetrics==0.6.0
+    - kornia==0.6
+    - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
+    - -e git+https://github.com/openai/CLIP.git@main#egg=clip
+    - -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN
+    - -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan
+    - -e .
--- a/media/config-v3.jpg
+++ b/media/config-v3.jpg
--- a/media/config-v4.jpg
+++ b/media/config-v4.jpg
--- a/media/config-v5.jpg
+++ b/media/config-v5.jpg
--- a/media/config-v6.png
+++ b/media/config-v6.png
--- a/media/config-v7.jpg
+++ b/media/config-v7.jpg
--- a/media/ding.mp3
+++ b/media/ding.mp3
--- a/media/shot-v10-simple.jpg
+++ b/media/shot-v10-simple.jpg
--- a/media/shot-v10.jpg
+++ b/media/shot-v10.jpg
--- a/media/shot-v3a.jpg
+++ b/media/shot-v3a.jpg
--- a/media/shot-v6a.jpg
+++ b/media/shot-v6a.jpg
--- a/media/shot-v8.jpg
+++ b/media/shot-v8.jpg
--- a/media/task-queue-v1.jpg
+++ b/media/task-queue-v1.jpg
--- a/scripts/Developer
+++ b/scripts/Developer
@ -1,32 +0,0 @@
-@echo off
-
-echo "Opening Stable Diffusion UI - Developer Console.." & echo.
-
-set PATH=C:\Windows\System32;%PATH%
-
-@rem set legacy and new installer's PATH, if they exist
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
-
-@rem activate the installer env
-call conda activate
-
-@rem Test the environment
-echo "Environment Info:"
-call where git
-call git --version
-
-call where conda
-call conda --version
-
-echo.
-
-@rem activate the environment
-call conda activate .\stable-diffusion\env
-
-call where python
-call python --version
-
-echo.
-
-cmd /k
--- a/scripts/Start
+++ b/scripts/Start
@ -1,24 +0,0 @@
-@echo off
-
-set PATH=C:\Windows\System32;%PATH%
-
-@rem set legacy installer's PATH, if it exists
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
-
-@rem Setup the packages required for the installer
-call scripts\bootstrap.bat
-
-@rem set new installer's PATH, if it downloaded any packages
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
-
-@rem Test the bootstrap
-call where git
-call git --version
-
-call where conda
-call conda --version
-
-@rem Download the rest of the installer and UI
-call scripts\on_env_start.bat
-
-@pause
--- a/scripts/bootstrap.bat
+++ b/scripts/bootstrap.bat
@ -1,55 +0,0 @@
-@echo off
-
-@rem This script will install git and conda (if not found on the PATH variable)
-@rem  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-@rem For users who already have git and conda, this step will be skipped.
-
-@rem This enables a user to install this project without manually installing conda and git.
-
-@rem config
-set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
-set INSTALL_ENV_DIR=%cd%\installer_files\env
-set LEGACY_INSTALL_ENV_DIR=%cd%\installer
-set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
-
-@rem figure out whether git and conda needs to be installed
-if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
-
-set PACKAGES_TO_INSTALL=
-
-if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" (
-    if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda
-)
-
-call git --version >.tmp1 2>.tmp2
-if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
-
-@rem (if necessary) install git and conda into a contained environment
-if "%PACKAGES_TO_INSTALL%" NEQ "" (
-    @rem download micromamba
-    if not exist "%MAMBA_ROOT_PREFIX%\micromamba.exe" (
-        echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
-
-        mkdir "%MAMBA_ROOT_PREFIX%"
-        call curl -L "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe"
-
-        @rem test the mamba binary
-        echo Micromamba version:
-        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version
-    )
-
-    @rem create the installer env
-    if not exist "%INSTALL_ENV_DIR%" (
-        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" create -y --prefix "%INSTALL_ENV_DIR%"
-    )
-
-    echo "Packages to install:%PACKAGES_TO_INSTALL%"
-
-    call "%MAMBA_ROOT_PREFIX%\micromamba.exe" install -y --prefix "%INSTALL_ENV_DIR%" -c conda-forge %PACKAGES_TO_INSTALL%
-
-    if not exist "%INSTALL_ENV_DIR%" (
-        echo "There was a problem while installing%PACKAGES_TO_INSTALL% using micromamba. Cannot continue."
-        pause
-        exit /b
-    )
-)
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@ -1,70 +0,0 @@
-#!/bin/bash
-
-# This script will install git and conda (if not found on the PATH variable)
-#  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-# For users who already have git and conda, this step will be skipped.
-
-# This enables a user to install this project without manually installing conda and git.
-
-
-OS_NAME=$(uname -s)
-case "${OS_NAME}" in
-    Linux*)     OS_NAME="linux";;
-    Darwin*)    OS_NAME="osx";;
-    *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
-esac
-
-OS_ARCH=$(uname -m)
-case "${OS_ARCH}" in
-    x86_64*)    OS_ARCH="64";;
-    arm64*)     OS_ARCH="arm64";;
-    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
-esac
-
-# https://mamba.readthedocs.io/en/latest/installation.html
-if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64"; fi
-
-# config
-export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba"
-INSTALL_ENV_DIR="$(pwd)/installer_files/env"
-LEGACY_INSTALL_ENV_DIR="$(pwd)/installer"
-MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest"
-
-# figure out whether git and conda needs to be installed
-if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi
-
-PACKAGES_TO_INSTALL=""
-
-if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi
-if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi
-
-# (if necessary) install git and conda into a contained environment
-if [ "$PACKAGES_TO_INSTALL" != "" ]; then
-    # download micromamba
-    if [ ! -e "$MAMBA_ROOT_PREFIX/micromamba" ]; then
-        echo "Downloading micromamba from $MICROMAMBA_DOWNLOAD_URL to $MAMBA_ROOT_PREFIX/micromamba"
-
-        mkdir -p "$MAMBA_ROOT_PREFIX"
-        curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj bin/micromamba -O > "$MAMBA_ROOT_PREFIX/micromamba"
-
-        chmod u+x "$MAMBA_ROOT_PREFIX/micromamba"
-
-        # test the mamba binary
-        echo "Micromamba version:"
-        "$MAMBA_ROOT_PREFIX/micromamba" --version
-    fi
-
-    # create the installer env
-    if [ ! -e "$INSTALL_ENV_DIR" ]; then
-        "$MAMBA_ROOT_PREFIX/micromamba" create -y --prefix "$INSTALL_ENV_DIR"
-    fi
-
-    echo "Packages to install:$PACKAGES_TO_INSTALL"
-
-    "$MAMBA_ROOT_PREFIX/micromamba" install -y --prefix "$INSTALL_ENV_DIR" -c conda-forge $PACKAGES_TO_INSTALL
-
-    if [ ! -e "$INSTALL_ENV_DIR" ]; then
-        echo "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue."
-        exit
-    fi
-fi
--- a/scripts/developer_console.sh
+++ b/scripts/developer_console.sh
@ -1,39 +0,0 @@
-#!/bin/bash
-
-if [ "$0" == "bash" ]; then
-  echo "Opening Stable Diffusion UI - Developer Console.."
-  echo ""
-
-  # set legacy and new installer's PATH, if they exist
-  if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
-  if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
-
-  # activate the installer env
-  CONDA_BASEPATH=$(conda info --base)
-  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
-
-  conda activate
-
-  # test the environment
-  echo "Environment Info:"
-  which git
-  git --version
-
-  which conda
-  conda --version
-
-  echo ""
-
-  # activate the environment
-  CONDA_BASEPATH=$(conda info --base)
-  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script)
-
-  conda activate ./stable-diffusion/env
-
-  which python
-  python --version
-
-  echo ""
-else
-  bash --init-file developer_console.sh
-fi
--- a/scripts/on_env_start.bat
+++ b/scripts/on_env_start.bat
@ -1,61 +0,0 @@
-@echo off
-
-@echo. & echo "Stable Diffusion UI - v2" & echo.
-
-set PATH=C:\Windows\System32;%PATH%
-
-if exist "scripts\config.bat" (
-    @call scripts\config.bat
-)
-
-if "%update_branch%"=="" (
-    set update_branch=main
-)
-
-@>nul findstr /m "conda_sd_ui_deps_installed" scripts\install_status.txt
-@if "%ERRORLEVEL%" NEQ "0" (
-    for /f "tokens=*" %%a in ('python -c "import os; parts = os.getcwd().split(os.path.sep); print(len(parts))"') do if "%%a" NEQ "2" (
-        echo. & echo "!!!! WARNING !!!!" & echo.
-        echo "Your 'stable-diffusion-ui' folder is at %cd%" & echo.
-        echo "The 'stable-diffusion-ui' folder needs to be at the top of your drive, for e.g. 'C:\stable-diffusion-ui' or 'D:\stable-diffusion-ui' etc."
-        echo "Not placing this folder at the top of a drive can cause errors on some computers."
-        echo. & echo "Recommended: Please close this window and move the 'stable-diffusion-ui' folder to the top of a drive. For e.g. 'C:\stable-diffusion-ui'. Then run the installer again." & echo.
-        echo "Not Recommended: If you're sure that you want to install at the current location, please press any key to continue." & echo.
-
-        pause
-    )
-)
-
-@>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    @echo "Stable Diffusion UI's git repository was already installed. Updating from %update_branch%.."
-
-    @cd sd-ui-files
-
-    @call git reset --hard
-    @call git -c advice.detachedHead=false checkout "%update_branch%"
-    @call git pull
-
-    @cd ..
-) else (
-    @echo. & echo "Downloading Stable Diffusion UI.." & echo.
-    @echo "Using the %update_branch% channel" & echo.
-
-    @call git clone -b "%update_branch%" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files && (
-        @echo sd_ui_git_cloned >> scripts\install_status.txt
-    ) || (
-        @echo "Error downloading Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        @exit /b
-    )
-)
-
-@xcopy sd-ui-files\ui ui /s /i /Y
-@copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
-@copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
-@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y
-
-@call scripts\on_sd_start.bat
-
-@pause
--- a/scripts/on_env_start.sh
+++ b/scripts/on_env_start.sh
@ -1,45 +0,0 @@
-#!/bin/bash
-
-printf "\n\nStable Diffusion UI\n\n"
-
-if [ -f "scripts/config.sh" ]; then
-    source scripts/config.sh
-fi
-
-if [ "$update_branch" == "" ]; then
-    export update_branch="main"
-fi
-
-if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/install_status.txt` -gt "0" ]; then
-    echo "Stable Diffusion UI's git repository was already installed. Updating from $update_branch.."
-
-    cd sd-ui-files
-
-    git reset --hard
-    git -c advice.detachedHead=false checkout "$update_branch"
-    git pull
-
-    cd ..
-else
-    printf "\n\nDownloading Stable Diffusion UI..\n\n"
-    printf "Using the $update_branch channel\n\n"
-
-    if git clone -b "$update_branch" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files ; then
-        echo sd_ui_git_cloned >> scripts/install_status.txt
-    else
-        printf "\n\nError downloading Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-fi
-
-rm -rf ui
-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/start.sh .
-cp sd-ui-files/scripts/developer_console.sh .
-
-./scripts/on_sd_start.sh
-
-read -p "Press any key to continue"
--- a/scripts/on_sd_start.bat
+++ b/scripts/on_sd_start.bat
@ -1,348 +0,0 @@
-@echo off
-
-@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
-
-if exist "%cd%\profile" (
-    set USERPROFILE=%cd%\profile
-)
-
-@rem activate the installer env
-call conda activate
-
-@REM Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
-@REM Note to self: Please rewrite this in Python. For the sake of your own sanity.
-
-@REM remove the old version of the dev console script, if it's still present
-if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
-
-@call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"
-
-@>nul findstr /m "sd_git_cloned" scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    @echo "Stable Diffusion's git repository was already installed. Updating.."
-
-    @cd stable-diffusion
-
-    @call git reset --hard
-    @call git pull
-    @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    @call git apply ..\ui\sd_internal\ddim_callback.patch
-    @call git apply ..\ui\sd_internal\env_yaml.patch
-
-    @cd ..
-) else (
-    @echo. & echo "Downloading Stable Diffusion.." & echo.
-
-    @call git clone https://github.com/basujindal/stable-diffusion.git && (
-        @echo sd_git_cloned >> scripts\install_status.txt
-    ) || (
-        @echo "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        @exit /b
-    )
-
-    @cd stable-diffusion
-    @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    @call git apply ..\ui\sd_internal\ddim_callback.patch
-    @call git apply ..\ui\sd_internal\env_yaml.patch
-
-    @cd ..
-)
-
-@cd stable-diffusion
-
-@>nul findstr /m "conda_sd_env_created" ..\scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    @echo "Packages necessary for Stable Diffusion were already installed"
-
-    @call conda activate .\env
-) else (
-    @echo. & echo "Downloading packages necessary for Stable Diffusion.." & echo. & echo "***** This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient ***** .." & echo.
-
-    @rmdir /s /q .\env
-
-    @REM prevent conda from using packages from the user's home directory, to avoid conflicts
-    @set PYTHONNOUSERSITE=1
-
-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    @call conda env create --prefix env -f environment.yaml || (
-        @echo. & echo "Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    @call conda activate .\env
-
-    @call conda install -c conda-forge -y --prefix env antlr4-python3-runtime=4.8 || (
-        @echo. & echo "Error installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    for /f "tokens=*" %%a in ('python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    @echo conda_sd_env_created >> ..\scripts\install_status.txt
-)
-
-set PATH=C:\Windows\System32;%PATH%
-
-@>nul findstr /m "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    @echo "Packages necessary for GFPGAN (Face Correction) were already installed"
-) else (
-    @echo. & echo "Downloading packages necessary for GFPGAN (Face Correction).." & echo.
-
-    @set PYTHONNOUSERSITE=1
-
-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    @call pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN || (
-        @echo. & echo "Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    @call pip install basicsr==1.4.2 || (
-        @echo. & echo "Error installing the basicsr package necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    for /f "tokens=*" %%a in ('python -c "from gfpgan import GFPGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    @echo conda_sd_gfpgan_deps_installed >> ..\scripts\install_status.txt
-)
-
-@>nul findstr /m "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    @echo "Packages necessary for ESRGAN (Resolution Upscaling) were already installed"
-) else (
-    @echo. & echo "Downloading packages necessary for ESRGAN (Resolution Upscaling).." & echo.
-
-    @set PYTHONNOUSERSITE=1
-
-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    @call pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan || (
-        @echo. & echo "Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    for /f "tokens=*" %%a in ('python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-
-    @echo conda_sd_esrgan_deps_installed >> ..\scripts\install_status.txt
-)
-
-@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
-@if "%ERRORLEVEL%" EQU "0" (
-    echo "Packages necessary for Stable Diffusion UI were already installed"
-) else (
-    @echo. & echo "Downloading packages necessary for Stable Diffusion UI.." & echo.
-
-    @set PYTHONNOUSERSITE=1
-
-    set USERPROFILE=%cd%\profile
-    set TMP=%cd%\tmp
-    set TEMP=%cd%\tmp
-
-    @call conda install -c conda-forge -y --prefix env uvicorn fastapi || (
-        echo "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        exit /b
-    )
-)
-
-call WHERE uvicorn > .tmp
-@>nul findstr /m "uvicorn" .tmp
-@if "%ERRORLEVEL%" NEQ "0" (
-    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-    pause
-    exit /b
-)
-
-@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
-@if "%ERRORLEVEL%" NEQ "0" (
-    @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
-)
-
-
-
-if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
-echo. > "..\models\stable-diffusion\Put your custom ckpt files here.txt"
-
-@if exist "sd-v1-4.ckpt" (
-    for %%I in ("sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
-        echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 4 GB Model."
-    ) else (
-        for %%J in ("sd-v1-4.ckpt") do if "%%~zJ" EQU "7703807346" (
-            echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 7 GB Model."
-        ) else (
-            for %%K in ("sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
-                echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
-            ) else (
-                echo. & echo "The model file present at %cd%\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
-                del "sd-v1-4.ckpt"
-            )
-        )
-    )
-)
-
-@if not exist "sd-v1-4.ckpt" (
-    @echo. & echo "Downloading data files (weights) for Stable Diffusion.." & echo.
-
-    @call curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
-
-    @if exist "sd-v1-4.ckpt" (
-        for %%I in ("sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
-            echo. & echo "Error: The downloaded model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "GFPGANv1.3.pth" (
-    for %%I in ("GFPGANv1.3.pth") do if "%%~zI" EQU "348632874" (
-        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
-    ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\GFPGANv1.3.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "GFPGANv1.3.pth"
-    )
-)
-
-@if not exist "GFPGANv1.3.pth" (
-    @echo. & echo "Downloading data files (weights) for GFPGAN (Face Correction).." & echo.
-
-    @call curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth
-
-    @if exist "GFPGANv1.3.pth" (
-        for %%I in ("GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
-            echo. & echo "Error: The downloaded GFPGAN model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "RealESRGAN_x4plus.pth" (
-    for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
-    ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "RealESRGAN_x4plus.pth"
-    )
-)
-
-@if not exist "RealESRGAN_x4plus.pth" (
-    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.." & echo.
-
-    @call curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
-
-    @if exist "RealESRGAN_x4plus.pth" (
-        for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
-            echo. & echo "Error: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "RealESRGAN_x4plus_anime_6B.pth" (
-    for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
-    ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "RealESRGAN_x4plus_anime_6B.pth"
-    )
-)
-
-@if not exist "RealESRGAN_x4plus_anime_6B.pth" (
-    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.." & echo.
-
-    @call curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
-
-    @if exist "RealESRGAN_x4plus_anime_6B.pth" (
-        for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
-            echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        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
-    @echo sd_install_complete >> ..\scripts\install_status.txt
-)
-
-@echo. & echo "Stable Diffusion is ready!" & echo.
-
-@set SD_DIR=%cd%
-
-@cd env\lib\site-packages
-@set PYTHONPATH=%SD_DIR%;%cd%
-@cd ..\..\..
-@echo PYTHONPATH=%PYTHONPATH%
-
-call where python
-call python --version
-
-@cd ..
-@set SD_UI_PATH=%cd%\ui
-@cd stable-diffusion
-
-@uvicorn server:app --app-dir "%SD_UI_PATH%" --port 9000 --host 0.0.0.0
-
-@pause
--- a/scripts/on_sd_start.sh
+++ b/scripts/on_sd_start.sh
@ -1,323 +0,0 @@
-#!/bin/bash
-
-cp sd-ui-files/scripts/on_env_start.sh scripts/
-cp sd-ui-files/scripts/bootstrap.sh scripts/
-
-# activate the installer env
-CONDA_BASEPATH=$(conda info --base)
-source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
-
-conda activate
-
-# remove the old version of the dev console script, if it's still present
-if [ -e "open_dev_console.sh" ]; then
-    rm "open_dev_console.sh"
-fi
-
-python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"
-
-# Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
-# Note to self: Please rewrite this in Python. For the sake of your own sanity.
-
-if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/install_status.txt` -gt "0" ]; then
-    echo "Stable Diffusion's git repository was already installed. Updating.."
-
-    cd stable-diffusion
-
-    git reset --hard
-    git pull
-    git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    git apply ../ui/sd_internal/ddim_callback.patch
-    git apply ../ui/sd_internal/env_yaml.patch
-
-    cd ..
-else
-    printf "\n\nDownloading Stable Diffusion..\n\n"
-
-    if git clone https://github.com/basujindal/stable-diffusion.git ; then
-        echo sd_git_cloned >> scripts/install_status.txt
-    else
-        printf "\n\nError downloading Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    cd stable-diffusion
-    git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    git apply ../ui/sd_internal/ddim_callback.patch
-    git apply ../ui/sd_internal/env_yaml.patch
-
-    cd ..
-fi
-
-cd stable-diffusion
-
-if [ `grep -c conda_sd_env_created ../scripts/install_status.txt` -gt "0" ]; then
-    echo "Packages necessary for Stable Diffusion were already installed"
-
-    conda activate ./env
-else
-    printf "\n\nDownloading packages necessary for Stable Diffusion..\n"
-    printf "\n\n***** This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient ***** ..\n\n"
-
-    # prevent conda from using packages from the user's home directory, to avoid conflicts
-    export PYTHONNOUSERSITE=1
-
-    if conda env create --prefix env --force -f environment.yaml ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    conda activate ./env
-
-    if conda install -c conda-forge --prefix ./env -y antlr4-python3-runtime=4.8 ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"`
-    if [ "$out_test" != "42" ]; then
-        printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    echo conda_sd_env_created >> ../scripts/install_status.txt
-fi
-
-if [ `grep -c conda_sd_gfpgan_deps_installed ../scripts/install_status.txt` -gt "0" ]; then
-    echo "Packages necessary for GFPGAN (Face Correction) were already installed"
-else
-    printf "\n\nDownloading packages necessary for GFPGAN (Face Correction)..\n"
-
-    export PYTHONNOUSERSITE=1
-
-    if pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    out_test=`python -c "from gfpgan import GFPGANer; print(42)"`
-    if [ "$out_test" != "42" ]; then
-        printf "\n\nDependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    echo conda_sd_gfpgan_deps_installed >> ../scripts/install_status.txt
-fi
-
-if [ `grep -c conda_sd_esrgan_deps_installed ../scripts/install_status.txt` -gt "0" ]; then
-    echo "Packages necessary for ESRGAN (Resolution Upscaling) were already installed"
-else
-    printf "\n\nDownloading packages necessary for ESRGAN (Resolution Upscaling)..\n"
-
-    export PYTHONNOUSERSITE=1
-
-    if pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    out_test=`python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"`
-    if [ "$out_test" != "42" ]; then
-        printf "\n\nDependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    echo conda_sd_esrgan_deps_installed >> ../scripts/install_status.txt
-fi
-
-if [ `grep -c conda_sd_ui_deps_installed ../scripts/install_status.txt` -gt "0" ]; then
-    echo "Packages necessary for Stable Diffusion UI were already installed"
-else
-    printf "\n\nDownloading packages necessary for Stable Diffusion UI..\n\n"
-
-    export PYTHONNOUSERSITE=1
-
-    if conda install -c conda-forge --prefix ./env -y uvicorn fastapi ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    if ! command -v uvicorn &> /dev/null; then
-        printf "\n\nUI packages not found! Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-
-    echo conda_sd_ui_deps_installed >> ../scripts/install_status.txt
-fi
-
-
-
-mkdir -p "../models/stable-diffusion"
-echo "" > "../models/stable-diffusion/Put your custom ckpt files here.txt"
-
-if [ -f "sd-v1-4.ckpt" ]; then
-    model_size=`find "sd-v1-4.ckpt" -printf "%s"`
-
-    if [ "$model_size" -eq "4265380512" ] || [ "$model_size" -eq "7703807346" ] || [ "$model_size" -eq "7703810927" ]; then
-        echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
-    else
-        printf "\n\nThe model file present at $PWD/sd-v1-4.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm sd-v1-4.ckpt
-    fi
-fi
-
-if [ ! -f "sd-v1-4.ckpt" ]; then
-    echo "Downloading data files (weights) for Stable Diffusion.."
-
-    curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
-
-    if [ -f "sd-v1-4.ckpt" ]; then
-        model_size=`find "sd-v1-4.ckpt" -printf "%s"`
-        if [ ! "$model_size" == "4265380512" ]; then
-            printf "\n\nError: The downloaded model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-            read -p "Press any key to continue"
-            exit
-        fi
-    else
-        printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-fi
-
-
-if [ -f "GFPGANv1.3.pth" ]; then
-    model_size=`find "GFPGANv1.3.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "348632874" ]; then
-        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
-    else
-        printf "\n\nThe model file present at $PWD/GFPGANv1.3.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm GFPGANv1.3.pth
-    fi
-fi
-
-if [ ! -f "GFPGANv1.3.pth" ]; then
-    echo "Downloading data files (weights) for GFPGAN (Face Correction).."
-
-    curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth
-
-    if [ -f "GFPGANv1.3.pth" ]; then
-        model_size=`find "GFPGANv1.3.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "348632874" ]; then
-            printf "\n\nError: The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-            read -p "Press any key to continue"
-            exit
-        fi
-    else
-        printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-fi
-
-
-if [ -f "RealESRGAN_x4plus.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "67040989" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
-    else
-        printf "\n\nThe model file present at $PWD/RealESRGAN_x4plus.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm RealESRGAN_x4plus.pth
-    fi
-fi
-
-if [ ! -f "RealESRGAN_x4plus.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.."
-
-    curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
-
-    if [ -f "RealESRGAN_x4plus.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "67040989" ]; then
-            printf "\n\nError: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-            read -p "Press any key to continue"
-            exit
-        fi
-    else
-        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-fi
-
-
-if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "17938799" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
-    else
-        printf "\n\nThe model file present at $PWD/RealESRGAN_x4plus_anime_6B.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm RealESRGAN_x4plus_anime_6B.pth
-    fi
-fi
-
-if [ ! -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.."
-
-    curl -C - --retry 20 --retry-all-errors --retry-delay 5 -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
-
-    if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-        model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "17938799" ]; then
-            printf "\n\nError: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-            read -p "Press any key to continue"
-            exit
-        fi
-    else
-        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  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\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
-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
-fi
-
-printf "\n\nStable Diffusion is ready!\n\n"
-
-SD_PATH=`pwd`
-export PYTHONPATH="$SD_PATH:$SD_PATH/env/lib/python3.8/site-packages"
-echo "PYTHONPATH=$PYTHONPATH"
-
-which python
-python --version
-
-cd ..
-export SD_UI_PATH=`pwd`/ui
-cd stable-diffusion
-
-uvicorn server:app --app-dir "$SD_UI_PATH" --port 9000 --host 0.0.0.0
-
-read -p "Press any key to continue"
--- a/scripts/post_activate.bat
+++ b/scripts/post_activate.bat
@ -1,6 +0,0 @@
-@call conda --version
-@call git --version
-
-cd %CONDA_PREFIX%\..\scripts
-
-on_env_start.bat
--- a/scripts/post_activate.sh
+++ b/scripts/post_activate.sh
@ -1,12 +0,0 @@
-#!/bin/bash
-
-conda-unpack
-
-source $CONDA_PREFIX/etc/profile.d/conda.sh
-
-conda --version
-git --version
-
-cd $CONDA_PREFIX/../scripts
-
-./on_env_start.sh
--- a/scripts/start.sh
+++ b/scripts/start.sh
@ -1,20 +0,0 @@
-#!/bin/bash
-
-# set legacy installer's PATH, if it exists
-if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
-
-# Setup the packages required for the installer
-scripts/bootstrap.sh
-
-# set new installer's PATH, if it downloaded any packages
-if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
-
-# Test the bootstrap
-which git
-git --version
-
-which conda
-conda --version
-
-# Download the rest of the installer and UI
-scripts/on_env_start.sh
--- a/scripts/win_enable_long_filepaths.ps1
+++ b/scripts/win_enable_long_filepaths.ps1
@ -1,2 +0,0 @@
-Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name LongPathsEnabled -Type DWord -Value 1
-pause
--- a/start.sh
+++ b/start.sh
@ -0,0 +1,18 @@
+#!/bin/bash
+
+echo "Stable Diffusion UI - v2.5"
+echo ""
+
+export SD_BASE_DIR=$(pwd)
+
+echo "Working in $SD_BASE_DIR"
+
+# Setup the packages required for the installer
+installer/bootstrap/bootstrap.sh
+
+# Test the bootstrap
+git --version
+python --version
+
+# Download the rest of the installer and UI
+installer/installer/start.sh
--- a/ui/index.html
+++ b/ui/index.html
@ -2,29 +2,26 @@
 <html>
 <head>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" href="/media/images/favicon-16x16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/media/images/favicon-32x32.png" sizes="32x32">
-    <link rel="stylesheet" href="/media/css/fonts.css?v=1">
-    <link rel="stylesheet" href="/media/css/themes.css?v=1">
-    <link rel="stylesheet" href="/media/css/main.css?v=3">
-    <link rel="stylesheet" href="/media/css/auto-save.css?v=2">
-    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=2">
-    <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
-    <link rel="stylesheet" href="/media/css/drawingboard.min.css">
-    <script src="/media/js/jquery-3.6.1.min.js"></script>
-    <script src="/media/js/drawingboard.min.js"></script>
+    <link rel="icon" type="image/png" href="/media/favicon-16x16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/media/favicon-32x32.png" sizes="32x32">
+    <link rel="stylesheet" href="/media/main.css?v=10">
+    <link rel="stylesheet" href="/media/modifier-thumbnails.css?v=1">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
+    <link rel="stylesheet" href="/media/drawingboard.min.css">
+    <script src="/media/jquery-3.6.1.min.js"></script>
+    <script src="/media/drawingboard.min.js"></script>
 </head>
 <body>
 <div id="container">
    <div id="top-nav">
        <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.3.5 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.195 <span id="updateBranchLabel"></span></small></h1>
        </div>
        <ul id="top-nav-items">
            <li class="dropdown">
                <span><i class="fa fa-comments icon"></i> Help & Community</span>
                <ul id="community-links" class="dropdown-content">
-                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
+                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Usual problems and solutions</a></li>
                    <li><a href="https://discord.com/invite/u9yhsFmEkB" target="_blank"><i class="fa-brands fa-discord fa-fw"></i> Discord user community</a></li>
                    <li><a href="https://www.reddit.com/r/StableDiffusionUI/" target="_blank"><i class="fa-brands fa-reddit fa-fw"></i> Reddit community</a></li>
                    <li><a href="https://github.com/cmdr2/stable-diffusion-ui" target="_blank"><i class="fa-brands fa-github fa-fw"></i> Source code on GitHub</a></li>
@ -36,18 +33,11 @@
                    <ul id="system-settings-entries">
                        <li><b class="settings-subheader">System Settings</b></li>
                        <br/>
-                        <li><label for="theme">Theme: </label><select id="theme" name="theme"><option value="theme-default">Default</option></select></li>
                        <li><input id="save_to_disk" name="save_to_disk" type="checkbox"> <label for="save_to_disk">Automatically save to <input id="diskPath" name="diskPath" size="40" disabled></label></li>
                        <li><input id="sound_toggle" name="sound_toggle" type="checkbox" checked> <label for="sound_toggle">Play sound on task completion</label></li>
                        <li><input id="turbo" name="turbo" type="checkbox" checked> <label for="turbo">Turbo mode <small>(generates images faster, but uses an additional 1 GB of GPU memory)</small></label></li>
                        <li><input id="use_cpu" name="use_cpu" type="checkbox"> <label for="use_cpu">Use CPU instead of GPU <small>(warning: this will be *very* slow)</small></label></li>
                        <li><input id="use_full_precision" name="use_full_precision" type="checkbox"> <label for="use_full_precision">Use full precision <small>(for GPU-only. warning: this will consume more VRAM)</small></label></li>
-                        <li>
-                            <input id="auto_save_settings" name="auto_save_settings" checked type="checkbox">
-                            <label for="auto_save_settings">Automatically save settings <small>(settings restored on browser load)</small></label>
-                            <br/>
-                            <button id="configureSettingsSaveBtn">Configure</button>
-                        </li>
                        <!-- <li><input id="allow_nsfw" name="allow_nsfw" type="checkbox"> <label for="allow_nsfw">Allow NSFW Content (You confirm you are above 18 years of age)</label></li> -->
                        <br/>
                        <li><input id="use_beta_channel" name="use_beta_channel" type="checkbox"> <label for="use_beta_channel">🔥Beta channel. Get the latest features immediately (but could be less stable). Please restart the program after changing this.</label></li>
@ -65,25 +55,16 @@
            </div>
            <div id="editor-inputs">
                <div id="editor-inputs-prompt" class="row">
-                    <label for="prompt"><b>Enter Prompt</b></label> <small>or</small> <button id="promptsFromFileBtn">Load from a file</button>
+                    <label for="prompt">Prompt</label>
                    <textarea id="prompt" class="col-free">a photograph of an astronaut riding a horse</textarea>
-                    <input id="prompt_from_file" name="prompt_from_file" type="file" /> <!-- hidden -->
-
-                    <label for="negative_prompt" class="collapsible" id="negative_prompt_handle">Negative Prompt <small>(optional)</small></label>
-                    <div class="collapsible-content">
-                        <input id="negative_prompt" name="negative_prompt" placeholder="list the things to remove from the image (e.g. fog, green)">
-                    </div>
                </div>

                <div id="editor-inputs-init-image" class="row">
-                    <label for="init_image">Initial Image (img2img) <small>(optional)</small> </label> <input id="init_image" name="init_image" type="file" /><br/>
+                    <label for="init_image"><b>Initial Image:</b> (optional) </label> <input id="init_image" name="init_image" type="file" /><br/>

                    <div id="init_image_preview_container" class="image_preview_container">
-                        <div id="init_image_wrapper">
-                            <img id="init_image_preview" src="" />
-                            <span id="init_image_size_box"></span>
-                            <button class="init_image_clear image_clear_btn">X</button>
-                        </div>
+                        <img id="init_image_preview" src="" width="100" height="100" />
+                        <button class="init_image_clear image_clear_btn">X</button>

                        <br/>
                        <input id="enable_mask" name="enable_mask" type="checkbox"> <label for="enable_mask">In-Painting (beta) <small>(select the area which the AI will paint into)</small></label>
@ -103,37 +84,24 @@
            <div class="line-separator">&nbsp;</div>

            <div id="editor-settings" class="panel-box settings-box">
-                <h4 class="collapsible">
-                    Image Settings
-                    <i id="reset-image-settings" class="fa-solid fa-arrow-rotate-left">
-                        <span class="simple-tooltip right">
-                            Reset Image Settings
-                        </span>
-                    </i>
-                </h4>
+                <h4 class="collapsible">Image Settings</h4>
                <ul id="editor-settings-entries" class="collapsible-content">
-                    <li><table>
-                    <tr><b class="settings-subheader">Image Settings</b></tr>
-                    <tr class="pl-5"><td><label for="seed">Seed:</label></td><td><input id="seed" name="seed" size="10" value="30000"> <input id="random_seed" name="random_seed" type="checkbox" checked><label for="random_seed">Random</label></td></tr>
-                    <tr class="pl-5"><td><label for="num_outputs_total">Number of Images:</label></td><td><input id="num_outputs_total" name="num_outputs_total" value="1" size="1"> <label><small>(total)</small></label> <input id="num_outputs_parallel" name="num_outputs_parallel" value="1" size="1"> <label for="num_outputs_parallel"><small>(in parallel)</small></label></td></tr>
-                    <tr class="pl-5"><td><label for="stable_diffusion_model">Model:</label></td><td>
-                        <select id="stable_diffusion_model" name="stable_diffusion_model">
-                            <!-- <option value="sd-v1-4" selected>sd-v1-4</option> -->
-                        </select>
-                    </td></tr>
-                    <tr id="samplerSelection" class="pl-5"><td><label for="sampler">Sampler:</label></td><td>
+                    <li><b class="settings-subheader">Image Settings</b></li>
+                    <li class="pl-5"><label for="seed">Seed:</label> <input id="seed" name="seed" size="10" value="30000"> <input id="random_seed" name="random_seed" type="checkbox" checked> <label for="random_seed">Random Image</label></li>
+                    <li class="pl-5"><label for="num_outputs_total">Number of images to make:</label> <input id="num_outputs_total" name="num_outputs_total" value="1" size="1"> <label for="num_outputs_parallel">Generate in parallel:</label> <input id="num_outputs_parallel" name="num_outputs_parallel" value="1" size="1"> (images at once)</li>
+                    <li id="samplerSelection" class="pl-5"><label for="sampler">Sampler:</label>
                        <select id="sampler" name="sampler">
-                            <option value="plms">plms</option>
+                            <option value="plms" selected>plms</option>
                            <option value="ddim">ddim</option>
                            <option value="heun">heun</option>
                            <option value="euler">euler</option>
-                            <option value="euler_a" selected>euler_a</option>
+                            <option value="euler_a">euler_a</option>
                            <option value="dpm2">dpm2</option>
                            <option value="dpm2_a">dpm2_a</option>
                            <option value="lms">lms</option>
                        </select>
-                    </td></tr>
-                    <tr class="pl-5"><td><label>Image Size: </label></td><td>
+                    </li>
+                    <li class="pl-5"><label>Image Size: </label>
                        <select id="width" name="width" value="512">
                            <option value="128">128 (*)</option>
                            <option value="192">192</option>
@ -178,48 +146,45 @@
                            <option value="2048">2048</option>
                        </select>
                        <label for="height"><small>(height)</small></label>
-                    </td></tr>
-                    <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"></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="10" max="500"> <input id="guidance_scale" name="guidance_scale" size="4"></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"><br/></td></tr></span>
-                    <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>
-                            <option value="png">png</option>
-                        </select>
-                    </td></tr>
-                    </li></table>
+                    </li>
+                    <li class="pl-5"><label for="num_inference_steps">Number of inference steps:</label> <input id="num_inference_steps" name="num_inference_steps" size="4" value="50"></li>
+                    <li class="pl-5"><label for="guidance_scale_slider">Guidance Scale:</label> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="10" max="500"> <input id="guidance_scale" name="guidance_scale" size="4"></li>
+                    <li class="pl-5"><span id="prompt_strength_container"><label for="prompt_strength_slider">Prompt Strength:</label> <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"><br/></span></li>
+
+                    <br/>
+
+                    <li><b class="settings-subheader">Prompt Settings</b></li>
+                    <li class="pl-5"><label for="negative_prompt">Negative Prompt:</label> <input id="negative_prompt" name="negative_prompt" size="55"></li>

                    <br/>

                    <li><b class="settings-subheader">Render Settings</b></li>
-                    <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview <small>(uses more VRAM, slightly slower image creation)</small></label></li>
+                    <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview of the image <small>(uses more VRAM, slightly slower image creation)</small></label></li>
                    <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox" checked> <label for="use_face_correction">Fix incorrect faces and eyes <small>(uses GFPGAN)</small></label></li>
                    <li class="pl-5">
-                        <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Upscale image by 4x with </label>
+                        <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Upscale the image to 4x resolution using </label>
                        <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>
                        </select>
                    </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>
+                    <br/>
+                    <li><small>The system-related settings have been moved to the top-right corner.</small></li>
                </ul>
            </div>

            <div id="editor-modifiers" class="panel-box">
-                <button id="modifier-settings-btn" title="Add custom modifiers"><i class="fa fa-gear"></i></button>
                <h4 class="collapsible">Image Modifiers (art styles, tags etc)</h4>
                <div id="editor-modifiers-entries" class="collapsible-content">
-                    <div id="editor-modifiers-entries-toolbar">
-                        <label for="preview-image">Image Style:</label>
-                        <select id="preview-image" name="preview-image" value="portrait">
-                            <option value="portrait" selected="">Face</option>
-                            <option value="landscape">Landscape</option>
-                        </select>
-                        &nbsp;
-                        <label for="modifier-card-size-slider">Thumbnail Size:</label>
-                        <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
-                    </div>
+                    <label for="preview-image">Image Style:</label>
+                    <select id="preview-image" name="preview-image" value="portrait">
+                        <option value="portrait" selected="">Face</option>
+                        <option value="landscape">Landscape</option>
+                    </select>
+                    &nbsp;
+                    <label for="modifier-card-size-slider">Thumbnail Size:</label>
+                    <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
                </div>
            </div>
        </div>
@ -234,30 +199,10 @@
        </div>
    </div>

-    <div id="save-settings-config" style="display:none">
-        <div>
-            <span id="save-settings-config-close-btn">X</span>
-            <h1>Save Settings Configuration</h1>
-            <p>Select which settings should be remembered when restarting the browser</p>
-            <table id="save-settings-config-table">
-            </table>
-        </div>
-    </div>
-
-    <div id="modifier-settings-config" style="display:none">
-        <div>
-            <span id="modifier-settings-config-close-btn">X</span>
-            <h1>Modifier Settings</h1>
-            <p>Set your custom modifiers (one per line)</p>
-            <textarea id="custom-modifiers-input" placeholder="Enter your custom modifiers, one-per-line"></textarea>
-            <p><small><b>Tip:</b> You can include special characters like {} () [] and |. You can also put multiple comma-separated phrases in a single line, to make a single modifier that combines all of those.</small></p>
-        </div>
-    </div>
-
    <div class="line-separator">&nbsp;</div>

    <div id="footer" class="panel-box">
-        <p>If you found this project useful and want to help keep it alive, please <a href="https://ko-fi.com/cmdr2_stablediffusion_ui" target="_blank"><img src="/media/images/kofi.png" id="coffeeButton"></a> to help cover the cost of development and maintenance! Thank you for your support!</p>
+        <p>If you found this project useful and want to help keep it alive, please <a href="https://ko-fi.com/cmdr2_stablediffusion_ui" target="_blank"><img src="media/kofi.png" id="coffeeButton"></a> to help cover the cost of development and maintenance! Thank you for your support!</p>
        <p>Please feel free to join the <a href="https://discord.com/invite/u9yhsFmEkB" target="_blank">discord community</a> or <a href="https://github.com/cmdr2/stable-diffusion-ui/issues" target="_blank">file an issue</a> if you have any problems or suggestions in using this interface.</p>
        <div id="footer-legal">
            <p><b>Disclaimer:</b> The authors of this project are not responsible for any content generated using this interface.</p>
@ -268,21 +213,12 @@
 </div>
 </body>

-<script src="media/js/plugins.js?v=1"></script>
-<script src="media/js/utils.js?v=4"></script>
-<script src="media/js/inpainting-editor.js?v=1"></script>
-<script src="media/js/image-modifiers.js?v=3"></script>
-<script src="media/js/auto-save.js?v=2"></script>
-<script src="media/js/main.js?v=5"></script>
-<script src="media/js/themes.js?v=2"></script>
+<script src="media/main.js?v=15"></script>
 <script>
 async function init() {
-    await initSettings()
-    await getModels()
+    await loadModifiers()
    await getDiskPath()
    await getAppConfig()
-    await loadModifiers()
-    await loadUIPlugins()

    setInterval(healthCheck, HEALTH_PING_INTERVAL * 1000)
    healthCheck()
--- a/ui/media/css/auto-save.css
+++ b/ui/media/css/auto-save.css
@ -1,74 +0,0 @@
-/* Auto-Settings Styling */
-#auto_save_settings ~ button {
-    margin: 5px;
-}
-#auto_save_settings:not(:checked) ~ button {
-    display: none;
-}
-
-#save-settings-config {
-    position: absolute;
-    background: rgba(32, 33, 36, 50%);
-    top: 0px;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    z-index: 1000;
-}
-
-#save-settings-config > div {
-    background: var(--background-color3);
-    max-width: 600px;
-    margin: auto;
-    margin-top: 50px;
-    border-radius: 6px;
-    padding: 30px;
-    text-align: center;
-}
-
-#save-settings-config-table {
-    margin: auto;
-}
-
-#save-settings-config-table th {
-    padding-top: 15px;
-    padding-bottom: 5px;
-}
-
-#save-settings-config-table td:first-child,
-#save-settings-config-table th:first-child {
-    float: right;
-}
-
-#save-settings-config-table td:last-child,
-#save-settings-config-table th:last-child {
-    float: left;
-}
-
-#save-settings-config-table td small {
-    color: rgb(153, 153, 153);
-}
-
-#save-settings-config-close-btn {
-    float: right;
-    cursor: pointer;
-    padding: 10px;
-    transform: translate(50%, -50%) scaleX(130%);
-}
-
-#reset-image-settings {
-    cursor: pointer;
-    float: right;
-    padding: 8px;
-    opacity: 1;
-    transition: opacity 0.5;
-}
-
-.collapsible:not(.active) #reset-image-settings {
-    display: none;
-}
-
-#reset-image-settings.hidden {
-    opacity: 0;
-    pointer-events: none;
-}
--- a/ui/media/css/fontawesome-all.min.css
+++ b/ui/media/css/fontawesome-all.min.css
--- a/ui/media/css/fonts.css
+++ b/ui/media/css/fonts.css
@ -1,40 +0,0 @@
-/* work-sans-regular - latin */
-@font-face {
-    font-family: 'Work Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: local(''),
-         url('/media/fonts/work-sans-v18-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-         url('/media/fonts/work-sans-v18-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-  }
-  
-  /* work-sans-600 - latin */
-  @font-face {
-    font-family: 'Work Sans';
-    font-style: normal;
-    font-weight: 600;
-    src: local(''),
-         url('/media/fonts/work-sans-v18-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-         url('/media/fonts/work-sans-v18-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-  }
-  
-  /* work-sans-700 - latin */
-  @font-face {
-    font-family: 'Work Sans';
-    font-style: normal;
-    font-weight: 700;
-    src: local(''),
-         url('/media/fonts/work-sans-v18-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-         url('/media/fonts/work-sans-v18-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-  }
-  
-  /* work-sans-800 - latin */
-  @font-face {
-    font-family: 'Work Sans';
-    font-style: normal;
-    font-weight: 800;
-    src: local(''),
-         url('/media/fonts/work-sans-v18-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-         url('/media/fonts/work-sans-v18-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
-  }
-  
--- a/ui/media/css/themes.css
+++ b/ui/media/css/themes.css
@ -1,146 +0,0 @@
-:root {
-    --background-color1: rgb(32, 33, 36); /* main parts of the page */
-    --background-color2: rgb(44, 45, 48); /* main panels */
-    --background-color3: rgb(47, 49, 53);
-    --background-color4: rgb(18, 18, 19); /* settings dropdowns */
-
-    --accent-hue: 266;
-    --accent-lightness: 36%;
-    --accent-lightness-hover: 40%;
-
-    --text-color: #eee;
-
-    --input-text-color: black;
-    --input-background-color: #e9e9ed; 
-    --input-border-color: #8f8f9d; 
-
-    --button-text-color: var(--input-text-color);
-    --button-color: #e9e9ed;
-    --button-border: 1px solid #8f8f9d;
-
-    /* other */
-    --input-border-radius: 4px;
-    --input-border-size: 1px; 
-    --accent-color: hsl(var(--accent-hue), 100%, var(--accent-lightness));
-    --accent-color-hover: hsl(var(--accent-hue), 100%, var(--accent-lightness-hover));
-    --make-image-border: 2px solid hsl(var(--accent-hue), 100%, calc(var(--accent-lightness) - 21%));
-}
-
-.theme-light {
-    --background-color1: white; 
-    --background-color2: #dddddd;
-    --background-color3: #e7e9eb;
-    --background-color4: #cccccc;
-
-    --text-color: black;
-
-    --input-text-color: black;
-    --input-background-color: #f8f9fa; 
-    --input-border-color: grey; 
-}
-
-.theme-discord {
-    --background-color1: #36393f;
-    --background-color2: #2f3136;
-    --background-color3: #292b2f;
-    --background-color4: #202225;
-    
-    --accent-hue: 235;
-    --accent-lightness: 65%;
-    --make-image-border: none;
-    
-    --button-color: var(--accent-color);
-    --button-border: none;
-
-    --input-text-color: #ccc;
-    --input-border-size: 2px; 
-    --input-background-color: #202225; 
-    --input-border-color: var(--input-background-color); 
-}
-
-.theme-cool-blue {
-    --main-hue: 222;
-	--main-saturation: 18%;
-	--value-base: 19%;
-	--value-step: 3%;
-	--background-color1: hsl(var(--main-hue), var(--main-saturation), var(--value-base));
-	--background-color2: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (1 * var(--value-step))));
-	--background-color3: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (2 * var(--value-step))));
-	--background-color4: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (3 * var(--value-step))));
-    
-    --accent-hue: 212;
-    --make-image-border: none;
-
-    --button-color: var(--accent-color);
-    --button-border: none;
-    
-    --input-border-size: 1px; 
-    --input-background-color: var(--background-color3);
-	--input-text-color: #ccc;
-	--input-border-color: var(--background-color4);
-}
-
-
-.theme-blurple {
-    --main-hue: 235;
-	--main-saturation: 18%;
-	--value-base: 16%;
-	--value-step: 3%;
-	--background-color1: hsl(var(--main-hue), var(--main-saturation), var(--value-base));
-	--background-color2: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (1 * var(--value-step))));
-	--background-color3: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (2 * var(--value-step))));
-	--background-color4: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (3 * var(--value-step))));
-    
-    --make-image-border: none;
-
-    --button-color: var(--accent-color);
-    --button-border: none;
-    
-    --input-border-size: 1px; 
-    --input-background-color: var(--background-color3);
-	--input-text-color: #ccc;
-	--input-border-color: var(--background-color4);
-}
-
-.theme-super-dark {
-    --main-hue: 222;
-	--main-saturation: 18%;
-	--value-base: 5%;
-	--value-step: 5%;
-	--background-color1: hsl(var(--main-hue), var(--main-saturation), var(--value-base));
-	--background-color2: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) + (1 * var(--value-step))));
-	--background-color3: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) + (2 * var(--value-step))));
-	--background-color4: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) + (3 * var(--value-step))));
-    
-    --make-image-border: none;
-
-    --button-color: var(--accent-color);
-    --button-border: none;
-    
-    --input-border-size: 0px; 
-    --input-background-color: var(--background-color3);
-	--input-text-color: #ccc;
-	--input-border-color: var(--background-color4);
-}
-
-.theme-wild {
-    --main-hue: 128;
-	--main-saturation: 18%;
-	--value-base: 20%;
-	--value-step: 5%;
-	--background-color1: hsl(var(--main-hue), var(--main-saturation), var(--value-base));
-	--background-color2: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (1 * var(--value-step))));
-	--background-color3: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (2 * var(--value-step))));
-	--background-color4: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (3 * var(--value-step))));
-    
-    --accent-hue: 212;
-    --make-image-border: none;
-
-    --button-color: var(--accent-color);
-    --button-border: none;
-    
-    --input-border-size: 1px; 
-    --input-background-color: hsl(222, var(--main-saturation), calc(var(--value-base) - (2 * var(--value-step))));
-	--input-text-color: red;
-	--input-border-color: green;
-}
--- a/ui/media/css/drawingboard.min.css
+++ b/ui/media/css/drawingboard.min.css
--- a/ui/media/js/drawingboard.min.js
+++ b/ui/media/js/drawingboard.min.js
--- a/ui/media/images/favicon-16x16.png
+++ b/ui/media/images/favicon-16x16.png
--- a/ui/media/images/favicon-32x32.png
+++ b/ui/media/images/favicon-32x32.png
--- a/ui/media/fonts/fa-brands-400.ttf
+++ b/ui/media/fonts/fa-brands-400.ttf
--- a/ui/media/fonts/fa-brands-400.woff2
+++ b/ui/media/fonts/fa-brands-400.woff2
--- a/ui/media/fonts/fa-regular-400.ttf
+++ b/ui/media/fonts/fa-regular-400.ttf
--- a/ui/media/fonts/fa-regular-400.woff2
+++ b/ui/media/fonts/fa-regular-400.woff2
--- a/ui/media/fonts/fa-solid-900.ttf
+++ b/ui/media/fonts/fa-solid-900.ttf
--- a/ui/media/fonts/fa-solid-900.woff2
+++ b/ui/media/fonts/fa-solid-900.woff2
--- a/ui/media/fonts/fa-v4compatibility.ttf
+++ b/ui/media/fonts/fa-v4compatibility.ttf
--- a/ui/media/fonts/fa-v4compatibility.woff2
+++ b/ui/media/fonts/fa-v4compatibility.woff2
--- a/ui/media/fonts/work-sans-v18-latin-600.woff
+++ b/ui/media/fonts/work-sans-v18-latin-600.woff
--- a/ui/media/fonts/work-sans-v18-latin-600.woff2
+++ b/ui/media/fonts/work-sans-v18-latin-600.woff2
--- a/ui/media/fonts/work-sans-v18-latin-700.woff
+++ b/ui/media/fonts/work-sans-v18-latin-700.woff
--- a/ui/media/fonts/work-sans-v18-latin-700.woff2
+++ b/ui/media/fonts/work-sans-v18-latin-700.woff2
--- a/ui/media/fonts/work-sans-v18-latin-800.woff
+++ b/ui/media/fonts/work-sans-v18-latin-800.woff
--- a/ui/media/fonts/work-sans-v18-latin-800.woff2
+++ b/ui/media/fonts/work-sans-v18-latin-800.woff2
--- a/ui/media/fonts/work-sans-v18-latin-regular.woff
+++ b/ui/media/fonts/work-sans-v18-latin-regular.woff
--- a/ui/media/fonts/work-sans-v18-latin-regular.woff2
+++ b/ui/media/fonts/work-sans-v18-latin-regular.woff2
--- a/ui/media/js/jquery-3.6.1.min.js
+++ b/ui/media/js/jquery-3.6.1.min.js
--- a/ui/media/js/auto-save.js
+++ b/ui/media/js/auto-save.js
@ -1,285 +0,0 @@
-// Saving settings
-let saveSettingsConfigTable = document.getElementById("save-settings-config-table")
-let saveSettingsConfigOverlay = document.getElementById("save-settings-config")
-let resetImageSettingsButton = document.getElementById("reset-image-settings")
-
-const SETTINGS_KEY = "user_settings_v2"
-
-const SETTINGS = {} // key=id. dict initialized in initSettings. { element, default, value, ignore }
-const SETTINGS_IDS_LIST = [
-    "prompt",
-    "seed",
-    "random_seed",
-    "num_outputs_total",
-    "num_outputs_parallel",
-    "stable_diffusion_model",
-    "sampler",
-    "width",
-    "height",
-    "num_inference_steps",
-    "guidance_scale",
-    "prompt_strength",
-    "output_format",
-    "negative_prompt",
-    "stream_image_progress",
-    "use_face_correction",
-    "use_upscale",
-    "show_only_filtered_image",
-    "upscale_model",
-    "preview-image",
-    "modifier-card-size-slider",
-    "theme",
-    "save_to_disk",
-    "diskPath",
-    "sound_toggle",
-    "turbo",
-    "use_cpu",
-    "use_full_precision",
-    "auto_save_settings"
-]
-
-const IGNORE_BY_DEFAULT = [
-    "prompt"
-]
-
-const SETTINGS_SECTIONS = [ // 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" }
-]
-
-async function initSettings() {
-    SETTINGS_IDS_LIST.forEach(id => {
-        var element = document.getElementById(id)
-        var label = document.querySelector(`label[for='${element.id}']`)
-        SETTINGS[id] = {
-            key: id,
-            element: element,
-            label: getSettingLabel(element),
-            default: getSetting(element),
-            value: getSetting(element),
-            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 => {
-        var name = section.name
-        var element = document.getElementById(section.id)
-        var children = Array.from(element.querySelectorAll(unsorted_settings_ids.map(id => `#${id}`).join(",")))
-        section.keys = []
-        children.forEach(e => {
-            section.keys.push(e.id)
-        })
-        unsorted_settings_ids = unsorted_settings_ids.filter(id => children.find(e => e.id == id) == undefined)
-    })
-    loadSettings()
-}
-
-function getSetting(element) {
-    if (typeof element === "string" || element instanceof String) {
-        element = SETTINGS[element].element
-    }
-    if (element.type == "checkbox") {
-        return element.checked
-    }
-    return element.value
-}
-function setSetting(element, value) {
-    if (typeof element === "string" || element instanceof String) {
-        element = SETTINGS[element].element
-    }
-    SETTINGS[element.id].value = value
-    if (getSetting(element) == value) {
-        return // no setting necessary
-    }
-    if (element.type == "checkbox") {
-        element.checked = value
-    }
-    else {
-        element.value = value
-    }
-    element.dispatchEvent(new Event("input"))
-    element.dispatchEvent(new Event("change"))
-}
-
-function saveSettings() {
-    var saved_settings = Object.values(SETTINGS).map(setting => {
-        return {
-            key: setting.key,
-            value: setting.value,
-            ignore: setting.ignore
-        }
-    })
-    localStorage.setItem(SETTINGS_KEY, JSON.stringify(saved_settings))
-}
-
-var CURRENTLY_LOADING_SETTINGS = false
-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) {
-            setSetting("auto_save_settings", false)
-            return
-        }
-        CURRENTLY_LOADING_SETTINGS = true
-        saved_settings.map(saved_setting => {
-            var setting = SETTINGS[saved_setting.key]
-            setting.ignore = saved_setting.ignore
-            if (!setting.ignore) {
-                setting.value = saved_setting.value
-                setSetting(setting.element, setting.value)
-            }
-        })
-        CURRENTLY_LOADING_SETTINGS = false
-    }
-    else {
-        CURRENTLY_LOADING_SETTINGS = true
-        tryLoadOldSettings();
-        CURRENTLY_LOADING_SETTINGS = false
-        saveSettings()
-    }
-}
-
-function loadDefaultSettingsSection(section_id) {
-    CURRENTLY_LOADING_SETTINGS = true
-    var section = SETTINGS_SECTIONS.find(s => s.id == section_id);
-    section.keys.forEach(key => {
-        var setting = SETTINGS[key];
-        setting.value = setting.default
-        setSetting(setting.element, setting.value)
-    })
-    CURRENTLY_LOADING_SETTINGS = false
-    saveSettings()
-}
-
-function settingChangeHandler(event) {
-    if (!CURRENTLY_LOADING_SETTINGS) {
-        var element = event.target
-        var value = getSetting(element)
-        if (value != SETTINGS[element.id].value) {
-            SETTINGS[element.id].value = value
-            saveSettings()
-        }
-    }
-}
-
-function getSettingLabel(element) {
-    var labelElement = document.querySelector(`label[for='${element.id}']`)
-    var label = labelElement?.innerText || element.id
-    var truncate_length = 30
-    if (label.includes(" (")) {
-        label = label.substring(0, label.indexOf(" ("))
-    }
-    if (label.length > truncate_length) {
-        label = label.substring(0, truncate_length - 3) + "..."
-    }
-    label = label.replace("➕", "")
-    label = label.replace("➖", "")
-    return label
-}
-
-function fillSaveSettingsConfigTable() {
-    saveSettingsConfigTable.textContent = ""
-    SETTINGS_SECTIONS.forEach(section => {
-        var section_row = `<tr><th>${section.name}</th><td></td></tr>`
-        saveSettingsConfigTable.insertAdjacentHTML("beforeend", section_row)
-        section.keys.forEach(key => {
-            var setting = SETTINGS[key]
-            var element = setting.element
-            var checkbox_id = `shouldsave_${element.id}`
-            var is_checked = setting.ignore ? "" : "checked"
-            var value = setting.value
-            var value_truncate_length = 30
-            if ((typeof value === "string" || value instanceof String) && value.length > value_truncate_length) {
-                value = value.substring(0, value_truncate_length - 3) + "..."
-            }
-            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 => {
-                setting.ignore = !checkbox.checked
-                saveSettings()
-            })
-        })
-    })
-}
-
-document.getElementById("save-settings-config-close-btn").addEventListener('click', () => {
-    saveSettingsConfigOverlay.style.display = 'none'
-})
-document.getElementById("configureSettingsSaveBtn").addEventListener('click', () => {
-    fillSaveSettingsConfigTable()
-    saveSettingsConfigOverlay.style.display = 'block'
-})
-saveSettingsConfigOverlay.addEventListener('click', (event) => {
-    if (event.target.id == saveSettingsConfigOverlay.id) {
-        saveSettingsConfigOverlay.style.display = 'none'
-    }
-})
-document.getElementById("save-settings-config-close-btn").addEventListener('click', () => {
-    saveSettingsConfigOverlay.style.display = 'none'
-})
-resetImageSettingsButton.addEventListener('click', event => {
-    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",
-        "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 => {
-            key = key in old_map ? old_map[key] : key
-            SETTINGS[key].ignore = !saved_settings.should_save[key]
-        });
-        Object.keys(saved_settings.values).forEach(key => {
-            key = key in old_map ? old_map[key] : key
-            var setting = SETTINGS[key]
-            if (!setting.ignore) {
-                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
-        "soundEnabled": "sound_toggle",
-        "saveToDisk": "save_to_disk",
-        "useCPU": "use_cpu",
-        "useFullPrecision": "use_full_precision",
-        "useTurboMode": "turbo",
-        "diskPath": "diskPath",
-        "useFaceCorrection": "use_face_correction",
-        "useUpscaling": "use_upscale",
-        "showOnlyFilteredImage": "show_only_filtered_image",
-        "streamImageProgress": "stream_image_progress",
-        "outputFormat": "output_format",
-        "autoSaveSettings": "auto_save_settings",
-    };
-    Object.keys(individual_settings_map).forEach(localStorageKey => {
-        var localStorageValue = localStorage.getItem(localStorageKey);
-        if (localStorageValue !== null) {
-            var setting = SETTINGS[individual_settings_map[localStorageKey]]
-            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);
-        }
-    })
-}
--- a/ui/media/js/image-modifiers.js
+++ b/ui/media/js/image-modifiers.js
@ -1,294 +0,0 @@
-let activeTags = []
-let modifiers = []
-let customModifiersGroupElement = undefined
-
-let editorModifierEntries = document.querySelector('#editor-modifiers-entries')
-let editorModifierTagsList = document.querySelector('#editor-inputs-tags-list')
-let editorTagsContainer = document.querySelector('#editor-inputs-tags-container')
-let modifierCardSizeSlider = document.querySelector('#modifier-card-size-slider')
-let previewImageField = document.querySelector('#preview-image')
-let modifierSettingsBtn = document.querySelector('#modifier-settings-btn')
-let modifierSettingsOverlay = document.querySelector('#modifier-settings-config')
-let customModifiersTextBox = document.querySelector('#custom-modifiers-input')
-let customModifierEntriesToolbar = document.querySelector('#editor-modifiers-entries-toolbar')
-
-const modifierThumbnailPath = 'media/modifier-thumbnails'
-const activeCardClass = 'modifier-card-active'
-const CUSTOM_MODIFIERS_KEY = "customModifiers"
-
-function createModifierCard(name, previews) {
-    const modifierCard = document.createElement('div')
-    modifierCard.className = 'modifier-card'
-    modifierCard.innerHTML = `
-    <div class="modifier-card-overlay"></div>
-    <div class="modifier-card-image-container">
-        <div class="modifier-card-image-overlay">+</div>
-        <p class="modifier-card-error-label"></p>
-        <img onerror="this.remove()" alt="Modifier Image" class="modifier-card-image">
-    </div>
-    <div class="modifier-card-container">
-        <div class="modifier-card-label"><p></p></div>
-    </div>`
-
-    const image = modifierCard.querySelector('.modifier-card-image')
-    const errorText =  modifierCard.querySelector('.modifier-card-error-label')
-    const label = modifierCard.querySelector('.modifier-card-label')
-
-    errorText.innerText = 'No Image'
-
-    if (typeof previews == 'object') {
-        image.src = previews[0]; // portrait
-        image.setAttribute('preview-type', 'portrait')
-    } else {
-        image.remove()
-    }
-
-    const maxLabelLength = 30
-    const nameWithoutBy = name.replace('by ', '')
-
-    if(nameWithoutBy.length <= maxLabelLength) {
-        label.querySelector('p').innerText = nameWithoutBy
-    } else {
-        const tooltipText = document.createElement('span')
-        tooltipText.className = 'tooltip-text'
-        tooltipText.innerText = name
-
-        label.classList.add('tooltip')
-        label.appendChild(tooltipText)
-
-        label.querySelector('p').innerText = nameWithoutBy.substring(0, maxLabelLength) + '...'
-    }
-
-    return modifierCard
-}
-
-function createModifierGroup(modifierGroup, initiallyExpanded) {
-    const title = modifierGroup.category
-    const modifiers = modifierGroup.modifiers
-
-    const titleEl = document.createElement('h5')
-    titleEl.className = 'collapsible'
-    titleEl.innerText = title
-
-    const modifiersEl = document.createElement('div')
-    modifiersEl.classList.add('collapsible-content', 'editor-modifiers-leaf')
-
-    if (initiallyExpanded === true) {
-        titleEl.className += ' active'
-        modifiersEl.style.display = 'block'
-    }
-
-    modifiers.forEach(modObj => {
-        const modifierName = modObj.modifier
-        const modifierPreviews = modObj?.previews?.map(preview => `${modifierThumbnailPath}/${preview.path}`)
-
-        const modifierCard = createModifierCard(modifierName, modifierPreviews)
-
-        if(typeof modifierCard == 'object') {
-            modifiersEl.appendChild(modifierCard)
-
-            modifierCard.addEventListener('click', () => {
-                if (activeTags.map(x => x.name).includes(modifierName)) {
-                    // remove modifier from active array
-                    activeTags = activeTags.filter(x => x.name != modifierName)
-                    modifierCard.classList.remove(activeCardClass)
-
-                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
-                } else {
-                    // add modifier to active array
-                    activeTags.push({
-                        'name': modifierName,
-                        'element': modifierCard.cloneNode(true),
-                        'originElement': modifierCard,
-                        'previews': modifierPreviews
-                    })
-
-                    modifierCard.classList.add(activeCardClass)
-
-                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
-                }
-
-                refreshTagsList()
-            })
-        }
-    })
-
-    let brk = document.createElement('br')
-    brk.style.clear = 'both'
-    modifiersEl.appendChild(brk)
-
-    let e = document.createElement('div')
-    e.appendChild(titleEl)
-    e.appendChild(modifiersEl)
-
-    editorModifierEntries.insertBefore(e, customModifierEntriesToolbar.nextSibling)
-
-    return e
-}
-
-async function loadModifiers() {
-    try {
-        let res = await fetch('/get/modifiers')
-        if (res.status === 200) {
-            res = await res.json()
-
-            modifiers = res; // update global variable
-
-            res.reverse()
-
-            res.forEach((modifierGroup, idx) => {
-                createModifierGroup(modifierGroup, idx === res.length - 1)
-            })
-
-            createCollapsibles(editorModifierEntries)
-        }
-    } catch (e) {
-        console.log('error fetching modifiers', e)
-    }
-
-    loadCustomModifiers()
-}
-
-function refreshTagsList() {
-    editorModifierTagsList.innerHTML = ''
-
-    if (activeTags.length == 0) {
-        editorTagsContainer.style.display = 'none'
-        return
-    } else {
-        editorTagsContainer.style.display = 'block'
-    }
-
-    activeTags.forEach((tag, index) => {
-        tag.element.querySelector('.modifier-card-image-overlay').innerText = '-'
-        tag.element.classList.add('modifier-card-tiny')
-
-        editorModifierTagsList.appendChild(tag.element)
-
-        tag.element.addEventListener('click', () => {
-            let idx = activeTags.indexOf(tag)
-
-            if (idx !== -1) {
-                activeTags[idx].originElement.classList.remove(activeCardClass)
-                activeTags[idx].originElement.querySelector('.modifier-card-image-overlay').innerText = '+'
-
-                activeTags.splice(idx, 1)
-                refreshTagsList()
-            }
-        })
-    })
-
-    let brk = document.createElement('br')
-    brk.style.clear = 'both'
-    editorModifierTagsList.appendChild(brk)
-}
-
-function changePreviewImages(val) {
-    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)))
-    
-    previewArr = previewArr.map(x => {
-        let obj = {}
-
-        x.forEach(preview => {
-            obj[preview.name] = preview.path
-        })
-        
-        return obj
-    })
-
-    previewImages.forEach(previewImage => {
-        const currentPreviewType = previewImage.getAttribute('preview-type')
-        const relativePreviewPath = previewImage.src.split(modifierThumbnailPath + '/').pop()
-
-        const previews = previewArr.find(preview => relativePreviewPath == preview[currentPreviewType])
-
-        if(typeof previews == 'object') {
-            let preview = null
-
-            if (val == 'portrait') {
-                preview = previews.portrait
-            }
-            else if (val == 'landscape') {
-                preview = previews.landscape
-            }
-
-            if(preview != null) {
-                previewImage.src = `${modifierThumbnailPath}/${preview}`
-                previewImage.setAttribute('preview-type', val)
-            }
-        }
-    })
-}
-
-function resizeModifierCards(val) {
-    const cardSizePrefix = 'modifier-card-size_'
-    const modifierCardClass = 'modifier-card'
-
-    const modifierCards = document.querySelectorAll(`.${modifierCardClass}`)
-    const cardSize = n => `${cardSizePrefix}${n}`
-
-    modifierCards.forEach(card => {
-        // remove existing size classes
-        const classes = card.className.split(' ').filter(c => !c.startsWith(cardSizePrefix))
-        card.className = classes.join(' ').trim()
-
-        if(val != 0) {
-            card.classList.add(cardSize(val))
-        }
-    })
-}
-
-modifierCardSizeSlider.onchange = () => resizeModifierCards(modifierCardSizeSlider.value)
-previewImageField.onchange = () => changePreviewImages(previewImageField.value)
-
-modifierSettingsBtn.addEventListener('click', function() {
-    modifierSettingsOverlay.style.display = 'block'
-})
-document.getElementById("modifier-settings-config-close-btn").addEventListener('click', () => {
-    modifierSettingsOverlay.style.display = 'none'
-})
-modifierSettingsOverlay.addEventListener('click', (event) => {
-    if (event.target.id == modifierSettingsOverlay.id) {
-        modifierSettingsOverlay.style.display = 'none'
-    }
-})
-
-function saveCustomModifiers() {
-    localStorage.setItem(CUSTOM_MODIFIERS_KEY, customModifiersTextBox.value.trim())
-
-    loadCustomModifiers()
-}
-
-function loadCustomModifiers() {
-    let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, '')
-    customModifiersTextBox.value = customModifiers
-
-    if (customModifiersGroupElement !== undefined) {
-        customModifiersGroupElement.remove()
-    }
-
-    if (customModifiers && customModifiers.trim() !== '') {
-        customModifiers = customModifiers.split('\n')
-        customModifiers = customModifiers.filter(m => m.trim() !== '')
-        customModifiers = customModifiers.map(function(m) {
-            return {
-                "modifier": m
-            }
-        })
-
-        let customGroup = {
-            'category': 'Custom Modifiers',
-            'modifiers': customModifiers
-        }
-
-        customModifiersGroupElement = createModifierGroup(customGroup, true)
-
-        createCollapsibles(customModifiersGroupElement)
-    }
-}
-
-customModifiersTextBox.addEventListener('change', saveCustomModifiers)
--- a/ui/media/js/inpainting-editor.js
+++ b/ui/media/js/inpainting-editor.js
@ -1,41 +0,0 @@
-const INPAINTING_EDITOR_SIZE = 450
-
-let inpaintingEditorContainer = document.querySelector('#inpaintingEditor')
-let inpaintingEditor = new DrawingBoard.Board('inpaintingEditor', {
-    color: "#ffffff",
-    background: false,
-    size: 30,
-    webStorage: false,
-    controls: [{'DrawingMode': {'filler': false}}, 'Size', 'Navigation']
-})
-let inpaintingEditorCanvasBackground = document.querySelector('.drawing-board-canvas-wrapper')
-
-function resizeInpaintingEditor(widthValue, heightValue) {
-    if (widthValue === heightValue) {
-        widthValue = INPAINTING_EDITOR_SIZE
-        heightValue = INPAINTING_EDITOR_SIZE
-    } else if (widthValue > heightValue) {
-        heightValue = (heightValue / widthValue) * INPAINTING_EDITOR_SIZE
-        widthValue = INPAINTING_EDITOR_SIZE
-    } else {
-        widthValue = (widthValue / heightValue) * INPAINTING_EDITOR_SIZE
-        heightValue = INPAINTING_EDITOR_SIZE
-    }
-    if (inpaintingEditor.opts.aspectRatio === (widthValue / heightValue).toFixed(3)) {
-        // Same ratio, don't reset the canvas.
-        return
-    }
-    inpaintingEditor.opts.aspectRatio = (widthValue / heightValue).toFixed(3)
-
-    inpaintingEditorContainer.style.width = widthValue + 'px'
-    inpaintingEditorContainer.style.height = heightValue + 'px'
-    inpaintingEditor.opts.enlargeYourContainer = true
-
-    inpaintingEditor.opts.size = inpaintingEditor.ctx.lineWidth
-    inpaintingEditor.resize()
-
-    inpaintingEditor.ctx.lineCap = "round"
-    inpaintingEditor.ctx.lineJoin = "round"
-    inpaintingEditor.ctx.lineWidth = inpaintingEditor.opts.size
-    inpaintingEditor.setColor(inpaintingEditor.opts.color)
-}
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
cmdr2	7219c55dcd	Correct PATH	2022-10-10 21:07:30 +05:30
cmdr2	9aa46f92dc	Check for uvicorn and set the PATH env variable before checking	2022-10-10 21:04:23 +05:30
cmdr2	199fa4a0f5	Don't check for ldm, since it doesn't register in the pkgutils	2022-10-10 20:59:43 +05:30
cmdr2	c91348dae7	Print traceback when printing a fatal message	2022-10-10 20:20:53 +05:30
cmdr2	b47ff071da	4.6.0.66 opencv-python for mac	2022-10-10 20:17:05 +05:30
cmdr2	0d921eacb6	4.6.0.66 opencv-python	2022-10-10 20:16:29 +05:30
cmdr2	e1718c45e1	Use opencv-python==4.6.0	2022-10-10 20:15:30 +05:30
cmdr2	1c5352203d	Try moving the environment.yaml to the sd folder before installing	2022-10-10 20:12:02 +05:30
cmdr2	e521b350ca	Activate the project env dir in the dev console	2022-10-10 20:06:26 +05:30
cmdr2	e9ddef6992	Typo while checking the OS name	2022-10-10 20:02:19 +05:30
cmdr2	1d4a835e4a	Run the SD install command inside the SD repo folder	2022-10-10 19:58:56 +05:30
cmdr2	3cf7a984fd	Convert bytes to str in the output of run	2022-10-10 19:50:43 +05:30
cmdr2	a6913dfe29	Rename dev console scripts	2022-10-10 19:38:41 +05:30
cmdr2	1f7c7909c2	Initial port of the entire installation process; Switched 0.0.0.0 to localhost default; Skip color correction in GFPGAN via a patch	2022-10-10 19:35:33 +05:30
cmdr2	0e15c48d04	Just run the symlinks	2022-10-04 20:00:59 +05:30
cmdr2	a3e5931fd6	Project root check in dev script	2022-10-04 19:57:35 +05:30
cmdr2	0e3766838f	Typo	2022-10-04 19:52:11 +05:30
cmdr2	f17a00092a	Don't use git clone's exit status; Remove package overrides in env yaml	2022-10-04 19:48:34 +05:30
cmdr2	724e101edc	Merge branch 'installer_new' of github.com:cmdr2/stable-diffusion-ui into installer_new	2022-10-04 19:21:23 +05:30
cmdr2	0b1968c017	Task to install Stable Diffusion's environment	2022-10-04 19:21:14 +05:30
cmdr2	be3a52d703	Make the start script executable	2022-10-04 16:34:59 +05:30
cmdr2	7468aa5a4f	Re-organize the script files, to allow overwriting the main script file with an auto-update without freaking out the shell	2022-10-04 16:33:54 +05:30
cmdr2	889fd98577	Newline doesn't work in linux echo	2022-10-04 16:21:57 +05:30
cmdr2	9de91d3021	Open bash conditionally in the dev console on unix	2022-10-04 16:06:14 +05:30
cmdr2	f20014660d	Enter to continue on linux	2022-10-04 15:46:31 +05:30
cmdr2	add533d0da	Incorrect newline character	2022-10-04 15:45:52 +05:30
cmdr2	a5f5113e9a	Typo in bash case	2022-10-04 15:44:15 +05:30
cmdr2	c72e1f0943	Execute permissions for the unix scripts	2022-10-04 15:39:33 +05:30
cmdr2	e282b2864f	Installer v2.5 for {linux,mac}_{x64,arm64}; Include the micromamba binaries for them	2022-10-04 15:33:36 +05:30
cmdr2	abcab9bce5	Preserve an error log if the installation failed; Include the starting timestamp in the log	2022-10-04 14:48:16 +05:30
cmdr2	2174788514	Use git fetch for getting the latest SD commits	2022-10-04 14:36:20 +05:30
cmdr2	ecda0d5b05	Pull before checking out a commit for SD	2022-10-04 14:31:40 +05:30
cmdr2	55bd8a34d7	Typo in detachedHead suppress command	2022-10-04 13:53:14 +05:30
cmdr2	65c667cc37	Suppress detachedHead warnings	2022-10-04 13:52:01 +05:30
cmdr2	582b594789	Developer console which shows an activated mamba environment; A script to enable developer mode and auto-create the symlinks	2022-10-04 13:48:56 +05:30
cmdr2	19a868b2df	Installer v2.5 now checks out stable diffusion and applies patches	2022-10-04 12:27:36 +05:30
cmdr2	9e07228a90	Revert update	2022-10-03 23:31:46 +05:30
cmdr2	85f8141968	Update test	2022-10-03 23:31:14 +05:30
cmdr2	b9646a8a94	Unnecessary quotes	2022-10-03 23:30:00 +05:30
cmdr2	3a7e4390eb	Start cmd	2022-10-03 23:26:15 +05:30
cmdr2	d07279c266	Installer files for v2.5	2022-10-03 23:05:10 +05:30
cmdr2	c10411c506	Initial files for installer v2.5	2022-10-03 22:58:36 +05:30