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
lvmin
0831c3c3e6
fix all t2i adapter problems
2023-04-24 19:46:36 -07:00
lvmin
4e633fa065
fix all t2i adapter problems
2023-04-24 19:34:42 -07:00
lvmin
686af179b7
fix all t2i adapter problems
2023-04-24 19:34:14 -07:00
lvmin
fbdcfeadda
v
2023-04-24 15:21:18 -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
e4aa3056d9
v
2023-04-23 22:17:04 -07:00
ljleb
0342759629
ignore extra args from api and fix param count ( #1013 )
...
* fix api
* automatic param count
* add new control param in tests
* add new control param in tests
2023-04-24 01:08:43 -04:00
lllyasviel
289cd03914
Merge pull request #1010 from Mikubill/control-mode
...
Control mode
2023-04-23 21:17:20 -07:00
lllyasviel
c18ee48ec8
Update controlnet_version.py
2023-04-23 21:12:25 -07: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
ljleb
1618dfda21
fix none ( #1009 )
2023-04-23 23:15:06 -04:00
ljleb
f408b2326b
Revert "Fixed issue where Nontype causes a crash ( #1006 )" ( #1008 )
...
This reverts commit f051ff3f99 .
2023-04-23 23:11:42 -04:00
lvmin
3470fd5e74
get in
2023-04-23 19:51:18 -07:00
lvmin
1d0a526be3
get in
2023-04-23 19:46:46 -07:00
jmsether
f051ff3f99
Fixed issue where Nontype causes a crash ( #1006 )
2023-04-23 22:43:21 -04:00
lvmin
c1d164fb08
init control mode
2023-04-23 19:40:36 -07:00
lvmin
23180ca184
fix saving problem
2023-04-23 16:40:59 -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
lvmin
e0e5663e78
bug track comments
2023-04-23 15:13:56 -07:00
lvmin
024477629b
bug track comments
2023-04-23 15:13:08 -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
4a25e53f5a
bug track comments
2023-04-23 07:17:45 -07:00
lvmin
08fee566e9
test if version is added
2023-04-23 06:59:16 -07: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
784f0a4bed
add mid control for high res back
2023-04-21 14:57:15 -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
7a7f44c99f
fix
2023-04-20 02:42:44 -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
1404f946dd
see if pass test, 3rd attempt
2023-04-19 23:59:34 -07:00
lvmin
b382654ed7
see if pass test
2023-04-19 23:37:44 -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
Wojtek Kowaluk
00a7595a75
fix control_scale calculation for adapter in high_res_fix
2023-04-19 13:12:45 +02: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
483450add6
fix 90% amd problems
2023-04-19 00:37:20 -07:00
lvmin
599376130c
add comments
2023-04-18 20:37:02 -07:00
lvmin
17d4e2f185
softer in high-res pass
2023-04-18 20:31:17 -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
0674eb28e2
super high quality resampling
2023-04-18 19:39:23 -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
lvmin
7e5c153b86
more aliases
2023-04-18 09:10:42 -07:00
ljleb
20a5310bc8
resize mode aliases ( #894 )
2023-04-18 07:29:17 -04: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
26372c657a
int thr_aaa
2023-04-18 01:37:35 -04: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
a4519c98a3
add lineart_standard
2023-04-17 18:31:09 -07:00
lvmin
7f1ae2cf0e
fix test
2023-04-17 18:05:59 -07:00
lvmin
c6b80df33f
better high-quality sampling
2023-04-17 18:03:17 -07:00
lvmin
1a18328a95
fix tests and revise high-res fix
2023-04-17 17:52:37 -07:00
lvmin
86873af29e
fix tests
2023-04-17 17:22:14 -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
lllyasviel
7d4b024850
Merge pull request #826 from kft334/main
...
Update detect endpoint
2023-04-17 00:34:10 -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
kft334
c955472be1
Update detect endpoint
2023-04-17 01:11:02 -04:00
lvmin
1cdbaa852d
fix inpaint mask only
2023-04-16 21:05:23 -07:00
lvmin
c8d7c78660
fix api
2023-04-16 19:41:44 -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
lvmin
740af65de4
fix threshold
2023-04-16 17:39:24 -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
82c42285b9
Merge pull request #810 from Mikubill/lvmin
...
fix uncheck lowvram error
2023-04-16 16:04:14 -07:00
lvmin
69c3b16f26
fix uncheck lowvram error
2023-04-16 16:03:41 -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
lllyasviel
d499bd4080
Merge pull request #806 from Mikubill/lvmin
...
Lvmin
2023-04-16 11:50:45 -07:00
lvmin
1e8b3e4055
less aggressive guess mode
2023-04-16 11:50:07 -07:00
lvmin
2770751003
less aggressive guess mode
2023-04-16 11:49:58 -07: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
Kakigōri Maker
2f7d73a299
Merge pull request #791 from ljleb/fix-callbacks
...
Fix script callbacks clear
2023-04-16 20:39:06 +09:00
lllyasviel
e900a87aaa
Merge pull request #803 from Mikubill/lvmin
...
restore default to inner fit
2023-04-16 01:15:00 -07:00
lvmin
786531a647
restore default to inner fit
2023-04-16 01:13:19 -07: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
lllyasviel
ede9e2c379
Merge pull request #799 from Mikubill/lvmin
...
lowvram warning with flag
2023-04-16 00:29:50 -07:00
lvmin
d6b522bebc
lowvram warning with flag
2023-04-16 00:29:21 -07:00
Kakigōri Maker
a78628d5c2
Update global_state.py
2023-04-16 15:49:18 +09: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
4a09696d6b
dont remove all script callbacks
2023-04-15 23:51:54 -04:00
ljleb
315ff7b21b
dont import xyz ( #790 )
...
* importlib reload
* remove xyz
2023-04-15 23:47:13 -04:00
ljleb
c6d7e48296
remove xyz import
2023-04-15 23:41:57 -04:00
lllyasviel
3717174dde
Merge pull request #789 from Mikubill/lvmin
...
low vram fix
2023-04-15 20:36:37 -07:00
ljleb
92ea00c13e
importlib reload ( #787 )
2023-04-15 23:35:41 -04:00
lvmin
85f32d8850
low vram fix
2023-04-15 20:35:33 -07:00
lllyasviel
a9e11f7d01
Merge pull request #786 from Mikubill/lvmin
...
low vram vs shuffle
2023-04-15 20:08:22 -07:00
lvmin
7a1eacc92e
low vram vs shuffle
2023-04-15 20:07:32 -07:00
catboxanon
895154a9fb
Allow modifying shuffle seed with subseed
2023-04-15 22:28:31 -04:00
lllyasviel
33608671ca
Merge pull request #782 from Mikubill/lvmin
...
typo
2023-04-15 18:10:23 -07:00
lvmin
5bb5460588
typo
2023-04-15 18:10:00 -07:00
lllyasviel
c31cbd7264
Merge pull request #780 from kft334/main
...
Update detect endpoint
2023-04-15 18:08:34 -07:00
lllyasviel
272fafc9d3
Merge pull request #781 from Mikubill/lvmin
...
inner fit
2023-04-15 17:55:36 -07:00
lvmin
d696cb2bc1
inner fit
2023-04-15 17:55:11 -07:00
kft334
dfe4e0e322
Update detect endpoint
...
Updated to be consistent with the webui preprocessor naming.
Typo note: t2ia_color_gird should be changed to t2ia_color_grid in the list of webui preprocessors.
2023-04-15 20:51:34 -04:00
lllyasviel
227c464866
Merge pull request #763 from kft334/main
...
Update detect endpoint
2023-04-15 16:08:53 -07:00
lvmin
929072f52f
better name
2023-04-15 16:06:14 -07:00
lvmin
4e0622f829
2nd fix clip vision for adapter
2023-04-15 15:58:42 -07:00
lvmin
e42421b901
Revert "fix clip vision for adapter"
...
This reverts commit 7781656f6c .
2023-04-15 15:51:48 -07:00
lvmin
7781656f6c
fix clip vision for adapter
2023-04-15 15:40:54 -07:00
lvmin
01df629d1a
fix guess mode for adapter
2023-04-15 15:23:34 -07:00
lvmin
8a56ac2c19
better guess mode + better global avg pool
2023-04-15 14:42:22 -07:00
kft334
edf7cd0a42
Update api.py
2023-04-15 17:22:42 -04:00
kft334
76d413c586
Update detect endpoint
2023-04-15 16:52:32 -04:00
lvmin
6047b3f3a0
remove all invert to make every preprocessor consistent
2023-04-15 13:28:29 -07:00
lvmin
5329b2d9eb
fix shuffle seed
2023-04-15 13:23:09 -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
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