1580158
/
automatic
mirror of https://github.com/vladmandic/automatic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,527 Commits
3 Branches
29 Tags
109 MiB
Commit Graph

2792 Commits (ec8453ff11219db36301fe416e1bbea738bbd6e5)

Author SHA1 Message Date
AUTOMATIC 22bcc7be42 attempted fix for infinite loading for settings that some people experience 2023-03-29 08:58:29 +03:00
Vladimir Mandic 86b83fc956
Merge pull request #66 from AUTOMATIC1111/master 
merge from upstream
 2023-03-28 16:43:39 -04:00
AUTOMATIC 3856ada5cc do not add mask blur to infotext if there is no mask 2023-03-28 22:20:31 +03:00
AUTOMATIC 433b3ab701 Revert "Merge pull request #7931 from space-nuko/img2img-enhance" 
This reverts commit 4268759370, reversing
changes made to 1b63afbedc.
 2023-03-28 20:36:57 +03:00
AUTOMATIC1111 4268759370
Merge pull request #7931 from space-nuko/img2img-enhance 
Add `Upscale by` and `Upscaler` options to img2img
 2023-03-28 20:21:25 +03:00
AUTOMATIC 1b63afbedc sort hypernetworks and checkpoints by name 2023-03-28 20:03:57 +03:00
AUTOMATIC1111 daa5a83bb7
Merge pull request #9052 from space-nuko/temp-disable-extensions 
Temporary disable extensions option
 2023-03-28 19:42:09 +03:00
AUTOMATIC1111 f1db987e6a
Merge pull request #8958 from MrCheeze/variations-model 
Add support for the unclip (Variations) models, unclip-h and unclip-l
 2023-03-28 19:39:20 +03:00
space-nuko 4414d36bf6
Merge branch 'master' into img2img-enhance 2023-03-28 10:59:12 -04:00
Vladimir Mandic db6c934b76 update and reenable extensions 2023-03-28 09:29:14 -04:00
space-nuko fc8e1008ea Make disable configurable between builtin/extra extensions 2023-03-27 12:44:49 -04:00
space-nuko 2a4d3d2124 Add temporary "disable all extensions" option for debugging use 2023-03-27 12:04:45 -04:00
Vladimir Mandic 6f854a0c05 post-merge cleanup 2023-03-27 10:47:35 -04:00
Vladimir Mandic 4231cf42f6
Merge pull request #65 from AUTOMATIC1111/master 
merge from upstream
 2023-03-27 10:35:57 -04:00
Vladimir Mandic f4d87011ed pre-merge cleanup 2023-03-27 10:33:12 -04:00
Vladimir Mandic f06e70c806 pre merge cleanup 2023-03-27 10:30:50 -04:00
Vladimir Mandic 99602e7454 add option to disable sdp 2023-03-27 10:19:42 -04:00
AUTOMATIC 77f9db3b08 serve css as independent files 2023-03-27 12:59:12 +03:00
AUTOMATIC 9e82896d5f remove an extra unneeded row in outputs 2023-03-27 10:20:01 +03:00
AUTOMATIC 5fcd4bfa3d do not read extensions' git stuff at startup 2023-03-27 10:02:30 +03:00
AUTOMATIC1111 c7daba71de
Merge pull request #8669 from Vespinian/fix-api-running-unwanted_scripts 
Fix for API running unwanted alwayson scripts
 2023-03-27 08:11:34 +03:00
AUTOMATIC1111 769def1e41
Merge pull request #8944 from SirFrags/extra_save_geninfo 
Transfer generation parameters to previews
 2023-03-27 08:06:54 +03:00
AUTOMATIC a70ae917ea update button pressed down style for #8569 2023-03-27 08:05:55 +03:00
AUTOMATIC1111 a7d6fc3b42
Merge pull request #8569 from missionfloyd/extra-networks-toggle 
Make extra networks button togglable
 2023-03-27 07:35:39 +03:00
AUTOMATIC1111 c5e1efb4ca
Merge pull request #8525 from bluelovers/pr/sort-001 
feat: try sort as ignore-case
 2023-03-27 07:34:18 +03:00
AUTOMATIC 3d09b4e99f remove -y, bring back -f 2023-03-27 07:12:40 +03:00
AUTOMATIC ff0d97c1e3 bring back -y 2023-03-27 07:11:39 +03:00
AUTOMATIC1111 3b5a3fab91
Merge pull request #8943 from space-nuko/fix-accordion-padding 
Fix padding on accordion/dropdown list elements
 2023-03-27 06:45:39 +03:00
Vladimir Mandic 6fe6eff9b4 improve error handling 2023-03-26 21:50:15 -04:00
MrCheeze 1f08600345 overwrite xformers in the unclip model config if not available 2023-03-26 16:55:29 -04:00
Vladimir Mandic f25dd739f2 fix previews 2023-03-26 15:48:48 -04:00
Vladimir Mandic 404a2a2cb2 fix broken generate and add progress bars 2023-03-26 14:23:45 -04:00
Vladimir Mandic a4d00060eb
Merge pull request #62 from AUTOMATIC1111/master 
merge from upstream
 2023-03-26 10:28:05 -04:00
AUTOMATIC 4c1ad743e3 for img2img, use None as upscaler instead of erroring out if the desired upscaler is not found 2023-03-26 11:01:32 +03:00
MrCheeze 8a34671fe9 Add support for the Variations models (unclip-h and unclip-l) 2023-03-25 21:03:07 -04:00
bluelovers d64ff4248b remove changes in textual_inversion.py 2023-03-26 06:15:09 +08:00
missionfloyd 6f18c9b13f
Merge branch 'master' into extra-networks-toggle 2023-03-25 14:51:25 -06:00
space-nuko c9647c8d23 Support Gradio's theme API 2023-03-25 16:11:41 -04:00
SirFrags abc4d3a693
preview replace save params 2023-03-25 15:59:50 -04:00
space-nuko d3b188c82d Fix padding on accordion/dropdown list elements 2023-03-25 15:52:06 -04:00
space-nuko c5f9f7c237 Use .success() callback on img2img preview inputs change 2023-03-25 14:26:36 -04:00
Vespinian 23f6dfce4c Reworked this PR, now we have 2 default arg list (one for each tab) that will be initialized on the first api request and then reused afterwards. The init_script_args copies the corresponding default list and applies the modifications asked by the api request. 2023-03-25 14:16:35 -04:00
Vespinian f371579571 Revert "Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested" 
This reverts commit dfa258de5f.
 2023-03-25 14:11:46 -04:00
Vespinian db602b100e Revert "Comment fix" 
This reverts commit f04bd037a5.
 2023-03-25 14:11:38 -04:00
space-nuko 7ea5d395c4 Add upscaler to img2img 2023-03-25 12:52:43 -04:00
space-nuko 68999d0b15 Add upscale slider to img2img 2023-03-25 12:52:35 -04:00
Vladimir Mandic 36c2d8eae8 update gradio styles 2023-03-25 12:50:13 -04:00
Vladimir Mandic 70a54bae7d
Merge pull request #59 from AUTOMATIC1111/master 
merge from upstream
 2023-03-25 11:48:17 -04:00
Vladimir Mandic 281be75629 initial css for new gradio 2023-03-25 11:47:52 -04:00
AUTOMATIC 69eb2a9ee8 add missing extensions_dir, extensions_builtin_dir to extensions.py 2023-03-25 17:39:53 +03:00
Vladimir Mandic 073e8e1495
Merge pull request #58 from AUTOMATIC1111/master 
merge from upstream
 2023-03-25 09:29:37 -04:00
Vladimir Mandic 74da0032f2 pre merge cleanup 2023-03-25 09:29:26 -04:00
Vladimir Mandic 284bbcd67b update modules 2023-03-25 09:25:13 -04:00
AUTOMATIC1111 9b2dcb04bc
Merge branch 'master' into master 2023-03-25 16:15:29 +03:00
AUTOMATIC 8c801362b4 split commandline args into its own file 
make launch.py use the same command line argument parser as the main program
 2023-03-25 16:05:25 +03:00
Vladimir Mandic f181885f0c
Merge pull request #57 from AUTOMATIC1111/master 
merge from upstream
 2023-03-25 08:47:00 -04:00
Vladimir Mandic 7dc717cd55 pre merge cleanup 2023-03-25 08:46:37 -04:00
Andrey 3ec7e19f2b Split history: mv temp modules/shared.py 2023-03-25 14:30:50 +03:00
Andrey a5cef4932f Split history: mv modules/shared.py modules/cmd_args.py 2023-03-25 14:30:49 +03:00
AUTOMATIC1111 6b00d876f7
Merge pull request #7936 from EllangoK/master 
Custom height and width settings for Extra Networks cards
 2023-03-25 13:01:49 +03:00
AUTOMATIC1111 a03536f213
Merge pull request #8662 from vladmandic/api-handler 
api error handler
 2023-03-25 12:47:32 +03:00
AUTOMATIC 616cc13b6b update overflow-wrap: break-word; for gradio 3.23 2023-03-25 12:43:14 +03:00
Karun 63a2f8d822
Merge branch 'master' into master 2023-03-25 05:12:55 -04:00
AUTOMATIC1111 8dbe793af5
Merge branch 'master' into extra-network-info 2023-03-25 12:08:24 +03:00
AUTOMATIC1111 956ed9a737
Merge pull request #8780 from Brawlence/master 
Unload and re-load checkpoint to VRAM on request (API & Manual)
 2023-03-25 12:03:26 +03:00
AUTOMATIC1111 8d2c582e3e
Merge pull request #8797 from ArrowM/master 
Move `load_file_from_url` import
 2023-03-25 11:34:07 +03:00
AUTOMATIC1111 c0a7ff8055
Merge pull request #8803 from mlhub-action/fix_scripts_load_order 
Fix scripts load order
 2023-03-25 11:23:41 +03:00
AUTOMATIC1111 90410e212f
Merge pull request #8814 from catboxanon/inpaint-mask 
Add ability to display and/or save inpainting mask and masked composite
 2023-03-25 11:21:45 +03:00
AUTOMATIC1111 e8bbc344c3
Merge pull request #8824 from zimkjh/fix-variable-typo 
fix variable typo
 2023-03-25 11:04:46 +03:00
AUTOMATIC1111 9d2551d593
Merge pull request #8647 from Tps-F/add_submodule 
Support git submodule for extension and Fix Windows PermissionError
 2023-03-25 11:02:41 +03:00
AUTOMATIC 9ed04e759d use HTTP request to fetch metadata for Lora cards instead of including it into the main page 2023-03-25 10:11:04 +03:00
AUTOMATIC1111 724a63714d
Merge pull request #8878 from butaixianran/master 
Fix None type error for TI module
 2023-03-25 09:20:43 +03:00
AUTOMATIC1111 89ea746f7c
Merge pull request #8866 from brkirch/mps-torch-2-0-nn-linear-workarounds 
Add PyTorch 2.0 support for macOS, fix image generation on macOS 13.2.X
 2023-03-25 09:17:09 +03:00
AUTOMATIC1111 03c8eefbcc
Merge pull request #8782 from FNSpd/master 
--upcast-sampling support for CUDA
 2023-03-25 09:10:01 +03:00
AUTOMATIC 4697def235 bump gradio to 3.23 
fix broken image dragging
 2023-03-25 09:00:37 +03:00
AUTOMATIC ff216820fd fix extra networks ui 2023-03-25 09:00:37 +03:00
AUTOMATIC af2db25c84 enable queue by default 
more stylistic changes
 2023-03-25 09:00:37 +03:00
AUTOMATIC 43a0912a07 hide delete button for single-item dropdown 
more stylistic changes
 2023-03-25 09:00:37 +03:00
AUTOMATIC 9b2f205400 fix ctrl+up/down attention edit 
fix dropdown obscured by live preview
stylistic changes
 2023-03-25 09:00:36 +03:00
AUTOMATIC 9f0da9f6ed initial gradio 3.22 support 2023-03-25 09:00:36 +03:00
FNSpd a9eab236d7
Update devices.py 2023-03-24 23:08:30 +04:00
butaixianran 803d44c474
Fix None type error for TI module 
When user using model_name.png as a preview image, textural_inversion.py still treat it as an embeding, and didn't handle its error, just let python throw out an None type error like following:
```bash
  File "D:\Work\Dev\AI\stable-diffusion-webui\modules\textual_inversion\textual_inversion.py", line 155, in load_from_file
    name = data.get('name', name)
AttributeError: 'NoneType' object has no attribute 'get'
```

With just a simple `if data:` checking as following, there will be no error, breaks nothing, and now this module can works fine with user's preview images.
Old code:  
```python
                data = extract_image_data_embed(embed_image)
                name = data.get('name', name)
```
New code:  
```python
                data = extract_image_data_embed(embed_image)
                if data:
                    name = data.get('name', name)
                else:
                    # if data is None, means this is not an embeding, just a preview image
                    return
```

Also, since there is no more errors on textual inversion module, from now on, extra network can set "model_name.png" as preview image for embedings.
 2023-03-25 02:05:00 +08:00
Vladimir Mandic 73135f2c12 optimize model loader 2023-03-24 13:48:26 -04:00
FNSpd 280ed8f00f
Update sd_hijack_optimizations.py 2023-03-24 16:29:16 +04:00
FNSpd beb7dda5d6
Update sd_hijack_unet.py 2023-03-24 16:25:42 +04:00
brkirch 27fe3eb6a9 Add workaround for MPS layer_norm on PyTorch 2.0 
On PyTorch 2.0, with MPS layer_norm only accepts float32 inputs. This was fixed shortly after 2.0 was finalized so the workaround can be applied with an exact version match.
 2023-03-24 04:04:22 -04:00
brkirch c5142e2fbe Add workaround for broken nn.Linear on macOS 13.2 
Credit to danieldk (https://github.com/explosion/curated-transformers/pull/124) for the workaround this is based on.
 2023-03-24 04:04:20 -04:00
pieresimakp 252f15e046 added search textbox to filter available extensions 2023-03-23 23:43:00 +08:00
carat-johyun 92e173d414 fix variable typo 2023-03-23 14:28:08 +09:00
Vladimir Mandic 44f61ee52c update extensions 2023-03-22 22:45:49 -04:00
catboxanon caf84e8233 Expose inpainting mask and composite 
For inpainting, this exposes the mask and masked composite and gives
the user the ability to display these in the web UI,
save to disk, or both.
 2023-03-22 17:51:40 +00:00
sumof2primes cd3cd0fca0 Fix scripts load order 
- 1st webui, 2nd extensions-builtin, 3rd extensions
 - to load scripts independent of --data-dir
 - change load order key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename, x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
 2023-03-23 01:28:09 +09:00
sumof2primes 64b7e83823 Fix scripts load order 
- 1st webui, 2nd extensions-builtin, 3rd extensions
 - to load scripts independent of --data-dir
 - change load order key [x.basedir, x.filename, x.path] to [orderby(x.basedir), x.filename, x.path]

e.g., scripts/xyz_grid.py dependent extentions should loaded later
extensions\sd-webui-controlnet\scripts\xyz_grid_support.py
extensions\sd-webui-additional-networks\scripts\xyz_grid_support.py
 2023-03-22 18:24:11 +09:00
ArrowM 00bd271faf Move `load_file_from_url` 
Why?
one of the internal calls of `load_file_from_url` import cv2, which locks the cv2 site-package, which extensions may (and in our case, is) breaking the installation of some libraries. The base project should be limiting its import of unnecessary libraries when possible during the installation phase.
 2023-03-21 21:13:30 -05:00
Vladimir Mandic 6f0f72c7c9 remove variables 2023-03-21 16:29:28 -04:00
Vladimir Mandic b58b55aac5 fast model load 2023-03-21 14:18:50 -04:00
FNSpd c84c9df737
Update sd_hijack_optimizations.py 2023-03-21 14:50:22 +04:00
FNSpd 91cfa9718c
Update sd_hijack_unet.py 2023-03-21 14:47:43 +04:00
FNSpd 254d994643
Update devices.py 2023-03-21 14:45:39 +04:00
Φφ 4cbbb881ee Unload checkpoints on Request 
…to free VRAM.

New Action buttons in the settings to manually free and reload checkpoints, essentially
juggling models between RAM and VRAM.
 2023-03-21 09:28:50 +03:00
missionfloyd 8e3ced73a8 Add event.stopPropagation() to extraNetworksShowMetadata() 
Prevent bubbling the same way "replace preview" does
 2023-03-20 18:04:22 -06:00
Vladimir Mandic f275e43eb9 update torch load and external repos 2023-03-20 10:10:56 -04:00
missionfloyd 64fc936738
Don't bubble when metadata_button is clicked 2023-03-19 19:30:28 -06:00
Vladimir Mandic 53db51194f implement new training master script 2023-03-19 12:13:16 -04:00
Vladimir Mandic 187b5a2272 add icon and background 2023-03-17 11:41:53 -04:00
Vladimir Mandic f6679fcc77 add global exception handler 2023-03-17 10:08:07 -04:00
Vladimir Mandic 27dca3c15b change startup order and refresh ui 2023-03-16 15:35:10 -04:00
Ftps 147d2922ff Cross device link 2023-03-16 12:35:48 +09:00
Vespinian f04bd037a5 Comment fix 2023-03-15 22:27:54 -04:00
Vespinian dfa258de5f Made copies of global scriptrunners, now we clear the copied scriptrunner of alwayson_scripts and only add back the ones that that were requested 2023-03-15 22:17:32 -04:00
Vespinian f6374934db Changed img2img scriptrunner for gui request from scripts_txt2img to scripts_img2img 2023-03-15 17:53:32 -04:00
Vladimir Mandic cbce7f1c58 implement global and api exception handler 2023-03-15 15:17:48 -04:00
Vladimir Mandic 5387576c59
api error handler 2023-03-15 15:11:04 -04:00
Ftps 79ed567b12 remove unused library 
I'm sorry I forgot.
 2023-03-15 22:42:53 +09:00
Ftps 4845db4e32 Update ui_extensions.py 
Add git submodule and Fix WinError
 2023-03-15 20:29:50 +09:00
bluelovers fd672a79af fix: remove cmp 
by ChatGPT
 2023-03-15 13:17:09 +08:00
Vladimir Mandic df51949f3b
Merge pull request #53 from AUTOMATIC1111/master 
merge from upstream
 2023-03-14 07:58:58 -04:00
Vladimir Mandic 0251dfb250 pre-merge cleanup 2023-03-14 07:58:46 -04:00
AUTOMATIC1111 a9fed7c364
Merge pull request #8503 from mcmonkey4eva/filename-length-limit-fix 
Add correction file filename length limits on *nix systems
 2023-03-14 11:28:13 +03:00
AUTOMATIC 6a04a7f20f fix an error loading Lora with empty values in metadata 2023-03-14 11:22:29 +03:00
AUTOMATIC1111 8b35b64e11
Merge pull request #8589 from vladmandic/unipc 
add progressbar to unipc sampler
 2023-03-14 11:19:21 +03:00
AUTOMATIC1111 f9b0465c8b
Merge pull request #8588 from hananbeer/fix/undefined_extra_network_data 
initialize extra_network_data before use
 2023-03-14 11:18:30 +03:00
willtakasan 4281432594
Update ui_extra_networks.py 
I updated it so that no error message is displayed when setting a webp for the preview image.
 2023-03-14 15:36:08 +09:00
AUTOMATIC c19530f1a5 Add view metadata button for Lora cards. 2023-03-14 09:10:26 +03:00
Vladimir Mandic eb960aa71c update config and defaults 2023-03-13 16:09:28 -04:00
Vladimir Mandic 08f170f87a update unipc 2023-03-13 13:10:44 -04:00
Vladimir Mandic 03a80f198e
add pbar to unipc 2023-03-13 12:35:30 -04:00
high_byte 4d26c7da57 initialize extra_network_data before use 2023-03-13 17:37:29 +02:00
Vladimir Mandic f2e9991de5
Merge pull request #52 from AUTOMATIC1111/master 
merge from upstream
 2023-03-13 07:30:49 -04:00
missionfloyd 9e23bacfbc Make extra networks button togglable 2023-03-12 17:07:03 -06:00
Alex "mcmonkey" Goodwin af9158a8c7 update `fullfn` properly 2023-03-12 12:36:04 -07:00
Alex "mcmonkey" Goodwin 48df6d66ea add safety check in case of short extensions 
so eg if a two-letter or empty extension is used, `.txt` would break, this `max` call protects that.
 2023-03-12 12:33:29 -07:00
Alex "mcmonkey" Goodwin a71b7b5ec0 relocate filename length limit to better spot 2023-03-12 12:30:31 -07:00
AUTOMATIC dfeee786f9 display correct timings after restarting UI 2023-03-12 21:25:22 +03:00
AUTOMATIC a00cd8b9c1 attempt to fix memory monitor with multiple CUDA devices 2023-03-12 21:04:17 +03:00
AUTOMATIC 27eedb6966 change extension index link to the new dedicated repo instead of wiki 2023-03-12 17:20:17 +03:00
Vladimir Mandic bd67c41f54
force refresh tqdm before close 2023-03-12 09:19:23 -04:00
Vladimir Mandic 696af5dc07
Merge pull request #49 from AUTOMATIC1111/master 
merge from upstream
 2023-03-12 08:56:09 -04:00
AUTOMATIC1111 adf723a9b2
Merge pull request #8492 from zhanghua000/absolute-path 
fix: gradio's ValueError about fetching extensions files
 2023-03-12 08:55:15 +03:00
AUTOMATIC1111 6106f6d0a0
Merge pull request #7965 from Kilvoctu/extranet-buttons 
Use emojis for extra network buttons
 2023-03-12 08:25:03 +03:00
AUTOMATIC1111 beb96bd115
Merge pull request #8515 from EllangoK/unipc-typo 
Fix dims typo in unipc
 2023-03-12 08:24:17 +03:00
AUTOMATIC1111 bbc4b0478a
Merge pull request #8518 from brkirch/remove-bool-test 
Fix image generation on macOS 13.3 betas
 2023-03-12 08:14:26 +03:00
bluelovers 0492424121 feat: try sort as ignore-case 
https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/8368
 2023-03-12 10:18:33 +08:00
brkirch a4cb96d4ae Remove test, use bool tensor fix by default 
The test isn't working correctly on macOS 13.3 and the bool tensor fix for cumsum is currently always needed anyway, so enable the fix by default.
 2023-03-11 17:35:17 -05:00
EllangoK 48f4abd2e6 fix dims typo in unipc 2023-03-11 15:52:14 -05:00
Vespinian 64efb3d9e0 Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2023-03-11 14:35:20 -05:00
Vespinian 49bbdbe447 small diff whitespace cleanup 2023-03-11 14:34:56 -05:00
Kilvoctu 247a34498b restore text, remove 'close' 
don't use emojis for extra network buttons; remove 'close'
 2023-03-11 13:11:26 -06:00
AUTOMATIC 27e319dc4f alternative solution for #8089 2023-03-11 21:22:52 +03:00
Vespinian 5546e71a10 Fixed whitespace 2023-03-11 12:35:20 -05:00