Commit Graph

255 Commits

Author SHA1 Message Date
EyeDeck
7ed044400e
Merge branch 'hlky:master' into master 2022-08-25 08:31:59 -04:00
EyeDeck
f63b294b87 add missing selfs 2022-08-25 08:31:44 -04:00
JohannesGaessler
0d133e05f4 Scripting support for txt2img 2022-08-25 14:20:29 +02:00
hlky
94b73d82c0
Merge pull request #20 from EyeDeck/master
🔥 🔥 Workaround for Gradio server hanging on keyboard interrupt 🔥 🔥  🥇
2022-08-25 13:14:39 +01:00
EyeDeck
5e9ed5961d Workaround for Gradio server hanging on keyboard interrupt
Moved the demo.launch() call to start up a new thread, so we can kill the process ourselves on keyboard interrupt
2022-08-25 08:08:24 -04:00
hlky
a6f80800f3
Merge pull request #19 from hlky/loopback-mask-fix
loopback-mask-fix 🔥 
2022-08-25 11:54:26 +01:00
hlky
2b264de644
Update webui.py 2022-08-25 11:40:01 +01:00
hlky
0e53541a4b
Merge pull request #17 from EyeDeck/master
The same PR I made last time
2022-08-25 10:53:31 +01:00
EyeDeck
67130cf1ff Update webui.py 2022-08-25 04:12:10 -04:00
EyeDeck
60cd83aa03 Fix crash when cfg_scale == 1.0 2022-08-25 02:28:01 -04:00
EyeDeck
13c818053a Update webui.py
the same commit I made last time
2022-08-25 01:47:01 -04:00
hlky
c2ccff1684
🐸 work WITHOUT a mask
keep_mask default should be FALSE
🐸
2022-08-25 06:06:54 +01:00
hlky
e34c6a8b7e
,,,,,, 🐸 👎 2022-08-25 06:01:15 +01:00
hlky
58f11b34e8
🐸 🐸 🐸 2022-08-25 05:52:17 +01:00
hlky
2f2d78956f
Revert "Revert "Update webui.py""
This reverts commit 9c7af7a3d0.
2022-08-25 05:44:53 +01:00
hlky
5c8063bc2a
Update webui.py 2022-08-25 05:43:05 +01:00
hlky
9c7af7a3d0
Revert "Update webui.py"
This reverts commit 5d452710b1.
2022-08-25 05:39:41 +01:00
hlky
8eddb489ee
Merge pull request #16 from EyeDeck/master
Update webui.py
2022-08-25 05:33:46 +01:00
EyeDeck
5d452710b1 Update webui.py
Fix CheckboxGroup read error
2022-08-25 00:25:38 -04:00
hlky
d2968f4089
pr fix 🐸
reeee
2022-08-25 05:17:42 +01:00
hlky
07edcd9a92
Merge pull request #14 from EyeDeck/master
UI tweaks 👑 🔥
2022-08-25 04:48:46 +01:00
EyeDeck
85a905f757
Merge branch 'hlky:master' into master 2022-08-24 23:44:25 -04:00
hlky
92661ba475
pr fix reeeee 🐸 2022-08-25 04:39:32 +01:00
EyeDeck
0ec5bd9f91 Merge branch 'master' of https://github.com/EyeDeck/stable-diffusion-webui 2022-08-24 23:36:40 -04:00
EyeDeck
98ec85da40 UI tweaks
Made a handful of UI tweaks:
- changed literal 'random' default seed to a blank (more intuitive I think, also a blank previously behaved the same as '0')
- moved toggles into a Gradio CheckboxGroup (somewhat subjective, but saves a little vertical space in the UI, and makes it easier to adjust toggles in code)
- changed default CFG scale to 7.5 and 5.0 to match official txt2img and img2img (the waifu-diffusion fork this ultimately borrows from changed them to 7.0 for some reason)
- raised some of the default limits somewhat:
	- Steps from 150 -> 250 (the official command line version crashes at exactly 251, so seems like a reasonable limit)
	- ~~Batch count 16 -> 40~~ Got changed to 250 before I committed anyway
	- CFG scale 15.0 -> 30.0 (above 15 doesn't seem to affect k-diffusion much, but significantly impacts DDIM and PLMS up to about 50—maybe should be - higher?)
- inverted toggle names for clarity (both default on):
	- 'Skip grid' -> 'Save grid'
	- 'Skip save individual images' -> 'Save individual images'

Also:
- added separate --outdir_txt2img and --outdir_img2img command line args, which take priority over --outdir
- fixed flagging, some var names were only partially updated previously—note that CSV indicies were changed, so old log files will need deleted/renamed/etc
2022-08-24 23:31:49 -04:00
hlky
72e58a3af6
Merge pull request #13 from bryanlyon/patch-1
Fix GFPGAN color errors.  🔥 🥇
2022-08-25 04:28:07 +01:00
hlky
5240a47ee6
k-samplers fix 🔥
now THIS should fix it
2022-08-25 04:19:55 +01:00
bryanlyon
9caf41f5a1
Fix GFPGAN color errors.
GFPGAN requires images in BGR color space.  Using the wrong color space leads to color-shift of the face after it's put through GFPGAN.  To fix, convert the color space before sending to GFPGAN and again when it's returned.
2022-08-24 20:18:29 -07:00
hlky
07e4d738d5
Fix default selection of sampling checkbox
k-lms -> k_lms
2022-08-25 04:07:14 +01:00
hlky
77c06f829f
KDiffusionSampler fix 2022-08-25 03:55:15 +01:00
hlky
7143234939
description k_lms = default k-diffusion + max batch size increase
more k-diffusion samplers available now so clarify that k_lms is the same as was used before
2022-08-25 03:44:13 +01:00
hlky
3be4ce4fbd
Merge branch 'master' of https://github.com/hlky/stable-diffusion-webui 2022-08-25 03:31:44 +01:00
hlky
1ca4a3ec42
other k-diffusion samplers 2022-08-25 03:31:40 +01:00
hlky
905786bf47
Merge pull request #11 from EyeDeck/master
Fix crash display
2022-08-25 01:44:15 +01:00
EyeDeck
0afb4ca285 Fix crash display
Output tuple was changed;
also, fix text so it isn't black-on-black with light UI theme
2022-08-24 20:36:28 -04:00
hlky
a6452fbaa5
Flagging fix
🚩 🚩 🚩 🚩
2022-08-25 01:28:23 +01:00
hlky
2d87a58ebe
Merge branch 'master' of https://github.com/hlky/stable-diffusion-webui 2022-08-25 00:18:57 +01:00
hlky
e2941dcbdf
relauncher.py sync 2022-08-25 00:17:50 +01:00
hlky
4b81d08c0c
Merge pull request #9 from hlky/img2img-mask
img2img-mask 💯 🔥
2022-08-25 00:10:41 +01:00
hlky
9927f7c38a
img2img-mask
Great work, thanks anon!! 💯 🔥
2022-08-25 00:03:47 +01:00
hlky
8d6c046a08
Textual inversion support
Enabled only if textual-inversion exists.  i.e.
> config (configs/stable-diffusion/v1-inference.yaml) is updated for textual inversion
> ldm/modules/embedding_manager.py exists (copied from textual-inversion repo)
> ldm/data/personalized.py exists (copied from textual-inversion repo)
> ldm/data/personalized_style.py exists (copied from textual-inversion repo)
> ldm/models/diffusion/ddpm.py is replaced with textual-inversion version
> ldm/util.py is replaced with textual-inversion version

Without textual-inversion installed script will function as normal

Please note:
Once textual-inversion changes have been applied do not remove personalization_config from config .yaml without also replacing the files changed with the original versions
2022-08-24 22:28:32 +01:00
hlky
22e225ad1e
Queue
Fix for Issue#7
2022-08-24 21:38:29 +01:00
hlky
e726be2965
fix ? sync workflow 2022-08-24 20:50:34 +01:00
hlky
4c8cc9d881
sync workflow
sync webui.py to hlky/stable-diffusion
2022-08-24 20:46:42 +01:00
hlky
b00be410c7
Merge pull request #5 from xraxra/master
Prompt Weighting
2022-08-24 19:15:39 +01:00
xra
c099aa8185 prompt weighting
was missing the grid gradio options last time
2022-08-25 02:58:45 +09:00
xra
c861d42feb Merge branch 'master' of https://github.com/xraxra/stable-diffusion-webui
# Conflicts:
#	webui.py
2022-08-25 02:54:40 +09:00
xra
f502897a06 updated weights code to match latest 2022-08-25 02:51:28 +09:00
hlky
75a7cadf3b
Revert "Merge pull request #4 from xraxra/master"
This reverts commit eae4ec82be, reversing
changes made to 5ae104bd99.
2022-08-24 18:23:52 +01:00
hlky
eae4ec82be
Merge pull request #4 from xraxra/master
weighted prompts similar to Midjourney
2022-08-24 18:15:04 +01:00