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
Mikubill
b64b7c9ed8
minor fix
2023-03-05 08:27:26 +00:00
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
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
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
57ed434ee4
static script cache
2023-03-04 09:43:47 -05:00
ljleb
09a403de79
basic external code api
2023-03-03 20:12:55 -05:00
catboxanon
3792adb020
Check if state_dict has style_embedding key
2023-03-03 19:53:08 -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
bc1e0ec862
fix: filepath import issue ( #446 )
2023-03-02 00:16:20 +00: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
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
Mikubill
e63cb23921
fix: reload config from infotext field ( #412 )
2023-02-27 19:45:20 +00: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
Ashen
b552ce2f86
👌 🐛 fixing parse_remote_call according to newly introduced PARAM_COUNT global variable
2023-02-26 23:05:18 -08:00
ljleb
65c66ebee6
return pil
2023-02-26 20:42:18 -05:00
Ashen
ce5dc9f418
✨ Added guidance start parameter.
2023-02-26 08:28:28 -08: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
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
Kakigōri Maker
7aa5a127c2
Revert "proper is_img2img implementation"
2023-02-25 12:23:08 +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
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
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
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
missionfloyd
ca88ccd8ed
Merge branch 'main' into model-path
2023-02-21 22:37:45 -07: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
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
mattyamonaca
433361d808
add movie2movie
2023-02-22 01:22:29 +09:00
Mikubill
ae2d4a9cb0
refactor: multi-controlnet support
2023-02-21 14:41:21 +00:00
missionfloyd
698e136093
Merge branch 'main' into model-path
2023-02-20 21:48:29 -07:00
Mikubill
2b370d9fde
fix: txt2img support, da7a36
2023-02-21 04:39:09 +00:00
Mikubill
da7a3609e1
fix: inpaint mask issue ( #250 , #78 , #232 , #169 )
2023-02-21 04:20:15 +00:00
Mikubill
b4a9d7bd43
fix: typo
2023-02-21 03:27:14 +00:00
Mikubill
3ccc1fd01e
fix: move depth_boosting to settings
2023-02-21 03:25:29 +00:00
Kakigōri Maker
0b55af6cee
Merge branch 'main' into main
2023-02-21 11:50:11 +09:00
FNSpd
1432751823
"Only masked" fix
...
ControlNet should use cropped masked area now if "only masked" is selected
2023-02-21 00:25:42 +04:00