From 214197a24d0dca84e0714466865b6189d1b19979 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 6 Nov 2023 22:35:18 +0900 Subject: [PATCH] update DB improve: scanner.py - parallel pull --- custom-node-list.json | 20 ++++++++++++++++++++ extension-node-map.json | 28 +++++++++++++++++++++++++--- node_db/new/custom-node-list.json | 20 ++++++++++++++++++++ node_db/new/extension-node-map.json | 28 +++++++++++++++++++++++++--- scanner.py | 10 ++++++++-- 5 files changed, 98 insertions(+), 8 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index 2f7a5e9..0570f2b 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -160,6 +160,16 @@ "install_type": "git-clone", "description": "A collection of ComfyUI custom nodes to help streamline workflows and reduce total node count.

NOTE: This node is originally created by LucianoCirino, but the original repository is no longer maintained and has been forked by a new maintainer. To use the forked version, you should uninstall the original version and REINSTALL this one.

" }, + { + "author": "jags111", + "title": "ComfyUI_Jags_VectorMagic", + "reference": "https://github.com/jags111/ComfyUI_Jags_VectorMagic", + "files": [ + "https://github.com/jags111/ComfyUI_Jags_VectorMagic" + ], + "install_type": "git-clone", + "description": "a collection of nodes to explore Vector and image manipulation" + }, { "author": "Derfuu", "title": "Derfuu_ComfyUI_ModdedNodes", @@ -2673,6 +2683,16 @@ "install_type": "git-clone", "description": "CSV Loader for prompt building within ComfyUI interface. Allows access to positive/negative prompts associated with a name. Selections are being pulled from CSV files." }, + { + "author": "Trung0246", + "title": "ComfyUI-0246", + "reference": "https://github.com/Trung0246/ComfyUI-0246", + "files": [ + "https://github.com/Trung0246/ComfyUI-0246" + ], + "install_type": "git-clone", + "description": "Nodes: Highway. Random nodes for ComfyUI I made to solve my struggle with ComfyUI. Have varying quality." + }, { "author": "Smuzzies", "title": "Chatbox Overlay node for ComfyUI", diff --git a/extension-node-map.json b/extension-node-map.json index 6a4760e..1a73b95 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -709,6 +709,7 @@ "Checkpoint", "Float", "Int", + "Lora", "Operation", "String" ], @@ -1436,6 +1437,14 @@ "title_aux": "YARS: Yet Another Resolution Selector" } ], + "https://github.com/Trung0246/ComfyUI-0246": [ + [ + "Highway" + ], + { + "title_aux": "ComfyUI-0246" + } + ], "https://github.com/Ttl/ComfyUi_NNLatentUpscale": [ [ "NNLatentUpscale" @@ -2752,6 +2761,14 @@ "title_aux": "FaceSwap" } ], + "https://github.com/jags111/ComfyUI_Jags_VectorMagic": [ + [ + "my unique name" + ], + { + "title_aux": "ComfyUI_Jags_VectorMagic" + } + ], "https://github.com/jags111/efficiency-nodes-comfyui": [ [ "AnimateDiff Script", @@ -2826,6 +2843,11 @@ "GetImageRangeFromBatch", "GrowMaskWithBlur", "INTConstant", + "ImageBatchTestPattern", + "ImageConcanate", + "ImageGridComposite2x2", + "ImageGridComposite3x3", + "ReplaceImagesInBatch", "ReverseImageBatch", "SaveImageWithAlpha", "SomethingToString", @@ -3026,9 +3048,9 @@ "LatentReceiver", "LatentSender", "LatentSwitch", - "LoadConditioning", "MMDetDetectorProvider", "MMDetLoader", + "MaskDetailerPipe", "MaskListToMaskBatch", "MaskPainter", "MaskToSEGS", @@ -3058,7 +3080,6 @@ "SEGSPreview", "SEGSSwitch", "SEGSToImageList", - "SaveConditioning", "SegmDetectorCombined", "SegmDetectorCombined_v2", "SegmDetectorForEach", @@ -3176,7 +3197,8 @@ "DiscordServing", "ServingInputNumber", "ServingInputText", - "ServingOutput" + "ServingOutput", + "WebSocketServing" ], { "title_aux": "ComfyUI Serving toolkit" diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index e5cf4cc..27c814b 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,25 @@ { "custom_nodes": [ + { + "author": "jags111", + "title": "ComfyUI_Jags_VectorMagic", + "reference": "https://github.com/jags111/ComfyUI_Jags_VectorMagic", + "files": [ + "https://github.com/jags111/ComfyUI_Jags_VectorMagic" + ], + "install_type": "git-clone", + "description": "a collection of nodes to explore Vector and image manipulation" + }, + { + "author": "Trung0246", + "title": "ComfyUI-0246", + "reference": "https://github.com/Trung0246/ComfyUI-0246", + "files": [ + "https://github.com/Trung0246/ComfyUI-0246" + ], + "install_type": "git-clone", + "description": "Nodes: Highway. Random nodes for ComfyUI I made to solve my struggle with ComfyUI. Have varying quality." + }, { "author": "PCMonsterx", "title": "ComfyUI-CSV-Loader", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 6a4760e..1a73b95 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -709,6 +709,7 @@ "Checkpoint", "Float", "Int", + "Lora", "Operation", "String" ], @@ -1436,6 +1437,14 @@ "title_aux": "YARS: Yet Another Resolution Selector" } ], + "https://github.com/Trung0246/ComfyUI-0246": [ + [ + "Highway" + ], + { + "title_aux": "ComfyUI-0246" + } + ], "https://github.com/Ttl/ComfyUi_NNLatentUpscale": [ [ "NNLatentUpscale" @@ -2752,6 +2761,14 @@ "title_aux": "FaceSwap" } ], + "https://github.com/jags111/ComfyUI_Jags_VectorMagic": [ + [ + "my unique name" + ], + { + "title_aux": "ComfyUI_Jags_VectorMagic" + } + ], "https://github.com/jags111/efficiency-nodes-comfyui": [ [ "AnimateDiff Script", @@ -2826,6 +2843,11 @@ "GetImageRangeFromBatch", "GrowMaskWithBlur", "INTConstant", + "ImageBatchTestPattern", + "ImageConcanate", + "ImageGridComposite2x2", + "ImageGridComposite3x3", + "ReplaceImagesInBatch", "ReverseImageBatch", "SaveImageWithAlpha", "SomethingToString", @@ -3026,9 +3048,9 @@ "LatentReceiver", "LatentSender", "LatentSwitch", - "LoadConditioning", "MMDetDetectorProvider", "MMDetLoader", + "MaskDetailerPipe", "MaskListToMaskBatch", "MaskPainter", "MaskToSEGS", @@ -3058,7 +3080,6 @@ "SEGSPreview", "SEGSSwitch", "SEGSToImageList", - "SaveConditioning", "SegmDetectorCombined", "SegmDetectorCombined_v2", "SegmDetectorForEach", @@ -3176,7 +3197,8 @@ "DiscordServing", "ServingInputNumber", "ServingInputText", - "ServingOutput" + "ServingOutput", + "WebSocketServing" ], { "title_aux": "ComfyUI Serving toolkit" diff --git a/scanner.py b/scanner.py index 1755cb2..936a1c1 100644 --- a/scanner.py +++ b/scanner.py @@ -3,6 +3,7 @@ import os import json from git import Repo from torchvision.datasets.utils import download_url +import concurrent builtin_nodes = ["KSampler", "CheckpointSave"] @@ -162,14 +163,19 @@ def update_custom_nodes(): git_url_titles = get_git_urls_from_json('custom-node-list.json') - for url, title in git_url_titles: + def process_git_url_title(url, title): name = os.path.basename(url) if name.endswith(".git"): name = name[:-4] - + node_info[name] = (url, title) clone_or_pull_git_repository(url) + max_threads = 10 + with concurrent.futures.ThreadPoolExecutor(max_threads) as executor: + for url, title in git_url_titles: + executor.submit(process_git_url_title, url, title) + py_url_titles = get_py_urls_from_json('custom-node-list.json') for url, title in py_url_titles: