diff --git a/__init__.py b/__init__.py index 7eeece06..017b24d4 100644 --- a/__init__.py +++ b/__init__.py @@ -20,8 +20,9 @@ import nodes import torch -version = "V1.12.1" -print(f"### Loading: ComfyUI-Manager ({version})") +version = [1, 13] +version_str = f"V{version[0]}.{version[1]}" + ('.' + version[2] if len(version) > 2 else '') +print(f"### Loading: ComfyUI-Manager ({version_str})") required_comfyui_revision = 1793 @@ -783,6 +784,21 @@ async def fetch_customnode_list(request): json_obj = await get_data_by_mode(request.rel_url.query["mode"], 'custom-node-list.json') + def is_ignored_notice(code): + global version + + if code is not None and code.startswith('#NOTICE_'): + try: + notice_version = [int(x) for x in code[8:].split('.')] + return notice_version[0] < version[0] or (notice_version[0] == version[0] and notice_version[1] <= version[1]) + except Exception: + return False + else: + False + + + json_obj['custom_nodes'] = [record for record in json_obj['custom_nodes'] if not is_ignored_notice(record.get('author'))] + check_custom_nodes_installed(json_obj, False, not skip_update) for x in json_obj['custom_nodes']: diff --git a/custom-node-list.json b/custom-node-list.json index 7c40bde1..3478a27a 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -3167,7 +3167,7 @@ "https://github.com/thecooltechguy/ComfyUI-MagicAnimate" ], "install_type": "git-clone", - "description": "Easily use Magic Animate within ComfyUI!" + "description": "Easily use Magic Animate within ComfyUI!\n[w/WARN: This extension requires 110GB+ disk space.]" }, { "author": "knuknX", @@ -3330,6 +3330,38 @@ "install_type": "git-clone", "description": "Image and matte filtering nodes for ComfyUI `image/filters/*`" }, + { + "author": "kijai", + "title": "Marigold depth estimation in ComfyUI", + "reference": "https://github.com/kijai/ComfyUI-Marigold", + "files": [ + "https://github.com/kijai/ComfyUI-Marigold" + ], + "install_type": "git-clone", + "description": "This is a wrapper node for Marigold depth estimation: [https://github.com/prs-eth/Marigold](https://github.com/kijai/ComfyUI-Marigold). Currently using the same diffusers pipeline as in the original implementation, so in addition to the custom node, you need the model in diffusers format.\nNOTE: See details in repo to install." + }, + { + "author": "glifxyz", + "title": "ComfyUI-GlifNodes", + "reference": "https://github.com/glifxyz/ComfyUI-GlifNodes", + "files": [ + "https://github.com/glifxyz/ComfyUI-GlifNodes" + ], + "install_type": "git-clone", + "description": "Nodes:Consistency VAE Decoder." + }, + { + "author": "glifxyz", + "title": "ComfyUI-GlifNodes", + "reference": "https://github.com/glifxyz/ComfyUI-GlifNodes", + "files": [ + "https://github.com/glifxyz/ComfyUI-GlifNodes" + ], + "install_type": "git-clone", + "description": "Nodes:Consistency VAE Decoder." + }, + + { "author": "Ser-Hilary", "title": "SDXL_sizing", diff --git a/extension-node-map.json b/extension-node-map.json index 4df51383..d60fd7c5 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -2608,6 +2608,7 @@ "FromListGet1Image", "FromListGet1Int", "FromListGet1Latent", + "FromListGet1Mask", "FromListGet1Model", "FromListGet1String", "FromListGetColors", @@ -2616,6 +2617,7 @@ "FromListGetImages", "FromListGetInts", "FromListGetLatents", + "FromListGetMasks", "FromListGetModels", "FromListGetStrings", "Get Contour from list", @@ -2659,6 +2661,7 @@ "ToImageList", "ToIntList", "ToLatentList", + "ToMaskList", "ToModelList", "ToStringList", "UnGridify (image)", @@ -2717,7 +2720,8 @@ ], "https://github.com/bruefire/ComfyUI-SeqImageLoader": [ [ - "VFrame Loader With Mask Editor" + "VFrame Loader With Mask Editor", + "Video Loader With Mask Editor" ], { "title_aux": "ComfyUI Sequential Image Loader" @@ -3406,6 +3410,14 @@ "title_aux": "Save Image with Generation Metadata" } ], + "https://github.com/glifxyz/ComfyUI-GlifNodes": [ + [ + "GlifConsistencyVAE" + ], + { + "title_aux": "ComfyUI-GlifNodes" + } + ], "https://github.com/guoyk93/yk-node-suite-comfyui": [ [ "YKImagePadForOutpaint", @@ -3487,10 +3499,12 @@ "https://github.com/idrirap/ComfyUI-Lora-Auto-Trigger-Words": [ [ "FusionText", + "LoraListNames", "LoraLoaderAdvanced", "LoraLoaderStackedAdvanced", "LoraLoaderStackedVanilla", "LoraLoaderVanilla", + "LoraTagsOnly", "Randomizer", "TagsFormater", "TagsSelector", @@ -3761,6 +3775,14 @@ "title_aux": "KJNodes for ComfyUI" } ], + "https://github.com/kijai/ComfyUI-Marigold": [ + [ + "MarigoldDepthEstimation" + ], + { + "title_aux": "Marigold depth estimation in ComfyUI" + } + ], "https://github.com/kijai/ComfyUI-SVD": [ [ "SVDimg2vid" @@ -4345,7 +4367,8 @@ ], "https://github.com/modusCell/ComfyUI-dimension-node-modusCell": [ [ - "DimensionProvider modusCell" + "DimensionProviderFree modusCell", + "DimensionProviderRatio modusCell" ], { "title_aux": "Preset Dimensions" @@ -5085,8 +5108,10 @@ ], "https://github.com/theUpsider/ComfyUI-Logic": [ [ + "Bool", "Compare", "DebugPrint", + "Float", "If ANY execute A else B", "Int", "String" diff --git a/js/comfyui-manager.js b/js/comfyui-manager.js index e90d7ea1..a6f4d55d 100644 --- a/js/comfyui-manager.js +++ b/js/comfyui-manager.js @@ -48,7 +48,7 @@ docStyle.innerHTML = ` #cm-channel-badge { color: white; background-color: #AA0000; - width: 150px; + width: 220px; height: 23px; font-size: 13px; border-radius: 5px; diff --git a/js/custom-nodes-downloader.js b/js/custom-nodes-downloader.js index 03a7795f..54095025 100644 --- a/js/custom-nodes-downloader.js +++ b/js/custom-nodes-downloader.js @@ -575,9 +575,11 @@ export class CustomNodesInstaller extends ComfyDialog { } }); - data5.appendChild(installBtn); + if(!data.author.startsWith('#NOTICE')){ + data5.appendChild(installBtn); + } - if(data.installed == 'Fail') + if(data.installed == 'Fail' || data.author.startsWith('#NOTICE')) dataRow.style.backgroundColor = "#880000"; else dataRow.style.backgroundColor = "var(--bg-color)"; @@ -702,7 +704,7 @@ export class CustomNodesInstaller extends ComfyDialog { let channel_badge = ''; if(this.channel != 'default') { - channel_badge = $el('span', {id:'cm-channel-badge'}, [`Channel: ${this.channel}`]); + channel_badge = $el('span', {id:'cm-channel-badge'}, [`Channel: ${this.channel} (Incomplete list)`]); } else { diff --git a/node_db/dev/custom-node-list.json b/node_db/dev/custom-node-list.json index 935b6ca9..cfb2ac3e 100644 --- a/node_db/dev/custom-node-list.json +++ b/node_db/dev/custom-node-list.json @@ -1,5 +1,14 @@ { "custom_nodes": [ + { + "author": "#NOTICE_1.13", + "title": "NOTICE: This channel is not the default channel.", + "reference": "https://github.com/ltdrdata/ComfyUI-Manager", + "files": [], + "install_type": "git-clone", + "description": "If you see this message, your ComfyUI-Manager is outdated.\nDev channel provides only the list of the developing nodes. If you want to find the complete node list, please go to the Default channel." + }, + { "author": "talesofai", "title": "comfyui-supersave [WIP]", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index 6cc61478..5e59688f 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,34 @@ { "custom_nodes": [ + { + "author": "#NOTICE_1.13", + "title": "NOTICE: This channel is not the default channel.", + "reference": "https://github.com/ltdrdata/ComfyUI-Manager", + "files": [], + "install_type": "git-clone", + "description": "If you see this message, your ComfyUI-Manager is outdated.\nRecent channel provides only the list of the latest nodes. If you want to find the complete node list, please go to the Default channel." + }, + + { + "author": "glifxyz", + "title": "ComfyUI-GlifNodes", + "reference": "https://github.com/glifxyz/ComfyUI-GlifNodes", + "files": [ + "https://github.com/glifxyz/ComfyUI-GlifNodes" + ], + "install_type": "git-clone", + "description": "Nodes:Consistency VAE Decoder." + }, + { + "author": "kijai", + "title": "Marigold depth estimation in ComfyUI", + "reference": "https://github.com/kijai/ComfyUI-Marigold", + "files": [ + "https://github.com/kijai/ComfyUI-Marigold" + ], + "install_type": "git-clone", + "description": "This is a wrapper node for Marigold depth estimation: [https://github.com/prs-eth/Marigold](https://github.com/kijai/ComfyUI-Marigold). Currently using the same diffusers pipeline as in the original implementation, so in addition to the custom node, you need the model in diffusers format.\nNOTE: See details in repo to install." + }, { "author": "spacepxl", "title": "ComfyUI-Image-Filters", @@ -179,7 +208,7 @@ "https://github.com/thecooltechguy/ComfyUI-MagicAnimate" ], "install_type": "git-clone", - "description": "Easily use Magic Animate within ComfyUI!" + "description": "Easily use Magic Animate within ComfyUI!\n[w/WARN: This extension requires 110GB+ disk space.]" }, { "author": "knuknX", @@ -681,87 +710,6 @@ ], "install_type": "git-clone", "description": "This extension simply connects the nodes and specifies the output path of the generated images to a manageable path." - }, - { - "author": "amorano", - "title": "Jovimetrix Composition Nodes", - "reference": "https://github.com/Amorano/Jovimetrix", - "files": [ - "https://github.com/Amorano/Jovimetrix" - ], - "nodename_pattern": " \\(jov\\)$", - "install_type": "git-clone", - "description": "Compose like Substance Designer. Webcams, Media Streams (in/out), Tick animation, Color correction, Geometry manipulation, Pixel shader, Polygonal shape generator, Remap images gometry and color, Heavily inspired by WAS and MTB Node Suites" - }, - { - "author": "romeobuilderotti", - "title": "ComfyUI PNG Metadata", - "reference": "https://github.com/romeobuilderotti/ComfyUI-PNG-Metadata", - "files": [ - "https://github.com/romeobuilderotti/ComfyUI-PNG-Metadata" - ], - "install_type": "git-clone", - "description": "Add custom Metadata fields to your saved PNG files." - }, - { - "author": "ka-puna", - "title": "comfyui-yanc", - "reference": "https://github.com/ka-puna/comfyui-yanc", - "files": [ - "https://github.com/ka-puna/comfyui-yanc" - ], - "install_type": "git-clone", - "description": "NOTE: Concatenate Strings, Format Datetime String, Integer Caster, Multiline String, Truncate String. Yet Another Node Collection, a repository of simple nodes for ComfyUI. This repository eases the addition or removal of custom nodes to itself." - }, - { - "author": "TheBarret", - "title": "ZSuite", - "reference": "https://github.com/TheBarret/ZSuite", - "files": [ - "https://github.com/TheBarret/ZSuite" - ], - "install_type": "git-clone", - "description": "Nodes:Prompter, RF Noise, SeedMod." - }, - { - "author": "palant", - "title": "Extended Save Image for ComfyUI", - "reference": "https://github.com/palant/extended-saveimage-comfyui", - "files": [ - "https://github.com/palant/extended-saveimage-comfyui" - ], - "install_type": "git-clone", - "description": "This custom node is largely identical to the usual Save Image but allows saving images also in JPEG and WEBP formats, the latter with both lossless and lossy compression. Metadata is embedded in the images as usual, and the resulting images can be used to load a workflow." - }, - { - "author": "LonicaMewinsky", - "title": "ComfyBreakAnim", - "reference": "https://github.com/LonicaMewinsky/ComfyUI-MakeFrame", - "files": [ - "https://github.com/LonicaMewinsky/ComfyUI-MakeFrame" - ], - "install_type": "git-clone", - "description": "Nodes:BreakFrames, GetKeyFrames, MakeGrid." - }, - { - "author": "gemell1", - "title": "ComfyUI_GMIC", - "reference": "https://github.com/gemell1/ComfyUI_GMIC", - "files": [ - "https://github.com/gemell1/ComfyUI_GMIC" - ], - "install_type": "git-clone", - "description": "Nodes:GMIC Image Processing." - }, - { - "author": "peteromallet", - "title": "ComfyUI-Creative-Interpolation [Beta]", - "reference": "https://github.com/peteromallet/ComfyUI-Creative-Interpolation", - "files": [ - "https://github.com/peteromallet/ComfyUI-Creative-Interpolation" - ], - "install_type": "git-clone", - "description": "This a ComfyUI node for batch creative interpolation. The goal is to allow you to input a batch of images, and to provide a range of simple settings to control how the images are interpolated between." } ] } diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 4df51383..d60fd7c5 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -2608,6 +2608,7 @@ "FromListGet1Image", "FromListGet1Int", "FromListGet1Latent", + "FromListGet1Mask", "FromListGet1Model", "FromListGet1String", "FromListGetColors", @@ -2616,6 +2617,7 @@ "FromListGetImages", "FromListGetInts", "FromListGetLatents", + "FromListGetMasks", "FromListGetModels", "FromListGetStrings", "Get Contour from list", @@ -2659,6 +2661,7 @@ "ToImageList", "ToIntList", "ToLatentList", + "ToMaskList", "ToModelList", "ToStringList", "UnGridify (image)", @@ -2717,7 +2720,8 @@ ], "https://github.com/bruefire/ComfyUI-SeqImageLoader": [ [ - "VFrame Loader With Mask Editor" + "VFrame Loader With Mask Editor", + "Video Loader With Mask Editor" ], { "title_aux": "ComfyUI Sequential Image Loader" @@ -3406,6 +3410,14 @@ "title_aux": "Save Image with Generation Metadata" } ], + "https://github.com/glifxyz/ComfyUI-GlifNodes": [ + [ + "GlifConsistencyVAE" + ], + { + "title_aux": "ComfyUI-GlifNodes" + } + ], "https://github.com/guoyk93/yk-node-suite-comfyui": [ [ "YKImagePadForOutpaint", @@ -3487,10 +3499,12 @@ "https://github.com/idrirap/ComfyUI-Lora-Auto-Trigger-Words": [ [ "FusionText", + "LoraListNames", "LoraLoaderAdvanced", "LoraLoaderStackedAdvanced", "LoraLoaderStackedVanilla", "LoraLoaderVanilla", + "LoraTagsOnly", "Randomizer", "TagsFormater", "TagsSelector", @@ -3761,6 +3775,14 @@ "title_aux": "KJNodes for ComfyUI" } ], + "https://github.com/kijai/ComfyUI-Marigold": [ + [ + "MarigoldDepthEstimation" + ], + { + "title_aux": "Marigold depth estimation in ComfyUI" + } + ], "https://github.com/kijai/ComfyUI-SVD": [ [ "SVDimg2vid" @@ -4345,7 +4367,8 @@ ], "https://github.com/modusCell/ComfyUI-dimension-node-modusCell": [ [ - "DimensionProvider modusCell" + "DimensionProviderFree modusCell", + "DimensionProviderRatio modusCell" ], { "title_aux": "Preset Dimensions" @@ -5085,8 +5108,10 @@ ], "https://github.com/theUpsider/ComfyUI-Logic": [ [ + "Bool", "Compare", "DebugPrint", + "Float", "If ANY execute A else B", "Int", "String"