diff --git a/adv_control/nodes_deprecated.py b/adv_control/nodes_deprecated.py index 838fc99..273629c 100644 --- a/adv_control/nodes_deprecated.py +++ b/adv_control/nodes_deprecated.py @@ -83,6 +83,8 @@ class ScaledSoftUniversalWeightsDeprecated: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -121,6 +123,8 @@ class SoftControlNetWeightsDeprecated: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -165,6 +169,8 @@ class CustomControlNetWeightsDeprecated: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -200,6 +206,8 @@ class SoftT2IAdapterWeightsDeprecated: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -233,6 +241,8 @@ class CustomT2IAdapterWeightsDeprecated: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -272,6 +282,8 @@ class AdvancedControlNetApplyDEPR: "weights_override": ("CONTROL_NET_WEIGHTS", ), "model_optional": ("MODEL",), "vae_optional": ("VAE",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -313,6 +325,8 @@ class AdvancedControlNetApplySingleDEPR: "weights_override": ("CONTROL_NET_WEIGHTS", ), "model_optional": ("MODEL",), "vae_optional": ("VAE",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } diff --git a/adv_control/nodes_keyframes.py b/adv_control/nodes_keyframes.py index 5f92977..bbcf599 100644 --- a/adv_control/nodes_keyframes.py +++ b/adv_control/nodes_keyframes.py @@ -25,6 +25,8 @@ class TimestepKeyframeNode: "inherit_missing": ("BOOLEAN", {"default": True}, ), "guarantee_steps": ("INT", {"default": 1, "min": 0, "max": BIGMAX}), "mask_optional": ("MASK", ), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -82,6 +84,8 @@ class TimestepKeyframeInterpolationNode: "inherit_missing": ("BOOLEAN", {"default": True},), "mask_optional": ("MASK", ), "print_keyframes": ("BOOLEAN", {"default": False}), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -141,6 +145,8 @@ class TimestepKeyframeFromStrengthListNode: "inherit_missing": ("BOOLEAN", {"default": True},), "mask_optional": ("MASK", ), "print_keyframes": ("BOOLEAN", {"default": False}), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -198,6 +204,8 @@ class LatentKeyframeNode: }, "optional": { "prev_latent_kf": ("LATENT_KEYFRAME", ), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -235,7 +243,9 @@ class LatentKeyframeGroupNode: "prev_latent_kf": ("LATENT_KEYFRAME", ), "latent_optional": ("LATENT", ), "print_keyframes": ("BOOLEAN", {"default": False}), - "autosize": ("ACNAUTOSIZE", {"padding": 35}), + }, + "hidden": { + "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -355,7 +365,9 @@ class LatentKeyframeInterpolationNode: "optional": { "prev_latent_kf": ("LATENT_KEYFRAME", ), "print_keyframes": ("BOOLEAN", {"default": False}), - "autosize": ("ACNAUTOSIZE", {"padding": 50}), + }, + "hidden": { + "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -426,6 +438,8 @@ class LatentKeyframeBatchedGroupNode: "optional": { "prev_latent_kf": ("LATENT_KEYFRAME", ), "print_keyframes": ("BOOLEAN", {"default": False}), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } diff --git a/adv_control/nodes_main.py b/adv_control/nodes_main.py index 5cdd68d..7df8fe5 100644 --- a/adv_control/nodes_main.py +++ b/adv_control/nodes_main.py @@ -47,7 +47,9 @@ class DiffControlNetLoaderAdvanced: }, "optional": { "tk_optional": ("TIMESTEP_KEYFRAME", ), - "autosize": ("ACNAUTOSIZE", {"padding": 160}), + }, + "hidden": { + "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -88,6 +90,8 @@ class AdvancedControlNetApply: "latent_kf_override": ("LATENT_KEYFRAME", ), "weights_override": ("CONTROL_NET_WEIGHTS", ), "vae_optional": ("VAE",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -189,8 +193,9 @@ class AdvancedControlNetApplySingle: "timestep_kf": ("TIMESTEP_KEYFRAME", ), "latent_kf_override": ("LATENT_KEYFRAME", ), "weights_override": ("CONTROL_NET_WEIGHTS", ), - "model_optional": ("MODEL",), "vae_optional": ("VAE",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -202,12 +207,12 @@ class AdvancedControlNetApplySingle: CATEGORY = "Adv-ControlNet 🛂🅐🅒🅝" def apply_controlnet(self, conditioning, control_net, image, strength, start_percent, end_percent, - mask_optional: Tensor=None, model_optional: ModelPatcher=None, vae_optional=None, + mask_optional: Tensor=None, vae_optional=None, timestep_kf: TimestepKeyframeGroup=None, latent_kf_override: LatentKeyframeGroup=None, weights_override: ControlWeights=None): values = AdvancedControlNetApply.apply_controlnet(self, positive=conditioning, negative=None, control_net=control_net, image=image, strength=strength, start_percent=start_percent, end_percent=end_percent, - mask_optional=mask_optional, model_optional=model_optional, vae_optional=vae_optional, + mask_optional=mask_optional, vae_optional=vae_optional, timestep_kf=timestep_kf, latent_kf_override=latent_kf_override, weights_override=weights_override, control_apply_to_uncond=True) return (values[0],) diff --git a/adv_control/nodes_plusplus.py b/adv_control/nodes_plusplus.py index c3fb298..755cef7 100644 --- a/adv_control/nodes_plusplus.py +++ b/adv_control/nodes_plusplus.py @@ -62,8 +62,10 @@ class PlusPlusInputNode: }, "optional": { "prev_plus_input": ("PLUS_INPUT",), - "autosize": ("ACNAUTOSIZE", {"padding": 0}), #"strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": BIGMAX, "step": 0.01}), + }, + "hidden": { + "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } diff --git a/adv_control/nodes_sparsectrl.py b/adv_control/nodes_sparsectrl.py index 50c634e..fe1c05b 100644 --- a/adv_control/nodes_sparsectrl.py +++ b/adv_control/nodes_sparsectrl.py @@ -134,7 +134,7 @@ class RgbSparseCtrlPreprocessor: "vae": ("VAE", ), "latent_size": ("LATENT", ), }, - "optional": { + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -168,7 +168,9 @@ class SparseWeightExtras: "sparse_hint_mult": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.001}, ), "sparse_nonhint_mult": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.001}, ), "sparse_mask_mult": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.001}, ), - "autosize": ("ACNAUTOSIZE", {"padding": 50}), + }, + "hidden": { + "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } diff --git a/adv_control/nodes_weight.py b/adv_control/nodes_weight.py index 09c3dee..d134dd3 100644 --- a/adv_control/nodes_weight.py +++ b/adv_control/nodes_weight.py @@ -13,6 +13,8 @@ class DefaultWeights: return { "optional": { "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -42,6 +44,8 @@ class ScaledSoftMaskedUniversalWeights: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -76,6 +80,8 @@ class ScaledSoftUniversalWeights: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -113,6 +119,8 @@ class SoftControlNetWeightsSD15: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -156,6 +164,8 @@ class CustomControlNetWeightsSD15: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -204,6 +214,8 @@ class CustomControlNetWeightsFlux: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -238,6 +250,8 @@ class SoftT2IAdapterWeights: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } } @@ -267,6 +281,8 @@ class CustomT2IAdapterWeights: "optional": { "uncond_multiplier": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}, ), "cn_extras": ("CN_WEIGHTS_EXTRAS",), + }, + "hidden": { "autosize": ("ACNAUTOSIZE", {"padding": 0}), } }