Commit Graph

378 Commits (71d76ae0dd73d79f0dbaeda9a4e4bfa0e7942a65)

Author SHA1 Message Date
lvmin 6047b3f3a0 remove all invert to make every preprocessor consistent 2023-04-15 13:28:29 -07:00
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 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
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
DanielKauss ff9ea88525 Fixed batches, fixed support for extensions 2023-04-12 19:29:25 +02: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 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 42a25e0b5c Update UI to allow number of faces and confidence to be selected. 2023-03-31 10:57:10 -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
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
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 6e339e9b57
fix: sensible defaults for remote call units (#606) 2023-03-15 16:06:42 -04:00
Michael 3f28601896 Updated to use global_state 2023-03-15 09:56:04 -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
ljleb fd753f22a1 workaround for is_img2img and is_ui 2023-03-14 22:06:05 -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 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 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
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 06afffe08b fix: typo from previous PR 2023-03-07 02:28:27 +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
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 d3046c2f46 document ResizeMode 2023-03-05 23:55:05 -05:00
ljleb 3c0f00de64 document ResizeMode 2023-03-05 23:54:37 -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 228f12d917 merge main 2023-03-05 14:37:11 -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