Commit Graph

230 Commits

Author SHA1 Message Date
cmdr2
a7fde73df4 Tabs to spaces in bootstrap scripts 2022-11-12 12:47:39 +05:30
cmdr2
d1c9db874f Set the PYTHONPATH right at the start, to prevent it from picking up a system-wide python 2022-11-11 11:37:15 +05:30
cmdr2
65587536ab Fix typo in binding of host/ip 2022-11-09 11:08:25 +05:30
cmdr2
ad31be8344 Fix 2022-11-09 11:05:07 +05:30
cmdr2
25815c81bf Bring back the configurable host/port 2022-11-09 11:03:03 +05:30
cmdr2
852a22f86d temporary rollback of configurable host/port 2022-11-09 10:58:25 +05:30
cmdr2
e22b171b7b
Merge pull request #445 from JeLuF/err-handle
Improve error handling
2022-11-09 10:08:55 +05:30
cmdr2
9bc7521de0 Make custom VAE an Image Setting, rather than a System Setting; Don't load a VAE into memory by default 2022-11-08 16:54:15 +05:30
cmdr2
842e7e559e
Update bootstrap.bat 2022-11-08 10:30:26 +05:30
JeLuF
a62ee7850b Merge branch 'err-handle' of github.com:JeLuF/stable-diffusion-ui into err-handle 2022-11-05 23:31:19 +01:00
JeLuF
d3a90ccc0d Windows error handling
- cd to the script location on start of 'Start Stable Diffusion UI.cmd'
- Bail out when downloading micromamba fails
- add env variables SD_UI_BIND_IP and SD_UI_BIND_PORT to configure uvicorn
2022-11-05 23:30:40 +01:00
JeLuF
46b13ee664
Merge branch 'cmdr2:main' into err-handle 2022-11-05 20:49:19 +01:00
JeLuF
cfa6dc7836 Add blank lines to error message 2022-11-05 19:02:19 +01:00
JeLuF
f969bfa7be More error handling, central error function 2022-11-05 18:59:59 +01:00
cmdr2
ea7006eec4 Set the PYTHONPATH before installation to prevent conda from knowing about any system-wide python installations (and skipping package installs due to that) 2022-11-02 19:45:49 +05:30
cmdr2
33e25d9241 Deduce the filename in developer_console.sh instead of hardcoding it 2022-10-29 20:25:11 +05:30
cmdr2
fc11018158 Re-download micromamba if necessary 2022-10-29 19:41:52 +05:30
Michael Nahkies
840348b4eb fix: change to the correct working directory
changes to the directory containing `start.sh` prior to activating the conda environment

this allows you to run the program without first changing to the correct directory, eg: `$ ~/bin/stable-diffusion-ui/start.sh`
2022-10-29 15:09:04 +05:30
Michael Nahkies
450fb2553c fix: change to the correct working directory
changes to the directory containing `start.sh` prior to activating the conda environment

this allows you to run the program without first changing to the correct directory, eg: `$ ~/bin/stable-diffusion-ui/start.sh`
2022-10-29 15:08:25 +05:30
cmdr2
a8c16e39b8 Support custom VAE files; Use vae-ft-mse-840000-ema-pruned as the default VAE, which can be overridden by putting a .vae.pt file inside models/stable-diffusion with the same name as the ckpt model file. The UI / System Settings allows setting the default VAE model to use 2022-10-28 20:06:44 +05:30
cmdr2
cf313939aa
Merge pull request #402 from cmdr2/beta
Retry micromamba download on windows
2022-10-27 19:50:12 +05:30
cmdr2
873d4bd3f2 Retry micromamba download on windows 2022-10-27 19:47:20 +05:30
cmdr2
f43f3fc84b
Merge pull request #401 from cmdr2/beta
Download micromamba again if it failed to download the first time
2022-10-27 16:07:10 +05:30
cmdr2
0e1fed86ba Download micromamba again if it failed to download the first time 2022-10-27 16:06:16 +05:30
JeLuF
6ba32b95f3
Undo curl change
#392 Resume Downloads
The retry options also don't work on some windows machines:
https://discord.com/channels/1014774730907209781/1014774732018683926/1034935751332347922
2022-10-27 00:26:24 +02:00
cmdr2
6d43e0951c
Update on_sd_start.sh 2022-10-27 00:49:32 +05:30
cmdr2
088c546bee
Merge pull request #394 from JeLuF/patch-4
Retry downloads on flaky internet connections
2022-10-26 17:36:46 +05:30
JeLuF
4994a7ac85
Update on_sd_start.sh 2022-10-26 13:27:49 +02:00
JeLuF
a959c69d32
Retry downloads for flaky internet connections
See issue #392
2022-10-26 13:26:19 +02:00
cmdr2
c8fc0bb4f5 Remove the extra python version print 2022-10-26 16:02:00 +05:30
cmdr2
7b9d18caea Report the python version after activating the SD environment, that log is not very useful otherwise 2022-10-26 16:00:21 +05:30
cmdr2
137e519b66 Move the installer activation to on_sd_start 2022-10-26 12:15:58 +05:30
cmdr2
f732fa9736 Use call to start the conda script; activate the installer env first even in the developer console 2022-10-25 20:26:46 +05:30
cmdr2
0c2d227da1 Activate the installer env while starting up, like the previous installer did in the start script 2022-10-25 19:21:26 +05:30
cmdr2
a281efef04 deactivate any pre-activated conda environments, by returning to (base) and then deactivating that. On Windows and Linux 2022-10-25 18:07:29 +05:30
cmdr2
538dcec348 deactivate any pre-activated conda environments before installing 2022-10-25 17:26:33 +05:30
cmdr2
0d38c8ae8f Bring back the post-installation test for torch 2022-10-25 16:38:08 +05:30
cmdr2
967c1a2da9 No need for conda 4.14, disable the broken test for torch 2022-10-25 15:42:22 +05:30
cmdr2
f3da326b77 Remove debug logging 2022-10-25 14:36:57 +05:30
cmdr2
153a6e2cb0 Temporarily disable sd_start for linux 2022-10-25 14:30:08 +05:30
cmdr2
95f37b9d36 Use conda 4.14 in the new installer as well (like the previous installer did) 2022-10-25 13:00:57 +05:30
cmdr2
60c37a1fc7 Set the PYTHONPATH before testing the SD installation 2022-10-25 12:48:56 +05:30
cmdr2
615c61e230 Fix a broken PYTHONPATH export in the linux script, used ; instead of : 2022-10-25 12:44:05 +05:30
cmdr2
8d1adf4f80 Fix the incorrect command used for downloading and extracting micromamba on linux/osx 2022-10-23 15:13:24 +05:30
cmdr2
d0b7f58e7c Fix a bug in the new linux installer's legacy path 2022-10-23 15:02:03 +05:30
cmdr2
461f618b8a Replace grep with findstr on Windows 2022-10-23 14:37:59 +05:30
cmdr2
5ff14d1fed Install conda only if it's not present in the legacy and new installer dir 2022-10-23 11:57:23 +05:30
cmdr2
80c9c1bb05 Install a new conda only if not already present locally 2022-10-23 11:36:31 +05:30
cmdr2
a111d9b18a Supress detached head warning 2022-10-23 11:28:08 +05:30
cmdr2
df14913c67 Always install conda, don't use the system's version 2022-10-23 11:16:28 +05:30
cmdr2
b6c6fef770 Use findstr instead of grep on windows 2022-10-23 10:47:44 +05:30
cmdr2
1a2f37b0ec Make the micromamba binary executable after download on linux 2022-10-23 10:38:01 +05:30
cmdr2
3772137c8f Include usr/bin in the installer PATH; newlines at the end of all files 2022-10-23 10:23:43 +05:30
cmdr2
338c2243e3 Newline after printing env info in developer scripts 2022-10-22 23:28:43 +05:30
cmdr2
e8d61225f5 Make the linux installer executable 2022-10-22 23:26:59 +05:30
cmdr2
cc356ce67d Initial commit of the new micromamba-based installer; This should work seamlessly for new and existing users; Also allows the installer to run on mac (but the installation will fail because the mac-specific environment.yaml hasn't been added yet) 2022-10-22 23:24:13 +05:30
cmdr2
14e88706df Set and use a local profile directory for new installations - does not affect existing installations 2022-10-18 09:46:25 +05:30
cmdr2
e96312b470 Update the troubleshooting link to the new wiki page 2022-10-17 15:16:31 +05:30
cmdr2
91fccc6691 Executable permission 2022-10-13 10:39:34 +05:30
cmdr2
399642f958 Fix the broken linux developer console script 2022-10-10 19:37:05 +05:30
cmdr2
ffcf46a371
Set the custom temp variable only while installing 2022-10-09 10:02:59 +05:30
cmdr2
fc5eedbef5
Update on_sd_start.bat 2022-10-09 09:56:44 +05:30
cmdr2
d78b6c4445 Revert "Revert "Revert "Disable the uvicorn check, seems to be failing incorrectly for some reason"""
This reverts commit 6e056bb337.
2022-10-08 22:45:43 +05:30
cmdr2
6e056bb337 Revert "Revert "Disable the uvicorn check, seems to be failing incorrectly for some reason""
This reverts commit b5c2c1009c.
2022-10-08 22:43:37 +05:30
cmdr2
b5c2c1009c Revert "Disable the uvicorn check, seems to be failing incorrectly for some reason"
This reverts commit e30aca7531.
2022-10-08 22:37:44 +05:30
cmdr2
e30aca7531 Disable the uvicorn check, seems to be failing incorrectly for some reason 2022-10-08 22:26:14 +05:30
cmdr2
1024da601d Set a custom temp path to workaround the pip bug 2022-10-08 12:06:11 +05:30
cmdr2
06c8a004d8 Remove the old dev console scripts 2022-10-07 19:52:31 +05:30
cmdr2
4ab90fb14d Merge branch 'main' of github.com:cmdr2/stable-diffusion-ui 2022-10-07 19:48:40 +05:30
cmdr2
54d8feeaf0 Rename dev console script 2022-10-07 19:48:24 +05:30
cmdr2
10012d7125
Merge branch 'main' into beta 2022-10-07 19:38:53 +05:30
cmdr2
d70ea854b1 Create the custom model instruction file even on existing installations 2022-10-07 19:36:18 +05:30
cmdr2
8c576ece28 Instructions for where to place the custom ckpt file 2022-10-07 19:33:52 +05:30
cmdr2
ab987e73c6 Copy the dev console script for linux on the first restart 2022-10-07 18:50:07 +05:30
cmdr2
201a053025 Support an arbitrary number of custom models, placed in the models/stable-diffusion folder. Shows an option in the UI to select which model to use 2022-10-06 14:28:02 +05:30
cmdr2
703f987825 Copy the dev console script on the first update. Temporary until enough people have this update 2022-10-06 11:58:32 +05:30
cmdr2
4e3d677d8e Developer console, to enter the activated conda environment easily for debugging and fixing the environnment 2022-10-06 11:58:27 +05:30
cmdr2
aab90130d2 Copy the dev console script on the first update. Temporary until enough people have this update 2022-10-06 11:25:14 +05:30
cmdr2
9321dfdd89 Developer console, to enter the activated conda environment easily for debugging and fixing the environnment 2022-10-06 10:37:41 +05:30
cmdr2
fcb41e30dc Fix a bug with the linux script, where the file size check would fail if the group name had spaces 2022-09-30 10:45:08 +05:30
cmdr2
1cdb456216 Fix a bug with the linux script, where the file size check would fail if the group name had spaces 2022-09-30 10:44:47 +05:30
cmdr2
30c46c0858 Missing changes from main in beta, bad merge 2022-09-27 14:18:56 +05:30
cmdr2
a821b309f7 Merge branch 'main' into beta 2022-09-27 13:28:31 +05:30
cmdr2
939dd0b207 Empty the post-activate hook only if it exists 2022-09-26 23:02:03 +05:30
cmdr2
b652d0fc65 Merge branch 'win-installer-no-activate' into beta 2022-09-26 20:12:55 +05:30
cmdr2
e67843638f Fix errors with the new installer 2022-09-26 20:11:33 +05:30
cmdr2
ca704e1d51 Revert "Merge pull request #250 from cmdr2/win-installer-no-activate"
This reverts commit 04eb356c89, reversing
changes made to 300159c03b.
2022-09-26 20:07:04 +05:30
cmdr2
04eb356c89
Merge pull request #250 from cmdr2/win-installer-no-activate
Merge the new Windows Installer scripts, that doesn't use a post-activate hook
2022-09-26 19:53:46 +05:30
cmdr2
300159c03b Temporarily disable the check for whitelisted ckpt weights 2022-09-26 19:40:52 +05:30
cmdr2
2a46f6b225 Make the new installer work with existing installations (made with the old installer) 2022-09-26 19:19:11 +05:30
cmdr2
1bcb6738bb Temporarily disable check for whether uvicorn is installed 2022-09-24 23:56:59 +05:30
cmdr2
d14a13fcaf Temporarily revert the System32 patch 2022-09-24 23:38:56 +05:30
cmdr2
5facba4419 [installer] No need to go back a folder now, we're already in the right location 2022-09-24 23:23:35 +05:30
cmdr2
b4282a03ca Merge branch 'main' into win-installer-no-activate 2022-09-24 22:57:38 +05:30
cmdr2
858a1c7ae0 Include C:\Windows\System32 in the path anyway, to avoid the errors some users have 2022-09-24 13:23:04 +05:30
cmdr2
8cb340be9d Merge branch 'main' into beta 2022-09-23 20:19:12 +05:30
cmdr2
b0c15bc430 Latest commit on basujindal's fork for the Linux version 2022-09-22 23:04:29 +05:30
cmdr2
7b520942dc Update to the latest commit on basujindal's SD fork; More VRAM garbage-collection; Speed up live preview by displaying only every 5th step 2022-09-22 22:14:25 +05:30
cmdr2
1c5097b81b Hotfix for pywavelet version, attempt 1 2022-09-16 00:36:31 +05:30
cmdr2
5337153761 Remove the use of activate.d for the windows installer, since it allows for easier debugging later on 2022-09-15 15:14:48 +05:30