From 3fdd04de167c9f4c8496fa91c01cdeacf0dd83ca Mon Sep 17 00:00:00 2001 From: Sida Liu Date: Sat, 6 Apr 2024 19:51:22 +0800 Subject: [PATCH] naming --- __init__.py | 108 ++++++++++++--------- js/debug_node.js | 6 ++ js/{string_control.js => string_output.js} | 8 +- 3 files changed, 73 insertions(+), 49 deletions(-) create mode 100644 js/debug_node.js rename js/{string_control.js => string_output.js} (83%) diff --git a/__init__.py b/__init__.py index f5c1d24..96e501b 100644 --- a/__init__.py +++ b/__init__.py @@ -1,23 +1,21 @@ -class DebugNode: +def size_to_human_readable(size_in_bytes): + if size_in_bytes < 1024: + return f"{size_in_bytes} B" + elif size_in_bytes < 1024**2: + return f"{size_in_bytes / 1024:.1f} KB" + elif size_in_bytes < 1024**3: + return f"{size_in_bytes / 1024**2:.1f} MB" + elif size_in_bytes < 1024**4: + return f"{size_in_bytes / 1024**3:.1f} GB" + else: + return f"{size_in_bytes / 1024**4:.1f} TB" + +class DebugWatchNode: def __init__(self): pass @classmethod def INPUT_TYPES(s): - """ - Return a dictionary which contains config for all input fields. - Some types (string): "MODEL", "VAE", "CLIP", "CONDITIONING", "LATENT", "IMAGE", "INT", "STRING", "FLOAT". - Input types "INT", "STRING" or "FLOAT" are special values for fields on the node. - The type can be a list for selection. - - Returns: `dict`: - - Key input_fields_group (`string`): Can be either required, hidden or optional. A node class must have property `required` - - Value input_fields (`dict`): Contains input fields config: - * Key field_name (`string`): Name of a entry-point method's argument - * Value field_config (`tuple`): - + First value is a string indicate the type of field or a list for selection. - + Secound value is a config for type "INT", "STRING" or "FLOAT". - """ return { "required": { "string_field": ("STRING", { @@ -26,63 +24,83 @@ class DebugNode: }), }, "optional": { - "MODEL": ("MODEL",), - "CLIP": ("CLIP",), - "VAE": ("VAE",), - "CONDITIONING": ("CONDITIONING",), - "LATENT": ("LATENT",), + "model": ("MODEL",), + "clip": ("CLIP",), + "vae": ("VAE",), + "conditioning": ("CONDITIONING",), + "latent": ("LATENT",), }, } RETURN_TYPES = () FUNCTION = "watch" OUTPUT_NODE = True - CATEGORY = "Debug" + CATEGORY = "utils" - def size_to_human_readable(self, size_in_bytes): - if size_in_bytes < 1024: - return f"{size_in_bytes} B" - elif size_in_bytes < 1024**2: - return f"{size_in_bytes / 1024:.1f} KB" - elif size_in_bytes < 1024**3: - return f"{size_in_bytes / 1024**2:.1f} MB" - elif size_in_bytes < 1024**4: - return f"{size_in_bytes / 1024**3:.1f} GB" - else: - return f"{size_in_bytes / 1024**4:.1f} TB" - - def watch(self, string_field, MODEL=None, CLIP=None, VAE=None, CONDITIONING=None, LATENT=None): + def watch(self, string_field, model=None, clip=None, vae=None, CONDITIONING=None, LATENT=None): results = "" - if MODEL: + if model: results += "MODEL:\n" - results += "\tArch:\t" + MODEL.model.latent_format.__class__.__name__ + "\n" - results += f"\tSize:\t{self.size_to_human_readable(MODEL.size)}\n" + results += "\tArch:\t" + model.model.latent_format.__class__.__name__ + "\n" + results += f"\tSize:\t{size_to_human_readable(model.size)}\n" results += "\n" - if CLIP: + if clip: results += "CLIP:\n\n" - results += str(type(CLIP.tokenizer)) + "\n" - # results += f"size: {CLIP.size // 1024 // 1024}MB\n" + results += str(type(clip.tokenizer)) + "\n" results += "\n" - if VAE: + if vae: results += "VAE:\n\n" - results += str(type(VAE.first_stage_model)) + "\n" - # results += f"size: {VAE.size // 1024 // 1024}MB\n" + results += str(type(vae.first_stage_model)) + "\n" results += "\n" return { "ui": { "string_field": results } } +class DebugWatchModelNode: + def __init__(self): + pass + + @classmethod + def INPUT_TYPES(s): + return { + "required": { + "model": ("MODEL",), + "output": ("STRING", { + "multiline": True, #True if you want the field to look like the one on the ClipTextEncode node + "default": "Connect any of the inputs to get more information." + }), + }, + } + + RETURN_TYPES = () + FUNCTION = "watch" + OUTPUT_NODE = True + CATEGORY = "utils" + + def watch(self, output, model=None): + results = "" + if model: + results += "MODEL:\n" + results += "\tArch:\t" + model.model.latent_format.__class__.__name__ + "\n" + results += f"\tSize:\t{size_to_human_readable(model.size)}\n" + results += "\n" + + return { "ui": { "output": results } } + + # Set the web directory, any .js file in that directory will be loaded by the frontend as a frontend extension WEB_DIRECTORY = "./js" # A dictionary that contains all nodes you want to export with their names # NOTE: names should be globally unique NODE_CLASS_MAPPINGS = { - "DebugNode": DebugNode + "DebugWatchNode": DebugWatchNode, + "DebugWatchModelNode": DebugWatchModelNode, } # A dictionary that contains the friendly/humanly readable titles for the nodes NODE_DISPLAY_NAME_MAPPINGS = { - "DebugNode": "Debug" + "DebugWatchNode": "Debug Watch", + "DebugWatchModelNode": "Debug Watch Model", } diff --git a/js/debug_node.js b/js/debug_node.js new file mode 100644 index 0000000..6840112 --- /dev/null +++ b/js/debug_node.js @@ -0,0 +1,6 @@ +import {app} from "../../scripts/app.js"; + +// // Node that add notes to your project +// app.registerExtension({ +// name: "Comfy.Debug", +// }); diff --git a/js/string_control.js b/js/string_output.js similarity index 83% rename from js/string_control.js rename to js/string_output.js index aa9c485..79b9806 100644 --- a/js/string_control.js +++ b/js/string_output.js @@ -26,14 +26,14 @@ function updateStringWidgetContent(nodeId, widgetName, newContent) { api.addEventListener('executed', event => { const detail = event.detail; - // Check if `output` exists and has a `string_field` - if (detail.output && Array.isArray(detail.output.string_field)) { + // Check if `output` exists and has a `output` + if (detail.output && Array.isArray(detail.output.output)) { // Join the array elements into a string - const content = detail.output.string_field.join(''); + const content = detail.output.output.join(''); // Example node ID and widget name, replace with actual ones const nodeId = parseInt(app.runningNodeId); // Replace with actual node ID - const widgetName = 'string_field'; // Replace with actual widget name + const widgetName = 'output'; // Replace with actual widget name updateStringWidgetContent(nodeId, widgetName, content); } else {