399720dac2
update prompt token counts after using the paste params button
2023-01-30 01:03:31 +03:00
f91068f426
change disable_weights_auto_swap to true by default
2023-01-30 00:37:26 +03:00
938578e8a9
make it so that setting options in pasted infotext (like Clip Skip and ENSD) do not get applied directly and instead are added as temporary overrides
2023-01-30 00:25:30 +03:00
00dab8f10d
remove Batch size and Batch pos from textinfo (goodbye)
2023-01-29 11:53:24 +03:00
aa6e55e001
do not display the message for TI unless the list of loaded embeddings changed
2023-01-29 11:53:05 +03:00
920fe8057c
fixes #7284 btn unbound error
2023-01-29 03:36:16 -05:00
8d7382ab24
add buttons for auto-search in subdirectories for extra tabs
2023-01-29 11:34:58 +03:00
e8efd2ec47
Merge pull request #7353 from EllangoK/preview-fix
...
Fixes thumbnail cards not loading the preview image
2023-01-29 10:41:36 +03:00
659d602dce
only returns ckpt directories if they are not none
2023-01-29 02:32:53 -05:00
f6b7768f84
support for searching subdirectory names for extra networks
2023-01-29 10:20:19 +03:00
09a142a05a
Reduce grid rows if larger than number of images available
...
When a set number of grid rows is specified in settings, then it leads
to situations where an entire row in the grid is empty.
The most noticable example is the processing preview when the row count
is set to 2, where it shows the preview just fine but with a black
rectangle under it.
2023-01-28 19:25:52 -05:00
1d8e06d542
add checkpoints tab for extra networks UI
2023-01-28 22:52:27 +03:00
91c8d0dcfc
Merge pull request #7231 from EllangoK/master
...
Fixes X/Y/Z Plot parameters not being restored from images
2023-01-28 18:45:38 +03:00
fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings
...
Fix embeddings, upscalers, and refactor `--upcast-sampling`
2023-01-28 18:44:36 +03:00
e2c71a4bd4
make prevent the browser from using cached version of scripts when they change
2023-01-28 18:13:03 +03:00
591b68e56c
uses autos new regex, checks len of re_param
2023-01-28 10:04:09 -05:00
cd7e8fb42b
Merge pull request #7319 from Thurion/img2img_batch_fix
...
Fix error when using img2img batch without masks
2023-01-28 17:31:39 +03:00
b7d2af8c7f
add dropdowns in settings for hypernets and loras
2023-01-28 17:18:47 +03:00
1421e95960
allow empty mask dir
2023-01-28 14:42:24 +01:00
5d14f282c2
fixed a bug where after switching to a checkpoint with unknown hash, you'd get empty space instead of checkpoint name in UI
...
fixed a bug where if you update a selected checkpoint on disk and then restart the program, a different checkpoint loads, but the name is shown for the the old one.
2023-01-28 16:23:49 +03:00
f8feeaaedb
add progressbar to extension update check; do not check for updates for disabled extensions
2023-01-28 15:57:56 +03:00
d04e3e921e
automatically detect v-parameterization for SD2 checkpoints
2023-01-28 15:24:41 +03:00
4aa7f5b5b9
update image parameters regex for #7231
2023-01-28 15:24:40 +03:00
f9edd578e9
Remove MPS fix no longer needed for PyTorch
...
The torch.narrow fix was required for nightly PyTorch builds for a while to prevent a hard crash, but newer nightly builds don't have this issue.
2023-01-28 04:16:27 -05:00
ada17dbd7c
Refactor conditional casting, fix upscalers
2023-01-28 04:16:25 -05:00
bea31e849a
Merge pull request #7240 from Unstackd/master
...
Allow users to convert models to Instruct-pix2pix models by supporting merging Instruct-pix2pix models with regular ones in the merge tab
2023-01-28 10:52:28 +03:00
3752aad23d
don't replace regular --help with new paths.py parser help
2023-01-28 02:44:12 -05:00
ce72af87d3
Merge pull request #7199 from maxaudron/feature/configurable-data-dir
...
Add flag to store user data sepperate from source code
2023-01-28 09:24:40 +03:00
0834d4ce37
simplify #7284
2023-01-28 08:41:15 +03:00
c99d705e57
Merge pull request #7284 from Gazzoo-byte/patch-1
...
Add button to switch width and height
2023-01-28 08:33:43 +03:00
4c52dfe4ac
make the detection for -v models less broad
2023-01-28 08:30:17 +03:00
41975c375c
Merge pull request #7294 from MrCheeze/model-detection
...
add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name
2023-01-28 08:29:01 +03:00
2aac1d9778
Basic inpainting batch support
...
Modifies batch UI to add optional inpainting support
2023-01-27 17:32:31 -08:00
6b82efd737
add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name
2023-01-27 20:06:19 -05:00
cc8c9b7474
fix broken calls to find_checkpoint_config
2023-01-27 22:43:08 +03:00
eafaf14167
Add button to switch width and height
...
Adds a button to switch width and height, allowing quick and easy switching between landscape and portrait.
2023-01-27 18:34:41 +00:00
23a9d5e273
create user extensions directory if not exists
2023-01-27 14:44:34 +01:00
6b3981c068
clean up unused script_path imports
2023-01-27 14:44:34 +01:00
14c0884fd0
use python importlib to load and execute extension modules
...
previously module attributes like __file__ where not set correctly,
leading to scripts getting the directory of the stable-diffusion repo
location instead of their own script.
This causes problem when loading user data from an external location
using the --data-dir flag, as extensions would look for their own code
in the stable-diffusion repo location instead of the data dir location.
Using pythons importlib functions sets the modules specs correctly and
executes them. But this will break extensions if they build paths based
on the previously incorrect __file__ attribute.
2023-01-27 14:44:34 +01:00
5eee2ac398
add data-dir flag and set all user data directories based on it
2023-01-27 14:44:30 +01:00
9beb794e0b
clarify the option to disable NaN check.
2023-01-27 13:08:00 +03:00
6f31d2210c
support detecting midas model
...
fix broken api for checkpoint list
2023-01-27 11:54:19 +03:00
d2ac95fa7b
remove the need to place configs near models
2023-01-27 11:28:12 +03:00
7a14c8ab45
add an option to enable sections from extras tab in txt2img/img2img
...
fix some style inconsistenices
2023-01-26 23:31:32 +03:00
cdc2fa209a
Changed filename addition from "instrpix2pix" to the more readable ".instruct-pix2pix" for newly generated instruct pix2pix models.
2023-01-26 11:27:07 -05:00
c4b9b07db6
Fix embeddings dtype mismatch
2023-01-26 09:00:15 -05:00
9e72dc7434
Changed all references to "pix2pix" to the more precise name "instruct pix2pix". Also changed extension to instrpix2pix at least for now.
2023-01-26 06:05:40 -05:00
f90798c6b6
Added error check for the rare case a user merges a pix2pix model with a normal model using weighted sum. Also removed bad print message that interfered with merging progress bar.
2023-01-26 04:38:04 -05:00
f4ec411f2c
Allow checkpoint merger to merge pix2pix models in the same way that it currently supports inpainting models.
2023-01-26 03:45:16 -05:00
10421f93c3
Fix full previews, --no-half-vae
2023-01-26 01:43:35 -05:00
4d634dc592
adds components to infotext_fields
...
allows for loading script params
2023-01-26 00:18:41 -05:00
e57b5f7c55
re_param captures quotes with commas properly
...
and removes unnecessary regex
2023-01-25 22:36:14 -05:00
6cff440182
fix prompt editing break after first batch in img2img
2023-01-25 23:25:40 +03:00
d1d6ce2983
add edit_image_conditioning from my earlier edits in case there's an attempt to inegrate pix2pix properly
...
this allows to use pix2pix model in img2img though it won't work well this way
2023-01-25 23:25:25 +03:00
3cead6983e
Merge pull request #7197 from mcmonkey4eva/fix-ti-symlinks
...
allow symlinks in the textual inversion embeddings folder
2023-01-25 22:59:12 +03:00
15e89ef0f6
fix for unet hijack breaking the train tab
2023-01-25 20:11:01 +03:00
789d47f832
make clicking extra networks button one more time close the extra networks UI
2023-01-25 19:55:31 +03:00
e179b6098a
allow symlinks in the textual inversion embeddings folder
2023-01-25 08:48:40 -08:00
1574e96729
Merge pull request #6510 from brkirch/unet16-upcast-precision
...
Add upcast options, full precision sampling from float16 UNet and upcasting attention for inference using SD 2.1 models without --no-half
2023-01-25 19:12:29 +03:00
57c1baa774
change to code for live preview fix on OSX to be bit more obvious
2023-01-25 18:56:23 +03:00
23dafe6d86
Merge pull request #7151 from brkirch/fix-approx-nn
...
Fix Approx NN previews changing first generation result
2023-01-25 18:48:25 +03:00
ee0a0da324
Add instruct-pix2pix hijack
...
Allows loading instruct-pix2pix models via same method as inpainting models in sd_models.py and sd_hijack_ip2p.py
Adds ddpm_edit.py necessary for instruct-pix2pix
2023-01-25 08:53:23 -05:00
d5ce044bcd
Merge pull request #7146 from EllangoK/master
...
Adds X/Y/Z Grid Script
2023-01-25 11:56:26 +03:00
e3b53fd295
Add UI setting for upcasting attention to float32
...
Adds "Upcast cross attention layer to float32" option in Stable Diffusion settings. This allows for generating images using SD 2.1 models without --no-half or xFormers.
In order to make upcasting cross attention layer optimizations possible it is necessary to indent several sections of code in sd_hijack_optimizations.py so that a context manager can be used to disable autocast. Also, even though Stable Diffusion (and Diffusers) only upcast q and k, unfortunately my findings were that most of the cross attention layer optimizations could not function unless v is upcast also.
2023-01-25 01:13:04 -05:00
84d9ce30cb
Add option for float32 sampling with float16 UNet
...
This also handles type casting so that ROCm and MPS torch devices work correctly without --no-half. One cast is required for deepbooru in deepbooru_model.py, some explicit casting is required for img2img and inpainting. depth_model can't be converted to float16 or it won't work correctly on some systems (it's known to have issues on MPS) so in sd_models.py model.depth_model is removed for model.half().
2023-01-25 01:13:02 -05:00
5228ec8bda
remove fairscale requirement, add fake fairscale to make BLIP not complain about it mk2
2023-01-24 20:30:43 +03:00
28189985e6
remove fairscale requirement, add fake fairscale to make BLIP not complain about it
2023-01-24 20:24:27 +03:00
e46bfa5a9e
handling sub grids and merging into one
2023-01-24 02:24:32 -05:00
602a1864b0
also return the removed field to sdapi/v1/upscalers because someone might have relied on it existing
2023-01-24 10:09:30 +03:00
42a70d7477
repair sdapi/v1/upscalers returning bogus results
2023-01-24 10:05:45 +03:00
f64af77adc
Fix different first gen with Approx NN previews
...
The loading of the model for approx nn live previews can change the internal state of PyTorch, resulting in a different image. This can be avoided by preloading the approx nn model in advance.
2023-01-23 22:49:20 -05:00
45e270dfc8
add image decod exception handling
2023-01-23 17:11:22 -05:00
5c1cb9263f
fix BLIP failing to import depending on configuration
2023-01-24 00:24:17 +03:00
7ba7f4ed6e
Merge pull request #7113 from vladmandic/interrogate
...
Add selector to interrogate categories
2023-01-24 00:09:14 +03:00
7b1c7ba87b
add support for apostrophe in extra network names
2023-01-23 23:11:34 +03:00
04a561c11c
add option to skip interrogate categories
2023-01-23 12:29:23 -05:00
efa7287be0
Merge branch 'AUTOMATIC1111:master' into interrogate
2023-01-23 12:25:07 -05:00
171a5b3bb9
Merge pull request #7032 from gmq/extra-network-styles
...
Extra network view style
2023-01-23 18:46:37 +03:00
6e1b296baf
api-image-format
2023-01-23 10:10:59 -05:00
e8c3d03f7d
a possible fix for broken image upscaling
2023-01-23 17:59:58 +03:00
925dd09c91
improve interrogate
2023-01-23 09:03:17 -05:00
59146621e2
better support for xformers flash attention on older versions of torch
2023-01-23 16:40:20 +03:00
3fa482076a
Merge remote-tracking branch 'takuma104/xformers-flash-attention'
2023-01-23 16:01:53 +03:00
194cbd065e
fix open directory button failing
2023-01-23 15:50:32 +03:00
663353098e
Merge pull request #7031 from EllangoK/master
...
Fixes various button overflowing UI and compact checkbox
2023-01-23 15:22:06 +03:00
74608300d1
Merge pull request #7093 from Shondoit/fix-dark-mode
...
Fix dark mode
2023-01-23 15:09:26 +03:00
41265a026d
third time's the charm
2023-01-23 14:50:20 +03:00
fabdae089e
add missing import to previous commit
2023-01-23 14:42:49 +03:00
669dbd9725
Fix dark mode
...
Fixes #7048
Co-Authored-By: J.J. Tolton <jjtolton@gmail.com>
2023-01-23 09:54:42 +01:00
b5230197a6
rework extras tab to use script system
2023-01-23 09:24:43 +03:00
f80ff3c1e4
feat(extra-networks): remove view dropdown
2023-01-22 22:01:24 -03:00
66eef11ce7
feat(extra-networks): add default view setting
2023-01-22 12:18:21 -03:00
985c0b8e9a
feat(extra-networks): add thumbs view style
2023-01-22 12:18:21 -03:00
68303c96e5
split oversize extras.py to postprocessing.py
2023-01-22 15:38:39 +03:00
c56b367122
Split history extras.py to postprocessing.py
2023-01-22 15:26:41 +03:00
d63340a485
Split history extras.py to postprocessing.py
2023-01-22 15:26:40 +03:00
b238b14ee4
Split history extras.py to postprocessing.py
2023-01-22 15:26:40 +03:00
43ac9ff205
Split history extras.py to postprocessing.py
2023-01-22 15:26:40 +03:00
c98cb0f8ec
amend previous commit to work in a proper fashion when saving previews
2023-01-22 11:04:02 +03:00
35419b2746
add an option to reorder tabs for extra networks
2023-01-22 11:00:05 +03:00
AUTOMATIC