Commit graph

1945 commits

Author SHA1 Message Date
Liam
981fe9c4a3 Merge remote-tracking branch 'upstream/master' into token_count 2022-09-27 16:37:24 -04:00
Liam
5034f7d759 added token counter next to txt2img and img2img prompts 2022-09-27 15:56:18 -04:00
Bernard Maltais
e258f89080 Fix file name 2022-09-27 15:31:00 -04:00
Bernard Maltais
20b41b7be7 (feat): Rework Checkpoint Merger UI for better clarity
- Rename variables to better align with field input
- Improve merged checkpoint output file name
2022-09-27 15:21:25 -04:00
AUTOMATIC1111
f2a4a2c3a6
Merge pull request #1165 from baumandm/patch-1
Fix downssample typo in options
2022-09-27 20:57:28 +03:00
AUTOMATIC1111
a902cbff4f
Merge pull request #1166 from bmaltais/model-merge-upd
Add interpolation method and weight to merged model output filename
2022-09-27 20:55:54 +03:00
AUTOMATIC1111
ca358c1451
Merge pull request #1170 from offshore/patch-1
Fix COMMANDINE_ARGS -> COMMANDLINE_ARGS
2022-09-27 20:54:50 +03:00
d8ahazard
31ad536c33 Remove debugging message 2022-09-27 11:05:25 -05:00
d8ahazard
5756d517a6 Merge remote-tracking branch 'upstream/master' into ModelLoader 2022-09-27 11:02:41 -05:00
d8ahazard
11875f5863 Use model loader with stable-diffusion too.
Hook the model loader into the SD_models file.
Add default url/download if checkpoint is not found.
Add matching stablediffusion-models-path argument.
Add message that --ckpt-dir will be removed in the future, but have it pipe to stablediffusion-models-path for now.
Update help strings for models-path args so they're more or less uniform.
Move sd_model "setup" call to webUI with the others.
Ensure "cleanup_models" method moves existing models to the new locations, including SD, and that we aren't deleting folders that still have stuff in them.
2022-09-27 11:01:13 -05:00
Alex Offshore
b8bb14960a
Fix variable name typo in error message for launch.py
COMMANDINE_ARGS -> COMMANDLINE_ARGS
2022-09-27 17:47:07 +03:00
Bernard Maltais
0bd8aa937f Add interpolation method and weight to output filename 2022-09-27 10:29:52 -04:00
Dave Bauman
c055132606
Fix downssample typo in options
Updated `downssample` to `down-sample`, matching spelling in other places.
2022-09-27 09:50:06 -04:00
AUTOMATIC
ada901ed66 added console outputs, more clear indication of progress, and ability to specify full filename to checkpoint merger
restore "Loading..." text
2022-09-27 10:44:00 +03:00
AUTOMATIC1111
a9dc307a21
Merge pull request #1066 from moorehousew/master
Add support for checkpoint merging
2022-09-27 09:59:37 +03:00
AUTOMATIC1111
dbe072dcff
Merge pull request #1126 from AUTOMATIC1111/notification-sound
adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013)
2022-09-27 09:57:16 +03:00
DepFA
adbd26a68f add missing s_tmax 2022-09-27 09:30:45 +03:00
DepFA
48d5796f0d pass eta to tex2img sampler 2022-09-27 09:30:45 +03:00
DepFA
76d6f7b407 Add DDIM Eta to txt2img in xy_grid 2022-09-27 09:30:45 +03:00
DepFA
61585e5778 rename DDIM eta label 2022-09-27 09:30:45 +03:00
DepFA
fc2aa6b8f3 Add extra sampler params to xy_grid 2022-09-27 09:30:45 +03:00
DepFA
a860839f1f take extra sampler properties from StableDiffusionProcessing 2022-09-27 09:30:45 +03:00
DepFA
4ea36a37d6 add sampler properties to StableDiffusionProcessing and Processed 2022-09-27 09:30:45 +03:00
DepFA
2ab3d593f9 pass extra KDiffusionSampler function parameters 2022-09-27 09:30:45 +03:00
DepFA
6b78833e33 Add extra kdiffusion parameters 2022-09-27 09:30:45 +03:00
DepFA
ed5736139c pass ddim_eta and ddim_discretize 2022-09-27 09:30:45 +03:00
DepFA
619668ccfe Add options for exposed ddim sampler params
ddim_eta & ddim_discretize
2022-09-27 09:30:45 +03:00
DepFA
175baaaca2 xy_grid - Show blank cells when grid is incomplete 2022-09-27 09:06:44 +03:00
48DESIGN
e4145c8453
Merge branch 'master' into notification-sound 2022-09-27 08:05:19 +02:00
Connum
c0b1177a32 refactored image paste handling to fill unset images successively, then replace last existing image (fixes #981) 2022-09-27 08:59:40 +03:00
Daniel
8dcac9ac81 Grids saving to subdirectory when setting unchecked
Fixed grids saving to subdirectory when the setting is unchecked but "save images to subdirectory" was checked.
2022-09-27 08:58:47 +03:00
Martin Cairns
258a2d4f06 Add option to img2imgalt.py to use sigma adjustment instead of original method for #736 2022-09-27 08:53:35 +03:00
Alexandre Simard
c74becca23 Solve issue #962
Fix by @MrAcademy
2022-09-27 08:52:43 +03:00
DepFA
16e7ac09df job_timestamp initialization change 2022-09-27 08:51:59 +03:00
Alexandre Simard
9e737cbadc Solve issue #962
Fix by @MrAcademy
2022-09-26 17:18:57 -04:00
Connum
2846ca5702 adds support for a notification.mp3 in the root directory that will play upon completion (fixes #1013) 2022-09-26 22:57:31 +02:00
d8ahazard
f860f94c64 Cleanup gitignore, old files 2022-09-26 10:34:26 -05:00
d8ahazard
8604e469fd Update .gitignore 2022-09-26 10:30:39 -05:00
d8ahazard
7d5c29b674 Cleanup existing directories, fixes 2022-09-26 10:27:18 -05:00
William Moorehouse
dc11748dea Added smoothstep interpolation to checkpoint merging 2022-09-26 10:50:21 -04:00
d8ahazard
740070ea9c Re-implement universal model loading 2022-09-26 09:29:50 -05:00
d8ahazard
bfb7f15d46 Rename swinir -> swinir_model 2022-09-26 09:29:22 -05:00
d8ahazard
bff8d0ce42 Fix swinir arch name 2022-09-26 09:27:50 -05:00
tateisu
78d6aef302 use strftime. update hints.js 2022-09-26 16:24:21 +03:00
tateisu
b39f06cea7 add [datetime] to image file name pattern 2022-09-26 16:24:21 +03:00
DepFA
e61da308ba Disable sentry logging 2022-09-26 16:19:47 +03:00
DepFA
b8a8f749ef Update webui.bat 2022-09-26 16:19:47 +03:00
Liam
db4ab47f09 copy over fields when sending to img2img: https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/1029 2022-09-26 08:33:02 +03:00
William Moorehouse
91643f651d Add support for checkpoint merging 2022-09-25 19:22:12 -04:00
AUTOMATIC
ca3e5519e8 Merge remote-tracking branch 'origin/master' 2022-09-25 19:45:22 +03:00