Commit Graph

2209 Commits

Author SHA1 Message Date
brkirch f6ab5a39d7 Merge branch 'AUTOMATIC1111:master' into sub-quad_attn_opt 2023-01-06 00:14:20 -05:00
brkirch d782a95967 Add Birch-san's sub-quadratic attention implementation 2023-01-06 00:14:13 -05:00
AUTOMATIC1111 88e01b237e
Merge pull request #6372 from timntorres/save-ti-hypernet-settings-to-txt-revised
Save hypernet and textual inversion settings to text file, revised.
2023-01-06 07:59:44 +03:00
AUTOMATIC1111 143ed5a42d
Merge pull request #6384 from faber6/loads-ti-from-subdirs
allow loading embeddings from subdirectories
2023-01-06 07:56:48 +03:00
AUTOMATIC1111 8a13afd216
Merge pull request #6401 from acncagua/wsl-open
wsl-open
2023-01-06 07:56:15 +03:00
AUTOMATIC1111 85fa4eacea
Merge pull request #6402 from brkirch/work-with-nightly-local-builds
Add support for using PyTorch nightly and local builds
2023-01-06 07:51:45 +03:00
AUTOMATIC1111 3ea354f274
Merge pull request #6364 from 0xb8/master
hires-fix: add "nearest-exact" latent upscale mode.
2023-01-06 07:49:11 +03:00
acncagua d61a5aa4f6
Add files via upload 2023-01-06 10:58:22 +09:00
brkirch 8111b5569d Add support for PyTorch nightly and local builds 2023-01-05 20:54:52 -05:00
noodleanon b5253f0dab
allow img2img api to run scripts 2023-01-05 21:21:48 +00:00
Faber 81133d4168
allow loading embeddings from subdirectories 2023-01-06 03:38:37 +07:00
AUTOMATIC1111 310b71f669
Merge pull request #6376 from KumiIT/master
typo in TI
2023-01-05 22:10:07 +03:00
AUTOMATIC 847f869c67 experimental optimization 2023-01-05 21:00:52 +03:00
Kuma fda04e620d
typo in TI 2023-01-05 18:44:19 +01:00
timntorres b6bab2f052 Include model in log file. Exclude directory. 2023-01-05 09:14:56 -08:00
timntorres b85c2b5cf4 Clean up ti, add same behavior to hypernetwork. 2023-01-05 08:14:38 -08:00
cat 19a81ac287 hires-fix: add "nearest-exact" latent upscale mode. 2023-01-05 20:25:02 +05:00
timntorres eea8fc40e1 Add option to save ti settings to file. 2023-01-05 07:24:22 -08:00
AUTOMATIC f8d0cf6a6e rework #6329 to remove duplicate code and add prevent tab names for showing in ids for scripts that only exist on one tab 2023-01-05 12:08:11 +03:00
AUTOMATIC 997461d3dd add footer with versions 2023-01-05 11:57:14 +03:00
AUTOMATIC1111 01a1fee874
Merge pull request #6329 from Kryptortio/add_even_more_element_ids
Add additional elem_id/HTML ids (again)
2023-01-05 11:56:13 +03:00
AUTOMATIC 42fcc79bd3 add Discard penultimate sigma to infotext 2023-01-05 10:43:21 +03:00
AUTOMATIC1111 c53852e257
Merge pull request #6044 from hentailord85ez/discard-penultimate-sigma
Allow always discarding of penultimate sigma and fix doing 1 less step than specified
2023-01-05 10:33:51 +03:00
AUTOMATIC1111 24e21c0710
Merge pull request #6328 from lolsuffocate/fix-png-info-api
Make pnginfoapi return all image info
2023-01-05 10:23:59 +03:00
AUTOMATIC 2e30997450 move sd_model assignment to the place where we change the sd_model 2023-01-05 10:21:17 +03:00
Philpax 83ca8dd0c9
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings 2023-01-05 05:00:58 +01:00
AUTOMATIC 99b67cff0b make hires fix not do anything if the user chooses the second pass resolution to be the same as first pass resolution 2023-01-05 01:25:52 +03:00
me 5851bc839b Add element ids for script components and a few more in ui.py 2023-01-04 22:14:30 +01:00
AUTOMATIC bc43293c64 fix incorrect display/calculation for number of steps for hires fix in progress bars 2023-01-04 23:56:43 +03:00
Suffocate 1288a3bb7d Use the read_info_from_image function directly 2023-01-04 20:36:30 +00:00
AUTOMATIC 8149078094 added the option to specify target resolution with possibility of truncating for hires fix; also sampling steps 2023-01-04 22:04:40 +03:00
AUTOMATIC 24d4a0841d train tab visual updates
allow setting train tab values from ui-config.json
2023-01-04 20:10:40 +03:00
AUTOMATIC1111 eeb1de4388
Merge branch 'master' into gradient-clipping 2023-01-04 19:56:35 +03:00
AUTOMATIC1111 e9911391ca
Merge pull request #6305 from vladmandic/fix-jpeg
fix jpeg handling
2023-01-04 19:22:51 +03:00
AUTOMATIC 097a90b88b add XY plot parameters to grid image and do not add them to individual images 2023-01-04 19:19:11 +03:00
AUTOMATIC 3dae545a03 rename weirdly named variables from #3176 2023-01-04 18:42:51 +03:00
AUTOMATIC1111 37aafdb059
Merge branch 'master' into master 2023-01-04 18:39:57 +03:00
AUTOMATIC a8eb9e3bf8 Revert "Merge pull request #3791 from shirayu/fix/filename"
This reverts commit eed58279e7, reversing
changes made to 4ae960b01c.
2023-01-04 18:20:38 +03:00
AUTOMATIC1111 eed58279e7
Merge pull request #3791 from shirayu/fix/filename
Truncate too long filename (Fix #705)
2023-01-04 18:17:50 +03:00
AUTOMATIC 525cea9245 use shared function from processing for creating dummy mask when training inpainting model 2023-01-04 17:58:07 +03:00
Vladimir Mandic 590c5ae016
update pillow 2023-01-04 09:48:54 -05:00
AUTOMATIC 184e670126 fix the merge 2023-01-04 17:45:01 +03:00
AUTOMATIC1111 da5c1e8a73
Merge branch 'master' into inpaint_textual_inversion 2023-01-04 17:40:19 +03:00
AUTOMATIC1111 47df084901
Merge pull request #6304 from vladmandic/add-cross-attention-info
add cross-attention info
2023-01-04 17:30:43 +03:00
AUTOMATIC 4d66bf2c0d add infotext to "-before-highres-fix" images 2023-01-04 17:24:46 +03:00
Vladimir Mandic 79c682ad4f
fix jpeg 2023-01-04 08:20:42 -05:00
AUTOMATIC 1cfd8aec4a make it possible to work with opts.show_progress_every_n_steps = -1 with medvram 2023-01-04 16:05:42 +03:00
Vladimir Mandic 21ee77db31
add cross-attention info 2023-01-04 08:04:38 -05:00
AUTOMATIC1111 c923de0e05
Merge pull request #5969 from philpax/include-job-timestamp-in-progress-api
feat(api): include job_timestamp in progress
2023-01-04 15:28:51 +03:00
AUTOMATIC 642142556d use commandline-supplied cuda device name instead of cuda:0 for safetensors PR that doesn't fix anything 2023-01-04 15:09:53 +03:00
AUTOMATIC 68fbf4558f Merge remote-tracking branch 'Narsil/fix_safetensors_load_speed' 2023-01-04 14:53:03 +03:00
Vladimir Mandic 11b8160a08
fix typo 2023-01-04 06:36:57 -05:00
AUTOMATIC 0cd6399b8b fix broken inpainting model 2023-01-04 14:29:13 +03:00
AUTOMATIC 3bd737767b disable broken API logging 2023-01-04 14:20:32 +03:00
AUTOMATIC1111 7bbd984dda
Merge pull request #6253 from Shondoit/ti-optim
Save Optimizer next to TI embedding
2023-01-04 14:09:13 +03:00
AUTOMATIC1111 545ae8cb1c
Merge pull request #6264 from vladmandic/add-state-info
add missing state info
2023-01-04 14:04:50 +03:00
AUTOMATIC1111 a8ad8666cd
Merge pull request #6261 from vladmandic/api-logging
add api logging
2023-01-04 14:04:11 +03:00
AUTOMATIC1111 6281c1bdb4
Merge pull request #6299 from stysmmaker/feat/latent-upscale-modes
Add more latent upscale modes
2023-01-04 13:47:36 +03:00
AUTOMATIC1111 77c3bc7747
Merge pull request #6298 from stysmmaker/fix/intermediate-step-full-res
Save full resolution of intermediate step
2023-01-04 13:46:21 +03:00
MMaker b2151b934f
Rename bicubic antialiased option
Comma was causing the the value in PNG info to be quoted, which causes the upscaler dropdown option to be blank when sending to UI
2023-01-04 05:36:18 -05:00
MMaker f49f917cdd
Merge branch 'AUTOMATIC1111:master' into feat/latent-upscale-modes 2023-01-04 04:27:52 -06:00
AUTOMATIC 4ec6470a1a fix checkpoint list API 2023-01-04 13:26:23 +03:00
MMaker 15fd0b8bc4
Update processing.py 2023-01-04 05:12:54 -05:00
MMaker 96cf15bede
Add new latent upscale modes 2023-01-04 05:12:06 -05:00
AUTOMATIC 8d8a05a3bb find configs for models at runtime rather than when starting 2023-01-04 12:47:42 +03:00
AUTOMATIC 02d7abf514 helpful error message when trying to load 2.0 without config
failing to load model weights from settings won't break generation for currently loaded model anymore
2023-01-04 12:35:07 +03:00
MMaker e5b7ee910e
fix: Save full res of intermediate step 2023-01-04 04:22:01 -05:00
Max Weber 917b5bd8d0
ui: save dropdown sampling method to the ui-config 2023-01-03 18:19:56 -07:00
AUTOMATIC 3e22e29413 fix broken send to extras button 2023-01-03 21:49:24 +03:00
AUTOMATIC 82cfc227d7 added licenses screen to settings
added footer
removed unused inpainting code
2023-01-03 20:23:17 +03:00
Vladimir Mandic d8d206c168
add state to interrogate 2023-01-03 11:01:04 -05:00
Vladimir Mandic cec209981e
log only sdapi 2023-01-03 10:58:52 -05:00
AUTOMATIC 8f96f92899 call script callbacks for reloaded model after loading embeddings 2023-01-03 18:39:14 +03:00
AUTOMATIC 2d5a5076bb Make it so that upscalers are not repeated when restarting UI. 2023-01-03 18:38:21 +03:00
Vladimir Mandic 192ddc04d6
add job info to modules 2023-01-03 10:34:51 -05:00
Vladimir Mandic 1d9dc48efd
init job and add info to model merge 2023-01-03 10:21:51 -05:00
Vladimir Mandic aaa4c2aacb
add api logging 2023-01-03 09:45:16 -05:00
AUTOMATIC e9fb9bb0c2 fix hires fix not working in API when user does not specify upscaler 2023-01-03 17:40:20 +03:00
Shondoit bddebe09ed Save Optimizer next to TI embedding
Also add check to load only .PT and .BIN files as embeddings. (since we add .optim files in the same directory)
2023-01-03 13:30:24 +01:00
AUTOMATIC c0ee148870 add support for running with gradio 3.9 installed 2023-01-03 14:18:48 +03:00
AUTOMATIC a1cf55a9d1 add option to reorder items in main UI 2023-01-03 10:39:21 +03:00
AUTOMATIC 9d4eff097d add a button to show all setting pages 2023-01-03 10:01:06 +03:00
AUTOMATIC 2bc86712ec make quicksettings UI elements appear in same order as they are listed in the setting 2023-01-03 09:13:35 +03:00
AUTOMATIC 18c03cdeac styling rework to make things more compact 2023-01-03 09:04:29 +03:00
AUTOMATIC 269f6e8676 change settings UI to use vertical tabs 2023-01-03 07:20:20 +03:00
AUTOMATIC 251ecee694 make "send to" buttons send actual dimension of the sent image rather than fields 2023-01-02 22:44:46 +03:00
AUTOMATIC 8d12a729b8 fix possible error with accessing nonexistent setting 2023-01-02 20:46:51 +03:00
AUTOMATIC 84dd7e8e24 error out with a readable message in chwewckpoint merger for incompatible tensor shapes (ie when trying to merge SD1.5 with SD2.0) 2023-01-02 20:30:02 +03:00
AUTOMATIC 4dbde228ff make it possible to use fractional values for SD upscale. 2023-01-02 20:01:16 +03:00
AUTOMATIC ef27a18b6b Hires fix rework 2023-01-02 19:42:10 +03:00
AUTOMATIC1111 fd4461d44c
Merge pull request #6196 from philpax/add-embeddings-api
feat(api): add /sdapi/v1/embeddings
2023-01-02 06:11:10 +03:00
AUTOMATIC1111 f39a79d143
Merge pull request #6183 from Kryptortio/add_more_element_ids
Add additional elem_id/HTML ids
2023-01-02 06:10:26 +03:00
Philpax c65909ad16 feat(api): return more data for embeddings 2023-01-02 12:21:48 +11:00
Philpax b5819d9bf1 feat(api): add /sdapi/v1/embeddings 2023-01-02 10:18:11 +11:00
AUTOMATIC 311354c0bb fix the issue with training on SD2.0 2023-01-02 00:38:09 +03:00
me a005fccddd Add a lot more elem_id/HTML id, modified some that were duplicates for seed section 2023-01-01 20:06:52 +01:00
AUTOMATIC e672cfb074 rework of callback for #6094 2023-01-01 18:37:55 +03:00
AUTOMATIC1111 6062c85d4d
Merge pull request #6094 from AlUlkesh/master
Adding image numbers on grids
2023-01-01 18:31:01 +03:00
AUTOMATIC 524d532b38 moved roll artist to built-in extensions 2023-01-01 14:07:40 +03:00
AlUlkesh 5f12b23b8b Adding image numbers on grids
New grid option in settings enables adding of image numbers on grids. This makes identifying the images, especially in larger batches, much easier.

Revert "Adding image numbers on grids"

This reverts commit 3530c283b4b1d3a3cab40efbffe4cf2697938b6f.

Implements Callback for image grid loop

Necessary to make "Add image's number to its picture in the grid" extension possible.
2023-01-01 11:21:50 +01:00
AUTOMATIC e5f1a37cb9 make refresh buttons look more nice 2023-01-01 13:08:40 +03:00
AUTOMATIC b46b97fa29 more fixes for gradio update 2023-01-01 11:38:17 +03:00
AUTOMATIC 76f256fe8f Bump gradio version #YOLO 2023-01-01 11:08:39 +03:00
AUTOMATIC 11d432d92d add refresh buttons to checkpoint merger 2023-01-01 10:35:38 +03:00
AUTOMATIC 16b9661d27 change karras scheduler sigmas to values recommended by SD from old 0.1 to 10 with an option to revert to old 2023-01-01 09:51:37 +03:00
AUTOMATIC 210449b374 fix 'RuntimeError: Expected all tensors to be on the same device' error preventing models from loading on lowvram/medvram. 2023-01-01 02:41:15 +03:00
AUTOMATIC 29a3a7eb13 show sampler selection in dropdown, add option selection to revert to old radio group 2023-01-01 01:19:10 +03:00
AUTOMATIC 360feed9b5 HAPPY NEW YEAR
make save to zip into its own button instead of a checkbox
2023-01-01 00:38:58 +03:00
AUTOMATIC f4535f6e4f make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images 2022-12-31 23:40:55 +03:00
AUTOMATIC bdbe09827b changed embedding accepted shape detection to use existing code and support the new alt-diffusion model, and reformatted messages a bit #6149 2022-12-31 22:49:09 +03:00
AUTOMATIC1111 c24a314c5e
Merge pull request #6149 from vladmandic/validate-embeddings
validate textual inversion embeddings
2022-12-31 22:33:12 +03:00
AUTOMATIC1111 f378b8d53a
Merge pull request #6143 from vladmandic/fix-interrogate
fix interrogate
2022-12-31 22:20:56 +03:00
Vladimir Mandic f55ac33d44
validate textual inversion embeddings 2022-12-31 11:27:02 -05:00
AUTOMATIC f34c734172 alt-diffusion integration 2022-12-31 18:06:35 +03:00
Vladimir Mandic 65be1df7bb
initialize result so not to cause exception on empty results 2022-12-31 07:46:04 -05:00
AUTOMATIC 3f401cdb64 Merge remote-tracking branch 'baai-open-internal/master' into alt-diffusion 2022-12-31 13:02:28 +03:00
AUTOMATIC fef98723b2 set sd_model for API later, inside the lock, to prevent multiple requests with different models ending up with incorrect results #5877 #6012 2022-12-31 12:44:26 +03:00
AUTOMATIC1111 26522c7dc8
Merge pull request #6015 from philpax/api-begin-end-in-queue
fix(api): only begin/end state in lock
2022-12-31 12:23:39 +03:00
AUTOMATIC1111 3d8256e40c
Merge pull request #6017 from hitomi/master
Add memory cache for VAE weights
2022-12-31 12:22:59 +03:00
AUTOMATIC1111 d81636a091
Merge pull request #6037 from vladmandic/master
fix rgba to rgb when using jpeg output
2022-12-31 12:14:41 +03:00
AUTOMATIC1111 03cb43c3c8
Merge pull request #6133 from vladmandic/memmon-stats
add additional memory states
2022-12-31 10:52:58 +03:00
AUTOMATIC1111 38f5787e67
Merge pull request #6134 from vladmandic/remove-console-message
remove unnecessary console message
2022-12-31 10:52:30 +03:00
Vladimir Mandic 463048344f
fix shared state dictionary 2022-12-30 19:41:47 -05:00
Vladimir Mandic d3aa2a48e1
remove unnecessary console message 2022-12-30 19:38:53 -05:00
Vladimir Mandic 5958bbd244
add additional memory states 2022-12-30 19:36:36 -05:00
Nicolas Patry 5ba04f9ec0
Attempting to solve slow loads for `safetensors`.
Fixes #5893
2022-12-27 11:27:19 +01:00
hentailord85ez 03f486a239
Update shared.py 2022-12-26 20:49:33 +00:00
hentailord85ez 4df5009acb
Update sd_samplers.py 2022-12-26 20:49:13 +00:00
Vladimir Mandic ae955b0146 fix rgba to rgb when using jpeg output 2022-12-26 09:56:19 -05:00
AUTOMATIC 4af3ca5393 make it so that blank ENSD does not break image generation 2022-12-26 10:11:28 +03:00
hitomi 893933e05a Add memory cache for VAE weights 2022-12-25 20:49:25 +08:00
Philpax 5be9387b23 fix(api): only begin/end state in lock 2022-12-25 21:45:44 +11:00
Philpax fa931733f6 fix(api): assign sd_model after settings change 2022-12-25 20:17:49 +11:00
AUTOMATIC1111 7b7f7e9361
Merge pull request #6003 from eaglgenes101/settings-css-classes
Add CSS classes for the settings panels
2022-12-25 09:17:34 +03:00
AUTOMATIC1111 b12de850ae
Merge pull request #5992 from yuvalabou/F541
Fix F541: f-string without any placeholders
2022-12-25 09:16:08 +03:00
AUTOMATIC1111 a66514e1a3
Merge pull request #6005 from allenbenz/patch-1
Fix clip interrogate from the webui
2022-12-25 09:12:29 +03:00
AUTOMATIC1111 c1512ef9ae
Merge pull request #5999 from vladmandic/trainapi
implement train api
2022-12-25 09:11:42 +03:00
AUTOMATIC 8eef9d8e78 a way to add an exception to unpickler without explicitly calling load_with_extra 2022-12-25 09:03:56 +03:00
Allen Benz 61a273236f
Fix clip interrogate from the webui
A recent change made the image RGBA, which makes the clip interrogator unhappy.
deepbooru and calling the interrogator from the api already do the conversion so this is the only place that needed it.
2022-12-24 20:23:12 -08:00
eaglgenes101 f60c24f812 Add CSS classes for the settings panels 2022-12-24 22:16:01 -05:00
Vladimir Mandic 5f1dfbbc95 implement train api 2022-12-24 18:02:22 -05:00
AUTOMATIC c5bdba2089 change wording a bit 2022-12-24 22:41:35 +03:00
AUTOMATIC 56e557c6ff added cheap NN approximation for VAE 2022-12-24 22:39:10 +03:00
Yuval Aboulafia 3bf5591efe fix F541 f-string without any placeholders 2022-12-24 21:35:29 +02:00
AUTOMATIC1111 5927d3fa95
Merge pull request #5977 from philpax/api-dont-save-extras-output
fix(api): don't save extras output to disk
2022-12-24 18:50:45 +03:00
AUTOMATIC1111 a6a54a7529
Merge pull request #5976 from AbstractQbit/fast_preview
Add an option for faster low quality previews
2022-12-24 18:38:42 +03:00
AUTOMATIC 0b8acce6a9 separate part of denoiser code into a function to make it easier for extensions to override it 2022-12-24 18:38:16 +03:00
AUTOMATIC 03d7b39453 added an option to filter out deepbooru tags 2022-12-24 16:22:47 +03:00
linuxmobile ( リナックス ) 5a650055de
Removed lenght in sd_model at line 115
Commit eba60a4 is what is causing this error, delete the length check in sd_model starting at line 115 and it's fine.

https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/5971#issuecomment-1364507379
2022-12-24 09:25:35 -03:00
Philpax 6247f21a63 fix(api): don't save extras output to disk 2022-12-24 22:04:53 +11:00
AbstractQbit 11dd79e346 Add an option for faster low quality previews 2022-12-24 14:00:17 +03:00
Philpax f23a822f1c feat(api): include job_timestamp in progress 2022-12-24 20:45:16 +11:00
AUTOMATIC1111 eba60a42eb
Merge pull request #5627 from deanpress/patch-1
fix: fallback model_checkpoint if it's empty
2022-12-24 12:20:31 +03:00
AUTOMATIC1111 adab48cb1b
Merge pull request #5637 from aednzxy/patch-1
API endpoint to refresh checkpoints
2022-12-24 12:19:43 +03:00
AUTOMATIC1111 8c9e6d3c7d
Merge pull request #5131 from uservar/inpainting-detection
Better should_hijack_inpainting detection
2022-12-24 12:19:06 +03:00
AUTOMATIC1111 064f7b8fd2
Merge pull request #5718 from space-nuko/feature/save-hypernetwork-hash
Save hypernetwork hash and fix hypernetwork parameter restoring
2022-12-24 11:14:19 +03:00
AUTOMATIC c0a8401b5a rename the option for img2img latent upscale 2022-12-24 11:12:17 +03:00
AUTOMATIC1111 b2dbd4d698
Merge pull request #5521 from AndrewRyanChama/ryan/img2imglatentscale
Add latent upscale option to img2img
2022-12-24 11:10:35 +03:00
AUTOMATIC1111 34bc3616ec
Merge pull request #5838 from aliencaocao/fix_gradio_pil
Dirty fix for missing PIL supported file extensions
2022-12-24 10:24:33 +03:00
AUTOMATIC1111 ee65237d69
Merge pull request #5747 from yuvalabou/singleton-comparison
Format singleton comparisons
2022-12-24 10:17:38 +03:00
AUTOMATIC1111 7578b50ba6
Merge pull request #5873 from philpax/override-settings-restore-afterwards
feat(api): add override_settings_restore_afterwards
2022-12-24 10:15:04 +03:00
AUTOMATIC1111 fac92610d2
Merge pull request #5753 from calvinballing/master
Fix various typos
2022-12-24 09:58:28 +03:00
AUTOMATIC1111 94450b8877
Merge pull request #5589 from MrCheeze/better-special-model-support
Better support for 2.0-inpainting and 2.0-depth special models
2022-12-24 09:53:44 +03:00
AUTOMATIC 9441c28c94 add an option for img2img background color 2022-12-24 09:46:35 +03:00
AUTOMATIC1111 b81fa1e7f1
Merge pull request #5644 from ThereforeGames/master
Improve img2img color correction by performing a luminosity blend
2022-12-24 09:17:40 +03:00
AUTOMATIC1111 684d7059bc
Merge pull request #5808 from stysmmaker/patch/fix-fnt-size
Prevent overlapping in X/Y plot by changing font size
2022-12-24 09:13:05 +03:00
AUTOMATIC1111 55f3ef876b
Merge pull request #5814 from timntorres/5802-save-upscaler-to-filename
Add option to save upscaler to filename suffix in extras tab.
2022-12-24 09:07:00 +03:00
AUTOMATIC1111 992a877a4a
Merge pull request #4684 from simcop2387/fix-extension-docker
Fix docker tmp/ and extensions/ handling for docker.
2022-12-24 09:06:10 +03:00
AUTOMATIC 399b229783 eliminate duplicated code
add an option to samplers for skipping next to last sigma
2022-12-24 09:03:45 +03:00
AUTOMATIC1111 5667ec4ca7
Merge pull request #5797 from mcmonkey4eva/dpm2-a-fix
Add a workaround patch for DPM2 a issue
2022-12-24 08:51:43 +03:00
AUTOMATIC1111 3bfc6c07ae
Merge pull request #5810 from brkirch/fix-training-mps
Training fixes for MPS
2022-12-24 08:34:46 +03:00
AUTOMATIC1111 f0dfed2a17
Merge pull request #5796 from brkirch/invoke-fix
Improve InvokeAI cross attention reliability and speed when using MPS for large images
2022-12-24 08:21:19 +03:00
AUTOMATIC 0c747d4013 add a comment for disable xformers hack 2022-12-24 07:57:56 +03:00
Akiba 13e0295ab6
fix: xformers use importlib 2022-12-24 11:17:21 +08:00
brkirch 35b1775b32 Use other MPS optimization for large q.shape[0] * q.shape[1]
Check if q.shape[0] * q.shape[1] is 2**18 or larger and use the lower memory usage MPS optimization if it is. This should prevent most crashes that were occurring at certain resolutions (e.g. 1024x1024, 2048x512, 512x2048).

Also included is a change to check slice_size and prevent it from being divisible by 4096 which also results in a crash. Otherwise a crash can occur at 1024x512 or 512x1024 resolution.
2022-12-20 21:30:00 -05:00
Philpax 22f1527fa7 feat(api): add override_settings_restore_afterwards 2022-12-20 20:36:49 +11:00
Alex "mcmonkey" Goodwin 7ba9bc2fdb fix dpm2 in img2img as well 2022-12-18 19:16:42 -08:00
Billy Cao c02ef0f428 Fix PIL being imported before its installed (for new users only) 2022-12-18 20:51:59 +08:00
timntorres 6fd91c9179 Update OptionInfo to match preexisting option. 2022-12-17 08:59:02 -08:00
timntorres a7a039d53a Add option to include upscaler name in filename. 2022-12-17 08:50:20 -08:00
timntorres a26fe85056 Add upscaler name as a suffix. 2022-12-17 05:11:06 -08:00
brkirch cca16373de Add attributes used by MPS 2022-12-17 04:23:08 -05:00
brkirch 16b4509fa6 Add numpy fix for MPS on PyTorch 1.12.1
When saving training results with torch.save(), an exception is thrown:
"RuntimeError: Can't call numpy() on Tensor that requires grad. Use tensor.detach().numpy() instead."

So for MPS, check if Tensor.requires_grad and detach() if necessary.
2022-12-17 04:22:58 -05:00
MMaker b7c478c3eb
fix: Modify font size when unable to fit in plot
This prevents scenarios where text without line breaks will start overlapping with each other when generating X/Y plots. This is most evident when generating X/Y plots with checkpoints, as most don't contain spaces and sometimes include extra information such as the epoch, making it extra long.
2022-12-17 00:45:43 -05:00
Alex "mcmonkey" Goodwin 180fdf7809 apply to DPM2 (non-ancestral) as well 2022-12-16 08:42:00 -08:00
Alex "mcmonkey" Goodwin 8b0703b8fc Add a workaround patch for DPM2 a issue
DPM2 a and DPM2 a Karras samplers are both affected by an issue described by https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/3483 and can be resolved by a workaround suggested by the k-diffusion author at https://github.com/crowsonkb/k-diffusion/issues/43#issuecomment-1305195666
2022-12-16 08:18:29 -08:00
Akiba 35e1017e3e
fix: xformers 2022-12-16 20:43:09 +08:00
Jim Hays c0355caefe Fix various typos 2022-12-14 21:01:32 -05:00
Yuval Aboulafia 957e15c464 Correct singleton comparisons 2022-12-14 20:59:33 +02:00
space-nuko 5f407ebd61 Fix comment 2022-12-13 14:32:26 -08:00
space-nuko 1fcb959514 Correctly restore default hypernetwork strength 2022-12-13 14:30:54 -08:00
space-nuko 9d5948e5f7 Correctly restore hypernetwork from hash 2022-12-13 14:25:16 -08:00
space-nuko 7077428209 Save hypernetwork hash in infotext 2022-12-13 13:05:40 -08:00
ThereforeGames 2e8b5418e3
Improve color correction with luminosity blend 2022-12-11 18:03:36 -05:00
Dean Hopkins 960293d6b2
API endpoint to refresh checkpoints
API endpoint to refresh checkpoints
2022-12-11 19:16:44 +00:00
MrCheeze ec0a48826f unconditionally set use_ema=False if value not specified (True never worked, and all configs except v1-inpainting-inference.yaml already correctly set it to False) 2022-12-11 11:18:34 -05:00
Dean van Dugteren 59c6511494
fix: fallback model_checkpoint if it's empty
This fixes the following error when SD attempts to start with a deleted checkpoint:

```
Traceback (most recent call last):
  File "D:\Web\stable-diffusion-webui\launch.py", line 295, in <module>
    start()
  File "D:\Web\stable-diffusion-webui\launch.py", line 290, in start
    webui.webui()
  File "D:\Web\stable-diffusion-webui\webui.py", line 132, in webui
    initialize()
  File "D:\Web\stable-diffusion-webui\webui.py", line 62, in initialize
    modules.sd_models.load_model()
  File "D:\Web\stable-diffusion-webui\modules\sd_models.py", line 283, in load_model
    checkpoint_info = checkpoint_info or select_checkpoint()
  File "D:\Web\stable-diffusion-webui\modules\sd_models.py", line 117, in select_checkpoint
    checkpoint_info = checkpoints_list.get(model_checkpoint, None)
TypeError: unhashable type: 'list'
```
2022-12-11 17:08:51 +01:00
MrCheeze bd81a09eac fix support for 2.0 inpainting model while maintaining support for 1.5 inpainting model 2022-12-10 11:29:26 -05:00
MrCheeze a1c8ad8828 unload depth model if medvram/lowvram enabled 2022-12-10 11:02:47 -05:00
AUTOMATIC1111 94a35ca9d6
Merge pull request #5191 from aliencaocao/enable_checkpoint_switching_in_override_settings
Support changing checkpoint and vae through override_settings
2022-12-10 16:29:40 +03:00
AUTOMATIC 713c48ddd7 add an 'installed' tag to extensions 2022-12-10 15:05:22 +03:00
AUTOMATIC 991e2dcee9 remove NSFW filter and its dependency; if you still want it, find it in the extensions section 2022-12-10 14:54:16 +03:00
AUTOMATIC d06592267c use less javascript for this non-js-only implementation of the clear prompt button. 2022-12-10 13:46:18 +03:00
AUTOMATIC1111 2028aa06c0
Merge pull request #3198 from papuSpartan/master
Add Clear Prompt button to roll_col
2022-12-10 13:35:51 +03:00
AUTOMATIC1111 89237852f4
Merge pull request #5119 from 0xb8/master
Atomically rename saved image to avoid race condition with other processes
2022-12-10 13:26:07 +03:00
AUTOMATIC1111 cce306cb67
Merge pull request #5441 from timntorres/add-5433-avoid-sending-size-option
Add option to avoid sending size between interfaces.
2022-12-10 11:07:16 +03:00
papuSpartan 6387043fd2
Merge branch 'AUTOMATIC1111:master' into master 2022-12-10 00:02:39 -08:00
AUTOMATIC1111 ec5e072124
Merge pull request #4841 from R-N/vae-fix-none
Fix None option of VAE selector
2022-12-10 09:58:20 +03:00
AUTOMATIC bab91b1279 add Noise multiplier option to infotext 2022-12-10 09:51:26 +03:00
AUTOMATIC1111 8ee1acc1e4
Merge pull request #5373 from mezotaken/master
add noise strength parameter similar to NAI
2022-12-10 09:36:24 +03:00
AUTOMATIC1111 e5e557fa5d
Merge pull request #5404 from szhublox/merger-ram-usage
Merger ram usage
2022-12-10 09:33:39 +03:00
AUTOMATIC 505ec7e4d9 cleanup some unneeded imports for hijack files 2022-12-10 09:17:39 +03:00
AUTOMATIC 7dbfd8a7d8 do not replace entire unet for the resolution hack 2022-12-10 09:14:45 +03:00
AUTOMATIC1111 2641d1b83b
Merge pull request #4978 from aliencaocao/support_any_resolution
Patch UNet Forward to support resolutions that are not multiples of 64
2022-12-10 08:45:41 +03:00
AUTOMATIC1111 4d5fe3bfc0
Merge pull request #5555 from ywx9/master
Bug fix (a few lines in modules/api/api.py)
2022-12-10 08:27:44 +03:00
AUTOMATIC1111 a42a8e9112
Merge pull request #5547 from Ju1-js/master
Make "# settings changed" grammatically correct
2022-12-10 08:20:22 +03:00
ywx9 9539c2045a Bug fix 2022-12-09 23:03:06 +09:00
Ju1-js ce04ba71b8 Make # settings changed message grammatically correct
Make the ": " in the settings changed message not show if 0 settings were changed.
"0 settings changed: ." -> "0 settings changed."
2022-12-08 22:47:45 -08:00
Jay Smith 1ed4f0e228 Depth2img model support 2022-12-08 20:50:08 -06:00
Andrew Ryan 358a8628f6 Add latent upscale option to img2img
Recently, the option to do latent upscale was added to txt2img highres
fix. This feature runs by scaling the latent sample of the image, and
then running a second pass of img2img.

But, in this edition of highres fix, the image and parameters cannot be
changed between the first pass and second pass. We might want to do a
fixup in img2img before doing the second pass, or might want to run the
second pass at a different resolution.

This change adds the option for img2img to perform its upscale in latent
space, rather than image space, giving very similar results to highres
fix with latent upscale.  The result is not exactly the same because
there is an additional latent -> decoder -> image -> encoder -> latent
that won't happen in highres fix, but this conversion has relatively
small losses
2022-12-08 07:09:09 +00:00
zhaohu xing 965fc5ac5a delete a file
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 16:15:15 +08:00
zhaohu xing 5dcc22606d add hash and fix undo hijack bug
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 16:04:50 +08:00
Zac Liu a25dfebeed
Merge pull request #3 from 920232796/master
fix device support for mps
update the support for SD2.0
2022-12-06 09:17:57 +08:00
Zac Liu 3ebf977a6e
Merge branch 'AUTOMATIC1111:master' into master 2022-12-06 09:16:15 +08:00
zhaohu xing 4929503258 fix bugs
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-06 09:03:55 +08:00
timntorres 7057c72ae3 Add opt. to avoid sending size between interfaces. 2022-12-05 03:41:36 -08:00
Mackerel 681c450ecd extras.py: use as little RAM as possible, misc fixes
maximum of 2 models loaded at once. delete unneeded model before next
step. fix 'teritary' -> 'tertiary'. gracefully fail when "add
difference" is selected without a tertiary model
2022-12-04 10:31:06 -05:00
AUTOMATIC 44c46f0ed3 make it possible to merge inpainting model with non-inpainting one 2022-12-04 12:30:44 +03:00
AUTOMATIC 8504db5170 fix #4459 breaking inpainting when the option is not specified. 2022-12-04 01:04:24 +03:00
AUTOMATIC 60bd4d52a6 fix incorrect file extension filter for deepdanbooru models 2022-12-03 18:46:09 +03:00
AUTOMATIC 4b0dc206ed use modelloader for #4956 2022-12-03 18:45:51 +03:00
AUTOMATIC1111 2a649154ec
Merge pull request #4956 from TiagoSantos81/offline_BLIP
[CLIP interrogator] use local file, if available
2022-12-03 18:17:56 +03:00
AUTOMATIC 0d21624cee move #5216 to the extension 2022-12-03 18:16:19 +03:00
AUTOMATIC 89e1df013b Merge remote-tracking branch 'wywywywy/autoencoder-hijack' 2022-12-03 18:08:10 +03:00
AUTOMATIC b6e5edd746 add built-in extension system
add support for adding upscalers in extensions
move LDSR, ScuNET and SwinIR to built-in extensions
2022-12-03 18:06:33 +03:00
Vladimir Repin cf3e844d1d add noise strength parameter similar to NAI 2022-12-03 18:05:47 +03:00
AUTOMATIC 46b0d230e7 add comment for #4407 and remove seemingly unnecessary cudnn.enabled 2022-12-03 16:01:23 +03:00
AUTOMATIC 2651267e3a fix #4407 breaking UI entirely for card other than ones related to the PR 2022-12-03 15:57:52 +03:00
AUTOMATIC1111 681c0003df
Merge pull request #4407 from yoinked-h/patch-1
Fix issue with 16xx cards
2022-12-03 10:30:34 +03:00
AUTOMATIC1111 d2e5b4edfa
Merge pull request #5251 from adieyal/bug/negative-prompt-infotext
Fixed incorrect negative prompt text in infotext
2022-12-03 10:21:43 +03:00
AUTOMATIC1111 c9a2cfdf2a
Merge branch 'master' into racecond_fix 2022-12-03 10:19:51 +03:00
AUTOMATIC1111 5cd5a672f7
Merge pull request #4459 from kavorite/color-sketch-inpainting
add `--gradio-inpaint-tool` and option to specify `color-sketch`
2022-12-03 10:06:27 +03:00
AUTOMATIC1111 a2feaa95fc
Merge pull request #5194 from brkirch/autocast-and-mps-randn-fixes
Use devices.autocast() and fix MPS randn issues
2022-12-03 09:58:08 +03:00
AUTOMATIC c7af672186 more simple config option name plus mouseover hint for clip skip 2022-12-03 09:41:39 +03:00
AUTOMATIC1111 c67d8bca4f
Merge pull request #5304 from space-nuko/fix/clip-skip-application
Fix clip skip of 1 not being restored from prompts
2022-12-03 09:37:10 +03:00
AUTOMATIC1111 28c79b8f05
Merge pull request #5328 from jcowens/fix-typo
fix typo
2022-12-03 09:20:39 +03:00
AUTOMATIC1111 eb0b8f92bc
Merge pull request #5331 from smirkingface/openaimodel_fix
Fixed AttributeError where openaimodel is not found
2022-12-03 09:18:36 +03:00
AUTOMATIC1111 bab6ea6b22
Merge pull request #5340 from PhytoEpidemic/master
Fix divide by 0 error
2022-12-03 09:17:54 +03:00
AUTOMATIC b2f17dd367 prevent include_init_images from being passed to StableDiffusionProcessingImg2Img in API #4989 2022-12-03 09:15:24 +03:00
AUTOMATIC1111 ae81b377d4
Merge pull request #5165 from klimaleksus/fix-sequential-vae
Make VAE step sequential to prevent VRAM spikes, will fix #3059, #2082, #2561, #3462
2022-12-03 08:29:56 +03:00
PhytoEpidemic 119a945ef7
Fix divide by 0 error
Fix of the edge case 0 weight that occasionally will pop up in some specific situations. This was crashing the script.
2022-12-02 12:16:29 -06:00
SmirkingFace da698ca92e Fixed AttributeError where openaimodel is not found 2022-12-02 13:47:02 +01:00
jcowens 99b19b1a8f fix typo 2022-12-02 02:53:26 -08:00
SmirkingFace e461477869 Fixed safe.py for pytorch 1.13 ckpt files 2022-12-02 11:12:13 +01:00
zhaohu xing 9c86fb8cac fix bug
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-12-02 16:08:46 +08:00
space-nuko be2e6de94a Fix clip skip of 1 not being restored from prompts 2022-12-01 11:34:16 -08:00
brkirch 0fddb4a1c0 Rework MPS randn fix, add randn_like fix
torch.manual_seed() already sets a CPU generator, so there is no reason to create a CPU generator manually. torch.randn_like also needs a MPS fix for k-diffusion, but a torch hijack with randn_like already exists so it can also be used for that.
2022-11-30 10:33:42 -05:00
brkirch 4d5f1691dd Use devices.autocast instead of torch.autocast 2022-11-30 10:33:42 -05:00
brkirch 21effd629d Add workaround for using MPS with torchsde 2022-11-30 10:33:39 -05:00
Adi Eyal a44994e2c9 Fixed incorrect negative prompt text in infotext
Previously only the first negative prompt in all_negative_prompts was
being used for infotext. This fixes that by selecting the index-th
negative prompt
2022-11-30 15:23:53 +02:00
Billy Cao 3a724e91a2 Change to steps of 8 2022-11-30 20:52:32 +08:00
zhaohu xing 52cc83d36b fix bugs
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-11-30 14:56:12 +08:00
zhaohu xing 0831ab476c
Merge branch 'master' into master 2022-11-30 10:13:17 +08:00
wywywywy 7193814cf7
Added purpose of this hijack to comments 2022-11-29 19:22:53 +00:00
wywywywy 36c3613d16
Add autoencoder to sd_hijack 2022-11-29 17:40:02 +00:00
wywywywy 241cbc4d2f
Hijack VQModelInterface back to AutoEncoder 2022-11-29 17:38:16 +00:00
AUTOMATIC 4b3c5bc24b Merge remote-tracking branch 'pattontim/safetensors' 2022-11-29 17:06:15 +03:00
Billy Cao 9a8678f61e Support changing checkpoint and vae through override_settings 2022-11-29 11:11:29 +08:00
zhaohu xing 75c4511e6b add AltDiffusion to webui
Signed-off-by: zhaohu xing <920232796@qq.com>
2022-11-29 10:28:41 +08:00
brkirch 98ca437edf Refactor and instead check if mps is being used, not availability 2022-11-28 21:18:51 -05:00
klimaleksus 67efee33a6
Make VAE step sequential to prevent VRAM spikes 2022-11-28 16:29:43 +05:00
AUTOMATIC 0b5dcb3d7c fix an error that happens when you type into prompt while switching model, put queue stuff into separate file 2022-11-28 09:00:10 +03:00
AUTOMATIC 0376da180c make it possible to save nai model using safetensors 2022-11-28 08:39:59 +03:00
AUTOMATIC bb11bee22a if image on disk was deleted between being generated and request being completed, do use temporary dir to store it for the browser 2022-11-27 23:14:13 +03:00
AUTOMATIC aa12dfada0 fix the bug that makes it impossible to send images to other tabs 2022-11-27 23:04:42 +03:00
AUTOMATIC1111 39827a3998
Merge pull request #4688 from parasi22/resolve-embedding-name-in-filewords
resolve [name] after resolving [filewords] in training
2022-11-27 22:46:49 +03:00
uservar 9146a5884c
Better should hijack inpainting detection 2022-11-27 19:11:50 +00:00
AUTOMATIC1111 9e78d2c419
Merge pull request #4416 from Keavon/cors-regex
Add CORS-allow policy launch argument using regex
2022-11-27 18:50:12 +03:00
AUTOMATIC1111 ef567b083c
Merge pull request #4919 from brkirch/deepbooru-fix
Fix support for devices other than CUDA in DeepBooru
2022-11-27 16:59:22 +03:00
AUTOMATIC1111 554787231a
Merge pull request #5117 from aliencaocao/fix_api_sampler_name
Fix api ignoring sampler_name settings
2022-11-27 16:51:47 +03:00
AUTOMATIC1111 b24aed0b69
Merge pull request #4960 from Hugo-Matias/master
fix null negative_prompt on get requests
2022-11-27 16:36:29 +03:00
AUTOMATIC 8c13f3a2a5 cherrypick from #4971 2022-11-27 16:35:35 +03:00
AUTOMATIC1111 c33b9a6da7
Merge pull request #4583 from NoCrypt/patch-1
Forcing HTTPS instead of HTTP for ngrok
2022-11-27 16:30:23 +03:00
AUTOMATIC 506d529d19 rework #5012 to also work for pictures dragged into the prompt and also add Clip skip + ENSD to parameters 2022-11-27 16:28:32 +03:00
cat 185ab3cbd1 Atomically rename saved image to avoid race condition with other processes. 2022-11-27 18:23:08 +05:00
Billy Cao 06ada734c7 Prevent warning on sampler_index if sampler_name is being used 2022-11-27 21:19:47 +08:00
Billy Cao 3cf93de24f Fix sampler_name for API requests are being ignored 2022-11-27 21:12:37 +08:00
AUTOMATIC1111 488f831d52
Merge pull request #5012 from Nandaka/master
Support NAI style exif in PNG Info for Send... buttons
2022-11-27 15:57:50 +03:00
AUTOMATIC1111 9ec0a41a58
Merge pull request #4977 from sena-nana/master
Fix API img2img not accepting bare base64 strings
2022-11-27 15:54:39 +03:00
AUTOMATIC dac9b6f15d add safetensors support for model merging #4869 2022-11-27 15:51:29 +03:00
AUTOMATIC 6074175faa add safetensors to requirements 2022-11-27 14:46:40 +03:00
AUTOMATIC1111 f108782e30
Merge pull request #4930 from Narsil/allow_to_load_safetensors_file
Supporting `*.safetensors` format.
2022-11-27 14:36:55 +03:00
AUTOMATIC1111 a89d7f4f38
Merge pull request #4913 from dtlnor/deprecated-deepdanbooru-patch
Remove cmd args requirement for deepdanbooru
2022-11-27 14:19:32 +03:00
AUTOMATIC1111 eb08550108
Merge pull request #4663 from xucj98/draft
fix the model name error of Real-ESRGAN in the opts default value
2022-11-27 14:16:45 +03:00
AUTOMATIC1111 ca8c764af8
Merge pull request #4986 from mcmonkey4eva/add-model-name
add model_name pattern for saving
2022-11-27 13:58:34 +03:00
AUTOMATIC1111 8de897b3da
Merge pull request #5085 from MrCheeze/sd-2.0-automatic-2
no-half support for SD 2.0
2022-11-27 13:54:08 +03:00
AUTOMATIC1111 01f2ed6844
Merge pull request #5065 from JaySmithWpg/vram-leak
#3449 - VRAM leak when switching to/from inpainting checkpoint
2022-11-27 13:52:14 +03:00
AUTOMATIC1111 151e2cc627
Merge pull request #4461 from brkirch/face-restoration-device-fix
Fix setting device for GFPGAN and CodeFormer
2022-11-27 13:48:25 +03:00
AUTOMATIC1111 cc90dcc933
Merge pull request #4918 from brkirch/pytorch-fixes
Fixes for PyTorch 1.12.1 when using MPS
2022-11-27 13:47:01 +03:00
AUTOMATIC 10923f9b3a calculate dictionary for sampler names only once 2022-11-27 13:43:10 +03:00