Commit Graph
321 Commits
Author SHA1 Message Date
Jedrzej Kosinski 285f41c809 Cleaned up some commented out code from control_lllite.py file 2024-11-14 15:20:48 -06:00
Jedrzej Kosinski 326b26ed95 Simplified ControlLLLite implementation, since transformer_options are passed into get_control with ComfyUI rework 2024-11-14 12:10:28 -06:00
Jedrzej Kosinski b9c53b79c9 Fix from_vanilla call for ControlNetAdvanced so it does not break ComfyUI memory management system; parent model patcher has to be tracked properly now 2024-11-14 11:49:56 -06:00
Jedrzej Kosinski 7f84e973d6 Converted sampler_sample_wrapper to a outer_sample_wrapper so that controlnet prerun can be ran properly 2024-11-14 10:53:59 -06:00
Jedrzej Kosinski 52f8220260 Started to replace anc_sample_factory with acn_sampler_sample_wrapper WrapperHook, ReferenceCN now can respect individual conds 2024-11-14 08:12:54 -06:00
Jedrzej Kosinski 57dfa7d1ce Cleaned imports in nodes.py 2024-11-14 04:58:23 -06:00
Jedrzej Kosinski 820a591687 Replaced base Load Advanced ControlNet Model nodes with ones with cnet instead of control_net_name to leave more room for CN name 2024-11-14 04:57:12 -06:00
Jedrzej Kosinski 828c270a85 Moved autosize to hidden props instead of optional to make use of AustinMroz's revised js, fixed outdated autosize values 2024-11-14 04:13:38 -06:00
Jedrzej Kosinski 1d14382944 Updated Aoply Advanced ControlNet nodes to remove long unnecessaru model_optional fields, shifted some of the nodes.py code around to separate files to make deprecation cleaner 2024-11-14 04:04:21 -06:00
Jedrzej Kosinski 3120c14e0a Added checks for None control_net to produce more helpful error messages for users 2024-11-14 03:48:42 -06:00
Jedrzej Kosinski f42c902fd4 Fixed checks for special preprocessor input (ReferenceCN and RGB SparseCtrl), continued work on DinkLink 2024-11-14 03:42:29 -06:00
Jedrzej Kosinski 74320a78e3 Replaced SparseModelPatcher with native ModelPatcher and callbacks 2024-11-12 18:14:21 -06:00
Jedrzej Kosinski c7aa168691 Added DinkLink scaffolding 2024-11-12 18:13:17 -06:00
Jedrzej Kosinski 048e090146 version bump 2024-11-12 16:34:06 -06:00
Jedrzej Kosinski 5505370c43 Merge branch 'main' into rework-modelpatcher 2024-10-31 18:30:14 -05:00
Jedrzej Kosinski 172543b725 Merge pull request #194 from Stability-AI/bugfix/ControlLLLiteAdvanced
Fix for ControlLLLiteAdvanced
2024-10-31 18:20:35 -05:00
pharmapsychotic 6d00ede674 device is no longer a parameter to constructor for ControlBase 2024-10-31 23:12:46 +00:00
Jedrzej Kosinski f5a0e8e77e Merge branch 'main' into rework-modelpatcher 2024-10-25 15:45:13 -05:00
Jedrzej Kosinski 1dc1b648ce Some progress on future acn_sampler_sample_wrapper 2024-10-25 15:45:00 -05:00
Jedrzej Kosinski b9c8bdc6dd Merge pull request #192 from AustinMroz/main
Update autosizing js
2024-10-25 15:43:25 -05:00
Austin Mroz 5610657a56 Update autosizing js
Allow for autosizing to be configured by setting a hidden field instead
of dummy widget.

If autosizing isn't specified for a node, instead set the initial width
to the greater of the title length, or the original base node width used
by ComfyUI
2024-10-25 03:31:06 -05:00
Jedrzej Kosinski 767cbf3dcc Merge branch 'main' into rework-modelpatcher 2024-10-23 22:02:47 -05:00
Jedrzej Kosinski dc48641c97 Merge PR #188 from Kosinkadink/comfyupdate
Removed device var to match new ComfyUI update
2024-10-23 22:00:26 -05:00
Jedrzej Kosinski 934f55df85 version bump 2024-10-23 21:58:20 -05:00
Jedrzej Kosinski 95e26b9b79 Made code work with new ComfyUI changes (device var removed from ControlBase) 2024-10-23 21:57:39 -05:00
Jedrzej Kosinski 7d25e4bafb Ported ContextRef adain support to work with uuids, reorganized the ContextRef-related code in BankStyle classes 2024-10-11 09:43:06 -05:00
Jedrzej Kosinski b0044cc2b7 For ContextRef c_bank, don't cat unless needed 2024-10-08 17:37:40 -05:00
Jedrzej Kosinski ea878b462f More progress on using cond uuids for ContextRef 2024-10-08 17:23:46 -05:00
Jedrzej Kosinski 37a3b26986 Progress on using uuids of conds instead of depending on execution order for ContextRef 2024-10-08 16:43:27 -05:00
Kosinkadink f778bb2a70 Modified code to accept transformer_options to match ComfyUI's get_control change and removed need to a terribly ugly hack that was required before to get the cond_or_uncond; now can just be gotten from transformer_options 2024-09-25 20:50:20 +09:00
Kosinkadink 786f9dd27f Applied changes to context_ref support code to work with upcoming ComfyUI ModelPatcher changes/ADE 2024-09-24 16:05:56 +09:00
Jedrzej Kosinski 74d0c56ab3 Merge PR #170 from Kosinkadink/develop - fix fp8 support for SparseCtrl
Fix fp8 support for SparseCtrl
2024-08-30 08:35:40 -05:00
Jedrzej Kosinski 50db1e64be version bump 2024-08-30 08:29:57 -05:00
Jedrzej Kosinski 5641babc05 Merge branch 'main' into develop 2024-08-30 08:29:39 -05:00
Jedrzej Kosinski 552599ec6d Fix fp8 support for SparseCtrl 2024-08-30 08:29:23 -05:00
Jedrzej Kosinski dcc928be58 Merge PR #169 from Kosinkadink/develop - initial flux support
Initial flux support, refactoring weight control
2024-08-30 07:50:30 -05:00
Jedrzej Kosinski ef16e3c6be Refactored Scaled Soft Weights node to remove flip_weights param 2024-08-30 07:47:38 -05:00
Jedrzej Kosinski 60ac29b4ae version bump 2024-08-30 07:42:18 -05:00
Jedrzej Kosinski 476da0e724 Implemented changes from ComfyUI's InstantX depth flux support commit 2024-08-30 07:09:26 -05:00
Jedrzej Kosinski 299c6d9506 Fixed flux cns not working if no soft weights attached, added ControlNet Custom Weights [Flux] node 2024-08-30 06:37:30 -05:00
Jedrzej Kosinski 4b3a65fa32 Refactored Soft ControlNet SD1.5/T2I Weights node code to reuse code from Custom version 2024-08-30 06:05:00 -05:00
Jedrzej Kosinski 9c00ec00ea Clarified Soft/Custom ControlNet SD1.5/T2I Adapter Weights nodes, deprecated old versions 2024-08-30 05:59:05 -05:00
Jedrzej Kosinski ce72ce674f Add single cond version of Apply Advanced ControlNet node 2024-08-30 05:04:17 -05:00
Jedrzej Kosinski a9e9ec7b92 Fix inconsistent variable name causing reference before assignment error 2024-08-30 03:28:01 -05:00
Jedrzej Kosinski d3ceadbaba Attempted to add masking support for flux controlnet (not working yet, but logic is partway there 2024-08-29 09:57:23 -05:00
Jedrzej Kosinski 49609d318f Refactored cn weights to separate out input, middle, and output blocks, improved soft weight behavior to generalize math to be architecture agnostic (for the most part) 2024-08-24 07:31:26 -05:00
Jedrzej Kosinski 1807cd64e4 Updated ControlNetAdvanced to work with Flux controlnet, beginning of rework of weights 2024-08-24 00:43:21 -05:00
Jedrzej Kosinski 949843e2c0 Merge PR #165 from zhiselfly/main - ControlNet++ shape fix
Fixed the "doesn't match the broadcast shape" issue in ControlNet++ (…
2024-08-23 21:08:13 -05:00
zhiselfly 45e56c3003 Fixed the "doesn't match the broadcast shape" issue in ControlNet++ (Multi) when there are two or more Inputs due to insufficient memory 2024-08-23 21:41:11 +08:00
Jedrzej Kosinski 1b3cb5f48c Merge PR #163 from Kosinkadink/develop - SparseCtrl lowvram fix for newest ComfyUI
Make SparseCtrl work with newest ComfyUI updates
2024-08-20 05:14:24 -05:00