From 1904b4bdbfac21a2861bccff141cff17fc4c9885 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 7 Mar 2025 18:12:56 +0000 Subject: [PATCH] Fix: Organised Node List All CD nodes under one group in the node list. Not sure what subdir are wanted. --- comfy-nodes/external_audio.py | 1 + comfy-nodes/external_boolean.py | 3 ++- comfy-nodes/external_checkpoints.py | 3 ++- comfy-nodes/external_exr.py | 1 + comfy-nodes/external_face_model.py | 4 +--- comfy-nodes/external_image.py | 4 +--- comfy-nodes/external_image_alpha.py | 4 +--- comfy-nodes/external_image_batch.py | 4 +--- comfy-nodes/external_lora.py | 4 +--- comfy-nodes/external_number.py | 4 +--- comfy-nodes/external_number_int.py | 4 +--- comfy-nodes/external_number_slider.py | 4 +--- comfy-nodes/external_string_combine.py | 2 +- comfy-nodes/external_text.py | 2 +- comfy-nodes/external_text_any.py | 2 +- comfy-nodes/external_vid.py | 1 + comfy-nodes/external_video.py | 1 + comfy-nodes/input_websocket_image.py | 1 + comfy-nodes/model_list.py | 2 +- comfy-nodes/output_image.py | 3 +-- comfy-nodes/output_websocket_image.py | 4 +--- 21 files changed, 23 insertions(+), 35 deletions(-) diff --git a/comfy-nodes/external_audio.py b/comfy-nodes/external_audio.py index 525d8bf..6978c2d 100644 --- a/comfy-nodes/external_audio.py +++ b/comfy-nodes/external_audio.py @@ -7,6 +7,7 @@ class ComfyUIDeployExternalAudio: RETURN_TYPES = ("AUDIO",) RETURN_NAMES = ("audio",) FUNCTION = "load_audio" + CATEGORY = "🔗ComfyDeploy" @classmethod def INPUT_TYPES(cls): diff --git a/comfy-nodes/external_boolean.py b/comfy-nodes/external_boolean.py index 6f7b24c..4d9e057 100644 --- a/comfy-nodes/external_boolean.py +++ b/comfy-nodes/external_boolean.py @@ -23,8 +23,9 @@ class ComfyUIDeployExternalBoolean: RETURN_TYPES = ("BOOLEAN",) RETURN_NAMES = ("bool_value",) - + FUNCTION = "run" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): print(f"Node '{input_id}' processing with switch set to {default_value}") diff --git a/comfy-nodes/external_checkpoints.py b/comfy-nodes/external_checkpoints.py index c82fb4f..a4bcf71 100644 --- a/comfy-nodes/external_checkpoints.py +++ b/comfy-nodes/external_checkpoints.py @@ -36,10 +36,11 @@ class ComfyUIDeployExternalCheckpoint: RETURN_TYPES = (WILDCARD,) RETURN_NAMES = ("path",) + FUNCTION = "run" - CATEGORY = "deploy" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): import requests diff --git a/comfy-nodes/external_exr.py b/comfy-nodes/external_exr.py index 183e66a..d0ff4e5 100644 --- a/comfy-nodes/external_exr.py +++ b/comfy-nodes/external_exr.py @@ -10,6 +10,7 @@ class ComfyUIDeployExternalEXR: RETURN_TYPES = ("IMAGE", "MASK") RETURN_NAMES = ("image", "mask") FUNCTION = "load_exr" + CATEGORY = "🔗ComfyDeploy" @classmethod def INPUT_TYPES(cls): diff --git a/comfy-nodes/external_face_model.py b/comfy-nodes/external_face_model.py index 3cc915e..73e3001 100644 --- a/comfy-nodes/external_face_model.py +++ b/comfy-nodes/external_face_model.py @@ -48,10 +48,8 @@ class ComfyUIDeployExternalFaceModel: RETURN_TYPES = (WILDCARD,) RETURN_NAMES = ("path",) - FUNCTION = "run" - - CATEGORY = "deploy" + CATEGORY = "🔗ComfyDeploy" def run( self, diff --git a/comfy-nodes/external_image.py b/comfy-nodes/external_image.py index 679ebee..db2d96c 100644 --- a/comfy-nodes/external_image.py +++ b/comfy-nodes/external_image.py @@ -29,10 +29,8 @@ class ComfyUIDeployExternalImage: RETURN_TYPES = ("IMAGE",) RETURN_NAMES = ("image",) - FUNCTION = "run" - - CATEGORY = "image" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None, default_value_url=None): image = default_value diff --git a/comfy-nodes/external_image_alpha.py b/comfy-nodes/external_image_alpha.py index f989a98..ecef2dc 100644 --- a/comfy-nodes/external_image_alpha.py +++ b/comfy-nodes/external_image_alpha.py @@ -28,10 +28,8 @@ class ComfyUIDeployExternalImageAlpha: RETURN_TYPES = ("IMAGE",) RETURN_NAMES = ("image",) - FUNCTION = "run" - - CATEGORY = "image" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): image = default_value diff --git a/comfy-nodes/external_image_batch.py b/comfy-nodes/external_image_batch.py index 03c8474..1ad341e 100644 --- a/comfy-nodes/external_image_batch.py +++ b/comfy-nodes/external_image_batch.py @@ -34,10 +34,8 @@ class ComfyUIDeployExternalImageBatch: RETURN_TYPES = ("IMAGE",) RETURN_NAMES = ("image",) - FUNCTION = "run" - - CATEGORY = "image" + CATEGORY = "🔗ComfyDeploy" def process_image(self, image): image = ImageOps.exif_transpose(image) diff --git a/comfy-nodes/external_lora.py b/comfy-nodes/external_lora.py index 214aa45..59d002f 100644 --- a/comfy-nodes/external_lora.py +++ b/comfy-nodes/external_lora.py @@ -46,10 +46,8 @@ class ComfyUIDeployExternalLora: RETURN_TYPES = (WILDCARD,) RETURN_NAMES = ("path",) - FUNCTION = "run" - - CATEGORY = "deploy" + CATEGORY = "🔗ComfyDeploy" def run( self, diff --git a/comfy-nodes/external_number.py b/comfy-nodes/external_number.py index 155684b..34a6b55 100644 --- a/comfy-nodes/external_number.py +++ b/comfy-nodes/external_number.py @@ -31,10 +31,8 @@ class ComfyUIDeployExternalNumber: RETURN_TYPES = ("FLOAT",) RETURN_NAMES = ("value",) - FUNCTION = "run" - - CATEGORY = "number" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): try: diff --git a/comfy-nodes/external_number_int.py b/comfy-nodes/external_number_int.py index d5713e4..381ecab 100644 --- a/comfy-nodes/external_number_int.py +++ b/comfy-nodes/external_number_int.py @@ -31,10 +31,8 @@ class ComfyUIDeployExternalNumberInt: RETURN_TYPES = ("INT",) RETURN_NAMES = ("value",) - FUNCTION = "run" - - CATEGORY = "number" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): if not input_id or (isinstance(input_id, str) and not input_id.strip().isdigit()): diff --git a/comfy-nodes/external_number_slider.py b/comfy-nodes/external_number_slider.py index 0d6a8c2..9742a44 100644 --- a/comfy-nodes/external_number_slider.py +++ b/comfy-nodes/external_number_slider.py @@ -34,10 +34,8 @@ class ComfyUIDeployExternalNumberSlider: RETURN_TYPES = ("FLOAT",) RETURN_NAMES = ("value",) - FUNCTION = "run" - - CATEGORY = "number" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, min_value=0, max_value=1, display_name=None, description=None): try: diff --git a/comfy-nodes/external_string_combine.py b/comfy-nodes/external_string_combine.py index c264787..c4b703e 100644 --- a/comfy-nodes/external_string_combine.py +++ b/comfy-nodes/external_string_combine.py @@ -18,7 +18,7 @@ class StringFunction: RETURN_TYPES = ("STRING",) FUNCTION = "exec" - CATEGORY = "utils" + CATEGORY = "🔗ComfyDeploy" OUTPUT_NODE = True def exec(self, action, tidy_tags, text_a="", text_b="", text_c=""): diff --git a/comfy-nodes/external_text.py b/comfy-nodes/external_text.py index d3a0cc0..df99a2a 100644 --- a/comfy-nodes/external_text.py +++ b/comfy-nodes/external_text.py @@ -34,7 +34,7 @@ class ComfyUIDeployExternalText: FUNCTION = "run" - CATEGORY = "text" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): return [default_value] diff --git a/comfy-nodes/external_text_any.py b/comfy-nodes/external_text_any.py index e84be41..0dfd1d5 100644 --- a/comfy-nodes/external_text_any.py +++ b/comfy-nodes/external_text_any.py @@ -36,7 +36,7 @@ class ComfyUIDeployExternalTextAny: FUNCTION = "run" - CATEGORY = "text" + CATEGORY = "🔗ComfyDeploy" def run(self, input_id, default_value=None, display_name=None, description=None): return [default_value] diff --git a/comfy-nodes/external_vid.py b/comfy-nodes/external_vid.py index 8ee4a8f..31461bf 100644 --- a/comfy-nodes/external_vid.py +++ b/comfy-nodes/external_vid.py @@ -36,6 +36,7 @@ class ComfyUIDeployExternalVideo: RETURN_NAMES = ("video") FUNCTION = "load_video" + CATEGORY = "🔗ComfyDeploy" def load_video(self, input_id, default_value): input_dir = folder_paths.get_input_directory() diff --git a/comfy-nodes/external_video.py b/comfy-nodes/external_video.py index 365883f..2e7a8e3 100644 --- a/comfy-nodes/external_video.py +++ b/comfy-nodes/external_video.py @@ -791,6 +791,7 @@ class ComfyUIDeployExternalVideo: ) FUNCTION = "load_video" + CATEGORY = "🔗ComfyDeploy" def load_video(self, **kwargs): input_id = kwargs.get("input_id") diff --git a/comfy-nodes/input_websocket_image.py b/comfy-nodes/input_websocket_image.py index b912001..0a0c534 100644 --- a/comfy-nodes/input_websocket_image.py +++ b/comfy-nodes/input_websocket_image.py @@ -33,6 +33,7 @@ class ComfyDeployWebscoketImageInput: RETURN_NAMES = ("images",) FUNCTION = "run" + CATEGORY = "🔗ComfyDeploy" @classmethod def VALIDATE_INPUTS(s, input_id): diff --git a/comfy-nodes/model_list.py b/comfy-nodes/model_list.py index e828bc5..678eb4e 100644 --- a/comfy-nodes/model_list.py +++ b/comfy-nodes/model_list.py @@ -48,7 +48,7 @@ class ComfyUIDeployModalList: FUNCTION = "run" - CATEGORY = "model" + CATEGORY = "🔗ComfyDeploy" def run(self, model=""): # Split the model path by '/' and select the last item diff --git a/comfy-nodes/output_image.py b/comfy-nodes/output_image.py index 43a5f31..c330e03 100644 --- a/comfy-nodes/output_image.py +++ b/comfy-nodes/output_image.py @@ -39,8 +39,7 @@ class ComfyDeployOutputImage: FUNCTION = "run" OUTPUT_NODE = True - - CATEGORY = "output" + CATEGORY = "🔗ComfyDeploy" DESCRIPTION = "Saves the input images to your ComfyUI output directory." def run( diff --git a/comfy-nodes/output_websocket_image.py b/comfy-nodes/output_websocket_image.py index 7c6b47a..34265db 100644 --- a/comfy-nodes/output_websocket_image.py +++ b/comfy-nodes/output_websocket_image.py @@ -33,10 +33,8 @@ class ComfyDeployWebscoketImageOutput: RETURN_TYPES = () RETURN_NAMES = ("text",) - FUNCTION = "run" - - CATEGORY = "output" + CATEGORY = "🔗ComfyDeploy" @classmethod def VALIDATE_INPUTS(s, output_id):