Merge branch 'beta' of github.com:cmdr2/stable-diffusion-ui into beta

Add a debounce delay to allow mobile to bouble tap.

.gitignore

@@ -1,3 +1,5 @@
 __pycache__
+installer
+installer.tar
 dist
 .idea/*

3rd-PARTY-LICENSES

@@ -0,0 +1,27 @@
+jquery-confirm
+==============
+https://craftpip.github.io/jquery-confirm/
+
+jquery-confirm is licensed under the MIT license:
+
+  The MIT License (MIT)
+
+  Copyright (c) 2019 Boniface Pereira
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.

CHANGES.md

@@ -0,0 +1,66 @@
+# What's new?
+
+## v2.4
+### Major Changes
+- **Allow reordering the task queue** (by dragging and dropping tasks). Thanks @madrang
+- **Automatic scanning for malicious model files** - using `picklescan`, and support for `safetensor` model format. Thanks @JeLuf
+- **Image Editor** - for drawing simple images for guiding the AI. Thanks @mdiller
+- **Use pre-trained hypernetworks** - for improving the quality of images. Thanks @C0bra5
+- **Support for custom VAE models**. You can place your VAE files in the `models/vae` folder, and refresh the browser page to use them. More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder
+- **Experimental support for multiple GPUs!** It should work automatically. Just open one browser tab per GPU, and spread your tasks across your GPUs. For e.g. open our UI in two browser tabs if you have two GPUs. You can customize which GPUs it should use in the "Settings" tab, otherwise let it automatically pick the best GPUs. Thanks @madrang . More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/Run-on-Multiple-GPUs
+- **Cleaner UI design** - Show settings and help in new tabs, instead of dropdown popups (which were buggy). Thanks @mdiller
+- **Progress bar.** Thanks @mdiller
+- **Custom Image Modifiers** - You can now save your custom image modifiers! Your saved modifiers can include special characters like `{}, (), [], |`
+- Drag and Drop **text files generated from previously saved images**, and copy settings to clipboard. Thanks @madrang
+- Paste settings from clipboard. Thanks @JeLuf
+- Bug fixes to reduce the chances of tasks crashing during long multi-hour runs (chrome can put long-running background tabs to sleep). Thanks @JeLuf and @madrang
+- **Improved documentation.** Thanks @JeLuf and @jsuelwald
+- Improved the codebase for dealing with system settings and UI settings. Thanks @mdiller
+- Help instructions next to some setttings, and in the tab
+- Show system info in the settings tab
+- Keyboard shortcut: Ctrl+Enter to start a task
+- Configuration to prevent the browser from opening on startup
+- Lots of minor bug fixes
+- A `What's New?` tab in the UI
+- Ask for a confimation before clearing the results pane or stopping a render task. The dialog can be skipped by holding down the shift key while clicking on the button.
+- Show the network addresses of the server in the systems setting dialog
+- Support loading models in the safetensor format, for improved safety
+
+### Detailed changelog
+* 2.4.21 - 23 Dec 2022 - Speed up image creation, by removing a delay (regression) of 4-5 seconds between clicking the `Make Image` button and calling the server.
+* 2.4.20 - 22 Dec 2022 - `Pause All` button to pause all the pending tasks. Thanks @JeLuf
+* 2.4.20 - 22 Dec 2022 - `Undo`/`Redo` buttons in the image editor. Thanks @JeLuf
+* 2.4.20 - 22 Dec 2022 - Drag handle to reorder the tasks. This fixed a bug where the metadata was no longer selectable (for copying). Thanks @JeLuf
+* 2.4.19 - 17 Dec 2022 - Add Undo/Redo buttons in the Image Editor. Thanks @JeLuf
+* 2.4.19 - 10 Dec 2022 - Show init img in task list
+* 2.4.19 - 7 Dec 2022 - Use pre-trained hypernetworks while generating images. Thanks @C0bra5
+* 2.4.19 - 6 Dec 2022 - Allow processing new tasks first. Thanks @madrang
+* 2.4.19 - 6 Dec 2022 - Allow reordering the task queue (by dragging tasks). Thanks @madrang
+* 2.4.19 - 6 Dec 2022 - Re-organize the code, to make it easier to write user plugins. Thanks @madrang
+* 2.4.18 - 5 Dec 2022 - Make JPEG Output quality user controllable. Thanks @JeLuf
+* 2.4.18 - 5 Dec 2022 - Support loading models in the safetensor format, for improved safety. Thanks @JeLuf
+* 2.4.18 - 1 Dec 2022 - Image Editor, for drawing simple images for guiding the AI. Thanks @mdiller
+* 2.4.18 - 1 Dec 2022 - Disable an image modifier temporarily by right-clicking it. Thanks @patriceac
+* 2.4.17 - 30 Nov 2022 - Scroll to generated image. Thanks @patriceac
+* 2.4.17 - 30 Nov 2022 - Show the network addresses of the server in the systems setting dialog. Thanks @JeLuf
+* 2.4.17 - 30 Nov 2022 - Fix a bug where GFPGAN wouldn't work properly when multiple GPUs tried to run it at the same time. Thanks @madrang
+* 2.4.17 - 30 Nov 2022 - Confirm before stopping or clearing all the tasks. Thanks @JeLuf
+* 2.4.16 - 29 Nov 2022 - Bug fixes for SD 2.0 - remove the need for patching, default to SD 1.4 model if trying to load an SD2 model in SD1.4.
+* 2.4.15 - 25 Nov 2022 - Experimental support for SD 2.0. Uses lots of memory, not optimized, probably GPU-only.
+* 2.4.14 - 22 Nov 2022 - Change the backend to a custom fork of Stable Diffusion
+* 2.4.13 - 21 Nov 2022 - Change the modifier weight via mouse wheel, drag to reorder selected modifiers, and some more modifier-related fixes. Thanks @patriceac
+* 2.4.12 - 21 Nov 2022 - Another fix for improving how long images take to generate. Reduces the time taken for an enqueued task to start processing.
+* 2.4.11 - 21 Nov 2022 - Installer improvements: avoid crashing if the username contains a space or special characters, allow moving/renaming the folder after installation on Windows, whitespace fix on git apply
+* 2.4.11 - 21 Nov 2022 - Validate inputs before submitting the Image request
+* 2.4.11 - 19 Nov 2022 - New system settings to manage the network config (port number and whether to only listen on localhost)
+* 2.4.11 - 19 Nov 2022 - Address a regression in how long images take to generate. Use the previous code for moving a model to CPU. This improves things by a second or two per image, but we still have a regression (investigating).
+* 2.4.10 - 18 Nov 2022 - Textarea for negative prompts. Thanks @JeLuf
+* 2.4.10 - 18 Nov 2022 - Improved design for Settings, and rounded toggle buttons instead of checkboxes for a more modern look. Thanks @mdiller
+* 2.4.9 - 18 Nov 2022 - Add Picklescan - a scanner for malicious model files. If it finds a malicious file, it will halt the web application and alert the user. Thanks @JeLuf
+* 2.4.8 - 18 Nov 2022 - A `Use these settings` button to use the settings from a previously generated image task. Thanks @patriceac
+* 2.4.7 - 18 Nov 2022 - Don't crash if a VAE file fails to load
+* 2.4.7 - 17 Nov 2022 - Fix a bug where Face Correction (GFPGAN) would fail on cuda:N (i.e. GPUs other than cuda:0), as well as fail on CPU if the system had an incompatible GPU.
+* 2.4.6 - 16 Nov 2022 - Fix a regression in VRAM usage during startup, which caused 'Out of Memory' errors when starting on GPUs with 4gb (or less) VRAM
+* 2.4.5 - 16 Nov 2022 - Add checkbox for "Open browser on startup".
+* 2.4.5 - 16 Nov 2022 - Add a directory for core plugins that ship with Stable Diffusion UI by default.
+* 2.4.5 - 16 Nov 2022 - Add a "What's New?" tab as a core plugin, which fetches the contents of CHANGES.md from the app's release branch.

CONTRIBUTING.md

@@ -6,19 +6,18 @@ Thanks
 
 # For developers:
 
-If you would like to contribute to this project, there is a discord for dicussion:
+If you would like to contribute to this project, there is a discord for discussion:
 [![Discord Server](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.com/invite/u9yhsFmEkB)
 
 ## Development environment for UI (frontend and server) changes
 This is in-flux, but one way to get a development environment running for editing the UI of this project is:
 (swap `.sh` or `.bat` in instructions depending on your environment, and be sure to adjust any paths to match where you're working)
 
-1) `git clone` the repository, e.g. to `/projects/stable-diffusion-ui-repo`
-2) Download the pre-built end user archive from the link on github, and extract it, e.g. to `/projects/stable-diffusion-ui-archive`
-3) `cd /projects/stable-diffusion-ui-archive` and run the script to set up and start the project, e.g. `start.sh`
-4) Check you can view and generate images on `localhost:9000`
-5) Close the server, and edit `/projects/stable-diffusion-ui-archive/scripts/on_env_start.sh`
-6) Comment out the lines near the bottom that copies the `files/ui` folder, e.g:
+1) Install the project to a new location using the [usual installation process](https://github.com/cmdr2/stable-diffusion-ui#installation), e.g. to `/projects/stable-diffusion-ui-archive`
+2) Start the newly installed project, and check that you can view and generate images on `localhost:9000`
+3) Next, please clone the project repository using `git clone` (e.g. to `/projects/stable-diffusion-ui-repo`)
+4) Close the server (started in step 2), and edit `/projects/stable-diffusion-ui-archive/scripts/on_env_start.sh` (or `on_env_start.bat`)
+5) Comment out the lines near the bottom that copies the `files/ui` folder, e.g:
   
   for `.sh`
 ```
@@ -33,23 +32,20 @@ REM @xcopy sd-ui-files\ui ui /s /i /Y
 REM @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
 REM @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
 ``` 
-7) Comment out the line at the top of `/projects/stable-diffusion-ui-archive/scripts/on_sd_start.sh` that copies `on_env_start`. For e.g. `@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y`
+6) Next, comment out the line at the top of `/projects/stable-diffusion-ui-archive/scripts/on_sd_start.sh` (or `on_sd_start.bat`) that copies `on_env_start`. For e.g. `@rem @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y`
 8) Delete the current `ui` folder at `/projects/stable-diffusion-ui-archive/ui`
 9) Now make a symlink between the repository clone (where you will be making changes) and this archive (where you will be running stable diffusion):
 `ln -s /projects/stable-diffusion-ui-repo/ui /projects/stable-diffusion-ui-archive/ui`
 or for Windows
-`mklink /D \projects\stable-diffusion-ui-archive\ui \projects\stable-diffusion-ui-repo\ui` (link name first, source repo dir second)
-9) Run the archive again `start.sh` and ensure you can still use the UI.
+`mklink /J \projects\stable-diffusion-ui-archive\ui \projects\stable-diffusion-ui-repo\ui` (link name first, source repo dir second)
+9) Run the project again (like in step 2) and ensure you can still use the UI.
 10) Congrats, now any changes you make in your repo `ui` folder are linked to this running archive of the app and can be previewed in the browser.
+11) Please update CHANGES.md in your pull requests.
 
 Check the `ui/frontend/build/README.md` for instructions on running and building the React code.
 
 ## Development environment for Installer changes
 Build the Windows installer using Windows, and the Linux installer using Linux. Don't mix the two, and don't use WSL. An Ubuntu VM is fine for building the Linux installer on a Windows host.
 
-1. Install Miniconda 3 or Anaconda.
-2. Install `conda install -c conda-forge -y conda-pack`
-3. Open the Anaconda Prompt. Do not use WSL if you're building for Windows.
-4. Run `build.bat` or `./build.sh` depending on whether you're in Windows or Linux.
-5. Compress the `stable-diffusion-ui` folder created inside the `dist` folder. Make a `zip` for Windows, and `tar.xz` for Linux (smaller files, and Linux users already have tar).
-6. Make a new GitHub release and upload the Windows and Linux installer builds.
+1. Run `build.bat` or `./build.sh` depending on whether you're in Windows or Linux.
+2. Make a new GitHub release and upload the Windows and Linux installer builds created inside the `dist` folder.

Developer Console.cmd

@@ -1,15 +0,0 @@
-@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

How to install and run.txt

@@ -0,0 +1,24 @@
+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)

NSIS/README.md

@@ -0,0 +1 @@
+Scripts to be used with the Nullsoft Scriptable Installation System

NSIS/sdui.nsi

@@ -0,0 +1,265 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+Target x86-unicode
+Unicode True
+!AddPluginDir /x86-unicode "."
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "Stable Diffusion UI"
+!define PRODUCT_VERSION "Installer 2.35"
+!define PRODUCT_PUBLISHER "cmdr2 and contributors"
+!define PRODUCT_WEB_SITE "https://stable-diffusion-ui.github.io"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Cmdr2\App Paths\installer.exe"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+!include "LogicLib.nsh"
+!include "nsDialogs.nsh"
+
+Var Dialog
+Var Label
+Var Button
+
+Var InstDirLen
+Var LongPathsEnabled
+Var AccountType
+
+;---------------------------------------------------------------------------------------------------------
+; This function returns the number of spaces in a string.
+; The string is passed on the stack (using Push $STRING)
+; The result is also returned on the stack and can be consumed with Pop $var
+; https://nsis.sourceforge.io/Check_for_spaces_in_a_directory_path
+Function CheckForSpaces
+  Exch $R0
+  Push $R1
+  Push $R2
+  Push $R3
+  StrCpy $R1 -1
+  StrCpy $R3 $R0
+  StrCpy $R0 0
+  loop:
+    StrCpy $R2 $R3 1 $R1
+    IntOp $R1 $R1 - 1
+    StrCmp $R2 "" done
+    StrCmp $R2 " " 0 loop
+    IntOp $R0 $R0 + 1
+  Goto loop
+  done:
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+;---------------------------------------------------------------------------------------------------------
+; The function DirectoryLeave is called after the user chose the installation directory.
+; If it calls "abort", the user is sent back to choose a different directory.
+Function DirectoryLeave
+   ; check whether the installation directory path is longer than 30 characters.
+   ; If yes, we suggest to the user to enable long filename support
+   ;----------------------------------------------------------------------------
+   StrLen $InstDirLen "$INSTDIR"
+
+   ; Check whether the registry key that allows for >260 characters in a path name is set
+   ReadRegStr $LongPathsEnabled HKLM "SYSTEM\CurrentControlSet\Control\FileSystem" "LongPathsEnabled"
+
+   ${If} $InstDirLen > 30
+   ${AndIf} $LongPathsEnabled == "0"
+      ; Check whether we're in the Admin group
+      UserInfo::GetAccountType
+      Pop $AccountType
+
+      ${If} $AccountType == "Admin"
+      ${AndIf} ${Cmd} `MessageBox MB_YESNO|MB_ICONQUESTION 'The path name is too long. $\n$\nYou can either enable long file name support in Windows,$\nor you can go back and choose a different path.$\n$\nFor details see: shorturl.at/auBD1$\n$\nEnable long path name support in Windows?' IDYES`
+          ; Enable long path names
+          WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Control\FileSystem" "LongPathsEnabled" 1
+      ${Else}
+          MessageBox MB_OK|MB_ICONEXCLAMATION "Installation path name too long. The installation path must not have more than 30 characters."
+          abort
+      ${EndIf}
+   ${EndIf}
+   
+   ; Check for spaces in the installation directory path.
+   ; ----------------------------------------------------
+
+   ; $R0 = CheckForSpaces( $INSTDIR )
+   Push $INSTDIR # Input string (install path).
+     Call CheckForSpaces
+   Pop $R0 # The function returns the number of spaces found in the input string.
+
+   ; Check if any spaces exist in $INSTDIR.
+   ${If} $R0 != 0
+     ; Plural if more than 1 space in $INSTDIR.
+     ; If $R0 == 1: $R1 = ""; else: $R1 = "s"
+     StrCmp $R0 1 0 +3
+       StrCpy $R1 ""
+     Goto +2
+       StrCpy $R1 "s"
+
+     ; Show message box then take the user back to the Directory page.
+     MessageBox MB_OK|MB_ICONEXCLAMATION "Error: The Installaton directory \
+     has $R0 space character$R1.$\nPlease choose an installation directory without space characters."
+     Abort
+   ${EndIf}
+   
+   ; Check for NTFS filesystem. Installations on FAT fail.
+   ; -----------------------------------------------------
+   StrCpy $5 $INSTDIR 3
+   System::Call 'Kernel32::GetVolumeInformation(t "$5",t,i ${NSIS_MAX_STRLEN},*i,*i,*i,t.r1,i ${NSIS_MAX_STRLEN})i.r0'
+   ${If} $0 <> 0
+   ${AndIf} $1 == "NTFS"
+       MessageBox mb_ok "$5 has filesystem type '$1'.$\nOnly NTFS filesystems are supported.$\nPlease choose a different drive."
+       Abort
+   ${EndIf}
+
+FunctionEnd
+
+
+;---------------------------------------------------------------------------------------------------------
+; Open the MS download page in a browser and enable the [Next] button
+Function MSMediaFeaturepack
+    ExecShell "open" "https://www.microsoft.com/en-us/software-download/mediafeaturepack"
+
+    GetDlgItem $0 $HWNDPARENT 1
+    EnableWindow $0 1
+FunctionEnd
+
+;---------------------------------------------------------------------------------------------------------
+; Install the MS Media Feature Pack, if it is missing (e.g. on Windows 10 N)
+Function MediaPackDialog
+    !insertmacro MUI_HEADER_TEXT "Windows Media Feature Pack" "Required software module is missing"
+
+    ; Skip this dialog if mf.dll is installed
+    ${If} ${FileExists} "$WINDIR\system32\mf.dll"
+        Abort
+    ${EndIf}
+    
+    nsDialogs::Create 1018
+    Pop $Dialog
+
+    ${If} $Dialog == error
+	Abort
+    ${EndIf}
+
+    ${NSD_CreateLabel} 0 0 100% 48u "The Windows Media Feature Pack is missing on this computer. It is required for the Stable Diffusion UI.$\nYou can continue the installation after installing the Windows Media Feature Pack."
+    Pop $Label
+ 	
+    ${NSD_CreateButton} 10% 49u 80% 12u "Download Meda Feature Pack from Microsoft"
+    Pop $Button
+
+    GetFunctionAddress $0 MSMediaFeaturePack
+    nsDialogs::OnClick $Button $0
+    GetDlgItem $0 $HWNDPARENT 1
+    EnableWindow $0 0
+    nsDialogs::Show
+FunctionEnd
+
+;---------------------------------------------------------------------------------------------------------
+; MUI Settings
+;---------------------------------------------------------------------------------------------------------
+!define MUI_ABORTWARNING
+!define MUI_ICON "sd.ico"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "astro.bmp"
+
+; Welcome page
+!define MUI_WELCOMEPAGE_TEXT "This installer will guide you through the installation of Stable Diffusion UI.$\n$\n\
+Click Next to continue."
+!insertmacro MUI_PAGE_WELCOME
+Page custom MediaPackDialog
+
+; License page
+!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "..\CreativeML Open RAIL-M License"
+; Directory page
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE "DirectoryLeave"
+!insertmacro MUI_PAGE_DIRECTORY
+
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES 
+
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\Start Stable Diffusion UI.cmd"
+!insertmacro MUI_PAGE_FINISH
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+;---------------------------------------------------------------------------------------------------------
+; MUI end
+;---------------------------------------------------------------------------------------------------------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "Install Stable Diffusion UI.exe"
+InstallDir "C:\Stable-Diffusion-UI\"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+
+;---------------------------------------------------------------------------------------------------------
+; List of files to be installed
+Section "MainSection" SEC01
+  SetOutPath "$INSTDIR"
+  File "..\CreativeML Open RAIL-M License"
+  File "..\How to install and run.txt"
+  File "..\LICENSE"
+  File "..\Start Stable Diffusion UI.cmd"
+  SetOutPath "$INSTDIR\scripts"
+  File "..\scripts\bootstrap.bat"
+  File "..\scripts\install_status.txt"
+  File "..\scripts\on_env_start.bat"
+  File "C:\windows\system32\curl.exe"
+  CreateDirectory "$INSTDIR\profile"
+  CreateDirectory "$SMPROGRAMS\Stable Diffusion UI"
+  CreateShortCut "$SMPROGRAMS\Stable Diffusion UI\Start Stable Diffusion UI.lnk" "$INSTDIR\Start Stable Diffusion UI.cmd"
+SectionEnd
+
+;---------------------------------------------------------------------------------------------------------
+; Our installer only needs 25 KB, but once it has run, we need 25 GB
+; So we need to overwrite the automatically detected space requirements.
+; https://nsis.sourceforge.io/Docs/Chapter4.html#4.9.13.7
+; The example in section 4.9.13.7 seems to be wrong: the number
+; needs to be provided in Kilobytes.
+Function .onInit
+   ; Set required size of section 'SEC01' to 25 Gigabytes
+   SectionSetSize ${SEC01} 26214400
+  
+  
+   ; Check system meory size. We need at least 8GB
+   ; ----------------------------------------------------
+
+   ; allocate a few bytes of memory
+   System::Alloc 64
+   Pop $1
+
+   ; Retrieve HW info from the Windows Kernel
+   System::Call "*$1(i64)"
+   System::Call "Kernel32::GlobalMemoryStatusEx(i r1)"
+   ; unpack the data into $R2 - $R10
+   System::Call "*$1(i.r2, i.r3, l.r4, l.r5, l.r6, l.r7, l.r8, l.r9, l.r10)"
+
+   # free up the memory
+   System::Free $1
+
+   ; Result mapping:
+   ; "Structure size: $2 bytes"
+   ; "Memory load: $3%"
+   ; "Total physical memory: $4 bytes"
+   ; "Free physical memory: $5 bytes"
+   ; "Total page file: $6 bytes"
+   ; "Free page file: $7 bytes"
+   ; "Total virtual: $8 bytes"
+   ; "Free virtual: $9 bytes"
+
+   ; Mem size in MB
+   System::Int64Op $4 / 1048576
+   Pop $4
+
+   ${If} $4 < "8000"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Warning!$\n$\nYour system has less than 8GB of memory (RAM).$\n$\n\
+You can still try to install Stable Diffusion UI,$\nbut it might have problems to start, or run$\nvery slowly."
+   ${EndIf}
+  
+FunctionEnd
+
+
+;Section -Post
+;  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\installer.exe"
+;SectionEnd

README BEFORE YOU RUN THIS.txt

@@ -0,0 +1,8 @@
+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

README.md

@@ -1,107 +1,140 @@
-# 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.
+# Stable Diffusion UI
+### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community.
+
+[![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](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting)
+
+### New: 
+Experimental support for Stable Diffusion 2.0 is available in beta!
+
+----
+
+# Step 1: Download and prepare the installer
+Click the download button for your operating system:
 
 <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>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
 </p>
 
-[![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)
+## On Windows:
+1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
+2. Move the `stable-diffusion-ui` folder to your `C:` drive (or any other drive like `D:`, at the top root level). `C:\stable-diffusion-ui` or `D:\stable-diffusion-ui` as examples. This will avoid a common problem with Windows (file path length limits).
+## On Linux:
+1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
+2. Open a terminal window, and navigate to the `stable-diffusion-ui` directory.
 
-️‍🔥🎉 **New!** Use Custom Weights, Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
+# Step 2: Run the program
+## On Windows: 
+Double-click `Start Stable Diffusion UI.cmd`.
+If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`.
+## On Linux: 
+Run `./start.sh` (or `bash start.sh`) in a terminal.
 
-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.
+The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance.
 
-# Features in the new v2 Version:
-- **No Dependencies or Technical Knowledge Required**: 1-click install for Windows 10/11 and Linux. *No dependencies*, no need for WSL or Docker or Conda or technical setup. Just download and run!
-- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
-- **In-Painting**
-- **Live Preview**: See the image as the AI is drawing it
-- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
-- **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*.
-- **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
-- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
-- **New UI**: with cleaner design
-- **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*
-- **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
-- **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
-- **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM!
-
-![Screenshot 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)
-
-
-# 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. 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 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).
-
-2. **Extract**:
-  - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).
-  - For Linux: After extracting the .tar.xz file, please open a terminal, and go to the `stable-diffusion-ui` directory.
-
-3. **Run**:
-  - For Windows: `Start Stable Diffusion UI.cmd` by double-clicking it.
-  - For Linux: In the terminal, run `./start.sh` (or `bash start.sh`)
-
-This will automatically install Stable Diffusion, set it up, and start the interface. No additional steps are needed.
+# Step 3: There is no Step 3. It's that simple!
 
 **To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages.
 
+----
 
-# 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.
+# Easy for new users, powerful features for advanced users
+## Features:
 
-## 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.
+### User experience
+- **Hassle-free installation**: Does not require technical knowledge, does not require pre-installed software. Just download and run!
+- **Clutter-free UI**: A friendly and simple UI, while providing a lot of powerful features.
 
-## 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.
+### Image generation
+- **Supports**: "*Text to Image*" and "*Image to Image*".
+- **In-Painting**: Specify areas of your image to paint into.
+- **Simple Drawing Tool**: Draw basic images to guide the AI, without needing an external drawing program.
+- **Face Correction (GFPGAN)**
+- **Upscaling (RealESRGAN)**
+- **Loopback**: Use the output image as the input image for the next img2img task.
+- **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**: 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.
+- **1-click Upscale/Face Correction**: Upscale or correct an image after it has been generated.
+- **Make Similar Images**: Click to generate multiple variations of a generated image.
+- **NSFW Setting**: A setting in the UI to control *NSFW content*.
+- **JPEG/PNG output**: Multiple file formats.
 
-You can use Face Correction or Upscaling to improve the image further.
+### Advanced features
+- **Custom Models**: Use your own `.ckpt` or `.safetensors` file, by placing it inside the `models/stable-diffusion` folder!
+- **Stable Diffusion 2.0 support (experimental)**: available in beta channel.
+- **Use custom VAE models**
+- **Use pre-trained Hypernetworks**
+- **UI Plugins**: Choose from a growing list of [community-generated UI plugins](https://github.com/cmdr2/stable-diffusion-ui/wiki/UI-Plugins), or write your own plugin to add features to the project!
 
-**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.
+### Performance and security
+- **Low Memory Usage**: Creates 512x512 images with less than 4GB of GPU RAM!
+- **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
+- **Multi-GPU support**: Automatically spreads your tasks across multiple GPUs (if available), for faster performance!
+- **Auto scan for malicious models**: Uses picklescan to prevent malicious models.
+- **Safetensors support**: Support loading models in the safetensor format, for improved safety.
+- **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
+- **Developer Console**: A developer-mode for those who want to modify their Stable Diffusion code, and edit the conda environment.
 
-**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.
+### Usability:
+- **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.
+- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
+- **Multiple Prompts File**: Queue multiple prompts by entering one prompt per line, or by running a text file.
+- **Save generated images to disk**: Save your images to your PC!
+- **UI Themes**: Customize the program to your liking.
 
-## 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).
+**(and a lot more)**
 
-# 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.
+## Easy for new users:
+![Screenshot of the initial UI](media/shot-v10-simple.jpg?raw=true)
 
-![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+## Powerful features for advanced users:
+![Screenshot of advanced settings](media/shot-v10.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.
+## Live Preview
+Useful for judging (and stopping) an image quickly, without waiting for it to finish rendering.
 
-![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
+![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)
 
-# Image Modifiers
-![Screenshot of advanced settings](media/modifiers-v1.jpg?raw=true)
+## 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 and 25GB of disk space.
+
+You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
+
+----
+
+# How to use?
+Please refer to our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use) to understand how to use the features in this UI.
 
 # 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).
 
-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.
+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.
 
 # Disclaimer
 The authors of this project are not responsible for any content generated using this interface.
 
-The license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, spread misinformation, or target vulnerable groups. For the full list of restrictions please read [the license](LICENSE). You agree to these terms by using this software.
+The license of this software forbids you from sharing any content that:
+- Violates any laws.
+- Produces any harm to a person or persons.
+- Disseminates (spreads) any personal information that would be meant for harm.
+- Spreads misinformation.
+- Target vulnerable groups. 
+
+For the full list of restrictions please read [the License](LICENSE). You agree to these terms by using this software.

Start Stable Diffusion UI.cmd

@@ -1,25 +0,0 @@
-@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

Troubleshooting.md

@@ -1,75 +0,0 @@
-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.

build.bat

@@ -0,0 +1,47 @@
+@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-windows.zip
+cd ..\..
+
+@REM cd dist\linux-mac
+@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux.zip
+@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac.zip
+@REM cd ..\..
+
+echo "Build ready. Upload the zip files inside the 'dist' folder."
+
+pause

build.sh

@@ -0,0 +1,49 @@
+#!/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/functions.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-windows.zip stable-diffusion-ui
+# cd ../..
+
+cd dist/linux-mac
+zip -r ../stable-diffusion-ui-linux.zip stable-diffusion-ui
+zip -r ../stable-diffusion-ui-mac.zip stable-diffusion-ui
+cd ../..
+
+echo "Build ready. Upload the zip files inside the 'dist' folder."

developer_console.sh

@@ -1,18 +0,0 @@
-#!/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

engine/runtime.py

@@ -1,658 +0,0 @@
-import json
-import os, re
-import traceback
-import torch
-import numpy as np
-from omegaconf import OmegaConf
-from PIL import Image, ImageOps
-from tqdm import tqdm, trange
-from itertools import islice
-from einops import rearrange
-import time
-from pytorch_lightning import seed_everything
-from torch import autocast
-from contextlib import nullcontext
-from einops import rearrange, repeat
-from ldm.util import instantiate_from_config
-from optimizedSD.optimUtils import split_weighted_subprompts
-from transformers import logging
-
-from gfpgan import GFPGANer
-from basicsr.archs.rrdbnet_arch import RRDBNet
-from realesrgan import RealESRGANer
-
-import uuid
-
-logging.set_verbosity_error()
-
-# consts
-config_yaml = "optimizedSD/v1-inference.yaml"
-filename_regex = re.compile('[^a-zA-Z0-9]')
-
-# api stuff
-from . import Request, Response, Image as ResponseImage
-import base64
-from io import BytesIO
-#from colorama import Fore
-
-# local
-stop_processing = False
-temp_images = {}
-
-ckpt_file = None
-gfpgan_file = None
-real_esrgan_file = None
-
-model = None
-modelCS = None
-modelFS = None
-model_gfpgan = None
-model_real_esrgan = None
-
-model_is_half = False
-model_fs_is_half = False
-device = None
-unet_bs = 1
-precision = 'autocast'
-sampler_plms = None
-sampler_ddim = None
-
-has_valid_gpu = False
-force_full_precision = False
-try:
-    gpu = torch.cuda.current_device()
-    gpu_name = torch.cuda.get_device_name(gpu)
-    print('GPU detected: ', gpu_name)
-
-    force_full_precision = ('nvidia' in gpu_name.lower() or 'geforce' in gpu_name.lower()) and (' 1660' in gpu_name or ' 1650' in gpu_name) # otherwise these NVIDIA cards create green images
-    if force_full_precision:
-        print('forcing full precision on NVIDIA 16xx cards, to avoid green images. GPU detected: ', gpu_name)
-
-    mem_free, mem_total = torch.cuda.mem_get_info(gpu)
-    mem_total /= float(10**9)
-    if mem_total < 3.0:
-        print("GPUs with less than 3 GB of VRAM are not compatible with Stable Diffusion")
-        raise Exception()
-
-    has_valid_gpu = True
-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', 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
-
-    if device == 'cpu':
-        precision = 'full'
-
-    sd = load_model_from_config(f"{ckpt_file}.ckpt")
-    li, lo = [], []
-    for key, value in sd.items():
-        sp = key.split(".")
-        if (sp[0]) == "model":
-            if "input_blocks" in sp:
-                li.append(key)
-            elif "middle_block" in sp:
-                li.append(key)
-            elif "time_embed" in sp:
-                li.append(key)
-            else:
-                lo.append(key)
-    for key in li:
-        sd["model1." + key[6:]] = sd.pop(key)
-    for key in lo:
-        sd["model2." + key[6:]] = sd.pop(key)
-
-    config = OmegaConf.load(f"{config_yaml}")
-
-    model = instantiate_from_config(config.modelUNet)
-    _, _ = model.load_state_dict(sd, strict=False)
-    model.eval()
-    model.cdevice = device
-    model.unet_bs = unet_bs
-    model.turbo = turbo
-
-    modelCS = instantiate_from_config(config.modelCondStage)
-    _, _ = modelCS.load_state_dict(sd, strict=False)
-    modelCS.eval()
-    modelCS.cond_stage_model.device = device
-
-    modelFS = instantiate_from_config(config.modelFirstStage)
-    _, _ = modelFS.load_state_dict(sd, strict=False)
-    modelFS.eval()
-    del sd
-
-    if device != "cpu" and precision == "autocast":
-        model.half()
-        modelCS.half()
-        model_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
-
-    print('loaded ', ckpt_file, 'to', device, 'precision', precision)
-
-def load_model_gfpgan(gfpgan_to_use):
-    global gfpgan_file, model_gfpgan
-
-    if gfpgan_to_use is None:
-        return
-
-    gfpgan_file = gfpgan_to_use
-    model_path = gfpgan_to_use + ".pth"
-
-    if device == 'cpu':
-        model_gfpgan = GFPGANer(model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None, device=torch.device('cpu'))
-    else:
-        model_gfpgan = GFPGANer(model_path=model_path, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None, device=torch.device('cuda'))
-
-    print('loaded ', gfpgan_to_use, 'to', device, 'precision', precision)
-
-def load_model_real_esrgan(real_esrgan_to_use):
-    global real_esrgan_file, model_real_esrgan
-
-    if real_esrgan_to_use is None:
-        return
-
-    real_esrgan_file = real_esrgan_to_use
-    model_path = real_esrgan_to_use + ".pth"
-
-    RealESRGAN_models = {
-        'RealESRGAN_x4plus': RRDBNet(num_in_ch=3, num_out_ch=3, num_feat=64, num_block=23, num_grow_ch=32, scale=4),
-        'RealESRGAN_x4plus_anime_6B': RRDBNet(num_in_ch=3, num_out_ch=3, num_feat=64, num_block=6, num_grow_ch=32, scale=4)
-    }
-
-    model_to_use = RealESRGAN_models[real_esrgan_to_use]
-
-    if device == 'cpu':
-        model_real_esrgan = RealESRGANer(scale=2, model_path=model_path, model=model_to_use, pre_pad=0, half=False) # cpu does not support half
-        model_real_esrgan.device = torch.device('cpu')
-        model_real_esrgan.model.to('cpu')
-    else:
-        model_real_esrgan = RealESRGANer(scale=2, model_path=model_path, model=model_to_use, pre_pad=0, half=model_is_half)
-
-    model_real_esrgan.model.name = real_esrgan_to_use
-
-    print('loaded ', real_esrgan_to_use, 'to', device, 'precision', precision)
-
-def mk_img(req: Request):
-    try:
-        yield from do_mk_img(req)
-    except Exception as e:
-        print(traceback.format_exc())
-
-        gc()
-
-        if device != "cpu":
-            modelFS.to("cpu")
-            modelCS.to("cpu")
-
-            model.model1.to("cpu")
-            model.model2.to("cpu")
-
-        gc()
-
-        yield json.dumps({
-            "status": 'failed',
-            "detail": str(e)
-        })
-
-def do_mk_img(req: Request):
-    global model, modelCS, modelFS, device
-    global model_gfpgan, model_real_esrgan
-    global stop_processing
-
-    stop_processing = False
-
-    res = Response()
-    res.request = req
-    res.images = []
-
-    temp_images.clear()
-
-    model.turbo = req.turbo
-    if req.use_cpu:
-        if device != 'cpu':
-            device = 'cpu'
-
-            if model_is_half:
-                del model, modelCS, modelFS
-                load_model_ckpt(ckpt_file, device)
-
-            load_model_gfpgan(gfpgan_file)
-            load_model_real_esrgan(real_esrgan_file)
-    else:
-        if has_valid_gpu:
-            prev_device = device
-            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) 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):
-
-                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 req.use_face_correction != gfpgan_file:
-        load_model_gfpgan(req.use_face_correction)
-
-    if req.use_upscale != real_esrgan_file:
-        load_model_real_esrgan(req.use_upscale)
-
-    model.cdevice = device
-    modelCS.cond_stage_model.device = device
-
-    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)
-
-    print('\n\n    Using precision:', precision)
-
-    seed_everything(opt_seed)
-
-    batch_size = opt_n_samples
-    prompt = opt_prompt
-    assert prompt is not None
-    data = [batch_size * [prompt]]
-
-    if precision == "autocast" and device != "cpu":
-        precision_scope = autocast
-    else:
-        precision_scope = nullcontext
-
-    mask = None
-
-    if req.init_image is None:
-        handler = _txt2img
-
-        init_latent = None
-        t_enc = None
-    else:
-        handler = _img2img
-
-        init_image = load_img(req.init_image, opt_W, opt_H)
-        init_image = init_image.to(device)
-
-        if device != "cpu" and precision == "autocast":
-            init_image = init_image.half()
-
-        modelFS.to(device)
-
-        init_image = repeat(init_image, '1 ... -> b ...', b=batch_size)
-        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, 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)
-
-            if device != "cpu" and precision == "autocast":
-                mask = mask.half()
-
-        move_fs_to_cpu()
-
-        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 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
-
-    seeds = ""
-    with torch.no_grad():
-        for n in trange(opt_n_iter, desc="Sampling"):
-            for prompts in tqdm(data, desc="data"):
-
-                with precision_scope("cuda"):
-                    modelCS.to(device)
-                    uc = None
-                    if opt_scale != 1.0:
-                        uc = modelCS.get_learned_conditioning(batch_size * [req.negative_prompt])
-                    if isinstance(prompts, tuple):
-                        prompts = list(prompts)
-
-                    subprompts, weights = split_weighted_subprompts(prompts[0])
-                    if len(subprompts) > 1:
-                        c = torch.zeros_like(uc)
-                        totalWeight = sum(weights)
-                        # normalize each "sub prompt" and add it
-                        for i in range(len(subprompts)):
-                            weight = weights[i]
-                            # if not skip_normalize:
-                            weight = weight / totalWeight
-                            c = torch.add(c, modelCS.get_learned_conditioning(subprompts[i]), alpha=weight)
-                    else:
-                        c = modelCS.get_learned_conditioning(prompts)
-
-                    modelFS.to(device)
-
-                    partial_x_samples = None
-                    def img_callback(x_samples, i):
-                        nonlocal partial_x_samples
-
-                        partial_x_samples = x_samples
-
-                        if req.stream_progress_updates:
-                            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 = []
-
-                                for i in range(batch_size):
-                                    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)
-                                    x_sample = 255.0 * rearrange(x_sample[0].cpu().numpy(), "c h w -> h w c")
-                                    x_sample = x_sample.astype(np.uint8)
-                                    img = Image.fromarray(x_sample)
-                                    buf = BytesIO()
-                                    img.save(buf, format='JPEG')
-                                    buf.seek(0)
-
-                                    del img, x_sample, x_samples_ddim
-                                    # don't delete x_samples, it is used in the code that called this callback
-
-                                    temp_images[str(req.session_id) + '/' + str(i)] = buf
-                                    partial_images.append({'path': f'/image/tmp/{req.session_id}/{i}'})
-
-                                progress['output'] = partial_images
-
-                            yield json.dumps(progress)
-
-                        if stop_processing:
-                            raise UserInitiatedStop("User requested that we stop processing")
-
-                    # run the handler
-                    try:
-                        if handler == _txt2img:
-                            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, opt_scale, c, uc, opt_ddim_steps, opt_ddim_eta, opt_seed, img_callback, mask)
-
-                        yield from x_samples
-
-                        x_samples = partial_x_samples
-                    except UserInitiatedStop:
-                        if partial_x_samples is None:
-                            continue
-
-                        x_samples = partial_x_samples
-
-                    print("saving images")
-                    for i in range(batch_size):
-
-                        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)
-                        x_sample = 255.0 * rearrange(x_sample[0].cpu().numpy(), "c h w -> h w c")
-                        x_sample = x_sample.astype(np.uint8)
-                        img = Image.fromarray(x_sample)
-
-                        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 opt_show_only_filtered
-
-                        if stop_processing:
-                            return_orig_img = True
-
-                        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:
-                                save_image(img, img_out_path)
-
-                            save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_strength, opt_use_face_correction, opt_use_upscale, opt_sampler_name, req.negative_prompt)
-
-                        if return_orig_img:
-                            img_data = img_to_base64_str(img)
-                            res_image_orig = ResponseImage(data=img_data, seed=opt_seed)
-                            res.images.append(res_image_orig)
-
-                            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 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
-
-                    move_fs_to_cpu()
-                    gc()
-                    del x_samples, x_samples_ddim, x_sample
-                    print("memory_final = ", torch.cuda.memory_allocated() / 1e6)
-
-    print('Task completed')
-
-    yield json.dumps(res.json())
-
-def save_image(img, img_out_path):
-    try:
-        img.save(img_out_path)
-    except:
-        print('could not save the file', traceback.format_exc())
-
-def save_metadata(meta_out_path, prompts, opt_seed, opt_W, opt_H, opt_ddim_steps, opt_scale, opt_prompt_strength, opt_correct_face, opt_upscale, sampler_name, negative_prompt):
-    metadata = f"{prompts[0]}\nWidth: {opt_W}\nHeight: {opt_H}\nSeed: {opt_seed}\nSteps: {opt_ddim_steps}\nGuidance Scale: {opt_scale}\nPrompt Strength: {opt_prompt_strength}\nUse Face Correction: {opt_correct_face}\nUse Upscaling: {opt_upscale}\nSampler: {sampler_name}\nNegative Prompt: {negative_prompt}"
-
-    try:
-        with open(meta_out_path, 'w') as f:
-            f.write(metadata)
-    except:
-        print('could not save the file', traceback.format_exc())
-
-def _txt2img(opt_W, opt_H, opt_n_samples, opt_ddim_steps, opt_scale, start_code, opt_C, opt_f, opt_ddim_eta, c, uc, opt_seed, img_callback, mask, sampler_name):
-    shape = [opt_n_samples, opt_C, opt_H // opt_f, opt_W // opt_f]
-
-    if device != "cpu":
-        mem = torch.cuda.memory_allocated() / 1e6
-        modelCS.to("cpu")
-        while torch.cuda.memory_allocated() / 1e6 >= mem:
-            time.sleep(1)
-
-    if sampler_name == 'ddim':
-        model.make_schedule(ddim_num_steps=opt_ddim_steps, ddim_eta=opt_ddim_eta, verbose=False)
-
-    samples_ddim = model.sample(
-        S=opt_ddim_steps,
-        conditioning=c,
-        seed=opt_seed,
-        shape=shape,
-        verbose=False,
-        unconditional_guidance_scale=opt_scale,
-        unconditional_conditioning=uc,
-        eta=opt_ddim_eta,
-        x_T=start_code,
-        img_callback=img_callback,
-        mask=mask,
-        sampler = sampler_name,
-    )
-
-    yield from samples_ddim
-
-def _img2img(init_latent, t_enc, batch_size, opt_scale, c, uc, opt_ddim_steps, opt_ddim_eta, opt_seed, img_callback, mask):
-    # encode (scaled latent)
-    z_enc = model.stochastic_encode(
-        init_latent,
-        torch.tensor([t_enc] * batch_size).to(device),
-        opt_seed,
-        opt_ddim_eta,
-        opt_ddim_steps,
-    )
-    x_T = None if mask is None else init_latent
-
-    # decode it
-    samples_ddim = model.sample(
-        t_enc,
-        c,
-        z_enc,
-        unconditional_guidance_scale=opt_scale,
-        unconditional_conditioning=uc,
-        img_callback=img_callback,
-        mask=mask,
-        x_T=x_T,
-        sampler = 'ddim'
-    )
-
-    yield from samples_ddim
-
-def move_fs_to_cpu():
-    if device != "cpu":
-        mem = torch.cuda.memory_allocated() / 1e6
-        modelFS.to("cpu")
-        while torch.cuda.memory_allocated() / 1e6 >= mem:
-            time.sleep(1)
-
-def gc():
-    if device == 'cpu':
-        return
-
-    torch.cuda.empty_cache()
-    torch.cuda.ipc_collect()
-
-# internal
-
-def chunk(it, size):
-    it = iter(it)
-    return iter(lambda: tuple(islice(it, size)), ())
-
-
-def load_model_from_config(ckpt, verbose=False):
-    print(f"Loading model from {ckpt}")
-    pl_sd = torch.load(ckpt, map_location="cpu")
-    if "global_step" in pl_sd:
-        print(f"Global Step: {pl_sd['global_step']}")
-    sd = pl_sd["state_dict"]
-    return sd
-
-# utils
-class UserInitiatedStop(Exception):
-    pass
-
-def load_img(img_str, w0, h0):
-    image = base64_str_to_img(img_str).convert("RGB")
-    w, h = image.size
-    print(f"loaded input image of size ({w}, {h}) from base64")
-    if h0 is not None and w0 is not None:
-        h, w = h0, w0
-
-    w, h = map(lambda x: x - x % 64, (w, h))  # resize to integer multiple of 64
-    image = image.resize((w, h), resample=Image.Resampling.LANCZOS)
-    image = np.array(image).astype(np.float32) / 255.0
-    image = image[None].transpose(0, 3, 1, 2)
-    image = torch.from_numpy(image)
-    return 2.*image - 1.
-
-def load_mask(mask_str, h0, w0, newH, newW, invert=False):
-    image = base64_str_to_img(mask_str).convert("RGB")
-    w, h = image.size
-    print(f"loaded input mask of size ({w}, {h})")
-
-    if invert:
-        print("inverted")
-        image = ImageOps.invert(image)
-        # where_0, where_1 = np.where(image == 0), np.where(image == 255)
-        # image[where_0], image[where_1] = 255, 0
-
-    if h0 is not None and w0 is not None:
-        h, w = h0, w0
-
-    w, h = map(lambda x: x - x % 64, (w, h))  # resize to integer multiple of 64
-
-    print(f"New mask size ({w}, {h})")
-    image = image.resize((newW, newH), resample=Image.Resampling.LANCZOS)
-    image = np.array(image)
-
-    image = image.astype(np.float32) / 255.0
-    image = image[None].transpose(0, 3, 1, 2)
-    image = torch.from_numpy(image)
-    return image
-
-# https://stackoverflow.com/a/61114178
-def img_to_base64_str(img):
-    buffered = BytesIO()
-    img.save(buffered, format="PNG")
-    buffered.seek(0)
-    img_byte = buffered.getvalue()
-    img_str = "data:image/png;base64," + base64.b64encode(img_byte).decode()
-    return img_str
-
-def base64_str_to_img(img_str):
-    img_str = img_str[len("data:image/png;base64,"):]
-    data = base64.b64decode(img_str)
-    buffered = BytesIO(data)
-    img = Image.open(buffered)
-    return img

engine/server.py

@@ -1,237 +0,0 @@
-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')

environment.yaml

@@ -3,5 +3,5 @@ channels:
   - defaults
   - conda-forge
 dependencies:
+  - conda
   - git
-  - python=3.10.5

installer/bootstrap/bootstrap.bat

@@ -1,34 +0,0 @@
-@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%"

installer/bootstrap/bootstrap.sh

@@ -1,44 +0,0 @@
-#!/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"

installer/bootstrap/check-install-dir.bat

@@ -1,21 +0,0 @@
-@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%
-)

installer/developer/enable_dev_mode.py

@@ -1,78 +0,0 @@
-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}')

installer/installer/app.py

@@ -1,70 +0,0 @@
-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

installer/installer/check_modules.py

@@ -1,18 +0,0 @@
-'''
-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)

installer/installer/helpers.py

@@ -1,80 +0,0 @@
-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)

installer/installer/main.py

@@ -1,34 +0,0 @@
-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()

installer/installer/start.bat

@@ -1,8 +0,0 @@
-@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

installer/installer/start.sh

@@ -1,9 +0,0 @@
-#!/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"

installer/installer/tasks/apply_project_update.py

@@ -1,30 +0,0 @@
-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)

installer/installer/tasks/download_weights.py

@@ -1,46 +0,0 @@
-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

installer/installer/tasks/fetch_project_repo.py

@@ -1,27 +0,0 @@
-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)

installer/installer/tasks/fetch_stable_diffusion_repo.py

@@ -1,37 +0,0 @@
-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)

installer/installer/tasks/install_stable_diffusion_packages.py

@@ -1,59 +0,0 @@
-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'))

installer/installer/tasks/install_ui_packages.py

@@ -1,39 +0,0 @@
-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'))

installer/installer/tasks/start_ui_server.py

@@ -1,23 +0,0 @@
-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)

installer/patches/gfpgan_custom.patch

@@ -1,22 +0,0 @@
-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

installer/patches/sd_custom.patch

@@ -1,332 +0,0 @@
-diff --git a/optimizedSD/ddpm.py b/optimizedSD/ddpm.py
-index b967b55..35ef520 100644
---- a/optimizedSD/ddpm.py
-+++ b/optimizedSD/ddpm.py
-@@ -22,7 +22,7 @@ from ldm.util import exists, default, instantiate_from_config
- from ldm.modules.diffusionmodules.util import make_beta_schedule
- from ldm.modules.diffusionmodules.util import make_ddim_sampling_parameters, make_ddim_timesteps, noise_like
- from ldm.modules.diffusionmodules.util import make_beta_schedule, extract_into_tensor, noise_like
--from samplers import CompVisDenoiser, get_ancestral_step, to_d, append_dims,linear_multistep_coeff
-+from .samplers import CompVisDenoiser, get_ancestral_step, to_d, append_dims,linear_multistep_coeff
- 
- def disabled_train(self):
-     """Overwrite model.train with this function to make sure train/eval mode
-@@ -506,6 +506,8 @@ class UNet(DDPM):
- 
-         x_latent = noise if x0 is None else x0
-         # sampling
-+        if sampler in ('ddim', 'dpm2', 'heun', 'dpm2_a', 'lms') and not hasattr(self, 'ddim_timesteps'):
-+            self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
-         
-         if sampler == "plms":
-             self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
-@@ -528,39 +530,46 @@ class UNet(DDPM):
-         elif sampler == "ddim":
-             samples = self.ddim_sampling(x_latent, conditioning, S, unconditional_guidance_scale=unconditional_guidance_scale,
-                                          unconditional_conditioning=unconditional_conditioning,
--                                         mask = mask,init_latent=x_T,use_original_steps=False)
-+                                         mask = mask,init_latent=x_T,use_original_steps=False,
-+                                         callback=callback, img_callback=img_callback)
- 
-         elif sampler == "euler":
-             self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
-             samples = self.euler_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
-         elif sampler == "euler_a":
-             self.make_schedule(ddim_num_steps=S, ddim_eta=eta, verbose=False)
-             samples = self.euler_ancestral_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
- 
-         elif sampler == "dpm2":
-             samples = self.dpm_2_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
-         elif sampler == "heun":
-             samples = self.heun_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
- 
-         elif sampler == "dpm2_a":
-             samples = self.dpm_2_ancestral_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
- 
- 
-         elif sampler == "lms":
-             samples = self.lms_sampling(self.alphas_cumprod,x_latent, S, conditioning, unconditional_conditioning=unconditional_conditioning,
--                                        unconditional_guidance_scale=unconditional_guidance_scale)
-+                                        unconditional_guidance_scale=unconditional_guidance_scale,
-+                                        img_callback=img_callback)
-+
-+        yield from samples
- 
-         if(self.turbo):
-             self.model1.to("cpu")
-             self.model2.to("cpu")
- 
--        return samples
--
-     @torch.no_grad()
-     def plms_sampling(self, cond,b, img,
-                       ddim_use_original_steps=False,
-@@ -599,10 +608,10 @@ class UNet(DDPM):
-             old_eps.append(e_t)
-             if len(old_eps) >= 4:
-                 old_eps.pop(0)
--            if callback: callback(i)
--            if img_callback: img_callback(pred_x0, i)
-+            if callback: yield from callback(i)
-+            if img_callback: yield from img_callback(pred_x0, i)
- 
--        return img
-+        yield from img_callback(img, len(iterator)-1)
- 
-     @torch.no_grad()
-     def p_sample_plms(self, x, c, t, index, repeat_noise=False, use_original_steps=False, quantize_denoised=False,
-@@ -706,7 +715,8 @@ class UNet(DDPM):
- 
-     @torch.no_grad()
-     def ddim_sampling(self, x_latent, cond, t_start, unconditional_guidance_scale=1.0, unconditional_conditioning=None,
--               mask = None,init_latent=None,use_original_steps=False):
-+               mask = None,init_latent=None,use_original_steps=False,
-+               callback=None, img_callback=None):
- 
-         timesteps = self.ddim_timesteps
-         timesteps = timesteps[:t_start]
-@@ -730,10 +740,13 @@ class UNet(DDPM):
-                                           unconditional_guidance_scale=unconditional_guidance_scale,
-                                           unconditional_conditioning=unconditional_conditioning)
-         
-+            if callback: yield from callback(i)
-+            if img_callback: yield from img_callback(x_dec, i)
-+
-         if mask is not None:
--            return x0 * mask + (1. - mask) * x_dec
-+            x_dec = x0 * mask + (1. - mask) * x_dec
- 
--        return x_dec
-+        yield from img_callback(x_dec, len(iterator)-1)
- 
- 
-     @torch.no_grad()
-@@ -779,13 +792,16 @@ class UNet(DDPM):
- 
- 
-     @torch.no_grad()
--    def euler_sampling(self, ac, x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None,callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.):
-+    def euler_sampling(self, ac, x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None,callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.,
-+                        img_callback=None):
-         """Implements Algorithm 2 (Euler steps) from Karras et al. (2022)."""
-         extra_args = {} if extra_args is None else extra_args
-         cvd = CompVisDenoiser(ac)
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running Euler Sampling with {len(sigmas) - 1} timesteps")
-+
-         s_in = x.new_ones([x.shape[0]]).half()
-         for i in trange(len(sigmas) - 1, disable=disable):
-             gamma = min(s_churn / (len(sigmas) - 1), 2 ** 0.5 - 1) if s_tmin <= sigmas[i] <= s_tmax else 0.
-@@ -807,13 +823,18 @@ class UNet(DDPM):
-             d = to_d(x, sigma_hat, denoised)
-             if callback is not None:
-                 callback({'x': x, 'i': i, 'sigma': sigmas[i], 'sigma_hat': sigma_hat, 'denoised': denoised})
-+
-+            if img_callback: yield from img_callback(x, i)
-+
-             dt = sigmas[i + 1] - sigma_hat
-             # Euler method
-             x = x + d * dt
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
- 
-     @torch.no_grad()
--    def euler_ancestral_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None, callback=None, disable=None):
-+    def euler_ancestral_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None, callback=None, disable=None,
-+                        img_callback=None):
-         """Ancestral sampling with Euler method steps."""
-         extra_args = {} if extra_args is None else extra_args
- 
-@@ -822,6 +843,8 @@ class UNet(DDPM):
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running Euler Ancestral Sampling with {len(sigmas) - 1} timesteps")
-+
-         s_in = x.new_ones([x.shape[0]]).half()
-         for i in trange(len(sigmas) - 1, disable=disable):
- 
-@@ -837,17 +860,22 @@ class UNet(DDPM):
-             sigma_down, sigma_up = get_ancestral_step(sigmas[i], sigmas[i + 1])
-             if callback is not None:
-                 callback({'x': x, 'i': i, 'sigma': sigmas[i], 'sigma_hat': sigmas[i], 'denoised': denoised})
-+
-+            if img_callback: yield from img_callback(x, i)
-+
-             d = to_d(x, sigmas[i], denoised)
-             # Euler method
-             dt = sigma_down - sigmas[i]
-             x = x + d * dt
-             x = x + torch.randn_like(x) * sigma_up
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
- 
- 
- 
-     @torch.no_grad()
--    def heun_sampling(self, ac, x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.):
-+    def heun_sampling(self, ac, x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.,
-+                        img_callback=None):
-         """Implements Algorithm 2 (Heun steps) from Karras et al. (2022)."""
-         extra_args = {} if extra_args is None else extra_args
- 
-@@ -855,6 +883,8 @@ class UNet(DDPM):
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running Heun Sampling with {len(sigmas) - 1} timesteps")
-+
- 
-         s_in = x.new_ones([x.shape[0]]).half()
-         for i in trange(len(sigmas) - 1, disable=disable):
-@@ -876,6 +906,9 @@ class UNet(DDPM):
-             d = to_d(x, sigma_hat, denoised)
-             if callback is not None:
-                 callback({'x': x, 'i': i, 'sigma': sigmas[i], 'sigma_hat': sigma_hat, 'denoised': denoised})
-+
-+            if img_callback: yield from img_callback(x, i)
-+
-             dt = sigmas[i + 1] - sigma_hat
-             if sigmas[i + 1] == 0:
-                 # Euler method
-@@ -895,11 +928,13 @@ class UNet(DDPM):
-                 d_2 = to_d(x_2, sigmas[i + 1], denoised_2)
-                 d_prime = (d + d_2) / 2
-                 x = x + d_prime * dt
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
- 
- 
-     @torch.no_grad()
--    def dpm_2_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None, callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.):
-+    def dpm_2_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1,extra_args=None, callback=None, disable=None, s_churn=0., s_tmin=0., s_tmax=float('inf'), s_noise=1.,
-+                        img_callback=None):
-         """A sampler inspired by DPM-Solver-2 and Algorithm 2 from Karras et al. (2022)."""
-         extra_args = {} if extra_args is None else extra_args
- 
-@@ -907,6 +942,8 @@ class UNet(DDPM):
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running DPM2 Sampling with {len(sigmas) - 1} timesteps")
-+
-         s_in = x.new_ones([x.shape[0]]).half()
-         for i in trange(len(sigmas) - 1, disable=disable):
-             gamma = min(s_churn / (len(sigmas) - 1), 2 ** 0.5 - 1) if s_tmin <= sigmas[i] <= s_tmax else 0.
-@@ -924,7 +961,7 @@ class UNet(DDPM):
-             e_t_uncond, e_t = (x_in  + eps * c_out).chunk(2)
-             denoised = e_t_uncond + unconditional_guidance_scale * (e_t - e_t_uncond)
- 
--
-+            if img_callback: yield from img_callback(x, i)
-             
-             d = to_d(x, sigma_hat, denoised)
-             # Midpoint method, where the midpoint is chosen according to a rho=3 Karras schedule
-@@ -945,11 +982,13 @@ class UNet(DDPM):
- 
-             d_2 = to_d(x_2, sigma_mid, denoised_2)
-             x = x + d_2 * dt_2
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
- 
- 
-     @torch.no_grad()
--    def dpm_2_ancestral_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None):
-+    def dpm_2_ancestral_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None,
-+                        img_callback=None):
-         """Ancestral sampling with DPM-Solver inspired second-order steps."""
-         extra_args = {} if extra_args is None else extra_args
- 
-@@ -957,6 +996,8 @@ class UNet(DDPM):
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running DPM2 Ancestral Sampling with {len(sigmas) - 1} timesteps")
-+
-         s_in = x.new_ones([x.shape[0]]).half()
-         for i in trange(len(sigmas) - 1, disable=disable):
- 
-@@ -973,6 +1014,9 @@ class UNet(DDPM):
-             sigma_down, sigma_up = get_ancestral_step(sigmas[i], sigmas[i + 1])
-             if callback is not None:
-                 callback({'x': x, 'i': i, 'sigma': sigmas[i], 'sigma_hat': sigmas[i], 'denoised': denoised})
-+
-+            if img_callback: yield from img_callback(x, i)
-+
-             d = to_d(x, sigmas[i], denoised)
-             # Midpoint method, where the midpoint is chosen according to a rho=3 Karras schedule
-             sigma_mid = ((sigmas[i] ** (1 / 3) + sigma_down ** (1 / 3)) / 2) ** 3
-@@ -993,11 +1037,13 @@ class UNet(DDPM):
-             d_2 = to_d(x_2, sigma_mid, denoised_2)
-             x = x + d_2 * dt_2
-             x = x + torch.randn_like(x) * sigma_up
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
- 
- 
-     @torch.no_grad()
--    def lms_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None, order=4):
-+    def lms_sampling(self,ac,x, S, cond, unconditional_conditioning = None, unconditional_guidance_scale = 1, extra_args=None, callback=None, disable=None, order=4,
-+                        img_callback=None):
-         extra_args = {} if extra_args is None else extra_args
-         s_in = x.new_ones([x.shape[0]])
- 
-@@ -1005,6 +1051,8 @@ class UNet(DDPM):
-         sigmas = cvd.get_sigmas(S)
-         x = x*sigmas[0]
- 
-+        print(f"Running LMS Sampling with {len(sigmas) - 1} timesteps")
-+
-         ds = []
-         for i in trange(len(sigmas) - 1, disable=disable):
- 
-@@ -1017,6 +1065,7 @@ class UNet(DDPM):
-             e_t_uncond, e_t = (x_in  + eps * c_out).chunk(2)
-             denoised = e_t_uncond + unconditional_guidance_scale * (e_t - e_t_uncond)
- 
-+            if img_callback: yield from img_callback(x, i)
- 
-             d = to_d(x, sigmas[i], denoised)
-             ds.append(d)
-@@ -1027,4 +1076,5 @@ class UNet(DDPM):
-             cur_order = min(i + 1, order)
-             coeffs = [linear_multistep_coeff(cur_order, sigmas.cpu(), i, j) for j in range(cur_order)]
-             x = x + sum(coeff * d for coeff, d in zip(coeffs, reversed(ds)))
--        return x
-+
-+        yield from img_callback(x, len(sigmas)-1)
-diff --git a/optimizedSD/openaimodelSplit.py b/optimizedSD/openaimodelSplit.py
-index abc3098..7a32ffe 100644
---- a/optimizedSD/openaimodelSplit.py
-+++ b/optimizedSD/openaimodelSplit.py
-@@ -13,7 +13,7 @@ from ldm.modules.diffusionmodules.util import (
-     normalization,
-     timestep_embedding,
- )
--from splitAttention import SpatialTransformer
-+from .splitAttention import SpatialTransformer
- 
- 
- class AttentionPool2d(nn.Module):

installer/patches/sd_env_yaml.patch

@@ -1,13 +0,0 @@
-diff --git a/environment.yaml b/environment.yaml
-index 7f25da8..306750f 100644
---- a/environment.yaml
-+++ b/environment.yaml
-@@ -23,6 +23,8 @@ dependencies:
-     - torch-fidelity==0.3.0
-     - transformers==4.19.2
-     - torchmetrics==0.6.0
-+    - pywavelets==1.3.0
-+    - pandas==1.4.4
-     - 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

installer/yaml/sd-environment-mac-nvidia.yaml

@@ -1,47 +0,0 @@
-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

installer/yaml/sd-environment-win-linux-nvidia.yaml

@@ -1,33 +0,0 @@
-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 .

scripts/Developer Console.cmd

@@ -0,0 +1,46 @@
+@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%
+
+set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
+
+@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
+
+@rem set the PYTHONPATH
+cd stable-diffusion
+set SD_DIR=%cd%
+
+cd env\lib\site-packages
+set PYTHONPATH=%SD_DIR%;%cd%
+cd ..\..\..
+echo PYTHONPATH=%PYTHONPATH%
+
+cd ..
+
+@rem done
+echo.
+
+cmd /k

scripts/Start Stable Diffusion UI.cmd

@@ -0,0 +1,27 @@
+@echo off
+
+cd /d %~dp0
+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%
+
+set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
+
+@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

scripts/bootstrap.bat

@@ -0,0 +1,77 @@
+@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
+set umamba_exists=F
+
+set OLD_APPDATA=%APPDATA%
+set OLD_USERPROFILE=%USERPROFILE%
+set APPDATA=%cd%\installer_files\appdata
+set USERPROFILE=%cd%\profile
+
+@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
+
+call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
+if "%ERRORLEVEL%" EQU "0" set umamba_exists=T
+
+@rem (if necessary) install git and conda into a contained environment
+if "%PACKAGES_TO_INSTALL%" NEQ "" (
+    @rem download micromamba
+    if "%umamba_exists%" == "F" (
+        echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
+
+        mkdir "%MAMBA_ROOT_PREFIX%"
+        call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe"
+
+        if "%ERRORLEVEL%" NEQ "0" (
+            echo "There was a problem downloading micromamba. Cannot continue."
+            pause
+            exit /b
+        )
+
+        mkdir "%APPDATA%"
+        mkdir "%USERPROFILE%"
+
+        @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
+    )
+)
+
+@rem revert to the old APPDATA. only needed it for bypassing a bug in micromamba (with special characters)
+set APPDATA=%OLD_APPDATA%
+set USERPROFILE=%OLD_USERPROFILE%

scripts/bootstrap.sh

@@ -0,0 +1,86 @@
+#!/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.
+
+source ./scripts/functions.sh
+
+set -o pipefail
+
+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"
+umamba_exists="F"
+
+# 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 "$MAMBA_ROOT_PREFIX/micromamba" --version &>/dev/null; then umamba_exists="T"; fi
+
+# (if necessary) install git and conda into a contained environment
+if [ "$PACKAGES_TO_INSTALL" != "" ]; then
+    # download micromamba
+    if [ "$umamba_exists" == "F" ]; 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"
+
+        if [ "$?" != "0" ]; then
+            echo
+            echo "EE micromamba download failed"
+            echo "EE If the lines above contain 'bzip2: Cannot exec', your system doesn't have bzip2 installed"
+            echo "EE If there are network errors, please check your internet setup"
+            fail "micromamba download failed"
+        fi
+
+        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" || fail "unable to create the install environment"
+    fi
+   
+    if [ ! -e "$INSTALL_ENV_DIR" ]; then
+        fail "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue."
+    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 [ "$?" != "0" ]; then
+        fail "Installation of the packages '$PACKAGES_TO_INSTALL' failed."
+    fi
+fi

scripts/developer_console.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+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
+
+  # set the PYTHONPATH
+  cd stable-diffusion
+  SD_PATH=`pwd`
+  export PYTHONPATH="$SD_PATH:$SD_PATH/env/lib/python3.8/site-packages"
+  echo "PYTHONPATH=$PYTHONPATH"
+  cd ..
+
+  # done
+
+  echo ""
+else
+  file_name=$(basename "${BASH_SOURCE[0]}")
+  bash --init-file "$file_name"
+fi

scripts/functions.sh

@@ -0,0 +1,32 @@
+#
+# utility functions for all scripts
+#
+
+fail() {
+    echo
+    echo "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+    echo
+    if [ "$1" != "" ]; then
+        echo ERROR: $1
+    else
+        echo An error occurred.
+    fi
+    cat <<EOF
+
+Error downloading Stable Diffusion UI. 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/wiki/Troubleshooting
+ 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!
+
+
+EOF
+    read -p "Press any key to continue"
+    exit 1
+
+}
+
+
+

scripts/on_env_start.bat

@@ -0,0 +1,61 @@
+@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 /q
+@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

scripts/on_env_start.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+source ./scripts/functions.sh
+
+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
+        fail "git clone failed"
+    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"

scripts/on_sd_start.bat

@@ -0,0 +1,417 @@
+@echo off
+
+@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.
+
+@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
+)
+
+@mkdir tmp
+@set TMP=%cd%\tmp
+@set TEMP=%cd%\tmp
+
+@rem activate the installer env
+call conda activate
+@if "%ERRORLEVEL%" NEQ "0" (
+       @echo. & echo "Error activating conda 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
+)
+
+@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');"
+
+if NOT DEFINED test_sd2 set test_sd2=N
+
+@>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 remote set-url origin https://github.com/easydiffusion/diffusion-kit.git
+
+    @call git reset --hard
+    @call git pull
+
+    if "%test_sd2%" == "N" (
+        @call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
+    )
+    if "%test_sd2%" == "Y" (
+        @call git -c advice.detachedHead=false checkout 733a1f6f9cae9b9a9b83294bf3281b123378cb1f
+    )
+
+    @cd ..
+) else (
+    @echo. & echo "Downloading Stable Diffusion.." & echo.
+
+    @call git clone https://github.com/easydiffusion/diffusion-kit.git stable-diffusion && (
+        @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 7f32368ed1030a6e710537047bacd908adea183a
+
+    @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 PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
+    @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
+
+    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
+)
+
+@rem allow rolling back the sdkit-based changes
+if exist "src-old" (
+    if not exist "src" (
+        rename "src-old" "src"
+
+        if exist "ldm-old" (
+            rd /s /q "ldm-old"
+        )
+
+        call pip uninstall -y sdkit stable-diffusion-sdkit
+    )
+)
+
+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 PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
+    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 PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
+    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 PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
+    @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 2>nul call python -m picklescan --help
+@if "%ERRORLEVEL%" NEQ "0" (
+    @echo. & echo Picklescan not found. Installing
+    @call pip install picklescan || (
+        echo "Error installing the picklescan package 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
+    )
+)
+
+@>nul 2>nul call python -c "import safetensors"
+@if "%ERRORLEVEL%" NEQ "0" (
+    @echo. & echo SafeTensors not found. Installing
+    @call pip install safetensors || (
+        echo "Error installing the safetensors package 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
+    )
+)
+
+@>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"
+if not exist "..\models\vae" mkdir "..\models\vae"
+if not exist "..\models\hypernetwork" mkdir "..\models\hypernetwork"
+echo. > "..\models\stable-diffusion\Put your custom ckpt files here.txt"
+echo. > "..\models\vae\Put your VAE files here.txt"
+echo. > "..\models\hypernetwork\Put your hypernetwork 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 -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 -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 RealESRGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "RealESRGAN_x4plus.pth"
+    )
+)
+
+@if not exist "RealESRGAN_x4plus.pth" (
+    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.." & echo.
+
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
+
+    @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 RealESRGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "RealESRGAN_x4plus_anime_6B.pth"
+    )
+)
+
+@if not exist "RealESRGAN_x4plus_anime_6B.pth" (
+    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.." & echo.
+
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
+
+    @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
+    )
+)
+
+
+
+@if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+    for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" EQU "334695179" (
+        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
+    ) else (
+        echo. & echo "The default VAE (sd-vae-ft-mse-original) file present at models\vae\vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt"
+    )
+)
+
+@if not exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+    @echo. & echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).." & echo.
+
+    @call curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt
+
+    @if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+        for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" NEQ "334695179" (
+            echo. & echo "Error: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: %%~zI" & echo.
+            echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). 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 the default VAE (sd-vae-ft-mse-original). 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 "%test_sd2%" == "Y" (
+    @call pip install open_clip_torch==2.0.2
+)
+
+@>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
+
+@rem
+@rem Rewrite easy-install.pth. This fixes the installation if the user has relocated the SDUI installation
+@rem
+>env\Lib\site-packages\easy-install.pth echo %cd%\src\taming-transformers
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\clip
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\gfpgan
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\realesrgan
+
+@if NOT DEFINED SD_UI_BIND_PORT set SD_UI_BIND_PORT=9000
+@if NOT DEFINED SD_UI_BIND_IP set SD_UI_BIND_IP=0.0.0.0
+@uvicorn server:app --app-dir "%SD_UI_PATH%" --port %SD_UI_BIND_PORT% --host %SD_UI_BIND_IP%
+
+
+@pause

scripts/on_sd_start.sh

@@ -0,0 +1,341 @@
+#!/bin/bash
+
+source ./scripts/functions.sh
+
+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 || fail "Failed to activate conda"
+
+# 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 [ "$test_sd2" == "" ]; then
+    export test_sd2="N"
+fi
+
+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 remote set-url origin https://github.com/easydiffusion/diffusion-kit.git
+
+    git reset --hard
+    git pull
+
+    if [ "$test_sd2" == "N" ]; then
+        git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
+    elif [ "$test_sd2" == "Y" ]; then
+        git -c advice.detachedHead=false checkout 733a1f6f9cae9b9a9b83294bf3281b123378cb1f
+    fi
+
+    cd ..
+else
+    printf "\n\nDownloading Stable Diffusion..\n\n"
+
+    if git clone https://github.com/easydiffusion/diffusion-kit.git stable-diffusion ; then
+        echo sd_git_cloned >> scripts/install_status.txt
+    else
+        fail "git clone of basujindal/stable-diffusion.git failed"
+    fi
+
+    cd stable-diffusion
+    git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
+
+    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 || fail "conda activate failed"
+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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
+
+    if conda env create --prefix env --force -f environment.yaml ; then
+        echo "Installed. Testing.."
+    else
+        fail "'conda env create' failed"
+    fi
+
+    conda activate ./env || fail "conda activate failed"
+
+    out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        fail "Dependency test failed"
+    fi
+
+    echo conda_sd_env_created >> ../scripts/install_status.txt
+fi
+
+# allow rolling back the sdkit-based changes
+if [ -e "src-old" ] && [ ! -e "src" ]; then
+    mv src-old src
+
+    if [ -e "ldm-old" ]; then rm -r ldm-old; fi
+
+    pip uninstall -y sdkit stable-diffusion-sdkit
+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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
+
+    out_test=`python -c "from gfpgan import GFPGANer; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        echo "EE The dependency check has failed. This usually means that some system libraries are missing."
+	echo "EE On Debian/Ubuntu systems, this are often these packages: libsm6 libxext6 libxrender-dev"
+	echo "EE Other Linux distributions might have different package names for these libraries."
+        fail "GFPGAN dependency test failed"
+    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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
+
+    out_test=`python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        fail "ESRGAN dependency test failed"
+    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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
+
+    if conda install -c conda-forge --prefix ./env -y uvicorn fastapi ; then
+        echo "Installed. Testing.."
+    else
+        fail "'conda install uvicorn' failed" 
+    fi
+
+    if ! command -v uvicorn &> /dev/null; then
+        fail "UI packages not found!"
+    fi
+
+    echo conda_sd_ui_deps_installed >> ../scripts/install_status.txt
+fi
+
+if python -m picklescan --help >/dev/null 2>&1; then
+    echo "Picklescan is already installed."
+else
+    echo "Picklescan not found, installing."
+    pip install picklescan || fail "Picklescan installation failed."
+fi
+
+if python -c "import safetensors" --help >/dev/null 2>&1; then
+    echo "SafeTensors is already installed."
+else
+    echo "SafeTensors not found, installing."
+    pip install safetensors || fail "SafeTensors installation failed."
+fi
+
+
+
+mkdir -p "../models/stable-diffusion"
+mkdir -p "../models/vae"
+mkdir -p "../models/hypernetwork"
+echo "" > "../models/stable-diffusion/Put your custom ckpt files here.txt"
+echo "" > "../models/vae/Put your VAE files here.txt"
+echo "" > "../models/hypernetwork/Put your hypernetwork 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 -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
+	    fail "The downloaded model file was invalid! Bytes downloaded: $model_size"
+        fi
+    else
+        fail "Error downloading the data files (weights) for Stable Diffusion"
+    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 -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
+            fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
+        fi
+    else
+        fail "Error downloading the data files (weights) for GFPGAN (Face Correction)."
+    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 -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
+            fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
+        fi
+    else
+        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus"
+    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 -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
+            fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
+        fi
+    else
+        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime."
+    fi
+fi
+
+
+if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+    model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
+
+    if [ "$model_size" -eq "334695179" ]; then
+        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
+    else
+        printf "\n\nThe model file present at models/vae/vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
+    fi
+fi
+
+if [ ! -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+    echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).."
+
+    curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
+
+    if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+        model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
+        if [ ! "$model_size" -eq "334695179" ]; then
+            printf "\n\nError: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). 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 the default VAE (sd-vae-ft-mse-original). 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 [ "$test_sd2" == "Y" ]; then
+    pip install open_clip_torch==2.0.2
+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 ${SD_UI_BIND_PORT:-9000} --host ${SD_UI_BIND_IP:-0.0.0.0}
+
+read -p "Press any key to continue"

scripts/start.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+# 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 || exit 1
+
+# 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 || exit 1
+
+which conda
+conda --version || exit 1
+
+# Download the rest of the installer and UI
+scripts/on_env_start.sh

scripts/win_enable_long_filepaths.ps1

@@ -0,0 +1,2 @@
+Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name LongPathsEnabled -Type DWord -Value 1
+pause

start.sh

@@ -1,18 +0,0 @@
-#!/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

ui/index.html

@@ -1,107 +1,154 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <title>Stable Diffusion UI</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" href="/media/favicon-16x16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/media/favicon-32x32.png" sizes="32x32">
-    <link rel="stylesheet" href="/media/main.css?v=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>
+    <meta name="theme-color" content="#673AB6">
+    <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">
+    <link rel="stylesheet" href="/media/css/themes.css">
+    <link rel="stylesheet" href="/media/css/main.css">
+    <link rel="stylesheet" href="/media/css/auto-save.css">
+    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css">
+    <link rel="stylesheet" href="/media/css/fontawesome-all.min.css">
+    <link rel="stylesheet" href="/media/css/image-editor.css">
+    <link rel="stylesheet" href="/media/css/jquery-confirm.min.css">
+    <link rel="manifest" href="/media/manifest.webmanifest">
+    <script src="/media/js/jquery-3.6.1.min.js"></script>
+    <script src="/media/js/jquery-confirm.min.js"></script>
+    <script src="/media/js/marked.min.js"></script>
 </head>
 <body>
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.195 <span id="updateBranchLabel"></span></small></h1>
+            <h1>
+                Stable Diffusion UI
+                <small>v2.4.22 <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/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>
-                </ul>
-            </li>
-            <li class="dropdown">
+        <div id="server-status">
+            <div id="server-status-color">●</div>
+            <span id="server-status-msg">Stable Diffusion is starting..</span>
+        </div>
+        <div id="tab-container">
+            <span id="tab-main" class="tab active">
+                <span><i class="fa fa-image icon"></i> Generate</span>
+            </span>
+            <span id="tab-settings" class="tab">
                 <span><i class="fa fa-gear icon"></i> Settings</span>
-                <div id="system-settings" class="panel-box settings-box dropdown-content">
-                    <ul id="system-settings-entries">
-                        <li><b class="settings-subheader">System Settings</b></li>
-                        <br/>
-                        <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="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>
-                    </ul>
-                </div>
-            </li>
-        </ul>
+            </span>
+            <span id="tab-about" class="tab">
+                <span><i class="fa fa-comments icon"></i> Help & Community</span>
+            </span>
+        </div>
     </div>
 
-    <div class="flex-container">
-        <div id="editor" class="col-fixed-10">
-            <div id="server-status">
-                <div id="server-status-color">●</div>
-                <span id="server-status-msg">Stable Diffusion is starting..</span>
-            </div>
+    <div id="tab-content-wrapper">
+        <div id="tab-content-main" class="tab-content active flex-container">
+        <div id="editor">
             <div id="editor-inputs">
                 <div id="editor-inputs-prompt" class="row">
-                    <label for="prompt">Prompt</label>
+                    <label for="prompt"><b>Enter Prompt</b></label> <small>or</small> <button id="promptsFromFileBtn">Load from a file</button>
                     <textarea id="prompt" class="col-free">a photograph of an astronaut riding a horse</textarea>
-                </div>
-
-                <div id="editor-inputs-init-image" class="row">
-                    <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">
-                        <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>
-                        <div id="inpaintingEditor"></div>
+                    <input id="prompt_from_file" name="prompt_from_file" type="file" /> <!-- hidden -->
+                    <label for="negative_prompt" class="collapsible" id="negative_prompt_handle">
+                        Negative Prompt
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Writing-prompts#negative-prompts" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about Negative Prompts</span></i></a>
+                        <small>(optional)</small>
+                    </label>
+                    <div class="collapsible-content">
+                        <textarea id="negative_prompt" name="negative_prompt" placeholder="list the things to remove from the image (e.g. fog, green)"></textarea>
                     </div>
                 </div>
 
+                <div id="editor-inputs-init-image" class="row">
+                    <label for="init_image">Initial Image (img2img) <small>(optional)</small> </label>
+
+                    <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"><i class="fa-solid fa-xmark"></i></button>
+                        </div>
+                        <div id="init_image_buttons">
+                            <div class="button">
+                                <i class="fa-regular fa-folder-open"></i>
+                                Browse
+                                <input id="init_image" name="init_image" type="file" />
+                            </div>
+                            <div id="init_image_button_draw" class="button">
+                                <i class="fa-solid fa-pencil"></i>
+                                Draw
+                            </div>
+                            <div id="inpaint_button_container">
+                                <div id="init_image_button_inpaint" class="button">
+                                    <i class="fa-solid fa-paintbrush"></i>
+                                    Inpaint
+                                </div>
+                                <input id="enable_mask" name="enable_mask" type="checkbox">
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
                 <div id="editor-inputs-tags-container" class="row">
-                    <label>Image Modifiers: <small>(click an Image Modifier to remove it)</small></label>
+                    <label>Image Modifiers <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">click an Image Modifier to remove it, use Ctrl+Mouse Wheel to adjust its weight</span></i>:</label>
                     <div id="editor-inputs-tags-list"></div>
                 </div>
 
-                <button id="makeImage">Make Image</button>
-                <button id="stopImage" class="secondaryButton">Stop All</button>
+                <button id="makeImage" class="primaryButton">Make Image</button>
+		<div id="render-buttons">
+		   <button id="stopImage" class="secondaryButton">Stop All</button>
+		   <button id="pause"><i class="fa-solid fa-pause"></i> Pause All</button>
+		   <button id="resume"><i class="fa-solid fa-play"></i> Resume</button>
+		</div>
             </div>
 
-            <div class="line-separator">&nbsp;</div>
+            <span class="line-separator"></span>
 
-            <div id="editor-settings" class="panel-box settings-box">
-                <h4 class="collapsible">Image Settings</h4>
-                <ul id="editor-settings-entries" class="collapsible-content">
-                    <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>
+            <div id="editor-settings" class="settings-box panel-box">
+                <h4 class="collapsible">
+                    Image Settings
+                    <i id="reset-image-settings" class="fa-solid fa-arrow-rotate-left section-button">
+                        <span class="simple-tooltip top-left">
+                            Reset Image Settings
+                        </span>
+                    </i>
+                </h4>
+                <div id="editor-settings-entries" class="collapsible-content">
+                    <div><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="0" onkeypress="preventNonNumericalInput(event)"> <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" onkeypress="preventNonNumericalInput(event)"> <label><small>(total)</small></label> <input id="num_outputs_parallel" name="num_outputs_parallel" value="1" size="1" onkeypress="preventNonNumericalInput(event)"> <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>
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Custom-Models" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about custom models</span></i></a>
+                    </td></tr>
+                    <tr class="pl-5"><td><label for="vae_model">Custom VAE:</i></label></td><td>
+                        <select id="vae_model" name="vae_model">
+                            <!-- <option value="" selected>None</option> -->
+                        </select>
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about VAEs</span></i></a>
+                    </td></tr>
+                    <tr id="samplerSelection" class="pl-5"><td><label for="sampler">Sampler:</label></td><td>
                         <select id="sampler" name="sampler">
-                            <option value="plms" selected>plms</option>
+                            <option value="plms">plms</option>
                             <option value="ddim">ddim</option>
                             <option value="heun">heun</option>
                             <option value="euler">euler</option>
-                            <option value="euler_a">euler_a</option>
+                            <option value="euler_a" selected>euler_a</option>
                             <option value="dpm2">dpm2</option>
                             <option value="dpm2_a">dpm2_a</option>
                             <option value="lms">lms</option>
                         </select>
-                    </li>
-                    <li class="pl-5"><label>Image Size: </label>
+                        <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use#samplers" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about samplers</span></i></a>
+                    </td></tr>
+                    <tr class="pl-5"><td><label>Image Size: </label></td><td>
                         <select id="width" name="width" value="512">
                             <option value="128">128 (*)</option>
                             <option value="192">192</option>
@@ -146,63 +193,204 @@
                             <option value="2048">2048</option>
                         </select>
                         <label for="height"><small>(height)</small></label>
-                    </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/>
+                    </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" onkeypress="preventNonNumericalInput(event)"></td></tr>
+                    <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="11" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
+                    <tr id="prompt_strength_container" class="pl-5"><td><label for="prompt_strength_slider">Prompt Strength:</label></td><td> <input id="prompt_strength_slider" name="prompt_strength_slider" class="editor-slider" value="80" type="range" min="0" max="99"> <input id="prompt_strength" name="prompt_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td></tr>
+                    <tr class="pl-5"><td><label for="hypernetwork_model">Hypernetwork:</i></label></td><td>
+                        <select id="hypernetwork_model" name="hypernetwork_model">
+                            <!-- <option value="" selected>None</option> -->
+                        </select>
+                    </td></tr>
+                    <tr id="hypernetwork_strength_container" class="pl-5">
+                        <td><label for="hypernetwork_strength_slider">Hypernetwork Strength:</label></td>
+                        <td> <input id="hypernetwork_strength_slider" name="hypernetwork_strength_slider" class="editor-slider" value="100" type="range" min="0" max="100"> <input id="hypernetwork_strength" name="hypernetwork_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td>
+                    </tr>
+                    <tr 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>
+                    <tr class="pl-5" id="output_quality_row"><td><label for="output_quality">JPEG Quality:</label></td><td>
+                    <input id="output_quality_slider" name="output_quality" class="editor-slider" value="75" type="range" min="10" max="95"> <input id="output_quality" name="output_quality" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)">
+                    </td></tr>
+                    </table></div>
 
+                    <div><ul>
                     <li><b class="settings-subheader">Render Settings</b></li>
-                    <li class="pl-5"><input id="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview 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="stream_image_progress" name="stream_image_progress" type="checkbox"> <label for="stream_image_progress">Show a live preview <small>(uses more VRAM, slower images)</small></label></li>
+                    <li class="pl-5"><input id="use_face_correction" name="use_face_correction" type="checkbox"> <label for="use_face_correction">Fix incorrect faces and eyes <small>(uses GFPGAN)</small></label></li>
                     <li class="pl-5">
-                        <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Upscale the image to 4x resolution using </label>
+                        <input id="use_upscale" name="use_upscale" type="checkbox"> <label for="use_upscale">Upscale image by 4x with </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>
+                    </ul></div>
+                </div>
             </div>
 
             <div id="editor-modifiers" class="panel-box">
-                <h4 class="collapsible">Image Modifiers (art styles, tags etc)</h4>
+                <h4 class="collapsible">
+                    Image Modifiers (art styles, tags etc)
+                    <i id="modifier-settings-btn" class="fa-solid fa-gear section-button">
+                        <span class="simple-tooltip left">
+                            Add Custom Modifiers
+                        </span>
+                    </i>
+                </h4>
                 <div id="editor-modifiers-entries" class="collapsible-content">
-                    <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 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>
                 </div>
             </div>
         </div>
 
         <div id="preview" class="col-free">
             <div id="initial-text">
-                Type a prompt and press the "Make Image" button.<br/><br/>You can set an "Initial Image" if you want to guide the AI.<br/><br/>You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section and selecting the desired modifiers.<br/><br/>Click "Advanced Settings" for additional settings like seed, image size, number of images to generate etc.<br/><br/>Enjoy! :)
+                Type a prompt and press the "Make Image" button.<br/><br/>You can set an "Initial Image" if you want to guide the AI.<br/><br/>
+                You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section 
+                and selecting the desired modifiers.<br/><br/>
+                Click "Image Settings" for additional settings like seed, image size, number of images to generate etc.<br/><br/>Enjoy! :)
             </div>
             <div id="preview-tools">
                 <button id="clear-all-previews" class="secondaryButton"><i class="fa-solid fa-trash-can"></i> Clear All</button>
             </div>
         </div>
+        </div>
+
+        <div id="tab-content-settings" class="tab-content">
+            <div id="system-settings" class="tab-content-inner">
+                <h1>System Settings</h1>
+                <div class="parameters-table"></div>
+                <br/>
+                <button id="save-system-settings-btn" class="primaryButton">Save</button>
+                <br/><br/>
+                <div>
+                    <h3><i class="fa fa-microchip icon"></i> System Info</h3>
+                    <div id="system-info">
+                        <table>
+                            <tr><td><label>Processor:</label></td><td id="system-info-cpu" class="value"></td></tr>
+                            <tr><td><label>Compatible Graphics Cards (all):</label></td><td id="system-info-gpus-all" class="value"></td></tr>
+                            <tr><td></td><td>&nbsp;</td></tr>
+                            <tr><td><label>Used for rendering 🔥:</label></td><td id="system-info-rendering-devices" class="value"></td></tr>
+                            <tr><td><label>Server Addresses <i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">You can access Stable Diffusion UI from other devices using these addresses</span></i> :</label></td><td id="system-info-server-hosts" class="value"></td></tr>
+                        </table>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+        <div id="tab-content-about" class="tab-content">
+            <div class="tab-content-inner">
+                <div class="float-container">
+                    <div class="float-child">
+                        <h1>Help</h1>
+                        <ul id="help-links">
+                            <li><span class="help-section">Using the software</span>
+                            <ul>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/How-To-Use" target="_blank"><i class="fa-solid fa-book fa-fw"></i> How to use</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/UI-Overview" target="_blank"><i class="fa-solid fa-list fa-fw"></i> UI Overview</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Writing-Prompts" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> Writing prompts</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Inpainting" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Inpainting</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Run-on-Multiple-GPUs" target="_blank"><i class="fa-solid fa-paintbrush fa-fw"></i> Run on Multiple GPUs</a>
+                            </ul>
+  
+                            <li><span class="help-section">Installation</span>
+                            <ul>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" target="_blank"><i class="fa-solid fa-circle-question fa-fw"></i> Troubleshooting</a>
+                            </ul>
+  
+                            <li><span class="help-section">Downloadable Content</span>
+                            <ul>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/Custom-Models" target="_blank"><i class="fa-solid fa-images fa-fw"></i> Custom Models</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/UI-Plugins" target="_blank"><i class="fa-solid fa-puzzle-piece fa-fw"></i> UI Plugins</a>
+                                <li> <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/VAE-Variational-Auto-Encoder" target="_blank"><i class="fa-solid fa-hand-sparkles fa-fw"></i> VAE Variational Auto Encoder</a>
+                            </ul>
+                        </ul>
+                    </div>
+  
+                    <div class="float-child">
+                        <h1>Community</h1>
+                        <ul id="community-links">
+                            <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>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+
+    <div id="save-settings-config" class="popup">
+        <div>
+            <i class="close-button fa-solid fa-xmark"></i>
+            <h1>Save Settings Configuration</h1>
+            <p>Select which settings should be remembered when restarting the browser</p>
+            <table id="save-settings-config-table" class="form-table">
+            </table>
+        </div>
     </div>
 
-    <div class="line-separator">&nbsp;</div>
+    <div id="modifier-settings-config" class="popup">
+        <div>
+            <i class="close-button fa-solid fa-xmark"></i>
+            <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 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/kofi.png" id="coffeeButton"></a> to help cover the cost of development and maintenance! Thank you for your support!</p>
+    <div id="image-editor" class="popup image-editor-popup">
+        <div>
+            <i class="close-button fa-solid fa-xmark"></i>
+            <h1>Image Editor</h1>
+            <div class="flex-container">
+                <div class="editor-controls-left"></div>
+                <div class="editor-controls-center">
+                    <div></div>
+                </div>
+                <div class="editor-controls-right">
+                    <div></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="image-inpainter" class="popup image-editor-popup">
+        <div>
+            <i class="close-button fa-solid fa-xmark"></i>
+            <h1>Inpainter</h1>
+            <div class="flex-container">
+                <div class="editor-controls-left"></div>
+                <div class="editor-controls-center">
+                    <div></div>
+                </div>
+                <div class="editor-controls-right">
+                    <div></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="footer-spacer"></div>
+    <div id="footer">
+        <div class="line-separator">&nbsp;</div>
+        <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>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>
@@ -212,16 +400,34 @@
     </div>
 </div>
 </body>
+<script src="media/js/utils.js"></script>
+<script src="media/js/engine.js"></script>
+<script src="media/js/parameters.js"></script>
+<script src="media/js/plugins.js"></script>
 
-<script src="media/main.js?v=15"></script>
+<script src="media/js/image-modifiers.js"></script>
+<script src="media/js/auto-save.js"></script>
+
+<script src="media/js/main.js"></script>
+<script src="media/js/themes.js"></script>
+<script src="media/js/dnd.js"></script>
+<script src="media/js/image-editor.js"></script>
 <script>
 async function init() {
-    await loadModifiers()
+    await initSettings()
+    await getModels()
     await getDiskPath()
     await getAppConfig()
+    await loadUIPlugins()
+    await loadModifiers()
+    await getSystemInfo()
 
-    setInterval(healthCheck, HEALTH_PING_INTERVAL * 1000)
-    healthCheck()
+    SD.init({
+        events: {
+            statusChange: setServerStatus
+            , idle: onIdle
+        }
+    })
 
     playSound()
 }

ui/media/css/auto-save.css

@@ -0,0 +1,81 @@
+/* Auto-Settings Styling */
+#auto_save_settings ~ button {
+    margin: 5px;
+}
+#auto_save_settings:not(:checked) ~ button {
+    display: none;
+}
+
+.form-table {
+    margin: auto;
+}
+
+.form-table th {
+    padding-top: 15px;
+    padding-bottom: 5px;
+}
+
+.form-table td:first-child > *,
+.form-table th:first-child > * {
+    float: right;
+    white-space: nowrap;
+}
+
+.form-table td:last-child > *,
+.form-table th:last-child > * {
+    float: left;
+}
+
+
+.parameters-table {
+    display: flex;
+    flex-direction: column;
+    gap: 1px;
+}
+
+.parameters-table > div {
+    background: var(--background-color2);
+    display: flex;
+    padding: 0px 4px;
+}
+
+.parameters-table > div > div {
+    padding: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.parameters-table small {
+    color: rgb(153, 153, 153);
+}
+
+.parameters-table > div > div:nth-child(1) {
+    font-size: 20px;
+    width: 45px;
+}
+
+.parameters-table > div > div:nth-child(2) {
+    flex: 1;
+    flex-direction: column;
+    text-align: left;
+    justify-content: center;
+    align-items: start;
+    gap: 4px;
+}
+
+.parameters-table > div > div:nth-child(3) {
+    text-align: right;
+}
+
+.parameters-table > div:first-child {
+    border-radius: 12px 12px 0px 0px;
+}
+
+.parameters-table > div:last-child {
+    border-radius: 0px 0px 12px 12px;
+}
+
+.parameters-table .fa-fire {
+    color: #F7630C;
+}

ui/media/css/fonts.css

@@ -0,0 +1,40 @@
+/* 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+ */
+  }
+  

ui/media/css/image-editor.css

@@ -0,0 +1,215 @@
+.editor-controls-left {
+	padding-left: 32px;
+	text-align: left;
+	padding-bottom: 20px;
+}
+
+.editor-options-container {
+	display: flex;
+	row-gap: 10px;
+	max-width: 210px;
+}
+
+.editor-options-container > * {
+	flex: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.editor-options-container > * > * {
+	position: inherit;
+	width: 32px;
+	height: 32px;
+	border-radius: 16px;
+	background: var(--background-color3);
+	cursor: pointer;
+	transition: opacity 0.25s;
+}
+.editor-options-container > * > *:hover {
+	opacity: 0.75;
+}
+
+.editor-options-container > * > *.active {
+	border: 2px solid #3584e4;
+}
+
+.image_editor_opacity .editor-options-container > * > *:not(.active) {
+	border: 1px solid var(--background-color3);
+}
+
+.image_editor_color .editor-options-container {
+	flex-wrap: wrap;
+}
+.image_editor_color .editor-options-container > * {
+	flex: 20%;
+}
+.image_editor_color .editor-options-container > * > * {
+	position: relative;
+}
+.image_editor_color .editor-options-container > * > *.active::before {
+	content: "\f00c";
+	display: var(--fa-display,inline-block);
+	font-style: normal;
+	font-variant: normal;
+	line-height: 1;
+	text-rendering: auto;
+	font-family: var(--fa-style-family, "Font Awesome 6 Free");
+	font-weight: var(--fa-style, 900);
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%) scale(125%);
+	color: black;
+}
+.image_editor_color .editor-options-container > *:first-child {
+	flex: 100%;
+}
+.image_editor_color .editor-options-container > *:first-child > * {
+	width: 100%;
+}
+.image_editor_color .editor-options-container > *:first-child > * > input {
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+	cursor: pointer;
+}
+.image_editor_color .editor-options-container > *:first-child > * > span {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	opacity: 0.5;
+}
+.image_editor_color .editor-options-container > *:first-child > *.active > span {
+	opacity: 0;
+}
+
+.image_editor_tool .editor-options-container {
+	flex-wrap: wrap;
+}
+
+.image_editor_tool .editor-options-container > * {
+	padding: 2px;
+	flex: 50%;
+}
+
+.editor-controls-center {
+	/* background: var(--background-color2); */
+	flex: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.editor-controls-center > div {
+	position: relative;
+	background: black;
+}
+
+.editor-controls-center canvas {
+	position: absolute;
+	left: 0;
+	top: 0;
+}
+
+.editor-controls-right {
+	padding: 32px;
+	display: flex;
+	flex-direction: column;
+}
+
+
+.editor-controls-right > div:last-child {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	min-width: 200px;
+	gap: 5px;
+	justify-content: end;
+}
+
+.image-editor-button {
+	width: 100%;
+	height: 32px;
+	border-radius: 16px;
+	background: var(--background-color3);
+}
+
+.editor-controls-right .image-editor-button {
+	margin-bottom: 4px;
+}
+
+#init_image_button_inpaint .input-toggle {
+	position: absolute;
+	left: 16px;
+}
+
+#init_image_button_inpaint .input-toggle input:not(:checked) ~ label {
+	pointer-events: none;
+}
+
+
+.image-editor-popup {
+	--popup-margin: 16px;
+	--popup-padding: 24px;
+}
+
+.image-editor-popup > div {
+	margin: var(--popup-margin);
+	padding: var(--popup-padding);
+	min-height: calc(100vh - (2 * var(--popup-margin)));
+	max-width: none;
+}
+
+.image-editor-popup h1 {
+	position: absolute;
+	top: 32px;
+	left: 50%;
+	transform: translateX(-50%);
+}
+
+
+@media screen and (max-width: 700px) {
+	.image-editor-popup > div {
+		margin: 0px;
+		padding: 0px;
+	}
+
+	.image-editor-popup h1 {
+		position: relative;
+		transform: none;
+		left: auto;
+	}
+}
+
+
+.image-editor-popup > div > div {
+	min-height: calc(100vh - (2 * var(--popup-margin)) - (2 * var(--popup-padding)));
+}
+
+.inpainter .image_editor_color {
+	display: none;
+}
+
+.inpainter .editor-canvas-background {
+	opacity: 0.75;
+}
+
+#init_image_preview_container .button {
+	display: flex;
+	padding: 6px;
+	height: 24px;
+	box-shadow: 2px 2px 1px 1px #00000088;
+}
+
+#init_image_preview_container .button:hover {
+  background: var(--background-color4)
+}
+
+.image-editor-popup .button {
+	display: flex;
+}
+.image-editor-popup h4 {
+	text-align: left;
+}

ui/media/css/modifier-thumbnails.css

@@ -214,3 +214,10 @@
     margin-bottom: 0.5em;
     vertical-align: middle;
 }
+#modifier-settings-btn {
+    float: right;
+}
+#modifier-settings-config textarea {
+    width: 90%;
+    height: 150px;
+}

ui/media/css/themes.css

@@ -0,0 +1,160 @@
+:root {
+    --main-hue: 222;
+	--main-saturation: 4%;
+	--value-base: 13%;
+	--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) - (0.5 * var(--value-step))));
+	--background-color4: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (1.5 * var(--value-step))));
+
+    --accent-hue: 267;
+    --accent-lightness: 36%;
+    --accent-lightness-hover: 40%;
+
+    --text-color: #eee;
+
+	--input-text-color: #eee;
+    --input-background-color: hsl(var(--main-hue), var(--main-saturation), calc(var(--value-base) - (0.7 * var(--value-step))));
+	--input-border-color: var(--background-color4);
+
+    --button-text-color: var(--input-text-color);
+    --button-color: var(--input-background-color);
+    --button-border: none;
+
+    /* 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));
+    --primary-button-border: none;
+    --input-switch-padding: 1px;
+    --input-height: 18px;
+
+    /* Main theme color, hex color fallback. */
+    --theme-color-fallback: #673AB6;
+}
+
+.theme-light {
+    --background-color1: white; 
+    --background-color2: #ececec;
+    --background-color3: #e7e9eb;
+    --background-color4: #cccccc;
+
+    --text-color: black;
+
+    --input-text-color: black;
+    --input-background-color: #f8f9fa; 
+    --input-border-color: grey; 
+
+    --theme-color-fallback: #aaaaaa;
+}
+
+.theme-discord {
+    --background-color1: #36393f;
+    --background-color2: #2f3136;
+    --background-color3: #292b2f;
+    --background-color4: #202225;
+    
+    --accent-hue: 235;
+    --accent-lightness: 65%;
+
+    --input-border-size: 2px; 
+    --input-background-color: #202225; 
+    --input-border-color: var(--input-background-color); 
+
+    --theme-color-fallback: #202225;
+}
+
+.theme-cool-blue {
+    --main-hue: 222;
+	--main-saturation: 18%;
+	--value-base: 18%;
+	--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))));
+
+    --input-background-color: var(--background-color3);
+
+    --accent-hue: 212;
+
+    --theme-color-fallback: #0056b8;
+}
+
+
+.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))));
+
+    --input-background-color: var(--background-color3);
+
+    --theme-color-fallback: #5300b8;
+}
+
+.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) + (1.4 * var(--value-step))));
+
+    --input-background-color: var(--background-color3);
+    --input-border-size: 0px;
+
+    --theme-color-fallback: #000000;
+}
+
+.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;
+    
+    --input-border-size: 1px; 
+    --input-background-color: hsl(222, var(--main-saturation), calc(var(--value-base) - (2 * var(--value-step))));
+    --input-text-color: #FF0000;
+    --input-border-color: #005E05;
+}
+
+
+.theme-gnomie {
+    --background-color1: #242424;
+    --background-color2: #353535;
+    --background-color3: #494949;
+    --background-color4: #000000;
+    
+    --accent-hue: 213;
+    --accent-lightness: 55%;
+    --accent-color: #2168bf;
+
+    --input-border-radius: 6px;
+    --input-text-color: #ffffff;
+    --input-background-color: #2a2a2a; 
+    --input-border-size: 0px; 
+    --input-border-color: var(--input-background-color); 
+
+    --theme-color-fallback: #2168bf;
+}
+
+.theme-gnomie .panel-box {
+    border: none;
+    box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.25);
+    border-radius: 10px;
+}