holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,382 Commits 12 Branches 36 Tags 62 MiB
24b631500a
Commit Graph

161 Commits

Author SHA1 Message Date
cmdr2
347fa0fda1
Update on_sd_start.bat 2022-11-26 01:50:30 +05:30
cmdr2
91e4ccf6f8
Update on_sd_start.bat 2022-11-26 01:43:41 +05:30
cmdr2
642c114501 Working txt2img 2022-11-25 14:29:24 +05:30
cmdr2
02dd3e457d Tweaks to load sd1 models in sd2 code, typos 2022-11-25 13:57:15 +05:30
cmdr2
ea7b28c9d5 Placeholder changes for SD 2.0 support, haven't tested yet 2022-11-25 12:17:44 +05:30
cmdr2
daaa65dc0a Warn but don't fix whitespaces in a patch 2022-11-22 23:20:24 +05:30
cmdr2
5af84b8e90 Fix whitespace during git apply 2022-11-22 22:21:54 +05:30
cmdr2
d9b9f80a93 diffusion-kit upgrade 2022-11-22 17:39:51 +05:30
cmdr2
d429505b71 Update version of diffusion-kit 2022-11-22 17:14:20 +05:30
cmdr2
72ee708917 Remove the need to install realesrgan, gfpgan and certain specific package versions, since the new backend should install them directly 2022-11-22 16:50:10 +05:30
cmdr2
93bbfac29a Change the backend to a custom fork of SD, since basujindal's fork is no longer under development. This fork is intended to include the common models/tools used like RealESRGAN, GFPGAN, Codeformer etc, and is meant to be a community-developed project 2022-11-22 16:38:39 +05:30
cmdr2
87a7b70a27
Shell error code check 2022-11-22 10:40:20 +05:30
cmdr2
3bf5e11f94 Nowarn for fresh installation (git apply whitespace) 2022-11-21 17:19:55 +05:30
cmdr2
eef9af2266 Typo 2022-11-21 17:14:54 +05:30
cmdr2
8316a002da Don't warn about whitespace in the git patch application 2022-11-21 17:11:38 +05:30
cmdr2
5fe7807462 ERRORLEVEL is unreliable when conda is run 2022-11-21 12:38:46 +05:30
cmdr2
497e073a8c
Merge pull request #480 from JeLuF/patch-3 
Handle %TMP% and %TEMP%
 2022-11-21 12:34:31 +05:30
cmdr2
d4ce54a3c2
Merge pull request #521 from JeLuF/patch-4 
Add --whitespace=fix to git apply
 2022-11-21 12:33:04 +05:30
JeLuF
2b1f8533b0
Add --whitespace=fix to git apply 
For some users who have git preinstalled, `git apply` fails due to whitespace errors.

Aracon found that applying `--whitespace=fix` to the `git apply` invocation fixes the problem.
https://discord.com/channels/1014774730907209781/1036679816713359471/1037025435491516548

ryz confirmed that `--reject` wasn't needed for him to make it work, and this explanation from the "git apply" manpage suggests 
that we shouldn't include `--reject`:

> For atomicity, git apply by default fails the whole patch and does not touch the working tree when some 
> of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave 
> the rejected hunks in corresponding *.rej files.

After having a look at https://github.com/git/git/blob/master/apply.c, I think that they only check for `correct_ws_error` if they couldn't apply the patch. It doesn't impact 'normal' patching. If the patch can be applied, it will be done, and only if the apply fails, they'll check whether adding or removing WS might help. It should thus be save to be added and didn't produce any errors on my installation using SDUI-provided git.
 2022-11-20 23:07:44 +01:00
JeLuF
5ebc6b698c Rewrite easy_install.pth on each start 
Fixes GFPGANer errors when the env has been moved.
 2022-11-20 18:48:48 +01:00
cmdr2
462af9989a
Merge pull request #491 from JeLuF/inst1 
Fix typo in the installer's error messages
 2022-11-18 17:07:06 +05:30
JeLuF
3e18f2f09c Picklescan of model files 
During getModel(), the server picklescans the model files for potential
malicious code in the pickled python objects. If a malicious file is
found, the web UI will show a big red error message, the makeImage
button will be disabled, and the user must remove the malicious file
and reload the UI page.
 2022-11-16 22:34:02 +01:00
JeLuF
add09e52ef Fix typo in the installer's error messages 2022-11-16 20:56:11 +01:00
cmdr2
e99d54d1f6 Merge main 2022-11-16 11:19:10 +05:30
JeLuF
7f436061b8
❓RFC: how to handle %TMP% and %TEMP% - UNTESTED 
`conda activate` fails if %TMP% or %TEMP% contains spaces. So instead of setting the temp variables in the installer steps, we need to set it at the beginning of the script. 

Would this break anything? 
https://discord.com/channels/1014774730907209781/1042190192049668106/1042190192049668106
 2022-11-15 23:29:32 +01:00
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
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
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
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
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
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
088c546bee
Merge pull request #394 from JeLuF/patch-4 
Retry downloads on flaky internet connections
 2022-10-26 17:36:46 +05:30
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
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
461f618b8a Replace grep with findstr on Windows 2022-10-23 14:37:59 +05:30
cmdr2
a111d9b18a Supress detached head warning 2022-10-23 11:28:08 +05:30
cmdr2
b6c6fef770 Use findstr instead of grep on windows 2022-10-23 10:47:44 +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
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
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
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
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
30c46c0858 Missing changes from main in beta, bad merge 2022-09-27 14:18:56 +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
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
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
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
2587727087 Merge branch 'main' of github.com:cmdr2/stable-diffusion-ui 2022-09-15 13:21:14 +05:30
cmdr2
4ccf26c23f Patch the openAI code only if it exists 2022-09-15 13:19:42 +05:30
cmdr2
476d6fe85d Force-install antlr4, since pip (incorrectly) skips installing it occasionally 2022-09-15 12:10:21 +05:30
cmdr2
e59c66ae26 Backend changes to support stopping a task mid-way. Uses a custom patch for the stable-diffusion codebase, to make it call a callback for DDIM 2022-09-13 19:59:41 +05:30
cmdr2
e928fee26f Log python version 2022-09-13 11:38:28 +05:30
cmdr2
db1fbad0db Force install basicsr, investigating a support query 2022-09-13 11:00:55 +05:30
cmdr2
852875b440 Try force installing basicsr 1.4.2 2022-09-12 23:42:48 +05:30
cmdr2
4444525c01 Set the PYTHONPATH explicitly for the conda env 2022-09-12 23:06:51 +05:30
cmdr2
a955730086 Allow using waifu 7 GB weights 2022-09-12 20:44:54 +05:30
cmdr2
a32a58bd0f Allow using the 7 GB model as well 2022-09-12 17:36:50 +05:30
cmdr2
ef46603f4e Tell conda to skip any pre-installed packages in the users' home/.local folder, since that can cause conflicts 2022-09-12 16:39:23 +05:30
cmdr2
cd1db214b0 Fix 2022-09-10 00:34:51 +05:30
cmdr2
622322c878 Fix 2022-09-10 00:23:19 +05:30
cmdr2
7c580e276a Merge branch 'main' into beta 2022-09-10 00:14:51 +05:30
cmdr2
927013cd57 Hotfix for broken openAI dependency - bad json file 2022-09-10 00:13:16 +05:30
cmdr2
65b2c056c6 Revert "Revert "Revert "Revert "Merge pull request #112 from cmdr2/develop"""" 
This reverts commit 0dd38870e0.
 2022-09-09 21:05:24 +05:30
cmdr2
0d33964a03 Fix a transient bug in the installer code (windows) where a script overwriting itself would cause problems 2022-09-09 17:24:30 +05:30
cmdr2
0dd38870e0 Revert "Revert "Revert "Merge pull request #112 from cmdr2/develop""" 
This reverts commit 788dcbf471.
 2022-09-08 23:45:21 +05:30
cmdr2
a4305540f0 use a certain working version of SD 2022-09-08 23:23:02 +05:30
cmdr2
788dcbf471 Revert "Revert "Merge pull request #112 from cmdr2/develop"" 
This reverts commit 9051bf6e68.
 2022-09-08 23:19:35 +05:30
cmdr2
9051bf6e68 Revert "Merge pull request #112 from cmdr2/develop" 
This reverts commit 598de3697d, reversing
changes made to 0eae17075f.
 2022-09-08 22:54:54 +05:30
cmdr2
253e75c747 v2.1 - Face correction (GFPGAN) and Upscaling (RealESRGAN) 2022-09-08 21:20:27 +05:30
cmdr2
a1908de302 Also check for antlr4 during the post-install tests 2022-09-07 15:49:14 +05:30
cmdr2
c30678af98 Fix the link for the troubleshooting page in all the scripts 2022-09-07 15:35:19 +05:30
cmdr2
c4349951da Create a troubleshooting page; Clearer troubleshooting steps in the installation error messages 2022-09-07 14:44:01 +05:30
cmdr2
7388c13c63 Check if the installation dir isn't at the top of a drive (on windows) and show a warning 2022-09-07 13:02:41 +05:30
cmdr2
0d9c8a804d Check the exact file size for the model file before allowing the installer to continue 2022-09-07 11:51:12 +05:30