From 94279ac5bf0bf2c033e12780c8d075d382a3e8f5 Mon Sep 17 00:00:00 2001 From: spacepxl Date: Sun, 20 Jul 2025 20:30:51 -0400 Subject: [PATCH] cleanup node mappings --- __init__.py | 9 ++- nodes.py | 182 +++++++++++++++++----------------------------------- 2 files changed, 68 insertions(+), 123 deletions(-) diff --git a/__init__.py b/__init__.py index 50fb1bb..0b22001 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,10 @@ -from .nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS +# from .nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS +from .nodes import COMBINED_MAPPINGS + +NODE_CLASS_MAPPINGS = {} +NODE_DISPLAY_NAME_MAPPINGS = {} +for k, v in COMBINED_MAPPINGS.items(): + NODE_CLASS_MAPPINGS[k] = v[0] + NODE_DISPLAY_NAME_MAPPINGS[k] = v[1] __all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS'] \ No newline at end of file diff --git a/nodes.py b/nodes.py index 05aa691..0626044 100644 --- a/nodes.py +++ b/nodes.py @@ -2256,126 +2256,64 @@ class PackVideoMask: return (squashed_mask,) -NODE_CLASS_MAPPINGS = { - "AdainFilterLatent": AdainFilterLatent, - "AdainImage": AdainImage, - "AdainLatent": AdainLatent, - "AlphaClean": AlphaClean, - "AlphaMatte": AlphaMatte, - "BatchAlign": BatchAlign, - "BatchAverageImage": BatchAverageImage, - "BatchAverageUnJittered": BatchAverageUnJittered, - "BatchNormalizeImage": BatchNormalizeImage, - "BatchNormalizeLatent": BatchNormalizeLatent, - "BetterFilmGrain": BetterFilmGrain, - "BilateralFilterImage": BilateralFilterImage, - "BlurImageFast": BlurImageFast, - "BlurMaskFast": BlurMaskFast, - "ClampImage": ClampImage, - "ClampOutliers": ClampOutliers, - "ColorMatchImage": ColorMatchImage, - "ConditioningSubtract": ConditioningSubtract, - "ConvertNormals": ConvertNormals, - "CustomNoise": CustomNoise, - "DepthToNormals": DepthToNormals, - "DifferenceChecker": DifferenceChecker, - "DilateErodeMask": DilateErodeMask, - "EnhanceDetail": EnhanceDetail, - "ExposureAdjust": ExposureAdjust, - "ExtractNFrames": ExtractNFrames, - "FrequencyCombine": FrequencyCombine, - "FrequencySeparate": FrequencySeparate, - "GameOfLife": GameOfLife, - "GuidedFilterImage": GuidedFilterImage, - "Hunyuan3Dv2LatentUpscaleBy": Hunyuan3Dv2LatentUpscaleBy, - "ImageConstant": ImageConstant, - "ImageConstantHSV": ImageConstantHSV, - "ImageMatting": ImageMatting, - "InpaintConditionApply": InpaintConditionApply, - "InpaintConditionEncode": InpaintConditionEncode, - "InstructPixToPixConditioningAdvanced": InstructPixToPixConditioningAdvanced, - "JitterImage": JitterImage, - "Keyer": Keyer, - "LatentNormalizeShuffle": LatentNormalizeShuffle, - "RandnLikeLatent": RandnLikeLatent, - "LatentStats": LatentStats, - "MaskClean": MaskClean, - "MedianFilterImage": MedianFilterImage, - "MergeFramesByIndex": MergeFramesByIndex, - "ModelTest": ModelTest, - "NormalMapSimple": NormalMapSimple, - "OffsetLatentImage": OffsetLatentImage, - "PackVideoMask": PackVideoMask, - "PrintSigmas": PrintSigmas, - "RelightSimple": RelightSimple, - "RemapRange": RemapRange, - "RestoreDetail": RestoreDetail, - "SharpenFilterLatent": SharpenFilterLatent, - "ShuffleChannels": ShuffleChannels, - "Tonemap": Tonemap, - "UnJitterImage": UnJitterImage, - "UnTonemap": UnTonemap, - "VisualizeLatents": VisualizeLatents, -} - -NODE_DISPLAY_NAME_MAPPINGS = { - "AdainFilterLatent": "AdaIN Filter (Latent)", - "AdainImage": "AdaIN (Image)", - "AdainLatent": "AdaIN (Latent)", - "AlphaClean": "Alpha Clean (DEPRECATED, use MaskClean)", - "AlphaMatte": "Alpha Matte (DEPRECATED, use ImageMatting)", - "BatchAlign": "Batch Align (RAFT)", - "BatchAverageImage": "Batch Average Image", - "BatchAverageUnJittered": "Batch Average Un-Jittered", - "BatchNormalizeImage": "Batch Normalize (Image)", - "BatchNormalizeLatent": "Batch Normalize (Latent)", - "BetterFilmGrain": "Better Film Grain", - "BilateralFilterImage": "Bilateral Filter Image", - "BlurImageFast": "Blur Image (Fast)", - "BlurMaskFast": "Blur Mask (Fast)", - "ClampImage": "Clamp Image", - "ClampOutliers": "Clamp Outliers", - "ColorMatchImage": "Color Match Image", - "ConditioningSubtract": "ConditioningSubtract", - "ConvertNormals": "Convert Normals", - "CustomNoise": "CustomNoise", - "DepthToNormals": "Depth To Normals", - "DifferenceChecker": "Difference Checker", - "DilateErodeMask": "Dilate/Erode Mask", - "EnhanceDetail": "Enhance Detail", - "ExposureAdjust": "Exposure Adjust", - "ExtractNFrames": "Extract N Frames", - "FrequencyCombine": "Frequency Combine", - "FrequencySeparate": "Frequency Separate", - "GameOfLife": "Game Of Life", - "GuidedFilterImage": "Guided Filter Image", - "Hunyuan3Dv2LatentUpscaleBy": "Upscale Hunyuan3Dv2 Latent By", - "ImageConstant": "Image Constant Color (RGB)", - "ImageConstantHSV": "Image Constant Color (HSV)", - "ImageMatting": "Image Matting", - "InpaintConditionApply": "Inpaint Condition Apply", - "InpaintConditionEncode": "Inpaint Condition Encode", - "InstructPixToPixConditioningAdvanced": "InstructPixToPixConditioningAdvanced", - "JitterImage": "Jitter Image", - "Keyer": "Keyer", - "LatentNormalizeShuffle": "LatentNormalizeShuffle", - "RandnLikeLatent": "RandnLikeLatent", - "LatentStats": "Latent Stats", - "MaskClean": "Mask (Alpha) Clean", - "MedianFilterImage": "Median Filter Image", - "MergeFramesByIndex": "Merge Frames By Index", - "ModelTest": "Model Test", - "NormalMapSimple": "Normal Map (Simple)", - "OffsetLatentImage": "Offset Latent Image", - "PackVideoMask": "Pack Video Mask", - "PrintSigmas": "Print Sigmas", - "RelightSimple": "Relight (Simple)", - "RemapRange": "Remap Range", - "RestoreDetail": "Restore Detail", - "SharpenFilterLatent": "Sharpen Filter (Latent)", - "ShuffleChannels": "Shuffle Channels", - "Tonemap": "Tonemap", - "UnJitterImage": "Un-Jitter Image", - "UnTonemap": "UnTonemap", - "VisualizeLatents": "Visualize Latents", +COMBINED_MAPPINGS = { + "AdainFilterLatent": (AdainFilterLatent, "AdaIN Filter (Latent)"), + "AdainImage": (AdainImage, "AdaIN (Image)"), + "AdainLatent": (AdainLatent, "AdaIN (Latent)"), + "AlphaClean": (AlphaClean, "Alpha Clean (DEPRECATED, use MaskClean)"), + "AlphaMatte": (AlphaMatte, "Alpha Matte (DEPRECATED, use ImageMatting)"), + "BatchAlign": (BatchAlign, "Batch Align (RAFT)"), + "BatchAverageImage": (BatchAverageImage, "Batch Average Image"), + "BatchAverageUnJittered": (BatchAverageUnJittered, "Batch Average Un-Jittered"), + "BatchNormalizeImage": (BatchNormalizeImage, "Batch Normalize (Image)"), + "BatchNormalizeLatent": (BatchNormalizeLatent, "Batch Normalize (Latent)"), + "BetterFilmGrain": (BetterFilmGrain, "Better Film Grain"), + "BilateralFilterImage": (BilateralFilterImage, "Bilateral Filter Image"), + "BlurImageFast": (BlurImageFast, "Blur Image (Fast)"), + "BlurMaskFast": (BlurMaskFast, "Blur Mask (Fast)"), + "ClampImage": (ClampImage, "Clamp Image"), + "ClampOutliers": (ClampOutliers, "Clamp Outliers"), + "ColorMatchImage": (ColorMatchImage, "Color Match Image"), + "ConditioningSubtract": (ConditioningSubtract, "ConditioningSubtract"), + "ConvertNormals": (ConvertNormals, "Convert Normals"), + "CustomNoise": (CustomNoise, "CustomNoise"), + "DepthToNormals": (DepthToNormals, "Depth To Normals"), + "DifferenceChecker": (DifferenceChecker, "Difference Checker"), + "DilateErodeMask": (DilateErodeMask, "Dilate/Erode Mask"), + "EnhanceDetail": (EnhanceDetail, "Enhance Detail"), + "ExposureAdjust": (ExposureAdjust, "Exposure Adjust"), + "ExtractNFrames": (ExtractNFrames, "Extract N Frames"), + "FrequencyCombine": (FrequencyCombine, "Frequency Combine"), + "FrequencySeparate": (FrequencySeparate, "Frequency Separate"), + "GameOfLife": (GameOfLife, "Game Of Life"), + "GuidedFilterImage": (GuidedFilterImage, "Guided Filter Image"), + "Hunyuan3Dv2LatentUpscaleBy": (Hunyuan3Dv2LatentUpscaleBy, "Upscale Hunyuan3Dv2 Latent By"), + "ImageConstant": (ImageConstant, "Image Constant Color (RGB)"), + "ImageConstantHSV": (ImageConstantHSV, "Image Constant Color (HSV)"), + "ImageMatting": (ImageMatting, "Image Matting"), + "InpaintConditionApply": (InpaintConditionApply, "Inpaint Condition Apply"), + "InpaintConditionEncode": (InpaintConditionEncode, "Inpaint Condition Encode"), + "InstructPixToPixConditioningAdvanced": (InstructPixToPixConditioningAdvanced, "IP2P Conditioning Advanced"), + "JitterImage": (JitterImage, "Jitter Image"), + "Keyer": (Keyer, "Keyer"), + "LatentNormalizeShuffle": (LatentNormalizeShuffle, "LatentNormalizeShuffle"), + "RandnLikeLatent": (RandnLikeLatent, "RandnLikeLatent"), + "LatentStats": (LatentStats, "Latent Stats"), + "MaskClean": (MaskClean, "Mask (Alpha) Clean"), + "MedianFilterImage": (MedianFilterImage, "Median Filter Image"), + "MergeFramesByIndex": (MergeFramesByIndex, "Merge Frames By Index"), + "ModelTest": (ModelTest, "Model Test"), + "NormalMapSimple": (NormalMapSimple, "Normal Map (Simple)"), + "OffsetLatentImage": (OffsetLatentImage, "Offset Latent Image"), + "PackVideoMask": (PackVideoMask, "Pack Video Mask"), + "PrintSigmas": (PrintSigmas, "Print Sigmas"), + "RelightSimple": (RelightSimple, "Relight (Simple)"), + "RemapRange": (RemapRange, "Remap Range"), + "RestoreDetail": (RestoreDetail, "Restore Detail"), + "SharpenFilterLatent": (SharpenFilterLatent, "Sharpen Filter (Latent)"), + "ShuffleChannels": (ShuffleChannels, "Shuffle Channels"), + "Tonemap": (Tonemap, "Tonemap"), + "UnJitterImage": (UnJitterImage, "Un-Jitter Image"), + "UnTonemap": (UnTonemap, "UnTonemap"), + "VisualizeLatents": (VisualizeLatents, "Visualize Latents"), } \ No newline at end of file