Merge branch 'main' into feat/component-manager

10 months ago · b4a2c52d39
7 changed files with 139 additions and 39 deletions
--- a/custom-node-list.json
+++ b/custom-node-list.json
@ -4415,14 +4415,14 @@
            "description": "Ranbooru is an extension for the comfyUI. The purpose of this extension is to add a node that gets a random set of tags from boorus pictures. This is mostly being used to help me test my checkpoints on a large variety of"
        },
        {
-            "author": "Miosp",
+            "author": "miosp",
            "title": "ComfyUI-FBCNN",
            "reference": "https://github.com/Miosp/ComfyUI-FBCNN",
            "files": [
                "https://github.com/Miosp/ComfyUI-FBCNN"
            ],
            "install_type": "git-clone",
-            "description": "ComfyUI implementation of [a/FBCNN](https://github.com/jiaxi-jiang/FBCNN). This is a JPEG artifact/compression removal tool, which can work automatically or with the help of a user."
+            "description": "A node for JPEG de-artifacting using [a/FBCNN](https://github.com/jiaxi-jiang/FBCNN)."
        },
        {
            "author": "JcandZero",
@ -4434,6 +4434,17 @@
            "install_type": "git-clone",
            "description": "GLM4 Vision Integration"
        },
+        {
+            "author": "darkpixel",
+            "title": "DarkPrompts",
+            "reference": "https://github.com/darkpixel/darkprompts",
+            "files": [
+                "https://github.com/darkpixel/darkprompts"
+            ],
+            "install_type": "git-clone",
+            "description": "Slightly better random prompt generation tools that allow combining and picking prompts from both file and text input sources."
+        },
+



--- a/extension-node-map.json
+++ b/extension-node-map.json
@ -270,6 +270,7 @@
    ],
    "https://github.com/BennyKok/comfyui-deploy": [
        [
+            "ComfyUIDeployExternalCheckpoints",
            "ComfyUIDeployExternalImage",
            "ComfyUIDeployExternalImageAlpha",
            "ComfyUIDeployExternalLora",
@ -978,7 +979,8 @@
    ],
    "https://github.com/JaredTherriault/ComfyUI-JNodes": [
        [
-            "JNodes_AddOrSetPngInfoKey",
+            "JNodes_AddOrSetMetaDataKey",
+            "JNodes_AnyToString",
            "JNodes_AppendReversedFrames",
            "JNodes_BooleanSelectorWithString",
            "JNodes_CheckpointSelectorWithString",
@ -996,8 +998,8 @@
            "JNodes_ParseWildcards",
            "JNodes_PromptBuilderSingleSubject",
            "JNodes_PromptEditor",
+            "JNodes_RemoveMetaDataKey",
            "JNodes_RemoveParseableDataForInference",
-            "JNodes_RemovePngInfoKey",
            "JNodes_SamplerSelectorWithString",
            "JNodes_SaveImageWithOutput",
            "JNodes_SaveVideo",
@ -1555,7 +1557,9 @@
            "Image Crop Fit",
            "Image Resize Fit",
            "OFF SEGS to Image",
+            "Paste Face Segment to Image",
            "Query Gender and Age",
+            "SEGS to Face Crop Data",
            "Safe Mask to Image",
            "VAE Encode For Inpaint V2",
            "Watermarking"
@ -3410,7 +3414,8 @@
    "https://github.com/brianfitzgerald/style_aligned_comfy": [
        [
            "StyleAlignedBatchAlign",
-            "StyleAlignedReferenceSampler"
+            "StyleAlignedReferenceSampler",
+            "StyleAlignedSampleReferenceLatents"
        ],
        {
            "title_aux": "StyleAligned for ComfyUI"
@ -3593,15 +3598,18 @@
    ],
    "https://github.com/chflame163/ComfyUI_LayerStyle": [
        [
-            "LayerStyle_ColorPicker",
-            "LayerStyle_DropShadow",
+            "LayerFilter: MotionBlur",
+            "LayerMask: MaskInvert",
+            "LayerMask: MaskPreview",
+            "LayerStyle: DropShadow",
+            "LayerStyle: InnerGlow",
+            "LayerStyle: InnerShadow",
+            "LayerStyle: OuterGlow",
+            "LayerStyle: Stroke",
            "LayerStyle_Illumine",
-            "LayerStyle_ImageBlend",
-            "LayerStyle_ImageOpacity",
-            "LayerStyle_MaskInvert",
-            "LayerStyle_MaskPreview",
-            "LayerStyle_OuterGlow",
-            "LayerStyle_Stroke"
+            "LayerUtility: ColorPicker",
+            "LayerUtility: ImageBlend",
+            "LayerUtility: ImageOpacity"
        ],
        {
            "title_aux": "ComfyUI Layer Style"
@ -4043,11 +4051,11 @@
    "https://github.com/daniel-lewis-ab/ComfyUI-Llama": [
        [
            "Call LLM",
-            "LLM_Create_Embedding",
+            "Call LLM Advanced",
+            "LLM_Create_Completion",
            "LLM_Detokenize",
            "LLM_Embed",
            "LLM_Eval",
-            "LLM_Generate",
            "LLM_Load_State",
            "LLM_Reset",
            "LLM_Sample",
@ -4062,6 +4070,15 @@
            "title_aux": "ComfyUI-Llama"
        }
    ],
+    "https://github.com/darkpixel/darkprompts": [
+        [
+            "DarkCombine",
+            "DarkPrompt"
+        ],
+        {
+            "title_aux": "DarkPrompts"
+        }
+    ],
    "https://github.com/dave-palt/comfyui_DSP_imagehelpers": [
        [
            "dsp-imagehelpers-concat"
@ -6095,6 +6112,7 @@
            "GamePal",
            "GetImageSize_",
            "GradientImage",
+            "GridOutput",
            "ImageColorTransfer",
            "ImageCropByAlpha",
            "IntNumber",
@ -6120,6 +6138,7 @@
            "SmoothMask",
            "SpeechRecognition",
            "SpeechSynthesis",
+            "SplitImage",
            "SplitLongMask",
            "SvgImage",
            "SwitchByIndex",
@ -6586,8 +6605,10 @@
    ],
    "https://github.com/talesofai/comfyui-browser": [
        [
+            "DifyTextGenerator //Browser",
            "LoadImageByUrl //Browser",
            "SelectInputs //Browser",
+            "UploadToRemote //Browser",
            "XyzPlot //Browser"
        ],
        {
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@ -136,14 +136,24 @@ docStyle.innerHTML = `
 }

 .cm-notice-board {
-	width: 310px;
-	padding: 0px !important;
-	height: 260px;
+	width: 290px;
+	height: 230px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
-	padding: 10px;
+	padding: 5px 10px;
 	overflow-x: hidden;
+	box-sizing: content-box;
+}
+
+.cm-notice-board > ul {
+    display: block;
+    list-style-type: disc;
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+    margin-inline-start: 0px;
+    margin-inline-end: 0px;
+    padding-inline-start: 40px;
 }

 .cm-conflicted-nodes-text {
@ -251,6 +261,7 @@ const style = `
 	border-radius: 5px;
 	text-align: center;
 	transform: translateX(-50%);
+	display: block;
 }

 .cm-menu-combo {
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@ -9,6 +9,16 @@
            "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": "shiimizu",
+            "title": "shiimizu/ComfyUI PhotoMaker",
+            "reference": "https://github.com/shiimizu/ComfyUI-PhotoMaker",
+            "files": [
+                "https://github.com/shiimizu/ComfyUI-PhotoMaker"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI reference implementation for [a/PhotoMaker](https://github.com/TencentARC/PhotoMaker) models. [w/WARN:Currently, it is not distinguishable because it shares the same repository name as https://github.com/ZHO-ZHO-ZHO/ComfyUI-PhotoMaker]"
+        },
        {
            "author": "prismwastaken",
            "title": "prism-tools",
@ -31,13 +41,13 @@
        },
        {
            "author": "ZHO-ZHO-ZHO",
-            "title": "ComfyUI PhotoMaker (WIP)",
+            "title": "ZHO-ZHO-ZHO/ComfyUI PhotoMaker (WIP)",
            "reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-PhotoMaker",
            "files": [
                "https://github.com/ZHO-ZHO-ZHO/ComfyUI-PhotoMaker"
            ],
            "install_type": "git-clone",
-            "description": "Unofficial implementation of [a/PhotoMaker](https://github.com/TencentARC/PhotoMaker) for ComfyUI（WIP） Testing……"
+            "description": "Unofficial implementation of [a/PhotoMaker](https://github.com/TencentARC/PhotoMaker) for ComfyUI（WIP） Testing……\n[w/WARN:Currently, it is not distinguishable because it shares the same repository name as https://github.com/shiimizu/ComfyUI-PhotoMaker]"
        },
        {
            "author": "poisenbery",
--- a/node_db/dev/extension-node-map.json
+++ b/node_db/dev/extension-node-map.json
@ -124,11 +124,18 @@
    ],
    "https://github.com/ZHO-ZHO-ZHO/ComfyUI-PhotoMaker": [
        [
-            "PhotoMaker_Batch_Zho",
-            "PhotoMaker_Zho"
+            "BaseModel_Loader_fromhub",
+            "BaseModel_Loader_local",
+            "LoRALoader",
+            "NEW_PhotoMaker_Generation",
+            "PhotoMakerAdapter_Loader_fromhub",
+            "PhotoMakerAdapter_Loader_local",
+            "PhotoMaker_Generation",
+            "Prompt_Styler",
+            "Ref_Image_Preprocessing"
        ],
        {
-            "title_aux": "ComfyUI PhotoMaker (WIP)"
+            "title_aux": "ZHO-ZHO-ZHO/ComfyUI PhotoMaker (WIP)"
        }
    ],
    "https://github.com/alt-key-project/comfyui-dream-video-batches": [
@ -246,6 +253,7 @@
            "ImageCrop",
            "ImageInvert",
            "ImageOnlyCheckpointLoader",
+            "ImageOnlyCheckpointSave",
            "ImagePadForOutpaint",
            "ImageQuantize",
            "ImageScale",
@ -649,6 +657,14 @@
            "title_aux": "NudeNet-Detector-Provider [WIP]"
        }
    ],
+    "https://github.com/prismwastaken/comfyui-tools": [
+        [
+            "Prism-RandomNormal"
+        ],
+        {
+            "title_aux": "prism-tools"
+        }
+    ],
    "https://github.com/solarpush/comfyui_sendimage_node": [
        [
            "Send_To_Pod"
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
@ -11,6 +11,16 @@
        

        
+        {
+            "author": "darkpixel",
+            "title": "DarkPrompts",
+            "reference": "https://github.com/darkpixel/darkprompts",
+            "files": [
+                "https://github.com/darkpixel/darkprompts"
+            ],
+            "install_type": "git-clone",
+            "description": "Slightly better random prompt generation tools that allow combining and picking prompts from both file and text input sources."
+        },
        {
            "author": "Taremin",
            "title": "WebUI Monaco Prompt",
@ -32,14 +42,14 @@
            "description": "GLM4 Vision Integration"
        },
        {
-            "author": "Miosp",
+            "author": "miosp",
            "title": "ComfyUI-FBCNN",
            "reference": "https://github.com/Miosp/ComfyUI-FBCNN",
            "files": [
                "https://github.com/Miosp/ComfyUI-FBCNN"
            ],
            "install_type": "git-clone",
-            "description": "ComfyUI implementation of [a/FBCNN](https://github.com/jiaxi-jiang/FBCNN). This is a JPEG artifact/compression removal tool, which can work automatically or with the help of a user."
+            "description": "A node for JPEG de-artifacting using [a/FBCNN](https://github.com/jiaxi-jiang/FBCNN)."
        },
        {
            "author": "chaojie",
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
@ -270,6 +270,7 @@
    ],
    "https://github.com/BennyKok/comfyui-deploy": [
        [
+            "ComfyUIDeployExternalCheckpoints",
            "ComfyUIDeployExternalImage",
            "ComfyUIDeployExternalImageAlpha",
            "ComfyUIDeployExternalLora",
@ -978,7 +979,8 @@
    ],
    "https://github.com/JaredTherriault/ComfyUI-JNodes": [
        [
-            "JNodes_AddOrSetPngInfoKey",
+            "JNodes_AddOrSetMetaDataKey",
+            "JNodes_AnyToString",
            "JNodes_AppendReversedFrames",
            "JNodes_BooleanSelectorWithString",
            "JNodes_CheckpointSelectorWithString",
@ -996,8 +998,8 @@
            "JNodes_ParseWildcards",
            "JNodes_PromptBuilderSingleSubject",
            "JNodes_PromptEditor",
+            "JNodes_RemoveMetaDataKey",
            "JNodes_RemoveParseableDataForInference",
-            "JNodes_RemovePngInfoKey",
            "JNodes_SamplerSelectorWithString",
            "JNodes_SaveImageWithOutput",
            "JNodes_SaveVideo",
@ -1555,7 +1557,9 @@
            "Image Crop Fit",
            "Image Resize Fit",
            "OFF SEGS to Image",
+            "Paste Face Segment to Image",
            "Query Gender and Age",
+            "SEGS to Face Crop Data",
            "Safe Mask to Image",
            "VAE Encode For Inpaint V2",
            "Watermarking"
@ -3410,7 +3414,8 @@
    "https://github.com/brianfitzgerald/style_aligned_comfy": [
        [
            "StyleAlignedBatchAlign",
-            "StyleAlignedReferenceSampler"
+            "StyleAlignedReferenceSampler",
+            "StyleAlignedSampleReferenceLatents"
        ],
        {
            "title_aux": "StyleAligned for ComfyUI"
@ -3593,15 +3598,18 @@
    ],
    "https://github.com/chflame163/ComfyUI_LayerStyle": [
        [
-            "LayerStyle_ColorPicker",
-            "LayerStyle_DropShadow",
+            "LayerFilter: MotionBlur",
+            "LayerMask: MaskInvert",
+            "LayerMask: MaskPreview",
+            "LayerStyle: DropShadow",
+            "LayerStyle: InnerGlow",
+            "LayerStyle: InnerShadow",
+            "LayerStyle: OuterGlow",
+            "LayerStyle: Stroke",
            "LayerStyle_Illumine",
-            "LayerStyle_ImageBlend",
-            "LayerStyle_ImageOpacity",
-            "LayerStyle_MaskInvert",
-            "LayerStyle_MaskPreview",
-            "LayerStyle_OuterGlow",
-            "LayerStyle_Stroke"
+            "LayerUtility: ColorPicker",
+            "LayerUtility: ImageBlend",
+            "LayerUtility: ImageOpacity"
        ],
        {
            "title_aux": "ComfyUI Layer Style"
@ -4043,11 +4051,11 @@
    "https://github.com/daniel-lewis-ab/ComfyUI-Llama": [
        [
            "Call LLM",
-            "LLM_Create_Embedding",
+            "Call LLM Advanced",
+            "LLM_Create_Completion",
            "LLM_Detokenize",
            "LLM_Embed",
            "LLM_Eval",
-            "LLM_Generate",
            "LLM_Load_State",
            "LLM_Reset",
            "LLM_Sample",
@ -4062,6 +4070,15 @@
            "title_aux": "ComfyUI-Llama"
        }
    ],
+    "https://github.com/darkpixel/darkprompts": [
+        [
+            "DarkCombine",
+            "DarkPrompt"
+        ],
+        {
+            "title_aux": "DarkPrompts"
+        }
+    ],
    "https://github.com/dave-palt/comfyui_DSP_imagehelpers": [
        [
            "dsp-imagehelpers-concat"
@ -6095,6 +6112,7 @@
            "GamePal",
            "GetImageSize_",
            "GradientImage",
+            "GridOutput",
            "ImageColorTransfer",
            "ImageCropByAlpha",
            "IntNumber",
@ -6120,6 +6138,7 @@
            "SmoothMask",
            "SpeechRecognition",
            "SpeechSynthesis",
+            "SplitImage",
            "SplitLongMask",
            "SvgImage",
            "SwitchByIndex",
@ -6586,8 +6605,10 @@
    ],
    "https://github.com/talesofai/comfyui-browser": [
        [
+            "DifyTextGenerator //Browser",
            "LoadImageByUrl //Browser",
            "SelectInputs //Browser",
+            "UploadToRemote //Browser",
            "XyzPlot //Browser"
        ],
        {