7377d4990a
Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet
2023-03-01 13:06:26 +00:00
e3c4232bf2
fix: minor fix - remove unused params
2023-03-01 13:06:24 +00:00
c27dbecac1
Merge pull request #376 from vladmandic/allow-relative-paths
...
allow relative paths
2023-03-01 22:02:30 +09:00
7e9fbc78a9
fix: minor fix
2023-03-01 02:00:19 +00:00
96f2e1c12b
fix: revert #350 - h/w differ from input, reproducibility ( #430 )
...
will use another apporach later
2023-03-01 00:37:14 +00:00
1f0f001850
Update scripts/controlnet.py
...
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-02-28 18:13:58 -06:00
e72b129837
Added func to ensure sent values are /8
2023-02-28 15:52:48 -06:00
e223cdd255
Added "send dimensions" button
2023-02-28 15:18:54 -06:00
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
e63cb23921
fix: reload config from infotext field ( #412 )
2023-02-27 19:45:20 +00:00
8753ef58a2
Enable controls for 'Enabled' in the script.
2023-02-27 18:33:53 +09:00
8ca06ba8eb
Merge pull request #383 from rulyone/controlnet_batch
...
Controlnet batch support
2023-02-27 17:40:40 +09:00
511e254c48
fix: backward compatibility
2023-02-27 08:00:24 +00:00
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
46befda39c
Merge pull request #384 from ljleb/api-multi-cn
...
Multiple control units in API
2023-02-27 16:10:27 +09:00
b552ce2f86
👌 🐛 fixing parse_remote_call according to newly introduced PARAM_COUNT global variable
2023-02-26 23:05:18 -08:00
65c66ebee6
return pil
2023-02-26 20:42:18 -05:00
ce5dc9f418
✨ Added guidance start parameter.
2023-02-26 08:28:28 -08:00
510efc09fd
remove space
2023-02-26 12:54:29 +09:00
4e1b4223f4
add duration opt
2023-02-26 12:51:22 +09:00
59c0d5b35e
API multi cn
2023-02-25 22:37:42 -05:00
a4dbd87101
Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet into develop
2023-02-26 10:51:57 +09:00
70d4e34ecd
fixed issue when executing without batch mode
2023-02-25 21:41:36 -03:00
6247fc5313
init commit to test in cloud env
2023-02-25 19:11:58 -03:00
38535ff17b
allow relative paths
2023-02-25 11:58:02 -05:00
fe40f20645
is_img2img with respect to api ( #372 )
2023-02-25 23:29:19 +09:00
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
7aa5a127c2
Revert "proper is_img2img implementation"
2023-02-25 12:23:08 +09:00
a6c995c876
fix merge conflict
2023-02-25 10:18:09 +09:00
18793b3344
Merge branch 'main' into proper-is-img2img
2023-02-25 08:44:06 +09:00
58d69685d6
Merge pull request #351 from aiton-sd/main
...
Improving the selector function.
2023-02-25 08:05:44 +09:00
694ac1d536
Improving the selector function.
2023-02-25 06:27:35 +09:00
11d9bddc96
fix: calculate size to fit output image
2023-02-25 05:14:31 +08:00
90d777c445
Separated models into tabs
2023-02-24 13:21:58 -06:00
0267082ee2
fix: make model_cache gc more accurate ( #344 )
2023-02-24 17:14:11 +00:00
3691d1130b
fix: issues with API access ( #335 , #194 )
2023-02-24 11:20:13 +00:00
f94b453d10
fix: allow model config override ( #331 )
2023-02-24 03:22:41 +00:00
a18750f4e0
adapted to multi controlnet
2023-02-23 23:25:57 +09:00
194884327c
fix: metadata in multi-cn ( #307 )
2023-02-23 19:51:10 +08:00
b0c6d97338
fix: make annotator preview smaller ( #311 )
2023-02-23 07:51:25 +00:00
a9794535b5
fix: rename (scribble mode -> Invert input colors), add inverse for pidinet ( #309 )
2023-02-23 03:15:23 +00:00
524ee15511
fix: ui issue with old gradio pkg ( #308 )
2023-02-23 01:39:55 +00:00
ba2c8a1a82
fix conflict
2023-02-23 07:54:13 +09:00
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
36c092fc01
getattr just to be sure
2023-02-22 10:57:28 -05:00
dc85f2c1f0
update pr
2023-02-22 10:54:35 -05:00
06dd9934d6
fix: skip cropping if image_mask is None ( #292 )
2023-02-22 14:39:19 +00:00
f7ea68576e
Merge pull request #138 from missionfloyd/model-path
...
Move models to models/ControlNet
2023-02-22 23:22:24 +09:00
aa4deb232f
feat: add annotator preview
2023-02-22 12:42:00 +00:00
5a0fa4bd13
fix: incorrect cond ord in ddim and plms sampler ( #269 )
2023-02-22 10:04:14 +00:00
571d919211
Revert "fix: incorrect cond ord in ddim and plms sampler ( #269 )"
...
This reverts commit e189729772
2023-02-22 09:27:34 +00:00
e189729772
fix: incorrect cond ord in ddim and plms sampler ( #269 )
2023-02-22 09:21:52 +00:00
ca88ccd8ed
Merge branch 'main' into model-path
2023-02-21 22:37:45 -07:00
559395f4e0
fixed api
2023-02-21 20:54:49 -08:00
121c7b77d3
lowvram fix and docs
2023-02-22 04:38:49 +00:00
caa56b7dc6
minor fix and #276
2023-02-22 04:07:12 +00:00
4b5fc30af3
fix: API and script control support
2023-02-22 03:32:06 +00:00
6971b1e172
cleanup and minor fix
2023-02-21 20:08:36 +00:00
d6dfeaf6ee
fix controlnet
2023-02-22 01:32:03 +09:00
1ad4398aa8
merge upstream
2023-02-22 01:28:16 +09:00
433361d808
add movie2movie
2023-02-22 01:22:29 +09:00
ae2d4a9cb0
refactor: multi-controlnet support
2023-02-21 14:41:21 +00:00
698e136093
Merge branch 'main' into model-path
2023-02-20 21:48:29 -07:00
2b370d9fde
fix: txt2img support, da7a36
2023-02-21 04:39:09 +00:00
da7a3609e1
fix: inpaint mask issue ( #250 , #78 , #232 , #169 )
2023-02-21 04:20:15 +00:00
b4a9d7bd43
fix: typo
2023-02-21 03:27:14 +00:00
3ccc1fd01e
fix: move depth_boosting to settings
2023-02-21 03:25:29 +00:00
0b55af6cee
Merge branch 'main' into main
2023-02-21 11:50:11 +09:00
1432751823
"Only masked" fix
...
ControlNet should use cropped masked area now if "only masked" is selected
2023-02-21 00:25:42 +04:00
4737b4189c
fix: temporary revert #235 since it will break menu on some devices ( #242 )
2023-02-21 03:24:22 +09:00
6d9a3c854a
fix: import issue ( #239 )
2023-02-20 16:17:23 +00:00
6edad1662a
Merge pull request #235 from stassius/main
...
Added if (__name__ == '__main__'):
2023-02-21 00:21:39 +09:00
c6fc96eef9
feat: add guess_mode and cfg_based guidance
2023-02-20 15:20:59 +00:00
858a5b5679
Added if (__name__ == '__main__'): to the controlnet.py so it can be called from other scripts
2023-02-20 16:19:31 +03:00
a8c5b4e255
fix: add log entry, minor fix ( #220 , #223 )
2023-02-20 01:55:31 +00:00
030922a3d2
Add depth boost
...
https://github.com/compphoto/BoostingMonocularDepth
2023-02-19 20:52:00 -05:00
ce6f08ff9a
Change checkboxes to buttons
2023-02-19 15:24:40 -07:00
46cb2dfeba
Simplify expression
2023-02-19 03:16:10 -07:00
b9e1782c30
fix video component layout
2023-02-19 19:00:52 +09:00
b50786bf9f
add video component
2023-02-19 18:43:58 +09:00
78c4919652
Merge branch 'Mikubill:main' into webcam
2023-02-19 02:13:41 -07:00
74498562cd
Merge branch 'main' into model-path
2023-02-19 01:04:08 -07:00
a24089a62e
Merge pull request #211 from 105gun/detected_map_autosave
...
Detected map autosave
2023-02-19 16:08:12 +09:00
867c6e15c2
Save detectedmap in subfolder
2023-02-19 14:45:09 +08:00
d1eef3099c
Add detectedmap auto save
2023-02-19 14:35:58 +08:00
a338d92ee4
Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet
2023-02-19 05:32:33 +00:00
3a5a12d96e
fix: hide openpose_hand opt ( #210 )
2023-02-19 05:32:24 +00:00
3b156bd680
Merge branch 'Mikubill:main' into webcam
2023-02-18 20:54:58 -07:00
b62873196c
Merge branch 'main' into model-path
2023-02-18 20:47:41 -07:00
764c1517a2
Webcam support
2023-02-18 18:02:59 -07:00
7dd91595d1
Merge branch 'Mikubill:main' into model-path
2023-02-18 14:50:47 -07:00
12f50619c7
Merge branch 'main' of https://github.com/cmeka/sd-webui-controlnet-leres
2023-02-18 14:03:55 -05:00
5620c1cd5a
Add LeReS depth thresholds and cleanup
...
Adds near and background removal/thresholds
Adds CPU model loading
Increase default model res to 512
Pass image dimensions to model
Remove duplicate functions in utils.py
2023-02-18 14:02:13 -05:00
0f37dac3e0
chore: add only_mid_control to settings
2023-02-18 15:32:00 +00:00
2d91ef71e0
fix: disable svg processor when unavailable ( #185 )
2023-02-18 10:55:28 +00:00
e2239c20b8
fix: temporary fix #181
2023-02-18 09:12:03 +00:00
e521249c7a
fix: add slider visible op
2023-02-18 08:11:15 +00:00
1257791d06
Merge branch 'main' of https://github.com/Mikubill/sd-webui-controlnet
2023-02-18 08:10:43 +00:00
f054d390b0
ui: hide sliders with preproc=none
2023-02-18 07:20:17 +00:00
54b7380687
Merge branch 'Mikubill:main' into model-path
2023-02-17 22:31:40 -07:00
694045a3b8
Add old model path
2023-02-17 22:28:19 -07:00
423c3e513a
Fix default_conf_adapter path
2023-02-17 22:21:31 -07:00
21750a46c0
Move checkbox to Settings tab
2023-02-18 13:48:46 +09:00
ff169ebb7f
Merge branch 'main' into model-path
2023-02-17 21:48:21 -07:00
f9e35c745b
Merge remote-tracking branch 'origin/main'
2023-02-18 13:22:57 +09:00
340d7c38c8
fix: compatibility issues ( #174 )
2023-02-18 04:09:38 +00:00
5ec3e8a788
Merge remote-tracking branch 'origin/main'
2023-02-18 09:20:04 +09:00
403447fcc1
Merge branch 'main' into model-path
2023-02-17 15:09:17 -07:00
7f38bca5d4
Add control item and fix typo
2023-02-18 06:12:18 +09:00
5048c4c9f1
Add support for LeReS
2023-02-17 14:27:29 -05:00
b215d6f0f8
fix issue with img2img batch when changing tab during sampling
2023-02-17 11:25:01 -05:00
c47fc919b5
Merge pull request #155 from aiton-sd/main
...
Add some items to X/Y/Z plot
2023-02-18 00:48:33 +09:00
c027c163a5
Add control items
2023-02-18 00:22:15 +09:00
85d3611db1
chore: docs and samples
2023-02-17 15:01:19 +00:00
8d8837ff70
fix typo
2023-02-17 23:57:41 +09:00
4d7fd17d02
fix ui
2023-02-17 22:54:35 +09:00
64e46763da
fix variable name
2023-02-17 22:45:13 +09:00
6c0b0bbb37
Merge remote-tracking branch 'origin/main'
2023-02-17 22:42:46 +09:00
2b36e819a0
feat: impl timestep based strength
2023-02-17 13:10:20 +00:00
0146699545
feat: impl t2i-adapter
2023-02-17 11:40:19 +00:00
fa35459ff9
Update controlnet.py
...
related: #146 , #147
2023-02-17 20:22:12 +09:00
0f18cd87e7
Merge pull request #122 from GeorgLegato/GeorgLegato_SVG_Support
...
Supporting SVG graphics as input (drag/drop and select file)
2023-02-17 19:41:09 +09:00
33ede984c4
add back option in case someone wants it
2023-02-17 04:50:24 -05:00
5e3b8e9b9f
automatically remove no detectmap in img2img batch tab
2023-02-17 04:20:29 -05:00
3a03eb7e64
Merge remote-tracking branch 'origin/main'
2023-02-17 18:09:49 +09:00
fd2d7a51e8
fix: gradio compatibility
2023-02-17 06:49:01 +00:00
74846ac89f
Merge branch 'Mikubill:main' into model-path
2023-02-16 22:34:36 -07:00
feb2c406d6
Move models to models/ControlNet
2023-02-16 22:22:24 -07:00
f8dbf61c55
ui: minor fix
2023-02-17 05:21:48 +00:00
290825ca6d
Add height/width swap button
2023-02-16 21:45:21 -07:00
7bb00e03ec
Increase Annotator resolution to 2048
...
The minimum values are also changed to match to the same minimum value in Width
and Height sliders in the main section of A1111 UI. I can adjust those in
64-2048 range, and since preprocessor image will be either downscaled or
upscaled if it does not match and scaled it can cause issues in some cases (especially for
canny prepropressor and model).
Solves issue #121
2023-02-17 04:19:13 +00:00
623c5a44d6
fix: use generic update to avoid corner issue
2023-02-17 03:33:54 +00:00
6e6f9fc8ae
fix when no inputs given
2023-02-17 02:32:07 +01:00
c38877c111
Merge branch 'GeorgLegato_SVG_Support' of https://github.com/GeorgLegato/sd-webui-controlnet into GeorgLegato_SVG_Support
2023-02-17 02:10:46 +01:00
1440142ab3
simple svg support working
2023-02-17 01:49:16 +01:00
7b987376eb
fix: webui backward compatibility
2023-02-17 00:00:44 +00:00
7b9a8b4b92
fix the timing of swapping pipelines
2023-02-17 00:10:34 +09:00
7cf1c44e31
Merge remote-tracking branch 'origin/main'
2023-02-17 00:09:56 +09:00
45ccea66b6
fix: issue with none preproc
2023-02-16 14:59:50 +00:00
bd12abb399
fix: threshold slider issue
2023-02-16 14:45:26 +00:00
2ebf44895a
fix: slider, canny resolution
2023-02-16 14:41:00 +00:00
8486683529
ui: threshold slider, add missing value
2023-02-16 14:25:11 +00:00
85cfcdff9f
ui: threshold slider, minor fix
2023-02-16 14:18:56 +00:00
d09c520d40
ui: add threshold slider
2023-02-16 14:15:00 +00:00
cd0452e23d
add option to use initial image of img2img
2023-02-16 22:54:26 +09:00
64862e7bfb
Merge branch 'main' into ui-tweaks
2023-02-15 23:19:04 -07:00
14e125969b
Move canvas button
...
Relabel it to more accurately reflect its function.
2023-02-15 22:42:21 -07:00
45bad2b9e0
ui: move option to settings panel
2023-02-16 05:10:16 +00:00
069ec7e33a
Merge pull request #57 from fishslot/for-video-loopback
...
Allow other scripts to control this extention
2023-02-16 14:07:31 +09:00
7cec2d8566
Move image input to top
...
Make refresh button match the others
2023-02-15 21:08:22 -07:00
892b9fbf83
fix: compatibility issues
2023-02-16 04:06:22 +00:00
5184a46a1d
Merge branch 'main' into for-video-loopback
2023-02-16 11:46:18 +08:00
5f3e2a7da5
chore: remove config param since unused and documents
2023-02-16 03:30:48 +00:00
6690ac2a3e
docs: minor fix and defaults
2023-02-15 21:17:40 +00:00
b9efb602e5
fix: impl transfer control from original repo
2023-02-15 20:06:23 +00:00
43cca930e6
feat: add RGB-BGR conversion ( #71 )
2023-02-15 16:54:59 +00:00
269961bc21
fix: add some hints
2023-02-15 16:36:06 +00:00
b20ecea100
fix: minor fix
2023-02-15 16:08:34 +00:00
1d2cb96c3b
fix: normal_map issue ( #71 )
2023-02-15 16:08:00 +00:00
c2eff2c56f
fix: only use mid control on hires pass
2023-02-15 15:48:10 +00:00
27cbda0d2d
Update controlnet.py
2023-02-15 22:08:06 +08:00
d435be8ecf
Merge branch 'Mikubill:main' into for-video-loopback
2023-02-15 21:57:37 +08:00
c7c9f936d0
fix: unload models when switching preprocessor
2023-02-15 13:03:35 +00:00
4b26a6d659
conf: add control_net_no_detectmap
2023-02-15 12:03:19 +00:00
1412c9105a
consider preload.py not run
2023-02-15 05:46:24 -05:00
acf9671b7a
add additional models path in settings tab
2023-02-15 03:59:29 -05:00
48bd01cfc7
add --controlnet-dir cli arg
2023-02-15 02:55:06 -05:00
b25543b96a
Merge branch 'Mikubill:main' into for-video-loopback
2023-02-15 14:31:54 +08:00
5b080f7b93
ui: filename, minor fix
2023-02-15 06:12:18 +00:00
b08f746d1c
Merge branch 'Mikubill:main' into for-video-loopback
2023-02-15 14:09:46 +08:00
6b825f308b
Update controlnet.py
2023-02-15 14:09:28 +08:00
230a632ef5
fix: ui refresh button issue ( #18 )
2023-02-15 06:04:26 +00:00
3ff37ba46e
Update controlnet.py
2023-02-15 13:58:34 +08:00
f6a802ff5a
Merge branch 'Mikubill:main' into for-video-loopback
2023-02-15 12:46:23 +08:00
2108f7c90c
feat: add scribble mode
2023-02-14 17:37:58 +00:00
65c83f09db
Update controlnet.py
2023-02-15 00:46:17 +08:00
f9e2832fd4
Merge branch 'Mikubill:main' into for-video-loopback
2023-02-15 00:43:56 +08:00
c1ecaa8d2b
Update controlnet.py
2023-02-15 00:43:24 +08:00
0f200f1958
chore: rename preprocessor (midas->depth), add log entry
2023-02-14 16:14:01 +00:00
b2b07a4965
fix: minor fix
2023-02-14 16:05:44 +00:00
e472a12bdc
Merge pull request #36 from fishslot/main
...
When the user does not give an additional image, the init_image is used as the default
2023-02-15 01:02:29 +09:00
3919d2502a
fix: align preview map to output
2023-02-14 15:58:14 +00:00
7d7223f47d
Update controlnet.py
2023-02-14 23:56:49 +08:00
b53e00e7a1
fix: incorrent array handle with normal map ( #31 )
2023-02-14 15:33:39 +00:00
50dbb2658e
Update controlnet.py
2023-02-14 22:46:18 +08:00
c2a2ff4616
Update controlnet.py
2023-02-14 22:14:18 +08:00
98d24916f4
feat: add normal_map support ( #31 )
2023-02-14 13:24:21 +00:00
ce81753200
fix: enable scribble mode with mask input by default ( #7 )
2023-02-14 12:44:43 +00:00
d896a7c288
feat: add support for uniformer, skip reload model when not changed
2023-02-14 10:38:09 +00:00
de47fa2522
docs: update sample
2023-02-14 10:07:26 +00:00
e136818f66
fix: preview of detected_map
2023-02-14 09:59:33 +00:00
cb6cb50945
fix: hires upscale
2023-02-14 08:31:45 +00:00
b29f17c40d
fix: interpolate stuffs
2023-02-14 05:12:26 +00:00
5717556a12
Partially fix --device-id
2023-02-14 04:41:26 +08:00
ee2dfb14c2
fix: apply resize suggestion by usagirei
2023-02-13 20:29:57 +00:00
5d65a4eb42
fix: apply strength control correctly (maybe #4 )
2023-02-13 19:34:10 +00:00
1fa6303e2d
fix: resize issue
2023-02-13 18:13:40 +00:00
570bb2c787
feat: add midas support
2023-02-13 17:37:17 +00:00
abfd6261f2
fix conflicts
2023-02-14 01:37:07 +09:00
644e2a27ae
fix: mlsd issue, add resize mode radio( #3 )
2023-02-13 16:16:39 +00:00
867fafd275
fix: minor fix
2023-02-13 13:48:03 +00:00
6912fee6af
fix: sketchpad hw issue & handle image reader correctly
2023-02-13 13:36:44 +00:00
3991f42fef
add lowvram option (from original low_vram.py)
2023-02-13 21:32:14 +09:00
ffc20d0032
fix: use fixed controlmap size
2023-02-13 12:00:55 +00:00
90e8741bf4
feat: add samples
2023-02-13 10:32:47 +00:00
21056faa2a
feat: add samples
2023-02-13 09:58:17 +00:00
eed7e5dd51
feat: make openpose mode works
2023-02-13 09:10:52 +00:00
565447cfdb
feat: make hed mode works
2023-02-13 08:21:10 +00:00
b1af0414e9
feat: make canny mode works
2023-02-13 07:05:22 +00:00
b46bbd3fca
fix: add control image to output
2023-02-13 06:28:10 +00:00
1a2d545414
fix: move parser outof model loader
2023-02-13 06:27:28 +00:00
1da97f4e2b
Add files via upload
2023-02-13 15:00:54 +09:00
Mikubill
LonicaMewinsky
LonicaMewinsky
aiton-sd
Ashen
ljleb
mattyamonaca
Pablo Martinez
Vladimir Mandic
ddPn08
Yu Zhu
105gun
Jim Allanson
missionfloyd
Sang
FNSpd
stassius
Chris Mekarski
ddPn08
Lissanro Rayen
GeorgLegato
fishslot
RcINS
hnmr293