Revert "Merge pull request #294 from cmdr2/main"

This reverts commit 1e3b4f9969, reversing
changes made to e0c0935d3a.

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.gitignore

@@ -2,4 +2,10 @@ __pycache__
 installer
 installer.tar
 dist
+
+# built code for the front end
+!/ui/frontend/dist
+ui/frontend/.idea/*
+ui/frontend/build_src/.idea/*
+
 .idea/*

3rd-PARTY-LICENSES

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

@@ -1,115 +0,0 @@
-# What's new?
-
-## v2.5
-### Major Changes
-- **Nearly twice as fast** - significantly faster speed of image generation. We're now pretty close to automatic1111's speed. Code contributions are welcome to make our project even faster: https://github.com/easydiffusion/sdkit/#is-it-fast
-- **Full support for Stable Diffusion 2.1 (including CPU)** - supports loading v1.4 or v2.0 or v2.1 models seamlessly. No need to enable "Test SD2", and no need to add `sd2_` to your SD 2.0 model file names. Works on CPU as well.
-- **Memory optimized Stable Diffusion 2.1** - you can now use 768x768 models for SD 2.1, with the same low VRAM optimizations that we've always had for SD 1.4. Please note, 4 GB graphics cards can still only support images upto 512x512 resolution.
-- **6 new samplers!** - explore the new samplers, some of which can generate great images in less than 10 inference steps!
-- **Model Merging** - You can now merge two models (`.ckpt` or `.safetensors`) and output `.ckpt` or `.safetensors` models, optionally in `fp16` precision. Details: https://github.com/cmdr2/stable-diffusion-ui/wiki/Model-Merging
-- **Fast loading/unloading of VAEs** - No longer needs to reload the entire Stable Diffusion model, each time you change the VAE
-- **Database of known models** - automatically picks the right configuration for known models. E.g. we automatically detect and apply "v" parameterization (required for some SD 2.0 models), and "fp32" attention precision (required for some SD 2.1 models).
-- **Color correction for img2img** - an option to preserve the color profile (histogram) of the initial image. This is especially useful if you're getting red-tinted images after inpainting/masking.
-- **Three GPU Memory Usage Settings** - `High` (fastest, maximum VRAM usage), `Balanced` (default - almost as fast, significantly lower VRAM usage), `Low` (slowest, very low VRAM usage). The `Low` setting is applied automatically for GPUs with less than 4 GB of VRAM.
-- **Find models in sub-folders** - This allows you to organize your models into sub-folders inside `models/stable-diffusion`, instead of keeping them all in a single folder.
-- **Save metadata as JSON** - You can now save the metadata files as either text or json files (choose in the Settings tab).
-- **Major rewrite of the code** - Most of the codebase has been reorganized and rewritten, to make it more manageable and easier for new developers to contribute features. We've separated our core engine into a new project called `sdkit`, which allows anyone to easily integrate Stable Diffusion (and related modules like GFPGAN etc) into their programming projects (via a simple `pip install sdkit`): https://github.com/easydiffusion/sdkit/
-- **Name change** - Last, and probably the least, the UI is now called "Easy Diffusion". It indicates the focus of this project - an easy way for people to play with Stable Diffusion.
-
-Our focus continues to remain on an easy installation experience, and an easy user-interface. While still remaining pretty powerful, in terms of features and speed.
-
-### Detailed changelog
-* 2.5.14 - 8 Feb 2023 - Fix broken auto-save settings. We renamed `sampler` to `sampler_name`, which caused old settings to fail.
-* 2.5.14 - 6 Feb 2023 - Simplify the UI for merging models, and some other minor UI tweaks. Better error reporting if a model failed to load.
-* 2.5.14 - 3 Feb 2023 - Fix the 'Make Similar Images' button, which was producing incorrect images (weren't very similar).
-* 2.5.13 - 1 Feb 2023 - Fix the remaining GPU memory leaks, including a better fix (more comprehensive) for the change in 2.5.12 (27 Jan).
-* 2.5.12 - 27 Jan 2023 - Fix a memory leak, which made the UI unresponsive after an out-of-memory error. The allocated memory is now freed-up after an error.
-* 2.5.11 - 25 Jan 2023 - UI for Merging Models. Thanks @JeLuf. More info: https://github.com/cmdr2/stable-diffusion-ui/wiki/Model-Merging
-* 2.5.10 - 24 Jan 2023 - Reduce the VRAM usage for img2img in 'balanced' mode (without reducing the rendering speed), to make it similar to v2.4 of this UI.
-* 2.5.9 - 23 Jan 2023 - Fix a bug where img2img would produce poorer-quality images for the same settings, as compared to version 2.4 of this UI.
-* 2.5.9 - 23 Jan 2023 - Reduce the VRAM usage for 'balanced' mode (without reducing the rendering speed), to make it similar to v2.4 of the UI.
-* 2.5.8 - 17 Jan 2023 - Fix a bug where 'Low' VRAM usage would consume a LOT of VRAM (on higher-end GPUs). Also fixed a bug that caused out-of-memory errors on SD 2.1-768 models, on 'high' VRAM usage setting.
-* 2.5.7 - 16 Jan 2023 - Fix a bug where VAE files ending with .vae.pt weren't getting displayed. Thanks Madrang, rbertus2000 and JeLuf.
-* 2.5.6 - 10 Jan 2023 - `Fill` tool for the Image Editor, to allow filling areas with color (or the entire image). And some bug fixes to the Image Editor. Thanks @mdiller.
-* 2.5.6 - 10 Jan 2023 - Find Stable Diffusion models in sub-folders inside `models/stable-diffusion`. This allows you to organize your models into sub-folders, instead of keeping them all in a single folder. Thanks @JeLuf.
-* 2.5.5 - 9 Jan 2023 - Lots of bug fixes. Thanks @patriceac and @JeLuf.
-* 2.5.4 - 29 Dec 2022 - Press Esc key on the keyboard to close the Image Editor. Thanks @patriceac.
-* 2.5.4 - 29 Dec 2022 - Lots of bug fixes in the UI. Thanks @patriceac.
-* 2.5.4 - 28 Dec 2022 - Full support for running tasks in parallel on multiple GPUs. Warning: 'Euler Ancestral', 'DPM2 Ancestral' and 'DPM++ 2s Ancestral' may produce slight variations in the image (if run in parallel), so we recommend using the other samplers.
-* 2.5.3 - 27 Dec 2022 - Fix broken drag-and-drop for text metadata files (as well as paste in clipboard).
-* 2.5.3 - 27 Dec 2022 - Allow upscaling by 2x as well as 4x.
-* 2.5.3 - 27 Dec 2022 - Fix broken renders on a second GPU.
-* 2.5.3 - 26 Dec 2022 - Add a `Remove` button on each image. Thanks @JeLuf.
-* 2.5.2 - 26 Dec 2022 - Fix broken inpainting if using non-square target images.
-* 2.5.2 - 26 Dec 2022 - Fix a bug where an incorrect model config would get used for some SD 2.1 models.
-* 2.5.2 - 26 Dec 2022 - Slight performance and memory improvement while rendering using SD 2.1 models.
-* 2.5.1 - 25 Dec 2022 - Allow custom config yaml files for models. You can put a config file (`.yaml`) next to the model file, with the same name as the model. For e.g. if you put `robo-diffusion-v2-base.yaml` next to `robo-diffusion-v2-base.ckpt`, it'll automatically use that config file.
-* 2.5.1 - 25 Dec 2022 - Fix broken rendering for SD 2.1-768 models. Fix broken rendering SD 2.0 safetensor models.
-* 2.5.0 - 25 Dec 2022 - Major new release! Nearly twice as fast, Full support for SD 2.1 (including low GPU RAM optimizations), 6 new samplers, Model Merging, Fast loading/unloading of VAEs, Database of known models, Color correction for img2img, Three GPU Memory Usage Settings, Save metadata as JSON, Major rewrite of the code, Name change.
-
-## v2.4
-### Major Changes
-- **Allow reordering the task queue** (by dragging and dropping tasks). Thanks @madrang
-- **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.24 - 9 Jan 2022 - Urgent fix for failures on old/long-term-support browsers. Thanks @JeLuf.
-* 2.4.23/22 - 29 Dec 2022 - Allow rolling back from the upcoming v2.5 change (in beta).
-* 2.4.21 - 23 Dec 2022 - Speed up image creation, by removing a delay (regression) of 4-5 seconds between clicking the `Make Image` button and calling the server.
-* 2.4.20 - 22 Dec 2022 - `Pause All` button to pause all the pending tasks. Thanks @JeLuf
-* 2.4.20 - 22 Dec 2022 - `Undo`/`Redo` buttons in the image editor. Thanks @JeLuf
-* 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,18 +6,19 @@ Thanks
 
 # For developers:
 
-If you would like to contribute to this project, there is a discord for discussion:
+If you would like to contribute to this project, there is a discord for dicussion:
 [![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) 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:
+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:
   
   for `.sh`
 ```
@@ -32,20 +33,23 @@ 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
 ``` 
-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`
+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`
 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 /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.
+`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.
 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. 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.
+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.

NSIS/README.md

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

NSIS/sdui.nsi

@@ -1,265 +0,0 @@
-; 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.md

@@ -1,145 +1,106 @@
-# Easy Diffusion 2.5
-### 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.
-
-[Installation guide](#step-1-download-and-extract-the-installer) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | <sub>[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB)</sub> <sup>(for support queries, and development discussions)</sup>
-
-![t2i](https://raw.githubusercontent.com/Stability-AI/stablediffusion/main/assets/stable-samples/txt2img/768/merged-0006.png)
-
-# Step 1: Download and extract the installer
-Click the download button for your operating system:
+# Stable Diffusion UI v2
+### A simple 1-click way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required.
 
 <p float="left">
-  <a href="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/releases/download/v2.4.13/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
+  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-win.png" width="200" /></a>
+  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-linux.png" width="200" /></a>
 </p>
 
-## 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.
+[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
 
-# Step 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.
+️‍🔥🎉 **New!** Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
 
-The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance.
+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.
 
-# 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.
-
-----
-
-# Easy for new users, powerful features for advanced users
-## Features:
-
-### 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.
-- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish.
-- **Intelligent Model Detection**: Automatically figures out the YAML config file to use for the chosen model (via a models database).
-- **Live Preview**: See the image as the AI is drawing it.
-- **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.
-- **Organize your models into sub-folders**
-
-### Image generation
-- **Supports**: "*Text to Image*" and "*Image to Image*".
-- **14 Samplers**: `ddim`, `plms`, `heun`, `euler`, `euler_a`, `dpm2`, `dpm2_a`, `lms`, `dpm_solver_stability`, `dpmpp_2s_a`, `dpmpp_2m`, `dpmpp_sde`, `dpm_fast`, `dpm_adaptive`
-- **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.
+# 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
 - **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`.
-- **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.
-
-### Advanced features
-- **Custom Models**: Use your own `.ckpt` or `.safetensors` file, by placing it inside the `models/stable-diffusion` folder!
-- **Stable Diffusion 2.1 support**
-- **Merge Models**
-- **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!
-
-### Performance and security
-- **Fast**: Creates a 512x512 image with euler_a in 5 seconds, on an NVIDIA 3060 12GB.
-- **Low Memory Usage**: Create 512x512 images with less than 3 GB of GPU RAM, and 768x768 images with less than 4 GB of GPU RAM!
+- **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.
-- **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.
-
-**(and a lot more)**
-
-----
-
-## Easy for new users:
-![Screenshot of the initial UI](https://user-images.githubusercontent.com/844287/217043152-29454d15-0387-4228-b70d-9a4b84aeb8ba.png)
-
-
-## Powerful features for advanced users:
-![Screenshot of advanced settings](https://user-images.githubusercontent.com/844287/217042588-fc53c975-bacd-4a9c-af88-37408734ade3.png)
+- **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM!
 
+![Screenshot of advanced settings](media/shot-v9.jpg?raw=true)
 
 ## Live Preview
-Useful for judging (and stopping) an image quickly, without waiting for it to finish rendering.
-
 ![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)
 
-## Task Queue
-![Screenshot of task queue](https://user-images.githubusercontent.com/844287/217043984-0b35f73b-1318-47cb-9eed-a2a91b430490.png)
-
-
 
 # System Requirements
 1. Windows 10/11, or Linux. Experimental support for Mac is coming soon.
-2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. If you don't have a compatible graphics card, it'll automatically run in the slower "CPU Mode".
-3. Minimum 8 GB of RAM and 25GB of disk space.
+2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. But if you don't have a compatible graphics card, you can still use it with a "Use CPU" setting. It'll be very slow, but it should still work.
 
-You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
+You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.
 
-----
+# Installation
+1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).
 
-# 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.
+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.
+
+**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.
+
+## With a text description
+1. Enter a text prompt, like `a photograph of an astronaut riding a horse` in the textbox.
+2. Press `Make Image`. This will take some time, depending on your system's processing power.
+3. See the image generated using your prompt.
+
+## With an image
+1. Click `Browse..` next to `Initial Image`. Select your desired image.
+2. An optional text prompt can help you further describe the kind of image you want to generate.
+3. Press `Make Image`. See the image generated using your prompt.
+
+You can use Face Correction or Upscaling to improve the image further.
+
+**Pro tip:** You can also click `Use as Input` on a generated image, to use it as the input image for your next generation. This can be useful for sequentially refining the generated image with a single click.
+
+**Another tip:** Images with the same aspect ratio of your generated image work best. E.g. 1:1 if you're generating images sized 512x512.
+
+## Problems? Troubleshooting
+Please try the common [troubleshooting](Troubleshooting.md) steps. If that doesn't fix it, please ask on the [discord server](https://discord.com/invite/u9yhsFmEkB), or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+
+# Image Settings
+You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Image settings'.
+
+Use the same `seed` number to get the same image for a certain prompt. This is useful for refining a prompt without losing the basic image design. Enable the `random images` checkbox to get random images.
+
+![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+
+# System Settings
+The system settings are reachable via the cogwheel symbol on the top right. It can be used to configure whether all generated images should 
+saved be automically, or to tune the Stable Diffusion image generation.
+
+![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
+
+# Image Modifiers
+![Screenshot of advanced settings](media/modifiers-v1.jpg?raw=true)
 
 # Bugs reports and code contributions welcome
 If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
 
-We could really use help on these aspects (click to view tasks that need your help):
-* [User Interface](https://github.com/users/cmdr2/projects/1/views/1)
-* [Engine](https://github.com/users/cmdr2/projects/3/views/1)
-* [Installer](https://github.com/users/cmdr2/projects/4/views/1)
-* [Documentation](https://github.com/users/cmdr2/projects/5/views/1)
-
-If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users.
+Also, please feel free to submit a pull request, if you have any code contributions in mind. Join the [discord server](https://discord.com/invite/u9yhsFmEkB) for development-related discussions, and for helping other users.
 
 # Disclaimer
 The authors of this project are not responsible for any content generated using this interface.
 
-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.
+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.

Troubleshooting.md

@@ -0,0 +1,75 @@
+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.
+
+**Windows:**
+1. Open the terminal
+2. Type `cd /path/to/stable-diffusion-ui` and press enter
+3. Type `installer/bin/activate` and press enter
+4. Type `cd stable-diffusion` and press enter
+5. Type `conda activate ./env` and press enter
+6. Type `python --version` and press enter. You should see 3.8.5.
+
+This will give you an activated conda environment. To confirm, type `python --version` and press enter. You should see 3.8.5.

build.bat

@@ -8,40 +8,40 @@
 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
+@set PYTHONNOUSERSITE=1
 
-@rem copy the installer files for Windows
+@mkdir dist\stable-diffusion-ui
 
-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
+@echo "Downloading components for the installer.."
 
-@rem copy the installer files for Linux and Mac
+@call conda env create --prefix installer -f environment.yaml
+@call conda activate .\installer
 
-@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
+@echo "Creating a distributable package.."
 
-@rem make the zip
+@call conda install -c conda-forge -y conda-pack
+@call conda pack --n-threads -1 --prefix installer --format tar
 
-cd dist\win
-call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-windows.zip
-cd ..\..
+@cd dist\stable-diffusion-ui
+@mkdir installer
 
-@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 ..\..
+@call tar -xf ..\..\installer.tar -C installer
 
-echo "Build ready. Upload the zip files inside the 'dist' folder."
+@mkdir scripts
 
-pause
+@copy ..\..\scripts\on_env_start.bat scripts\
+@copy "..\..\scripts\Start Stable Diffusion UI.cmd" .
+@copy ..\..\LICENSE .
+@copy "..\..\CreativeML Open RAIL-M License" .
+@copy "..\..\How to install and run.txt" .
+@echo. > scripts\install_status.txt
+
+@echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder."
+
+@echo "Cleaning up.."
+
+@cd ..\..
+
+@rmdir /s /q installer
+
+@del installer.tar

build.sh

@@ -11,39 +11,45 @@ case $yn in
     * ) exit;;
 esac
 
-# mkdir -p dist/win/stable-diffusion-ui/scripts
-mkdir -p dist/linux-mac/stable-diffusion-ui/scripts
+export PYTHONNOUSERSITE=1
 
-# copy the installer files for Windows
+mkdir -p dist/stable-diffusion-ui
 
-# 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
+echo "Downloading components for the installer.."
 
-# copy the installer files for Linux and Mac
+source ~/miniconda3/etc/profile.d/conda.sh
 
-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
+conda install -c conda-forge -y conda-pack
 
-# make the zip
+conda env create --prefix installer -f environment.yaml
+conda activate ./installer
 
-# cd dist/win
-# zip -r ../stable-diffusion-ui-windows.zip stable-diffusion-ui
-# cd ../..
+echo "Creating a distributable package.."
+
+conda pack --n-threads -1 --prefix installer --format tar
+
+cd dist/stable-diffusion-ui
+mkdir installer
+
+tar -xf ../../installer.tar -C installer
+
+mkdir scripts
+
+cp ../../scripts/on_env_start.sh scripts/
+cp ../../scripts/start.sh .
+cp ../../LICENSE .
+cp "../../CreativeML Open RAIL-M License" .
+cp "../../How to install and run.txt" .
+echo "" > scripts/install_status.txt
+
+chmod u+x start.sh
+
+echo "Build ready. Zip the 'dist/stable-diffusion-ui' folder."
+
+echo "Cleaning up.."
 
-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."
+rm -rf installer
+
+rm installer.tar

scripts/Developer Console.cmd

@@ -1,43 +0,0 @@
-@echo off
-
-echo "Opening Stable Diffusion UI - Developer Console.." & echo.
-
-set PATH=C:\Windows\System32;%PATH%
-
-@rem set legacy and new installer's PATH, if they exist
-if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
-if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
-
-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 legacy environment (if present) and set PYTHONPATH
-if exist "installer_files\env" (
-    set PYTHONPATH=%cd%\installer_files\env\lib\site-packages
-)
-if exist "stable-diffusion\env" (
-    call conda activate .\stable-diffusion\env
-    set PYTHONPATH=%cd%\stable-diffusion\env\lib\site-packages
-)
-
-call where python
-call python --version
-
-echo PYTHONPATH=%PYTHONPATH%
-
-@rem done
-echo.
-
-cmd /k

scripts/Start Stable Diffusion UI.cmd

@@ -1,27 +1,19 @@
 @echo off
 
-cd /d %~dp0
-set PATH=C:\Windows\System32;%PATH%
+@REM Delete the post-activate hook from the old installer
+if exist "installer\etc\conda\activate.d\post_activate.bat" (
+    echo. > installer\etc\conda\activate.d\post_activate.bat
+)
 
-@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%
+@call installer\Scripts\activate.bat
 
-@rem Setup the packages required for the installer
-call scripts\bootstrap.bat
+@call conda-unpack
 
-@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%
+@call conda --version
+@call git --version
 
-set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
+@cd installer
 
-@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
+@call ..\scripts\on_env_start.bat
 
 @pause

scripts/bootstrap.bat

@@ -1,77 +0,0 @@
-@echo off
-
-@rem This script will install git and conda (if not found on the PATH variable)
-@rem  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-@rem For users who already have git and conda, this step will be skipped.
-
-@rem This enables a user to install this project without manually installing conda and git.
-
-@rem config
-set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
-set INSTALL_ENV_DIR=%cd%\installer_files\env
-set LEGACY_INSTALL_ENV_DIR=%cd%\installer
-set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
-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 python=3.8.5
-)
-
-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

@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# This script will install git and conda (if not found on the PATH variable)
-#  using micromamba (an 8mb static-linked single-file binary, conda replacement).
-# For users who already have git and conda, this step will be skipped.
-
-# This enables a user to install this project without manually installing conda and git.
-
-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 python=3.8.5"; 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/check_modules.py

@@ -1,13 +0,0 @@
-'''
-This script checks if the given modules exist
-'''
-
-import sys
-import pkgutil
-
-modules = sys.argv[1:]
-missing_modules = []
-for m in modules:
-    if pkgutil.find_loader(m) is None:
-        print('module', m, 'not found')
-        exit(1)

scripts/developer_console.sh

@@ -1,53 +0,0 @@
-#!/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 legacy environment (if present) and set PYTHONPATH
-  if [ -e "installer_files/env" ]; then
-    export PYTHONPATH="$(pwd)/installer_files/env/lib/python3.8/site-packages"
-  fi
-  if [ -e "stable-diffusion/env" ]; then
-    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
-
-    export PYTHONPATH="$(pwd)/stable-diffusion/env/lib/python3.8/site-packages"
-  fi
-
-  which python
-  python --version
-
-  echo "PYTHONPATH=$PYTHONPATH"
-
-  # done
-
-  echo ""
-else
-  file_name=$(basename "${BASH_SOURCE[0]}")
-  bash --init-file "$file_name"
-fi

scripts/functions.sh

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

@@ -4,6 +4,8 @@
 
 set PATH=C:\Windows\System32;%PATH%
 
+@cd ..
+
 if exist "scripts\config.bat" (
     @call scripts\config.bat
 )
@@ -12,7 +14,7 @@ if "%update_branch%"=="" (
     set update_branch=main
 )
 
-@>nul findstr /m "conda_sd_ui_deps_installed" scripts\install_status.txt
+@>nul grep -c "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.
@@ -26,14 +28,14 @@ if "%update_branch%"=="" (
     )
 )
 
-@>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt
+@>nul grep -c "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 checkout "%update_branch%"
     @call git pull
 
     @cd ..
@@ -44,19 +46,16 @@ if "%update_branch%"=="" (
     @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!"
+        @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
         pause
         @exit /b
     )
 )
 
-@xcopy sd-ui-files\ui ui /s /i /Y /q
+@xcopy sd-ui-files\ui ui /s /i /Y
 @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
-@copy sd-ui-files\scripts\check_modules.py 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
+@pause

scripts/on_env_start.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source ./scripts/functions.sh
-
 printf "\n\nStable Diffusion UI\n\n"
 
 if [ -f "scripts/config.sh" ]; then
@@ -18,7 +16,7 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in
     cd sd-ui-files
 
     git reset --hard
-    git -c advice.detachedHead=false checkout "$update_branch"
+    git checkout "$update_branch"
     git pull
 
     cd ..
@@ -29,17 +27,16 @@ else
     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"
+        printf "\n\nError downloading Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
     fi
 fi
 
 rm -rf ui
 cp -Rf sd-ui-files/ui .
 cp sd-ui-files/scripts/on_sd_start.sh scripts/
-cp sd-ui-files/scripts/bootstrap.sh scripts/
-cp sd-ui-files/scripts/check_modules.py scripts/
 cp sd-ui-files/scripts/start.sh .
-cp sd-ui-files/scripts/developer_console.sh .
 
 ./scripts/on_sd_start.sh
 

scripts/on_sd_start.bat

@@ -1,202 +1,199 @@
 @echo off
 
+@copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y
+
 @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
-@copy sd-ui-files\scripts\check_modules.py scripts\ /Y
-
-if exist "%cd%\profile" (
-    set USERPROFILE=%cd%\profile
-)
-
-@rem set the correct installer path (current vs legacy)
-if exist "%cd%\installer_files\env" (
-    set INSTALL_ENV_DIR=%cd%\installer_files\env
-)
-if exist "%cd%\stable-diffusion\env" (
-    set INSTALL_ENV_DIR=%cd%\stable-diffusion\env
-)
-
-@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');"
 
-@rem create the stable-diffusion folder, to work with legacy installations
-if not exist "stable-diffusion" mkdir stable-diffusion
-cd stable-diffusion
+@>nul grep -c "sd_git_cloned" scripts\install_status.txt
+@if "%ERRORLEVEL%" EQU "0" (
+    @echo "Stable Diffusion's git repository was already installed. Updating.."
 
-@rem activate the old stable-diffusion env, if it exists
-if exist "env" (
-    call conda activate .\env
+    @cd stable-diffusion
+
+    @call git reset --hard
+    @call git pull
+    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+
+    @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
+
+    @cd ..
+) else (
+    @echo. & echo "Downloading Stable Diffusion.." & echo.
+
+    @call git clone https://github.com/basujindal/stable-diffusion.git && (
+        @echo sd_git_cloned >> scripts\install_status.txt
+    ) || (
+        @echo "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        pause
+        @exit /b
+    )
+
+    @cd stable-diffusion
+    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+
+    @call git apply ..\ui\sd_internal\ddim_callback.patch
+    @call git apply ..\ui\sd_internal\env_yaml.patch
+
+    @cd ..
 )
 
-@rem disable the legacy src and ldm folder (otherwise this prevents installing gfpgan and realesrgan)
-if exist src rename src src-old
-if exist ldm rename ldm ldm-old
+@cd stable-diffusion
 
-if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
-if not exist "..\models\gfpgan" mkdir "..\models\gfpgan"
-if not exist "..\models\realesrgan" mkdir "..\models\realesrgan"
-if not exist "..\models\vae" mkdir "..\models\vae"
+@>nul grep -c "conda_sd_env_created" ..\scripts\install_status.txt
+@if "%ERRORLEVEL%" EQU "0" (
+    @echo "Packages necessary for Stable Diffusion were already installed"
 
-@rem migrate the legacy models to the correct path (if already downloaded)
-if exist "sd-v1-4.ckpt" move sd-v1-4.ckpt ..\models\stable-diffusion\
-if exist "custom-model.ckpt" move custom-model.ckpt ..\models\stable-diffusion\
-if exist "GFPGANv1.3.pth" move GFPGANv1.3.pth ..\models\gfpgan\
-if exist "RealESRGAN_x4plus.pth" move RealESRGAN_x4plus.pth ..\models\realesrgan\
-if exist "RealESRGAN_x4plus_anime_6B.pth" move RealESRGAN_x4plus_anime_6B.pth ..\models\realesrgan\
-
-@rem install torch and torchvision
-call python ..\scripts\check_modules.py torch torchvision
-if "%ERRORLEVEL%" EQU "0" (
-    echo "torch and torchvision have already been installed."
+    @call conda activate .\env
 ) else (
-    echo "Installing torch and torchvision.."
+    @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.
 
-    @REM prevent from using packages from the user's home directory, to avoid conflicts
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
+    @rmdir /s /q .\env
 
-    call python -m pip install --upgrade torch torchvision --extra-index-url https://download.pytorch.org/whl/cu116 || (
-        echo "Error installing torch. 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!"
+    @REM prevent conda from using packages from the user's home directory, to avoid conflicts
+    @set PYTHONNOUSERSITE=1
+
+    @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
+
+    @call conda activate .\env
+
+    @call conda install -c conda-forge -y --prefix env antlr4-python3-runtime=4.8 || (
+        @echo. & echo "Error installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+
+    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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+
+    @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
 set PATH=C:\Windows\System32;%PATH%
 
-@rem install/upgrade sdkit
-call python ..\scripts\check_modules.py sdkit sdkit.models ldm transformers numpy antlr4 gfpgan realesrgan
-if "%ERRORLEVEL%" EQU "0" (
-    echo "sdkit is already installed."
-
-    @rem skip sdkit upgrade if in developer-mode
-    if not exist "..\src\sdkit" (
-        @REM prevent from using packages from the user's home directory, to avoid conflicts
-        set PYTHONNOUSERSITE=1
-        set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-        call python -m pip install --upgrade sdkit -q || (
-            echo "Error updating sdkit"
-        )
-    )
+@>nul grep -c "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 "Installing sdkit: https://pypi.org/project/sdkit/"
+    @echo. & echo "Downloading packages necessary for GFPGAN (Face Correction).." & echo.
 
-    @REM prevent from using packages from the user's home directory, to avoid conflicts
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
+    @set PYTHONNOUSERSITE=1
 
-    call python -m pip install sdkit || (
-        echo "Error installing sdkit. 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!"
+    @call pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN || (
+        @echo. & echo "Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
-)
 
-call python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
-
-@rem upgrade stable-diffusion-sdkit
-call python -m pip install --upgrade stable-diffusion-sdkit -q || (
-    echo "Error updating stable-diffusion-sdkit"
-)
-call python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
-
-@rem install rich
-call python ..\scripts\check_modules.py rich
-if "%ERRORLEVEL%" EQU "0" (
-    echo "rich has already been installed."
-) else (
-    echo "Installing rich.."
-
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-    call python -m pip install rich || (
-        echo "Error installing rich. 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!"
+    @call pip install basicsr==1.4.2 || (
+        @echo. & echo "Error installing the basicsr package necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
+
+    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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+
+    @echo conda_sd_gfpgan_deps_installed >> ..\scripts\install_status.txt
 )
 
-set PATH=C:\Windows\System32;%PATH%
+@>nul grep -c "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.
 
-call python ..\scripts\check_modules.py uvicorn fastapi
+    @set PYTHONNOUSERSITE=1
+
+    @call pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan || (
+        @echo. & echo "Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+
+    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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+
+    @echo conda_sd_esrgan_deps_installed >> ..\scripts\install_status.txt
+)
+
+@>nul grep -c "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 PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
+    @set PYTHONNOUSERSITE=1
 
-    @call conda install -c conda-forge -y 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!"
+    @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
         pause
         exit /b
     )
 )
 
 call WHERE uvicorn > .tmp
-@>nul findstr /m "uvicorn" .tmp
+@>nul grep -c "uvicorn" .tmp
 @if "%ERRORLEVEL%" NEQ "0" (
-    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
     pause
     exit /b
 )
 
-@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
+@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
     @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )
 
-@if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
-    for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
+
+
+@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 ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zJ" EQU "7703807346" (
+        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 ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
+            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 models\stable-diffusion\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
-                del "..\models\stable-diffusion\sd-v1-4.ckpt"
+                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 "..\models\stable-diffusion\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://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ..\models\stable-diffusion\sd-v1-4.ckpt
+    @call curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
 
-    @if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
-        for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
+    @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.
+            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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) 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.
+        @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -204,29 +201,29 @@ call WHERE uvicorn > .tmp
 
 
 
-@if exist "..\models\gfpgan\GFPGANv1.3.pth" (
-    for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" EQU "348632874" (
+@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 models\gfpgan\GFPGANv1.3.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\gfpgan\GFPGANv1.3.pth"
+        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 "..\models\gfpgan\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 > ..\models\gfpgan\GFPGANv1.3.pth
+    @call curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > GFPGANv1.3.pth
 
-    @if exist "..\models\gfpgan\GFPGANv1.3.pth" (
-        for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
+    @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.
+            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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) 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.
+        @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -234,29 +231,29 @@ call WHERE uvicorn > .tmp
 
 
 
-@if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
-    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
+@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 models\realesrgan\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\realesrgan\RealESRGAN_x4plus.pth"
+        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "RealESRGAN_x4plus.pth"
     )
 )
 
-@if not exist "..\models\realesrgan\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 > ..\models\realesrgan\RealESRGAN_x4plus.pth
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > RealESRGAN_x4plus.pth
 
-    @if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
-        for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
+    @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.
+            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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) 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.
+        @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -264,29 +261,29 @@ call WHERE uvicorn > .tmp
 
 
 
-@if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
-    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
+@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 models\realesrgan\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth"
+        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "RealESRGAN_x4plus_anime_6B.pth"
     )
 )
 
-@if not exist "..\models\realesrgan\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 > ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth
+    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > RealESRGAN_x4plus_anime_6B.pth
 
-    @if exist "..\models\realesrgan\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.
+            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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) 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.
+        @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/blob/main/Troubleshooting.md" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -294,35 +291,7 @@ call WHERE uvicorn > .tmp
 
 
 
-@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
-    )
-)
-
-@>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt
+@>nul grep -c "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
@@ -332,22 +301,17 @@ call WHERE uvicorn > .tmp
 
 @set SD_DIR=%cd%
 
-set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-echo PYTHONPATH=%PYTHONPATH%
-
-call where python
-call python --version
+@cd env\lib\site-packages
+@set PYTHONPATH=%SD_DIR%;%cd%
+@cd ..\..\..
+@echo PYTHONPATH=%PYTHONPATH%
 
 @cd ..
 @set SD_UI_PATH=%cd%\ui
 @cd stable-diffusion
 
-@rem set any overrides
-set HF_HUB_DISABLE_SYMLINKS_WARNING=true
+@call python --version
 
-@if NOT DEFINED SD_UI_BIND_PORT set SD_UI_BIND_PORT=9000
-@if NOT DEFINED SD_UI_BIND_IP set SD_UI_BIND_IP=0.0.0.0
-@uvicorn main:server_api --app-dir "%SD_UI_PATH%" --port %SD_UI_BIND_PORT% --host %SD_UI_BIND_IP% --log-level error
+@uvicorn server:app --app-dir "%SD_UI_PATH%" --port 9000 --host 0.0.0.0
 
-
-@pause
+@pause

scripts/on_sd_start.sh

@@ -1,280 +1,292 @@
 #!/bin/bash
 
-source ./scripts/functions.sh
-
 cp sd-ui-files/scripts/on_env_start.sh scripts/
-cp sd-ui-files/scripts/bootstrap.sh scripts/
-cp sd-ui-files/scripts/check_modules.py scripts/
 
-# activate the installer env
-CONDA_BASEPATH=$(conda info --base)
-source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
+source installer/etc/profile.d/conda.sh
 
-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');" 
+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.
 
-# set the correct installer path (current vs legacy)
-if [ -e "installer_files/env" ]; then
-    export INSTALL_ENV_DIR="$(pwd)/installer_files/env"
-fi
-if [ -e "stable-diffusion/env" ]; then
-    export INSTALL_ENV_DIR="$(pwd)/stable-diffusion/env"
+if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/install_status.txt` -gt "0" ]; then
+    echo "Stable Diffusion's git repository was already installed. Updating.."
+
+    cd stable-diffusion
+
+    git reset --hard
+    git pull
+    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+
+    git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
+
+    cd ..
+else
+    printf "\n\nDownloading Stable Diffusion..\n\n"
+
+    if git clone https://github.com/basujindal/stable-diffusion.git ; then
+        echo sd_git_cloned >> scripts/install_status.txt
+    else
+        printf "\n\nError downloading Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    cd stable-diffusion
+    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
+
+    git apply ../ui/sd_internal/ddim_callback.patch
+    git apply ../ui/sd_internal/env_yaml.patch
+
+    cd ..
 fi
 
-# create the stable-diffusion folder, to work with legacy installations
-if [ ! -e "stable-diffusion" ]; then mkdir stable-diffusion; fi
 cd stable-diffusion
 
-# activate the old stable-diffusion env, if it exists
-if [ -e "env" ]; then
-    conda activate ./env || fail "conda activate failed"
+if [ `grep -c conda_sd_env_created ../scripts/install_status.txt` -gt "0" ]; then
+    echo "Packages necessary for Stable Diffusion were already installed"
+
+    conda activate ./env
+else
+    printf "\n\nDownloading packages necessary for Stable Diffusion..\n"
+    printf "\n\n***** This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient ***** ..\n\n"
+
+    # prevent conda from using packages from the user's home directory, to avoid conflicts
+    export PYTHONNOUSERSITE=1
+
+    if conda env create --prefix env --force -f environment.yaml ; then
+        echo "Installed. Testing.."
+    else
+        printf "\n\nError installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    conda activate ./env
+
+    if conda install -c conda-forge --prefix ./env -y antlr4-python3-runtime=4.8 ; then
+        echo "Installed. Testing.."
+    else
+        printf "\n\nError installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    echo conda_sd_env_created >> ../scripts/install_status.txt
 fi
 
-# disable the legacy src and ldm folder (otherwise this prevents installing gfpgan and realesrgan)
-if [ -e "src" ]; then mv src src-old; fi
-if [ -e "ldm" ]; then mv ldm ldm-old; fi
-
-mkdir -p "../models/stable-diffusion"
-mkdir -p "../models/gfpgan"
-mkdir -p "../models/realesrgan"
-mkdir -p "../models/vae"
-
-# migrate the legacy models to the correct path (if already downloaded)
-if [ -e "sd-v1-4.ckpt" ]; then mv sd-v1-4.ckpt ../models/stable-diffusion/; fi
-if [ -e "custom-model.ckpt" ]; then mv custom-model.ckpt ../models/stable-diffusion/; fi
-if [ -e "GFPGANv1.3.pth" ]; then mv GFPGANv1.3.pth ../models/gfpgan/; fi
-if [ -e "RealESRGAN_x4plus.pth" ]; then mv RealESRGAN_x4plus.pth ../models/realesrgan/; fi
-if [ -e "RealESRGAN_x4plus_anime_6B.pth" ]; then mv RealESRGAN_x4plus_anime_6B.pth ../models/realesrgan/; fi
-
-# install torch and torchvision
-if python ../scripts/check_modules.py torch torchvision; then
-    echo "torch and torchvision have already been installed."
+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
-    echo "Installing torch and torchvision.."
+    printf "\n\nDownloading packages necessary for GFPGAN (Face Correction)..\n"
 
     export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
 
-    if python -m pip install --upgrade torch torchvision --extra-index-url https://download.pytorch.org/whl/cu116 ; then
-        echo "Installed."
+    if pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN ; then
+        echo "Installed. Testing.."
     else
-        fail "torch install failed" 
+        printf "\n\nError installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
     fi
+
+    out_test=`python -c "from gfpgan import GFPGANer; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        printf "\n\nDependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    echo conda_sd_gfpgan_deps_installed >> ../scripts/install_status.txt
 fi
 
-# install/upgrade sdkit
-if python ../scripts/check_modules.py sdkit sdkit.models ldm transformers numpy antlr4 gfpgan realesrgan ; then
-    echo "sdkit is already installed."
-
-    # skip sdkit upgrade if in developer-mode
-    if [ ! -e "../src/sdkit" ]; then
-        export PYTHONNOUSERSITE=1
-        export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-        python -m pip install --upgrade sdkit -q
-    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
-    echo "Installing sdkit: https://pypi.org/project/sdkit/"
+    printf "\n\nDownloading packages necessary for ESRGAN (Resolution Upscaling)..\n"
 
     export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
 
-    if python -m pip install sdkit ; then
-        echo "Installed."
+    if pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan ; then
+        echo "Installed. Testing.."
     else
-        fail "sdkit install failed"
+        printf "\n\nError installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
     fi
+
+    out_test=`python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"`
+    if [ "$out_test" != "42" ]; then
+        printf "\n\nDependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+
+    echo conda_sd_esrgan_deps_installed >> ../scripts/install_status.txt
 fi
 
-python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
-
-# upgrade stable-diffusion-sdkit
-python -m pip install --upgrade stable-diffusion-sdkit -q
-python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
-
-# install rich
-if python ../scripts/check_modules.py rich; then
-    echo "rich has already been installed."
-else
-    echo "Installing rich.."
-
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-    if python -m pip install rich ; then
-        echo "Installed."
-    else
-        fail "Install failed for rich"
-    fi
-fi
-
-if python ../scripts/check_modules.py uvicorn fastapi ; then
+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="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
 
-    if conda install -c conda-forge -y uvicorn fastapi ; then
+    if conda install -c conda-forge --prefix ./env -y uvicorn fastapi ; then
         echo "Installed. Testing.."
     else
-        fail "'conda install uvicorn' failed" 
+        printf "\n\nError installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
     fi
 
     if ! command -v uvicorn &> /dev/null; then
-        fail "UI packages not found!"
+        printf "\n\nUI packages not found! Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
     fi
+
+    echo conda_sd_ui_deps_installed >> ../scripts/install_status.txt
 fi
 
-if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
-    model_size=`find "../models/stable-diffusion/sd-v1-4.ckpt" -printf "%s"`
+
+
+if [ -f "sd-v1-4.ckpt" ]; then
+    model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`
 
     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 models/stable-diffusion/sd-v1-4.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/stable-diffusion/sd-v1-4.ckpt
+        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 "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
+if [ ! -f "sd-v1-4.ckpt" ]; then
     echo "Downloading data files (weights) for Stable Diffusion.."
 
-    curl -L -k https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ../models/stable-diffusion/sd-v1-4.ckpt
+    curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
 
-    if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
-        model_size=`find "../models/stable-diffusion/sd-v1-4.ckpt" -printf "%s"`
+    if [ -f "sd-v1-4.ckpt" ]; then
+        model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`
         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 "../models/gfpgan/GFPGANv1.3.pth" ]; then
-    model_size=`find "../models/gfpgan/GFPGANv1.3.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "348632874" ]; then
-        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
-    else
-        printf "\n\nThe model file present at models/gfpgan/GFPGANv1.3.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/gfpgan/GFPGANv1.3.pth
-    fi
-fi
-
-if [ ! -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
-    echo "Downloading data files (weights) for GFPGAN (Face Correction).."
-
-    curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > ../models/gfpgan/GFPGANv1.3.pth
-
-    if [ -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
-        model_size=`find "../models/gfpgan/GFPGANv1.3.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "348632874" ]; then
-            fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for GFPGAN (Face Correction)."
-    fi
-fi
-
-
-if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-    model_size=`find "../models/realesrgan/RealESRGAN_x4plus.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "67040989" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
-    else
-        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/realesrgan/RealESRGAN_x4plus.pth
-    fi
-fi
-
-if [ ! -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.."
-
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > ../models/realesrgan/RealESRGAN_x4plus.pth
-
-    if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-        model_size=`find "../models/realesrgan/RealESRGAN_x4plus.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "67040989" ]; then
-            fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus"
-    fi
-fi
-
-
-if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`find "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
-
-    if [ "$model_size" -eq "17938799" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
-    else
-        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus_anime_6B.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
-    fi
-fi
-
-if [ ! -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.."
-
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
-
-    if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-        model_size=`find "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
-        if [ ! "$model_size" -eq "17938799" ]; then
-            fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
-        fi
-    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"
+            printf "\n\nError: The downloaded model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\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"
+        printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
         read -p "Press any key to continue"
         exit
     fi
 fi
 
+
+if [ -f "GFPGANv1.3.pth" ]; then
+    model_size=`ls -l GFPGANv1.3.pth | awk '{print $5}'`
+
+    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=`ls -l GFPGANv1.3.pth | awk '{print $5}'`
+        if [ ! "$model_size" -eq "348632874" ]; then
+            printf "\n\nError: The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
+        fi
+    else
+        printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+fi
+
+
+if [ -f "RealESRGAN_x4plus.pth" ]; then
+    model_size=`ls -l RealESRGAN_x4plus.pth | awk '{print $5}'`
+
+    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=`ls -l RealESRGAN_x4plus.pth | awk '{print $5}'`
+        if [ ! "$model_size" -eq "67040989" ]; then
+            printf "\n\nError: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
+        fi
+    else
+        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+fi
+
+
+if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
+    model_size=`ls -l RealESRGAN_x4plus_anime_6B.pth | awk '{print $5}'`
+
+    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=`ls -l RealESRGAN_x4plus_anime_6B.pth | awk '{print $5}'`
+        if [ ! "$model_size" -eq "17938799" ]; then
+            printf "\n\nError: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+            read -p "Press any key to continue"
+            exit
+        fi
+    else
+        printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/blob/main/Troubleshooting.md\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
+        read -p "Press any key to continue"
+        exit
+    fi
+fi
+
+
 if [ `grep -c sd_install_complete ../scripts/install_status.txt` -gt "0" ]; then
     echo sd_weights_downloaded >> ../scripts/install_status.txt
     echo sd_install_complete >> ../scripts/install_status.txt
@@ -283,17 +295,15 @@ fi
 printf "\n\nStable Diffusion is ready!\n\n"
 
 SD_PATH=`pwd`
-
-export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
+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 main:server_api --app-dir "$SD_UI_PATH" --port ${SD_UI_BIND_PORT:-9000} --host ${SD_UI_BIND_IP:-0.0.0.0} --log-level error
+python --version
+
+uvicorn server:app --app-dir "$SD_UI_PATH" --port 9000 --host 0.0.0.0
 
 read -p "Press any key to continue"

scripts/post_activate.bat

@@ -0,0 +1,6 @@
+@call conda --version
+@call git --version
+
+cd %CONDA_PREFIX%\..\scripts
+
+on_env_start.bat

scripts/post_activate.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+conda-unpack
+
+source $CONDA_PREFIX/etc/profile.d/conda.sh
+
+conda --version
+git --version
+
+cd $CONDA_PREFIX/../scripts
+
+./on_env_start.sh

scripts/start.sh

@@ -1,23 +1,10 @@
 #!/bin/bash
 
-cd "$(dirname "${BASH_SOURCE[0]}")"
+source installer/bin/activate
 
-# set legacy installer's PATH, if it exists
-if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
+conda-unpack
 
-# Setup the packages required for the installer
-scripts/bootstrap.sh || exit 1
+conda --version
+git --version
 
-# 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
-chmod +x scripts/*.sh
 scripts/on_env_start.sh

ui/easydiffusion/app.py

@@ -1,165 +0,0 @@
-import os
-import socket
-import sys
-import json
-import traceback
-import logging
-from rich.logging import RichHandler
-
-from sdkit.utils import log as sdkit_log # hack, so we can overwrite the log config
-
-from easydiffusion import task_manager
-from easydiffusion.utils import log
-
-# Remove all handlers associated with the root logger object.
-for handler in logging.root.handlers[:]:
-    logging.root.removeHandler(handler)
-
-LOG_FORMAT = '%(asctime)s.%(msecs)03d %(levelname)s %(threadName)s %(message)s'
-logging.basicConfig(
-        level=logging.INFO,
-        format=LOG_FORMAT,
-        datefmt="%X",
-        handlers=[RichHandler(markup=True, rich_tracebacks=False, show_time=False, show_level=False)],
-)
-
-SD_DIR = os.getcwd()
-
-SD_UI_DIR = os.getenv('SD_UI_PATH', None)
-sys.path.append(os.path.dirname(SD_UI_DIR))
-
-CONFIG_DIR = os.path.abspath(os.path.join(SD_UI_DIR, '..', 'scripts'))
-MODELS_DIR = os.path.abspath(os.path.join(SD_DIR, '..', 'models'))
-
-USER_UI_PLUGINS_DIR = os.path.abspath(os.path.join(SD_DIR, '..', 'plugins', 'ui'))
-CORE_UI_PLUGINS_DIR = os.path.abspath(os.path.join(SD_UI_DIR, 'plugins', 'ui'))
-UI_PLUGINS_SOURCES = ((CORE_UI_PLUGINS_DIR, 'core'), (USER_UI_PLUGINS_DIR, 'user'))
-
-OUTPUT_DIRNAME = "Stable Diffusion UI" # in the user's home folder
-TASK_TTL = 15 * 60 # Discard last session's task timeout
-APP_CONFIG_DEFAULTS = {
-    # auto: selects the cuda device with the most free memory, cuda: use the currently active cuda device.
-    'render_devices': 'auto', # valid entries: 'auto', 'cpu' or 'cuda:N' (where N is a GPU index)
-    'update_branch': 'main',
-    'ui': {
-        'open_browser_on_start': True,
-    },
-}
-
-def init():
-    os.makedirs(USER_UI_PLUGINS_DIR, exist_ok=True)
-
-    update_render_threads()
-
-def getConfig(default_val=APP_CONFIG_DEFAULTS):
-    try:
-        config_json_path = os.path.join(CONFIG_DIR, 'config.json')
-        if not os.path.exists(config_json_path):
-            return default_val
-        with open(config_json_path, 'r', encoding='utf-8') as f:
-            config = json.load(f)
-            if 'net' not in config:
-                config['net'] = {}
-            if os.getenv('SD_UI_BIND_PORT') is not None:
-                config['net']['listen_port'] = int(os.getenv('SD_UI_BIND_PORT'))
-            if os.getenv('SD_UI_BIND_IP') is not None:
-                config['net']['listen_to_network'] = (os.getenv('SD_UI_BIND_IP') == '0.0.0.0')
-            return config
-    except Exception as e:
-        log.warn(traceback.format_exc())
-        return default_val
-
-def setConfig(config):
-    try: # config.json
-        config_json_path = os.path.join(CONFIG_DIR, 'config.json')
-        with open(config_json_path, 'w', encoding='utf-8') as f:
-            json.dump(config, f)
-    except:
-        log.error(traceback.format_exc())
-
-    try: # config.bat
-        config_bat_path = os.path.join(CONFIG_DIR, 'config.bat')
-        config_bat = []
-
-        if 'update_branch' in config:
-            config_bat.append(f"@set update_branch={config['update_branch']}")
-
-        config_bat.append(f"@set SD_UI_BIND_PORT={config['net']['listen_port']}")
-        bind_ip = '0.0.0.0' if config['net']['listen_to_network'] else '127.0.0.1'
-        config_bat.append(f"@set SD_UI_BIND_IP={bind_ip}")
-
-        if len(config_bat) > 0:
-            with open(config_bat_path, 'w', encoding='utf-8') as f:
-                f.write('\r\n'.join(config_bat))
-    except:
-        log.error(traceback.format_exc())
-
-    try: # config.sh
-        config_sh_path = os.path.join(CONFIG_DIR, 'config.sh')
-        config_sh = ['#!/bin/bash']
-
-        if 'update_branch' in config:
-            config_sh.append(f"export update_branch={config['update_branch']}")
-
-        config_sh.append(f"export SD_UI_BIND_PORT={config['net']['listen_port']}")
-        bind_ip = '0.0.0.0' if config['net']['listen_to_network'] else '127.0.0.1'
-        config_sh.append(f"export SD_UI_BIND_IP={bind_ip}")
-
-        if len(config_sh) > 1:
-            with open(config_sh_path, 'w', encoding='utf-8') as f:
-                f.write('\n'.join(config_sh))
-    except:
-        log.error(traceback.format_exc())
-
-def save_to_config(ckpt_model_name, vae_model_name, hypernetwork_model_name, vram_usage_level):
-    config = getConfig()
-    if 'model' not in config:
-        config['model'] = {}
-
-    config['model']['stable-diffusion'] = ckpt_model_name
-    config['model']['vae'] = vae_model_name
-    config['model']['hypernetwork'] = hypernetwork_model_name
-
-    if vae_model_name is None or vae_model_name == "":
-        del config['model']['vae']
-    if hypernetwork_model_name is None or hypernetwork_model_name == "":
-        del config['model']['hypernetwork']
-
-    config['vram_usage_level'] = vram_usage_level
-
-    setConfig(config)
-
-def update_render_threads():
-    config = getConfig()
-    render_devices = config.get('render_devices', 'auto')
-    active_devices = task_manager.get_devices()['active'].keys()
-
-    log.debug(f'requesting for render_devices: {render_devices}')
-    task_manager.update_render_threads(render_devices, active_devices)
-
-def getUIPlugins():
-    plugins = []
-
-    for plugins_dir, dir_prefix in UI_PLUGINS_SOURCES:
-        for file in os.listdir(plugins_dir):
-            if file.endswith('.plugin.js'):
-                plugins.append(f'/plugins/{dir_prefix}/{file}')
-
-    return plugins
-
-def getIPConfig():
-    try:
-        ips = socket.gethostbyname_ex(socket.gethostname())
-        ips[2].append(ips[0])
-        return ips[2]
-    except Exception as e:
-        log.exception(e)
-        return []
-
-def open_browser():
-    config = getConfig()
-    ui = config.get('ui', {})
-    net = config.get('net', {'listen_port':9000})
-    port = net.get('listen_port', 9000)
-    if ui.get('open_browser_on_start', True):
-        import webbrowser; webbrowser.open(f"http://localhost:{port}")

ui/easydiffusion/device_manager.py

@@ -1,199 +0,0 @@
-import os
-import torch
-import traceback
-import re
-
-from easydiffusion.utils import log
-
-'''
-Set `FORCE_FULL_PRECISION` in the environment variables, or in `config.bat`/`config.sh` to set full precision (i.e. float32).
-Otherwise the models will load at half-precision (i.e. float16).
-
-Half-precision is fine most of the time. Full precision is only needed for working around GPU bugs (like NVIDIA 16xx GPUs).
-'''
-
-COMPARABLE_GPU_PERCENTILE = 0.65 # if a GPU's free_mem is within this % of the GPU with the most free_mem, it will be picked
-
-mem_free_threshold = 0
-
-def get_device_delta(render_devices, active_devices):
-    '''
-    render_devices: 'cpu', or 'auto' or ['cuda:N'...]
-    active_devices: ['cpu', 'cuda:N'...]
-    '''
-
-    if render_devices in ('cpu', 'auto'):
-        render_devices = [render_devices]
-    elif render_devices is not None:
-        if isinstance(render_devices, str):
-            render_devices = [render_devices]
-        if isinstance(render_devices, list) and len(render_devices) > 0:
-            render_devices = list(filter(lambda x: x.startswith('cuda:'), render_devices))
-            if len(render_devices) == 0:
-                raise Exception('Invalid render_devices value in config.json. Valid: {"render_devices": ["cuda:0", "cuda:1"...]}, or {"render_devices": "cpu"} or {"render_devices": "auto"}')
-
-            render_devices = list(filter(lambda x: is_device_compatible(x), render_devices))
-            if len(render_devices) == 0:
-                raise Exception('Sorry, none of the render_devices configured in config.json are compatible with Stable Diffusion')
-        else:
-            raise Exception('Invalid render_devices value in config.json. Valid: {"render_devices": ["cuda:0", "cuda:1"...]}, or {"render_devices": "cpu"} or {"render_devices": "auto"}')
-    else:
-        render_devices = ['auto']
-
-    if 'auto' in render_devices:
-        render_devices = auto_pick_devices(active_devices)
-        if 'cpu' in render_devices:
-            log.warn('WARNING: Could not find a compatible GPU. Using the CPU, but this will be very slow!')
-
-    active_devices = set(active_devices)
-    render_devices = set(render_devices)
-
-    devices_to_start = render_devices - active_devices
-    devices_to_stop = active_devices - render_devices
-
-    return devices_to_start, devices_to_stop
-
-def auto_pick_devices(currently_active_devices):
-    global mem_free_threshold
-
-    if not torch.cuda.is_available(): return ['cpu']
-
-    device_count = torch.cuda.device_count()
-    if device_count == 1:
-        return ['cuda:0'] if is_device_compatible('cuda:0') else ['cpu']
-
-    log.debug('Autoselecting GPU. Using most free memory.')
-    devices = []
-    for device in range(device_count):
-        device = f'cuda:{device}'
-        if not is_device_compatible(device):
-            continue
-
-        mem_free, mem_total = torch.cuda.mem_get_info(device)
-        mem_free /= float(10**9)
-        mem_total /= float(10**9)
-        device_name = torch.cuda.get_device_name(device)
-        log.debug(f'{device} detected: {device_name} - Memory (free/total): {round(mem_free, 2)}Gb / {round(mem_total, 2)}Gb')
-        devices.append({'device': device, 'device_name': device_name, 'mem_free': mem_free})
-
-    devices.sort(key=lambda x:x['mem_free'], reverse=True)
-    max_mem_free = devices[0]['mem_free']
-    curr_mem_free_threshold = COMPARABLE_GPU_PERCENTILE * max_mem_free
-    mem_free_threshold = max(curr_mem_free_threshold, mem_free_threshold)
-
-    # Auto-pick algorithm:
-    # 1. Pick the top 75 percentile of the GPUs, sorted by free_mem.
-    # 2. Also include already-running devices (GPU-only), otherwise their free_mem will
-    #    always be very low (since their VRAM contains the model).
-    #    These already-running devices probably aren't terrible, since they were picked in the past.
-    #    Worst case, the user can restart the program and that'll get rid of them.
-    devices = list(filter((lambda x: x['mem_free'] > mem_free_threshold or x['device'] in currently_active_devices), devices))
-    devices = list(map(lambda x: x['device'], devices))
-    return devices
-
-def device_init(context, device):
-    '''
-    This function assumes the 'device' has already been verified to be compatible.
-    `get_device_delta()` has already filtered out incompatible devices.
-    '''
-
-    validate_device_id(device, log_prefix='device_init')
-
-    if device == 'cpu':
-        context.device = 'cpu'
-        context.device_name = get_processor_name()
-        context.half_precision = False
-        log.debug(f'Render device CPU available as {context.device_name}')
-        return
-
-    context.device_name = torch.cuda.get_device_name(device)
-    context.device = device
-
-    # Force full precision on 1660 and 1650 NVIDIA cards to avoid creating green images
-    if needs_to_force_full_precision(context):
-        log.warn(f'forcing full precision on this GPU, to avoid green images. GPU detected: {context.device_name}')
-        # Apply force_full_precision now before models are loaded.
-        context.half_precision = False
-
-    log.info(f'Setting {device} as active, with precision: {"half" if context.half_precision else "full"}')
-    torch.cuda.device(device)
-
-    return
-
-def needs_to_force_full_precision(context):
-    if 'FORCE_FULL_PRECISION' in os.environ:
-        return True
-
-    device_name = context.device_name.lower()
-    return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name))
-
-def get_max_vram_usage_level(device):
-    if device != 'cpu':
-        _, mem_total = torch.cuda.mem_get_info(device)
-        mem_total /= float(10**9)
-
-        if mem_total < 4.5:
-            return 'low'
-        elif mem_total < 6.5:
-            return 'balanced'
-
-    return 'high'
-
-def validate_device_id(device, log_prefix=''):
-    def is_valid():
-        if not isinstance(device, str):
-            return False
-        if device == 'cpu':
-            return True
-        if not device.startswith('cuda:') or not device[5:].isnumeric():
-            return False
-        return True
-
-    if not is_valid():
-        raise EnvironmentError(f"{log_prefix}: device id should be 'cpu', or 'cuda:N' (where N is an integer index for the GPU). Got: {device}")
-
-def is_device_compatible(device):
-    '''
-    Returns True/False, and prints any compatibility errors
-    '''
-    # static variable "history". 
-    is_device_compatible.history = getattr(is_device_compatible, 'history', {})
-    try:
-        validate_device_id(device, log_prefix='is_device_compatible')
-    except:
-        log.error(str(e))
-        return False
-
-    if device == 'cpu': return True
-    # Memory check
-    try:
-        _, mem_total = torch.cuda.mem_get_info(device)
-        mem_total /= float(10**9)
-        if mem_total < 3.0:
-            if is_device_compatible.history.get(device) == None:
-               log.warn(f'GPU {device} with less than 3 GB of VRAM is not compatible with Stable Diffusion')
-               is_device_compatible.history[device] = 1
-            return False
-    except RuntimeError as e:
-        log.error(str(e))
-        return False
-    return True
-
-def get_processor_name():
-    try:
-        import platform, subprocess
-        if platform.system() == "Windows":
-            return platform.processor()
-        elif platform.system() == "Darwin":
-            os.environ['PATH'] = os.environ['PATH'] + os.pathsep + '/usr/sbin'
-            command = "sysctl -n machdep.cpu.brand_string"
-            return subprocess.check_output(command).strip()
-        elif platform.system() == "Linux":
-            command = "cat /proc/cpuinfo"
-            all_info = subprocess.check_output(command, shell=True).decode().strip()
-            for line in all_info.split("\n"):
-                if "model name" in line:
-                    return re.sub(".*model name.*:", "", line, 1).strip()
-    except:
-        log.error(traceback.format_exc())
-        return "cpu"

ui/easydiffusion/model_manager.py

@@ -1,230 +0,0 @@
-import os
-
-from easydiffusion import app, device_manager
-from easydiffusion.types import TaskData
-from easydiffusion.utils import log
-
-from sdkit import Context
-from sdkit.models import load_model, unload_model, get_model_info_from_db, scan_model
-from sdkit.utils import hash_file_quick
-
-KNOWN_MODEL_TYPES = ['stable-diffusion', 'vae', 'hypernetwork', 'gfpgan', 'realesrgan']
-MODEL_EXTENSIONS = {
-    'stable-diffusion': ['.ckpt', '.safetensors'],
-    'vae': ['.vae.pt', '.ckpt', '.safetensors'],
-    'hypernetwork': ['.pt', '.safetensors'],
-    'gfpgan': ['.pth'],
-    'realesrgan': ['.pth'],
-}
-DEFAULT_MODELS = {
-    'stable-diffusion': [ # needed to support the legacy installations
-        'custom-model', # only one custom model file was supported initially, creatively named 'custom-model'
-        'sd-v1-4', # Default fallback.
-    ],
-    'gfpgan': ['GFPGANv1.3'],
-    'realesrgan': ['RealESRGAN_x4plus'],
-}
-MODELS_TO_LOAD_ON_START = ['stable-diffusion', 'vae', 'hypernetwork']
-
-known_models = {}
-
-def init():
-    make_model_folders()
-    getModels() # run this once, to cache the picklescan results
-
-def load_default_models(context: Context):
-    set_vram_optimizations(context)
-
-    # init default model paths
-    for model_type in MODELS_TO_LOAD_ON_START:
-        context.model_paths[model_type] = resolve_model_to_use(model_type=model_type)
-        try:
-           load_model(context, model_type)
-        except Exception as e:
-           log.error(f'[red]Error while loading {model_type} model: {context.model_paths[model_type]}[/red]')
-           log.error(f'[red]Error: {e}[/red]')
-           log.error(f'[red]Consider removing the model from the model folder.[red]')
-
-
-def unload_all(context: Context):
-    for model_type in KNOWN_MODEL_TYPES:
-        unload_model(context, model_type)
-
-def resolve_model_to_use(model_name:str=None, model_type:str=None):
-    model_extensions = MODEL_EXTENSIONS.get(model_type, [])
-    default_models = DEFAULT_MODELS.get(model_type, [])
-    config = app.getConfig()
-
-    model_dirs = [os.path.join(app.MODELS_DIR, model_type), app.SD_DIR]
-    if not model_name: # When None try user configured model.
-        # config = getConfig()
-        if 'model' in config and model_type in config['model']:
-            model_name = config['model'][model_type]
-
-    if model_name:
-        # Check models directory
-        models_dir_path = os.path.join(app.MODELS_DIR, model_type, model_name)
-        for model_extension in model_extensions:
-            if os.path.exists(models_dir_path + model_extension):
-                return models_dir_path + model_extension
-            if os.path.exists(model_name + model_extension):
-                return os.path.abspath(model_name + model_extension)
-
-    # Default locations
-    if model_name in default_models:
-        default_model_path = os.path.join(app.SD_DIR, model_name)
-        for model_extension in model_extensions:
-            if os.path.exists(default_model_path + model_extension):
-                return default_model_path + model_extension
-
-    # Can't find requested model, check the default paths.
-    for default_model in default_models:
-        for model_dir in model_dirs:
-            default_model_path = os.path.join(model_dir, default_model)
-            for model_extension in model_extensions:
-                if os.path.exists(default_model_path + model_extension):
-                    if model_name is not None:
-                        log.warn(f'Could not find the configured custom model {model_name}{model_extension}. Using the default one: {default_model_path}{model_extension}')
-                    return default_model_path + model_extension
-
-    return None
-
-def reload_models_if_necessary(context: Context, task_data: TaskData):
-    model_paths_in_req = {
-        'stable-diffusion': task_data.use_stable_diffusion_model,
-        'vae': task_data.use_vae_model,
-        'hypernetwork': task_data.use_hypernetwork_model,
-        'gfpgan': task_data.use_face_correction,
-        'realesrgan': task_data.use_upscale,
-    }
-    models_to_reload = {model_type: path for model_type, path in model_paths_in_req.items() if context.model_paths.get(model_type) != path}
-
-    if set_vram_optimizations(context): # reload SD
-        models_to_reload['stable-diffusion'] = model_paths_in_req['stable-diffusion']
-
-    for model_type, model_path_in_req in models_to_reload.items():
-        context.model_paths[model_type] = model_path_in_req
-
-        action_fn = unload_model if context.model_paths[model_type] is None else load_model
-        action_fn(context, model_type, scan_model=False) # we've scanned them already
-
-def resolve_model_paths(task_data: TaskData):
-    task_data.use_stable_diffusion_model = resolve_model_to_use(task_data.use_stable_diffusion_model, model_type='stable-diffusion')
-    task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type='vae')
-    task_data.use_hypernetwork_model = resolve_model_to_use(task_data.use_hypernetwork_model, model_type='hypernetwork')
-
-    if task_data.use_face_correction: task_data.use_face_correction = resolve_model_to_use(task_data.use_face_correction, 'gfpgan')
-    if task_data.use_upscale: task_data.use_upscale = resolve_model_to_use(task_data.use_upscale, 'realesrgan')
-
-def set_vram_optimizations(context: Context):
-    config = app.getConfig()
-
-    max_usage_level = device_manager.get_max_vram_usage_level(context.device)
-    vram_usage_level = config.get('vram_usage_level', 'balanced')
-
-    v = {'low': 0, 'balanced': 1, 'high': 2}
-    if v[vram_usage_level] > v[max_usage_level]:
-        log.error(f'Requested GPU Memory Usage level ({vram_usage_level}) is higher than what is ' + \
-                  f'possible ({max_usage_level}) on this device ({context.device}). Using "{max_usage_level}" instead')
-        vram_usage_level = max_usage_level
-
-    if vram_usage_level != context.vram_usage_level:
-        context.vram_usage_level = vram_usage_level
-        return True
-
-    return False
-
-def make_model_folders():
-    for model_type in KNOWN_MODEL_TYPES:
-        model_dir_path = os.path.join(app.MODELS_DIR, model_type)
-
-        os.makedirs(model_dir_path, exist_ok=True)
-
-        help_file_name = f'Place your {model_type} model files here.txt'
-        help_file_contents = f'Supported extensions: {" or ".join(MODEL_EXTENSIONS.get(model_type))}'
-
-        with open(os.path.join(model_dir_path, help_file_name), 'w', encoding='utf-8') as f:
-            f.write(help_file_contents)
-
-def is_malicious_model(file_path):
-    try:
-        scan_result = scan_model(file_path)
-        if scan_result.issues_count > 0 or scan_result.infected_files > 0:
-            log.warn(":warning: [bold red]Scan %s: %d scanned, %d issue, %d infected.[/bold red]" % (file_path, scan_result.scanned_files, scan_result.issues_count, scan_result.infected_files))
-            return True
-        else:
-            log.debug("Scan %s: [green]%d scanned, %d issue, %d infected.[/green]" % (file_path, scan_result.scanned_files, scan_result.issues_count, scan_result.infected_files))
-            return False
-    except Exception as e:
-        log.error(f'error while scanning: {file_path}, error: {e}')
-    return False
-
-def getModels():
-    models = {
-        'active': {
-            'stable-diffusion': 'sd-v1-4',
-            'vae': '',
-            'hypernetwork': '',
-        },
-        'options': {
-            'stable-diffusion': ['sd-v1-4'],
-            'vae': [],
-            'hypernetwork': [],
-        },
-    }
-
-    models_scanned = 0
-
-    class MaliciousModelException(Exception):
-        "Raised when picklescan reports a problem with a model"
-        pass
-
-    def scan_directory(directory, suffixes):
-        nonlocal models_scanned
-        tree = []
-        for entry in os.scandir(directory):
-            if entry.is_file():
-                matching_suffix = list(filter(lambda s: entry.name.endswith(s), suffixes))
-                if len(matching_suffix) == 0: continue
-                matching_suffix = matching_suffix[0]
-
-                mtime = entry.stat().st_mtime
-                mod_time = known_models[entry.path] if entry.path in known_models else -1
-                if mod_time != mtime:
-                    models_scanned += 1
-                    if is_malicious_model(entry.path):
-                        raise MaliciousModelException(entry.path)
-                known_models[entry.path] = mtime
-                tree.append(entry.name[:-len(matching_suffix)])
-            elif entry.is_dir():
-                scan=scan_directory(entry.path, suffixes) 
-                if len(scan) != 0:
-                    tree.append( (entry.name, scan ) )
-        return tree
-
-    def listModels(model_type):
-        nonlocal models_scanned
-
-        model_extensions = MODEL_EXTENSIONS.get(model_type, [])
-        models_dir = os.path.join(app.MODELS_DIR, model_type)
-        if not os.path.exists(models_dir):
-            os.makedirs(models_dir)
-
-        try:
-            models['options'][model_type] = scan_directory(models_dir, model_extensions)
-        except MaliciousModelException as e:
-            models['scan-error'] = e
-
-    # custom models
-    listModels(model_type='stable-diffusion')
-    listModels(model_type='vae')
-    listModels(model_type='hypernetwork')
-
-    if models_scanned > 0: log.info(f'[green]Scanned {models_scanned} models. Nothing infected[/]')
-
-    # legacy
-    custom_weight_path = os.path.join(app.SD_DIR, 'custom-model.ckpt')
-    if os.path.exists(custom_weight_path):
-        models['options']['stable-diffusion'].append('custom-model')
-
-    return models

ui/easydiffusion/renderer.py

@@ -1,137 +0,0 @@
-import queue
-import time
-import json
-import pprint
-
-from easydiffusion import device_manager
-from easydiffusion.types import TaskData, Response, Image as ResponseImage, UserInitiatedStop, GenerateImageRequest
-from easydiffusion.utils import get_printable_request, save_images_to_disk, log
-
-from sdkit import Context
-from sdkit.generate import generate_images
-from sdkit.filter import apply_filters
-from sdkit.utils import img_to_buffer, img_to_base64_str, latent_samples_to_images, gc
-
-context = Context() # thread-local
-'''
-runtime data (bound locally to this thread), for e.g. device, references to loaded models, optimization flags etc
-'''
-
-def init(device):
-    '''
-    Initializes the fields that will be bound to this runtime's context, and sets the current torch device
-    '''
-    context.stop_processing = False
-    context.temp_images = {}
-    context.partial_x_samples = None
-
-    device_manager.device_init(context, device)
-
-def make_images(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback):
-    context.stop_processing = False
-    print_task_info(req, task_data)
-
-    images, seeds = make_images_internal(req, task_data, data_queue, task_temp_images, step_callback)
-
-    res = Response(req, task_data, images=construct_response(images, seeds, task_data, base_seed=req.seed))
-    res = res.json()
-    data_queue.put(json.dumps(res))
-    log.info('Task completed')
-
-    return res
-
-def print_task_info(req: GenerateImageRequest, task_data: TaskData):
-    req_str = pprint.pformat(get_printable_request(req)).replace("[","\[")
-    task_str = pprint.pformat(task_data.dict()).replace("[","\[")
-    log.info(f'request: {req_str}')
-    log.info(f'task data: {task_str}')
-
-def make_images_internal(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback):
-    images, user_stopped = generate_images_internal(req, task_data, data_queue, task_temp_images, step_callback, task_data.stream_image_progress)
-    filtered_images = filter_images(task_data, images, user_stopped)
-
-    if task_data.save_to_disk_path is not None:
-        save_images_to_disk(images, filtered_images, req, task_data)
-
-    seeds = [*range(req.seed, req.seed + len(images))]
-    if task_data.show_only_filtered_image or filtered_images is images:
-        return filtered_images, seeds
-    else:
-        return images + filtered_images, seeds + seeds
-
-def generate_images_internal(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback, stream_image_progress: bool):
-    context.temp_images.clear()
-
-    callback = make_step_callback(req, task_data, data_queue, task_temp_images, step_callback, stream_image_progress)
-
-    try:
-        if req.init_image is not None: req.sampler_name = 'ddim'
-
-        images = generate_images(context, callback=callback, **req.dict())
-        user_stopped = False
-    except UserInitiatedStop:
-        images = []
-        user_stopped = True
-        if context.partial_x_samples is not None:
-            images = latent_samples_to_images(context, context.partial_x_samples)
-    finally:
-        if hasattr(context, 'partial_x_samples') and context.partial_x_samples is not None:
-            del context.partial_x_samples
-            context.partial_x_samples = None
-
-    return images, user_stopped
-
-def filter_images(task_data: TaskData, images: list, user_stopped):
-    if user_stopped or (task_data.use_face_correction is None and task_data.use_upscale is None):
-        return images
-
-    filters_to_apply = []
-    if task_data.use_face_correction and 'gfpgan' in task_data.use_face_correction.lower(): filters_to_apply.append('gfpgan')
-    if task_data.use_upscale and 'realesrgan' in task_data.use_upscale.lower(): filters_to_apply.append('realesrgan')
-
-    return apply_filters(context, filters_to_apply, images, scale=task_data.upscale_amount)
-
-def construct_response(images: list, seeds: list, task_data: TaskData, base_seed: int):
-    return [
-        ResponseImage(
-            data=img_to_base64_str(img, task_data.output_format, task_data.output_quality),
-            seed=seed,
-        ) for img, seed in zip(images, seeds)
-    ]
-
-def make_step_callback(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback, stream_image_progress: bool):
-    n_steps = req.num_inference_steps if req.init_image is None else int(req.num_inference_steps * req.prompt_strength)
-    last_callback_time = -1
-
-    def update_temp_img(x_samples, task_temp_images: list):
-        partial_images = []
-        images = latent_samples_to_images(context, x_samples)
-        for i, img in enumerate(images):
-            buf = img_to_buffer(img, output_format='JPEG')
-
-            context.temp_images[f"{task_data.request_id}/{i}"] = buf
-            task_temp_images[i] = buf
-            partial_images.append({'path': f"/image/tmp/{task_data.request_id}/{i}"})
-        del images
-        return partial_images
-
-    def on_image_step(x_samples, i):
-        nonlocal last_callback_time
-
-        context.partial_x_samples = x_samples
-        step_time = time.time() - last_callback_time if last_callback_time != -1 else -1
-        last_callback_time = time.time()
-
-        progress = {"step": i, "step_time": step_time, "total_steps": n_steps}
-
-        if stream_image_progress and i % 5 == 0:
-            progress['output'] = update_temp_img(x_samples, task_temp_images)
-
-        data_queue.put(json.dumps(progress))
-
-        step_callback()
-
-        if context.stop_processing:
-            raise UserInitiatedStop("User requested that we stop processing")
-
-    return on_image_step

ui/easydiffusion/server.py

@@ -1,241 +0,0 @@
-"""server.py: FastAPI SD-UI Web Host.
-Notes:
-    async endpoints always run on the main thread. Without they run on the thread pool.
-"""
-import os
-import traceback
-import datetime
-from typing import List, Union
-
-from fastapi import FastAPI, HTTPException
-from fastapi.staticfiles import StaticFiles
-from starlette.responses import FileResponse, JSONResponse, StreamingResponse
-from pydantic import BaseModel
-
-from easydiffusion import app, model_manager, task_manager
-from easydiffusion.types import TaskData, GenerateImageRequest, MergeRequest
-from easydiffusion.utils import log
-
-log.info(f'started in {app.SD_DIR}')
-log.info(f'started at {datetime.datetime.now():%x %X}')
-
-server_api = FastAPI()
-
-NOCACHE_HEADERS={"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"}
-
-class NoCacheStaticFiles(StaticFiles):
-    def is_not_modified(self, response_headers, request_headers) -> bool:
-        if 'content-type' in response_headers and ('javascript' in response_headers['content-type'] or 'css' in response_headers['content-type']):
-            response_headers.update(NOCACHE_HEADERS)
-            return False
-
-        return super().is_not_modified(response_headers, request_headers)
-
-class SetAppConfigRequest(BaseModel):
-    update_branch: str = None
-    render_devices: Union[List[str], List[int], str, int] = None
-    model_vae: str = None
-    ui_open_browser_on_start: bool = None
-    listen_to_network: bool = None
-    listen_port: int = None
-
-def init():
-    server_api.mount('/media', NoCacheStaticFiles(directory=os.path.join(app.SD_UI_DIR, 'media')), name="media")
-
-    for plugins_dir, dir_prefix in app.UI_PLUGINS_SOURCES:
-        server_api.mount(f'/plugins/{dir_prefix}', NoCacheStaticFiles(directory=plugins_dir), name=f"plugins-{dir_prefix}")
-
-    @server_api.post('/app_config')
-    async def set_app_config(req : SetAppConfigRequest):
-        return set_app_config_internal(req)
-
-    @server_api.get('/get/{key:path}')
-    def read_web_data(key:str=None):
-        return read_web_data_internal(key)
-
-    @server_api.get('/ping') # Get server and optionally session status.
-    def ping(session_id:str=None):
-        return ping_internal(session_id)
-
-    @server_api.post('/render')
-    def render(req: dict):
-        return render_internal(req)
-
-    @server_api.post('/model/merge')
-    def model_merge(req: dict):
-        print(req)
-        return model_merge_internal(req)
-
-    @server_api.get('/image/stream/{task_id:int}')
-    def stream(task_id:int):
-        return stream_internal(task_id)
-
-    @server_api.get('/image/stop')
-    def stop(task: int):
-        return stop_internal(task)
-
-    @server_api.get('/image/tmp/{task_id:int}/{img_id:int}')
-    def get_image(task_id: int, img_id: int):
-        return get_image_internal(task_id, img_id)
-
-    @server_api.get('/')
-    def read_root():
-        return FileResponse(os.path.join(app.SD_UI_DIR, 'index.html'), headers=NOCACHE_HEADERS)
-
-    @server_api.on_event("shutdown")
-    def shutdown_event(): # Signal render thread to close on shutdown
-        task_manager.current_state_error = SystemExit('Application shutting down.')
-
-# API implementations
-def set_app_config_internal(req : SetAppConfigRequest):
-    config = app.getConfig()
-    if req.update_branch is not None:
-        config['update_branch'] = req.update_branch
-    if req.render_devices is not None:
-        update_render_devices_in_config(config, req.render_devices)
-    if req.ui_open_browser_on_start is not None:
-        if 'ui' not in config:
-            config['ui'] = {}
-        config['ui']['open_browser_on_start'] = req.ui_open_browser_on_start
-    if req.listen_to_network is not None:
-       if 'net' not in config:
-           config['net'] = {}
-       config['net']['listen_to_network'] = bool(req.listen_to_network)
-    if req.listen_port is not None:
-       if 'net' not in config:
-           config['net'] = {}
-       config['net']['listen_port'] = int(req.listen_port)
-    try:
-        app.setConfig(config)
-
-        if req.render_devices:
-            app.update_render_threads()
-
-        return JSONResponse({'status': 'OK'}, headers=NOCACHE_HEADERS)
-    except Exception as e:
-        log.error(traceback.format_exc())
-        raise HTTPException(status_code=500, detail=str(e))
-
-def update_render_devices_in_config(config, render_devices):
-    if render_devices not in ('cpu', 'auto') and not render_devices.startswith('cuda:'):
-        raise HTTPException(status_code=400, detail=f'Invalid render device requested: {render_devices}')
-
-    if render_devices.startswith('cuda:'):
-        render_devices = render_devices.split(',')
-
-    config['render_devices'] = render_devices
-
-def read_web_data_internal(key:str=None):
-    if not key: # /get without parameters, stable-diffusion easter egg.
-        raise HTTPException(status_code=418, detail="StableDiffusion is drawing a teapot!") # HTTP418 I'm a teapot
-    elif key == 'app_config':
-        return JSONResponse(app.getConfig(), headers=NOCACHE_HEADERS)
-    elif key == 'system_info':
-        config = app.getConfig()
-        system_info = {
-            'devices': task_manager.get_devices(),
-            'hosts': app.getIPConfig(),
-            'default_output_dir': os.path.join(os.path.expanduser("~"), app.OUTPUT_DIRNAME),
-        }
-        system_info['devices']['config'] = config.get('render_devices', "auto")
-        return JSONResponse(system_info, headers=NOCACHE_HEADERS)
-    elif key == 'models':
-        return JSONResponse(model_manager.getModels(), headers=NOCACHE_HEADERS)
-    elif key == 'modifiers': return FileResponse(os.path.join(app.SD_UI_DIR, 'modifiers.json'), headers=NOCACHE_HEADERS)
-    elif key == 'ui_plugins': return JSONResponse(app.getUIPlugins(), headers=NOCACHE_HEADERS)
-    else:
-        raise HTTPException(status_code=404, detail=f'Request for unknown {key}') # HTTP404 Not Found
-
-def ping_internal(session_id:str=None):
-    if task_manager.is_alive() <= 0: # Check that render threads are alive.
-        if task_manager.current_state_error: raise HTTPException(status_code=500, detail=str(task_manager.current_state_error))
-        raise HTTPException(status_code=500, detail='Render thread is dead.')
-    if task_manager.current_state_error and not isinstance(task_manager.current_state_error, StopAsyncIteration): raise HTTPException(status_code=500, detail=str(task_manager.current_state_error))
-    # Alive
-    response = {'status': str(task_manager.current_state)}
-    if session_id:
-        session = task_manager.get_cached_session(session_id, update_ttl=True)
-        response['tasks'] = {id(t): t.status for t in session.tasks}
-    response['devices'] = task_manager.get_devices()
-    return JSONResponse(response, headers=NOCACHE_HEADERS)
-
-def render_internal(req: dict):
-    try:
-        # separate out the request data into rendering and task-specific data
-        render_req: GenerateImageRequest = GenerateImageRequest.parse_obj(req)
-        task_data: TaskData = TaskData.parse_obj(req)
-
-        render_req.init_image_mask = req.get('mask') # hack: will rename this in the HTTP API in a future revision
-
-        app.save_to_config(task_data.use_stable_diffusion_model, task_data.use_vae_model, task_data.use_hypernetwork_model, task_data.vram_usage_level)
-
-        # enqueue the task
-        new_task = task_manager.render(render_req, task_data)
-        response = {
-            'status': str(task_manager.current_state), 
-            'queue': len(task_manager.tasks_queue),
-            'stream': f'/image/stream/{id(new_task)}',
-            'task': id(new_task)
-        }
-        return JSONResponse(response, headers=NOCACHE_HEADERS)
-    except ChildProcessError as e: # Render thread is dead
-        raise HTTPException(status_code=500, detail=f'Rendering thread has died.') # HTTP500 Internal Server Error
-    except ConnectionRefusedError as e: # Unstarted task pending limit reached, deny queueing too many.
-        raise HTTPException(status_code=503, detail=str(e)) # HTTP503 Service Unavailable
-    except Exception as e:
-        log.error(traceback.format_exc())
-        raise HTTPException(status_code=500, detail=str(e))
-
-def model_merge_internal(req: dict):
-    try:
-        from sdkit.train import merge_models
-        from easydiffusion.utils.save_utils import filename_regex
-        mergeReq: MergeRequest = MergeRequest.parse_obj(req)
-        
-        merge_models(model_manager.resolve_model_to_use(mergeReq.model0,'stable-diffusion'), 
-           model_manager.resolve_model_to_use(mergeReq.model1,'stable-diffusion'), 
-           mergeReq.ratio, 
-           os.path.join(app.MODELS_DIR, 'stable-diffusion', filename_regex.sub('_', mergeReq.out_path)), 
-           mergeReq.use_fp16
-        )
-        return JSONResponse({'status':'OK'}, headers=NOCACHE_HEADERS)
-    except Exception as e:
-        log.error(traceback.format_exc())
-        raise HTTPException(status_code=500, detail=str(e))
-
-def stream_internal(task_id:int):
-    #TODO Move to WebSockets ??
-    task = task_manager.get_cached_task(task_id, update_ttl=True)
-    if not task: raise HTTPException(status_code=404, detail=f'Request {task_id} not found.') # HTTP404 NotFound
-    #if (id(task) != task_id): raise HTTPException(status_code=409, detail=f'Wrong task id received. Expected:{id(task)}, Received:{task_id}') # HTTP409 Conflict
-    if task.buffer_queue.empty() and not task.lock.locked():
-        if task.response:
-            #log.info(f'Session {session_id} sending cached response')
-            return JSONResponse(task.response, headers=NOCACHE_HEADERS)
-        raise HTTPException(status_code=425, detail='Too Early, task not started yet.') # HTTP425 Too Early
-    #log.info(f'Session {session_id} opened live render stream {id(task.buffer_queue)}')
-    return StreamingResponse(task.read_buffer_generator(), media_type='application/json')
-
-def stop_internal(task: int):
-    if not task:
-        if task_manager.current_state == task_manager.ServerStates.Online or task_manager.current_state == task_manager.ServerStates.Unavailable:
-            raise HTTPException(status_code=409, detail='Not currently running any tasks.') # HTTP409 Conflict
-        task_manager.current_state_error = StopAsyncIteration('')
-        return {'OK'}
-    task_id = task
-    task = task_manager.get_cached_task(task_id, update_ttl=False)
-    if not task: raise HTTPException(status_code=404, detail=f'Task {task_id} was not found.') # HTTP404 Not Found
-    if isinstance(task.error, StopAsyncIteration): raise HTTPException(status_code=409, detail=f'Task {task_id} is already stopped.') # HTTP409 Conflict
-    task.error = StopAsyncIteration(f'Task {task_id} stop requested.')
-    return {'OK'}
-
-def get_image_internal(task_id: int, img_id: int):
-    task = task_manager.get_cached_task(task_id, update_ttl=True)
-    if not task: raise HTTPException(status_code=410, detail=f'Task {task_id} could not be found.') # HTTP404 NotFound
-    if not task.temp_images[img_id]: raise HTTPException(status_code=425, detail='Too Early, task data is not available yet.') # HTTP425 Too Early
-    try:
-        img_data = task.temp_images[img_id]
-        img_data.seek(0)
-        return StreamingResponse(img_data, media_type='image/jpeg')
-    except KeyError as e:
-        raise HTTPException(status_code=500, detail=str(e))

ui/easydiffusion/task_manager.py

@@ -1,492 +0,0 @@
-"""task_manager.py: manage tasks dispatching and render threads.
-Notes:
-    render_threads should be the only hard reference held by the manager to the threads.
-    Use weak_thread_data to store all other data using weak keys.
-    This will allow for garbage collection after the thread dies.
-"""
-import json
-import traceback
-
-TASK_TTL = 15 * 60 # seconds, Discard last session's task timeout
-
-import torch
-import queue, threading, time, weakref
-from typing import Any, Hashable
-
-from easydiffusion import device_manager
-from easydiffusion.types import TaskData, GenerateImageRequest
-from easydiffusion.utils import log
-
-from sdkit.utils import gc
-
-THREAD_NAME_PREFIX = ''
-ERR_LOCK_FAILED = ' failed to acquire lock within timeout.'
-LOCK_TIMEOUT = 15 # Maximum locking time in seconds before failing a task.
-# It's better to get an exception than a deadlock... ALWAYS use timeout in critical paths.
-
-DEVICE_START_TIMEOUT = 60 # seconds - Maximum time to wait for a render device to init.
-
-class SymbolClass(type): # Print nicely formatted Symbol names.
-    def __repr__(self): return self.__qualname__
-    def __str__(self): return self.__name__
-class Symbol(metaclass=SymbolClass): pass
-
-class ServerStates:
-    class Init(Symbol): pass
-    class LoadingModel(Symbol): pass
-    class Online(Symbol): pass
-    class Rendering(Symbol): pass
-    class Unavailable(Symbol): pass
-
-class RenderTask(): # Task with output queue and completion lock.
-    def __init__(self, req: GenerateImageRequest, task_data: TaskData):
-        task_data.request_id = id(self)
-        self.render_request: GenerateImageRequest = req  # Initial Request
-        self.task_data: TaskData = task_data
-        self.response: Any = None # Copy of the last reponse
-        self.render_device = None # Select the task affinity. (Not used to change active devices).
-        self.temp_images:list = [None] * req.num_outputs * (1 if task_data.show_only_filtered_image else 2)
-        self.error: Exception = None
-        self.lock: threading.Lock = threading.Lock() # Locks at task start and unlocks when task is completed
-        self.buffer_queue: queue.Queue = queue.Queue() # Queue of JSON string segments
-    async def read_buffer_generator(self):
-        try:
-            while not self.buffer_queue.empty():
-                res = self.buffer_queue.get(block=False)
-                self.buffer_queue.task_done()
-                yield res
-        except queue.Empty as e: yield
-    @property
-    def status(self):
-        if self.lock.locked():
-            return 'running'
-        if isinstance(self.error, StopAsyncIteration):
-            return 'stopped'
-        if self.error:
-            return 'error'
-        if not self.buffer_queue.empty():
-            return 'buffer'
-        if self.response:
-            return 'completed'
-        return 'pending'
-    @property
-    def is_pending(self):
-        return bool(not self.response and not self.error)
-
-# Temporary cache to allow to query tasks results for a short time after they are completed.
-class DataCache():
-    def __init__(self):
-        self._base = dict()
-        self._lock: threading.Lock = threading.Lock()
-    def _get_ttl_time(self, ttl: int) -> int:
-        return int(time.time()) + ttl
-    def _is_expired(self, timestamp: int) -> bool:
-        return int(time.time()) >= timestamp
-    def clean(self) -> None:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.clean' + ERR_LOCK_FAILED)
-        try:
-            # Create a list of expired keys to delete
-            to_delete = []
-            for key in self._base:
-                ttl, _ = self._base[key]
-                if self._is_expired(ttl):
-                    to_delete.append(key)
-            # Remove Items
-            for key in to_delete:
-                (_, val) = self._base[key]
-                if isinstance(val, RenderTask):
-                    log.debug(f'RenderTask {key} expired. Data removed.')
-                elif isinstance(val, SessionState):
-                    log.debug(f'Session {key} expired. Data removed.')
-                else:
-                    log.debug(f'Key {key} expired. Data removed.')
-                del self._base[key]
-        finally:
-            self._lock.release()
-    def clear(self) -> None:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.clear' + ERR_LOCK_FAILED)
-        try: self._base.clear()
-        finally: self._lock.release()
-    def delete(self, key: Hashable) -> bool:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.delete' + ERR_LOCK_FAILED)
-        try:
-            if key not in self._base:
-                return False
-            del self._base[key]
-            return True
-        finally:
-            self._lock.release()
-    def keep(self, key: Hashable, ttl: int) -> bool:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.keep' + ERR_LOCK_FAILED)
-        try:
-            if key in self._base:
-                _, value = self._base.get(key)
-                self._base[key] = (self._get_ttl_time(ttl), value)
-                return True
-            return False
-        finally:
-            self._lock.release()
-    def put(self, key: Hashable, value: Any, ttl: int) -> bool:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.put' + ERR_LOCK_FAILED)
-        try:
-            self._base[key] = (
-                self._get_ttl_time(ttl), value
-            )
-        except Exception as e:
-            log.error(traceback.format_exc())
-            return False
-        else:
-            return True
-        finally:
-            self._lock.release()
-    def tryGet(self, key: Hashable) -> Any:
-        if not self._lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('DataCache.tryGet' + ERR_LOCK_FAILED)
-        try:
-            ttl, value = self._base.get(key, (None, None))
-            if ttl is not None and self._is_expired(ttl):
-                log.debug(f'Session {key} expired. Discarding data.')
-                del self._base[key]
-                return None
-            return value
-        finally:
-            self._lock.release()
-
-manager_lock = threading.RLock()
-render_threads = []
-current_state = ServerStates.Init
-current_state_error:Exception = None
-tasks_queue = []
-session_cache = DataCache()
-task_cache = DataCache()
-weak_thread_data = weakref.WeakKeyDictionary()
-idle_event: threading.Event = threading.Event()
-
-class SessionState():
-    def __init__(self, id: str):
-        self._id = id
-        self._tasks_ids = []
-    @property
-    def id(self):
-        return self._id
-    @property
-    def tasks(self):
-        tasks = []
-        for task_id in self._tasks_ids:
-            task = task_cache.tryGet(task_id)
-            if task:
-                tasks.append(task)
-        return tasks
-    def put(self, task, ttl=TASK_TTL):
-        task_id = id(task)
-        self._tasks_ids.append(task_id)
-        if not task_cache.put(task_id, task, ttl):
-            return False
-        while len(self._tasks_ids) > len(render_threads) * 2:
-            self._tasks_ids.pop(0)
-        return True
-
-def thread_get_next_task():
-    from easydiffusion import renderer
-    if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT):
-        log.warn(f'Render thread on device: {renderer.context.device} failed to acquire manager lock.')
-        return None
-    if len(tasks_queue) <= 0:
-        manager_lock.release()
-        return None
-    task = None
-    try:  # Select a render task.
-        for queued_task in tasks_queue:
-            if queued_task.render_device and renderer.context.device != queued_task.render_device:
-                # Is asking for a specific render device.
-                if is_alive(queued_task.render_device) > 0:
-                    continue  # requested device alive, skip current one.
-                else:
-                    # Requested device is not active, return error to UI.
-                    queued_task.error = Exception(queued_task.render_device + ' is not currently active.')
-                    task = queued_task
-                    break
-            if not queued_task.render_device and renderer.context.device == 'cpu' and is_alive() > 1:
-                # not asking for any specific devices, cpu want to grab task but other render devices are alive.
-                continue  # Skip Tasks, don't run on CPU unless there is nothing else or user asked for it.
-            task = queued_task
-            break
-        if task is not None:
-            del tasks_queue[tasks_queue.index(task)]
-        return task
-    finally:
-        manager_lock.release()
-
-def thread_render(device):
-    global current_state, current_state_error
-
-    from easydiffusion import renderer, model_manager
-    try:
-        renderer.init(device)
-
-        weak_thread_data[threading.current_thread()] = {
-            'device': renderer.context.device,
-            'device_name': renderer.context.device_name,
-            'alive': True
-        }
-
-        current_state = ServerStates.LoadingModel
-        model_manager.load_default_models(renderer.context)
-
-        current_state = ServerStates.Online
-    except Exception as e:
-        log.error(traceback.format_exc())
-        weak_thread_data[threading.current_thread()] = {
-            'error': e,
-            'alive': False
-        }
-        return
-
-    while True:
-        session_cache.clean()
-        task_cache.clean()
-        if not weak_thread_data[threading.current_thread()]['alive']:
-            log.info(f'Shutting down thread for device {renderer.context.device}')
-            model_manager.unload_all(renderer.context)
-            return
-        if isinstance(current_state_error, SystemExit):
-            current_state = ServerStates.Unavailable
-            return
-        task = thread_get_next_task()
-        if task is None:
-            idle_event.clear()
-            idle_event.wait(timeout=1)
-            continue
-        if task.error is not None:
-            log.error(task.error)
-            task.response = {"status": 'failed', "detail": str(task.error)}
-            task.buffer_queue.put(json.dumps(task.response))
-            continue
-        if current_state_error:
-            task.error = current_state_error
-            task.response = {"status": 'failed', "detail": str(task.error)}
-            task.buffer_queue.put(json.dumps(task.response))
-            continue
-        log.info(f'Session {task.task_data.session_id} starting task {id(task)} on {renderer.context.device_name}')
-        if not task.lock.acquire(blocking=False): raise Exception('Got locked task from queue.')
-        try:
-            def step_callback():
-                global current_state_error
-
-                if isinstance(current_state_error, SystemExit) or isinstance(current_state_error, StopAsyncIteration) or isinstance(task.error, StopAsyncIteration):
-                    renderer.context.stop_processing = True
-                    if isinstance(current_state_error, StopAsyncIteration):
-                        task.error = current_state_error
-                        current_state_error = None
-                        log.info(f'Session {task.task_data.session_id} sent cancel signal for task {id(task)}')
-
-            current_state = ServerStates.LoadingModel
-            model_manager.resolve_model_paths(task.task_data)
-            model_manager.reload_models_if_necessary(renderer.context, task.task_data)
-
-            current_state = ServerStates.Rendering
-            task.response = renderer.make_images(task.render_request, task.task_data, task.buffer_queue, task.temp_images, step_callback)
-            # Before looping back to the generator, mark cache as still alive.
-            task_cache.keep(id(task), TASK_TTL)
-            session_cache.keep(task.task_data.session_id, TASK_TTL)
-        except Exception as e:
-            task.error = str(e)
-            task.response = {"status": 'failed', "detail": str(task.error)}
-            task.buffer_queue.put(json.dumps(task.response))
-            log.error(traceback.format_exc())
-        finally:
-            gc(renderer.context)
-            task.lock.release()
-        task_cache.keep(id(task), TASK_TTL)
-        session_cache.keep(task.task_data.session_id, TASK_TTL)
-        if isinstance(task.error, StopAsyncIteration):
-            log.info(f'Session {task.task_data.session_id} task {id(task)} cancelled!')
-        elif task.error is not None:
-            log.info(f'Session {task.task_data.session_id} task {id(task)} failed!')
-        else:
-            log.info(f'Session {task.task_data.session_id} task {id(task)} completed by {renderer.context.device_name}.')
-        current_state = ServerStates.Online
-
-def get_cached_task(task_id:str, update_ttl:bool=False):
-    # By calling keep before tryGet, wont discard if was expired.
-    if update_ttl and not task_cache.keep(task_id, TASK_TTL):
-        # Failed to keep task, already gone.
-        return None
-    return task_cache.tryGet(task_id)
-
-def get_cached_session(session_id:str, update_ttl:bool=False):
-    if update_ttl:
-        session_cache.keep(session_id, TASK_TTL)
-    session = session_cache.tryGet(session_id)
-    if not session:
-        session = SessionState(session_id)
-        session_cache.put(session_id, session, TASK_TTL)
-    return session
-
-def get_devices():
-    devices = {
-        'all': {},
-        'active': {},
-    }
-
-    def get_device_info(device):
-        if device == 'cpu':
-            return {'name': device_manager.get_processor_name()}
-            
-        mem_free, mem_total = torch.cuda.mem_get_info(device)
-        mem_free /= float(10**9)
-        mem_total /= float(10**9)
-
-        return {
-            'name': torch.cuda.get_device_name(device),
-            'mem_free': mem_free,
-            'mem_total': mem_total,
-            'max_vram_usage_level': device_manager.get_max_vram_usage_level(device),
-        }
-
-    # list the compatible devices
-    gpu_count = torch.cuda.device_count()
-    for device in range(gpu_count):
-        device = f'cuda:{device}'
-        if not device_manager.is_device_compatible(device):
-            continue
-
-        devices['all'].update({device: get_device_info(device)})
-
-    devices['all'].update({'cpu': get_device_info('cpu')})
-
-    # list the activated devices
-    if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('get_devices' + ERR_LOCK_FAILED)
-    try:
-        for rthread in render_threads:
-            if not rthread.is_alive():
-                continue
-            weak_data = weak_thread_data.get(rthread)
-            if not weak_data or not 'device' in weak_data or not 'device_name' in weak_data:
-                continue
-            device = weak_data['device']
-            devices['active'].update({device: get_device_info(device)})
-    finally:
-        manager_lock.release()
-
-    return devices
-
-def is_alive(device=None):
-    if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('is_alive' + ERR_LOCK_FAILED)
-    nbr_alive = 0
-    try:
-        for rthread in render_threads:
-            if device is not None:
-                weak_data = weak_thread_data.get(rthread)
-                if weak_data is None or not 'device' in weak_data or weak_data['device'] is None:
-                    continue
-                thread_device = weak_data['device']
-                if thread_device != device:
-                    continue
-            if rthread.is_alive():
-                nbr_alive += 1
-        return nbr_alive
-    finally:
-        manager_lock.release()
-
-def start_render_thread(device):
-    if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('start_render_thread' + ERR_LOCK_FAILED)
-    log.info(f'Start new Rendering Thread on device: {device}')
-    try:
-        rthread = threading.Thread(target=thread_render, kwargs={'device': device})
-        rthread.daemon = True
-        rthread.name = THREAD_NAME_PREFIX + device
-        rthread.start()
-        render_threads.append(rthread)
-    finally:
-        manager_lock.release()
-    timeout = DEVICE_START_TIMEOUT
-    while not rthread.is_alive() or not rthread in weak_thread_data or not 'device' in weak_thread_data[rthread]:
-        if rthread in weak_thread_data and 'error' in weak_thread_data[rthread]:
-            log.error(f"{rthread}, {device}, error: {weak_thread_data[rthread]['error']}")
-            return False
-        if timeout <= 0:
-            return False
-        timeout -= 1
-        time.sleep(1)
-    return True
-
-def stop_render_thread(device):
-    try:
-        device_manager.validate_device_id(device, log_prefix='stop_render_thread')
-    except:
-        log.error(traceback.format_exc())
-        return False
-
-    if not manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT): raise Exception('stop_render_thread' + ERR_LOCK_FAILED)
-    log.info(f'Stopping Rendering Thread on device: {device}')
-
-    try:
-        thread_to_remove = None
-        for rthread in render_threads:
-            weak_data = weak_thread_data.get(rthread)
-            if weak_data is None or not 'device' in weak_data or weak_data['device'] is None:
-                continue
-            thread_device = weak_data['device']
-            if thread_device == device:
-                weak_data['alive'] = False
-                thread_to_remove = rthread
-                break
-        if thread_to_remove is not None:
-            render_threads.remove(rthread)
-            return True
-    finally:
-        manager_lock.release()
-
-    return False
-
-def update_render_threads(render_devices, active_devices):
-    devices_to_start, devices_to_stop = device_manager.get_device_delta(render_devices, active_devices)
-    log.debug(f'devices_to_start: {devices_to_start}')
-    log.debug(f'devices_to_stop: {devices_to_stop}')
-
-    for device in devices_to_stop:
-        if is_alive(device) <= 0:
-            log.debug(f'{device} is not alive')
-            continue
-        if not stop_render_thread(device):
-            log.warn(f'{device} could not stop render thread')
-
-    for device in devices_to_start:
-        if is_alive(device) >= 1:
-            log.debug(f'{device} already registered.')
-            continue
-        if not start_render_thread(device):
-            log.warn(f'{device} failed to start.')
-
-    if is_alive() <= 0: # No running devices, probably invalid user config.
-        raise EnvironmentError('ERROR: No active render devices! Please verify the "render_devices" value in config.json')
-
-    log.debug(f"active devices: {get_devices()['active']}")
-
-def shutdown_event(): # Signal render thread to close on shutdown
-    global current_state_error
-    current_state_error = SystemExit('Application shutting down.')
-
-def render(render_req: GenerateImageRequest, task_data: TaskData):
-    current_thread_count = is_alive()
-    if current_thread_count <= 0:  # Render thread is dead
-        raise ChildProcessError('Rendering thread has died.')
-
-    # Alive, check if task in cache
-    session = get_cached_session(task_data.session_id, update_ttl=True)
-    pending_tasks = list(filter(lambda t: t.is_pending, session.tasks))
-    if current_thread_count < len(pending_tasks):
-        raise ConnectionRefusedError(f'Session {task_data.session_id} already has {len(pending_tasks)} pending tasks out of {current_thread_count}.')
-
-    new_task = RenderTask(render_req, task_data)
-    if session.put(new_task, TASK_TTL):
-        # Use twice the normal timeout for adding user requests.
-        # Tries to force session.put to fail before tasks_queue.put would.
-        if manager_lock.acquire(blocking=True, timeout=LOCK_TIMEOUT * 2):
-            try:
-                tasks_queue.append(new_task)
-                idle_event.set()
-                return new_task
-            finally:
-                manager_lock.release()
-    raise RuntimeError('Failed to add task to cache.')

ui/easydiffusion/types.py

@@ -1,95 +0,0 @@
-from pydantic import BaseModel
-from typing import Any
-
-class GenerateImageRequest(BaseModel):
-    prompt: str = ""
-    negative_prompt: str = ""
-
-    seed: int = 42
-    width: int = 512
-    height: int = 512
-
-    num_outputs: int = 1
-    num_inference_steps: int = 50
-    guidance_scale: float = 7.5
-
-    init_image: Any = None
-    init_image_mask: Any = None
-    prompt_strength: float = 0.8
-    preserve_init_image_color_profile = False
-
-    sampler_name: str = None # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms"
-    hypernetwork_strength: float = 0
-
-class TaskData(BaseModel):
-    request_id: str = None
-    session_id: str = "session"
-    save_to_disk_path: str = None
-    vram_usage_level: str = "balanced" # or "low" or "medium"
-
-    use_face_correction: str = None # or "GFPGANv1.3"
-    use_upscale: str = None # or "RealESRGAN_x4plus" or "RealESRGAN_x4plus_anime_6B"
-    upscale_amount: int = 4 # or 2
-    use_stable_diffusion_model: str = "sd-v1-4"
-    # use_stable_diffusion_config: str = "v1-inference"
-    use_vae_model: str = None
-    use_hypernetwork_model: str = None
-
-    show_only_filtered_image: bool = False
-    output_format: str = "jpeg" # or "png"
-    output_quality: int = 75
-    metadata_output_format: str = "txt" # or "json"
-    stream_image_progress: bool = False
-
-class MergeRequest(BaseModel):
-    model0: str = None
-    model1: str = None
-    ratio: float = None
-    out_path: str = "mix"
-    use_fp16 = True
-
-class Image:
-    data: str # base64
-    seed: int
-    is_nsfw: bool
-    path_abs: str = None
-
-    def __init__(self, data, seed):
-        self.data = data
-        self.seed = seed
-
-    def json(self):
-        return {
-            "data": self.data,
-            "seed": self.seed,
-            "path_abs": self.path_abs,
-        }
-
-class Response:
-    render_request: GenerateImageRequest
-    task_data: TaskData
-    images: list
-
-    def __init__(self, render_request: GenerateImageRequest, task_data: TaskData, images: list):
-        self.render_request = render_request
-        self.task_data = task_data
-        self.images = images
-
-    def json(self):
-        del self.render_request.init_image
-        del self.render_request.init_image_mask
-
-        res = {
-            "status": 'succeeded',
-            "render_request": self.render_request.dict(),
-            "task_data": self.task_data.dict(),
-            "output": [],
-        }
-
-        for image in self.images:
-            res["output"].append(image.json())
-
-        return res
-
-class UserInitiatedStop(Exception):
-    pass

ui/easydiffusion/utils/__init__.py

@@ -1,8 +0,0 @@
-import logging
-
-log = logging.getLogger('easydiffusion')
-
-from .save_utils import (
-    save_images_to_disk,
-    get_printable_request,
-)

ui/easydiffusion/utils/save_utils.py

@@ -1,88 +0,0 @@
-import os
-import time
-import base64
-import re
-
-from easydiffusion.types import TaskData, GenerateImageRequest
-
-from sdkit.utils import save_images, save_dicts
-
-filename_regex = re.compile('[^a-zA-Z0-9._-]')
-
-# keep in sync with `ui/media/js/dnd.js`
-TASK_TEXT_MAPPING = {
-    'prompt': 'Prompt',
-    'width': 'Width',
-    'height': 'Height',
-    'seed': 'Seed',
-    'num_inference_steps': 'Steps',
-    'guidance_scale': 'Guidance Scale',
-    'prompt_strength': 'Prompt Strength',
-    'use_face_correction': 'Use Face Correction',
-    'use_upscale': 'Use Upscaling',
-    'upscale_amount': 'Upscale By',
-    'sampler_name': 'Sampler',
-    'negative_prompt': 'Negative Prompt',
-    'use_stable_diffusion_model': 'Stable Diffusion model',
-    'use_hypernetwork_model': 'Hypernetwork model',
-    'hypernetwork_strength': 'Hypernetwork Strength'
-}
-
-def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData):
-    now = time.time()
-    save_dir_path = os.path.join(task_data.save_to_disk_path, filename_regex.sub('_', task_data.session_id))
-    metadata_entries = get_metadata_entries_for_request(req, task_data)
-    make_filename = make_filename_callback(req, now=now)
-
-    if task_data.show_only_filtered_image or filtered_images is images:
-        save_images(filtered_images, save_dir_path, file_name=make_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_dicts(metadata_entries, save_dir_path, file_name=make_filename, output_format=task_data.metadata_output_format)
-    else:
-        make_filter_filename = make_filename_callback(req, now=now, suffix='filtered')
-
-        save_images(images, save_dir_path, file_name=make_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_images(filtered_images, save_dir_path, file_name=make_filter_filename, output_format=task_data.output_format, output_quality=task_data.output_quality)
-        save_dicts(metadata_entries, save_dir_path, file_name=make_filter_filename, output_format=task_data.metadata_output_format)
-
-def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskData):
-    metadata = get_printable_request(req)
-    metadata.update({
-        'use_stable_diffusion_model': task_data.use_stable_diffusion_model,
-        'use_vae_model': task_data.use_vae_model,
-        'use_hypernetwork_model': task_data.use_hypernetwork_model,
-        'use_face_correction': task_data.use_face_correction,
-        'use_upscale': task_data.use_upscale,
-    })
-    if metadata['use_upscale'] is not None:
-        metadata['upscale_amount'] = task_data.upscale_amount
-
-    # if text, format it in the text format expected by the UI
-    is_txt_format = (task_data.metadata_output_format.lower() == 'txt')
-    if is_txt_format:
-        metadata = {TASK_TEXT_MAPPING[key]: val for key, val in metadata.items() if key in TASK_TEXT_MAPPING}
-
-    entries = [metadata.copy() for _ in range(req.num_outputs)]
-    for i, entry in enumerate(entries):
-        entry['Seed' if is_txt_format else 'seed'] = req.seed + i
-
-    return entries
-
-def get_printable_request(req: GenerateImageRequest):
-    metadata = req.dict()
-    del metadata['init_image']
-    del metadata['init_image_mask']
-    return metadata
-
-def make_filename_callback(req: GenerateImageRequest, suffix=None, now=None):
-    if now is None:
-        now = time.time()
-    def make_filename(i):
-        img_id = base64.b64encode(int(now+i).to_bytes(8, 'big')).decode() # Generate unique ID based on time.
-        img_id = img_id.translate({43:None, 47:None, 61:None})[-8:] # Remove + / = and keep last 8 chars.
-
-        prompt_flattened = filename_regex.sub('_', req.prompt)[:50]
-        name = f"{prompt_flattened}_{img_id}"
-        name = name if suffix is None else f'{name}_{suffix}'
-        return name
-
-    return make_filename