Commit Graph

749 Commits (d4e8a37ed4d9f39d5f201ccbf2f3c9f0fa8d3f4b)

Author SHA1 Message Date
lvmin fa994bb2ff fix shuffle seed 2023-04-15 13:22:38 -07:00
lvmin 6cda5ed62d fix shuffle seed 2023-04-15 12:49:11 -07:00
lvmin 408a6a79e9 put none in first 2023-04-15 12:24:31 -07:00
lvmin d7bc3d4383 sort preprocessor 2023-04-15 12:20:00 -07:00
lvmin 727c6e3e3b do not invert softpidi 2023-04-15 12:10:20 -07:00
Mikubill 5bad033b07 fix: add auto-inversion for lineart-* models (https://github.com/Mikubill/sd-webui-controlnet/issues/736#issuecomment-1509890905) 2023-04-15 16:57:24 +00:00
Mikubill 3b7e491974 add support for global_average_pooling 2023-04-15 15:11:14 +00:00
Kakigōri Maker 3d000778ea
Merge branch 'main' into cnet-1.1 2023-04-15 19:41:11 +09:00
Kakigōri Maker d575ccf5d6
Merge pull request #720 from DanielKauss/fix-hires
Use image scaled to target resolution for hires fix
2023-04-15 19:39:32 +09:00
Kakigōri Maker 345330cb19
Update controlnet.py 2023-04-15 19:37:11 +09:00
Kakigōri Maker 5384ddafa5
Update hook.py 2023-04-15 19:35:23 +09:00
Mikubill b7a2058419 fix: deprec thr-based inversion (and #736), cleanup code 2023-04-15 07:41:26 +00:00
Kakigōri Maker e5b565e27f
Merge pull request #741 from Norne9/fix_resolution_mismatch
Fix resolution mismatch in inpaint
2023-04-14 01:38:14 +09:00
Aleksey Pestov 86aa5d415c Fixed inpainting for same or lower resolution images 2023-04-13 17:13:58 +03:00
RcINS b1c0bc62e0 Add {lineart, lineart_anime, normalbae, oneformer, shuffle, zoe} annotator 2023-04-13 18:01:29 +08:00
Kakigōri Maker ae2b83ce47
Revert "Create __init__.py" 2023-04-13 16:57:43 +09:00
Kakigōri Maker d0ff352372
Merge pull request #729 from cxDosx/main
add RGB to BGR in api
2023-04-13 15:00:56 +09:00
DanielKauss ff9ea88525 Fixed batches, fixed support for extensions 2023-04-12 19:29:25 +02:00
Souradip Mookerjee 8dd39d61b7
Create __init__.py
Fix bug when loading controlnet into webui
2023-04-12 09:46:10 +01:00
cxDosx d480b1f188 support RGB to BGR in api 2023-04-11 16:37:02 +08:00
DoubleCai 12b925b21f Fix response serialization error 2023-04-11 13:53:52 +08:00
DanielKauss c5403ced56 Merge branch 'fix-hires' of https://github.com/DanielKauss/sd-webui-controlnet into fix-hires 2023-04-10 16:09:23 +02:00
DanielKauss c97735fefd added check to see if hint_cond was modified externally 2023-04-10 16:09:09 +02:00
DanielKauss fddbc836db
exchange issubclass for isinstance
Co-authored-by: ljleb <lebel.louisjacob@gmail.com>
2023-04-10 01:29:21 +02:00
DanielKauss c4158b0931
Merge branch 'main' into fix-hires 2023-04-09 20:41:43 +02:00
DanielKauss bd4f1a1e13 When using hires fix, controlnet now uses a higher resolution image 2023-04-09 19:36:32 +02:00
Kakigōri Maker 187ae88038
Merge pull request #702 from AlUlkesh/main
Adding elem_ids to target controlnet image
2023-04-09 19:29:45 +09:00
Kakigōri Maker da4eed03e9
Merge pull request #694 from chrisgoringe/req/633
Req/633
2023-04-09 19:01:49 +09:00
Aleksey Pestov c9993fdb84 Fix image cropping problem for inpaint 2023-04-03 13:27:24 +03:00
AlUlkesh 3c3b3425c5 Adding elem_ids to target controlnet image 2023-04-02 19:19:57 +02:00
Chris c3a8ac9da8 oops 2023-04-01 23:36:15 +11:00
Chris 5de9f6bab9 s 2023-04-01 22:08:02 +11:00
Chris 7021aeab97 save fake clip_vision map 2023-04-01 22:08:02 +11:00
Joseph Catrambone f2c6341c9c Fix issue with thresholds not being accepted by mediapipe function. 2023-03-31 12:00:02 -07:00
Joseph Catrambone 50a4865525 Forgot to connect UI components. 2023-03-31 11:42:41 -07:00
Joseph Catrambone 51cbd171f4 Default to 0.5 confidence. Handle an edge case where result set is null rather than empty. 2023-03-31 11:33:15 -07:00
Joseph Catrambone 4adb9a38b9 Make min_confidence a required parameter. Change the default max faces to 10. 2023-03-31 11:26:54 -07:00
Joseph Catrambone 42a25e0b5c Update UI to allow number of faces and confidence to be selected. 2023-03-31 10:57:10 -07:00
Joseph Catrambone eeb27da545 Missed a few references. Renaming. 2023-03-31 10:49:31 -07:00
Joseph Catrambone 3cd07a6ee8 Rename mediapipe_laion_face to mediapipe_face. 2023-03-31 10:48:17 -07:00
Joseph Catrambone f4d728539c Move the copy from controlnet's internals back into laion_face_common to see if we can alleviate the negative stride without changing the codebase. 2023-03-31 10:31:55 -07:00
Joseph Catrambone 869602ffb0 Correctly return image. Perform a copy of detected_map because of 'ValueError: At least one stride in the given numpy array is negative'. Will have to ask why this happens. 2023-03-31 10:02:58 -07:00
Joseph Catrambone a2c1561c1f Fix processor script + init to correctly generate processed face. 2023-03-30 17:12:03 -07:00
Joseph Catrambone 78833dce35 Add MediaPipe Face conditioning as a step. 2023-03-30 16:30:41 -07:00
Vespinian a2e9b50f4b Patched unit module being None, by passing default_unit.module value if None in the parse_remote_call function, Updated test so they execute the tests correctly with controlnet units either in alwayson_scripts or with the control_units param 2023-03-29 20:48:18 -04:00
DiligentCatCat b8fdfb19f9 feat: use the closest model if model is not found 2023-03-23 16:16:00 +08:00
Kakigōri Maker 2f0e67329d
fix: add option for field sync (#647) 2023-03-22 02:37:51 +09:00
Kakigōri Maker 7cea487333
Merge pull request #642 from ljleb/fix-image-clear
Fix: clearing a control unit image does not do anything
2023-03-21 18:58:11 +09:00
space-nuko 3f5c272098 Improve startup performance by not deepcopying component state 2023-03-21 02:51:20 -04:00
ljleb b69beaa290 fix: clearing image does not work 2023-03-20 21:21:59 -04:00
Kakigōri Maker dbdd6b1b02
Merge pull request #621 from Dradows/fixFit
Fix inner fit and outer fit
2023-03-20 05:23:28 +09:00
Kakigōri Maker 81f8f0f8aa
Merge pull request #625 from space-nuko/send_params_img2img
Enable passing ControlNet parameters with "Send to img2img"
2023-03-20 00:34:41 +09:00
Kakigōri Maker cb28aa2dce
Update controlnet.py 2023-03-20 00:26:17 +09:00
FNSpd d78a132155
Update adapter.py 2023-03-19 19:03:33 +04:00
FNSpd c3c582358c
Support of --upcast-sampling for T2I-Adapters 2023-03-19 18:51:53 +04:00
Kakigōri Maker de8fdeff37
Merge pull request #600 from mishafarms/movie2movie_pre
added preprocessor save in movie2movie.py and made unique filenames
2023-03-19 01:12:14 +09:00
Michael 66957f7fbd remove some blank lines 2023-03-17 23:10:32 -07:00
Michael efa3e31630 Updated to put the dictionaries in global_state.py 2023-03-17 23:05:42 -07:00
space-nuko 4932a856f9
Merge branch 'main' into send_params_img2img 2023-03-17 21:45:15 -04:00
space-nuko 3c14cce4cf Enable passing ControlNet parameters with "Send to txt2img" 2023-03-17 20:52:06 -04:00
Michael cd2f25529c Added a method to get the list of preprocessors 2023-03-17 16:26:59 -07:00
Blaston cc48cc694c fix inner fit and outer fit 2023-03-18 01:38:12 +08:00
Blaston ffb7f09726 fix inner fit and outer fit v2 2023-03-18 01:24:27 +08:00
Blaston de1b5c1607 fix inner fit and outer fit 2023-03-18 01:16:54 +08:00
ljleb b8d236cc09
Revert "add back preprocessor in api" 2023-03-17 05:15:07 -04:00
ljleb 34ff08d2fe add back preprocessor 2023-03-17 03:55:17 -04:00
ljleb 296c791d27
Revert "Added a new API call to get the preprocessor list" 2023-03-17 03:48:07 -04:00
ljleb 1681ae4eae
Merge pull request #601 from mishafarms/api_preprocessors
Added  a new API call to get the preprocessor list
2023-03-17 03:37:02 -04:00
ljleb fd3e58a852 move dict directly to global_state 2023-03-17 03:29:29 -04:00
ljleb 2aa9c048cf fix: ignore kwargs 2023-03-17 02:03:54 -04:00
ljleb 6e339e9b57
fix: sensible defaults for remote call units (#606) 2023-03-15 16:06:42 -04:00
ljleb 426014e633
fix: #602 (#605) 2023-03-15 15:44:07 -04:00
mishafarms 87db009295 Merge remote-tracking branch 'origin/main' into movie2movie_pre 2023-03-15 10:04:15 -07:00
Michael 8a03b2a082 use a better name in the function 2023-03-15 10:01:46 -07:00
Michael 3f28601896 Updated to use global_state 2023-03-15 09:56:04 -07:00
mishafarms 1159366077 Merge remote-tracking branch 'origin/api_preprocessors' into api_preprocessors
# Conflicts:
#	scripts/controlnet.py
#	scripts/external_code.py
2023-03-15 09:50:46 -07:00
Michael 25772cfe34 Updated to use global_state 2023-03-15 09:49:36 -07:00
mishafarms 57a1cfb65d Merge remote-tracking branch 'origin/main' into api_preprocessors
# Conflicts:
#	scripts/controlnet.py
#	scripts/external_code.py
2023-03-15 07:25:03 -07:00
Kakigōri Maker a3c424f5dc
Merge branch 'main' into api_preprocessors 2023-03-15 22:25:44 +09:00
ljleb fdfeb378a0 typpo 2023-03-15 02:58:52 -04:00
ljleb e1fe7421c9 merge main 2023-03-15 01:51:52 -04:00
Michael cb46a182df Added a new API call to get the preprocessor list 2023-03-14 22:28:17 -07:00
Michael 0f60881408 added preprocessor save in movie2movie.py and made unique filenames 2023-03-14 22:05:30 -07:00
ljleb fd753f22a1 workaround for is_img2img and is_ui 2023-03-14 22:06:05 -04:00
ljleb 2db7eee81e test image dict getter 2023-03-14 20:46:16 -04:00
ljleb e0d94846f4 add test for mask property 2023-03-14 19:51:39 -04:00
ljleb 9c34a59684 reload modules for users that dont fully restart webui 2023-03-14 19:23:18 -04:00
ljleb 1d44dd7984 refactor and diff main 2023-03-14 18:57:19 -04:00
ljleb 40934b81b9 more tests 2023-03-14 18:28:31 -04:00
ljleb 3c273363df revert relative imports 2023-03-13 20:19:19 -04:00
ljleb 88919de14b workaround for torch check 2023-03-13 20:10:21 -04:00
ljleb 571e4c9413 remove is_img2img from args, fix 2023-03-13 16:49:37 -04:00
Vladimir Mandic c13423af0f
skip process if nothing to do 2023-03-13 15:19:31 -04:00
ljleb ed51ee5099 fix xyz support imports 2023-03-13 15:13:53 -04:00
ljleb a9f9613f1a add back changes 2023-03-13 14:48:05 -04:00
Kakigōri Maker 094c79bbb0
Revert "Deprecate `/controlnet/*2img` web API in favor of new alwayson_scripts support" 2023-03-14 02:05:29 +09:00
Kakigōri Maker 6a5580ca7c
Merge pull request #527 from ljleb/array-of-struct
Deprecate `/controlnet/*2img` web API in favor of new alwayson_scripts support
2023-03-13 20:58:34 +09:00
Mikubill bbd5dd2a0e fix: add UniPC to vanilla samplers (#577), add tests 2023-03-13 09:43:26 +00:00
ljleb 73922d57fa deprecation message 2023-03-13 04:16:04 -04:00
ljleb d2258de440 restore initial value 2023-03-13 04:05:57 -04:00
ljleb fe37cb2f6f txt2img fix 2023-03-13 04:00:48 -04:00
ljleb 9c695c1941 Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet into array-of-struct 2023-03-13 03:36:35 -04:00
ljleb f6186bc2f9 move globals to global_state file 2023-03-13 03:07:41 -04:00
ljleb f0fc18d182 default gradio values 2023-03-13 01:54:57 -04:00
ljleb fbb6354ba7 fix obvious bugs 2023-03-12 23:32:46 -04:00
ljleb 545715c37e use correct function 2023-03-12 23:30:04 -04:00
ljleb 53806d4a5e fix obvious bugs 2023-03-12 23:28:42 -04:00
PhoenixCreation d7ee999ce4 Add str check for image for API compatibility, #567 2023-03-12 16:25:12 +05:30
BoringCrypto f39578a9b0 no_detectmap_opt fix
When no_detectmap_opt was set, execution would stop in postprocessing, failing to release (retore) the controlnet from the model and clearing `latest_network` and `input_image`
2023-03-10 16:42:41 +07:00
Guillaume Faguet e6553457e9 additional comments, apply_field_ modif 2023-03-09 08:33:02 +01:00
Guillaume Faguet 567883e236 xyz_refactor 2023-03-08 16:42:36 +01:00
aiton-sd 3cce511ae5
Code cleanup. 2023-03-08 20:42:46 +09:00
Mikubill ce365d1a49 Revert "fix: use lazy resize to handle hires stuff"
This reverts commit c3d2a68a22.
2023-03-08 10:29:28 +00:00
Mikubill 5cc876276a fix: skip if detectmap is None (#534) 2023-03-08 08:46:58 +00:00
Mikubill c3d2a68a22 fix: use lazy resize to handle hires stuff
Note: this may break some generation with hires enabled.
Deprecated: control_net_only_midctrl_hires is removed, use control_net_only_mid_control instead.
2023-03-08 05:04:51 +00:00
Mikubill 62427e2a0c chore: cleanup debug log 2023-03-08 03:54:18 +00:00
Mikubill 5dfdc772d4 fix: resize issue with t2i-adapter/color alignment 2023-03-08 03:52:21 +00:00
ljleb 2419fc95d4 draft 2023-03-07 16:51:15 -05:00
Mikubill fed7a52909 fix: allow style models weight 2023-03-07 09:57:55 +00:00
Mikubill 457f01bc5b fix: reduce warning 2023-03-07 05:17:03 +00:00
Mikubill 06afffe08b fix: typo from previous PR 2023-03-07 02:28:27 +00:00
Mikubill 6dd043aad3 fix: make StyleAdapter works with controlnet (#512) 2023-03-06 16:59:46 +00:00
Kakigōri Maker f51b2174ec
Merge pull request #469 from ljleb/ext-api-base
basic external code api
2023-03-06 22:46:01 +09:00
Kakigōri Maker c6e26f49f1
Merge pull request #508 from Guillaume-Fgt/autosaving-none
No autosave if preprocessor is none
2023-03-06 21:03:36 +09:00
Mikubill d41c470ebc fix: minor fix for fake_scribble 2023-03-06 11:12:23 +00:00
Guillaume Faguet 6f0b923df8 no autosave if preprocessor is none 2023-03-06 10:46:00 +01:00
ljleb 5d805afa03 unnecessary if 2023-03-06 00:58:26 -05:00
ljleb 8d8342c6d1 use kwargs 2023-03-06 00:54:01 -05:00
ljleb 080d605130 add get_all_units_in_processing 2023-03-06 00:28:49 -05:00
ljleb 7ba2813600 fix args diff 2023-03-06 00:16:31 -05:00
ljleb e4d3205435 dont update if script args not a list of script args 2023-03-06 00:07:58 -05:00
ljleb d3046c2f46 document ResizeMode 2023-03-05 23:55:05 -05:00
ljleb 3c0f00de64 document ResizeMode 2023-03-05 23:54:37 -05:00
ljleb b9825ec52c fix bug 2023-03-05 23:22:58 -05:00
ljleb 3866561da0 docstring 2023-03-05 23:21:44 -05:00
ljleb 839ba111e5 docstring 2023-03-05 23:20:22 -05:00
ljleb 2b748a8104 feedback 2023-03-05 23:11:27 -05:00
ljleb 91888ab6c8 feedback 2023-03-05 23:03:05 -05:00
ljleb a6dfc39115 feedback 2023-03-05 23:00:03 -05:00
ljleb 1e7453a532 feedback 2023-03-05 22:55:39 -05:00
ljleb 31eb7f8580 remove moved code 2023-03-05 14:42:48 -05:00
ljleb 60a4ccde93 remove moved code 2023-03-05 14:41:56 -05:00
ljleb 9508427af0 remove inner f 2023-03-05 14:38:08 -05:00
ljleb 228f12d917 merge main 2023-03-05 14:37:11 -05:00
kft334 ac8007cce2
Fix detect endpoint 2023-03-05 12:17:47 -05:00
Kakigōri Maker dcd083278a
Merge pull request #495 from KurozumiGH/preproc_binary
Add binary preprocessor
2023-03-06 02:08:13 +09:00
Kakigōri Maker 2cfebfd50a
Update controlnet.py 2023-03-06 02:07:49 +09:00
Mikubill 63f7d3c2a6 fix: annotator preview issue (#496) 2023-03-05 16:49:43 +00:00
Yoshitada Kurozumi b49d3375ca Add binary preprocessor 2023-03-06 01:09:34 +09:00
Kakigōri Maker eab5bc08cb
Merge pull request #479 from catboxanon/new-t2i-adapters
Support for new T2I adapters (color, style)
2023-03-05 23:50:54 +09:00
Kakigōri Maker 2456b78c02
Merge pull request #428 from LonicaMewinsky/main
Added "send dimensions" button
2023-03-05 21:06:30 +09:00
Kakigōri Maker 5046bd8f0e
Merge branch 'main' into main 2023-03-05 20:38:25 +09:00
Kakigōri Maker dafa4c5144
Merge pull request #492 from jn-jairo/model-cache
Fix model cache
2023-03-05 20:37:35 +09:00
Mikubill b64b7c9ed8 minor fix 2023-03-05 08:27:26 +00:00
PhoenixCreation 054f4d86d1 Removed usage of `imgs` 2023-03-05 13:08:53 +05:30
PhoenixCreation 3e06d3f37f Updated path mechanism for movie2movie 2023-03-05 12:57:36 +05:30
Mikubill cdc807ad55 feat: add color annotator, minor fix 2023-03-05 04:54:18 +00:00
Mikubill 9acfb6d89e feat: add clip_vision annotator, support non-image input 2023-03-05 04:27:36 +00:00
Kakigōri Maker d314d1b07d
Merge pull request #486 from aiton-sd/main
Support for specifying a range of numbers.
2023-03-05 12:52:48 +09:00
Derek Elkins bb2c1240de Make model cache logic more sensible. 2023-03-04 19:23:43 -08:00
Jairo Correa a2c4bb291a Fix model cache 2023-03-04 23:45:49 -03:00
ljleb 85948a3264 do nothing when cn script not in always-on scripts 2023-03-04 14:52:22 -05:00
ljleb 8ef69b1fa8 invert condition 2023-03-04 13:28:05 -05:00
ljleb f8d4bac587 preserve is_ui and is_img2img when not specified 2023-03-04 13:20:05 -05:00
ljleb 2c9b11fbf0 comma 2023-03-04 11:03:47 -05:00
ljleb feea98d15b allow int for resize_mode in external_code 2023-03-04 10:51:24 -05:00
ljleb 346676f416 allow int for resize_mode in api requests 2023-03-04 10:28:57 -05:00
ljleb 9108199a22 allow int for resize_mode in api requests 2023-03-04 10:28:37 -05:00
ljleb 7f63b8cc15 merge main 2023-03-04 10:03:03 -05:00
ljleb 6d1dbf3ee9 use right function name 2023-03-04 09:53:49 -05:00
ljleb 57ed434ee4 static script cache 2023-03-04 09:43:47 -05:00
ljleb 7d4f274ecc use external_code 2023-03-04 09:25:18 -05:00
ljleb e93e286af8 docstrings 2023-03-04 09:16:00 -05:00
ljleb 525e19133f refact 2023-03-04 08:36:33 -05:00
ljleb cb0382daf6 refact 2023-03-04 08:33:06 -05:00
aiton-sd 92b105a912
Support for specifying a range of numbers. 2023-03-04 22:19:17 +09:00
catboxanon bff62eda02
fix: elif typo 2023-03-03 20:30:42 -05:00
catboxanon fae1b09bbf
Repair loading style adapter 2023-03-03 20:17:14 -05:00
ljleb 09a403de79 basic external code api 2023-03-03 20:12:55 -05:00
catboxanon c5c6c9e536
Load style adapter (still not 100% functional) 2023-03-03 20:01:05 -05:00
catboxanon 3792adb020
Check if state_dict has style_embedding key 2023-03-03 19:53:08 -05:00
catboxanon e3bf5ead9a
Initial support for color adapter 2023-03-03 19:41:37 -05:00
Kakigōri Maker 1031a902f3
Merge pull request #463 from ljleb/private-deprecate-api
use private '_deprecated' field to hide deprecated fields from docs instead
2023-03-03 11:56:49 +09:00
ljleb 44a92862a6 dont use existing deprecated field in api 2023-03-02 21:52:25 -05:00
Kakigōri Maker 48fce60f24
Merge pull request #453 from aiton-sd/main
Changed the location from which to read values from p.
2023-03-02 21:55:12 +09:00
Mikubill 9b19c63e98 fix: filepath issue (#446) 2023-03-02 11:38:18 +00:00
aiton-sd c1b05db76c
Changed the location from which to read values from p. 2023-03-02 20:32:25 +09:00
LonicaMewinsky 1ec7c9023d
Merge branch 'Mikubill:main' into main 2023-03-01 22:54:49 -06:00
Mikubill 513fd8fbeb Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet 2023-03-02 00:16:26 +00:00
Mikubill bc1e0ec862 fix: filepath import issue (#446) 2023-03-02 00:16:20 +00:00
aiton-sd 65b06db0bc
Support for older versions of Python. 2023-03-02 06:13:53 +09:00
aiton-sd 528c61a849
Bug fixing and code improvement. 2023-03-02 04:35:32 +09:00
Mikubill 7377d4990a Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet 2023-03-01 13:06:26 +00:00
Mikubill e3c4232bf2 fix: minor fix - remove unused params 2023-03-01 13:06:24 +00:00
Kakigōri Maker c27dbecac1
Merge pull request #376 from vladmandic/allow-relative-paths
allow relative paths
2023-03-01 22:02:30 +09:00
Mikubill 7e9fbc78a9 fix: minor fix 2023-03-01 02:00:19 +00:00
Mikubill 96f2e1c12b fix: revert #350 - h/w differ from input, reproducibility (#430)
will use another apporach later
2023-03-01 00:37:14 +00:00
LonicaMewinsky 1f0f001850
Update scripts/controlnet.py
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-02-28 18:13:58 -06:00
LonicaMewinsky e72b129837 Added func to ensure sent values are /8 2023-02-28 15:52:48 -06:00
LonicaMewinsky e223cdd255 Added "send dimensions" button 2023-02-28 15:18:54 -06:00
Kakigōri Maker 2ce17c0a2b
Merge pull request #407 from aiton-sd/main
Added support for Multi-ControlNet (list notation).
2023-03-01 01:06:10 +09:00
Kakigōri Maker 7be18a9fdb
Merge pull request #350 from ZhUyU1997/dev-yu-zhu
fix: calculate size to fit output image
2023-02-28 23:07:18 +09:00
aiton-sd 9897b9f7e0
Code cleanup (probably the last). 2023-02-28 19:35:03 +09:00
aiton-sd 51935cd156
A minor change. 2023-02-28 14:34:58 +09:00
aiton-sd 81aabe1369
Improve the code. 2023-02-28 14:18:47 +09:00
aiton-sd 9e9a20ed23
Improving code readability. 2023-02-28 11:31:50 +09:00
Mikubill 3a1c5b9f3c fix: add missing line (#415) 2023-02-27 19:57:39 +00:00
Kakigōri Maker 93e723c0f0
Merge pull request #415 from ljleb/fix-grayscale-api
fix: extend grayscale mask to shape (x, y, 1) in api
2023-02-28 04:47:21 +09:00
Mikubill e63cb23921 fix: reload config from infotext field (#412) 2023-02-27 19:45:20 +00:00
ljleb 937a7016fc fix: extend grayscale mask 2023-02-27 14:44:46 -05:00
aiton-sd 8734e3c50a
In non-list notation, support for None and empty string has been added. 2023-02-28 02:55:05 +09:00
aiton-sd 9ad92763d1
Further fixes. 2023-02-28 01:59:31 +09:00
aiton-sd a53bc76879
Bug fixes and function reordering. 2023-02-28 01:41:52 +09:00
ljleb 38a11aac39 fix no input image in cn unit 2023-02-27 10:22:47 -05:00
aiton-sd 82307bd13c
Added support for Multi-ControlNet (list notation). 2023-02-27 20:33:47 +09:00
aiton-sd 8753ef58a2
Enable controls for 'Enabled' in the script. 2023-02-27 18:33:53 +09:00
Kakigōri Maker 8ca06ba8eb
Merge pull request #383 from rulyone/controlnet_batch
Controlnet batch support
2023-02-27 17:40:40 +09:00
Mikubill 511e254c48 fix: backward compatibility 2023-02-27 08:00:24 +00:00
Ashen a3f1ab8aaf 🔀 resolve conflict w.r.t. latest changes to api.py
Merge branch 'main' into feature/guidance-start

# Conflicts:
#	scripts/api.py
2023-02-26 23:33:35 -08:00
Kakigōri Maker 46befda39c
Merge pull request #384 from ljleb/api-multi-cn
Multiple control units in API
2023-02-27 16:10:27 +09:00
Kakigōri Maker 1159888286
fix: minor fix for deprecated_defaults 2023-02-27 16:09:06 +09:00
Ashen b552ce2f86 👌 🐛 fixing parse_remote_call according to newly introduced PARAM_COUNT global variable 2023-02-26 23:05:18 -08:00
ljleb 2ba29fb14d refact 2023-02-26 23:35:24 -05:00
ljleb 335a094475 make selectable script work 2023-02-26 22:57:23 -05:00
ljleb 48f0480d95 warning 2023-02-26 22:10:09 -05:00
ljleb 2b378db229 remove limit in case we want batch size 2023-02-26 21:37:59 -05:00
ljleb 2547d9d514 found the bug 2023-02-26 21:12:02 -05:00
ljleb 65c66ebee6 return pil 2023-02-26 20:42:18 -05:00
ljleb 38347c020b refact 2023-02-26 20:33:15 -05:00
ljleb a08d817c02 replace img2img route, refactor 2023-02-26 18:55:28 -05:00
ljleb 8c9bbb4410 refact 2023-02-26 17:45:42 -05:00
ljleb 97c32eb95c refcat 2023-02-26 17:00:43 -05:00
ljleb 73cbaf78e4 merge /controlnet/txt2img routes, hide old fields 2023-02-26 15:15:46 -05:00
Ashen 440927d671 🧱 Apply "Guidance Start" parameter related change to api.py and xyz_grid_support.py 2023-02-26 10:58:37 -08:00
Mikubill 0c45b5ad6b fix: cleanup log outputs 2023-02-26 18:37:20 +00:00
Ashen ce5dc9f418 Added guidance start parameter. 2023-02-26 08:28:28 -08:00
ljleb 733b719620 tested concurrent requests 2023-02-26 11:21:30 -05:00
ljleb a03d1b64e4 queue lock reset on except 2023-02-26 10:53:26 -05:00
ljleb ffb580bb16 fix queue lock concurrency (hopefully) 2023-02-26 01:40:56 -05:00
ljleb c478e73de2 override sd txt2img init 2023-02-26 01:23:38 -05:00
ljleb 9aae869582 small refact 2023-02-25 23:56:55 -05:00
ljleb e8c8ea365d fix small overlook 2023-02-25 23:17:41 -05:00
mattyamonaca 8b618efed7 remove delete bg func 2023-02-26 12:56:21 +09:00
mattyamonaca 510efc09fd remove space 2023-02-26 12:54:29 +09:00
mattyamonaca 4e1b4223f4 add duration opt 2023-02-26 12:51:22 +09:00
ljleb 59c0d5b35e API multi cn 2023-02-25 22:37:42 -05:00
mattyamonaca a4dbd87101 Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet into develop 2023-02-26 10:51:57 +09:00
mattyamonaca 44008c700e Adapted to #335 2023-02-26 10:51:04 +09:00
Pablo Martinez 70d4e34ecd fixed issue when executing without batch mode 2023-02-25 21:41:36 -03:00
Pablo Martinez 6247fc5313 init commit to test in cloud env 2023-02-25 19:11:58 -03:00
Vladimir Mandic 38535ff17b
allow relative paths 2023-02-25 11:58:02 -05:00
ljleb fe40f20645
is_img2img with respect to api (#372) 2023-02-25 23:29:19 +09:00
ddPn08 88f5766630
don't skip img2img when ControlNet is disabled (#370)
* don't skip img2img when ControlNet is disabled

* Update controlnet.py

---------

Co-authored-by: Kakigōri Maker <31246794+Mikubill@users.noreply.github.com>
2023-02-25 23:19:35 +09:00
kft334 7237d01445
Update api.py 2023-02-24 23:41:10 -05:00
kft334 36bda3843d
Update api.py 2023-02-24 23:36:37 -05:00
kft334 a8fbf70f82
Update api.py 2023-02-24 22:58:07 -05:00
Kakigōri Maker 7aa5a127c2
Revert "proper is_img2img implementation" 2023-02-25 12:23:08 +09:00
mattyamonaca 2b7e7777d1 fix video input bug 2023-02-25 10:56:31 +09:00
mattyamonaca a6c995c876 fix merge conflict 2023-02-25 10:18:09 +09:00
Kakigōri Maker 18793b3344
Merge branch 'main' into proper-is-img2img 2023-02-25 08:44:06 +09:00
Kakigōri Maker 58d69685d6
Merge pull request #351 from aiton-sd/main
Improving the selector function.
2023-02-25 08:05:44 +09:00
aiton-sd 694ac1d536
Improving the selector function. 2023-02-25 06:27:35 +09:00
Yu Zhu 11d9bddc96 fix: calculate size to fit output image 2023-02-25 05:14:31 +08:00
LonicaMewinsky 90d777c445 Separated models into tabs 2023-02-24 13:21:58 -06:00
Mikubill 0267082ee2 fix: make model_cache gc more accurate (#344) 2023-02-24 17:14:11 +00:00
Mikubill 9fd195629a fix: use proper preset for p_res API (#194) 2023-02-24 12:28:39 +00:00
Mikubill 9468e02b61 fix: use proper default vals for API (#329) 2023-02-24 12:02:11 +00:00
Mikubill 07524b6700 fix: api, use pipeline directly 2023-02-24 11:45:05 +00:00
Mikubill 3691d1130b fix: issues with API access (#335, #194) 2023-02-24 11:20:13 +00:00
Mikubill f94b453d10 fix: allow model config override (#331) 2023-02-24 03:22:41 +00:00
aiton-sd 1cbf892b5e
Improvement of xyz_grid_support.py 2023-02-24 04:21:52 +09:00
mattyamonaca a18750f4e0 adapted to multi controlnet 2023-02-23 23:25:57 +09:00
105gun 194884327c fix: metadata in multi-cn (#307) 2023-02-23 19:51:10 +08:00
Mikubill b0c6d97338 fix: make annotator preview smaller (#311) 2023-02-23 07:51:25 +00:00
Mikubill a9794535b5 fix: rename (scribble mode -> Invert input colors), add inverse for pidinet (#309) 2023-02-23 03:15:23 +00:00
Mikubill 524ee15511 fix: ui issue with old gradio pkg (#308) 2023-02-23 01:39:55 +00:00
mattyamonaca ba2c8a1a82 fix conflict 2023-02-23 07:54:13 +09:00
Jim Allanson e97327457f fix: fixes an issue where Guidance Strength in extra generation params was reading the wrong value 2023-02-22 21:05:13 +00:00
ljleb 36c092fc01 getattr just to be sure 2023-02-22 10:57:28 -05:00
ljleb dc85f2c1f0 update pr 2023-02-22 10:54:35 -05:00
Mikubill 695f72cdc4 fix: bypass cfg_handler on some devices (#290) 2023-02-22 15:01:56 +00:00
Mikubill 06dd9934d6 fix: skip cropping if image_mask is None (#292) 2023-02-22 14:39:19 +00:00
Kakigōri Maker f7ea68576e
Merge pull request #138 from missionfloyd/model-path
Move models to models/ControlNet
2023-02-22 23:22:24 +09:00
Mikubill aa4deb232f feat: add annotator preview 2023-02-22 12:42:00 +00:00
Mikubill 5a0fa4bd13 fix: incorrect cond ord in ddim and plms sampler (#269) 2023-02-22 10:04:14 +00:00
Mikubill 571d919211 Revert "fix: incorrect cond ord in ddim and plms sampler (#269)"
This reverts commit e189729772.
2023-02-22 09:27:34 +00:00
Mikubill e189729772 fix: incorrect cond ord in ddim and plms sampler (#269) 2023-02-22 09:21:52 +00:00
Kakigōri Maker d23a95bf6c
Merge pull request #280 from 105gun/get-cn-model-api
Add an api to get cn models list
2023-02-22 17:38:25 +09:00
105gun 59d3c66aba Add an api to get cn models list 2023-02-22 15:47:36 +08:00
Kakigōri Maker 4328d98a6e
might fix #269 2023-02-22 16:27:07 +09:00
missionfloyd ca88ccd8ed
Merge branch 'main' into model-path 2023-02-21 22:37:45 -07:00
Sang 7f9ccc821d changed thresholds to floating point variable 2023-02-21 21:09:50 -08:00
Sang 559395f4e0 fixed api 2023-02-21 20:54:49 -08:00
Mikubill 121c7b77d3 lowvram fix and docs 2023-02-22 04:38:49 +00:00
Mikubill 93849504f2 Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet into multi-controlnet 2023-02-22 04:38:31 +00:00
Mikubill caa56b7dc6 minor fix and #276 2023-02-22 04:07:12 +00:00
Mikubill 4b5fc30af3 fix: API and script control support 2023-02-22 03:32:06 +00:00
Mikubill 6971b1e172 cleanup and minor fix 2023-02-21 20:08:36 +00:00
mattyamonaca d6dfeaf6ee fix controlnet 2023-02-22 01:32:03 +09:00
mattyamonaca 1ad4398aa8 merge upstream 2023-02-22 01:28:16 +09:00