From 006ac043efada973ecd74ea0cb2a1a6b64a8fd4e Mon Sep 17 00:00:00 2001 From: Jedrzej Kosinski Date: Tue, 12 Nov 2024 09:55:42 -0600 Subject: [PATCH] Commented out NoiseCalibration and FancyVideo from user's view so can be safely merged into main, will need to get working properly later --- animatediff/nodes.py | 10 ++++++---- animatediff/nodes_sample.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/animatediff/nodes.py b/animatediff/nodes.py index f61aa28..9e8f1ed 100644 --- a/animatediff/nodes.py +++ b/animatediff/nodes.py @@ -98,6 +98,8 @@ NODE_CLASS_MAPPINGS = { "ADE_IterationOptsDefault": IterationOptionsNode, "ADE_IterationOptsFreeInit": FreeInitOptionsNode, # Conditioning + "ADE_LoraHookKeyframeInterpolation": CreateLoraHookKeyframeInterpolation, + # Conditioning (DEPRECATED) "ADE_RegisterLoraHook": MaskableLoraLoaderDEPR, "ADE_RegisterLoraHookModelOnly": MaskableLoraLoaderModelOnlyDEPR, "ADE_RegisterModelAsLoraHook": MaskableSDModelLoaderDEPR, @@ -108,7 +110,6 @@ NODE_CLASS_MAPPINGS = { "ADE_SetLoraHookKeyframe": SetLoraHookKeyframesDEPR, "ADE_AttachLoraHookToCLIP": SetClipLoraHookDEPR, "ADE_LoraHookKeyframe": CreateLoraHookKeyframeDEPR, - "ADE_LoraHookKeyframeInterpolation": CreateLoraHookKeyframeInterpolation, "ADE_LoraHookKeyframeFromStrengthList": CreateLoraHookKeyframeFromStrengthListDEPR, "ADE_AttachLoraHookToConditioning": SetModelLoraHookDEPR, "ADE_PairedConditioningSetMask": PairedConditioningSetMaskHookedDEPR, @@ -154,7 +155,7 @@ NODE_CLASS_MAPPINGS = { "ADE_SigmaScheduleToSigmas": SigmaScheduleToSigmasNode, "ADE_NoisedImageInjection": NoisedImageInjectionNode, "ADE_NoisedImageInjectOptions": NoisedImageInjectOptionsNode, - "ADE_NoiseCalibration": NoiseCalibrationNode, + #"ADE_NoiseCalibration": NoiseCalibrationNode, # Scheduling PromptSchedulingNode.NodeID: PromptSchedulingNode, PromptSchedulingLatentsNode.NodeID: PromptSchedulingLatentsNode, @@ -210,7 +211,7 @@ NODE_CLASS_MAPPINGS = { "ADE_PIA_AnimateDiffKeyframe": PIA_ADKeyframeNode, "ADE_InjectPIAIntoAnimateDiffModel": LoadAnimateDiffAndInjectPIANode, # FancyVideo - ApplyAnimateDiffFancyVideo.NodeID: ApplyAnimateDiffFancyVideo, + #ApplyAnimateDiffFancyVideo.NodeID: ApplyAnimateDiffFancyVideo, # Deprecated Nodes "AnimateDiffLoaderV1": AnimateDiffLoaderDEPR, "ADE_AnimateDiffLoaderV1Advanced": AnimateDiffLoaderAdvancedDEPR, @@ -268,6 +269,8 @@ NODE_DISPLAY_NAME_MAPPINGS = { "ADE_IterationOptsDefault": "Default Iteration Options 🎭🅐🅓", "ADE_IterationOptsFreeInit": "FreeInit Iteration Options 🎭🅐🅓", # Conditioning + "ADE_LoraHookKeyframeInterpolation": "LoRA Hook Keyframes Interp. 🎭🅐🅓", + # Conditioning (DEPRECATED) "ADE_RegisterLoraHook": "Register LoRA Hook 🎭🅐🅓", "ADE_RegisterLoraHookModelOnly": "Register LoRA Hook (Model Only) 🎭🅐🅓", "ADE_RegisterModelAsLoraHook": "Register Model as LoRA Hook 🎭🅐🅓", @@ -278,7 +281,6 @@ NODE_DISPLAY_NAME_MAPPINGS = { "ADE_SetLoraHookKeyframe": "Set LoRA Hook Keyframes 🎭🅐🅓", "ADE_AttachLoraHookToCLIP": "Set CLIP LoRA Hook 🎭🅐🅓", "ADE_LoraHookKeyframe": "LoRA Hook Keyframe 🎭🅐🅓", - "ADE_LoraHookKeyframeInterpolation": "LoRA Hook Keyframes Interp. 🎭🅐🅓", "ADE_LoraHookKeyframeFromStrengthList": "LoRA Hook Keyframes From List 🎭🅐🅓", "ADE_AttachLoraHookToConditioning": "Set Model LoRA Hook 🎭🅐🅓", "ADE_PairedConditioningSetMask": "Set Props on Conds 🎭🅐🅓", diff --git a/animatediff/nodes_sample.py b/animatediff/nodes_sample.py index 6d798dc..631ae00 100644 --- a/animatediff/nodes_sample.py +++ b/animatediff/nodes_sample.py @@ -33,7 +33,7 @@ class SampleSettingsNode: "custom_cfg": ("CUSTOM_CFG",), "sigma_schedule": ("SIGMA_SCHEDULE",), "image_inject": ("IMAGE_INJECT",), - "noise_calib": ("NOISE_CALIBRATION",), + #"noise_calib": ("NOISE_CALIBRATION",), # TODO: bring back once NoiseCalibration is working }, "hidden": { "autosize": ("ADEAUTOSIZE", {"padding": 0}),