Commit Graph

647 Commits (8a8a42e4168c7edf89ff7030232f87ae3ee56b8b)

Author SHA1 Message Date
lllyasviel 1c994ff4f7
small fix to meet a1111 standard (#1328) 2023-05-19 01:43:30 -07:00
lllyasviel 999b05d521
Update controlnet.py (#1324) 2023-05-18 21:02:06 -07:00
lllyasviel c8e9e669bf
implement ref-only for only masked (#1323) 2023-05-18 20:44:12 -07:00
catboxanon 057af49da6
Use release event for sliders (#1316)
Improves overall UI performance.
2023-05-18 18:20:22 -07:00
lllyasviel ecc84a2891
add preprocessor reference_adain and adain_attn (#1278)
add preprocessor reference_adain and adain_attn
2023-05-14 22:30:47 -07:00
lllyasviel 5e58a80248
Style Fidelity Slider (#1273)
style fid
2023-05-14 15:00:49 -07:00
lllyasviel b2f9c73532
[Major Update] Reference-only Control (#1235)
[Major Update] Reference-only Control
2023-05-13 02:56:31 -07:00
lvmin dcb597c3c1 give elemid 2023-05-12 20:32:59 -07:00
lvmin b60439cc4e Merge branch 'main' of https://github.com/guming3d/sd-webui-controlnet into guming3d-main 2023-05-12 20:26:44 -07:00
lvmin 338c790cf6 first step in supporting more models 2023-05-12 19:36:51 -07:00
George Gu 2438c844ac [fix]fix elem_id format 2023-05-08 05:23:29 +00:00
George Gu fae0a17fc9 [fix]Adding elem_id to all the gradio component of controlnet 2023-05-08 03:19:51 +00:00
lvmin c31d7d1033 fix png info 2023-05-07 10:14:27 -07:00
ljleb 630d3daaf3
equal-height (#1201) 2023-05-07 12:35:23 -04:00
lvmin c64a11c44f fix gradio 2023-05-06 14:34:32 -07:00
lvmin 29c38ca369 refine 2023-05-06 11:21:15 -07:00
lvmin b944e21794 144 2023-05-06 11:11:53 -07:00
lvmin 0cf1c97815 Merge branch 'main' of https://github.com/zombieyang/sd-webui-controlnet into zombieyang-main 2023-05-06 11:03:49 -07:00
lvmin 7296e3c93e init 2023-05-06 09:56:29 -07:00
lvmin c4562e38fe beautify png meta 2023-05-06 05:44:00 -07:00
lvmin a84b6c620d beautify png meta 2023-05-06 05:33:40 -07:00
lvmin 7ed4a675ed fix random seed 2023-05-06 02:33:18 -07:00
zombieyang(杨浩) 6b30f7821a bugfix 2023-05-06 13:26:22 +08:00
unknown 71f6df02a2 add module_detail in /controlnet/module_list containing sliders config and reuse code with controlnet.build_sliders 2023-05-06 06:23:50 +08:00
ljleb a03b2f8a68 remove old enpoint test 2023-05-05 14:20:06 -04:00
ljleb 274645d0c7 merge 'main' into this branch 2023-05-05 14:05:38 -04:00
lvmin 1caa2b5379 remove deprecated guess mode 2023-05-05 09:32:58 -07:00
lvmin ae91dae48e fix multi control close button 2023-05-02 07:15:46 -07:00
lvmin 729efba023 fix leres 2023-05-02 03:55:07 -07:00
lvmin 53e5bb4d6f remove dangerous options, add leres++ 2023-05-02 01:29:01 -07:00
lvmin 466c0aaefc upload YAML files 2023-05-01 22:39:46 -07:00
lvmin 2d7f89fb5f small fix 2023-05-01 04:23:02 -07:00
lvmin d2153756b1 implement js and html based gradio ui 2023-05-01 03:17:01 -07:00
lvmin a153f2a95d now we can preview clipvision 2023-04-30 20:07:29 -07:00
huchenlei 3aae15889d 🐛 clear download link when generated image is cleared 2023-04-30 21:13:06 -04:00
huchenlei f484b33c4e 🎨 Rework icon style 2023-04-30 21:13:06 -04:00
huchenlei 9ebf228e73 add hint on button 2023-04-30 21:13:06 -04:00
huchenlei c700483928 Add download json button 2023-04-30 21:13:06 -04:00
lvmin dc025ea4c7 fix sd upscale 2023-04-30 07:04:19 -07:00
lvmin a95b8a2d90 fix small problem with native SD Upscale 2023-04-30 06:08:48 -07:00
lvmin 49fc3a0e0c begin to support native SD Upscale 2023-04-30 05:36:31 -07:00
lvmin 67c40c71ae pixel perfect mode for preview 2023-04-26 22:42:26 -07:00
lvmin 31d183d3e4 try fix github test, f2 2023-04-26 21:12:30 -07:00
lvmin e7c264bf50 try fix github test 2023-04-26 20:51:46 -07:00
lvmin bb3bf3309d better png meta 2023-04-26 19:10:40 -07:00
lllyasviel 523c9e13ab
Merge pull request #995 from ETdoFresh/main
Fix an issue with empty mask string.
2023-04-25 16:56:33 -07:00
lvmin 2e3110344f fix that 64 problem 2023-04-25 16:54:50 -07:00
ljleb d99306f3d0
convert control mode (#1038)
* and not or

* v

* convert control mode

* no alias for control mode

* add conversion for previous guess mode
2023-04-25 19:41:22 -04:00
ETdoFresh 47bac56fd0 Add empty string logic into new implementation of image_dict_from_any(image) 2023-04-25 12:07:22 -05:00
ETdoFresh 154c48a9ce
Merge branch 'main' into main 2023-04-25 11:51:27 -05:00
lvmin 6b2b0ec33d new tile model will soon use tile_resample as preprocessor 2023-04-25 06:35:52 -07:00
lvmin cd8b5d46c0 make room for new tile model 2023-04-24 20:35:40 -07:00
huchenlei 34e04c469b Add tooltip 2023-04-24 10:53:06 -04:00
ljleb 9eeb71a796
Fix no detectmap option ignored (#1020)
* and not or

* v
2023-04-24 09:53:41 -04:00
lvmin c014699b54 get in 2023-04-23 20:47:28 -07:00
lvmin 428531a741 get in 2023-04-23 20:35:15 -07:00
lvmin 1d0a526be3 get in 2023-04-23 19:46:46 -07:00
lvmin c1d164fb08 init control mode 2023-04-23 19:40:36 -07:00
lvmin 69031739e1 fix saving problem 2023-04-23 16:40:45 -07:00
lvmin f3438c03f6 loopback ui fix2 2023-04-23 16:00:26 -07:00
lvmin 120d22f982 loopback ui 2023-04-23 15:51:05 -07:00
lvmin cf2dae57d1 simplify ui 2023-04-23 15:28:41 -07:00
ljleb 07ef8a750a
Multi-ControlNet Batch (#683)
* add back preprocessor

* reload imports for people that update without restarting webui

* remeove img2img tab tracker (replaced by batch hijack)

* batch hijack script

* update gradio ui

* new options (used by batch hijack)

* demeter violation

* clear detected_map

* bug fixes, boys scout and whitespace

* demeter (tests)

* batch tests

* fix alwayson script args in api tests

* extract cn unit image type

* update instead of buggy set

* update readme

* carousel -> gallerie output

* fix index in unit batch iterator

* fix hook unregistering all callbacks

* dont modify hook

* fix non-cn batch

* fix responsiveness

* dont need queue here

* state no change

* readme

* name

* fix ui, bump version

* loopback less important

* interrupt batch if no input image

* keep batch mode in sync

* typo
2023-04-23 16:35:31 -04:00
ETdoFresh 7dcdaa485a Add a little more if/else logic on parsing image/mask string. 2023-04-23 14:03:11 -05:00
ETdoFresh 1fa1a53508 Fix issue where existing np.array were overwritten by my previous fix. 2023-04-23 13:08:42 -05:00
ETdoFresh 4d798819a2 Fix an issue with empty mask string. 2023-04-23 12:54:38 -05:00
lvmin ca9a4870c0 add version to UI for better bug tracking 2023-04-23 06:50:32 -07:00
lvmin 8e6b1a8e4e fix inpaint 2023-04-23 04:50:11 -07:00
lvmin c31b13ddcb safer numpy 2023-04-22 22:30:32 -07:00
lvmin 7c21df275a fix a1111 mask implementation 2023-04-21 23:52:07 -07:00
lvmin d5f89865fe fix a1111 mask implementation 2023-04-21 23:28:41 -07:00
lvmin 91962bca27 fix a1111 mask implementation 2023-04-21 22:58:37 -07:00
lvmin 5d8cc122a8 fix a1111 mask implementation 2023-04-21 22:42:28 -07:00
lvmin 97ea3433ba fix a1111 mask implementation 2023-04-21 22:28:05 -07:00
lvmin 06683a630d add mid control for high res back 2023-04-21 14:55:48 -07:00
lvmin 33667fbb7c use gradio equal height for preview 2023-04-21 04:59:21 -07:00
lvmin a216e329ee use gradio equal height for preview 2023-04-21 04:58:49 -07:00
lvmin e454a7d651 temp fix 2023-04-21 03:03:13 -07:00
lvmin 690ce4426e new create canvas 2023-04-21 01:52:02 -07:00
lvmin f2dd34361d try fix strange apple problem 2023-04-21 00:28:41 -07:00
lvmin 3978346ea5 try fix strange apple problem 2023-04-21 00:27:30 -07:00
lvmin 9b82ff1abf try fix strange apple problem 2023-04-21 00:21:34 -07:00
lvmin 3d7790ed70 using both methods to update 2023-04-20 20:36:29 -07:00
lvmin 7dbfd9e3e7 Revert "simpler fix (#841)"
This reverts commit 0c7998ab05.
2023-04-20 20:22:36 -07:00
lvmin a0ae5770ae use resampling 2023-04-20 16:48:07 -07:00
lvmin 5370a7ab48 use resampling 2023-04-20 16:45:54 -07:00
lvmin d9f76f99c1 use resampling 2023-04-20 16:43:49 -07:00
lvmin 6091b81223 use resampling 2023-04-20 16:16:14 -07:00
lvmin 0b39f11314 use better round estimation 2023-04-20 14:48:49 -07:00
lvmin 4e5af830eb use better round estimation 2023-04-20 14:47:23 -07:00
ljleb d7c5dd45b1
xyz invert dependency (#793)
* import preprocs from global_state

* reload xyz

* remove unused imports

* add NameError to exception list
2023-04-20 11:47:56 -04:00
ljleb 3ff63befce
Add command line arguments to readme (#933)
* relative path is relative to webui

* docs

* change default path back to webui/models

* for now, revert model path change
2023-04-20 11:26:38 -04:00
lvmin f9fcd17a50 logic v3 2023-04-20 03:11:44 -07:00
lvmin 62aa82c208 logic v3 2023-04-20 03:11:02 -07:00
lvmin bd7984e26c logic v2 2023-04-20 02:51:50 -07:00
lvmin 1242925096 first logic 2023-04-20 02:41:28 -07:00
lvmin d6fbd83452 init logic 2023-04-20 02:10:43 -07:00
lvmin 2c71749d82 see if pass test, 5th attempt 2023-04-20 02:04:19 -07:00
lvmin ff4c8ada75 fix api 2023-04-19 23:35:41 -07:00
lvmin a89ce4f82d init pixel perfect branch 2023-04-19 23:27:35 -07:00
lvmin 31f461c354 init pixel perfect branch 2023-04-19 23:26:14 -07:00
lvmin fcf7f94b01 fix inpaint preview 2023-04-19 22:51:44 -07:00
lvmin 65ecadfb4c improve clarification 2023-04-19 22:12:47 -07:00
ljleb 937e8f0741
reload order (#915) 2023-04-19 05:35:06 -04:00
lvmin 238c8cd8f1 improve inpaint mask quality 2023-04-19 01:19:40 -07:00
lvmin 60bc6b1141 super high quality resampling 2023-04-18 20:14:18 -07:00
lvmin bdf947d9be super high quality resampling 2023-04-18 20:01:01 -07:00
lvmin d512eee23a super high quality resampling 2023-04-18 19:37:54 -07:00
lvmin 32223a0716 super high quality resampling 2023-04-18 19:33:08 -07:00
lvmin a682fc5176 use cubic is safer 2023-04-18 09:25:36 -07:00
lllyasviel ca03f4e3d8
Merge pull request #891 from ljleb/move-models
add settings for annotator models path
2023-04-18 03:30:09 -07:00
ljleb d3bd9a6dc5 txt 2023-04-18 06:28:21 -04:00
lvmin f8b8c0888c major gradio update 2023-04-18 03:27:53 -07:00
ljleb 804d32ee3f add options 2023-04-18 06:16:59 -04:00
lvmin 07f704edc7 modern gradio 2023-04-18 01:27:13 -07:00
lvmin c07a140cdd use text consistent to a1111 resizing 2023-04-18 00:56:21 -07:00
ljleb 14f3661648
forward web api to external_code api (#850) 2023-04-18 00:57:15 -04:00
lvmin d3f14c90d3 fix inpaint mask bug with mask blur and invert 2023-04-17 21:09:01 -07:00
lvmin 2bddc278b0 fix resolution bug 2023-04-17 18:58:29 -07:00
lvmin a43f93c851 short hint 2023-04-17 18:43:48 -07:00
lvmin c6b80df33f better high-quality sampling 2023-04-17 18:03:17 -07:00
lvmin 42158b1b43 major update - ControlNet 1.1 GUI 2023-04-17 16:53:20 -07:00
lvmin cd36a13368 fix many mask problems 2023-04-17 15:51:05 -07:00
lllyasviel 1d66c2d27c
Merge pull request #861 from Mikubill/lvmin
smarter model search
2023-04-17 12:13:55 -07:00
lvmin a7f059eff9 smarter model search 2023-04-17 12:13:22 -07:00
lllyasviel 62e443b3cc
Merge pull request #859 from continue-revolution/main
Support Control Inpainting by SAM Extension
2023-04-17 11:55:20 -07:00
lllyasviel b47172d575
Merge pull request #688 from crucible-ai/main
Add MediaPipe Face Control
2023-04-17 11:47:13 -07:00
continue-revolution 04fda33cff support control inpainting 2023-04-18 02:41:38 +08:00
lvmin 9698b45d15 smart model search 2023-04-17 11:33:31 -07:00
lvmin 06234582d1 clarification 2023-04-17 11:17:47 -07:00
lvmin d2c6ac7d5a better hint 2023-04-17 10:59:28 -07:00
Joseph Catrambone 385b67c2e3 Merge upstream changes and resolve merge conflicts. 2023-04-17 09:35:49 -07:00
Mikubill e196567d61 ui fix - hints 2023-04-17 14:24:30 +00:00
ljleb 0c7998ab05
simpler fix (#841) 2023-04-17 09:14:27 -04:00
lvmin cfa981a0f9 better hint 2023-04-17 04:41:29 -07:00
lvmin aeb1f63dad fix model path 2023-04-17 03:55:16 -07:00
lvmin 2cfcf74499 fix model path 2023-04-17 03:53:58 -07:00
lvmin a54dc953ce add tile noise 2023-04-17 01:41:00 -07:00
lvmin 4d8bc25835 fix tile 2023-04-16 23:40:47 -07:00
lvmin 0f11c3ae21 safety check 2023-04-16 23:07:18 -07:00
lvmin 1cdbaa852d fix inpaint mask only 2023-04-16 21:05:23 -07:00
lllyasviel 0e74848e02
Merge pull request #785 from catboxanon/feat/shuffle-seed-mod
Fix shuffle preprocessor seed bug & allow modifying seed with subseed
2023-04-16 18:52:36 -07:00
lvmin d0da145f5f fix inpaint 2023-04-16 18:51:38 -07:00
catboxanon 071c363eee
Merge branch 'Mikubill:main' into feat/shuffle-seed-mod 2023-04-16 21:50:44 -04:00
lvmin 34c5b40e15 support inpaint 2023-04-16 18:42:44 -07:00
lllyasviel bee146aa10
Merge branch 'main' into lvmin 2023-04-16 17:20:56 -07:00
lvmin e6d3a326c4 add tile and xdog 2023-04-16 17:18:12 -07:00
lllyasviel d698e76e59
Merge pull request #808 from Mikubill/lvmin
correct un c count
2023-04-16 14:05:10 -07:00
lvmin de0ac533ae correct un c count 2023-04-16 14:04:10 -07:00
catboxanon 1594a1a0ef
Merge branch 'Mikubill:main' into feat/shuffle-seed-mod 2023-04-16 17:02:20 -04:00
catboxanon b7519b6214
Fix seed reproducibility for shuffle preprocessor 2023-04-16 12:24:57 -04:00
catboxanon 5ad5dbee26
Clamp subseed so it does not use -1 2023-04-16 11:42:53 -04:00
lllyasviel 937ea52637
Merge pull request #801 from Mikubill/lvmin
use safest int functions
2023-04-16 01:00:31 -07:00
lvmin 4189180fb5 use safest int functions 2023-04-16 00:59:56 -07:00
lllyasviel 5136a35194
Merge pull request #800 from Mikubill/lvmin
use safer int functions
2023-04-16 00:51:51 -07:00
lvmin 0c2f1a2a47 use safer int functions 2023-04-16 00:50:58 -07:00
Kakigōri Maker 6d4db75e31
Merge pull request #792 from ljleb/preprocs-unload
unload preprocessors
2023-04-16 15:10:33 +09:00
lllyasviel 27ce16d16b
Merge pull request #797 from Mikubill/lvmin
fix clip vision
2023-04-15 22:24:42 -07:00
lvmin 61a3512f5f fix clip vision 2023-04-15 22:24:03 -07:00
lllyasviel 6434299e9d
Merge pull request #796 from Mikubill/lvmin
better high quality image resizing
2023-04-15 22:04:45 -07:00
lvmin 0481f5f7a0 better high quality image resizing 2023-04-15 22:04:15 -07:00
lllyasviel 39216f4be8
Merge pull request #794 from Mikubill/lvmin
high quality image resizing
2023-04-15 21:49:46 -07:00
lvmin 323206643c high quality image resizing 2023-04-15 21:49:18 -07:00
ljleb a7e571c37e unload preprocs 2023-04-15 23:58:40 -04:00
ljleb 315ff7b21b
dont import xyz (#790)
* importlib reload

* remove xyz
2023-04-15 23:47:13 -04:00
ljleb 92ea00c13e
importlib reload (#787) 2023-04-15 23:35:41 -04:00
catboxanon 895154a9fb
Allow modifying shuffle seed with subseed 2023-04-15 22:28:31 -04:00
lvmin 8a56ac2c19 better guess mode + better global avg pool 2023-04-15 14:42:22 -07:00
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
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