d8ahazard
3665551b12
Merge branch 'master' of https://github.com/d8ahazard/stable-diffusion-webui
2022-09-30 12:51:57 -05:00
d8ahazard
8f1d412e7b
Fix BSRGAN Model loading.
2022-09-30 12:51:54 -05:00
d8ahazard
2162be514a
Merge branch 'master' into master
2022-09-30 11:33:41 -05:00
AUTOMATIC
3a876b16a9
Merge remote-tracking branch 'origin/master'
2022-09-30 18:56:23 +03:00
AUTOMATIC
4794202ebc
hello #1109
2022-09-30 18:56:10 +03:00
AUTOMATIC
ac21d308cd
fix for one error with BSRGAN, though it fails to work anyway #1109
2022-09-30 18:55:46 +03:00
AUTOMATIC
43c87ef0fc
change default inpaint mode to original
2022-09-30 18:07:49 +03:00
d8ahazard
9fc1e49bd2
Set default value for ckpt-dir
2022-09-30 09:38:57 -05:00
d8ahazard
f71d02b85f
Remove unused LDSR opt
2022-09-30 09:29:31 -05:00
d8ahazard
5d52231bcb
Logging....
...
Cleanup. Sorry.
2022-09-30 09:28:48 -05:00
d8ahazard
ca87c09c0e
Fix recursive model loading
...
Ensure we find checkpoints within subdirectories.
2022-09-30 09:28:28 -05:00
d8ahazard
19eb1467f1
Fix BSRGAN variable not found.
2022-09-30 09:05:00 -05:00
d8ahazard
99aa132df7
Remove useless print message
2022-09-30 08:56:39 -05:00
d8ahazard
8d60645106
Fix model paths, ensure we have the right files.
...
Also, clean up logging in the ldsr arch file.
2022-09-30 08:55:04 -05:00
d8ahazard
64c6b13312
Remove LDSR project.yaml if too large.
...
If we accidentally downloaded the wrong file and saved it as project.yaml, this will delete it so it can be re-downloaded.
2022-09-30 08:41:25 -05:00
d8ahazard
41f9449d96
Fix LDSR YAML path
2022-09-30 08:33:06 -05:00
AUTOMATIC
980cd1697a
prevent neural network resizing when it is not necessary #1109
2022-09-30 14:23:41 +03:00
AUTOMATIC
98cc6c6e74
add embeddings dir
2022-09-30 14:16:26 +03:00
RnDMonkey
5c0c778a65
fixed so that {prompt} can be anywhere in style
2022-09-30 13:00:43 +03:00
RnDMonkey
ff4df06c57
refined [styles] pattern and added [prompt_no_styles]
2022-09-30 13:00:43 +03:00
AUTOMATIC
b60cd0809f
return the dropdown that mysteriously disappeared
2022-09-30 12:56:36 +03:00
AUTOMATIC
9a54077d4d
repair broken highres fix #1109
2022-09-30 12:26:41 +03:00
AUTOMATIC
cef838a6ab
revert the annotation not supported by old pythons
2022-09-30 12:15:29 +03:00
AUTOMATIC
d1f098540a
remove unwanted formatting/functionality from the PR
2022-09-30 11:42:40 +03:00
AUTOMATIC
2552204fcb
fix for broken codeformer in PR
2022-09-30 11:03:00 +03:00
AUTOMATIC
aec811c5e6
undo upscaler model filename tampering
2022-09-30 10:52:45 +03:00
AUTOMATIC
a5e7b371d6
fix the bug with broken rescaling in PR
2022-09-30 10:38:48 +03:00
AUTOMATIC
8f1b315318
fix bugs in the PR
2022-09-30 09:46:52 +03:00
AUTOMATIC1111
25414bcd05
Merge pull request #1109 from d8ahazard/ModelLoader
...
Model Loader, Fixes
2022-09-30 09:35:58 +03:00
AUTOMATIC
f80c3696f6
fix the sys not found error when importing sd_samplers that appeared after PR
2022-09-30 08:21:05 +03:00
C43H66N12O12S2
28307a9f10
force usage of cloned k-diffusion
2022-09-30 07:57:39 +03:00
DepFA
ebd2c48115
return shortest checkpoint title match
2022-09-30 07:37:05 +03:00
DepFA
642b7e333e
add get_closet_checkpoint_match
2022-09-30 07:37:05 +03:00
d8ahazard
435fd2112a
Fixes, cleanup.
2022-09-29 19:59:53 -05:00
d8ahazard
d73741794d
Merge remote-tracking branch 'upstream/master' into ModelLoader
2022-09-29 19:59:36 -05:00
d8ahazard
0dce0df1ee
Holy $hit.
...
Yep.
Fix gfpgan_model_arch requirement(s).
Add Upscaler base class, move from images.
Add a lot of methods to Upscaler.
Re-work all the child upscalers to be proper classes.
Add BSRGAN scaler.
Add ldsr_model_arch class, removing the dependency for another repo that just uses regular latent-diffusion stuff.
Add one universal method that will always find and load new upscaler models without having to add new "setup_model" calls. Still need to add command line params, but that could probably be automated.
Add a "self.scale" property to all Upscalers so the scalers themselves can do "things" in response to the requested upscaling size.
Ensure LDSR doesn't get stuck in a longer loop of "upscale/downscale/upscale" as we try to reach the target upscale size.
Add typehints for IDE sanity.
PEP-8 improvements.
Moar.
2022-09-29 17:46:23 -05:00
Justin Maier
a112168d28
Save parameters as comments when saving as jpg
2022-09-29 19:07:29 +03:00
Justin Maier
ca5901b5c8
Save should use desired sample format fixes #1028
2022-09-29 19:07:29 +03:00
AUTOMATIC
c715ef04d1
fix for incorrect model weight loading for #814
2022-09-29 15:40:28 +03:00
C43H66N12O12S2
965dcf4469
improve code quality
2022-09-29 13:52:51 +03:00
C43H66N12O12S2
b05355770c
add new samplers
2022-09-29 13:52:51 +03:00
WDevelopsWebApps
f28ce3e3a1
Merge branch 'master' into saving
2022-09-29 12:19:13 +02:00
Hanusz Leszek
be5555fce4
drop the print
2022-09-29 12:48:42 +03:00
Hanusz Leszek
e9919f2ab7
Sort scripts loading order
2022-09-29 12:48:42 +03:00
safentisAuth
66fed8ffb8
Add custom name and try-except
2022-09-29 12:41:47 +03:00
Michoko
819fd3af40
Add output folder icons
...
Changed the hidden element class name to a more generic one, so people can reuse it if they want to hide further elements in the future
2022-09-29 12:10:00 +03:00
Michoko
02c4b757b6
Add output folder icons
...
Handling of the --hide-ui-dir-config flag and added multi-platform code for opening a folder
2022-09-29 12:10:00 +03:00
Michoko
f8acbb8f88
Add output folder icons
...
Adds icons on the first 3 tabs to directly open the corresponding images output directory
2022-09-29 12:10:00 +03:00
AUTOMATIC
4127f4aff8
fix program breaking on empty prompt
2022-09-29 11:39:55 +03:00
AUTOMATIC
c1c27dad3b
new implementation for attention/emphasis
2022-09-29 11:31:48 +03:00
AUTOMATIC
29ce8a687d
remove unneded debug print
2022-09-29 08:03:23 +03:00
William Moorehouse
041d2aefc0
Respect --ckpt-dir command-line argument when merging models ( #1261 )
...
* Update .gitignore to ignore *all* checkpoint files in /models
* Fixed typo in UI
2022-09-29 01:00:48 +03:00
AUTOMATIC
7acfaca05a
update lists of models after merging them in checkpoints tab
...
support saving as half
2022-09-29 00:59:44 +03:00
AUTOMATIC
791808c890
correctly list and display model names for #1261
2022-09-29 00:21:54 +03:00
AUTOMATIC
d62954c2bc
fix broken DDIM with img2img
2022-09-28 22:30:52 +03:00
AUTOMATIC
a703f56d73
clone k-diffusion instead of installing it via pip, and do not install its requirements.txt
2022-09-28 21:38:26 +03:00
AUTOMATIC1111
278e7c7114
Merge pull request #1194 from liamkerr/token_count
...
Token count
2022-09-28 19:22:55 +03:00
AUTOMATIC
1deac2b645
do nor add log messages to saved iamge parameters
2022-09-28 18:20:30 +03:00
AUTOMATIC
d64b451681
added support for automatically installing latest k-diffusion
...
added eta parameter to parameters output for generated images
split eta settings into ancestral and ddim (because they have different default values)
2022-09-28 18:09:06 +03:00
AUTOMATIC
9be0d1b89e
Merge remote-tracking branch 'origin/master'
2022-09-28 17:05:32 +03:00
AUTOMATIC
aea5b2510e
save parameters for images when using the Save button.
2022-09-28 17:05:23 +03:00
Liam
7ca9858c4c
removed unused import; now using javascript to watch prompt textarea
2022-09-28 09:43:54 -04:00
Bernard Maltais
228a2f30e7
Remove unintended code commit for this PR
2022-09-28 08:56:07 -04:00
Bernard Maltais
fe2f0e1729
Adding support for inverse sigmoid interpolation
2022-09-28 08:52:46 -04:00
Bernard Maltais
c3bcc7e9fc
Switch active checkpoint selection to dropdown
...
- Provides a better user experience
- Better suited to variable list of options
- Keep the UI "stable" as list contract or expand
2022-09-28 07:07:19 -04:00
WDevelopsWebApps
03ee67bfd3
add advanced saving for save button
2022-09-28 10:53:40 +02:00
AUTOMATIC
2ab64ec81a
emergency fix for #1199
2022-09-28 10:49:07 +03:00
AUTOMATIC1111
15f333a266
Merge pull request #1185 from bmaltais/checkpoint-merger-ui-improvement
...
(feat): Rework Checkpoint Merger UI for better clarity and usability
2022-09-28 08:42:26 +03:00
Bernard Maltais
4c9c2a6702
-Fix interp_amount rounding in filename
...
-Sort list of checkpoints in list
2022-09-27 22:16:25 -04:00
C43H66N12O12S2
047ca73388
Update shared.py
2022-09-28 05:11:40 +03:00
C43H66N12O12S2
5391c0bf3e
Update processing.py
2022-09-28 05:11:03 +03:00
C43H66N12O12S2
8644e494be
add eta to k ancestral
2022-09-28 05:09:22 +03:00
Bernard Maltais
8c48ede135
Fix variable conversion code issue
2022-09-27 21:34:24 -04:00
Bernard Maltais
d641af6a7d
- Add gradio dropdown list to select checkpoints
...
- Update checkpoint model fields labels
2022-09-27 21:09:28 -04:00
Bernard Maltais
591c138e32
-Add gradio dropdown list to select checkpoints to merge
...
-Update the name of the model feilds
-Update the associated variable names
2022-09-27 21:08:07 -04:00
Liam
e5707b66d6
switched the token counter to use hidden buttons instead of api call
2022-09-27 19:29:53 -04:00
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
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
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
61585e5778
rename DDIM eta label
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
48DESIGN
e4145c8453
Merge branch 'master' into notification-sound
2022-09-27 08:05:19 +02: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
