Tag v2.4.23, to be able to revert back incase of an emergency

Bring back Linux download link

.gitattributes

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

.gitignore

@@ -2,10 +2,4 @@ __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

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

CHANGES.md

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

CONTRIBUTING.md

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

NSIS/README.md

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

NSIS/sdui.nsi

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

README.md

@@ -1,106 +1,140 @@
-# Stable Diffusion UI v2
-### A simple 1-click way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. No dependencies or technical knowledge required.
+# Stable Diffusion UI
+### The easiest way to install and use [Stable Diffusion](https://github.com/CompVis/stable-diffusion) on your own computer. Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community.
+
+[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting)
+
+### New: 
+Experimental support for Stable Diffusion 2.0 is available in beta!
+
+----
+
+# Step 1: Download and prepare the installer
+Click the download button for your operating system:
 
 <p float="left">
-  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-win.png" width="200" /></a>
-  <a href="#installation"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/develop/media/download-linux.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.4.13/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
 </p>
 
-[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support, and development discussion) | [Troubleshooting guide for common problems](Troubleshooting.md)
+## On Windows:
+1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
+2. Move the `stable-diffusion-ui` folder to your `C:` drive (or any other drive like `D:`, at the top root level). `C:\stable-diffusion-ui` or `D:\stable-diffusion-ui` as examples. This will avoid a common problem with Windows (file path length limits).
+## On Linux:
+1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
+2. Open a terminal window, and navigate to the `stable-diffusion-ui` directory.
 
-️‍🔥🎉 **New!** Task Queue, Negative Prompt, Live Preview, More Samplers, In-Painting, Face Correction (GFPGAN) and Upscaling (RealESRGAN) have been added!
+# Step 2: Run the program
+## On Windows: 
+Double-click `Start Stable Diffusion UI.cmd`.
+If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`.
+## On Linux: 
+Run `./start.sh` (or `bash start.sh`) in a terminal.
 
-This distribution currently uses Stable Diffusion 1.4. Once the model for 1.5 becomes publicly available, the model in this distribution will be updated.
+The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance.
 
-# Features in the new v2 Version:
-- **No Dependencies or Technical Knowledge Required**: 1-click install for Windows 10/11 and Linux. *No dependencies*, no need for WSL or Docker or Conda or technical setup. Just download and run!
-- **Face Correction (GFPGAN) and Upscaling (RealESRGAN)**
-- **In-Painting**
-- **Live Preview**: See the image as the AI is drawing it
-- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish
-- **Negative Prompt**: Specify aspects of the image to *remove*.
-- **Lots of Samplers:** ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms
-- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
-- **New UI**: with cleaner design
-- **Waifu Model Support**: Just replace the `stable-diffusion\sd-v1-4.ckpt` file after installation with the Waifu model
-- Supports "*Text to Image*" and "*Image to Image*"
-- **NSFW Setting**: A setting in the UI to control *NSFW content*
-- **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
-- **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
-- **Low Memory Usage**: Creates 512x512 images with less than 4GB of VRAM!
-
-![Screenshot of advanced settings](media/shot-v9.jpg?raw=true)
-
-## Live Preview
-![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)
-
-
-# System Requirements
-1. Windows 10/11, or Linux. Experimental support for Mac is coming soon.
-2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. But if you don't have a compatible graphics card, you can still use it with a "Use CPU" setting. It'll be very slow, but it should still work.
-
-You do not need anything else. You do not need WSL, Docker or Conda. The installer will take care of it.
-
-# Installation
-1. **Download** [for Windows](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-win64.zip) or [for Linux](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/stable-diffusion-ui-linux.tar.xz).
-
-2. **Extract**:
-  - For Windows: After unzipping the file, please move the `stable-diffusion-ui` folder to your `C:` (or any drive like D:, at the top root level), e.g. `C:\stable-diffusion-ui`. This will avoid a common problem with Windows (file path length limits).
-  - For Linux: After extracting the .tar.xz file, please open a terminal, and go to the `stable-diffusion-ui` directory.
-
-3. **Run**:
-  - For Windows: `Start Stable Diffusion UI.cmd` by double-clicking it.
-  - For Linux: In the terminal, run `./start.sh` (or `bash start.sh`)
-
-This will automatically install Stable Diffusion, set it up, and start the interface. No additional steps are needed.
+# Step 3: There is no Step 3. It's that simple!
 
 **To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages.
 
+----
 
-# Usage
-Open http://localhost:9000 in your browser (after running step 3 previously). It may take a few moments for the back-end to be ready.
+# Easy for new users, powerful features for advanced users
+## Features:
 
-## With a text description
-1. Enter a text prompt, like `a photograph of an astronaut riding a horse` in the textbox.
-2. Press `Make Image`. This will take some time, depending on your system's processing power.
-3. See the image generated using your prompt.
+### User experience
+- **Hassle-free installation**: Does not require technical knowledge, does not require pre-installed software. Just download and run!
+- **Clutter-free UI**: A friendly and simple UI, while providing a lot of powerful features.
 
-## With an image
-1. Click `Browse..` next to `Initial Image`. Select your desired image.
-2. An optional text prompt can help you further describe the kind of image you want to generate.
-3. Press `Make Image`. See the image generated using your prompt.
+### Image generation
+- **Supports**: "*Text to Image*" and "*Image to Image*".
+- **In-Painting**: Specify areas of your image to paint into.
+- **Simple Drawing Tool**: Draw basic images to guide the AI, without needing an external drawing program.
+- **Face Correction (GFPGAN)**
+- **Upscaling (RealESRGAN)**
+- **Loopback**: Use the output image as the input image for the next img2img task.
+- **Negative Prompt**: Specify aspects of the image to *remove*.
+- **Attention/Emphasis**: () in the prompt increases the model's attention to enclosed words, and [] decreases it.
+- **Weighted Prompts**: Use weights for specific words in your prompt to change their importance, e.g. `red:2.4 dragon:1.2`.
+- **Prompt Matrix**: Quickly create multiple variations of your prompt, e.g. `a photograph of an astronaut riding a horse | illustration | cinematic lighting`.
+- **Lots of Samplers**: ddim, plms, heun, euler, euler_a, dpm2, dpm2_a, lms.
+- **1-click Upscale/Face Correction**: Upscale or correct an image after it has been generated.
+- **Make Similar Images**: Click to generate multiple variations of a generated image.
+- **NSFW Setting**: A setting in the UI to control *NSFW content*.
+- **JPEG/PNG output**: Multiple file formats.
 
-You can use Face Correction or Upscaling to improve the image further.
+### Advanced features
+- **Custom Models**: Use your own `.ckpt` or `.safetensors` file, by placing it inside the `models/stable-diffusion` folder!
+- **Stable Diffusion 2.0 support (experimental)**: available in beta channel.
+- **Use custom VAE models**
+- **Use pre-trained Hypernetworks**
+- **UI Plugins**: Choose from a growing list of [community-generated UI plugins](https://github.com/cmdr2/stable-diffusion-ui/wiki/UI-Plugins), or write your own plugin to add features to the project!
 
-**Pro tip:** You can also click `Use as Input` on a generated image, to use it as the input image for your next generation. This can be useful for sequentially refining the generated image with a single click.
+### Performance and security
+- **Low Memory Usage**: Creates 512x512 images with less than 4GB of GPU RAM!
+- **Use CPU setting**: If you don't have a compatible graphics card, but still want to run it on your CPU.
+- **Multi-GPU support**: Automatically spreads your tasks across multiple GPUs (if available), for faster performance!
+- **Auto scan for malicious models**: Uses picklescan to prevent malicious models.
+- **Safetensors support**: Support loading models in the safetensor format, for improved safety.
+- **Auto-updater**: Gets you the latest improvements and bug-fixes to a rapidly evolving project.
+- **Developer Console**: A developer-mode for those who want to modify their Stable Diffusion code, and edit the conda environment.
 
-**Another tip:** Images with the same aspect ratio of your generated image work best. E.g. 1:1 if you're generating images sized 512x512.
+### Usability:
+- **Live Preview**: See the image as the AI is drawing it.
+- **Task Queue**: Queue up all your ideas, without waiting for the current task to finish.
+- **Image Modifiers**: A library of *modifier tags* like *"Realistic"*, *"Pencil Sketch"*, *"ArtStation"* etc. Experiment with various styles quickly.
+- **Multiple Prompts File**: Queue multiple prompts by entering one prompt per line, or by running a text file.
+- **Save generated images to disk**: Save your images to your PC!
+- **UI Themes**: Customize the program to your liking.
 
-## Problems? Troubleshooting
-Please try the common [troubleshooting](Troubleshooting.md) steps. If that doesn't fix it, please ask on the [discord server](https://discord.com/invite/u9yhsFmEkB), or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
+**(and a lot more)**
 
-# Image Settings
-You can also set the configuration like `seed`, `width`, `height`, `num_outputs`, `num_inference_steps` and `guidance_scale` using the 'show' button next to 'Image settings'.
+----
 
-Use the same `seed` number to get the same image for a certain prompt. This is useful for refining a prompt without losing the basic image design. Enable the `random images` checkbox to get random images.
+## Easy for new users:
+![Screenshot of the initial UI](media/shot-v10-simple.jpg?raw=true)
 
-![Screenshot of advanced settings](media/config-v6.jpg?raw=true)
+## Powerful features for advanced users:
+![Screenshot of advanced settings](media/shot-v10.jpg?raw=true)
 
-# System Settings
-The system settings are reachable via the cogwheel symbol on the top right. It can be used to configure whether all generated images should 
-saved be automically, or to tune the Stable Diffusion image generation.
+## Live Preview
+Useful for judging (and stopping) an image quickly, without waiting for it to finish rendering.
 
-![Screenshot of advanced settings](media/system-settings-v2.jpg?raw=true)
+![live-512](https://user-images.githubusercontent.com/844287/192097249-729a0a1e-a677-485e-9ccc-16a9e848fabe.gif)
 
-# Image Modifiers
-![Screenshot of advanced settings](media/modifiers-v1.jpg?raw=true)
+## Task Queue
+![Screenshot of task queue](media/task-queue-v1.jpg?raw=true)
+
+# System Requirements
+1. Windows 10/11, or Linux. Experimental support for Mac is coming soon.
+2. An NVIDIA graphics card, preferably with 4GB or more of VRAM. If you don't have a compatible graphics card, it'll automatically run in the slower "CPU Mode".
+3. Minimum 8 GB of RAM and 25GB of disk space.
+
+You don't need to install or struggle with Python, Anaconda, Docker etc. The installer will take care of whatever is needed.
+
+----
+
+# How to use?
+Please refer to our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use) to understand how to use the features in this UI.
 
 # Bugs reports and code contributions welcome
 If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
 
-Also, please feel free to submit a pull request, if you have any code contributions in mind. Join the [discord server](https://discord.com/invite/u9yhsFmEkB) for development-related discussions, and for helping other users.
+We could really use help on these aspects (click to view tasks that need your help):
+* [User Interface](https://github.com/users/cmdr2/projects/1/views/1)
+* [Engine](https://github.com/users/cmdr2/projects/3/views/1)
+* [Installer](https://github.com/users/cmdr2/projects/4/views/1)
+* [Documentation](https://github.com/users/cmdr2/projects/5/views/1)
+
+If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users.
 
 # Disclaimer
 The authors of this project are not responsible for any content generated using this interface.
 
-The license of this software forbids you from sharing any content that violates any laws, produce any harm to a person, disseminate any personal information that would be meant for harm, spread misinformation, or target vulnerable groups. For the full list of restrictions please read [the license](LICENSE). You agree to these terms by using this software.
+The license of this software forbids you from sharing any content that:
+- Violates any laws.
+- Produces any harm to a person or persons.
+- Disseminates (spreads) any personal information that would be meant for harm.
+- Spreads misinformation.
+- Target vulnerable groups. 
+
+For the full list of restrictions please read [the License](LICENSE). You agree to these terms by using this software.

Troubleshooting.md

@@ -1,75 +0,0 @@
-Common issues and their solutions. If these solutions don't work, please feel free to ask at the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues).
-
-## RuntimeError: CUDA out of memory
-This can happen if your PC has less than 6GB of VRAM.
-
-Try disabling the "Turbo mode" setting under "Advanced Settings", since that takes an additional 1 GB of VRAM (to increase the speed).
-
-Additionally, a common reason for this error is that you're using an initial image larger than 768x768 pixels. Try using a smaller initial image.
-
-Also try generating smaller sized images.
-
-## basicsr module not found
-For Windows: Please download and extract basicsr from [here](https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.16/basicsr-win64.zip), and place the `basicsr` folder inside the `stable-diffusion-ui\stable-diffusion\env\lib\site-packages` folder. Then run the `Start Stable Diffusion UI.cmd` file again.
-
-For Linux: Please contact on the [discord server](https://discord.com/invite/u9yhsFmEkB).
-
-## No ldm found, or antlr4 or any other missing module, or ClobberError: This transaction has incompatible packages due to a shared path
-On Windows, please ensure that you had placed the `stable-diffusion-ui` folder after unzipping to the root of C: or D: (or any drive). For e.g. `C:\stable-diffusion-ui`. **Note:** This has to be done **before** you start the installation process. If you have already installed (and are facing this error), please delete the installed folder, and start fresh by unzipping and placing the folder at the top of your drive.
-
-This error can also be caused if you already have conda/miniconda/anaconda installed, due to package conflicts. Please open your Anaconda Prompt, and run `conda clean --all` to clean up unused packages.
-
-If nothing works, this could be due to a corrupted installation. Please try reinstalling this, by deleting the installed folder, and unzipping from the downloaded zip file.
-
-## Killed uvicorn server:app --app-dir ... --port 9000 --host 0.0.0.0
-This happens if your PC ran out of RAM. Stable Diffusion requires a lot of RAM, and requires atleast 10 GB of RAM to work well. You can also try closing all other applications before running Stable Diffusion UI.
-
-## Green image generated
-This usually happens if you're running NVIDIA 1650 or 1660 Super. To solve this, please close and run the Stable Diffusion command on your computer. If you're using the older Docker-based solution (v1), please upgrade to v2: https://github.com/cmdr2/stable-diffusion-ui/tree/v2#installation
-
-If you're still seeing this error, please try enabling "Full Precision" under "Advanced Settings" in the Stable Diffusion UI.
-
-## './docker-compose.yml' is invalid:
-> ERROR: The Compose file './docker-compose.yml' is invalid because:
-> services.stability-ai.deploy.resources.reservations value Additional properties are not allowed ('devices' was unexpected)
-
-Please ensure you have `docker-compose` version 1.29 or higher. Check `docker-compose --version`, and if required [update it to 1.29](https://docs.docker.com/compose/install/). (Thanks [HVRyan](https://github.com/HVRyan))
-
-## RuntimeError: Found no NVIDIA driver on your system:
-If you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), please ensure that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877). (Thanks [u/exintrovert420](https://www.reddit.com/user/exintrovert420/))
-
-## Some other process is already running at port 9000 / port 9000 could not be bound
-You can override the port used. Please change `docker-compose.yml` inside the project directory, and update the line `9000:9000` to `1337:9000` (where 1337 is whichever port number you want).
-
-After doing this, please restart your server, by running `./server restart`.
-
-After this, you can access the server at `http://localhost:1337` (where 1337 is the new port you specified earlier).
-
-## RuntimeError: CUDA error: unknown error
-Please ensure that you have an NVIDIA GPU and the latest [NVIDIA driver](http://www.nvidia.com/Download/index.aspx), and that you've installed [nvidia-container-toolkit](https://stackoverflow.com/a/58432877).
-
-Also, if you are using WSL (Windows), please ensure you have the latest WSL kernel by running `wsl --shutdown` and then `wsl --update`. (Thanks [AndrWeisR](https://github.com/AndrWeisR))
-
-# For support queries
-## Entering a conda environment in an existing installation
-This will give you an activated conda environment in the terminal, so you can run commands and force-install any packages, if required.
-
-Users don't need to have the Anaconda Prompt installed to do this anymore, since the installer bundles a portable version of conda inside it. Just follow these steps.
-
-**Windows:**
-1. Open the terminal: Press Win+R, type "cmd", and press "Run"
-2. Type `cd C:\stable-diffusion-ui` and press enter (or wherever you've installed it)
-3. Type `installer\Scripts\activate.bat` and press enter
-4. Type `cd stable-diffusion` and press enter
-5. Type `conda activate .\env` and press enter
-6. Type `python --version` and press enter. You should see 3.8.5.
-
-**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
 
-@set PYTHONNOUSERSITE=1
+mkdir dist\win\stable-diffusion-ui\scripts
+@REM mkdir dist\linux-mac\stable-diffusion-ui\scripts
 
-@mkdir dist\stable-diffusion-ui
+@rem copy the installer files for Windows
 
-@echo "Downloading components for the installer.."
+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
 
-@call conda env create --prefix installer -f environment.yaml
-@call conda activate .\installer
+@rem copy the installer files for Linux and Mac
 
-@echo "Creating a distributable package.."
+@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
 
-@call conda install -c conda-forge -y conda-pack
-@call conda pack --n-threads -1 --prefix installer --format tar
+@rem make the zip
 
-@cd dist\stable-diffusion-ui
-@mkdir installer
+cd dist\win
+call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-windows.zip
+cd ..\..
 
-@call tar -xf ..\..\installer.tar -C 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 ..\..
 
-@mkdir scripts
+echo "Build ready. Upload the zip files inside the 'dist' folder."
 
-@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
+pause

build.sh

@@ -11,45 +11,39 @@ case $yn in
     * ) exit;;
 esac
 
-export PYTHONNOUSERSITE=1
+# mkdir -p dist/win/stable-diffusion-ui/scripts
+mkdir -p dist/linux-mac/stable-diffusion-ui/scripts
 
-mkdir -p dist/stable-diffusion-ui
+# copy the installer files for Windows
 
-echo "Downloading components for the installer.."
+# 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
 
-source ~/miniconda3/etc/profile.d/conda.sh
+# copy the installer files for Linux and Mac
 
-conda install -c conda-forge -y conda-pack
+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 env create --prefix installer -f environment.yaml
-conda activate ./installer
+# make the zip
 
-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/win
+# zip -r ../stable-diffusion-ui-windows.zip stable-diffusion-ui
+# cd ../..
 
+cd dist/linux-mac
+zip -r ../stable-diffusion-ui-linux.zip stable-diffusion-ui
+zip -r ../stable-diffusion-ui-mac.zip stable-diffusion-ui
 cd ../..
 
-rm -rf installer
-
-rm installer.tar
+echo "Build ready. Upload the zip files inside the 'dist' folder."

scripts/Developer Console.cmd

@@ -0,0 +1,46 @@
+@echo off
+
+echo "Opening Stable Diffusion UI - Developer Console.." & echo.
+
+set PATH=C:\Windows\System32;%PATH%
+
+@rem set legacy and new installer's PATH, if they exist
+if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH%
+if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH%
+
+set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
+
+@rem activate the installer env
+call conda activate
+
+@rem Test the environment
+echo "Environment Info:"
+call where git
+call git --version
+
+call where conda
+call conda --version
+
+echo.
+
+@rem activate the environment
+call conda activate .\stable-diffusion\env
+
+call where python
+call python --version
+
+@rem set the PYTHONPATH
+cd stable-diffusion
+set SD_DIR=%cd%
+
+cd env\lib\site-packages
+set PYTHONPATH=%SD_DIR%;%cd%
+cd ..\..\..
+echo PYTHONPATH=%PYTHONPATH%
+
+cd ..
+
+@rem done
+echo.
+
+cmd /k

scripts/Start Stable Diffusion UI.cmd

@@ -1,19 +1,27 @@
 @echo off
 
-@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
-)
+cd /d %~dp0
+set PATH=C:\Windows\System32;%PATH%
 
-@call installer\Scripts\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 conda-unpack
+@rem Setup the packages required for the installer
+call scripts\bootstrap.bat
 
-@call conda --version
-@call git --version
+@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%
 
-@cd installer
+set PYTHONPATH=%cd%\installer;%cd%\installer_files\env
 
-@call ..\scripts\on_env_start.bat
+@rem Test the bootstrap
+call where git
+call git --version
+
+call where conda
+call conda --version
+
+@rem Download the rest of the installer and UI
+call scripts\on_env_start.bat
 
 @pause

scripts/bootstrap.bat

@@ -0,0 +1,77 @@
+@echo off
+
+@rem This script will install git and conda (if not found on the PATH variable)
+@rem  using micromamba (an 8mb static-linked single-file binary, conda replacement).
+@rem For users who already have git and conda, this step will be skipped.
+
+@rem This enables a user to install this project without manually installing conda and git.
+
+@rem config
+set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
+set INSTALL_ENV_DIR=%cd%\installer_files\env
+set LEGACY_INSTALL_ENV_DIR=%cd%\installer
+set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe
+set umamba_exists=F
+
+set OLD_APPDATA=%APPDATA%
+set OLD_USERPROFILE=%USERPROFILE%
+set APPDATA=%cd%\installer_files\appdata
+set USERPROFILE=%cd%\profile
+
+@rem figure out whether git and conda needs to be installed
+if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH%
+
+set PACKAGES_TO_INSTALL=
+
+if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" (
+    if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda
+)
+
+call git --version >.tmp1 2>.tmp2
+if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git
+
+call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2
+if "%ERRORLEVEL%" EQU "0" set umamba_exists=T
+
+@rem (if necessary) install git and conda into a contained environment
+if "%PACKAGES_TO_INSTALL%" NEQ "" (
+    @rem download micromamba
+    if "%umamba_exists%" == "F" (
+        echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe"
+
+        mkdir "%MAMBA_ROOT_PREFIX%"
+        call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe"
+
+        if "%ERRORLEVEL%" NEQ "0" (
+            echo "There was a problem downloading micromamba. Cannot continue."
+            pause
+            exit /b
+        )
+
+        mkdir "%APPDATA%"
+        mkdir "%USERPROFILE%"
+
+        @rem test the mamba binary
+        echo Micromamba version:
+        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version
+    )
+
+    @rem create the installer env
+    if not exist "%INSTALL_ENV_DIR%" (
+        call "%MAMBA_ROOT_PREFIX%\micromamba.exe" create -y --prefix "%INSTALL_ENV_DIR%"
+    )
+
+    echo "Packages to install:%PACKAGES_TO_INSTALL%"
+
+    call "%MAMBA_ROOT_PREFIX%\micromamba.exe" install -y --prefix "%INSTALL_ENV_DIR%" -c conda-forge %PACKAGES_TO_INSTALL%
+
+    if not exist "%INSTALL_ENV_DIR%" (
+        echo "There was a problem while installing%PACKAGES_TO_INSTALL% using micromamba. Cannot continue."
+        pause
+        exit /b
+    )
+)
+
+@rem revert to the old APPDATA. only needed it for bypassing a bug in micromamba (with special characters)
+set APPDATA=%OLD_APPDATA%
+set USERPROFILE=%OLD_USERPROFILE%

scripts/bootstrap.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# This script will install git and conda (if not found on the PATH variable)
+#  using micromamba (an 8mb static-linked single-file binary, conda replacement).
+# For users who already have git and conda, this step will be skipped.
+
+# This enables a user to install this project without manually installing conda and git.
+
+source ./scripts/functions.sh
+
+set -o pipefail
+
+OS_NAME=$(uname -s)
+case "${OS_NAME}" in
+    Linux*)     OS_NAME="linux";;
+    Darwin*)    OS_NAME="osx";;
+    *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
+esac
+
+OS_ARCH=$(uname -m)
+case "${OS_ARCH}" in
+    x86_64*)    OS_ARCH="64";;
+    arm64*)     OS_ARCH="arm64";;
+    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
+esac
+
+# https://mamba.readthedocs.io/en/latest/installation.html
+if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64"; fi
+
+# config
+export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba"
+INSTALL_ENV_DIR="$(pwd)/installer_files/env"
+LEGACY_INSTALL_ENV_DIR="$(pwd)/installer"
+MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest"
+umamba_exists="F"
+
+# figure out whether git and conda needs to be installed
+if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi
+
+PACKAGES_TO_INSTALL=""
+
+if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi
+if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi
+
+if "$MAMBA_ROOT_PREFIX/micromamba" --version &>/dev/null; then umamba_exists="T"; fi
+
+# (if necessary) install git and conda into a contained environment
+if [ "$PACKAGES_TO_INSTALL" != "" ]; then
+    # download micromamba
+    if [ "$umamba_exists" == "F" ]; then
+        echo "Downloading micromamba from $MICROMAMBA_DOWNLOAD_URL to $MAMBA_ROOT_PREFIX/micromamba"
+
+        mkdir -p "$MAMBA_ROOT_PREFIX"
+        curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj bin/micromamba -O > "$MAMBA_ROOT_PREFIX/micromamba"
+
+        if [ "$?" != "0" ]; then
+            echo
+            echo "EE micromamba download failed"
+            echo "EE If the lines above contain 'bzip2: Cannot exec', your system doesn't have bzip2 installed"
+            echo "EE If there are network errors, please check your internet setup"
+            fail "micromamba download failed"
+        fi
+
+        chmod u+x "$MAMBA_ROOT_PREFIX/micromamba"
+
+        # test the mamba binary
+        echo "Micromamba version:"
+        "$MAMBA_ROOT_PREFIX/micromamba" --version
+    fi
+
+    # create the installer env
+    if [ ! -e "$INSTALL_ENV_DIR" ]; then
+        "$MAMBA_ROOT_PREFIX/micromamba" create -y --prefix "$INSTALL_ENV_DIR" || fail "unable to create the install environment"
+    fi
+   
+    if [ ! -e "$INSTALL_ENV_DIR" ]; then
+        fail "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue."
+    fi
+
+    echo "Packages to install:$PACKAGES_TO_INSTALL"
+
+    "$MAMBA_ROOT_PREFIX/micromamba" install -y --prefix "$INSTALL_ENV_DIR" -c conda-forge $PACKAGES_TO_INSTALL
+    if [ "$?" != "0" ]; then
+        fail "Installation of the packages '$PACKAGES_TO_INSTALL' failed."
+    fi
+fi

scripts/developer_console.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+if [ "$0" == "bash" ]; then
+  echo "Opening Stable Diffusion UI - Developer Console.."
+  echo ""
+
+  # set legacy and new installer's PATH, if they exist
+  if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
+  if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
+
+  # activate the installer env
+  CONDA_BASEPATH=$(conda info --base)
+  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
+
+  conda activate
+
+  # test the environment
+  echo "Environment Info:"
+  which git
+  git --version
+
+  which conda
+  conda --version
+
+  echo ""
+
+  # activate the environment
+  CONDA_BASEPATH=$(conda info --base)
+  source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script)
+
+  conda activate ./stable-diffusion/env
+
+  which python
+  python --version
+
+  # set the PYTHONPATH
+  cd stable-diffusion
+  SD_PATH=`pwd`
+  export PYTHONPATH="$SD_PATH:$SD_PATH/env/lib/python3.8/site-packages"
+  echo "PYTHONPATH=$PYTHONPATH"
+  cd ..
+
+  # done
+
+  echo ""
+else
+  file_name=$(basename "${BASH_SOURCE[0]}")
+  bash --init-file "$file_name"
+fi

scripts/functions.sh

@@ -0,0 +1,32 @@
+#
+# utility functions for all scripts
+#
+
+fail() {
+    echo
+    echo "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+    echo
+    if [ "$1" != "" ]; then
+        echo ERROR: $1
+    else
+        echo An error occurred.
+    fi
+    cat <<EOF
+
+Error downloading Stable Diffusion UI. Sorry about that, please try to:
+ 1. Run this installer again.
+ 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
+ 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB
+ 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
+
+Thanks!
+
+
+EOF
+    read -p "Press any key to continue"
+    exit 1
+
+}
+
+
+

scripts/on_env_start.bat

@@ -4,8 +4,6 @@
 
 set PATH=C:\Windows\System32;%PATH%
 
-@cd ..
-
 if exist "scripts\config.bat" (
     @call scripts\config.bat
 )
@@ -14,7 +12,7 @@ if "%update_branch%"=="" (
     set update_branch=main
 )
 
-@>nul grep -c "conda_sd_ui_deps_installed" scripts\install_status.txt
+@>nul findstr /m "conda_sd_ui_deps_installed" scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
     for /f "tokens=*" %%a in ('python -c "import os; parts = os.getcwd().split(os.path.sep); print(len(parts))"') do if "%%a" NEQ "2" (
         echo. & echo "!!!! WARNING !!!!" & echo.
@@ -28,14 +26,14 @@ if "%update_branch%"=="" (
     )
 )
 
-@>nul grep -c "sd_ui_git_cloned" scripts\install_status.txt
+@>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     @echo "Stable Diffusion UI's git repository was already installed. Updating from %update_branch%.."
 
     @cd sd-ui-files
 
     @call git reset --hard
-    @call git checkout "%update_branch%"
+    @call git -c advice.detachedHead=false checkout "%update_branch%"
     @call git pull
 
     @cd ..
@@ -46,16 +44,18 @@ 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/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 "Error downloading Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
         pause
         @exit /b
     )
 )
 
-@xcopy sd-ui-files\ui ui /s /i /Y
+@xcopy sd-ui-files\ui ui /s /i /Y /q
 @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
+@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
 @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
+@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y
 
 @call scripts\on_sd_start.bat
 
-@pause
+@pause

scripts/on_env_start.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ./scripts/functions.sh
+
 printf "\n\nStable Diffusion UI\n\n"
 
 if [ -f "scripts/config.sh" ]; then
@@ -16,7 +18,7 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in
     cd sd-ui-files
 
     git reset --hard
-    git checkout "$update_branch"
+    git -c advice.detachedHead=false checkout "$update_branch"
     git pull
 
     cd ..
@@ -27,16 +29,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
-        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
+        fail "git clone failed"
     fi
 fi
 
 rm -rf ui
 cp -Rf sd-ui-files/ui .
 cp sd-ui-files/scripts/on_sd_start.sh scripts/
+cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/start.sh .
+cp sd-ui-files/scripts/developer_console.sh .
 
 ./scripts/on_sd_start.sh
 

scripts/on_sd_start.bat

@@ -1,49 +1,73 @@
 @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
+
+if exist "%cd%\profile" (
+    set USERPROFILE=%cd%\profile
+)
+
+@mkdir tmp
+@set TMP=%cd%\tmp
+@set TEMP=%cd%\tmp
+
+@rem activate the installer env
+call conda activate
+@if "%ERRORLEVEL%" NEQ "0" (
+       @echo. & echo "Error activating conda for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+       pause
+       exit /b
+)
+
+@REM remove the old version of the dev console script, if it's still present
+if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
+
 @call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"
 
-@>nul grep -c "sd_git_cloned" scripts\install_status.txt
+if NOT DEFINED test_sd2 set test_sd2=N
+
+@>nul findstr /m "sd_git_cloned" scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     @echo "Stable Diffusion's git repository was already installed. Updating.."
 
     @cd stable-diffusion
 
+    @call git remote set-url origin https://github.com/easydiffusion/diffusion-kit.git
+
     @call git reset --hard
     @call git pull
-    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
-    @call git apply ..\ui\sd_internal\ddim_callback.patch
-    @call git apply ..\ui\sd_internal\env_yaml.patch
+    if "%test_sd2%" == "N" (
+        @call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
+    )
+    if "%test_sd2%" == "Y" (
+        @call git -c advice.detachedHead=false checkout 733a1f6f9cae9b9a9b83294bf3281b123378cb1f
+    )
 
     @cd ..
 ) else (
     @echo. & echo "Downloading Stable Diffusion.." & echo.
 
-    @call git clone https://github.com/basujindal/stable-diffusion.git && (
+    @call git clone https://github.com/easydiffusion/diffusion-kit.git stable-diffusion && (
         @echo sd_git_cloned >> scripts\install_status.txt
     ) || (
-        @echo "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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 "Error downloading Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
         pause
         @exit /b
     )
 
     @cd stable-diffusion
-    @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    @call git apply ..\ui\sd_internal\ddim_callback.patch
-    @call git apply ..\ui\sd_internal\env_yaml.patch
+    @call git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
 
     @cd ..
 )
 
 @cd stable-diffusion
 
-@>nul grep -c "conda_sd_env_created" ..\scripts\install_status.txt
+@>nul findstr /m "conda_sd_env_created" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     @echo "Packages necessary for Stable Diffusion were already installed"
 
@@ -56,22 +80,20 @@
     @REM prevent conda from using packages from the user's home directory, to avoid conflicts
     @set PYTHONNOUSERSITE=1
 
+    set USERPROFILE=%cd%\profile
+
+    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
     @call conda env create --prefix env -f environment.yaml || (
-        @echo. & echo "Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
 
     @call conda activate .\env
 
-    @call conda install -c conda-forge -y --prefix env antlr4-python3-runtime=4.8 || (
-        @echo. & echo "Error installing antlr4-python3-runtime for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -79,9 +101,22 @@
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
+@rem allow rolling back the sdkit-based changes
+if exist "src-old" (
+    if not exist "src" (
+        rename "src-old" "src"
+
+        if exist "ldm-old" (
+            rd /s /q "ldm-old"
+        )
+
+        call pip uninstall -y sdkit stable-diffusion-sdkit
+    )
+)
+
 set PATH=C:\Windows\System32;%PATH%
 
-@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
+@>nul findstr /m "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     @echo "Packages necessary for GFPGAN (Face Correction) were already installed"
 ) else (
@@ -89,20 +124,12 @@ set PATH=C:\Windows\System32;%PATH%
 
     @set PYTHONNOUSERSITE=1
 
-    @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
-    )
+    set USERPROFILE=%cd%\profile
 
-    @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
-    )
+    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
 
     for /f "tokens=*" %%a in ('python -c "from gfpgan import GFPGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -110,7 +137,7 @@ set PATH=C:\Windows\System32;%PATH%
     @echo conda_sd_gfpgan_deps_installed >> ..\scripts\install_status.txt
 )
 
-@>nul grep -c "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt
+@>nul findstr /m "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     @echo "Packages necessary for ESRGAN (Resolution Upscaling) were already installed"
 ) else (
@@ -118,14 +145,12 @@ set PATH=C:\Windows\System32;%PATH%
 
     @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
-    )
+    set USERPROFILE=%cd%\profile
+
+    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
 
     for /f "tokens=*" %%a in ('python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"') do if "%%a" NEQ "42" (
-        @echo. & echo "Dependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Dependency test failed! Error installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -133,7 +158,7 @@ set PATH=C:\Windows\System32;%PATH%
     @echo conda_sd_esrgan_deps_installed >> ..\scripts\install_status.txt
 )
 
-@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
+@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" EQU "0" (
     echo "Packages necessary for Stable Diffusion UI were already installed"
 ) else (
@@ -141,28 +166,65 @@ set PATH=C:\Windows\System32;%PATH%
 
     @set PYTHONNOUSERSITE=1
 
+    set USERPROFILE=%cd%\profile
+
+    set PYTHONPATH=%cd%;%cd%\env\lib\site-packages
+
     @call conda install -c conda-forge -y --prefix env uvicorn fastapi || (
-        echo "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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 "Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
         pause
         exit /b
     )
 )
 
 call WHERE uvicorn > .tmp
-@>nul grep -c "uvicorn" .tmp
+@>nul findstr /m "uvicorn" .tmp
 @if "%ERRORLEVEL%" NEQ "0" (
-    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+    @echo. & echo "UI packages not found! Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
     pause
     exit /b
 )
 
-@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
+@>nul 2>nul call python -m picklescan --help
+@if "%ERRORLEVEL%" NEQ "0" (
+    @echo. & echo Picklescan not found. Installing
+    @call pip install picklescan || (
+        echo "Error installing the picklescan package necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        pause
+        exit /b
+    )
+)
+
+@>nul 2>nul call python -c "import safetensors"
+@if "%ERRORLEVEL%" NEQ "0" (
+    @echo. & echo SafeTensors not found. Installing
+    @call pip install safetensors || (
+        echo "Error installing the safetensors package necessary for Stable Diffusion UI. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
+        pause
+        exit /b
+    )
+)
+
+@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
     @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )
 
 
 
+if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
+if not exist "..\models\vae" mkdir "..\models\vae"
+if not exist "..\models\hypernetwork" mkdir "..\models\hypernetwork"
+echo. > "..\models\stable-diffusion\Put your custom ckpt files here.txt"
+echo. > "..\models\vae\Put your VAE files here.txt"
+echo. > "..\models\hypernetwork\Put your hypernetwork files here.txt"
+
+@rem if downgrading from v2.5, migrate the models to the legacy path (if already downloaded)
+if exist "..\models\stable-diffusion\sd-v1-4.ckpt" if not exist "sd-v1-4.ckpt" move ..\models\stable-diffusion\sd-v1-4.ckpt .
+if exist "..\models\gfpgan\GFPGANv1.3.pth" if not exist "GFPGANv1.3.pth" move ..\models\gfpgan\GFPGANv1.3.pth .
+if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" if not exist "RealESRGAN_x4plus.pth" move ..\models\realesrgan\RealESRGAN_x4plus.pth .
+if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" if not exist "RealESRGAN_x4plus_anime_6B.pth" move ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth .
+
 @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."
@@ -188,12 +250,12 @@ call WHERE uvicorn > .tmp
     @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/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.
+            echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) else (
-        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -218,12 +280,12 @@ call WHERE uvicorn > .tmp
     @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/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.
+            echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) else (
-        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -235,7 +297,7 @@ call WHERE uvicorn > .tmp
     for %%I in ("RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
     ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        echo. & echo "The RealESRGAN model file present at %cd%\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
         del "RealESRGAN_x4plus.pth"
     )
 )
@@ -248,12 +310,12 @@ call WHERE uvicorn > .tmp
     @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/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.
+            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -265,7 +327,7 @@ call WHERE uvicorn > .tmp
     for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
     ) else (
-        echo. & echo "The GFPGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        echo. & echo "The RealESRGAN model file present at %cd%\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
         del "RealESRGAN_x4plus_anime_6B.pth"
     )
 )
@@ -278,12 +340,12 @@ call WHERE uvicorn > .tmp
     @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/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.
+            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
             pause
             exit /b
         )
     ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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.
+        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
         pause
         exit /b
     )
@@ -291,7 +353,39 @@ call WHERE uvicorn > .tmp
 
 
 
-@>nul grep -c "sd_install_complete" ..\scripts\install_status.txt
+@if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+    for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" EQU "334695179" (
+        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
+    ) else (
+        echo. & echo "The default VAE (sd-vae-ft-mse-original) file present at models\vae\vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
+        del "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt"
+    )
+)
+
+@if not exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+    @echo. & echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).." & echo.
+
+    @call curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt
+
+    @if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
+        for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" NEQ "334695179" (
+            echo. & echo "Error: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: %%~zI" & echo.
+            echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+            pause
+            exit /b
+        )
+    ) else (
+        @echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
+        pause
+        exit /b
+    )
+)
+
+if "%test_sd2%" == "Y" (
+    @call pip install open_clip_torch==2.0.2
+)
+
+@>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt
 @if "%ERRORLEVEL%" NEQ "0" (
     @echo sd_weights_downloaded >> ..\scripts\install_status.txt
     @echo sd_install_complete >> ..\scripts\install_status.txt
@@ -306,12 +400,24 @@ call WHERE uvicorn > .tmp
 @cd ..\..\..
 @echo PYTHONPATH=%PYTHONPATH%
 
+call where python
+call python --version
+
 @cd ..
 @set SD_UI_PATH=%cd%\ui
 @cd stable-diffusion
 
-@call python --version
+@rem
+@rem Rewrite easy-install.pth. This fixes the installation if the user has relocated the SDUI installation
+@rem
+>env\Lib\site-packages\easy-install.pth echo %cd%\src\taming-transformers
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\clip
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\gfpgan
+>>env\Lib\site-packages\easy-install.pth echo %cd%\src\realesrgan
 
-@uvicorn server:app --app-dir "%SD_UI_PATH%" --port 9000 --host 0.0.0.0
+@if NOT DEFINED SD_UI_BIND_PORT set SD_UI_BIND_PORT=9000
+@if NOT DEFINED SD_UI_BIND_IP set SD_UI_BIND_IP=0.0.0.0
+@uvicorn server:app --app-dir "%SD_UI_PATH%" --port %SD_UI_BIND_PORT% --host %SD_UI_BIND_IP%
 
-@pause
+
+@pause

scripts/on_sd_start.sh

@@ -1,43 +1,58 @@
 #!/bin/bash
 
+source ./scripts/functions.sh
+
 cp sd-ui-files/scripts/on_env_start.sh scripts/
+cp sd-ui-files/scripts/bootstrap.sh scripts/
 
-source installer/etc/profile.d/conda.sh
+# activate the installer env
+CONDA_BASEPATH=$(conda info --base)
+source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error
 
-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');"
+conda activate || fail "Failed to activate conda"
+
+# remove the old version of the dev console script, if it's still present
+if [ -e "open_dev_console.sh" ]; then
+    rm "open_dev_console.sh"
+fi
+
+python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" 
 
 # Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
 # Note to self: Please rewrite this in Python. For the sake of your own sanity.
 
+if [ "$test_sd2" == "" ]; then
+    export test_sd2="N"
+fi
+
 if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/install_status.txt` -gt "0" ]; then
     echo "Stable Diffusion's git repository was already installed. Updating.."
 
     cd stable-diffusion
 
+    git remote set-url origin https://github.com/easydiffusion/diffusion-kit.git
+
     git reset --hard
     git pull
-    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
 
-    git apply ../ui/sd_internal/ddim_callback.patch
-    git apply ../ui/sd_internal/env_yaml.patch
+    if [ "$test_sd2" == "N" ]; then
+        git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
+    elif [ "$test_sd2" == "Y" ]; then
+        git -c advice.detachedHead=false checkout 733a1f6f9cae9b9a9b83294bf3281b123378cb1f
+    fi
 
     cd ..
 else
     printf "\n\nDownloading Stable Diffusion..\n\n"
 
-    if git clone https://github.com/basujindal/stable-diffusion.git ; then
+    if git clone https://github.com/easydiffusion/diffusion-kit.git stable-diffusion ; 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
+        fail "git clone of basujindal/stable-diffusion.git failed"
     fi
 
     cd stable-diffusion
-    git checkout f6cfebffa752ee11a7b07497b8529d5971de916c
-
-    git apply ../ui/sd_internal/ddim_callback.patch
-    git apply ../ui/sd_internal/env_yaml.patch
+    git -c advice.detachedHead=false checkout 7f32368ed1030a6e710537047bacd908adea183a
 
     cd ..
 fi
@@ -47,62 +62,54 @@ cd stable-diffusion
 if [ `grep -c conda_sd_env_created ../scripts/install_status.txt` -gt "0" ]; then
     echo "Packages necessary for Stable Diffusion were already installed"
 
-    conda activate ./env
+    conda activate ./env || fail "conda activate failed"
 else
     printf "\n\nDownloading packages necessary for Stable Diffusion..\n"
     printf "\n\n***** This will take some time (depending on the speed of the Internet connection) and may appear to be stuck, but please be patient ***** ..\n\n"
 
     # prevent conda from using packages from the user's home directory, to avoid conflicts
     export PYTHONNOUSERSITE=1
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
 
     if conda env create --prefix env --force -f environment.yaml ; then
         echo "Installed. Testing.."
     else
-        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
+        fail "'conda env create' failed"
     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
+    conda activate ./env || fail "conda activate failed"
 
     out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"`
     if [ "$out_test" != "42" ]; then
-        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
+        fail "Dependency test failed"
     fi
 
     echo conda_sd_env_created >> ../scripts/install_status.txt
 fi
 
+# allow rolling back the sdkit-based changes
+if [ -e "src-old" ] && [ ! -e "src" ]; then
+    mv src-old src
+
+    if [ -e "ldm-old" ]; then rm -r ldm-old; fi
+
+    pip uninstall -y sdkit stable-diffusion-sdkit
+fi
+
 if [ `grep -c conda_sd_gfpgan_deps_installed ../scripts/install_status.txt` -gt "0" ]; then
     echo "Packages necessary for GFPGAN (Face Correction) were already installed"
 else
     printf "\n\nDownloading packages necessary for GFPGAN (Face Correction)..\n"
 
     export PYTHONNOUSERSITE=1
-
-    if pip install -e git+https://github.com/TencentARC/GFPGAN#egg=GFPGAN ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
 
     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
+        echo "EE The dependency check has failed. This usually means that some system libraries are missing."
+	echo "EE On Debian/Ubuntu systems, this are often these packages: libsm6 libxext6 libxrender-dev"
+	echo "EE Other Linux distributions might have different package names for these libraries."
+        fail "GFPGAN dependency test failed"
     fi
 
     echo conda_sd_gfpgan_deps_installed >> ../scripts/install_status.txt
@@ -114,20 +121,11 @@ else
     printf "\n\nDownloading packages necessary for ESRGAN (Resolution Upscaling)..\n"
 
     export PYTHONNOUSERSITE=1
-
-    if pip install -e git+https://github.com/xinntao/Real-ESRGAN#egg=realesrgan ; then
-        echo "Installed. Testing.."
-    else
-        printf "\n\nError installing the packages necessary for ESRGAN (Resolution Upscaling). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
 
     out_test=`python -c "from basicsr.archs.rrdbnet_arch import RRDBNet; from realesrgan import RealESRGANer; print(42)"`
     if [ "$out_test" != "42" ]; then
-        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
+        fail "ESRGAN dependency test failed"
     fi
 
     echo conda_sd_esrgan_deps_installed >> ../scripts/install_status.txt
@@ -139,28 +137,52 @@ else
     printf "\n\nDownloading packages necessary for Stable Diffusion UI..\n\n"
 
     export PYTHONNOUSERSITE=1
+    export PYTHONPATH="$(pwd):$(pwd)/env/lib/site-packages"
 
     if conda install -c conda-forge --prefix ./env -y uvicorn fastapi ; then
         echo "Installed. Testing.."
     else
-        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
+        fail "'conda install uvicorn' failed" 
     fi
 
     if ! command -v uvicorn &> /dev/null; then
-        printf "\n\nUI packages not found! Error installing the packages necessary for Stable Diffusion UI. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+        fail "UI packages not found!"
     fi
 
     echo conda_sd_ui_deps_installed >> ../scripts/install_status.txt
 fi
 
+if python -m picklescan --help >/dev/null 2>&1; then
+    echo "Picklescan is already installed."
+else
+    echo "Picklescan not found, installing."
+    pip install picklescan || fail "Picklescan installation failed."
+fi
 
+if python -c "import safetensors" --help >/dev/null 2>&1; then
+    echo "SafeTensors is already installed."
+else
+    echo "SafeTensors not found, installing."
+    pip install safetensors || fail "SafeTensors installation failed."
+fi
+
+
+
+mkdir -p "../models/stable-diffusion"
+mkdir -p "../models/vae"
+mkdir -p "../models/hypernetwork"
+echo "" > "../models/stable-diffusion/Put your custom ckpt files here.txt"
+echo "" > "../models/vae/Put your VAE files here.txt"
+echo "" > "../models/hypernetwork/Put your hypernetwork files here.txt"
+
+# if downgrading from v2.5, migrate the models to the legacy path (if already downloaded)
+if [ -e "../models/stable-diffusion/sd-v1-4.ckpt" ] && [ ! -e "sd-v1-4.ckpt" ]; then mv ../models/stable-diffusion/sd-v1-4.ckpt . ; fi
+if [ -e "../models/gfpgan/GFPGANv1.3.pth" ] && [ ! -e "GFPGANv1.3.pth" ]; then mv ../models/gfpgan/GFPGANv1.3.pth . ; fi
+if [ -e "../models/realesrgan/RealESRGAN_x4plus.pth" ] && [ ! -e "RealESRGAN_x4plus.pth" ]; then mv ../models/realesrgan/RealESRGAN_x4plus.pth . ; fi
+if [ -e "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ] && [ ! -e "RealESRGAN_x4plus_anime_6B.pth" ]; then mv ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth . ; fi
 
 if [ -f "sd-v1-4.ckpt" ]; then
-    model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`
+    model_size=`find "sd-v1-4.ckpt" -printf "%s"`
 
     if [ "$model_size" -eq "4265380512" ] || [ "$model_size" -eq "7703807346" ] || [ "$model_size" -eq "7703810927" ]; then
         echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
@@ -176,23 +198,18 @@ if [ ! -f "sd-v1-4.ckpt" ]; then
     curl -L -k https://me.cmdr2.org/stable-diffusion-ui/sd-v1-4.ckpt > sd-v1-4.ckpt
 
     if [ -f "sd-v1-4.ckpt" ]; then
-        model_size=`ls -l sd-v1-4.ckpt | awk '{print $5}'`
+        model_size=`find "sd-v1-4.ckpt" -printf "%s"`
         if [ ! "$model_size" == "4265380512" ]; then
-            printf "\n\nError: The downloaded model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+	    fail "The downloaded model file was invalid! Bytes downloaded: $model_size"
         fi
     else
-        printf "\n\nError downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+        fail "Error downloading the data files (weights) for Stable Diffusion"
     fi
 fi
 
 
 if [ -f "GFPGANv1.3.pth" ]; then
-    model_size=`ls -l GFPGANv1.3.pth | awk '{print $5}'`
+    model_size=`find "GFPGANv1.3.pth" -printf "%s"`
 
     if [ "$model_size" -eq "348632874" ]; then
         echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
@@ -208,23 +225,18 @@ if [ ! -f "GFPGANv1.3.pth" ]; then
     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}'`
+        model_size=`find "GFPGANv1.3.pth" -printf "%s"`
         if [ ! "$model_size" -eq "348632874" ]; then
-            printf "\n\nError: The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+            fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
         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
+        fail "Error downloading the data files (weights) for GFPGAN (Face Correction)."
     fi
 fi
 
 
 if [ -f "RealESRGAN_x4plus.pth" ]; then
-    model_size=`ls -l RealESRGAN_x4plus.pth | awk '{print $5}'`
+    model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
 
     if [ "$model_size" -eq "67040989" ]; then
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
@@ -240,23 +252,18 @@ if [ ! -f "RealESRGAN_x4plus.pth" ]; then
     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}'`
+        model_size=`find "RealESRGAN_x4plus.pth" -printf "%s"`
         if [ ! "$model_size" -eq "67040989" ]; then
-            printf "\n\nError: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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
+            fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
         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
+        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus"
     fi
 fi
 
 
 if [ -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`ls -l RealESRGAN_x4plus_anime_6B.pth | awk '{print $5}'`
+    model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
 
     if [ "$model_size" -eq "17938799" ]; then
         echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
@@ -272,20 +279,50 @@ if [ ! -f "RealESRGAN_x4plus_anime_6B.pth" ]; then
     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}'`
+        model_size=`find "RealESRGAN_x4plus_anime_6B.pth" -printf "%s"`
         if [ ! "$model_size" -eq "17938799" ]; then
-            printf "\n\nError: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/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"
+            fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
+        fi
+    else
+        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime."
+    fi
+fi
+
+
+if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+    model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
+
+    if [ "$model_size" -eq "334695179" ]; then
+        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
+    else
+        printf "\n\nThe model file present at models/vae/vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
+        rm ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
+    fi
+fi
+
+if [ ! -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+    echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).."
+
+    curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
+
+    if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
+        model_size=`find ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt -printf "%s"`
+        if [ ! "$model_size" -eq "334695179" ]; then
+            printf "\n\nError: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: $model_size\n\n"
+            printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
             read -p "Press any key to continue"
             exit
         fi
     else
-        printf "\n\nError downloading the data files (weights) for 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"
+        printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
         read -p "Press any key to continue"
         exit
     fi
 fi
 
+if [ "$test_sd2" == "Y" ]; then
+    pip install open_clip_torch==2.0.2
+fi
 
 if [ `grep -c sd_install_complete ../scripts/install_status.txt` -gt "0" ]; then
     echo sd_weights_downloaded >> ../scripts/install_status.txt
@@ -295,15 +332,16 @@ fi
 printf "\n\nStable Diffusion is ready!\n\n"
 
 SD_PATH=`pwd`
-export PYTHONPATH="$SD_PATH;$SD_PATH/env/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
 
-python --version
-
-uvicorn server:app --app-dir "$SD_UI_PATH" --port 9000 --host 0.0.0.0
+uvicorn server:app --app-dir "$SD_UI_PATH" --port ${SD_UI_BIND_PORT:-9000} --host ${SD_UI_BIND_IP:-0.0.0.0}
 
 read -p "Press any key to continue"

scripts/post_activate.bat

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

scripts/post_activate.sh

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

scripts/start.sh

@@ -1,10 +1,22 @@
 #!/bin/bash
 
-source installer/bin/activate
+cd "$(dirname "${BASH_SOURCE[0]}")"
 
-conda-unpack
+# set legacy installer's PATH, if it exists
+if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
 
-conda --version
-git --version
+# Setup the packages required for the installer
+scripts/bootstrap.sh || exit 1
 
+# set new installer's PATH, if it downloaded any packages
+if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi
+
+# Test the bootstrap
+which git
+git --version || exit 1
+
+which conda
+conda --version || exit 1
+
+# Download the rest of the installer and UI
 scripts/on_env_start.sh

ui/frontend/build_src/.eslintrc.cjs

@@ -1,87 +0,0 @@
-const path = require("path");
-
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
-    ecmaFeatures: {
-      jsx: true,
-    },
-    tsconfigRootDir: __dirname,
-  },
-
-  plugins: ["react"],
-
-  extends: [
-    "prettier",
-    "plugin:react/recommended",
-    "standard-with-typescript",
-    "plugin:i18next/recommended",
-    "plugin:i18n-json/recommended",
-  ],
-  settings: {
-    react: {
-      version: "detect",
-    },
-  },
-  rules: {
-    // general things turned off for now
-    "no-debugger": "warn",
-    "eol-last": "off",
-    "comma-dangle": ["off", "always-multiline"],
-    "no-void": ["off"],
-    "array-callback-return": ["off"],
-    "spaced-comment": ["off"],
-    "padded-blocks": ["off"],
-    "no-multiple-empty-lines": ["off", { max: 2, maxEOF: 1 }],
-    quotes: ["off", "double"],
-    semi: ["off", "always"],
-    yoda: ["off"],
-    eqeqeq: ["off"],
-    "react/display-name": "warn",
-
-    // TS THINGS WE DONT WANT
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-
-    // these are things that fight with prettier
-    "@typescript-eslint/comma-dangle": "off",
-    "@typescript-eslint/space-before-function-paren": "off",
-    "@typescript-eslint/quotes": "off",
-    "@typescript-eslint/semi": "off",
-    "@typescript-eslint/brace-style": "off",
-    "@typescript-eslint/indent": "off",
-    "@typescript-eslint/member-delimiter-style": "off",
-
-    // TS WARNINGS WE WANT
-    "@typescript-eslint/no-unused-vars": "warn",
-    "@typescript-eslint/no-non-null-assertion": "warn",
-
-    // i18n stuff no string literal works but turned off for now
-    "i18next/no-literal-string": "off",
-    // still need to figure out how to get this to work
-    // it should error if we dont haev all the keys in the translation file
-    "i18n-json/identical-keys": [
-      "error",
-      {
-        filePath: {
-          "home.json/": path.resolve("./Translation/locales/en/home.json"),
-        },
-      },
-    ],
-  },
-  overrides: [
-    {
-      files: ["*.ts", "*.tsx"],
-      parserOptions: {
-        project: ["./tsconfig.json"], // Specify it only for TypeScript files
-      },
-    },
-  ],
-  // eslint-disable-next-line semi
-};

ui/frontend/build_src/.gitignore

@@ -1,18 +0,0 @@
-# local ignores - We could move these to the global ignores, 
-# but I think it makes sense to keep them here
-
-# env
-*.local
-
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-# installed dependencies
-node_modules
-

ui/frontend/build_src/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="icon" type="image/png" href="/media/favicon-16x16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/media/favicon-32x32.png" sizes="32x32">
-    <meta name="color-scheme" content="dark light" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
-    <title>Stable Diffusion UI</title>
-  </head>
-  <body>
-    <!-- The react app entry point. Currently no ui just poc importing and logging -->
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

ui/frontend/build_src/package.json

@@ -1,56 +0,0 @@
-{
-  "name": "react-ts",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "pretty": "prettier --write .",
-    "dev": "vite",
-    "build": "tsc && vite build --emptyOutDir",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@headlessui/react": "^1.7.2",
-    "@tanstack/react-location": "^3.7.4",
-    "@tanstack/react-query": "^4.2.3",
-    "@tanstack/react-query-devtools": "^4.2.3",
-    "@vanilla-extract/css": "^1.9.0",
-    "@vanilla-extract/css-utils": "^0.1.2",
-    "@vanilla-extract/recipes": "^0.2.5",
-    "@vanilla-extract/vite-plugin": "^3.5.0",
-    "i18next": "^21.9.2",
-    "immer": "^9.0.15",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-i18next": "^11.18.6",
-    "uuid": "^9.0.0",
-    "zustand": "^4.1.1"
-  },
-  "devDependencies": {
-    "@types/node": "^18.7.18",
-    "@types/react": "^18.0.17",
-    "@types/react-dom": "^18.0.6",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "@typescript-eslint/parser": "^5.37.0",
-    "@vitejs/plugin-react": "^2.0.1",
-    "eslint": "^8.23.1",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-config-standard-with-typescript": "^23.0.0",
-    "eslint-plugin-i18n-json": "^4.0.0",
-    "eslint-plugin-i18next": "^6.0.0-4",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.5",
-    "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-react": "^7.31.8",
-    "prettier": "^2.7.1",
-    "typescript": "^4.8.3",
-    "vite": "^3.0.7",
-    "vite-plugin-eslint": "^1.8.1"
-  },
-  "overrides": {
-    "@vanilla-extract/vite-plugin": {
-      "vite": "^3"
-    }
-  }
-}

ui/frontend/build_src/prettier.cjs

@@ -1,7 +0,0 @@
-module.exports = {
-  singleQuote: true,
-  tabWidth: 2,
-  semi: true,
-  trailingComma: "es5",
-  endOfLine: "lf",
-};

ui/frontend/build_src/src/App.tsx

@@ -1,21 +0,0 @@
-import React from "react";
-import { ReactLocation, Router } from "@tanstack/react-location";
-import Home from "./pages/Home";
-import Settings from "./pages/Settings";
-import "./Translation/config";
-const location = new ReactLocation();
-
-function App() {
-
-  return (
-    <Router
-      location={location}
-      routes={[
-        { path: "/", element: <Home /> },
-        { path: "/settings", element: <Settings /> },
-      ]}
-    ></Router>
-  );
-}
-
-export default App;

ui/frontend/build_src/src/Translation/config.ts

@@ -1,32 +0,0 @@
-import i18n from "i18next";
-// this should be updated to an interface
-import ENTranslation from "./locales/en/home.json";
-import ESTranslation from "./locales/es/home.json";
-import { initReactI18next } from "react-i18next";
-
-export const resources = {
-  en: {
-    translation: ENTranslation,
-  },
-  es: {
-    translation: ESTranslation,
-  },
-} as const;
-i18n
-  .use(initReactI18next)
-  .init({
-    lng: "en",
-    interpolation: {
-      escapeValue: false,
-    },
-    resources,
-  })
-  .then(() => {
-    console.log("i18n initialized");
-  })
-  .catch((err) => {
-    console.error("i18n initialization failed", err);
-  })
-  .finally(() => {
-    console.log("i18n initialization finished");
-  });

ui/frontend/build_src/src/Translation/locales/en/home.json

@@ -1,110 +0,0 @@
-{
-  "title": "Stable Diffusion UI",
-  "description": "",
-  "navbar": {
-    "home": "Home",
-    "history": "History",
-    "community": "Community",
-    "settings": "Settings"
-  },
-  "land-cre": {
-    "cp": "Create Profile",
-    "cp-place": "Profile name",
-    "pp": "Profile Picture",
-    "pp-disc": "",
-    "ast": "Automatically save to",
-    "ast-disc": "File path to auto save your creations",
-    "place": "File path",
-    "cre": "Create"
-  },
-  "land-pre": {
-    "user": "Username",
-    "add": "Add Profile"
-  },
-  "home": {
-    "status-starting": "Stable Diffusion is starting...",
-    "status-ready": "Stable Diffusion is ready to use!",
-    "status-error": "Stable Diffusion is not running!",
-    "editor-title": "Prompt",
-    "initial-img-txt": "Initial Image: (optional)",
-    "initial-img-btn": "Browse...",
-    "initial-img-text2": "No file selected.",
-    "make-img-btn": "Make Image",
-    "make-img-btn-stop": "Stop"
-  },
-  "in-paint": {
-    "txt": "In-Painting (select the area which the AI will paint into)",
-    "clear": "Clear"
-  },
-  "settings": {
-    "base-img": "Use base image:",
-    "seed": "Seed:",
-    "amount-of-img": "Amount of images to make:",
-    "how-many": "How many at once:",
-    "stream-img": "Stream images (this will slow down image generation):",
-    "width": "Width:",
-    "height": "Height:",
-    "sampler": "Sampler:",
-    "steps": "Number of inference steps:",
-    "guide-scale": "Guidance Scale:",
-    "prompt-str": "Prompt Strength:",
-    "live-preview": "Show a live preview of the image (disable this for faster image generation)",
-    "fix-face": "Fix incorrect faces and eyes (uses GFPGAN)",
-    "ups": "Upscale the image to 4x resolution using:",
-    "no-ups": "No Upscaling",
-    "corrected": "Show only the corrected/upscaled image"
-  },
-  "tags": {
-    "txt": "Image Modifiers (art styles, tags etc)"
-  },
-  "preview-prompt": {
-    "part1": "Type a prompt and press the \"Make Image\" button.",
-    "part2": "You can set an \"Initial Image\" if you want to guide the AI.\n",
-    "part3": "You can also add modifiers like \"Realistic\", \"Pencil Sketch\", \"ArtStation\" etc by browsing through the \"Image Modifiers\" section and selecting the desired modifiers.\n",
-    "part4": "Click \"Advanced Settings\" for additional settings like seed, image size, number of images to generate etc.",
-    "part5": "Enjoy! :)"
-  },
-  "current-task": "Current task",
-  "recent-create": "Recently Created",
-  "popup": {
-    "use-btn": "Use Image",
-    "use-btn2": "Use Image and Tags"
-  },
-  "history": {
-    "fave": "Favorites Only",
-    "search": "Search"
-  },
-  "advanced-settings": {
-    "sound": "Play sound on task completion",
-    "sound-disc": "Will play a sound so user can hear when image is done.",
-    "turbo": "Turbo mode",
-    "turbo-disc": "Generates images faster, but uses an additional 1 GB of GPU memory",
-    "cpu": "Use CPU instead of GPU",
-    "cpu-disc": "Warning: this will be *very* slow",
-    "gpu": "Use full precision",
-    "gpu-disc": "(for GPU-only. warning: this will consume more VRAM)",
-    "beta": "Beta Features",
-    "beta-disc": "Get the latest features immediately (but could be less stable). \nPlease restart the program after changing this.",
-    "save": "SAVE"
-  },
-  "storage": {
-    "ast": "Automatically save to",
-    "ast-disc": "File path to auto save your creations",
-    "place": "File path",
-    "cps": "Cross profile sharing",
-    "cps-disc": "Profiles will see suggestions from each other.",
-    "acb": "Allow cloud backup",
-    "acb-disc": "A button will show up for images on hover",
-    "acb-place": "Choose your",
-    "acc-api": "Api key",
-    "acb-api-place": "Your API key",
-    "save": "SAVE"
-  },
-  "import": {
-    "imp-btn": "IMPORT",
-    "exp-btn": "EXPORT",
-    "disc": "It is a good idea to leave the exported file as it is. Otherwise it may not import correctly",
-    "disc:2": "When importing, only profiles that are not already present on the will be added."
-  },
-  "about": "If you found this project useful and want to help keep it alive, please to help cover the cost of development and maintenance! Thank you for your support!\n\nPlease feel free to join the discord community or file an issue if you have any problems or suggestions in using this interface.\n\nDisclaimer: The authors of this project are not responsible for any content generated using this interface.\n\nThis 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,\nspread misinformation and target vulnerable groups. For the full list of restrictions please read the license.\n\nBy using this software, you consent to the terms and conditions of the license.\n"
-}

ui/frontend/build_src/src/Translation/locales/es/home.json

@@ -1,108 +0,0 @@
-{
-  "title": "Stable Diffusion UI",
-  "description": "",
-  "navbar": {
-    "home": "Home",
-    "history": "History",
-    "community": "Community",
-    "settings": "Settings"
-  },
-  "land-cre": {
-    "cp": "Create Profile",
-    "cp-place": "Profile name",
-    "pp": "Profile Picture",
-    "pp-disc": "",
-    "ast": "Automatically save to",
-    "ast-disc": "File path to auto save your creations",
-    "place": "File path",
-    "cre": "Create"
-  },
-  "land-pre": {
-    "user": "Username",
-    "add": "Add Profile"
-  },
-  "home": {
-    "status-starting": "Stable Diffusion is starting...",
-    "status-ready": "Stable Diffusion is ready to use!",
-    "status-error": "Stable Diffusion is not running!",
-    "editor-title": "Prompt",
-    "initial-img-txt": "Initial Image: (optional)",
-    "initial-img-btn": "Browse...",
-    "initial-img-text2": "No file selected.",
-    "make-img-btn": "Make Image",
-    "make-img-btn-stop": "Stop"
-  },
-  "in-paint": {
-    "txt": "In-Painting (select the area which the AI will paint into)",
-    "clear": "Clear"
-  },
-  "settings": {
-    "base-img": "Use base image:",
-    "seed": "Seed:",
-    "amount-of-img": "Amount of images to make:",
-    "how-many": "How many at once:",
-    "width": "Width:",
-    "height": "Height:",
-    "steps": "Number of inference steps:",
-    "guide-scale": "Guidance Scale:",
-    "prompt-str": "Prompt Strength:",
-    "live-preview": "Show a live preview of the image (disable this for faster image generation)",
-    "fix-face": "Fix incorrect faces and eyes (uses GFPGAN)",
-    "ups": "Upscale the image to 4x resolution using:",
-    "no-ups": "No Upscaling",
-    "corrected": "Show only the corrected/upscaled image"
-  },
-  "tags": {
-    "txt": "Image Modifiers (art styles, tags etc)"
-  },
-  "preview-prompt": {
-    "part1": "Type a prompt and press the \"Make Image\" button.",
-    "part2": "You can set an \"Initial Image\" if you want to guide the AI.\n",
-    "part3": "You can also add modifiers like \"Realistic\", \"Pencil Sketch\", \"ArtStation\" etc by browsing through the \"Image Modifiers\" section and selecting the desired modifiers.\n",
-    "part4": "Click \"Advanced Settings\" for additional settings like seed, image size, number of images to generate etc.",
-    "part5": "Enjoy! :)"
-  },
-  "current-task": "Current task",
-  "recent-create": "Recently Created",
-  "popup": {
-    "use-btn": "Use Image",
-    "use-btn2": "Use Image and Tags"
-  },
-  "history": {
-    "fave": "Favorites Only",
-    "search": "Search"
-  },
-  "advanced-settings": {
-    "sound": "Play sound on task completion",
-    "sound-disc": "Will play a sound so user can hear when image is done.",
-    "turbo": "Turbo mode",
-    "turbo-disc": "Generates images faster, but uses an additional 1 GB of GPU memory",
-    "cpu": "Use CPU instead of GPU",
-    "cpu-disc": "Warning: this will be *very* slow",
-    "gpu": "Use full precision",
-    "gpu-disc": "(for GPU-only. warning: this will consume more VRAM)",
-    "beta": "Beta Features",
-    "beta-disc": "Get the latest features immediately (but could be less stable). \nPlease restart the program after changing this.",
-    "save": "SAVE"
-  },
-  "storage": {
-    "ast": "Automatically save to",
-    "ast-disc": "File path to auto save your creations",
-    "place": "File path",
-    "cps": "Cross profile sharing",
-    "cps-disc": "Profiles will see suggestions from each other.",
-    "acb": "Allow cloud backup",
-    "acb-disc": "A button will show up for images on hover",
-    "acb-place": "Choose your",
-    "acc-api": "Api key",
-    "acb-api-place": "Your API key",
-    "save": "SAVE"
-  },
-  "import": {
-    "imp-btn": "IMPORT",
-    "exp-btn": "EXPORT",
-    "disc": "It is a good idea to leave the exported file as it is. Otherwise it may not import correctly",
-    "disc:2": "When importing, only profiles that are not already present on the will be added."
-  },
-  "about": "If you found this project useful and want to help keep it alive, please to help cover the cost of development and maintenance! Thank you for your support!\n\nPlease feel free to join the discord community or file an issue if you have any problems or suggestions in using this interface.\n\nDisclaimer: The authors of this project are not responsible for any content generated using this interface.\n\nThis 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,\nspread misinformation and target vulnerable groups. For the full list of restrictions please read the license.\n\nBy using this software, you consent to the terms and conditions of the license.\n"
-}

ui/frontend/build_src/src/api/index.ts

@@ -1,146 +0,0 @@
-/**
- * basic server health
- */
-
-import type { SAMPLER_OPTIONS } from "../stores/imageCreateStore";
-
-// when we are on dev we want to specifiy 9000 as the port for the backend
-// when we are on prod we want be realtive to the current url
-export const API_URL = import.meta.env.DEV ? "http://localhost:9000" : "";
-
-export const HEALTH_PING_INTERVAL = 5000; // 5 seconds
-export const healthPing = async () => {
-  const pingUrl = `${API_URL}/ping`;
-  const response = await fetch(pingUrl);
-  const data = await response.json();
-  return data;
-};
-
-/**
- * the local list of modifications
- */
-export const loadModifications = async () => {
-  const response = await fetch(`${API_URL}/modifiers.json`);
-  const data = await response.json();
-  return data;
-};
-
-export const getSaveDirectory = async () => {
-  const response = await fetch(`${API_URL}/output_dir`);
-  const data = await response.json();
-  return data[0];
-};
-
-export const KEY_CONFIG = "config";
-export const getConfig = async () => {
-  const response = await fetch(`${API_URL}/app_config`);
-  const data = await response.json();
-  return data;
-};
-
-export const KEY_TOGGLE_CONFIG = "toggle_config";
-export const toggleBetaConfig = async (branch: string) => {
-  const response = await fetch(`${API_URL}/app_config`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      update_branch: branch,
-    }),
-  });
-  const data = await response.json();
-  return data;
-};
-
-/**
- * post a new request for an image
- */
-// TODO; put hese some place better
-export interface ImageRequest {
-  session_id: string;
-  prompt: string;
-  negative_prompt: string;
-  seed: number;
-  num_outputs: number;
-  num_inference_steps: number;
-  guidance_scale: number;
-  width:
-  | 128
-  | 192
-  | 256
-  | 320
-  | 384
-  | 448
-  | 512
-  | 576
-  | 640
-  | 704
-  | 768
-  | 832
-  | 896
-  | 960
-  | 1024;
-  height:
-  | 128
-  | 192
-  | 256
-  | 320
-  | 384
-  | 448
-  | 512
-  | 576
-  | 640
-  | 704
-  | 768
-  | 832
-  | 896
-  | 960
-  | 1024;
-  // allow_nsfw: boolean
-  turbo: boolean;
-  use_cpu: boolean;
-  use_full_precision: boolean;
-  save_to_disk_path: null | string;
-  use_face_correction: null | "GFPGANv1.3";
-  use_upscale: null | "RealESRGAN_x4plus" | "RealESRGAN_x4plus_anime_6B" | "";
-  show_only_filtered_image: boolean;
-  init_image: undefined | string;
-  prompt_strength: undefined | number;
-  mask: undefined | string;
-  sampler: typeof SAMPLER_OPTIONS[number];
-  stream_progress_updates: true;
-  stream_image_progress: boolean;
-
-}
-
-export interface ImageOutput {
-  data: string;
-  path_abs: string | null;
-  seed: number;
-}
-
-export interface ImageReturnType {
-  output: ImageOutput[];
-  request: ImageRequest;
-  status: string;
-}
-
-export const MakeImageKey = "MakeImage";
-export const doMakeImage = async (reqBody: ImageRequest) => {
-  const res = await fetch(`${API_URL}/image`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(reqBody),
-  });
-  return res;
-};
-
-export const doStopImage = async () => {
-
-  const response = await fetch(`${API_URL}/image/stop`);
-  const data = await response.json();
-  return data;
-};

ui/frontend/build_src/src/components/_recipes/button.css.ts

@@ -1,140 +0,0 @@
-// would prefer to use a var here, but it doesn't work
-// vars: {
-//   '--button-base-saturation': vars.colorMod.saturation.normal,
-//   '--button-base-lightness': vars.colorMod.lightness.normal,
-// },
-
-
-import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-export const buttonStyle = recipe({
-
-  base: {
-    fontSize: vars.fonts.sizes.Subheadline,
-    fontWeight: "bold",
-    color: vars.colors.text.normal,
-    padding: vars.spacing.small,
-    border: "0",
-    borderRadius: vars.trim.smallBorderRadius,
-  },
-
-  variants: {
-    color: {
-      primary: {
-        // @ts-expect-error
-        '--button-hue': vars.brandHue,
-        '--button-base-saturation': vars.colorMod.saturation.normal,
-        '--button-base-lightness': vars.colorMod.lightness.normal,
-      },
-      secondary: {
-        // @ts-expect-error
-        '--button-hue': vars.secondaryHue,
-        '--button-base-saturation': vars.colorMod.saturation.normal,
-        '--button-base-lightness': vars.colorMod.lightness.normal,
-      },
-      tertiary: {
-        // @ts-expect-error
-        '--button-hue': vars.tertiaryHue,
-        '--button-base-saturation': vars.colorMod.saturation.normal,
-        '--button-base-lightness': vars.colorMod.lightness.normal,
-      },
-      cancel: {
-        // @ts-expect-error
-        '--button-hue': vars.errorHue,
-        '--button-base-saturation': vars.colorMod.saturation.normal,
-        '--button-base-lightness': vars.colorMod.lightness.normal,
-      },
-      accent: {
-        // @ts-expect-error
-        '--button-hue': vars.backgroundAccentHue,
-        '--button-base-saturation': vars.backgroundAccentSaturation,
-        '--button-base-lightness': vars.backgroundAccentLightness,
-      },
-      clear: {
-        backgroundColor: "transparent",
-      },
-    },
-
-    type: {
-      fill: {
-        backgroundColor: `hsl(var(--button-hue),var(--button-base-saturation),${vars.colorMod.lightness.normal})`,
-        border: `1px solid hsl(var(--button-hue),var(--button-base-saturation),${vars.colorMod.lightness.normal})`,
-        ":hover": {
-          backgroundColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.normal})`,
-          border: `1px solid hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.normal})`,
-        },
-        ":active": {
-          backgroundColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-          border: `1px solid hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":focus": {
-          backgroundColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-          border: `1px solid hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":disabled": {
-          backgroundColor: `hsl(var(--button-hue),${vars.colorMod.saturation.dim},${vars.colorMod.lightness.dim})`,
-          border: `1px solid hsl(var(--button-hue),${vars.colorMod.saturation.dim},${vars.colorMod.lightness.dim})`,
-        },
-      },
-      outline: {
-        backgroundColor: "transparent",
-        border: `1px solid hsl(var(--button-hue),var(--button-base-saturation),${vars.colorMod.lightness.normal})`,
-        ":hover": {
-          borderColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.normal})`,
-        },
-
-        ":active": {
-          borderColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":focus": {
-          borderColor: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":disabled": {
-          borderColor: `hsl(var(--button-hue),${vars.colorMod.saturation.dim},${vars.colorMod.lightness.dim})`,
-        },
-      },
-      action: {
-        backgroundColor: "transparent",
-        color: `hsl(var(--button-hue),var(--button-base-saturation),${vars.colorMod.lightness.normal})`,
-        textDecoration: "underline",
-        ":hover": {
-          color: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.normal})`,
-        },
-
-        ":active": {
-          color: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":focus": {
-          color: `hsl(var(--button-hue),${vars.colorMod.saturation.bright},${vars.colorMod.lightness.dim})`,
-        },
-
-        ":disabled": {
-          color: `hsl(var(--button-hue),${vars.colorMod.saturation.dim},${vars.colorMod.lightness.dim})`,
-        },
-      }
-    },
-
-    size: {
-      slim: {
-        padding: vars.spacing.min,
-        fontSize: vars.fonts.sizes.Caption,
-      },
-      large: {
-        width: "100%",
-        fontSize: vars.fonts.sizes.Headline,
-      }
-    }
-  },
-
-  defaultVariants: {
-    color: "primary",
-    type: "fill",
-  },
-
-});

ui/frontend/build_src/src/components/_recipes/card.css.ts

@@ -1,51 +0,0 @@
-import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-export const card = recipe({
-
-  base: {
-    color: vars.colors.text.normal,
-    padding: vars.spacing.medium,
-  },
-
-  variants: {
-    backing: {
-      normal: {
-        background: vars.backgroundMain,
-      },
-      light: {
-        background: vars.backgroundLight,
-      },
-      dark: {
-        background: vars.backgroundDark,
-      },
-    },
-
-    rounded: {
-      true: {
-        borderRadius: vars.trim.smallBorderRadius,
-      },
-    },
-
-    info: {
-      true: {
-        background: vars.backgroundDark,
-        border: `1px solid ${vars.backgroundAccentMain}`,
-      },
-    },
-
-    level: {
-      flat: {},
-      1: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-      2: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-      3: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-    },
-  },
-  defaultVariants: {
-    backing: "light",
-    level: 'flat',
-    rounded: true,
-  },
-});
-
-

ui/frontend/build_src/src/components/_recipes/index.css.ts

@@ -1,24 +0,0 @@
-import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-
-export const card = recipe({
-  base: {
-    background: vars.backgroundMain,
-    color: vars.colors.text.normal,
-    padding: vars.spacing.medium,
-    borderRadius: vars.trim.smallBorderRadius,
-  },
-  variants: {
-    level: {
-      1: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-      2: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-      3: { boxShadow: "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)" },
-    },
-  },
-  defaultVariants: {
-    level: 1,
-  },
-});
-
-

ui/frontend/build_src/src/components/_recipes/popover_headless.css.ts

@@ -1,39 +0,0 @@
-
-import { style, globalStyle } from "@vanilla-extract/css";
-
-// import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-import {
-  card
-} from "./card.css";
-
-export const PopoverMain = style({
-  position: 'relative'
-});
-
-export const PopoverButtonStyle = style({
-  backgroundColor: "transparent",
-  border: "0 none",
-  cursor: "pointer",
-  padding: vars.spacing.none,
-  fontSize: vars.fonts.sizes.Subheadline,
-});
-
-globalStyle(`${PopoverButtonStyle} > i`, {
-  marginRight: vars.spacing.small,
-});
-
-export const PopoverPanelMain = style([card(
-  {
-    backing: 'dark',
-    level: 2,
-  }
-), {
-  position: 'absolute',
-  top: '100%',
-  right: '0',
-  zIndex: '1',
-}]);
-
-

ui/frontend/build_src/src/components/_recipes/switch_headless.css.ts

@@ -1,19 +0,0 @@
-import { style, } from "@vanilla-extract/css";
-
-// import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-export const SwitchGroupMain = style({
-});
-
-export const SwitchMain = style({
-});
-
-export const SwitchLabel = style({
-});
-
-export const SwitchEnabled = style({
-});
-
-export const SwitchPill = style({
-});

ui/frontend/build_src/src/components/_recipes/tabs_headless.css.ts

@@ -1,60 +0,0 @@
-import { style } from '@vanilla-extract/css';
-import { recipe } from "@vanilla-extract/recipes";
-import { vars } from "../../styles/theme/index.css";
-
-export const tabStyles = recipe({
-  base: {
-    background: vars.backgroundMain,
-    color: vars.colors.text.normal,
-    padding: vars.spacing.small,
-    borderRadius: `${vars.trim.smallBorderRadius} ${vars.trim.smallBorderRadius} 0 0`,
-    border: `1px solid ${vars.backgroundLight}`,
-    borderBottom: 'none',
-    marginLeft: vars.spacing.small,
-    boxShadow: `0px -1px 4px -2px ${vars.backgroundAccentMain} inset`,
-    width: 'fit-content',
-    ':focus': {
-      outline: 'none',
-    },
-  },
-
-  variants: {
-    selected: {
-      true: {
-        background: vars.backgroundLight,
-        color: vars.colors.text.normal,
-        boxShadow: `0px -1px 4px -2px ${vars.backgroundDark} inset`,
-      }
-    }
-  }
-});
-
-export const tabPanelStyles = recipe({
-  base: {
-    color: vars.colors.text.normal,
-    // borderRadius: `0 0 ${vars.trim.smallBorderRadius} ${vars.trim.smallBorderRadius}`,
-    background: vars.backgroundLight,
-    padding: vars.spacing.medium,
-    flexGrow: 1,
-    overflow: 'auto',
-    // "::-webkit-scrollbar": {
-    //   width: "4px",
-    // },
-
-  },
-  variants: {
-
-    backing: {
-      normal: {
-        background: vars.backgroundMain,
-      },
-      light: {
-        background: vars.backgroundLight,
-      },
-      dark: {
-        background: vars.backgroundDark,
-      },
-    },
-  },
-});
-

ui/frontend/build_src/src/components/layouts/CreationTabs/creationTabs.css.ts

@@ -1,34 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-import { vars } from "../../../styles/theme/index.css";
-import {
-  tabPanelStyles,
-} from "../../_recipes/tabs_headless.css";
-
-
-export const TabpanelScrollFlop = style([tabPanelStyles(), {
-  direction: 'rtl',
-  // position: 'relative',
-  overflow: 'overlay',
-  "::-webkit-scrollbar": {
-    position: 'absolute',
-    width: "6px",
-    backgroundColor: vars.backgroundAccentMain,
-  },
-
-  "::-webkit-scrollbar-thumb": {
-    backgroundColor: vars.backgroundDark,
-    borderRadius: "4px",
-  },
-
-
-  // "::-webkit-scrollbar-button: {
-  //   backgroundColor: vars.backgroundDark,
-  // }
-
-
-}]);
-
-globalStyle(`${TabpanelScrollFlop} > *`, {
-  direction: 'ltr',
-
-});

ui/frontend/build_src/src/components/layouts/CreationTabs/index.tsx

@@ -1,61 +0,0 @@
-import React, { Fragment } from "react";
-import { Tab } from '@headlessui/react';
-
-
-
-import CreationPanel from "../../organisms/creationPanel";
-import QueueDisplay from "../../organisms/queueDisplay";
-
-import ProcessingStatus from "../../molecules/queueStatusTab";
-
-import {
-  tabStyles,
-} from "../../_recipes/tabs_headless.css";
-
-import {
-  TabpanelScrollFlop
-} from "./creationTabs.css";
-
-export default function CreationTabs() {
-
-  return (
-    <Tab.Group>
-      <Tab.List>
-        <Tab as={Fragment}>
-          {({ selected }) => (
-            <button
-              className={tabStyles({
-                selected,
-              })}
-            >
-              Create
-            </button>
-          )}
-        </Tab>
-
-        <Tab as={Fragment}>
-          {({ selected }) => (
-
-            <button
-              className={tabStyles({
-                selected,
-              })}
-            >
-              <ProcessingStatus></ProcessingStatus>
-            </button>
-          )}
-        </Tab>
-
-
-      </Tab.List>
-      <Tab.Panels className={TabpanelScrollFlop}>
-        <Tab.Panel>
-          <CreationPanel></CreationPanel>
-        </Tab.Panel>
-        <Tab.Panel>
-          <QueueDisplay></QueueDisplay>
-        </Tab.Panel>
-      </Tab.Panels>
-    </Tab.Group>
-  );
-}

ui/frontend/build_src/src/components/layouts/basicDisplay/basicDisplay.css.ts

@@ -1,107 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-import { vars } from "../../../styles/theme/index.css";
-
-import {
-  tabStyles
-} from "../../_recipes/tabs_headless.css";
-
-
-export const basicDisplayLayout = style({
-  width: "100%",
-  height: "100%",
-  display: "grid",
-  gridTemplateColumns: "1fr 250px",
-  gridTemplateRows: "1fr 250px",
-  gridTemplateAreas: `
-    "content info"
-    "history history"`,
-
-  overflow: "hidden",
-
-  selectors: {
-    '&[data-hide-info]': {
-      gridTemplateColumns: "1fr",
-      gridTemplateRows: "1fr 250px",
-      // gridTemplateAreas: `
-      //   "content"
-      //   "history"`,
-    },
-    '&[data-hide-history]': {
-      gridTemplateColumns: "1fr 250px",
-      gridTemplateRows: "1fr 0px",
-      // gridTemplateAreas: `
-      //   "content info"`,
-    },
-    '&[data-hide-info][data-hide-history]': {
-      gridTemplateColumns: "1fr 0px",
-      gridTemplateRows: "1fr 0px",
-      // gridTemplateAreas: `
-      //   "content"`,
-    },
-  },
-
-
-  // "@media": {
-  //   "screen and (max-width: 800px)": {
-  //     gridTemplateColumns: "1fr",
-  //     gridTemplateRows: "100px 300px 1fr",
-  //     gridTemplateAreas: `
-  //       "header"
-  //       "create"
-  //       "display"
-  //     `,
-  //   },
-  // },
-
-});
-
-// globalStyle(`${basicDisplayLayout}.hideHistory`, {
-
-// });
-
-export const contentLayout = style({
-  gridArea: "content",
-});
-
-export const infoLayout = style({
-  gridArea: "info",
-  position: "relative",
-});
-
-export const historyLayout = style({
-  gridArea: "history",
-  position: "relative",
-});
-
-globalStyle(`${historyLayout} > button`, {
-  position: "absolute",
-  top: '-29px',
-});
-
-export const displayContainer = style({
-  flexGrow: 1,
-  overflow: 'auto',
-  display: "flex",
-});
-
-export const displayData = style({
-  width: '250px',
-  height: '100%',
-  backgroundColor: 'rebeccapurple',
-  position: 'relative',
-});
-
-export const DataTab = style([tabStyles(), {
-  position: 'absolute',
-  top: '0',
-  left: '0',
-
-  // pretty sure this is a magic number
-  transformOrigin: '37% 275%',
-  transform: 'rotate(-90deg)',
-}]);
-
-
-// export const previousImages = style({
-//   minHeight: '250px',
-// });

ui/frontend/build_src/src/components/layouts/basicDisplay/index.tsx

@@ -1,65 +0,0 @@
-
-import React, { useState, useRef, useEffect } from "react";
-import { Transition } from '@headlessui/react'
-
-import CurrentDisplay from "../../organisms/currentDisplay";
-import CompletedImages from "../../organisms/completedImages";
-import CurrentInfo from "../../organisms/currentInfo";
-
-
-import {
-  tabStyles
-} from "../../_recipes/tabs_headless.css";
-
-import {
-  basicDisplayLayout,
-  contentLayout,
-  infoLayout,
-  historyLayout
-} from "./basicDisplay.css";
-
-export default function BasicDisplay() {
-
-  const [isShowingHistory, setIsShowingHistory] = useState(true)
-
-  const layoutRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-
-    if (layoutRef.current != undefined) {
-      // set the hide-history data attribute
-      if (isShowingHistory) {
-        layoutRef.current.removeAttribute('data-hide-history');
-      }
-      else {
-        // layoutRef.current.dataset.hideHistory = "true";
-        layoutRef.current.setAttribute('data-hide-history', '');
-      }
-    }
-  }, [layoutRef, isShowingHistory]);
-
-
-  return (
-    <div
-      ref={layoutRef}
-      className={basicDisplayLayout}
-    >
-      <div className={contentLayout}>
-        <CurrentDisplay></CurrentDisplay>
-      </div>
-
-      {/* <div className={infoLayout}>
-        <CurrentInfo ></CurrentInfo>
-      </div> */}
-
-      <div className={historyLayout}>
-        <button
-          className={tabStyles({})}
-          onClick={() => setIsShowingHistory((isShowingHistory) => !isShowingHistory)}>
-          {isShowingHistory ? "Hide History" : "Show History"}
-        </button>
-        <CompletedImages></CompletedImages>
-      </div>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/molecules/audioDing/index.tsx

@@ -1,16 +0,0 @@
-import React from "react";
-import { API_URL } from "../../../api";
-
-const url = `${API_URL}/ding.mp3`;
-
-const AudioDing = React.forwardRef((props, ref) => (
-  // @ts-expect-error
-  <audio ref={ref} style={{ display: "none" }}>
-    <source src={url} type="audio/mp3" />
-  </audio>
-));
-
-AudioDing.displayName = "AudioDing";
-
-export default AudioDing;
-

ui/frontend/build_src/src/components/molecules/betaMode/index.tsx

@@ -1,73 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-
-import {
-  KEY_CONFIG,
-  getConfig,
-  KEY_TOGGLE_CONFIG,
-  toggleBetaConfig,
-} from "../../../api";
-
-import { useTranslation } from "react-i18next";
-
-export default function BetaMode() {
-  const { t } = useTranslation();
-  // gate for the toggle
-  const [shouldSetCofig, setShouldSetConfig] = useState(false);
-  // next branch to get
-  const [branchToGetNext, setBranchToGetNext] = useState("beta");
-
-  // our basic config
-  const { status: configStatus, data: configData } = useQuery(
-    [KEY_CONFIG],
-    getConfig
-  );
-  const queryClient = useQueryClient();
-
-  // the toggle config
-  const { status: toggleStatus, data: toggleData } = useQuery(
-    [KEY_TOGGLE_CONFIG],
-    async () => await toggleBetaConfig(branchToGetNext),
-    {
-      enabled: shouldSetCofig,
-    }
-  );
-
-  // this is also in the Header Display
-  // TODO: make this a custom hook
-  useEffect(() => {
-    if (configStatus === "success") {
-      const { update_branch: updateBranch } = configData;
-
-      if (updateBranch === "main") {
-        setBranchToGetNext("beta");
-      } else {
-        // setIsBeta(true);
-        setBranchToGetNext("main");
-      }
-    }
-  }, [configStatus, configData]);
-
-  useEffect(() => {
-    if (toggleStatus === "success") {
-      if (toggleData[0] === "OK") {
-        // force a refetch of the config
-        void queryClient.invalidateQueries([KEY_CONFIG])
-      }
-      setShouldSetConfig(false);
-    }
-  }, [toggleStatus, toggleData, setShouldSetConfig]);
-
-  return (
-    <label>
-      <input
-        type="checkbox"
-        checked={branchToGetNext === "main"}
-        onChange={(e) => {
-          setShouldSetConfig(true);
-        }}
-      />🔥
-      {t("advanced-settings.beta")} {t("advanced-settings.beta-disc")}
-    </label>
-  );
-}

ui/frontend/build_src/src/components/molecules/clearQueue/index.tsx

@@ -1,35 +0,0 @@
-import React from "react";
-import { doStopImage } from "../../../api";
-import { useRequestQueue } from "../../../stores/requestQueueStore";
-
-import {
-  buttonStyle
-} from "../../_recipes/button.css";
-
-
-export default function ClearQueue() {
-
-  const hasQueue = useRequestQueue((state) => state.hasAnyQueue());
-  const clearQueue = useRequestQueue((state) => state.clearQueue);
-
-  const stopAll = async () => {
-    try {
-      clearQueue();
-      const res = await doStopImage();
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  return (
-    <button className={buttonStyle(
-      {
-        color: "cancel",
-        size: "large",
-      }
-    )}
-      disabled={!hasQueue} onClick={() => void stopAll()}>
-      STOP ALL
-    </button>
-  );
-}

ui/frontend/build_src/src/components/molecules/drawImage/drawImage.css.ts

@@ -1,22 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-export const DrawImageMain = style({
-  position: "relative",
-});
-
-globalStyle(`${DrawImageMain} > canvas`, {
-  position: "absolute",
-  top: "0",
-  left: "0",
-  width: "100%",
-  height: "100%",
-});
-
-globalStyle(`${DrawImageMain} > canvas:first-of-type`, {
-  opacity: ".7",
-});
-
-globalStyle(`${DrawImageMain} > img`, {
-  top: "0",
-  left: "0",
-});

ui/frontend/build_src/src/components/molecules/drawImage/index.tsx

@@ -1,194 +0,0 @@
-import React, { useRef, useState, useEffect } from "react";
-
-import {
-  DrawImageMain,
-} from "./drawImage.css";
-
-// https://github.com/embiem/react-canvas-draw
-
-interface DrawImageProps {
-  imageData: string;
-  brushSize: number;
-
-  brushShape: string;
-  brushColor: string;
-  isErasing: boolean;
-  setData: (data: string) => void;
-}
-
-export default function DrawImage({
-  imageData,
-  brushSize,
-  brushShape,
-  brushColor,
-  isErasing,
-  setData,
-}: DrawImageProps) {
-  const drawingRef = useRef<HTMLCanvasElement>(null);
-  const cursorRef = useRef<HTMLCanvasElement>(null);
-  const [isUpdating, setIsUpdating] = useState(false);
-
-  const [canvasWidth, setCanvasWidth] = useState(512);
-  const [canvasHeight, setCanvasHeight] = useState(512);
-
-  useEffect(() => {
-    const img = new Image();
-    img.onload = () => {
-      setCanvasWidth(img.width);
-      setCanvasHeight(img.height);
-    };
-    img.src = imageData;
-  }, [imageData]);
-
-  useEffect(() => {
-    // when the brush color changes, change the color of all the
-    // drawn pixels to the new color
-    if (drawingRef.current != null) {
-      const ctx = drawingRef.current.getContext("2d");
-      if (ctx != null) {
-
-        const imageData = ctx.getImageData(0, 0, canvasWidth, canvasHeight);
-        const data = imageData.data;
-        for (let i = 0; i < data.length; i += 4) {
-          if (data[i + 3] > 0) {
-            data[i] = parseInt(brushColor, 16);
-            data[i + 1] = parseInt(brushColor, 16);
-            data[i + 2] = parseInt(brushColor, 16);
-          }
-        }
-        ctx.putImageData(imageData, 0, 0);
-      }
-    }
-  }, [brushColor]);
-
-  const _handleMouseDown = (
-    e: React.MouseEvent<HTMLCanvasElement, MouseEvent>
-  ) => {
-    const {
-      nativeEvent: { offsetX, offsetY },
-    } = e;
-
-    setIsUpdating(true);
-  };
-
-  const _handleMouseUp = (
-    e: React.MouseEvent<HTMLCanvasElement, MouseEvent>
-  ) => {
-    setIsUpdating(false);
-    const canvas = drawingRef.current;
-    if (canvas != null) {
-      const data = canvas.toDataURL();
-      setData(data);
-    }
-  };
-
-  const _drawCanvas = (x: number, y: number, brushSize: number, brushShape: string, brushColor: string | CanvasGradient | CanvasPattern) => {
-    const canvas = drawingRef.current;
-    if (canvas != null) {
-      const ctx = canvas.getContext("2d");
-      if (ctx != null) {
-        if (isErasing) {
-          // stack overflow https://stackoverflow.com/questions/10396991/clearing-circular-regions-from-html5-canvas
-          const offset = brushSize / 2;
-          ctx.clearRect(x - offset, y - offset, brushSize, brushSize);
-        } else {
-          ctx.beginPath();
-          ctx.lineWidth = brushSize;
-          // @ts-expect-error
-          ctx.lineCap = brushShape;
-          ctx.strokeStyle = brushColor;
-          ctx.moveTo(x, y);
-          ctx.lineTo(x, y);
-          ctx.stroke();
-        }
-      }
-    }
-  };
-
-  const _drawCursor = (
-    x: number,
-    y: number,
-    brushSize: number,
-    brushShape: string,
-    brushColor: string
-  ) => {
-    const canvas = cursorRef.current;
-    if (canvas != null) {
-      const ctx = canvas.getContext("2d");
-      if (ctx != null) {
-        ctx.beginPath();
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-
-        if (isErasing) {
-          const offset = brushSize / 2;
-          // draw a quare
-          ctx.lineWidth = 2;
-          ctx.lineCap = "butt";
-          ctx.strokeStyle = brushColor;
-          ctx.moveTo(x - offset, y - offset);
-          ctx.lineTo(x + offset, y - offset);
-          ctx.lineTo(x + offset, y + offset);
-          ctx.lineTo(x - offset, y + offset);
-          ctx.lineTo(x - offset, y - offset);
-          ctx.stroke();
-        } else {
-          ctx.lineWidth = brushSize;
-          // @ts-expect-error
-          ctx.lineCap = brushShape;
-          ctx.strokeStyle = brushColor;
-          ctx.moveTo(x, y);
-          ctx.lineTo(x, y);
-          ctx.stroke();
-        }
-      }
-
-
-
-    }
-  };
-
-  const _handleMouseMove = (
-    e: React.MouseEvent<HTMLCanvasElement, MouseEvent>
-  ) => {
-    const {
-      nativeEvent: { offsetX: x, offsetY: y },
-    } = e;
-
-    _drawCursor(x, y, brushSize, brushShape, brushColor);
-
-    if (isUpdating) {
-      _drawCanvas(x, y, brushSize, brushShape, brushColor);
-    }
-  };
-
-  // function for external use
-  const fillCanvas = () => {
-    const canvas = drawingRef.current;
-    if (canvas != null) {
-      const ctx = canvas.getContext("2d");
-      if (ctx != null) {
-        ctx.fillStyle = brushColor;
-        ctx.fillRect(0, 0, canvas.width, canvas.height);
-      }
-    }
-  };
-
-  return (
-    <div className={DrawImageMain}>
-      <img src={imageData} />
-      <canvas
-        ref={drawingRef}
-        width={canvasWidth}
-        height={canvasHeight}
-      ></canvas>
-      <canvas
-        ref={cursorRef}
-        width={canvasWidth}
-        height={canvasHeight}
-        onMouseDown={_handleMouseDown}
-        onMouseUp={_handleMouseUp}
-        onMouseMove={_handleMouseMove}
-      ></canvas>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/molecules/generatedImage/generatedImage.css.ts

@@ -1,11 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-export const generatedImageMain = style({
-  position: "relative",
-});
-
-globalStyle(`${generatedImageMain} img`, {
-  width: "100%",
-  height: "100%",
-  objectFit: "contain",
-});

ui/frontend/build_src/src/components/molecules/generatedImage/index.tsx

@@ -1,25 +0,0 @@
-import React from "react";
-
-import { ImageRequest } from "../../../api";
-
-import {
-  generatedImageMain,
-} from "./generatedImage.css";
-
-interface GeneretaedImageProps {
-  imageData: string | undefined;
-  metadata: ImageRequest | undefined;
-  className?: string;
-}
-
-export default function GeneratedImage({
-  imageData,
-  metadata,
-  className,
-}: GeneretaedImageProps) {
-  return (
-    <div className={[generatedImageMain, className].join(" ")}>
-      <img src={imageData} alt={metadata!.prompt} />
-    </div>
-  );
-}

ui/frontend/build_src/src/components/molecules/makeButton/index.tsx

@@ -1,276 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import React, { useEffect, useRef } from "react";
-
-import { useImageCreate } from "../../../stores/imageCreateStore";
-import {
-  QueueStatus,
-  useRequestQueue
-} from "../../../stores/requestQueueStore";
-
-import {
-  FetchingStates,
-  useImageFetching
-} from "../../../stores/imageFetchingStore";
-
-
-import { useImageDisplay } from "../../../stores/imageDisplayStore";
-
-import { v4 as uuidv4 } from "uuid";
-
-import { useRandomSeed } from "../../../utils";
-import {
-  ImageRequest,
-  ImageReturnType,
-  ImageOutput,
-  doMakeImage,
-} from "../../../api";
-
-import {
-  buttonStyle
-} from "../../_recipes/button.css";
-
-import { useTranslation } from "react-i18next";
-
-import AudioDing from "../../molecules/audioDing";
-
-const idDelim = "_batch";
-
-export default function MakeButton() {
-  const { t } = useTranslation();
-
-  const dingRef = useRef<HTMLAudioElement>();
-
-  const parallelCount = useImageCreate((state) => state.parallelCount);
-  const builtRequest = useImageCreate((state) => state.builtRequest);
-  const isRandomSeed = useImageCreate((state) => state.isRandomSeed());
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const isSoundEnabled = useImageCreate((state) => state.isSoundEnabled());
-
-  const addtoQueue = useRequestQueue((state) => state.addtoQueue);
-  const hasQueue = useRequestQueue((state) => state.hasPendingQueue());
-  const { id, options } = useRequestQueue((state) => state.firstInQueue());
-  const updateQueueStatus = useRequestQueue((state) => state.updateStatus);
-
-  const status = useImageFetching((state) => state.status);
-  const setStatus = useImageFetching((state) => state.setStatus);
-  const setStep = useImageFetching((state) => state.setStep);
-  const setTotalSteps = useImageFetching((state) => state.setTotalSteps);
-  const addProgressImage = useImageFetching((state) => state.addProgressImage);
-  const setStartTime = useImageFetching((state) => state.setStartTime);
-  const setNowTime = useImageFetching((state) => state.setNowTime);
-  const resetForFetching = useImageFetching((state) => state.resetForFetching);
-  const appendData = useImageFetching((state) => state.appendData);
-
-  const updateDisplay = useImageDisplay((state) => state.updateDisplay);
-
-  const hackJson = (jsonStr: string, id: string) => {
-
-    try {
-      const parsed = JSON.parse(jsonStr);
-      const { status, request, output: outputs } = parsed as ImageReturnType;
-
-
-      if (status === 'succeeded') {
-
-        updateQueueStatus(id, QueueStatus.complete);
-        outputs.forEach((output: any, index: number) => {
-
-          const { data, seed } = output as ImageOutput;
-          const seedReq = {
-            ...request,
-            seed,
-          };
-          const batchId = `${id}${idDelim}-${seed}-${index}`;
-          updateDisplay(batchId, data, seedReq);
-        });
-      }
-
-      else {
-        console.warn(`Unexpected status: ${status}`);
-        updateQueueStatus(id, QueueStatus.error);
-      }
-
-    }
-    catch (e) {
-      updateQueueStatus(id, QueueStatus.error);
-      console.warn("Error HACKING JSON: ", e)
-    }
-  }
-
-  const parseRequest = async (id: string, reader: ReadableStreamDefaultReader<Uint8Array>) => {
-    const decoder = new TextDecoder();
-    let finalJSON = '';
-
-    while (true) {
-      const { done, value } = await reader.read();
-      const jsonStr = decoder.decode(value);
-      if (done) {
-        setStatus(FetchingStates.COMPLETE);
-        hackJson(finalJSON, id);
-        if (isSoundEnabled) {
-          void dingRef.current?.play();
-        }
-        break;
-      }
-
-      try {
-        const update = JSON.parse(jsonStr);
-        const { status } = update;
-
-        if (status === "progress") {
-          setStatus(FetchingStates.PROGRESSING);
-          const { progress: { step, total_steps }, output: outputs } = update;
-          setStep(step);
-          setTotalSteps(total_steps);
-
-          if (step === 0) {
-            setStartTime();
-          }
-          else {
-            setNowTime();
-          }
-
-          if (void 0 !== outputs) {
-            outputs.forEach((output: any) => {
-              // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-              const timePath = `${output.path}?t=${new Date().getTime()}`
-              addProgressImage(timePath);
-            });
-          }
-
-        } else if (status === "succeeded") {
-          // TODO this should be the the new out instead of the try catch
-          // wait for the path to come back instead of the data
-          setStatus(FetchingStates.SUCCEEDED);
-        }
-        else if (status === 'failed') {
-          console.warn('failed');
-          console.warn(update);
-        }
-        else {
-          console.warn("UNKNOWN ?", update);
-        }
-      }
-      catch (e) {
-        // console.log('EXPECTED PARSE ERRROR')
-        finalJSON += jsonStr;
-      }
-
-    }
-  }
-
-  const startStream = async (id: string, req: ImageRequest) => {
-
-    try {
-      updateQueueStatus(id, QueueStatus.processing);
-      resetForFetching();
-      const res = await doMakeImage(req);
-      const reader = res.body?.getReader();
-
-      if (void 0 !== reader) {
-        void parseRequest(id, reader);
-      }
-
-    } catch (e) {
-      console.log('TOP LINE STREAM ERROR')
-      updateQueueStatus(id, QueueStatus.error);
-      console.log(e);
-    }
-
-  }
-
-  const queueImageRequest = (req: ImageRequest) => {
-    // the actual number of request we will make
-    const requests = [];
-    // the number of images we will make
-    let { num_outputs } = req;
-    if (parallelCount > num_outputs) {
-      requests.push(num_outputs);
-    } else {
-      // while we have at least 1 image to make
-      while (num_outputs >= 1) {
-        // subtract the parallel count from the number of images to make
-        num_outputs -= parallelCount;
-
-        // if we are still 0 or greater we can make the full parallel count
-        if (num_outputs <= 0) {
-          requests.push(parallelCount);
-        }
-        // otherwise we can only make the remaining images
-        else {
-          requests.push(Math.abs(num_outputs));
-        }
-      }
-    }
-
-    requests.forEach((num, index) => {
-      // get the seed we want to use
-      let seed = req.seed;
-      if (index !== 0) {
-        // we want to use a random seed for subsequent requests
-        seed = useRandomSeed();
-      }
-      // add the request to the queue
-      addtoQueue(uuidv4(), {
-        ...req,
-        // updated the number of images to make
-        num_outputs: num,
-        // update the seed
-        seed,
-      });
-    });
-  }
-
-  const makeImageQueue = async () => {
-    // potentially update the seed
-    if (isRandomSeed) {
-      // update the seed for the next time we click the button
-      setRequestOption("seed", useRandomSeed());
-    }
-    // the request that we have built
-    const req = builtRequest();
-    queueImageRequest(req);
-  };
-
-  useEffect(() => {
-    const makeImages = async (options: ImageRequest) => {
-      // removeFirstInQueue();
-      await startStream(id ?? "", options);
-    }
-
-    if (status === FetchingStates.PROGRESSING || status === FetchingStates.FETCHING) {
-      return;
-    }
-
-    if (hasQueue) {
-
-      if (options === undefined) {
-        console.log('req is undefined');
-        return;
-      }
-
-      makeImages(options).catch((e) => {
-        console.log('HAS QUEUE ERROR');
-        console.log(e);
-      });
-    }
-
-  }, [hasQueue, status, id, options, startStream]);
-
-  return (
-    <>
-      <button
-        className={buttonStyle({
-          size: "large",
-        })}
-        onClick={() => {
-          void makeImageQueue();
-        }}
-      >
-        {t("home.make-img-btn")}
-      </button>
-      <AudioDing ref={dingRef}></AudioDing>
-    </>
-  );
-}

ui/frontend/build_src/src/components/molecules/modifierTag/index.tsx

@@ -1,93 +0,0 @@
-import React, { useState } from "react";
-import { v4 as uuidv4 } from "uuid";
-import {
-  ModifierPreview,
-  useImageCreate
-} from "../../../stores/imageCreateStore";
-
-import { API_URL } from "../../../api";
-
-import {
-  IconFont,
-} from "../../../styles/shared.css";
-
-import {
-  ModifierTagMain,
-  ModifierActions,
-  tagPreview,
-  TagText,
-  TagToggle,
-} from "./modifierTags.css";
-
-interface ModifierTagProps {
-  name: string;
-  category: string;
-  previews: ModifierPreview[];
-}
-
-export default function ModifierTag({ name, category, previews }: ModifierTagProps) {
-
-  const previewType: 'portrait' | 'landscape' = "portrait";
-
-  const [showActions, setShowActions] = useState(false);
-
-  const handleHover = () => {
-    setShowActions(true);
-  };
-
-  const handleLeave = () => {
-    setShowActions(false);
-  };
-
-  const addCreateTag = useImageCreate((state) => state.addCreateTag);
-  const setPositivePrompt = () => {
-    addCreateTag({ id: uuidv4(), name, type: 'positive' });
-  }
-  const setNegativePrompt = () => {
-    addCreateTag({ id: uuidv4(), name, type: 'negative' });
-  }
-
-
-  const hasTag = useImageCreate((state) => state.hasTag(category, name))
-    ? "selected"
-    : "";
-  const toggleTag = useImageCreate((state) => state.toggleTag);
-
-  const _toggleTag = () => {
-    toggleTag(category, name);
-  };
-
-  // , hasTag].join(" ")
-  return (
-    <div className={ModifierTagMain}
-      onMouseEnter={handleHover}
-      onMouseLeave={handleLeave}>
-      <p className={!showActions ? TagText : TagToggle}>{name}</p>
-      {showActions && (
-        <div className={ModifierActions}>
-          <button onClick={setPositivePrompt}>
-            <i className={[IconFont, 'fa-solid', 'fa-plus'].join(" ")}></i>
-          </button>
-          <button onClick={setNegativePrompt}>
-            <i className={[IconFont, 'fa-solid', 'fa-minus'].join(" ")}></i>
-          </button>
-        </div>
-      )}
-      {/* <div className={tagPreview}>
-        {previews.map((preview) => {
-          if (preview.name !== previewType) {
-            return null;
-          }
-          return (
-            <img
-              key={preview.name}
-              src={`${API_URL}/media/modifier-thumbnails/${preview.path}`}
-              alt={preview.name}
-              title={preview.name}
-            />
-          );
-        })}
-      </div> */}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/molecules/modifierTag/modifierTags.css.ts

@@ -1,69 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-import { vars } from '../../../styles/theme/index.css';
-
-import { card } from '../../_recipes/card.css';
-
-export const ModifierTagMain = style([
-  card({
-    backing: 'normal',
-    level: 1,
-    info: true
-  }), {
-    position: "relative",
-    width: "fit-content",
-    borderColor: `hsl(${vars.brandHue}, ${vars.colorMod.saturation.normal}, ${vars.colorMod.lightness.normal})`,
-    padding: vars.spacing.small,
-  }
-]);
-
-globalStyle(`${ModifierTagMain}.selected`, {
-  backgroundColor: "rgb(131, 11, 121)",
-})
-
-globalStyle(`${ModifierTagMain} p`, {
-  margin: 0,
-  textAlign: "center",
-  marginBottom: "2px",
-});
-
-
-export const TagText = style({
-  opacity: 1,
-});
-
-export const TagToggle = style({
-  opacity: 0.3,
-});
-
-
-export const ModifierActions = style({
-  position: "absolute",
-  top: "0",
-  left: "0",
-  height: "100%",
-  width: "100%",
-  display: "flex",
-  flexDirection: "row",
-});
-
-globalStyle(`${ModifierActions} button`, {
-  flexGrow: 1,
-  backgroundColor: "transparent",
-  border: "none",
-  boxShadow: `inset 0 0 24px 0px rgb(255 255 255 / 50%)`,
-  borderRadius: "5px",
-  padding: "0",
-});
-
-export const tagPreview = style({
-  display: 'flex',
-  justifyContent: 'center',
-});
-
-globalStyle(`${tagPreview} img`, {
-  width: "90px",
-  height: "100%",
-  objectFit: "cover",
-  objectPosition: "center",
-});
-

ui/frontend/build_src/src/components/molecules/promptTag/index.tsx

@@ -1,68 +0,0 @@
-import React, { useState } from "react";
-
-import { useImageCreate } from "../../../stores/imageCreateStore";
-
-import {
-  IconFont,
-} from "../../../styles/shared.css";
-
-import {
-  PromptTagMain,
-  TagToggle,
-  TagRemoveButton,
-  PromptTagText,
-  PromptTagToggle
-} from "./promptTag.css";
-
-interface PromptTagProps {
-  id: string;
-  name: string;
-  category?: string;
-  previews?: string[];
-  type: string;
-};
-
-export default function PromptTag({ id, name, category, previews, type }: PromptTagProps) {
-
-  const [showToggle, setShowToggle] = useState(false);
-
-  const removeCreateTag = useImageCreate((state) => state.removeCreateTag);
-  const changeCreateTagType = useImageCreate((state) => state.changeCreateTagType);
-
-  const handleHover = () => {
-    setShowToggle(true);
-  };
-
-  const handleLeave = () => {
-    setShowToggle(false);
-  };
-
-  const toggleType = () => {
-    if (type === 'positive') {
-      changeCreateTagType(id, 'negative');
-    }
-    else {
-      changeCreateTagType(id, 'positive');
-    }
-  };
-
-  const handleRemove = () => {
-    console.log('remove');
-    removeCreateTag(id);
-  };
-
-  return (
-    <div
-      onMouseEnter={handleHover}
-      onMouseLeave={handleLeave}
-      className={[PromptTagMain, type].join(' ')}>
-      <p className={!showToggle ? PromptTagText : PromptTagToggle}>{name}</p>
-      {showToggle && <button className={TagToggle} onClick={toggleType}>
-        {type === 'positive' ? <i className={[IconFont, 'fa-solid', 'fa-minus'].join(" ")}></i> : <i className={[IconFont, 'fa-solid', 'fa-plus'].join(" ")}></i>}
-      </button>}
-      {showToggle && <button className={TagRemoveButton} onClick={handleRemove}>
-        <i className={[IconFont, 'fa-solid', 'fa-close'].join(" ")}></i>
-      </button>}
-    </div>
-  );
-};

ui/frontend/build_src/src/components/molecules/promptTag/promptTag.css.ts

@@ -1,55 +0,0 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-import { style, globalStyle } from '@vanilla-extract/css';
-
-import { XButton } from "../../../styles/shared.css";
-import { vars } from '../../../styles/theme/index.css';
-import { card } from '../../_recipes/card.css';
-
-
-export const PromptTagMain = style([
-  card({
-    backing: 'normal',
-    level: 1,
-    info: true
-  }), {
-    position: "relative",
-    width: "fit-content",
-    backgroundColor: `hsl(${vars.backgroundLight}, ${vars.colorMod.saturation.normal}, ${vars.colorMod.lightness.normal})`,
-    padding: vars.spacing.small,
-  }
-]);
-
-export const PromptTagText = style({
-  opacity: 1,
-  fontSize: vars.fonts.sizes.Plain,
-});
-
-export const PromptTagToggle = style({
-  opacity: 0.3,
-  fontSize: vars.fonts.sizes.Plain,
-});
-
-globalStyle(`${PromptTagMain}.positive`, {
-  borderColor: `hsl(${vars.brandHue}, ${vars.colorMod.saturation.normal}, ${vars.colorMod.lightness.normal})`,
-});
-
-globalStyle(`${PromptTagMain}.negative`, {
-  borderColor: `hsl(${vars.errorHue}, ${vars.colorMod.saturation.normal}, ${vars.colorMod.lightness.normal})`,
-});
-
-export const TagToggle = style({
-  position: "absolute",
-  top: "0",
-  right: "0",
-  height: "100%",
-  width: "100%",
-  border: "none",
-  backgroundColor: "transparent",
-  boxShadow: `inset 0 0 24px 0px rgb(255 255 255 / 50%)`,
-});
-
-export const TagRemoveButton = style([XButton, {
-  top: '-4px',
-  left: '4px',
-  padding: '0',
-}]);

ui/frontend/build_src/src/components/molecules/queueStatusTab/index.tsx

@@ -1,70 +0,0 @@
-import React, { useEffect, useState } from "react";
-
-import { FetchingStates, useImageFetching } from "../../../stores/imageFetchingStore";
-import { useRequestQueue } from "../../../stores/requestQueueStore";
-
-export default function QueueStatusTab() {
-
-
-  const [showBasicQueue, setShowBasicQueue] = useState(true);
-
-  const hasPendingQueue = useRequestQueue((state) => state.hasPendingQueue());
-  const pendingRequests = useRequestQueue((state) => state.pendingRequests());
-
-  const status = useImageFetching((state) => state.status);
-
-  const step = useImageFetching((state) => state.step);
-  const totalSteps = useImageFetching((state) => state.totalSteps);
-
-  const startTime = useImageFetching((state) => state.timeStarted);
-  const timeNow = useImageFetching((state) => state.timeNow);
-  const [timeRemaining, setTimeRemaining] = useState(0);
-
-  const [percent, setPercent] = useState(0);
-
-  useEffect(() => {
-    if (totalSteps > 0) {
-      setPercent(Math.round((step / totalSteps) * 100));
-    } else {
-      setPercent(0);
-    }
-  }, [step, totalSteps]);
-
-  useEffect(() => {
-    // find the remaining time
-    const timeTaken = +timeNow - +startTime;
-    const timePerStep = step == 0 ? 0 : timeTaken / step;
-    const totalTime = timePerStep * totalSteps;
-    const timeRemaining = (totalTime - timeTaken) / 1000;
-    // @ts-expect-error
-    setTimeRemaining(timeRemaining.toPrecision(3));
-
-  }, [step, totalSteps, startTime, timeNow, setTimeRemaining]);
-
-  useEffect(() => {
-    if (hasPendingQueue) {
-      setShowBasicQueue(false);
-    }
-  }, [status, hasPendingQueue]);
-
-  // {/* {showBasicQueue
-  //   ? <> */}
-  //   Queue
-  //   {/* </>
-  //   : <>
-  //     <span>Percent: {percent}%</span>
-  //   </>npm
-  // } */}
-
-
-  return (
-    <>
-      <span>Queue </span>
-      {hasPendingQueue && <span> Items Remaining: {pendingRequests.length} </span>}
-    </>
-  )
-
-}
-
-
-

ui/frontend/build_src/src/components/molecules/stopButton/index.tsx

@@ -1,25 +0,0 @@
-import React from "react";
-import { doStopImage } from "../../../api";
-
-
-import {
-  buttonStyle
-} from "../../_recipes/button.css";
-
-export default function StopButton() {
-
-  const stopMake = async () => {
-    try {
-      const res = await doStopImage();
-    } catch (e) {
-      console.log(e);
-    }
-  };
-
-  return <button className={buttonStyle(
-    {
-      color: "cancel",
-      size: "large",
-    }
-  )} onClick={() => void stopMake()}>Stop</button>;
-}

ui/frontend/build_src/src/components/organisms/completedImages/completedImages.css.ts

@@ -1,63 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-import { vars } from "../../../styles/theme/index.css";
-import {
-  card as cardStyle,
-} from '../../_recipes/card.css'
-
-export const completedImagesMain = style({
-  position: "relative",
-});
-
-// globalStyle(`${completedImagesMain} > button`, {
-//   position: "absolute",
-//   top: '-29px',
-// });
-
-export const completedImagesContent = style([cardStyle(), {
-  height: "250px",
-  width: "100%",
-  display: "flex",
-  padding: vars.spacing.medium,
-  borderRadius: 0,
-}]);
-
-export const completedImagesList = style({
-  display: "flex",
-  flexDirection: "row",
-  flexWrap: "nowrap",
-  height: "100%",
-  width: "100%",
-  overflow: "auto",
-  paddingLeft: vars.spacing.none,
-});
-
-globalStyle(`${completedImagesContent} li`, {
-  position: "relative",
-});
-
-globalStyle(`${completedImagesContent} > li:first-of-type`, {
-  marginLeft: vars.spacing.medium,
-});
-
-globalStyle(`${completedImagesContent} > li:last-of-type`, {
-  marginRight: 0,
-});
-
-export const imageContain = style({
-  width: "206px",
-  backgroundColor: "black",
-  display: "flex",
-  justifyContent: "center",
-  alignItems: "center",
-  flexShrink: 0,
-  border: "0 none",
-  padding: "0",
-  marginLeft: vars.spacing.medium,
-  cursor: "pointer",
-});
-
-globalStyle(`${imageContain} img`, {
-  width: "100%",
-  objectFit: "contain",
-});

ui/frontend/build_src/src/components/organisms/completedImages/index.tsx

@@ -1,87 +0,0 @@
-import React, { useState } from "react";
-
-
-import { useImageDisplay } from "../../../stores/imageDisplayStore";
-
-import {
-  completedImagesMain,
-  completedImagesContent,
-  completedImagesList,
-  imageContain,
-} from "./completedImages.css";
-
-import {
-  buttonStyle
-} from "../../_recipes/button.css";
-
-// import { Transition } from '@headlessui/react'
-
-
-// import {
-//   tabStyles
-// } from "../../_recipes/tabs_headless.css";
-
-export default function CompletedImages(
-
-) {
-
-  const [isShowing, setIsShowing] = useState(false)
-
-
-  const images = useImageDisplay((state) => state.images);
-  const setCurrentImage = useImageDisplay((state) => state.setCurrentImage);
-  const clearDisplay = useImageDisplay((state) => state.clearDisplay);
-
-  const removeImagesAll = () => {
-    clearDisplay();
-  };
-
-  return (
-    <div className={completedImagesMain}>
-      {/* <button
-        className={tabStyles({})}
-        onClick={() => setIsShowing((isShowing) => !isShowing)}>
-        {isShowing ? "Hide History" : "Show History"}
-      </button> */}
-      {/* <Transition
-        show={isShowing}
-      > */}
-
-      <div className={completedImagesContent}>
-        {/* Adjust the dom do we dont do this check twice */}
-        {images != null && images.length > 0 && (
-          <button
-            className={buttonStyle()}
-            onClick={() => {
-              removeImagesAll();
-            }}
-          >
-            REMOVE ALL
-          </button>
-        )}
-        <ul className={completedImagesList}>
-          {images?.map((image, index) => {
-            if (void 0 === image) {
-              console.warn(`image ${index} is undefined`);
-              return null;
-            }
-
-            return (
-              <li key={image.id}>
-                <button
-                  className={imageContain}
-                  onClick={() => {
-                    setCurrentImage(image);
-                  }}
-                >
-                  <img src={image.data} alt={image.info.prompt} />
-                </button>
-              </li>
-            );
-          })}
-        </ul>
-      </div>
-      {/* </Transition> */}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/advancedsettings.css.ts

@@ -1,12 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-import { vars } from "../../../../styles/theme/index.css";
-
-export const AdvancedSettingsList = style({
-  paddingLeft: 0,
-  listStyleType: "none",
-});
-
-export const AdvancedSettingGrouping = style({
-  marginTop: vars.spacing.small,
-});

ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/improvementSettings/index.tsx

@@ -1,119 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useImageCreate } from "../../../../../stores/imageCreateStore";
-
-import { useCreateUI } from "../../creationPanelUIStore";
-
-import {
-  SettingItem,
-} from "../../../../../styles/shared.css";
-
-import {
-  buttonStyle,
-} from "../../../../_recipes/button.css";
-
-import { useTranslation } from "react-i18next";
-
-export default function ImprovementSettings() {
-  const { t } = useTranslation();
-
-  // these are conditionals that should be retired and inferred from the store
-  const isUsingFaceCorrection = useImageCreate((state) =>
-    state.isUsingFaceCorrection()
-  );
-
-  const isUsingUpscaling = useImageCreate((state) => state.isUsingUpscaling());
-
-  const useUpscale = useImageCreate((state) =>
-    state.getValueForRequestKey("use_upscale")
-  );
-
-  const filteredOnly = useImageCreate((state) =>
-    state.getValueForRequestKey("show_only_filtered_image")
-  );
-
-  const toggleUseFaceCorrection = useImageCreate(
-    (state) => state.toggleUseFaceCorrection
-  );
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const improvementOpen = useCreateUI(
-    (state) => state.isOpenAdvImprovementSettings
-  );
-
-  const toggleImprovementOpen = useCreateUI(
-    (state) => state.toggleAdvImprovementSettings
-  );
-
-  const [isFilteringDisabled, setIsFilteringDisabled] = useState(false);
-  // should probably be a store selector
-  useEffect(() => {
-    // if either are true we arent disabled
-    if (isUsingFaceCorrection || useUpscale != "") {
-      setIsFilteringDisabled(false);
-    } else {
-      setIsFilteringDisabled(true);
-    }
-  }, [isUsingFaceCorrection, isUsingUpscaling, setIsFilteringDisabled]);
-
-  return (
-    <div>
-      <button
-        type="button"
-        className={buttonStyle({
-          type: 'action',
-          color: 'accent',
-        })}
-        onClick={toggleImprovementOpen}
-      >
-        Improvement Settings
-      </button>
-      {improvementOpen && (
-        <>
-          <div className={SettingItem}>
-            <label>
-              <input
-                type="checkbox"
-                checked={isUsingFaceCorrection}
-                onChange={(e) => toggleUseFaceCorrection()}
-              />
-              Fix incorrect faces and eyes (uses GFPGAN)
-            </label>
-          </div>
-          <div className={SettingItem}>
-            <label>
-              {t("settings.ups")}
-              <select
-                id="upscale_model"
-                name="upscale_model"
-                value={useUpscale}
-                onChange={(e) => {
-                  setRequestOption("use_upscale", e.target.value);
-                }}
-              >
-                <option value="">{t("settings.no-ups")}</option>
-                <option value="RealESRGAN_x4plus">RealESRGAN_x4plus</option>
-                <option value="RealESRGAN_x4plus_anime_6B">
-                  RealESRGAN_x4plus_anime_6B
-                </option>
-              </select>
-            </label>
-          </div>
-          <div className={SettingItem}>
-            <label>
-              <input
-                disabled={isFilteringDisabled}
-                type="checkbox"
-                checked={filteredOnly}
-                onChange={(e) =>
-                  setRequestOption("show_only_filtered_image", e.target.checked)
-                }
-              />
-              {t("settings.corrected")}
-            </label>
-          </div>
-        </>
-      )}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/index.tsx

@@ -1,69 +0,0 @@
-import React, { useEffect } from "react";
-import { useCreateUI } from "../creationPanelUIStore";
-
-
-
-import {
-  card
-} from '../../../_recipes/card.css';
-
-import {
-  buttonStyle,
-} from "../../../_recipes/button.css";
-
-import {
-  AdvancedSettingsList,
-  AdvancedSettingGrouping,
-} from "./advancedsettings.css";
-
-import ImprovementSettings from "./improvementSettings";
-import PropertySettings from "./propertySettings";
-import WorkflowSettings from "./workflowSettings";
-
-function SettingsList() {
-  return (
-    <ul className={AdvancedSettingsList}>
-      <li className={AdvancedSettingGrouping}>
-        <ImprovementSettings />
-      </li>
-      <li className={AdvancedSettingGrouping}>
-        <PropertySettings />
-      </li>
-      <li className={AdvancedSettingGrouping}>
-        <WorkflowSettings />
-      </li>
-    </ul>
-  );
-}
-
-export default function AdvancedSettings() {
-  const advancedSettingsIsOpen = useCreateUI(
-    (state) => state.isOpenAdvancedSettings
-  );
-
-  const toggleAdvancedSettingsIsOpen = useCreateUI(
-    (state) => state.toggleAdvancedSettings
-  );
-
-  return (
-    <div className={card(
-      {
-        level: 1,
-        backing: 'normal'
-      }
-    )}>
-      <button
-        type="button"
-        onClick={toggleAdvancedSettingsIsOpen}
-        className={buttonStyle({
-          type: 'action',
-          color: 'secondary',
-          size: 'large'
-        })}
-      >
-        Advanced Settings
-      </button>
-      {advancedSettingsIsOpen && <SettingsList />}
-    </div >
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/propertySettings/index.tsx

@@ -1,211 +0,0 @@
-import React from "react";
-import { useImageCreate, SAMPLER_OPTIONS } from "../../../../../stores/imageCreateStore";
-import { useCreateUI } from "../../creationPanelUIStore";
-
-import {
-  SettingItem,
-} from "../../../../../styles/shared.css";
-
-
-import {
-  buttonStyle,
-} from "../../../../_recipes/button.css";
-
-
-
-import { useTranslation } from "react-i18next";
-
-// todo: move this someplace more global
-const IMAGE_DIMENSIONS = [
-  { value: 128, label: "128 (*)" },
-  { value: 192, label: "192" },
-  { value: 256, label: "256 (*)" },
-  { value: 320, label: "320" },
-  { value: 384, label: "384" },
-  { value: 448, label: "448" },
-  { value: 512, label: "512 (*)" },
-  { value: 576, label: "576" },
-  { value: 640, label: "640" },
-  { value: 704, label: "704" },
-  { value: 768, label: "768 (*)" },
-  { value: 832, label: "832" },
-  { value: 896, label: "896" },
-  { value: 960, label: "960" },
-  { value: 1024, label: "1024 (*)" },
-];
-
-export default function PropertySettings() {
-  const { t } = useTranslation();
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-  const toggleUseRandomSeed = useImageCreate(
-    (state) => state.toggleUseRandomSeed
-  );
-  const isRandomSeed = useImageCreate((state) => state.isRandomSeed());
-
-  const seed = useImageCreate((state) => state.getValueForRequestKey("seed"));
-  const steps = useImageCreate((state) =>
-    state.getValueForRequestKey("num_inference_steps")
-  );
-  const guidanceScale = useImageCreate((state) =>
-    state.getValueForRequestKey("guidance_scale")
-  );
-
-  const initImage = useImageCreate((state) =>
-    state.getValueForRequestKey("init_image")
-  );
-
-  const promptStrength = useImageCreate((state) =>
-    state.getValueForRequestKey("prompt_strength")
-  );
-
-  const width = useImageCreate((state) => state.getValueForRequestKey("width"));
-  const height = useImageCreate((state) =>
-    state.getValueForRequestKey("height")
-  );
-
-  const sampler = useImageCreate((state) =>
-    state.getValueForRequestKey("sampler")
-  );
-
-  const propertyOpen = useCreateUI((state) => state.isOpenAdvPropertySettings);
-  const togglePropertyOpen = useCreateUI(
-    (state) => state.toggleAdvPropertySettings
-  );
-
-  return (
-    <div>
-      <button type="button" className={buttonStyle({
-        type: 'action',
-        color: 'accent',
-      })} onClick={togglePropertyOpen}>
-        Property Settings
-      </button>
-      {propertyOpen && (
-        <>
-          <div className={SettingItem}>
-            <label>
-              Seed:
-              <input
-                size={10}
-                value={seed}
-                onChange={(e) => setRequestOption("seed", e.target.value)}
-                disabled={isRandomSeed}
-                placeholder="random"
-              />
-            </label>
-            <label>
-              <input
-                type="checkbox"
-                checked={isRandomSeed}
-                onChange={(e) => toggleUseRandomSeed()}
-              />{" "}
-              Random Image
-            </label>
-          </div>
-
-          <div className={SettingItem}>
-            <label>
-              {t("settings.steps")}{" "}
-              <input
-                value={steps}
-                onChange={(e) => {
-                  setRequestOption("num_inference_steps", e.target.value);
-                }}
-                size={4}
-              />
-            </label>
-          </div>
-
-          <div className={SettingItem}>
-            <label>
-              {t("settings.guide-scale")}
-              <input
-                value={guidanceScale}
-                onChange={(e) =>
-                  setRequestOption("guidance_scale", e.target.value)
-                }
-                type="range"
-                min="0"
-                max="20"
-                step=".1"
-              />
-            </label>
-            <span>{guidanceScale}</span>
-          </div>
-
-          {void 0 !== initImage && (
-            <div className={SettingItem}>
-              <label>
-                {t("settings.prompt-str")}{" "}
-                <input
-                  value={promptStrength}
-                  onChange={(e) =>
-                    setRequestOption("prompt_strength", e.target.value)
-                  }
-                  type="range"
-                  min="0"
-                  max="1"
-                  step=".05"
-                />
-              </label>
-              <span>{promptStrength}</span>
-            </div>
-          )}
-
-          <div className={SettingItem}>
-            <label>
-              {t("settings.width")}
-              <select
-                value={width}
-                onChange={(e) => setRequestOption("width", e.target.value)}
-              >
-                {IMAGE_DIMENSIONS.map((dimension) => (
-                  <option
-                    key={`width-option_${dimension.value}`}
-                    value={dimension.value}
-                  >
-                    {dimension.label}
-                  </option>
-                ))}
-              </select>
-            </label>
-
-            <label>
-              {t("settings.height")}
-              <select
-                value={height}
-                onChange={(e) => setRequestOption("height", e.target.value)}
-              >
-                {IMAGE_DIMENSIONS.map((dimension) => (
-                  <option
-                    key={`height-option_${dimension.value}`}
-                    value={dimension.value}
-                  >
-                    {dimension.label}
-                  </option>
-                ))}
-              </select>
-            </label>
-          </div>
-
-          <div className={SettingItem}>
-            <label>
-              {t("settings.sampler")}
-              <select
-                value={sampler}
-                onChange={(e) => setRequestOption("sampler", e.target.value)}
-              >
-                {SAMPLER_OPTIONS.map((sampler) => (
-                  <option key={`sampler-option_${sampler}`} value={sampler}>
-                    {sampler}
-                  </option>
-                ))}
-              </select>
-            </label>
-          </div>
-        </>
-      )}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/advancedSettings/workflowSettings/index.tsx

@@ -1,84 +0,0 @@
-import React from "react";
-import { useImageCreate } from "../../../../../stores/imageCreateStore";
-
-import { useCreateUI } from "../../creationPanelUIStore";
-
-import {
-  SettingItem,
-} from "../../../../../styles/shared.css";
-
-import {
-  buttonStyle,
-} from "../../../../_recipes/button.css";
-
-import { useTranslation } from "react-i18next";
-
-export default function WorkflowSettings() {
-  const { t } = useTranslation();
-
-  const numOutputs = useImageCreate((state) =>
-    state.getValueForRequestKey("num_outputs")
-  );
-  const parallelCount = useImageCreate((state) => state.parallelCount);
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-  const setParallelCount = useImageCreate((state) => state.setParallelCount);
-  const shouldStreamImages = useImageCreate((state) => state.getValueForRequestKey("stream_image_progress"));
-
-  const workflowOpen = useCreateUI((state) => state.isOpenAdvWorkflowSettings);
-  const toggleWorkflowOpen = useCreateUI(
-    (state) => state.toggleAdvWorkflowSettings
-  );
-
-  return (
-    <div>
-      <button type="button" className={buttonStyle({
-        type: 'action',
-        color: 'accent',
-      })} onClick={toggleWorkflowOpen}>
-        Workflow Settings
-      </button>
-      {workflowOpen && (
-        <>
-          <div className={SettingItem}>
-            <label>
-              {t("settings.amount-of-img")}{" "}
-              <input
-                type="number"
-                value={numOutputs}
-                onChange={(e) =>
-                  setRequestOption("num_outputs", parseInt(e.target.value, 10))
-                }
-                size={4}
-              />
-            </label>
-          </div>
-          <div className={SettingItem}>
-            <label>
-              {t("settings.how-many")}
-              <input
-                type="number"
-                value={parallelCount}
-                onChange={(e) => setParallelCount(parseInt(e.target.value, 10))}
-                size={4}
-              />
-            </label>
-          </div>
-
-          <div className={SettingItem}>
-            <label>
-              {t("settings.stream-img")}
-              <input
-                type="checkbox"
-                checked={shouldStreamImages}
-                onChange={(e) =>
-                  setRequestOption("stream_image_progress", e.target.checked)
-                }
-              />
-            </label>
-          </div>
-        </>
-      )}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/basicCreation.css.ts

@@ -1,20 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-import { card } from "../../../_recipes/card.css";
-
-
-export const CreationBasicMain = style([
-  card({
-    backing: 'normal',
-    level: 1
-  }), {
-    position: "relative",
-    width: "100%",
-  }]
-);
-
-export const PromptDisplay = style({});
-
-globalStyle(`${CreationBasicMain} > *`, {
-  marginBottom: '10px'
-});

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/index.tsx

@@ -1,37 +0,0 @@
-import React, { ChangeEvent } from "react";
-import { useImageCreate } from "../../../../stores/imageCreateStore";
-
-import {
-  CreationBasicMain,
-  PromptDisplay,
-} from "./basicCreation.css";
-
-import MakeButton from "../../../molecules/makeButton";
-
-import PromptCreator from "./promptCreator";
-// import CreationActions from "./creationActions";
-import SeedImage from "./seedImage";
-import ActiveTags from "./promptCreator/activeTags";
-
-import { useTranslation } from "react-i18next";
-
-export default function BasicCreation() {
-  const { t } = useTranslation();
-
-  const promptText = useImageCreate((state) =>
-    state.getValueForRequestKey("prompt")
-  );
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const handlePromptChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-    setRequestOption("prompt", event.target.value);
-  };
-
-  return (
-    <div className={CreationBasicMain}>
-      <MakeButton></MakeButton>
-      <PromptCreator></PromptCreator>
-      <SeedImage></SeedImage>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/promptCreator/activeTags/activeTags.css.ts

@@ -1,18 +0,0 @@
-import { style } from '@vanilla-extract/css';
-import { vars } from '../../../../../../styles/theme/index.css';
-export const ActiveTagListMain = style({
-  display: 'flex',
-  flexDirection: 'row',
-  flexWrap: 'wrap',
-  gap: '10px',
-  width: '100%',
-  height: '100%',
-  overflow: 'visible',
-  scrollbarWidth: 'none',
-  msOverflowStyle: 'none',
-  '::-webkit-scrollbar': {
-    display: 'none',
-  },
-});
-
-

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/promptCreator/activeTags/index.tsx

@@ -1,39 +0,0 @@
-import React from "react";
-
-import { useImageCreate } from "../../../../../../stores/imageCreateStore";
-import ModifierTag from "../../../../../molecules/modifierTag";
-
-// import {
-//   card
-// } from '../../../../../_recipes/card.css';
-
-
-
-import PromptTag from "../../../../../molecules/promptTag";
-
-import {
-  ActiveTagListMain
-} from "./activeTags.css";
-
-
-export default function ActiveTags() {
-  const selectedtags = useImageCreate((state) => state.selectedTags());
-
-  const createTags = useImageCreate((state) => state.createTags);
-
-  return (
-    <div>
-      <ul className={ActiveTagListMain}>
-        {createTags.map((tag) => {
-          console.log(tag);
-          return (
-            <li key={tag.id}>
-              {/* @ts-expect-error */}
-              <PromptTag id={tag.id} name={tag.name} category={tag?.category} previews={tag?.previews} type={tag.type} />
-            </li>)
-        }
-        )}
-      </ul>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/promptCreator/index.tsx

@@ -1,108 +0,0 @@
-import React, { useState, ChangeEvent, KeyboardEventHandler, Fragment } from "react";
-import { v4 as uuidv4 } from "uuid";
-import { Switch } from '@headlessui/react'
-
-import { useImageCreate } from "../../../../../stores/imageCreateStore";
-
-import ActiveTags from "./activeTags";
-
-import {
-  IconFont,
-} from "../../../../../styles/shared.css";
-
-import {
-  buttonStyle,
-} from "../../../../_recipes/button.css";
-
-import {
-  PromptCreatorMain,
-  ToggleGroupMain,
-  ToggleMain,
-  ToggleLabel,
-  ToggleEnabled,
-  TogglePill,
-  buttonRow,
-} from "./promptCreator.css";
-
-
-
-import { useTranslation } from "react-i18next";
-import { type } from "os";
-
-interface TagTypeProps {
-  positive: boolean;
-  setPositive: (positive: boolean) => void;
-};
-
-function TagTypeToggle({ positive, setPositive }: TagTypeProps) {
-  return (
-    <Switch.Group as={Fragment}>
-      <div className={ToggleGroupMain}>
-        <Switch.Label> Type </Switch.Label>
-        <Switch className={ToggleMain} checked={positive} onChange={setPositive}>
-          <span
-            className={TogglePill}
-          >
-            {positive
-              ? <i className={[IconFont, 'fa-solid', 'fa-plus'].join(" ")}></i>
-              : <i className={[IconFont, 'fa-solid', 'fa-minus'].join(" ")}></i>}
-          </span>
-        </Switch>
-      </div>
-    </Switch.Group>
-  );
-}
-
-export default function PromptCreator() {
-
-  const [positive, setPositive] = useState(true)
-  const [tagText, setTagText] = useState('An astronaut riding a horse');
-
-  const addCreateTag = useImageCreate((state) => state.addCreateTag);
-
-  const { t } = useTranslation();
-
-  const checkForEnter = (event: KeyboardEventHandler<HTMLInputElement>) => {
-    // @ts-expect-error
-    if (event.key === "Enter") {
-      if (tagText !== '') {
-        const type = positive ? "positive" : "negative";
-
-        tagText.split(',').map((tag) => tag.trim()).forEach((tag) => {
-          addCreateTag({ id: uuidv4(), name: tag, type });
-        });
-        //debugger;
-
-        setTagText('');
-      }
-    }
-  };
-
-  return (
-    <div className={PromptCreatorMain}>
-      <div>
-        <p>{t("home.editor-title")}</p>
-        {/* @ts-expect-error */}
-        <input value={tagText} onKeyDown={checkForEnter} onChange={(event) => {
-          setTagText(event.target.value)
-        }}></input>
-      </div>
-      <div className={buttonRow}>
-        <button
-          className={buttonStyle(
-            {
-              size: 'slim'
-            }
-          )}
-          onClick={() => {
-          }}
-        >
-          Add Prompt
-        </button>
-
-        <TagTypeToggle positive={positive} setPositive={setPositive}></TagTypeToggle>
-      </div>
-      <ActiveTags></ActiveTags>
-    </div >
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/promptCreator/promptCreator.css.ts

@@ -1,79 +0,0 @@
-import { style, globalStyle } from '@vanilla-extract/css';
-
-import { vars } from "../../../../../styles/theme/index.css";
-
-export const PromptCreatorMain = style({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%',
-  height: '100%',
-  marginBottom: 0,
-});
-
-globalStyle(`${PromptCreatorMain} input`, {
-  width: '100%',
-});
-
-globalStyle(`${PromptCreatorMain} > div`, {
-  marginBottom: vars.spacing.small,
-});
-
-export const ToggleGroupMain = style({
-  //  '--toggle-size': '30px',
-});
-
-export const ToggleMain = style({
-  background: vars.backgroundDark,
-  height: '22px',
-  borderRadius: '15px',
-  width: '34px',
-  border: 0,
-  position: 'relative',
-  display: 'inline-flex',
-  padding: 0,
-  flexDirection: 'column',
-  alignItems: 'center',
-  justifyContent: 'center',
-  boxShadow: `0 0 2px 0  ${vars.backgroundDark}`,
-});
-
-export const ToggleLabel = style({
-});
-
-export const ToggleEnabled = style({
-});
-
-globalStyle(`${ToggleMain}[data-headlessui-state="checked"]`, {
-  background: vars.backgroundLight,
-});
-
-export const TogglePill = style({
-  display: 'inline-flex',
-  height: '18px',
-  width: '30px',
-  borderRadius: '15px',
-  background: vars.backgroundDark,
-  flexDirection: 'column',
-  alignItems: 'center',
-  justifyContent: 'center',
-});
-
-globalStyle(`${ToggleMain}[data-headlessui-state="checked"] ${TogglePill}`, {
-  background: vars.backgroundAccentMain,
-});
-
-globalStyle(`${TogglePill} p`, {
-  color: vars.colors.text.normal,
-});
-
-
-export const buttonRow = style({
-  marginTop: vars.spacing.small,
-  display: 'flex',
-  flexDirection: 'row',
-});
-
-globalStyle(`${buttonRow} > button`, {
-  flexGrow: 1,
-  marginRight: vars.spacing.medium,
-});

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/index.tsx

@@ -1,108 +0,0 @@
-import React, { useRef, ChangeEvent } from "react";
-
-
-
-import { XButton } from "../../../../../styles/shared.css";
-
-import {
-  ImageInputDisplay,
-  InputLabel,
-  ImageInput,
-  ImageFixer,
-} from "./seedImage.css";
-
-import {
-  buttonStyle
-} from "../../../../_recipes/button.css";
-
-import { useImageCreate } from "../../../../../stores/imageCreateStore";
-
-import { useTranslation } from "react-i18next";
-
-// TODO : figure out why this needs props to be passed in.. fixes a type error
-// when the component is used in the parent component
-export default function SeedImage(_props: any) {
-  const { t } = useTranslation();
-
-  const imageInputRef = useRef<HTMLInputElement>(null);
-
-  const initImage = useImageCreate((state) =>
-    state.getValueForRequestKey("init_image")
-  );
-
-  const isInPaintingMode = useImageCreate((state) => state.isInpainting);
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const _startFileSelect = () => {
-    imageInputRef.current?.click();
-  };
-  const _handleFileSelect = (event: ChangeEvent<HTMLInputElement>) => {
-    // @ts-expect-error
-    const file = event.target.files[0];
-
-    if (void 0 !== file) {
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        if (e.target != null) {
-          setRequestOption("init_image", e.target.result);
-        }
-      };
-      reader.readAsDataURL(file);
-    }
-  };
-
-  const toggleInpainting = useImageCreate((state) => state.toggleInpainting);
-
-  const _handleClearImage = () => {
-    setRequestOption("init_image", undefined);
-
-    setRequestOption("mask", undefined);
-    if (isInPaintingMode) {
-      toggleInpainting();
-    }
-  };
-
-  return (
-    <div className={ImageInputDisplay}>
-      <div>
-        <label className={InputLabel}>
-          <b>{t("home.initial-img-txt")}</b>
-        </label>
-        <input
-          ref={imageInputRef}
-          className={ImageInput}
-          name="init_image"
-          type="file"
-          onChange={_handleFileSelect}
-        />
-        <button className={buttonStyle()} onClick={_startFileSelect}>
-          {t("home.initial-img-btn")}
-        </button>
-      </div>
-
-      <div className={ImageFixer}>
-        {void 0 !== initImage && (
-          <>
-            <div>
-              <img src={initImage} width="100" height="100" />
-              <button className={XButton} onClick={_handleClearImage}>
-                X
-              </button>
-            </div>
-            <label>
-              <input
-                type="checkbox"
-                onChange={(e) => {
-                  toggleInpainting();
-                }}
-                checked={isInPaintingMode}
-              ></input>
-              {t("in-paint.txt")}
-            </label>
-          </>
-        )}
-      </div>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/seedImage/seedImage.css.ts

@@ -1,23 +0,0 @@
-import { style } from "@vanilla-extract/css";
-
-import { vars } from "../../../../../styles/theme/index.css";
-
-export const ImageInputDisplay = style({
-  display: "flex",
-});
-
-export const InputLabel = style({
-  marginBottom: vars.spacing.small,
-  display: "block",
-});
-
-export const ImageInput = style({
-  display: "none",
-});
-
-
-// this is needed to fix an issue with the image input text
-// when that is a drag an drop we can remove this
-export const ImageFixer = style({
-  marginLeft: "20px",
-});

ui/frontend/build_src/src/components/organisms/creationPanel/basicCreation/showQueue/index.tsx

@@ -1,21 +0,0 @@
-import React from "react";
-
-import { useCreateUI } from "../../creationPanelUIStore";
-
-export default function ShowQueue() {
-
-  const showQueue = useCreateUI((state) => state.showQueue);
-  const toggleQueue = useCreateUI((state) => state.toggleQueue);
-
-  return (
-    <label>
-      <input
-        type="checkbox"
-        checked={showQueue}
-        onChange={() => toggleQueue()}
-      >
-      </input>
-      Display Queue
-    </label>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/creationPanel.css.ts

@@ -1,21 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-import { vars } from "../../../styles/theme/index.css";
-export const CreationPaneMain = style({
-  position: "relative",
-  width: "100%",
-  height: "100%",
-  overflowY: "auto",
-  overflowX: "hidden",
-});
-
-globalStyle(`${CreationPaneMain} > div`, {
-  marginBottom: vars.spacing.medium,
-});
-
-export const InpaintingSlider = style({
-  position: "absolute",
-  top: "10px",
-  left: "400px",
-  zIndex: 1,
-  backgroundColor: "rgba(0, 0, 0, 0.5)",
-});

ui/frontend/build_src/src/components/organisms/creationPanel/creationPanelUIStore.ts

@@ -1,89 +0,0 @@
-import create from "zustand";
-import produce from "immer";
-import { persist } from "zustand/middleware";
-
-export interface ImageCreationUIOptions {
-  isOpenAdvancedSettings: boolean;
-  isOpenAdvImprovementSettings: boolean;
-  isOpenAdvPropertySettings: boolean;
-  isOpenAdvWorkflowSettings: boolean;
-  isOpenImageModifier: boolean;
-  showQueue: boolean;
-
-  toggleAdvancedSettings: () => void;
-  toggleAdvImprovementSettings: () => void;
-  toggleAdvPropertySettings: () => void;
-  toggleAdvWorkflowSettings: () => void;
-
-  toggleImageModifier: () => void;
-  toggleQueue: () => void;
-
-}
-
-export const useCreateUI = create<ImageCreationUIOptions>(
-  //@ts-expect-error
-  persist(
-    (set, get) => ({
-      isOpenAdvancedSettings: false,
-      isOpenAdvImprovementSettings: false,
-      isOpenAdvPropertySettings: false,
-      isOpenAdvWorkflowSettings: false,
-      isOpenImageModifier: false,
-      showQueue: false,
-
-      toggleAdvancedSettings: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.isOpenAdvancedSettings = !state.isOpenAdvancedSettings;
-          })
-        );
-      },
-
-      toggleAdvImprovementSettings: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.isOpenAdvImprovementSettings =
-              !state.isOpenAdvImprovementSettings;
-          })
-        );
-      },
-
-      toggleAdvPropertySettings: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.isOpenAdvPropertySettings = !state.isOpenAdvPropertySettings;
-          })
-        );
-      },
-
-      toggleAdvWorkflowSettings: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.isOpenAdvWorkflowSettings = !state.isOpenAdvWorkflowSettings;
-          })
-        );
-      },
-
-      toggleImageModifier: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.isOpenImageModifier = !state.isOpenImageModifier;
-          })
-        );
-      },
-
-      toggleQueue: () => {
-        set(
-          produce((state: ImageCreationUIOptions) => {
-            state.showQueue = !state.showQueue;
-          })
-        );
-      },
-
-    }),
-    {
-      name: "createUI",
-      // getStorage: () => localStorage,
-    }
-  )
-);

ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/imageModifiers.css.ts

@@ -1,33 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-import { vars } from "../../../../styles/theme/index.css";
-
-export const ImagerModifierGroups = style({
-  // marginBottom: vars.spacing.small,
-  paddingLeft: 0,
-  listStyleType: "none",
-});
-
-globalStyle(`${ImagerModifierGroups} li`, {
-  marginTop: vars.spacing.medium,
-});
-
-export const ImageModifierGrouping = style({
-  marginTop: vars.spacing.medium,
-});
-
-globalStyle(`${ImageModifierGrouping} h4`, {
-  fontSize: vars.fonts.sizes.Plain,
-});
-
-
-export const ModifierListStyle = style({
-  paddingLeft: 0,
-  listStyleType: "none",
-  display: "flex",
-  flexWrap: "wrap",
-  gap: vars.spacing.small,
-});
-
-globalStyle(`${ModifierListStyle} li`, {
-  margin: 0,
-});

ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/index.tsx

@@ -1,115 +0,0 @@
-import React, { useState } from "react";
-
-import {
-  MenuButton,
-} from "../../../../styles/shared.css";
-
-import {
-  card
-} from '../../../_recipes/card.css';
-
-import {
-  buttonStyle,
-} from "../../../_recipes/button.css";
-
-import {
-  ImagerModifierGroups,
-  ImageModifierGrouping,
-  ModifierListStyle,
-} from "./imageModifiers.css";
-
-import { ModifierObject, useImageCreate } from "../../../../stores/imageCreateStore";
-import { useCreateUI } from "../creationPanelUIStore";
-
-import ModifierTag from "../../../molecules/modifierTag";
-
-interface ModifierListProps {
-  category: string;
-  tags: ModifierObject[];
-}
-
-function ModifierList({ tags, category }: ModifierListProps) {
-  return (
-    <ul className={ModifierListStyle}>
-      {tags.map((tag) => (
-        <li key={tag.modifier}>
-          <ModifierTag category={category} name={tag.modifier} previews={tag.previews} />
-        </li>
-      ))}
-    </ul>
-  );
-}
-
-interface ModifierGroupingProps {
-  title: string;
-  category: string;
-  tags: ModifierObject[];
-}
-
-function ModifierGrouping({ title, category, tags }: ModifierGroupingProps) {
-  // doing this localy for now, but could move to a store
-  // and persist if we wanted to
-  const [isExpanded, setIsExpanded] = useState(false);
-
-  const _toggleExpand = () => {
-    setIsExpanded(!isExpanded);
-  };
-
-  return (
-    <div className={ImageModifierGrouping}>
-      <button type="button" className={buttonStyle({
-        type: 'action',
-        color: 'accent',
-      })} onClick={_toggleExpand}>
-        <h4>{title}</h4>
-      </button>
-      {isExpanded && <ModifierList category={category} tags={tags} />}
-    </div>
-  );
-}
-
-export default function ImageModifers() {
-  const allModifiers = useImageCreate((state) => state.allModifiers);
-
-  const imageModifierIsOpen = useCreateUI((state) => state.isOpenImageModifier);
-  const toggleImageModifiersIsOpen = useCreateUI(
-    (state) => state.toggleImageModifier
-  );
-
-  const handleClick = () => {
-    toggleImageModifiersIsOpen();
-  };
-
-  return (
-    <div className={card(
-      {
-        level: 1,
-        backing: 'normal'
-      }
-    )}>
-      <button
-        type="button"
-        onClick={handleClick}
-        className={buttonStyle({
-          type: 'action',
-          color: 'secondary',
-          size: 'large'
-        })}
-      >
-        Image Modifiers
-      </button>
-
-      {imageModifierIsOpen && (
-        <ul className={ImagerModifierGroups}>
-          {allModifiers.map((item, index) => {
-            return (
-              <li key={item.category}>
-                <ModifierGrouping title={item.category} category={item.category} tags={item.modifiers} />
-              </li>
-            );
-          })}
-        </ul>
-      )}
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/imageModifiers/modifiers.mock.ts

@@ -1,18 +0,0 @@
-const Mockifiers = [
-  [
-    "Drawing Style",
-    [
-      "Cel Shading",
-      "Children's Drawing",
-      "Crosshatch",
-      "Detailed and Intricate",
-      "Doodle",
-      "Dot Art",
-      "Line Art",
-      "Sketch",
-    ],
-  ],
-  ["Visual Style", ["2D", "8-bit", "16-bit", "Anaglyph", "Anime", "CGI"]],
-];
-
-export default Mockifiers;

ui/frontend/build_src/src/components/organisms/creationPanel/index.tsx

@@ -1,43 +0,0 @@
-import React, { ChangeEvent } from "react";
-
-import BasicCreation from "./basicCreation";
-import AdvancedSettings from "./advancedSettings";
-import ImageModifiers from "./imageModifiers";
-import InpaintingPanel from "./inpaintingPanel";
-
-import QueueDisplay from "../queueDisplay";
-
-// this works but causes type errors so its not worth it for now
-// import { useImageCreate } from "@stores/imageCreateStore.ts";
-
-import { useImageCreate } from "../../../stores/imageCreateStore";
-import { useRequestQueue } from "../../../stores/requestQueueStore";
-
-
-import {
-  CreationPaneMain,
-  InpaintingSlider,
-} from "./creationPanel.css";
-
-
-export default function CreationPanel() {
-  const isInPaintingMode = useImageCreate((state) => state.isInpainting);
-
-  const hasQueue = useRequestQueue((state) => state.hasAnyQueue());
-
-  return (
-    <>
-      <div className={CreationPaneMain}>
-        <BasicCreation></BasicCreation>
-        <AdvancedSettings></AdvancedSettings>
-        <ImageModifiers></ImageModifiers>
-      </div>
-
-      {isInPaintingMode && (
-        <div className={InpaintingSlider}>
-          <InpaintingPanel></InpaintingPanel>
-        </div>
-      )}
-    </>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/inpaintingPanel/index.tsx

@@ -1,114 +0,0 @@
-import React, { useRef, useState, ChangeEvent } from "react";
-import DrawImage from "../../../molecules/drawImage";
-
-import { useImageCreate } from "../../../../stores/imageCreateStore";
-
-import {
-  InpaintingPanelMain,
-  InpaintingControls,
-  InpaintingControlRow,
-} from "./inpaintingPanel.css";
-
-export default function InpaintingPanel() {
-  // no idea if this is the right typing
-  // const drawingRef = useRef(null);
-
-  const [brushSize, setBrushSize] = useState("20");
-  const [brushShape, setBrushShape] = useState("round");
-  const [brushColor, setBrushColor] = useState("#fff");
-  const [isErasing, setIsErasing] = useState(false);
-
-  const initImage = useImageCreate((state) =>
-    state.getValueForRequestKey("init_image")
-  );
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const setMask = (data: string) => {
-    setRequestOption("mask", data);
-  }
-
-
-  const _handleBrushMask = () => {
-    setIsErasing(false);
-  };
-
-  const _handleBrushErase = () => {
-    setIsErasing(true);
-  };
-
-
-  const _handleBrushSize = (event: ChangeEvent<HTMLInputElement>) => {
-    setBrushSize(event.target.value);
-  };
-
-  return (
-    <div className={InpaintingPanelMain}>
-      <DrawImage
-        // ref={drawingRef}
-        imageData={initImage}
-        // @ts-expect-error
-        brushSize={brushSize}
-        brushShape={brushShape}
-        brushColor={brushColor}
-        isErasing={isErasing}
-        setData={setMask}
-      />
-      <div className={InpaintingControls}>
-        <div className={InpaintingControlRow}>
-          <button onClick={_handleBrushMask}>Mask</button>
-          <button onClick={_handleBrushErase}>Erase</button>
-          {/* <button disabled onClick={_handleFillMask}>
-            Fill
-          </button>
-          <button disabled onClick={_handleClearAll}>
-            Clear
-          </button> */}
-
-          <label>
-            Brush Size
-            <input
-              type="range"
-              min="1"
-              max="100"
-              value={brushSize}
-              onChange={_handleBrushSize}
-            ></input>
-          </label>
-        </div>
-
-        <div className={InpaintingControlRow}>
-          <button
-            onClick={() => {
-              setBrushShape("round");
-            }}
-          >
-            Cirle Brush
-          </button>
-          <button
-            onClick={() => {
-              setBrushShape("square");
-            }}
-          >
-            Square Brush
-          </button>
-
-          {/* <button
-            onClick={() => {
-              setBrushColor("#000");
-            }}
-          >
-            Dark Brush
-          </button> */}
-          {/* <button
-            onClick={() => {
-              setBrushColor("#fff");
-            }}
-          >
-            Light Brush
-          </button> */}
-        </div>
-      </div>
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/creationPanel/inpaintingPanel/inpaintingPanel.css.ts

@@ -1,27 +0,0 @@
-import { style } from "@vanilla-extract/css";
-
-export const InpaintingPanelMain = style({
-  position: "relative",
-  width: "100%",
-  height: "100%",
-  padding: "10px 10px",
-});
-
-export const InpaintingControls = style({
-  display: "flex",
-  flexDirection: "row",
-  width: "100%",
-  flexWrap: "wrap",
-});
-
-export const InpaintingControlRow = style({
-  display: "flex",
-  flexDirection: "row",
-  justifyContent: "space-evenly",
-  alignItems: "center",
-  width: "100%",
-
-  ":first-of-type": {
-    margin: "10px 0",
-  },
-});

ui/frontend/build_src/src/components/organisms/currentDisplay/currentDisplay.css.ts

@@ -1,12 +0,0 @@
-import { style } from '@vanilla-extract/css'
-
-// handles all 3
-export const currentDisplayMain = style({
-  display: 'flex',
-  flexDirection: 'column',
-  justifyContent: 'center',
-  alignItems: 'center',
-  height: '100%',
-  width: '100%',
-  padding: '0 0 0 0',
-})

ui/frontend/build_src/src/components/organisms/currentDisplay/imageDisplay/imageDisplay.css.ts

@@ -1,40 +0,0 @@
-import { style, globalStyle } from '@vanilla-extract/css'
-
-import { vars } from '../../../../styles/theme/index.css'
-
-export const imageDisplayMain = style({
-  height: '100%',
-  width: '100%',
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-export const imageDisplayContainer = style({
-  height: '100%',
-  width: '80%',
-  display: 'flex',
-  justifyContent: 'center',
-});
-
-export const imageDisplayCenter = style({
-  width: '100%',
-  maxWidth: '1000px',
-  position: 'relative',
-});
-
-export const imageDisplayContent = style({
-  display: 'flex',
-  flexDirection: 'column',
-});
-
-globalStyle(`${imageDisplayContent} > div`, {
-  marginBottom: vars.spacing.medium,
-});
-
-globalStyle(`${imageDisplayContent} p`, {
-  marginBottom: vars.spacing.small,
-});
-
-globalStyle(`${imageDisplayContent} button`, {
-  marginRight: vars.spacing.medium,
-});

ui/frontend/build_src/src/components/organisms/currentDisplay/imageDisplay/index.tsx

@@ -1,100 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import React from "react";
-import { useImageCreate } from "../../../../stores/imageCreateStore";
-import { CompletedImagesType } from "../../../../stores/imageDisplayStore";
-
-import GeneratedImage from "../../../molecules/generatedImage";
-
-import {
-  imageDisplayMain,
-  imageDisplayContainer,
-  imageDisplayCenter,
-  imageDisplayContent,
-} from './imageDisplay.css';
-
-
-import {
-  buttonStyle
-} from "../../../_recipes/button.css";
-
-export default function ImageDisplay({ info, data }: CompletedImagesType) {
-
-  const createFileName = () => {
-    const {
-      prompt,
-      negative_prompt,
-      seed,
-      num_inference_steps,
-      guidance_scale,
-      use_face_correction,
-      use_upscale,
-      width,
-      height,
-    } = info;
-
-    // Most important information is the prompt
-    let underscoreName = prompt.replace(/[^a-zA-Z0-9]/g, "_");
-    underscoreName = underscoreName.substring(0, 100);
-    // name and the top level metadata
-    let fileName = `${underscoreName}_Seed-${seed}_Steps-${num_inference_steps}_Guidance-${guidance_scale}`;
-    // Add the face correction and upscale
-    if (typeof use_face_correction == "string") {
-      fileName += `_FaceCorrection-${use_face_correction}`;
-    }
-    if (typeof use_upscale == "string") {
-      fileName += `_Upscale-${use_upscale}`;
-    }
-    // Add the width and height
-    fileName += `_${width}x${height}`;
-    // add the file extension
-    fileName += ".png";
-    // return fileName
-    return fileName;
-  };
-
-  const setRequestOption = useImageCreate((state) => state.setRequestOptions);
-
-  const _handleSave = () => {
-    const link = document.createElement("a");
-    link.download = createFileName();
-    link.href = data ?? "";
-    link.click();
-  };
-
-  const _handleUseAsInput = () => {
-    setRequestOption("init_image", data);
-  };
-
-  return (
-    <div className={imageDisplayMain}>
-
-      <div className={imageDisplayContainer}>
-
-        <div className={imageDisplayCenter}>
-
-          <div className={imageDisplayContent}>
-            <div>
-              <p> {info?.prompt}</p>
-              <p> {info?.negative_prompt}</p>
-              <div>
-                <button className={buttonStyle(
-
-                )} onClick={_handleSave}>Save</button>
-                <button className={buttonStyle(
-                  {
-                    color: "secondary",
-                    type: "outline",
-                  }
-                )} onClick={_handleUseAsInput}>Use as Input</button>
-              </div>
-            </div>
-            <GeneratedImage imageData={data} metadata={info}></GeneratedImage>
-          </div>
-
-        </div>
-
-      </div>
-
-    </div>
-  );
-};

ui/frontend/build_src/src/components/organisms/currentDisplay/index.tsx

@@ -1,58 +0,0 @@
-import React, { useEffect, useState } from "react";
-
-import { FetchingStates, useImageFetching } from "../../../stores/imageFetchingStore";
-import { useImageDisplay } from "../../../stores/imageDisplayStore";
-
-import { API_URL } from "../../../api";
-
-import {
-  currentDisplayMain,
-} from './currentDisplay.css';
-
-import ImageDisplay from "./imageDisplay";
-
-const IdleDisplay = () => {
-  return (
-    <h4 className="no-image">Try Making a new image!</h4>
-  );
-};
-
-const LoadingDisplay = ({ images }: { images: string[] }) => {
-
-  return (
-    <>
-      {images.map((image, index) => {
-        if (index == images.length - 1) {
-          return (
-            <img src={`${API_URL}${image}`} key={index} />
-          )
-        }
-      })
-      }
-    </>
-  );
-};
-
-export default function CurrentDisplay() {
-
-  const status = useImageFetching((state) => state.status);
-  const currentImage = useImageDisplay((state) => state.currentImage);
-
-  const progressImages = useImageFetching((state) => state.progressImages);
-
-  return (
-    <div className={currentDisplayMain}>
-
-      {(currentImage == null) && <IdleDisplay />}
-      {/* {(status === FetchingStates.FETCHING || status === FetchingStates.PROGRESSING) && <LoadingDisplay />}
-      {(currentImage != null) && <ImageDisplay info={currentImage?.info} data={currentImage?.data} />}  */}
-
-      {
-        (progressImages.length > 0)
-          ? <LoadingDisplay images={progressImages} />
-          : (currentImage != null) && <ImageDisplay info={currentImage?.info} data={currentImage?.data} />
-      }
-
-    </div>
-  );
-}

ui/frontend/build_src/src/components/organisms/currentInfo/currentInfo.css.ts

@@ -1,22 +0,0 @@
-import { style } from '@vanilla-extract/css'
-
-import {
-  card as cardStyles,
-} from '../../_recipes/card.css'
-
-export const currentInfoMain = style([
-  cardStyles(
-    {
-      backing: 'dark',
-    }
-  ),
-  {
-    // display: 'flex',
-    // flexDirection: 'column',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-    // height: '100%',
-    width: '250px',
-    padding: '0 0 0 0',
-  },
-])

ui/frontend/build_src/src/components/organisms/currentInfo/index.tsx

@@ -1,7 +0,0 @@
-import React from "react";
-import { currentInfoMain } from "./currentInfo.css";
-export default function CurrentInfo() {
-  return <div className={
-    currentInfoMain
-  }> current info</div>;
-}

ui/frontend/build_src/src/components/organisms/footerDisplay/footerDisplay.css.ts

@@ -1,59 +0,0 @@
-import { style, globalStyle } from "@vanilla-extract/css";
-
-import { vars } from "../../../styles/theme/index.css";
-
-export const FooterDisplayMain = style({
-  color: vars.colors.text.normal,
-  fontSize: vars.fonts.sizes.Caption,
-
-  display: "inline-block",
-  // marginTop: vars.spacing.medium,
-  // marginBottom: vars.spacing.medium,
-  // TODO move this to the theme
-  padding: vars.spacing.small,
-  boxShadow:
-    "0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15)",
-});
-
-export const CoffeeButton = style({
-  height: "23px",
-  transform: "translateY(25%)",
-});
-
-globalStyle(`${FooterDisplayMain} a`, {
-  color: vars.colors.link,
-  textDecoration: "none",
-});
-
-globalStyle(`${FooterDisplayMain} a:hover`, {
-  textDecoration: "underline",
-});
-
-globalStyle(`${FooterDisplayMain} a:visited`, {
-  color: vars.colors.link,
-});
-
-globalStyle(`${FooterDisplayMain} a:active`, {
-  color: vars.colors.link,
-});
-
-globalStyle(`${FooterDisplayMain} a:focus`, {
-  color: vars.colors.link,
-});
-
-globalStyle(`${FooterDisplayMain} p`, {
-  margin: vars.spacing.min,
-});
-
-// .footer-display {
-//   color: #ffffff;
-//   display: flex;
-//   flex-direction: column;
-//   align-items: center;
-//   justify-content: center;
-// }
-
-// #coffeeButton {
-//   height: 23px;
-//   transform: translateY(25%);
-// }

ui/frontend/build_src/src/components/organisms/footerDisplay/index.tsx

@@ -1,71 +0,0 @@
-import React from "react";
-
-import {
-  FooterDisplayMain,
-  CoffeeButton,
-} from "./footerDisplay.css";
-
-import { API_URL } from "../../../api";
-
-export default function FooterDisplay() {
-  return (
-    <div className={FooterDisplayMain}>
-      <p>
-        If you found this project useful and want to help keep it alive, please{" "}
-        <a
-          href="https://ko-fi.com/cmdr2_stablediffusion_ui"
-          target="_blank"
-          rel="noreferrer"
-        >
-          <img src={`${API_URL}/kofi.png`} className={CoffeeButton} />
-        </a>{" "}
-        to help cover the cost of development and maintenance! Thank you for
-        your support!
-      </p>
-      <p>
-        Please feel free to join the{" "}
-        <a
-          href="https://discord.com/invite/u9yhsFmEkB"
-          target="_blank"
-          rel="noreferrer"
-        >
-          discord community
-        </a>{" "}
-        or{" "}
-        <a
-          href="https://github.com/cmdr2/stable-diffusion-ui/issues"
-          target="_blank"
-          rel="noreferrer"
-        >
-          file an issue
-        </a>{" "}
-        if you have any problems or suggestions in using this interface.
-      </p>
-      <div id="footer-legal">
-        <p>
-          <b>Disclaimer:</b> The authors of this project are not responsible for
-          any content generated using this interface.
-        </p>
-        <p>
-          This 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, <br />
-          spread misinformation and target vulnerable groups. For the full list
-          of restrictions please read{" "}
-          <a
-            href="https://github.com/cmdr2/stable-diffusion-ui/blob/main/LICENSE"
-            target="_blank"
-            rel="noreferrer"
-          >
-            the license
-          </a>
-          .
-        </p>
-        <p>
-          By using this software, you consent to the terms and conditions of the
-          license.
-        </p>
-      </div>
-    </div>
-  );
-}