From 269edff1f315e5a512abc7dae2eb67c702007c5e Mon Sep 17 00:00:00 2001 From: Nuked Date: Sun, 19 Nov 2023 08:57:48 +0100 Subject: [PATCH 01/14] changed author name and description --- custom-node-list.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index e0f5ffa7..7e592db6 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -1688,14 +1688,14 @@ "description": "Input your desired output final resolution, it will automaticaly set the initial recommended SDXL ratio/size and its Upscale Factor to reach that output final resolution, also there's an option for 2x/4x reverse Upscale Factor. These all to avoid using bad/arbitary initial ratio/resolution." }, { - "author": "Nuked88", + "author": "Nuked", "title": "ComfyUI-N-Nodes", "reference": "https://github.com/Nuked88/ComfyUI-N-Nodes", "files": [ "https://github.com/Nuked88/ComfyUI-N-Nodes" ], "install_type": "git-clone", - "description": "A suite of custom nodes for ComfyUI, for now i just put Integer, string and float variable nodes." + "description": "A suite of custom nodes for ConfyUI that includes GPT text-prompt generation, LoadVideo,SaveVideo,LoadFramesFromFolder and FrameInterpolator" }, { "author": "Extraltodeus", From 1c12cccca75d111e8bd79d30a4c087d46ff8b12d Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 20 Nov 2023 01:19:34 +0900 Subject: [PATCH 02/14] update DB --- custom-node-list.json | 4 ++-- extension-node-map.json | 8 +++++++- node_db/new/custom-node-list.json | 4 ++-- node_db/new/extension-node-map.json | 8 +++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index 7e592db6..b9f15298 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2452,9 +2452,9 @@ "title": "noEmbryo nodes", "reference": "https://github.com/noembryo/ComfyUI-noEmbryo", "files": [ - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo/master/nodes.py" + "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo" ], - "install_type": "copy", + "install_type": "git-clone", "description": "PromptTermList (1-6): are some nodes that help with the creation of Prompts inside ComfyUI. Resolution Scale outputs image dimensions using a scale factor. Regex Text Chopper outputs the chopped parts of a text using RegEx." }, { diff --git a/extension-node-map.json b/extension-node-map.json index 96ce0612..d0e78d6c 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -63,12 +63,14 @@ "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", "\ud83c\udf87 Expand (jov)", + "\ud83d\udcf7 WebCam (jov)", "\ud83d\udd06 Pixel Shader (jov)", "\ud83d\udd06 Pixel Shader Image (jov)", "\ud83d\udd30 Mirror (jov)", "\ud83d\udd33 Tile (jov)", "\ud83d\udd78\ufe0f Adjust (jov)", "\ud83d\uddfa\ufe0f Projection (jov)", + "\ud83d\ude8c Route (jov)", "\ud83d\udfea Constant (jov)" ], { @@ -4585,7 +4587,7 @@ "title_aux": "Cute Comfy" } ], - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo/master/nodes.py": [ + "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo": [ [ "PromptTermList1", "PromptTermList2", @@ -4595,6 +4597,10 @@ "PromptTermList6" ], { + "author": "noEmbryo", + "description": "Some useful nodes for ComfyUI", + "nickname": "noEmbryo", + "title": "noEmbryo nodes for ComfyUI", "title_aux": "noEmbryo nodes" } ], diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index 9efd0a4c..838aa67b 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -295,9 +295,9 @@ "title": "noEmbryo nodes", "reference": "https://github.com/noembryo/ComfyUI-noEmbryo", "files": [ - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo/master/nodes.py" + "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo" ], - "install_type": "copy", + "install_type": "git-clone", "description": "PromptTermList (1-6): are some nodes that help with the creation of Prompts inside ComfyUI. Resolution Scale outputs image dimensions using a scale factor. Regex Text Chopper outputs the chopped parts of a text using RegEx." }, { diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 96ce0612..d0e78d6c 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -63,12 +63,14 @@ "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", "\ud83c\udf87 Expand (jov)", + "\ud83d\udcf7 WebCam (jov)", "\ud83d\udd06 Pixel Shader (jov)", "\ud83d\udd06 Pixel Shader Image (jov)", "\ud83d\udd30 Mirror (jov)", "\ud83d\udd33 Tile (jov)", "\ud83d\udd78\ufe0f Adjust (jov)", "\ud83d\uddfa\ufe0f Projection (jov)", + "\ud83d\ude8c Route (jov)", "\ud83d\udfea Constant (jov)" ], { @@ -4585,7 +4587,7 @@ "title_aux": "Cute Comfy" } ], - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo/master/nodes.py": [ + "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo": [ [ "PromptTermList1", "PromptTermList2", @@ -4595,6 +4597,10 @@ "PromptTermList6" ], { + "author": "noEmbryo", + "description": "Some useful nodes for ComfyUI", + "nickname": "noEmbryo", + "title": "noEmbryo nodes for ComfyUI", "title_aux": "noEmbryo nodes" } ], From 16e7e125443b0a9c01004804f384b746a088cb1d Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 20 Nov 2023 01:25:25 +0900 Subject: [PATCH 03/14] update DB --- custom-node-list.json | 2 +- extension-node-map.json | 34 ++++++++++++++--------------- node_db/new/custom-node-list.json | 2 +- node_db/new/extension-node-map.json | 34 ++++++++++++++--------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index b9f15298..1ca4fb3f 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2452,7 +2452,7 @@ "title": "noEmbryo nodes", "reference": "https://github.com/noembryo/ComfyUI-noEmbryo", "files": [ - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo" + "https://github.com/noembryo/ComfyUI-noEmbryo" ], "install_type": "git-clone", "description": "PromptTermList (1-6): are some nodes that help with the creation of Prompts inside ComfyUI. Resolution Scale outputs image dimensions using a scale factor. Regex Text Chopper outputs the chopped parts of a text using RegEx." diff --git a/extension-node-map.json b/extension-node-map.json index d0e78d6c..14224de0 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -3581,6 +3581,23 @@ "title_aux": "comfyUI_Nodes_nicolai256" } ], + "https://github.com/noembryo/ComfyUI-noEmbryo": [ + [ + "PromptTermList1", + "PromptTermList2", + "PromptTermList3", + "PromptTermList4", + "PromptTermList5", + "PromptTermList6" + ], + { + "author": "noEmbryo", + "description": "Some useful nodes for ComfyUI", + "nickname": "noEmbryo", + "title": "noEmbryo nodes for ComfyUI", + "title_aux": "noEmbryo nodes" + } + ], "https://github.com/noxinias/ComfyUI_NoxinNodes": [ [ "NoxinChime", @@ -4587,23 +4604,6 @@ "title_aux": "Cute Comfy" } ], - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo": [ - [ - "PromptTermList1", - "PromptTermList2", - "PromptTermList3", - "PromptTermList4", - "PromptTermList5", - "PromptTermList6" - ], - { - "author": "noEmbryo", - "description": "Some useful nodes for ComfyUI", - "nickname": "noEmbryo", - "title": "noEmbryo nodes for ComfyUI", - "title_aux": "noEmbryo nodes" - } - ], "https://raw.githubusercontent.com/throttlekitty/SDXLCustomAspectRatio/main/SDXLAspectRatio.py": [ [ "SDXLAspectRatio" diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index 838aa67b..14bac20b 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -295,7 +295,7 @@ "title": "noEmbryo nodes", "reference": "https://github.com/noembryo/ComfyUI-noEmbryo", "files": [ - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo" + "https://github.com/noembryo/ComfyUI-noEmbryo" ], "install_type": "git-clone", "description": "PromptTermList (1-6): are some nodes that help with the creation of Prompts inside ComfyUI. Resolution Scale outputs image dimensions using a scale factor. Regex Text Chopper outputs the chopped parts of a text using RegEx." diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index d0e78d6c..14224de0 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -3581,6 +3581,23 @@ "title_aux": "comfyUI_Nodes_nicolai256" } ], + "https://github.com/noembryo/ComfyUI-noEmbryo": [ + [ + "PromptTermList1", + "PromptTermList2", + "PromptTermList3", + "PromptTermList4", + "PromptTermList5", + "PromptTermList6" + ], + { + "author": "noEmbryo", + "description": "Some useful nodes for ComfyUI", + "nickname": "noEmbryo", + "title": "noEmbryo nodes for ComfyUI", + "title_aux": "noEmbryo nodes" + } + ], "https://github.com/noxinias/ComfyUI_NoxinNodes": [ [ "NoxinChime", @@ -4587,23 +4604,6 @@ "title_aux": "Cute Comfy" } ], - "https://raw.githubusercontent.com/noembryo/ComfyUI-noEmbryo": [ - [ - "PromptTermList1", - "PromptTermList2", - "PromptTermList3", - "PromptTermList4", - "PromptTermList5", - "PromptTermList6" - ], - { - "author": "noEmbryo", - "description": "Some useful nodes for ComfyUI", - "nickname": "noEmbryo", - "title": "noEmbryo nodes for ComfyUI", - "title_aux": "noEmbryo nodes" - } - ], "https://raw.githubusercontent.com/throttlekitty/SDXLCustomAspectRatio/main/SDXLAspectRatio.py": [ [ "SDXLAspectRatio" From 276b9a843b873a89c1ca626f42e38983189188a1 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 20 Nov 2023 01:29:57 +0900 Subject: [PATCH 04/14] update DB --- custom-node-list.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-node-list.json b/custom-node-list.json index 1ca4fb3f..1f283a25 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -1473,7 +1473,7 @@ "files": [ "https://github.com/rgthree/rgthree-comfy" ], - "nodename_pattern": " (rgthree)$", + "nodename_pattern": " \\(rgthree\\)$", "install_type": "git-clone", "description": "Nodes: Seed, Reroute, Context, Lora Loader Stack, Context Switch, Fast Muter. These custom nodes helps organize the building of complex workflows." }, From d8ad8d39fb84f01d78355828fb87fcfc51536861 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 20 Nov 2023 20:13:05 +0900 Subject: [PATCH 05/14] update DB --- custom-node-list.json | 11 +++++++++++ extension-node-map.json | 17 ++++++++++++----- node_db/dev/custom-node-list.json | 10 ---------- node_db/new/custom-node-list.json | 11 +++++++++++ node_db/new/extension-node-map.json | 17 ++++++++++++----- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index 1f283a25..3ea4a142 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2677,6 +2677,17 @@ "install_type": "git-clone", "description": "Nodes:GradientPatchModelAddDownscale (Kohya Deep Shrink)." }, + { + "author": "Feidorian", + "title": "feidorian-ComfyNodes", + "reference": "https://github.com/Feidorian/feidorian-ComfyNodes", + "nodename_pattern": "^Feidorian_", + "files": [ + "https://github.com/Feidorian/feidorian-ComfyNodes" + ], + "install_type": "git-clone", + "description": "This extension provides various custom nodes. literals, loaders, logic, output, switches" + }, { "author": "Off-Live", "title": "ComfyUI-off-suite", diff --git a/extension-node-map.json b/extension-node-map.json index 14224de0..1265b1c8 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -59,10 +59,12 @@ "https://github.com/Amorano/Jovimetrix": [ [ "\u2697\ufe0f Blend (jov)", + "\u2697\ufe0f Blend Mask (jov)", "\u2728 Shape Generator (jov)", "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", - "\ud83c\udf87 Expand (jov)", + "\ud83c\udf87 Extend (jov)", + "\ud83d\udcc9 Threshold (jov)", "\ud83d\udcf7 WebCam (jov)", "\ud83d\udd06 Pixel Shader (jov)", "\ud83d\udd06 Pixel Shader Image (jov)", @@ -75,8 +77,7 @@ ], { "author": "amorano", - "description": "", - "nickname": "Jovimetrix", + "description": "Procedural & Compositing. Includes a Webcam node.", "title": "Jovimetrix Composition Pack", "title_aux": "Jovimetrix Composition Nodes" } @@ -493,7 +494,9 @@ ], "https://github.com/Fictiverse/ComfyUI_Fictiverse": [ [ + "Add Noise to Image with Mask", "Color correction", + "Displace Image with Depth", "Displace Images with Mask" ], { @@ -773,6 +776,7 @@ "Checkpoint", "Float", "Int", + "KepStringLiteral", "Lora", "Operation", "String" @@ -1404,10 +1408,12 @@ ], "https://github.com/THtianhao/ComfyUI-FaceChain": [ [ + "FCStyleLoraLoad", + "FC_CropBottom", "FC_CropMask", "FC_FaceDetection", "FC_FaceFusion", - "FC_LoraMerge", + "FC_ReplaceImage", "FC_Segment", "FC_StyleLoraLoad" ], @@ -2993,6 +2999,7 @@ "BatchCropFromMaskAdvanced", "BatchUncrop", "BatchUncropAdvanced", + "BboxToInt", "ColorMatch", "ColorToMask", "ConditioningMultiCombine", @@ -3004,6 +3011,7 @@ "CreateFadeMask", "CreateFluidMask", "CreateGradientMask", + "CreateMagicMask", "CreateShapeMask", "CreateTextMask", "CreateVoronoiMask", @@ -3943,7 +3951,6 @@ "AV_ParametersPipeToPrompts", "AV_PromptsToParametersPipe", "AV_SAMLoader", - "AV_UploadImage", "AV_VAELoader", "AspectRatioSelector", "BLIPCaption", diff --git a/node_db/dev/custom-node-list.json b/node_db/dev/custom-node-list.json index 96344e4b..a7829b1e 100644 --- a/node_db/dev/custom-node-list.json +++ b/node_db/dev/custom-node-list.json @@ -120,16 +120,6 @@ "install_type": "git-clone", "description": "Experimental node for SSD-1B. This node is not need for latest comfyui." }, - { - "author": "Feidorian", - "title": "feidorian-nodes", - "reference": "https://github.com/Feidorian/feidorian-ComfyNodes", - "files": [ - "https://github.com/Feidorian/feidorian-ComfyNodes" - ], - "install_type": "git-clone", - "description": "Nodes: Feidorian_WorkflowImageLoader" - }, { "author": "flowtyone", "title": "comfyui-flowty-lcm", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index 14bac20b..072d33ab 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,16 @@ { "custom_nodes": [ + { + "author": "Feidorian", + "title": "feidorian-ComfyNodes", + "reference": "https://github.com/Feidorian/feidorian-ComfyNodes", + "nodename_pattern": "^Feidorian_", + "files": [ + "https://github.com/Feidorian/feidorian-ComfyNodes" + ], + "install_type": "git-clone", + "description": "This extension provides various custom nodes. literals, loaders, logic, output, switches" + }, { "author": "kinfolk0117", "title": "ComfyUI_GradientDeepShrink", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 14224de0..1265b1c8 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -59,10 +59,12 @@ "https://github.com/Amorano/Jovimetrix": [ [ "\u2697\ufe0f Blend (jov)", + "\u2697\ufe0f Blend Mask (jov)", "\u2728 Shape Generator (jov)", "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", - "\ud83c\udf87 Expand (jov)", + "\ud83c\udf87 Extend (jov)", + "\ud83d\udcc9 Threshold (jov)", "\ud83d\udcf7 WebCam (jov)", "\ud83d\udd06 Pixel Shader (jov)", "\ud83d\udd06 Pixel Shader Image (jov)", @@ -75,8 +77,7 @@ ], { "author": "amorano", - "description": "", - "nickname": "Jovimetrix", + "description": "Procedural & Compositing. Includes a Webcam node.", "title": "Jovimetrix Composition Pack", "title_aux": "Jovimetrix Composition Nodes" } @@ -493,7 +494,9 @@ ], "https://github.com/Fictiverse/ComfyUI_Fictiverse": [ [ + "Add Noise to Image with Mask", "Color correction", + "Displace Image with Depth", "Displace Images with Mask" ], { @@ -773,6 +776,7 @@ "Checkpoint", "Float", "Int", + "KepStringLiteral", "Lora", "Operation", "String" @@ -1404,10 +1408,12 @@ ], "https://github.com/THtianhao/ComfyUI-FaceChain": [ [ + "FCStyleLoraLoad", + "FC_CropBottom", "FC_CropMask", "FC_FaceDetection", "FC_FaceFusion", - "FC_LoraMerge", + "FC_ReplaceImage", "FC_Segment", "FC_StyleLoraLoad" ], @@ -2993,6 +2999,7 @@ "BatchCropFromMaskAdvanced", "BatchUncrop", "BatchUncropAdvanced", + "BboxToInt", "ColorMatch", "ColorToMask", "ConditioningMultiCombine", @@ -3004,6 +3011,7 @@ "CreateFadeMask", "CreateFluidMask", "CreateGradientMask", + "CreateMagicMask", "CreateShapeMask", "CreateTextMask", "CreateVoronoiMask", @@ -3943,7 +3951,6 @@ "AV_ParametersPipeToPrompts", "AV_PromptsToParametersPipe", "AV_SAMLoader", - "AV_UploadImage", "AV_VAELoader", "AspectRatioSelector", "BLIPCaption", From defb7810973a184454d43d3802a3176543b3231e Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 21 Nov 2023 00:57:47 +0900 Subject: [PATCH 06/14] update DB --- custom-node-list.json | 20 ++++++++++++++++++++ extension-node-map.json | 16 ++++++++++++++++ node_db/new/custom-node-list.json | 20 ++++++++++++++++++++ node_db/new/extension-node-map.json | 16 ++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/custom-node-list.json b/custom-node-list.json index 3ea4a142..eab23113 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2688,6 +2688,26 @@ "install_type": "git-clone", "description": "This extension provides various custom nodes. literals, loaders, logic, output, switches" }, + { + "author": "wutipong", + "title": "ComfyUI-TextUtils", + "reference": "https://github.com/wutipong/ComfyUI-TextUtils", + "files": [ + "https://github.com/wutipong/ComfyUI-TextUtils" + ], + "install_type": "git-clone", + "description": "Nodes:Create N-Token String" + }, + { + "author": "natto-maki", + "title": "ComfyUI-NegiTools", + "reference": "https://github.com/natto-maki/ComfyUI-NegiTools", + "files": [ + "https://github.com/natto-maki/ComfyUI-NegiTools" + ], + "install_type": "git-clone", + "description": "Nodes:OpenAI DALLe3" + }, { "author": "Off-Live", "title": "ComfyUI-off-suite", diff --git a/extension-node-map.json b/extension-node-map.json index 1265b1c8..22962f5f 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -3581,6 +3581,14 @@ "title_aux": "ComfyUI_FastVAEDecorder_SDXL" } ], + "https://github.com/natto-maki/ComfyUI-NegiTools": [ + [ + "OpenAiDalle3" + ], + { + "title_aux": "ComfyUI-NegiTools" + } + ], "https://github.com/nicolai256/comfyUI_Nodes_nicolai256/raw/main/yugioh-presets.py": [ [ "yugioh_Presets" @@ -4469,6 +4477,14 @@ "title_aux": "SDXLResolutionPresets" } ], + "https://github.com/wutipong/ComfyUI-TextUtils": [ + [ + "wutipong/comfyui-textutils/create-n-token-string" + ], + { + "title_aux": "ComfyUI-TextUtils" + } + ], "https://github.com/xXAdonesXx/NodeGPT": [ [ "AppendAgent", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index 072d33ab..b61cf60e 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,25 @@ { "custom_nodes": [ + { + "author": "natto-maki", + "title": "ComfyUI-NegiTools", + "reference": "https://github.com/natto-maki/ComfyUI-NegiTools", + "files": [ + "https://github.com/natto-maki/ComfyUI-NegiTools" + ], + "install_type": "git-clone", + "description": "Nodes:OpenAI DALLe3" + }, + { + "author": "wutipong", + "title": "ComfyUI-TextUtils", + "reference": "https://github.com/wutipong/ComfyUI-TextUtils", + "files": [ + "https://github.com/wutipong/ComfyUI-TextUtils" + ], + "install_type": "git-clone", + "description": "Nodes:Create N-Token String" + }, { "author": "Feidorian", "title": "feidorian-ComfyNodes", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 1265b1c8..22962f5f 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -3581,6 +3581,14 @@ "title_aux": "ComfyUI_FastVAEDecorder_SDXL" } ], + "https://github.com/natto-maki/ComfyUI-NegiTools": [ + [ + "OpenAiDalle3" + ], + { + "title_aux": "ComfyUI-NegiTools" + } + ], "https://github.com/nicolai256/comfyUI_Nodes_nicolai256/raw/main/yugioh-presets.py": [ [ "yugioh_Presets" @@ -4469,6 +4477,14 @@ "title_aux": "SDXLResolutionPresets" } ], + "https://github.com/wutipong/ComfyUI-TextUtils": [ + [ + "wutipong/comfyui-textutils/create-n-token-string" + ], + { + "title_aux": "ComfyUI-TextUtils" + } + ], "https://github.com/xXAdonesXx/NodeGPT": [ [ "AppendAgent", From 580599ffe842d063811c5025a88012d6a2d15ce6 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 21 Nov 2023 11:01:12 +0900 Subject: [PATCH 07/14] fix: prestartup Logger - add encoding method --- __init__.py | 2 +- prestartup_script.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index e0c2dc14..30bab3ae 100644 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ import concurrent import ssl from urllib.parse import urlparse -version = "V1.1" +version = "V1.1.1" print(f"### Loading: ComfyUI-Manager ({version})") diff --git a/prestartup_script.py b/prestartup_script.py index dfb924d3..c3409b4c 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -138,7 +138,10 @@ try: def reconfigure(self, *args, **kwargs): pass + def encoding(): + return "utf-8" + def close_log(): log_file.close() From 1d21359a5aade09956113aa58be2812bd5427d80 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 21 Nov 2023 11:35:38 +0900 Subject: [PATCH 08/14] fix: encoding error --- __init__.py | 2 +- prestartup_script.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/__init__.py b/__init__.py index 30bab3ae..816b9c72 100644 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ import concurrent import ssl from urllib.parse import urlparse -version = "V1.1.1" +version = "V1.1.2" print(f"### Loading: ComfyUI-Manager ({version})") diff --git a/prestartup_script.py b/prestartup_script.py index c3409b4c..14551cf9 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -86,6 +86,7 @@ try: class Logger: def __init__(self, is_stdout): self.is_stdout = is_stdout + self.encoding = "utf-8" def fileno(self): try: @@ -137,10 +138,6 @@ try: def reconfigure(self, *args, **kwargs): pass - - def encoding(): - return "utf-8" - def close_log(): log_file.close() From 4feaa2d239d540e5a042c680193ba89551365c94 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 21 Nov 2023 18:10:21 +0900 Subject: [PATCH 09/14] refactor: Logger -> ComfyUIManagerLogger fix: prestartup Logger - add close method --- __init__.py | 2 +- prestartup_script.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/__init__.py b/__init__.py index 816b9c72..095f7d23 100644 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ import concurrent import ssl from urllib.parse import urlparse -version = "V1.1.2" +version = "V1.1.3" print(f"### Loading: ComfyUI-Manager ({version})") diff --git a/prestartup_script.py b/prestartup_script.py index 14551cf9..d5bfe941 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -83,7 +83,7 @@ try: log_file = open(f"comfyui{postfix}.log", "w", encoding="utf-8") log_lock = threading.Lock() - class Logger: + class ComfyUIManagerLogger: def __init__(self, is_stdout): self.is_stdout = is_stdout self.encoding = "utf-8" @@ -136,6 +136,10 @@ try: else: original_stderr.flush() + def close(self): + self.flush() + pass + def reconfigure(self, *args, **kwargs): pass @@ -143,8 +147,8 @@ try: log_file.close() - sys.stdout = Logger(True) - sys.stderr = Logger(False) + sys.stdout = ComfyUIManagerLogger(True) + sys.stderr = ComfyUIManagerLogger(False) atexit.register(close_log) except Exception as e: From c05a526f9cc7abc211d1569da6fcd891e190465a Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 21 Nov 2023 18:22:27 +0900 Subject: [PATCH 10/14] update DB --- custom-node-list.json | 50 +++++++++++++++++++++++ extension-node-map.json | 63 ++++++++++++++++++++++++++++- node_db/dev/custom-node-list.json | 10 +++++ node_db/new/custom-node-list.json | 30 ++++++++++++++ node_db/new/extension-node-map.json | 63 ++++++++++++++++++++++++++++- 5 files changed, 212 insertions(+), 4 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index eab23113..344edd26 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2708,6 +2708,56 @@ "install_type": "git-clone", "description": "Nodes:OpenAI DALLe3" }, + { + "author": "LonicaMewinsky", + "title": "ComfyUI-RawSaver", + "reference": "https://github.com/LonicaMewinsky/ComfyUI-RawSaver", + "files": [ + "https://github.com/LonicaMewinsky/ComfyUI-RawSaver" + ], + "install_type": "git-clone", + "description": "Nodes:SaveTifImage" + }, + { + "author": "jojkaart", + "title": "ComfyUI-sampler-lcm-alternative", + "reference": "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative", + "files": [ + "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative" + ], + "install_type": "git-clone", + "description": "Nodes:LCMScheduler, SamplerLCMAlternative, SamplerLCMCycle. ComfyUI Custom Sampler nodes that add a new improved LCM sampler functions" + }, + { + "author": "GTSuya-Studio", + "title": "ComfyUI-GTSuya-Nodes", + "reference": "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes", + "files": [ + "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes" + ], + "install_type": "git-clone", + "description": "ComfyUI-GTSuya-Nodes is a ComyUI extension designed to add several wildcards supports into ComfyUI. Wildcards allow you to use __name__ syntax in your prompt to get a random line from a file named name.txt in a wildcards directory." + }, + { + "author": "oyvindg", + "title": "ComfyUI-TrollSuite", + "reference": "https://github.com/oyvindg/ComfyUI-TrollSuite", + "files": [ + "https://github.com/oyvindg/ComfyUI-TrollSuite" + ], + "install_type": "git-clone", + "description": "Nodes: BinaryImageMask, ImagePadding, LoadLastCreatedImage, RandomMask, TransparentImage." + }, + { + "author": "drago87", + "title": "ComfyUI_Dragos_Nodes", + "reference": "https://github.com/drago87/ComfyUI_Dragos_Nodes", + "files": [ + "https://github.com/drago87/ComfyUI_Dragos_Nodes" + ], + "install_type": "git-clone", + "description": "For now a single node that checks a folder and returns a padded string depending on the .png files in it. An exaple is you have a folder with 3 .png files in it and you have set the padding to 4 it will give you a string '0003'" + }, { "author": "Off-Live", "title": "ComfyUI-off-suite", diff --git a/extension-node-map.json b/extension-node-map.json index 22962f5f..27a38784 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -572,6 +572,16 @@ "title_aux": "ezXY scripts and nodes" } ], + "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ + [ + "Simple Wildcards", + "Simple Wildcards (Dir.)", + "Wildcards" + ], + { + "title_aux": "ComfyUI-GTSuya-Nodes" + } + ], "https://github.com/Gourieff/comfyui-reactor-node": [ [ "ReActorFaceSwap", @@ -771,6 +781,14 @@ "title_aux": "ComfyBreakAnim" } ], + "https://github.com/LonicaMewinsky/ComfyUI-RawSaver": [ + [ + "SaveTifImage" + ], + { + "title_aux": "ComfyUI-RawSaver" + } + ], "https://github.com/M1kep/ComfyLiterals": [ [ "Checkpoint", @@ -1411,6 +1429,7 @@ "FCStyleLoraLoad", "FC_CropBottom", "FC_CropMask", + "FC_FCCropFace", "FC_FaceDetection", "FC_FaceFusion", "FC_ReplaceImage", @@ -1627,9 +1646,11 @@ [ "BLVAEEncode", "CLIPTextEncodeList", + "CLIPTextEncodeSequence2", "ConditioningBlend", "DebugInput", "KSamplerSeq", + "KSamplerSeq2", "VAEEncodeForInpaint (WAS)", "VividSharpen" ], @@ -2402,6 +2423,7 @@ "Loader", "Prompts", "SaveImages", + "Textbox", "Wildcards" ], { @@ -2657,6 +2679,14 @@ "title_aux": "ComfyUI-Vextra-Nodes" } ], + "https://github.com/drago87/ComfyUI_Dragos_Nodes": [ + [ + "file_padding" + ], + { + "title_aux": "ComfyUI_Dragos_Nodes" + } + ], "https://github.com/drustan-hawk/primitive-types": [ [ "float", @@ -2979,6 +3009,16 @@ "title_aux": "ComfyUI-Jjk-Nodes" } ], + "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative": [ + [ + "LCMScheduler", + "SamplerLCMAlternative", + "SamplerLCMCycle" + ], + { + "title_aux": "ComfyUI-sampler-lcm-alternative" + } + ], "https://github.com/ka-puna/comfyui-yanc": [ [ "YANC.ConcatStrings", @@ -3583,7 +3623,10 @@ ], "https://github.com/natto-maki/ComfyUI-NegiTools": [ [ - "OpenAiDalle3" + "NegiTools_OpenAiDalle3", + "NegiTools_OpenAiTranslate", + "NegiTools_SeedGenerator", + "NegiTools_StringFunction" ], { "title_aux": "ComfyUI-NegiTools" @@ -3705,6 +3748,18 @@ "title_aux": "Ostris Nodes ComfyUI" } ], + "https://github.com/oyvindg/ComfyUI-TrollSuite": [ + [ + "BinaryImageMask", + "ImagePadding", + "LoadLastImage", + "RandomMask", + "TransparentImage" + ], + { + "title_aux": "ComfyUI-TrollSuite" + } + ], "https://github.com/palant/extended-saveimage-comfyui": [ [ "SaveImageExtended" @@ -4374,6 +4429,7 @@ "Image Save with Prompt/Info (WLSH)", "Image Save with Prompt/Info File (WLSH)", "Image Scale By Factor (WLSH)", + "Image Scale by Shortside (WLSH)", "KSamplerAdvanced (WLSH)", "Multiply Integer (WLSH)", "Outpaint to Image (WLSH)", @@ -4479,7 +4535,10 @@ ], "https://github.com/wutipong/ComfyUI-TextUtils": [ [ - "wutipong/comfyui-textutils/create-n-token-string" + "Text Utils - Join N-Elements of String List", + "Text Utils - Join String List", + "Text Utils - Join Strings", + "Text Utils - Split String to List" ], { "title_aux": "ComfyUI-TextUtils" diff --git a/node_db/dev/custom-node-list.json b/node_db/dev/custom-node-list.json index a7829b1e..874f5595 100644 --- a/node_db/dev/custom-node-list.json +++ b/node_db/dev/custom-node-list.json @@ -1,5 +1,15 @@ { "custom_nodes": [ + { + "author": "drago87", + "title": "ComfyUI_Dragos_Nodes", + "reference": "https://github.com/drago87/ComfyUI_Dragos_Nodes", + "files": [ + "https://github.com/drago87/ComfyUI_Dragos_Nodes" + ], + "install_type": "git-clone", + "description": "For now a single node that checks a folder and returns a padded string depending on the .png files in it. An exaple is you have a folder with 3 .png files in it and you have set the padding to 4 it will give you a string '0003'" + }, { "author": "oyvindg", "title": "ComfyUI-TrollSuite", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index b61cf60e..b7a79dbd 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,35 @@ { "custom_nodes": [ + { + "author": "GTSuya-Studio", + "title": "ComfyUI-GTSuya-Nodes", + "reference": "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes", + "files": [ + "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes" + ], + "install_type": "git-clone", + "description": "ComfyUI-GTSuya-Nodes is a ComyUI extension designed to add several wildcards supports into ComfyUI. Wildcards allow you to use __name__ syntax in your prompt to get a random line from a file named name.txt in a wildcards directory." + }, + { + "author": "jojkaart", + "title": "ComfyUI-sampler-lcm-alternative", + "reference": "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative", + "files": [ + "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative" + ], + "install_type": "git-clone", + "description": "Nodes:LCMScheduler, SamplerLCMAlternative, SamplerLCMCycle. ComfyUI Custom Sampler nodes that add a new improved LCM sampler functions" + }, + { + "author": "LonicaMewinsky", + "title": "ComfyUI-RawSaver", + "reference": "https://github.com/LonicaMewinsky/ComfyUI-RawSaver", + "files": [ + "https://github.com/LonicaMewinsky/ComfyUI-RawSaver" + ], + "install_type": "git-clone", + "description": "Nodes:SaveTifImage." + }, { "author": "natto-maki", "title": "ComfyUI-NegiTools", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 22962f5f..27a38784 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -572,6 +572,16 @@ "title_aux": "ezXY scripts and nodes" } ], + "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ + [ + "Simple Wildcards", + "Simple Wildcards (Dir.)", + "Wildcards" + ], + { + "title_aux": "ComfyUI-GTSuya-Nodes" + } + ], "https://github.com/Gourieff/comfyui-reactor-node": [ [ "ReActorFaceSwap", @@ -771,6 +781,14 @@ "title_aux": "ComfyBreakAnim" } ], + "https://github.com/LonicaMewinsky/ComfyUI-RawSaver": [ + [ + "SaveTifImage" + ], + { + "title_aux": "ComfyUI-RawSaver" + } + ], "https://github.com/M1kep/ComfyLiterals": [ [ "Checkpoint", @@ -1411,6 +1429,7 @@ "FCStyleLoraLoad", "FC_CropBottom", "FC_CropMask", + "FC_FCCropFace", "FC_FaceDetection", "FC_FaceFusion", "FC_ReplaceImage", @@ -1627,9 +1646,11 @@ [ "BLVAEEncode", "CLIPTextEncodeList", + "CLIPTextEncodeSequence2", "ConditioningBlend", "DebugInput", "KSamplerSeq", + "KSamplerSeq2", "VAEEncodeForInpaint (WAS)", "VividSharpen" ], @@ -2402,6 +2423,7 @@ "Loader", "Prompts", "SaveImages", + "Textbox", "Wildcards" ], { @@ -2657,6 +2679,14 @@ "title_aux": "ComfyUI-Vextra-Nodes" } ], + "https://github.com/drago87/ComfyUI_Dragos_Nodes": [ + [ + "file_padding" + ], + { + "title_aux": "ComfyUI_Dragos_Nodes" + } + ], "https://github.com/drustan-hawk/primitive-types": [ [ "float", @@ -2979,6 +3009,16 @@ "title_aux": "ComfyUI-Jjk-Nodes" } ], + "https://github.com/jojkaart/ComfyUI-sampler-lcm-alternative": [ + [ + "LCMScheduler", + "SamplerLCMAlternative", + "SamplerLCMCycle" + ], + { + "title_aux": "ComfyUI-sampler-lcm-alternative" + } + ], "https://github.com/ka-puna/comfyui-yanc": [ [ "YANC.ConcatStrings", @@ -3583,7 +3623,10 @@ ], "https://github.com/natto-maki/ComfyUI-NegiTools": [ [ - "OpenAiDalle3" + "NegiTools_OpenAiDalle3", + "NegiTools_OpenAiTranslate", + "NegiTools_SeedGenerator", + "NegiTools_StringFunction" ], { "title_aux": "ComfyUI-NegiTools" @@ -3705,6 +3748,18 @@ "title_aux": "Ostris Nodes ComfyUI" } ], + "https://github.com/oyvindg/ComfyUI-TrollSuite": [ + [ + "BinaryImageMask", + "ImagePadding", + "LoadLastImage", + "RandomMask", + "TransparentImage" + ], + { + "title_aux": "ComfyUI-TrollSuite" + } + ], "https://github.com/palant/extended-saveimage-comfyui": [ [ "SaveImageExtended" @@ -4374,6 +4429,7 @@ "Image Save with Prompt/Info (WLSH)", "Image Save with Prompt/Info File (WLSH)", "Image Scale By Factor (WLSH)", + "Image Scale by Shortside (WLSH)", "KSamplerAdvanced (WLSH)", "Multiply Integer (WLSH)", "Outpaint to Image (WLSH)", @@ -4479,7 +4535,10 @@ ], "https://github.com/wutipong/ComfyUI-TextUtils": [ [ - "wutipong/comfyui-textutils/create-n-token-string" + "Text Utils - Join N-Elements of String List", + "Text Utils - Join String List", + "Text Utils - Join Strings", + "Text Utils - Split String to List" ], { "title_aux": "ComfyUI-TextUtils" From b7aebb5167629511aa368eb19294befd18000432 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Wed, 22 Nov 2023 07:40:47 +0900 Subject: [PATCH 11/14] update DB --- custom-node-list.json | 12 ++- extension-node-map.json | 7 +- node_db/dev/custom-node-list.json | 2 +- node_db/new/custom-node-list.json | 125 +++------------------------- node_db/new/extension-node-map.json | 7 +- 5 files changed, 36 insertions(+), 117 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index 344edd26..b48c5f5d 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2716,7 +2716,7 @@ "https://github.com/LonicaMewinsky/ComfyUI-RawSaver" ], "install_type": "git-clone", - "description": "Nodes:SaveTifImage" + "description": "Nodes:SaveTifImage. ComfyUI custom node for purpose of saving image as uint16 tif file." }, { "author": "jojkaart", @@ -2758,6 +2758,16 @@ "install_type": "git-clone", "description": "For now a single node that checks a folder and returns a padded string depending on the .png files in it. An exaple is you have a folder with 3 .png files in it and you have set the padding to 4 it will give you a string '0003'" }, + { + "author": "ansonkao", + "title": "comfyui-geometry", + "reference": "https://github.com/ansonkao/comfyui-geometry", + "files": [ + "https://github.com/ansonkao/comfyui-geometry" + ], + "install_type": "git-clone", + "description": "Nodes: Mask to Centroid, Mask to Eigenvector. A small collection of custom nodes for use with ComfyUI, for geometry calculations" + }, { "author": "Off-Live", "title": "ComfyUI-off-suite", diff --git a/extension-node-map.json b/extension-node-map.json index 27a38784..02d0f6a6 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -1472,10 +1472,14 @@ "tri3d-atr-parse-batch", "tri3d-extract-hand", "tri3d-extract-parts-batch", + "tri3d-extract-parts-batch2", "tri3d-extract-parts-mask-batch", "tri3d-fuzzification", + "tri3d-interaction-canny", "tri3d-position-hands", - "tri3d-position-parts-batch" + "tri3d-position-parts-batch", + "tri3d-skin-feathered-padded-mask", + "tri3d-swap-pixels" ], { "title_aux": "tri3d-comfyui-nodes" @@ -3049,6 +3053,7 @@ "ConditioningSetMaskAndCombine5", "CreateAudioMask", "CreateFadeMask", + "CreateFadeMaskAdvanced", "CreateFluidMask", "CreateGradientMask", "CreateMagicMask", diff --git a/node_db/dev/custom-node-list.json b/node_db/dev/custom-node-list.json index 874f5595..8933a6cc 100644 --- a/node_db/dev/custom-node-list.json +++ b/node_db/dev/custom-node-list.json @@ -58,7 +58,7 @@ "https://github.com/dnl13/ComfyUI-dnl13-seg" ], "install_type": "git-clone", - "description": "Nodes: Automatic Segmentation (dnl13), RGB (dnl13)" + "description": "After discovering @storyicon implementation here of Segment Anything, I realized its potential as a powerful tool for ComfyUI if implemented correctly. I delved into the SAM and Dino models. The following is my own adaptation of sam_hq for ComfyUI." }, { "author": "phineas-pta", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index b7a79dbd..cf5dca3f 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,15 @@ { "custom_nodes": [ + { + "author": "ansonkao", + "title": "comfyui-geometry", + "reference": "https://github.com/ansonkao/comfyui-geometry", + "files": [ + "https://github.com/ansonkao/comfyui-geometry" + ], + "install_type": "git-clone", + "description": "Nodes: Mask to Centroid, Mask to Eigenvector. A small collection of custom nodes for use with ComfyUI, for geometry calculations" + }, { "author": "GTSuya-Studio", "title": "ComfyUI-GTSuya-Nodes", @@ -28,7 +38,7 @@ "https://github.com/LonicaMewinsky/ComfyUI-RawSaver" ], "install_type": "git-clone", - "description": "Nodes:SaveTifImage." + "description": "Nodes:SaveTifImage. ComfyUI custom node for purpose of saving image as uint16 tif file." }, { "author": "natto-maki", @@ -771,117 +781,6 @@ ], "install_type": "git-clone", "description": "Nodes:Conditioning (Blend), Inpainting VAE Encode (WAS), VividSharpen. Experimental nodes, or other random extra helper nodes." - }, - { - "author": "yolanother", - "title": "Image to Text Node", - "reference": "https://github.com/yolanother/DTAIImageToTextNode", - "files": [ - "https://github.com/yolanother/DTAIImageToTextNode" - ], - "install_type": "git-clone", - "description": "Nodes: Image URL to Text, Image to Text." - }, - { - "author": "yolanother", - "title": "Comfy UI Online Loaders", - "reference": "https://github.com/yolanother/DTAIComfyLoaders", - "files": [ - "https://github.com/yolanother/DTAIComfyLoaders" - ], - "install_type": "git-clone", - "description": "Nodes: Submit Image (Parameters), Submit Image. A collection of loaders that use a shared common online data source rather than relying on the files to be present locally." - }, - { - "author": "yolanother", - "title": "Comfy AI DoubTech.ai Image Sumission Node", - "reference": "https://github.com/yolanother/DTAIComfyImageSubmit", - "files": [ - "https://github.com/yolanother/DTAIComfyImageSubmit" - ], - "install_type": "git-clone", - "description": "A ComfyAI submit node to upload images to DoubTech.ai" - }, - { - "author": "yolanother", - "title": "Comfy UI QR Codes", - "reference": "https://github.com/yolanother/DTAIComfyQRCodes", - "files": [ - "https://github.com/yolanother/DTAIComfyQRCodes" - ], - "install_type": "git-clone", - "description": "This extension introduces QR code nodes for the Comfy UI stable diffusion client. NOTE: ComfyUI qrcode extension required." - }, - { - "author": "yolanother", - "title": "Variables for Comfy UI", - "reference": "https://github.com/yolanother/DTAIComfyVariables", - "files": [ - "https://github.com/yolanother/DTAIComfyVariables" - ], - "install_type": "git-clone", - "description": "Nodes: String, Int, Float, Short String, CLIP Text Encode (With Variables), String Format, Short String Format. This extension introduces quality of life improvements by providing variable nodes and shared global variables." - }, - { - "author": "kijai", - "title": "KJNodes for ComfyUI", - "reference": "https://github.com/kijai/ComfyUI-KJNodes", - "files": [ - "https://github.com/kijai/ComfyUI-KJNodes" - ], - "install_type": "git-clone", - "description": "Various quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability." - }, - { - "author": "WASasquatch", - "title": "ASTERR", - "reference": "https://github.com/WASasquatch/ASTERR", - "files": [ - "https://github.com/WASasquatch/ASTERR" - ], - "install_type": "git-clone", - "description": "Abstract Syntax Trees Evaluated Restricted Run (ASTERR) is a Python Script executor for ComfyUI.

Warning:ASTERR runs Python Code from a Web Interface! It is highly recommended to run this in a closed-off environment, as it could have potential security risks.

" - }, - { - "author": "Zuellni", - "title": "ComfyUI PickScore Nodes", - "reference": "https://github.com/Zuellni/ComfyUI-PickScore-Nodes", - "files": [ - "https://github.com/Zuellni/ComfyUI-PickScore-Nodes" - ], - "install_type": "git-clone", - "description": "Image scoring nodes for ComfyUI using PickScore with a batch of images to predict which ones fit a given prompt the best." - }, - { - "author": "chrisgoringe", - "title": "Use Everywhere (UE Nodes)", - "reference": "https://github.com/chrisgoringe/cg-use-everywhere", - "files": [ - "https://github.com/chrisgoringe/cg-use-everywhere" - ], - "install_type": "git-clone", - "nodename_pattern": "^(UE\\? |UE )", - "description": "A set of nodes that allow data to be 'broadcast' to some or all unconnected inputs. Greatly reduces link spaghetti." - }, - { - "author": "azazeal04", - "title": "ComfyUI-Styles", - "reference": "https://github.com/azazeal04/ComfyUI-Styles", - "files": [ - "https://github.com/azazeal04/ComfyUI-Styles" - ], - "install_type": "git-clone", - "description": "Nodes:Anime_Styler, Fantasy_Styler, Gothic_Styler, Line_Art_Styler, Movie_Poster_Styler, Punk_Styler, Travel_Poster_Styler. This extension offers 8 art style nodes, each of which includes approximately 50 individual style variations." - }, - { - "author": "city96", - "title": "ComfyUI_ColorMod", - "reference": "https://github.com/city96/ComfyUI_ColorMod", - "files": [ - "https://github.com/city96/ComfyUI_ColorMod" - ], - "install_type": "git-clone", - "description": "This extension currently has two sets of nodes - one set for editing the contrast/color of images and another set for saving images as 16 bit PNG files." - } + } ] } diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 27a38784..02d0f6a6 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -1472,10 +1472,14 @@ "tri3d-atr-parse-batch", "tri3d-extract-hand", "tri3d-extract-parts-batch", + "tri3d-extract-parts-batch2", "tri3d-extract-parts-mask-batch", "tri3d-fuzzification", + "tri3d-interaction-canny", "tri3d-position-hands", - "tri3d-position-parts-batch" + "tri3d-position-parts-batch", + "tri3d-skin-feathered-padded-mask", + "tri3d-swap-pixels" ], { "title_aux": "tri3d-comfyui-nodes" @@ -3049,6 +3053,7 @@ "ConditioningSetMaskAndCombine5", "CreateAudioMask", "CreateFadeMask", + "CreateFadeMaskAdvanced", "CreateFluidMask", "CreateGradientMask", "CreateMagicMask", From 8e8915f709b3fc4ba07c90ba8bc0ccdef1f490d4 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Wed, 22 Nov 2023 07:54:29 +0900 Subject: [PATCH 12/14] optimize: prestartup install script --- __init__.py | 2 +- prestartup_script.py | 64 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 15 deletions(-) diff --git a/__init__.py b/__init__.py index 095f7d23..ca71fc7b 100644 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ import concurrent import ssl from urllib.parse import urlparse -version = "V1.1.3" +version = "V1.2" print(f"### Loading: ComfyUI-Manager ({version})") diff --git a/prestartup_script.py b/prestartup_script.py index d5bfe941..942d7302 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -168,7 +168,7 @@ def check_bypass_ssl(): default_conf = config['default'] if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true': - print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification option is Enabled. (see ComfyUI-Manager/config.ini)") + print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)") ssl._create_default_https_context = ssl._create_unverified_context # SSL certificate error fix. except Exception: pass @@ -177,6 +177,37 @@ def check_bypass_ssl(): check_bypass_ssl() +# Perform install +processed_install = set() +script_list_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "startup-scripts", "install-scripts.txt") +pip_list = None + + +def get_installed_packages(): + global pip_list + + if pip_list is None: + try: + result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True) + pip_list = set([line.split()[0].lower() for line in result.split('\n') if line.strip()]) + except subprocess.CalledProcessError as e: + print(f"[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.") + return set() + + return pip_list + + +def is_installed(name): + name = name.strip() + pattern = r'([^<>!=]+)([<>!=]=?)' + match = re.search(pattern, name) + + if match: + name = match.group(1) + + return name.lower() in get_installed_packages() + + if os.path.exists(restore_snapshot_path): try: import json @@ -225,11 +256,12 @@ if os.path.exists(restore_snapshot_path): with open(requirements_path, 'r', encoding="UTF-8") as file: for line in file: package_name = line.strip() - if package_name: + if package_name and not is_installed(package_name): install_cmd = [sys.executable, "-m", "pip", "install", package_name] this_exit_code += process_wrap(install_cmd, repo_path) - if os.path.exists(install_script_path): + if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install: + processed_install.add(f'{repo_path}/install.py') install_cmd = [sys.executable, install_script_path] print(f">>> {install_cmd} / {repo_path}") this_exit_code += process_wrap(install_cmd, repo_path) @@ -253,26 +285,25 @@ if os.path.exists(restore_snapshot_path): os.remove(restore_snapshot_path) -# Perform install -script_list_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "startup-scripts", "install-scripts.txt") - - def execute_lazy_install_script(repo_path, executable): + global processed_install + install_script_path = os.path.join(repo_path, "install.py") requirements_path = os.path.join(repo_path, "requirements.txt") if os.path.exists(requirements_path): - print("Install: pip packages") + print(f"Install: pip packages for '{repo_path}'") with open(requirements_path, "r") as requirements_file: for line in requirements_file: package_name = line.strip() - if package_name: - install_cmd = [sys.executable, "-m", "pip", "install", package_name] + if package_name and not is_installed(package_name): + install_cmd = [executable, "-m", "pip", "install", package_name] process_wrap(install_cmd, repo_path) - if os.path.exists(install_script_path): - print(f"Install: install script") - install_cmd = [sys.executable, "install.py"] + if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install: + processed_install.add(f'{repo_path}/install.py') + print(f"Install: install script for '{repo_path}'") + install_cmd = [executable, "install.py"] process_wrap(install_cmd, repo_path) @@ -298,9 +329,12 @@ if os.path.exists(script_list_path): execute_lazy_install_script(script[0], script[2]) elif os.path.exists(script[0]): - print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}") + if 'pip' in script[1:] and 'install' in script[1:] and is_installed(script[-1]): + continue + print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}") print(f"\n## Execute install/(de)activation script for '{script[0]}'") + exit_code = process_wrap(script[1:], script[0]) if exit_code != 0: @@ -318,3 +352,5 @@ if os.path.exists(script_list_path): print("\n[ComfyUI-Manager] Startup script completed.") print("#######################################################################\n") +del processed_install +del pip_list \ No newline at end of file From 860f7d367e4f695c43d7f6f82ffcf0bf31c703d7 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Wed, 22 Nov 2023 19:02:22 +0900 Subject: [PATCH 13/14] fix: skip comment out package --- __init__.py | 2 +- prestartup_script.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index ca71fc7b..c024121a 100644 --- a/__init__.py +++ b/__init__.py @@ -14,7 +14,7 @@ import concurrent import ssl from urllib.parse import urlparse -version = "V1.2" +version = "V1.2.1" print(f"### Loading: ComfyUI-Manager ({version})") diff --git a/prestartup_script.py b/prestartup_script.py index 942d7302..94230b3d 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -199,6 +199,10 @@ def get_installed_packages(): def is_installed(name): name = name.strip() + + if name.startswith('#'): + return True + pattern = r'([^<>!=]+)([<>!=]=?)' match = re.search(pattern, name) From 79a2539088246e76232a7d99f72940b4b8d9cbaa Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Thu, 23 Nov 2023 00:28:43 +0900 Subject: [PATCH 14/14] update DB --- custom-node-list.json | 4 ++-- extension-node-map.json | 13 ++++++++++--- node_db/dev/custom-node-list.json | 10 ---------- node_db/new/custom-node-list.json | 12 +++++++++++- node_db/new/extension-node-map.json | 13 ++++++++++--- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/custom-node-list.json b/custom-node-list.json index b48c5f5d..750a8f6a 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -2756,7 +2756,7 @@ "https://github.com/drago87/ComfyUI_Dragos_Nodes" ], "install_type": "git-clone", - "description": "For now a single node that checks a folder and returns a padded string depending on the .png files in it. An exaple is you have a folder with 3 .png files in it and you have set the padding to 4 it will give you a string '0003'" + "description": "Nodes:File Padding, Image Info, VAE Loader With Name" }, { "author": "ansonkao", @@ -2776,7 +2776,7 @@ "https://github.com/Off-Live/ComfyUI-off-suite" ], "install_type": "copy", - "description": "Nodes:Image Crop Fit Node, OFF SEGS to Image, Crop Center wigh SEGS, GW Number Formatting Node." + "description": "Nodes:Image Crop Fit Node, OFF SEGS to Image, Crop Center wigh SEGS, Watermarking, GW Number Formatting Node." }, { "author": "Ser-Hilary", diff --git a/extension-node-map.json b/extension-node-map.json index 02d0f6a6..34b9d388 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -63,6 +63,7 @@ "\u2728 Shape Generator (jov)", "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", + "\ud83c\udf69 GLSL (jov)", "\ud83c\udf87 Extend (jov)", "\ud83d\udcc9 Threshold (jov)", "\ud83d\udcf7 WebCam (jov)", @@ -497,7 +498,8 @@ "Add Noise to Image with Mask", "Color correction", "Displace Image with Depth", - "Displace Images with Mask" + "Displace Images with Mask", + "Zoom Image with Depth" ], { "title_aux": "ComfyUI Fictiverse Nodes" @@ -574,6 +576,7 @@ ], "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ [ + "Get From Danbooru", "Simple Wildcards", "Simple Wildcards (Dir.)", "Wildcards" @@ -1427,11 +1430,13 @@ "https://github.com/THtianhao/ComfyUI-FaceChain": [ [ "FCStyleLoraLoad", + "FC_CropAndPaste", "FC_CropBottom", + "FC_CropFace", "FC_CropMask", - "FC_FCCropFace", "FC_FaceDetection", "FC_FaceFusion", + "FC_MaskOP", "FC_ReplaceImage", "FC_Segment", "FC_StyleLoraLoad" @@ -2685,7 +2690,9 @@ ], "https://github.com/drago87/ComfyUI_Dragos_Nodes": [ [ - "file_padding" + "file_padding", + "image_info", + "vae_loader" ], { "title_aux": "ComfyUI_Dragos_Nodes" diff --git a/node_db/dev/custom-node-list.json b/node_db/dev/custom-node-list.json index 8933a6cc..818d70d9 100644 --- a/node_db/dev/custom-node-list.json +++ b/node_db/dev/custom-node-list.json @@ -1,15 +1,5 @@ { "custom_nodes": [ - { - "author": "drago87", - "title": "ComfyUI_Dragos_Nodes", - "reference": "https://github.com/drago87/ComfyUI_Dragos_Nodes", - "files": [ - "https://github.com/drago87/ComfyUI_Dragos_Nodes" - ], - "install_type": "git-clone", - "description": "For now a single node that checks a folder and returns a padded string depending on the .png files in it. An exaple is you have a folder with 3 .png files in it and you have set the padding to 4 it will give you a string '0003'" - }, { "author": "oyvindg", "title": "ComfyUI-TrollSuite", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index cf5dca3f..cc861ce5 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -1,5 +1,15 @@ { "custom_nodes": [ + { + "author": "drago87", + "title": "ComfyUI_Dragos_Nodes", + "reference": "https://github.com/drago87/ComfyUI_Dragos_Nodes", + "files": [ + "https://github.com/drago87/ComfyUI_Dragos_Nodes" + ], + "install_type": "git-clone", + "description": "Nodes:File Padding, Image Info, VAE Loader With Name" + }, { "author": "ansonkao", "title": "comfyui-geometry", @@ -209,7 +219,7 @@ "https://github.com/Off-Live/ComfyUI-off-suite" ], "install_type": "copy", - "description": "Nodes:Image Crop Fit Node, OFF SEGS to Image, Crop Center wigh SEGS, GW Number Formatting Node." + "description": "Nodes:Image Crop Fit Node, OFF SEGS to Image, Crop Center wigh SEGS, Watermarking, GW Number Formatting Node." }, { "author": "laksjdjf", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index 02d0f6a6..34b9d388 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -63,6 +63,7 @@ "\u2728 Shape Generator (jov)", "\ud83c\udf08 HSV (jov)", "\ud83c\udf31 Transform (jov)", + "\ud83c\udf69 GLSL (jov)", "\ud83c\udf87 Extend (jov)", "\ud83d\udcc9 Threshold (jov)", "\ud83d\udcf7 WebCam (jov)", @@ -497,7 +498,8 @@ "Add Noise to Image with Mask", "Color correction", "Displace Image with Depth", - "Displace Images with Mask" + "Displace Images with Mask", + "Zoom Image with Depth" ], { "title_aux": "ComfyUI Fictiverse Nodes" @@ -574,6 +576,7 @@ ], "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ [ + "Get From Danbooru", "Simple Wildcards", "Simple Wildcards (Dir.)", "Wildcards" @@ -1427,11 +1430,13 @@ "https://github.com/THtianhao/ComfyUI-FaceChain": [ [ "FCStyleLoraLoad", + "FC_CropAndPaste", "FC_CropBottom", + "FC_CropFace", "FC_CropMask", - "FC_FCCropFace", "FC_FaceDetection", "FC_FaceFusion", + "FC_MaskOP", "FC_ReplaceImage", "FC_Segment", "FC_StyleLoraLoad" @@ -2685,7 +2690,9 @@ ], "https://github.com/drago87/ComfyUI_Dragos_Nodes": [ [ - "file_padding" + "file_padding", + "image_info", + "vae_loader" ], { "title_aux": "ComfyUI_Dragos_Nodes"