Commit Graph

646 Commits (58f620c921030eea0f3528d68849f7e052d44e3f)

Author SHA1 Message Date
lvmin 43a40598cc fix high-res fix 2023-06-10 14:47:08 -07:00
lvmin a60b46b6e1 fix high-res fix 2023-06-10 14:45:08 -07:00
lvmin 048e3384f3 fix high-res fix 2023-06-10 14:41:56 -07:00
lvmin 5e89cd9f0c fix high-res fix 2023-06-10 14:40:45 -07:00
lvmin ceb08e8464 fix high-res fix 2023-06-10 14:38:37 -07:00
lllyasviel 5c9731319b
[1.1.121] Preprocessor: inpaint_only+lama (#1558)
[1.1.121] Preprocessor: inpaint_only+lama (#1558)
2023-06-08 17:42:08 -07:00
Chenlei Hu 1f66e9c614
🎨 Make active unit's tab name green (#1577)
* 🎨 Make active unit's tab name green

* 🎨 Use brighter green in dark mode
2023-06-06 20:13:15 -04:00
lllyasviel 6a58d77191
fix bugs in 218 (#1576) 2023-06-06 14:13:21 -07:00
lllyasviel 7ad8cc8e65
fix api (#1565) 2023-06-05 16:24:06 -07:00
lllyasviel 795b27e0e6
more robust judgement (#1554) 2023-06-04 14:37:50 -07:00
lllyasviel 93ed6c9d4c
enable seeing masked area in inpaint mask visualization (#1553) 2023-06-04 14:28:47 -07:00
Chenlei Hu 5b681b071b
New feature: integrated openpose editor (#1454)
🎨 nits

🎨 Load alert screen when no editor is detected.

🔧 add option to hide edit button

🐛 Resolve conflicts during rebase

🚧 Set use preview as input after edit

🐛 Fix merge conflict
2023-06-04 15:54:35 -04:00
Chenlei Hu d3b64fbdd5
Reland logs; debug (#1540)
fallback
2023-06-04 13:55:45 -04:00
lllyasviel d8551e447d
remove unnecessary/wrong judgement (#1539) 2023-06-03 17:19:48 -07:00
Chenlei Hu b0a7dc8864
Revert "Logging migration (#1537)" (#1538)
This reverts commit f7eeb481ea.
2023-06-03 19:13:16 -04:00
Chenlei Hu f7eeb481ea
Logging migration (#1537)
* 🔊 Use logger to replace print in scripts

* 🐛 Fix double handler issue
2023-06-03 18:14:56 -04:00
lllyasviel 7b2bf668ee
fix post processing (#1532) 2023-06-02 20:46:26 -07:00
Chenlei Hu 591b3de809
[Reland] Extract Prepare Mask logic (#1528)
* 🔨 Extract prepare mask logic

* 🐛 return Image instead of nparray

* 🐛 rename variable so that same variable always have same type

* 🎨 nits
2023-06-02 22:18:56 -04:00
lllyasviel 3c41f1546e
Revert "Extract prepare mask logic (#1525)" (#1527)
This reverts commit d7faaa491c.
2023-06-02 18:51:41 -07:00
Chenlei Hu d7faaa491c
Extract prepare mask logic (#1525)
* 🔨 Extract prepare mask logic

* 🐛 return Image instead of nparray
2023-06-02 21:05:05 -04:00
Chenlei Hu d99905418c
🔨 Extract pixel perfect calculation (#1522) 2023-06-02 18:28:44 -04:00
lllyasviel d4db708a6e
fix data range (#1521)
* fix high-res fix, 212

* fix high-res fix, 212

* fix data range
2023-06-02 14:39:17 -07:00
Chenlei Hu b3a0dad462
🔨 Add int_value on ResizeMode (#1519) 2023-06-02 17:11:07 -04:00
Chenlei Hu 8326f4d5e0
🐛 Fix typo (#1518)
* 🐛 fix typo

* 🎨 nits
2023-06-02 16:53:13 -04:00
Chenlei Hu 470bb585ab
🔥 remove unnecessary moving (#1517) 2023-06-02 16:48:03 -04:00
Chenlei Hu 3de90f95f7
🚚 Move image has mask logic out (#1516) 2023-06-02 16:36:18 -04:00
Chenlei Hu 5c3adb2356
🔥 Use esize_mode_from_value to replace value matching (#1515) 2023-06-02 16:24:03 -04:00
Chenlei Hu e298df1796
[Refactor] Move choose input image logic out of Script.process (#1513)
* 🚚 Move choose input image load out of Script.process

* Deprecate first 2 branches
2023-06-02 16:17:19 -04:00
lllyasviel faee7cf2f5
Change to default multi control (#1511) 2023-06-02 11:40:51 -07:00
Chenlei Hu 8004669cb0
🔨 Convert methods that do not access member data to static methods (#1510) 2023-06-02 14:28:02 -04:00
Chenlei Hu a8387bddfb
🚚 Rename ui/ as controlnet_ui/ (#1508) 2023-06-02 10:49:26 -04:00
lllyasviel 4da6da05e5
fix inpaint distortion outside gradio preview (#1502) 2023-06-01 19:25:21 -07:00
Chenlei Hu 4f0f26b7c6
Cleanup unused functions (#1491)
* nits

* nits
2023-06-01 11:38:57 -04:00
lllyasviel ae5ca103be
fix outpaint eating boder pixels (#1493) 2023-06-01 03:13:16 -07:00
Chenlei Hu 624ec956f3
[Refactor] Move controlnet.Script.uigroup out as ui.controlnet_ui_group (#1475)
* 🚚 Move controlnet.Script.uigroup out.

* 🚚 rename uigroup

* explicitly declare fields

* 🐛 nits

* 🔥 remove unused imports

* reload utils

* reload utils

* 🚚 Move get_module_basename to global_state

* Update scripts/controlnet.py

---------

Co-authored-by: ljleb <lebel.louisjacob@gmail.com>
2023-05-31 22:22:40 -04:00
lllyasviel 904e97b605
outpaint shortcut (#1486) 2023-05-31 15:51:07 -07:00
Alexander Brown c3840a0029
Add classes/ids to some controls for styling (#1449)
* Add classes/ids to some controls for styling

* Change info/label for Loopback

* Replace id with class

* Add classes for the weight/steps section

* Update controlnet.py

* Add some classes to style the upper controls

* Undo label/info change for Loopback
2023-05-30 02:47:31 -07:00
lllyasviel 2d97323a6d
fix 1468 (#1470) 2023-05-30 02:12:24 -07:00
lllyasviel 09cb9a32d1
fix small misalignment with a1111 1.3.0 (#1460)
* fix small misalignment with a1111 1.3.0

* fix small misalignment with a1111 1.3.0
2023-05-29 03:35:44 -07:00
lllyasviel 2e0dc37d22
better inpaint (#1455)
* better inpaint

* better inpaint

* better inpaint

* better inpaint

* better inpaint

* better inpaint

* better inpaint
2023-05-28 04:53:51 -07:00
lllyasviel 5fe0981be0
add inpaint_only (#1441) 2023-05-26 19:42:52 -07:00
S-Del 0d1c252cad
fix typo in controlnet.py (#1440)
mod -> mode
2023-05-26 17:10:06 -07:00
lllyasviel fdb8b00c18
fix conflict with Tiled Diffudion (#1428) 2023-05-25 22:23:02 -07:00
lllyasviel a83a260605
ui filter fix (#1424)
* ui filter fix

* ui filter fix

* ui filter fix

* ui filter fix
2023-05-25 09:20:36 -07:00
lllyasviel cb94dda767
ui filter (#1422) 2023-05-25 07:56:12 -07:00
lllyasviel 35a12d07ad
fix clipvision (#1382) 2023-05-21 16:25:13 -07:00
huchenlei ca3252598b 🔧 Add cmd args to set cache size 2023-05-21 14:12:36 -04:00
huchenlei bbe357e6ac Add cache for preprocessors 2023-05-21 13:36:03 -04:00
lllyasviel 539d2fc990
shift to context marker for cond-ucond (#1337)
shift to context marker for cond-ucond https://github.com/Mikubill/sd-webui-controlnet/pull/1337
2023-05-20 01:08:55 -07:00
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