nodes/silveroxides-ComfyUI-ModelUtils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor names to be more universal

Browse Source
This commit is contained in:
silveroxides
2025-11-24 18:37:18 +01:00
parent 31989beefd
commit 232dc76db2
6 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__init__.py
+20 -20
View File
@@ -1,56 +1,56 @@
from .nodes import *
NODE_CLASS_MAPPINGS = {
"UNetMetaKeys": UNetMetaKeys,
"CLIPMetaKeys": CLIPMetaKeys,
"ModelMetaKeys": ModelMetaKeys,
"TextEncoderMetaKeys": TextEncoderMetaKeys,
"LoRAMetaKeys": LoRAMetaKeys,
"CheckpointMetaKeys": CheckpointMetaKeys,
"EmbeddingMetaKeys": EmbeddingMetaKeys,
"UNetRenameKeys": UNetRenameKeys,
"CLIPRenameKeys": CLIPRenameKeys,
"ModelRenameKeys": ModelRenameKeys,
"TextEncoderRenameKeys": TextEncoderRenameKeys,
"LoRARenameKeys": LoRARenameKeys,
"CheckpointRenameKeys": CheckpointRenameKeys,
"EmbeddingRenameKeys": EmbeddingRenameKeys,
"UNetPruneKeys": UNetPruneKeys,
"CLIPPruneKeys": CLIPPruneKeys,
"ModelPruneKeys": ModelPruneKeys,
"TextEncoderPruneKeys": TextEncoderPruneKeys,
"LoRAPruneKeys": LoRAPruneKeys,
"CheckpointPruneKeys": CheckpointPruneKeys,
"EmbeddingPruneKeys": EmbeddingPruneKeys,
"UNetTwoMerger": UNetTwoMerger,
"CLIPTwoMerger": CLIPTwoMerger,
"ModelTwoMerger": ModelTwoMerger,
"TextEncoderTwoMerger": TextEncoderTwoMerger,
"LoRATwoMerger": LoRATwoMerger,
"CheckpointTwoMerger": CheckpointTwoMerger,
"EmbeddingTwoMerger": EmbeddingTwoMerger,
"UNetThreeMerger": UNetThreeMerger,
"CLIPThreeMerger": CLIPThreeMerger,
"ModelThreeMerger": ModelThreeMerger,
"TextEncoderThreeMerger": TextEncoderThreeMerger,
"LoRAThreeMerger": LoRAThreeMerger,
"CheckpointThreeMerger": CheckpointThreeMerger,
"EmbeddingThreeMerger": EmbeddingThreeMerger,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"UNetMetaKeys": "Get UNet Metadata & Keys",
"CLIPMetaKeys": "Get CLIP Metadata & Keys",
"ModelMetaKeys": "Get Diffusion Model Metadata & Keys",
"TextEncoderMetaKeys": "Get Text Encoder Metadata & Keys",
"LoRAMetaKeys": "Get LoRA Metadata & Keys",
"CheckpointMetaKeys": "Get Checkpoint Metadata & Keys",
"EmbeddingMetaKeys": "Get Embedding Metadata & Keys",
"UNetRenameKeys": "UNetRenameKeys",
"CLIPRenameKeys": "CLIPRenameKeys",
"ModelRenameKeys": "ModelRenameKeys",
"TextEncoderRenameKeys": "TextEncoderRenameKeys",
"LoRARenameKeys": "LoRARenameKeys",
"CheckpointRenameKeys": "CheckpointRenameKeys",
"EmbeddingRenameKeys": "EmbeddingRenameKeys",
"UNetPruneKeys": "UNetPruneKeys",
"CLIPPruneKeys": "CLIPPruneKeys",
"ModelPruneKeys": "ModelPruneKeys",
"TextEncoderPruneKeys": "TextEncoderPruneKeys",
"LoRAPruneKeys": "LoRAPruneKeys",
"CheckpointPruneKeys": "Prune Checkpoint Keys",
"EmbeddingPruneKeys": "Prune Embedding Keys",
"UNetTwoMerger": "Merge UNets (2 Models)",
"CLIPTwoMerger": "Merge CLIPs (2 Models)",
"ModelTwoMerger": "Merge Models (2 Models)",
"TextEncoderTwoMerger": "Merge Text Encoders (2 Models)",
"LoRATwoMerger": "Merge LoRAs (2 Models)",
"CheckpointTwoMerger": "Merge Checkpoints (2 Models)",
"EmbeddingTwoMerger": "Merge Embeddings (2 Models)",
"UNetThreeMerger": "Merge UNets (3 Models)",
"CLIPThreeMerger": "Merge CLIPs (3 Models)",
"ModelThreeMerger": "Merge Models (3 Models)",
"TextEncoderThreeMerger": "Merge Text Encoders (3 Models)",
"LoRAThreeMerger": "Merge LoRAs (3 Models)",
"CheckpointThreeMerger": "Merge Checkpoints (3 Models)",
"EmbeddingThreeMerger": "Merge Embeddings (3 Models)",
nodes/__init__.py
+5 -5
View File
@@ -4,9 +4,9 @@ from .prunekeys import *
from .merger import *
__all__ = [
"UNetMetaKeys", "CLIPMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys",
"UNetRenameKeys", "CLIPRenameKeys", "LoRARenameKeys", "CheckpointRenameKeys", "EmbeddingRenameKeys",
"UNetPruneKeys", "CLIPPruneKeys", "LoRAPruneKeys", "CheckpointPruneKeys", "EmbeddingPruneKeys",
"CheckpointTwoMerger", "UNetTwoMerger", "CLIPTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
"CheckpointThreeMerger", "UNetThreeMerger", "CLIPThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger",
"ModelMetaKeys", "TextEncoderMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys",
"ModelRenameKeys", "TextEncoderRenameKeys", "LoRARenameKeys", "CheckpointRenameKeys", "EmbeddingRenameKeys",
"ModelPruneKeys", "TextEncoderPruneKeys", "LoRAPruneKeys", "CheckpointPruneKeys", "EmbeddingPruneKeys",
"CheckpointTwoMerger", "ModelTwoMerger", "TextEncoderTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
"CheckpointThreeMerger", "ModelThreeMerger", "TextEncoderThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger",
]
nodes/merger.py
+6 -6
View File
@@ -128,11 +128,11 @@ class CheckpointTwoMerger(BaseTwoMerger):
MODEL_TYPE = "checkpoints"
@classmethod
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
class UNetTwoMerger(BaseTwoMerger):
class ModelTwoMerger(BaseTwoMerger):
MODEL_TYPE = "diffusion_models"
@classmethod
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
class CLIPTwoMerger(BaseTwoMerger):
class TextEncoderTwoMerger(BaseTwoMerger):
MODEL_TYPE = "text_encoders"
@classmethod
def INPUT_TYPES(s): return _create_two_model_inputs(s.MODEL_TYPE)
@@ -150,11 +150,11 @@ class CheckpointThreeMerger(BaseThreeMerger):
MODEL_TYPE = "checkpoints"
@classmethod
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
class UNetThreeMerger(BaseThreeMerger):
class ModelThreeMerger(BaseThreeMerger):
MODEL_TYPE = "diffusion_models"
@classmethod
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
class CLIPThreeMerger(BaseThreeMerger):
class TextEncoderThreeMerger(BaseThreeMerger):
MODEL_TYPE = "text_encoders"
@classmethod
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
@@ -168,6 +168,6 @@ class EmbeddingThreeMerger(BaseThreeMerger):
def INPUT_TYPES(s): return _create_three_model_inputs(s.MODEL_TYPE)
__all__ = [
"CheckpointTwoMerger", "UNetTwoMerger", "CLIPTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
"CheckpointThreeMerger", "UNetThreeMerger", "CLIPThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger"
"CheckpointTwoMerger", "ModelTwoMerger", "TextEncoderTwoMerger", "LoRATwoMerger", "EmbeddingTwoMerger",
"CheckpointThreeMerger", "ModelThreeMerger", "TextEncoderThreeMerger", "LoRAThreeMerger", "EmbeddingThreeMerger"
]
nodes/metakeys.py
+9 -9
View File
@@ -36,29 +36,29 @@ class BaseMetaKeys:
class UNetMetaKeys(BaseMetaKeys):
class ModelMetaKeys(BaseMetaKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"unet_name": (folder_paths.get_filename_list("diffusion_models"), ),
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
}
}
def get_metakeys(self, unet_name):
return self._get_metakeys(unet_name, "diffusion_models")
def get_metakeys(self, diffusionmodel_name):
return self._get_metakeys(diffusionmodel_name, "diffusion_models")
class CLIPMetaKeys(BaseMetaKeys):
class TextEncoderMetaKeys(BaseMetaKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"clip_name": (folder_paths.get_filename_list("text_encoders"), ),
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
}
}
def get_metakeys(self, clip_name):
return self._get_metakeys(clip_name, "text_encoders")
def get_metakeys(self, textencoder_name):
return self._get_metakeys(textencoder_name, "text_encoders")
class LoRAMetaKeys(BaseMetaKeys):
@classmethod
@@ -95,4 +95,4 @@ class EmbeddingMetaKeys(BaseMetaKeys):
def get_metakeys(self, embedding):
return self._get_metakeys(embedding, "embeddings")
__all__ = ("UNetMetaKeys", "CLIPMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys")
__all__ = ("ModelMetaKeys", "TextEncoderMetaKeys", "LoRAMetaKeys", "CheckpointMetaKeys", "EmbeddingMetaKeys")
nodes/prunekeys.py
+10 -10
View File
@@ -51,35 +51,35 @@ class BasePruneKeys:
return (output_path,)
class UNetPruneKeys(BasePruneKeys):
class ModelPruneKeys(BasePruneKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"unet_name": (folder_paths.get_filename_list("diffusion_models"), ),
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
"use_regex": ("BOOLEAN", {"default": False}),
"output_filename": ("STRING", {"default": "pruned_unet"}),
"output_filename": ("STRING", {"default": "pruned_model"}),
}
}
def prune_keys(self, unet_name, keys_to_prune, use_regex, output_filename):
return self._prune_keys(unet_name, "diffusion_models", keys_to_prune, use_regex, output_filename)
def prune_keys(self, diffusionmodel_name, keys_to_prune, use_regex, output_filename):
return self._prune_keys(diffusionmodel_name, "diffusion_models", keys_to_prune, use_regex, output_filename)
class CLIPPruneKeys(BasePruneKeys):
class TextEncoderPruneKeys(BasePruneKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"clip_name": (folder_paths.get_filename_list("text_encoders"), ),
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
"keys_to_prune": ("STRING", {"multiline": True, "default": ""}),
"use_regex": ("BOOLEAN", {"default": False}),
"output_filename": ("STRING", {"default": "pruned_clip"}),
"output_filename": ("STRING", {"default": "pruned_textencoder"}),
}
}
def prune_keys(self, clip_name, keys_to_prune, use_regex, output_filename):
return self._prune_keys(clip_name, "text_encoders", keys_to_prune, use_regex, output_filename)
def prune_keys(self, textencoder_name, keys_to_prune, use_regex, output_filename):
return self._prune_keys(textencoder_name, "text_encoders", keys_to_prune, use_regex, output_filename)
class LoRAPruneKeys(BasePruneKeys):
@classmethod
nodes/renamekeys.py
+10 -10
View File
@@ -46,35 +46,35 @@ class BaseRenameKeys:
return (output_path,)
class UNetRenameKeys(BaseRenameKeys):
class ModelRenameKeys(BaseRenameKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"unet_name": (folder_paths.get_filename_list("diffusion_models"), ),
"diffusionmodel_name": (folder_paths.get_filename_list("diffusion_models"), ),
"old_keys": ("STRING", {"multiline": True, "default": ""}),
"new_keys": ("STRING", {"multiline": True, "default": ""}),
"output_filename": ("STRING", {"default": "renamed_unet"}),
"output_filename": ("STRING", {"default": "renamed_model"}),
}
}
def rename_keys(self, unet_name, old_keys, new_keys, output_filename):
return self._rename_keys(unet_name, "diffusion_models", old_keys, new_keys, output_filename)
def rename_keys(self, diffusionmodel_name, old_keys, new_keys, output_filename):
return self._rename_keys(diffusionmodel_name, "diffusion_models", old_keys, new_keys, output_filename)
class CLIPRenameKeys(BaseRenameKeys):
class TextEncoderRenameKeys(BaseRenameKeys):
@classmethod
def INPUT_TYPES(s):
return {
"required": {
"clip_name": (folder_paths.get_filename_list("text_encoders"), ),
"textencoder_name": (folder_paths.get_filename_list("text_encoders"), ),
"old_keys": ("STRING", {"multiline": True, "default": ""}),
"new_keys": ("STRING", {"multiline": True, "default": ""}),
"output_filename": ("STRING", {"default": "renamed_clip"}),
"output_filename": ("STRING", {"default": "renamed_textencoder"}),
}
}
def rename_keys(self, clip_name, old_keys, new_keys, output_filename):
return self._rename_keys(clip_name, "text_encoders", old_keys, new_keys, output_filename)
def rename_keys(self, textencoder_name, old_keys, new_keys, output_filename):
return self._rename_keys(textencoder_name, "text_encoders", old_keys, new_keys, output_filename)
class LoRARenameKeys(BaseRenameKeys):
@classmethod