Compare commits

..

2 Commits

Author SHA1 Message Date
Dr.Lt.Data
338d7abfa8 more detailed message 2025-03-03 01:04:39 +09:00
Dr.Lt.Data
f8e5f5bcbb print dbg message 2025-02-14 07:36:02 +09:00
20 changed files with 3382 additions and 3498 deletions

View File

@@ -3,6 +3,8 @@ import sys
cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode') cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
print("[DBG] point14")
if not os.path.exists(cli_mode_flag): if not os.path.exists(cli_mode_flag):
sys.path.append(os.path.join(os.path.dirname(__file__), "glob")) sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
import manager_server # noqa: F401 import manager_server # noqa: F401

View File

@@ -31,7 +31,8 @@ if comfy_path is None:
except: except:
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr) print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..')) comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
sys.path.append(comfy_path)
sys.path.append(comfy_path)
import utils.extra_config import utils.extra_config
import cm_global import cm_global
@@ -1020,17 +1021,7 @@ def save_snapshot(
] = True, ] = True,
): ):
cmd_ctx.set_user_directory(user_directory) cmd_ctx.set_user_directory(user_directory)
path = core.save_snapshot_with_postfix('snapshot', output, not full_snapshot)
if(not output.endswith('.json') and not output.endswith('.yaml')):
print("ERROR: output path should be either '.json' or '.yaml' file.")
raise typer.Exit(code=1)
dir_path = os.path.dirname(output)
if(dir_path != '' and not os.path.exists(dir_path)):
print(f"ERROR: {output} path not exists.")
raise typer.Exit(code=1)
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
print(f"Current snapshot is saved as `{path}`") print(f"Current snapshot is saved as `{path}`")

View File

@@ -3748,6 +3748,17 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "Nodes: Noxin Complete Chime, Noxin Scaled Resolutions, Load from Noxin Prompt Library, Save to Noxin Prompt Library" "description": "Nodes: Noxin Complete Chime, Noxin Scaled Resolutions, Load from Noxin Prompt Library, Save to Noxin Prompt Library"
}, },
{
"author": "apesplat",
"title": "ezXY scripts and nodes",
"id": "ezxy",
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
"files": [
"https://github.com/GMapeSplat/ComfyUI_ezXY"
],
"install_type": "git-clone",
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
},
{ {
"author": "kinfolk0117", "author": "kinfolk0117",
"title": "SimpleTiles", "title": "SimpleTiles",
@@ -8734,7 +8745,7 @@
"https://github.com/olduvai-jp/ComfyUI-HfLoader" "https://github.com/olduvai-jp/ComfyUI-HfLoader"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "A simple and easy to use Hugging Face model loader." "description": "Nodes:Lora Loader From HF"
}, },
{ {
"author": "AiMiDi", "author": "AiMiDi",
@@ -13326,16 +13337,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "This node for ComfyUI allows saving images with an optional alpha channel (transparency). It supports saving images in formats like PNG, JPEG, and WebP." "description": "This node for ComfyUI allows saving images with an optional alpha channel (transparency). It supports saving images in formats like PNG, JPEG, and WebP."
}, },
{
"author": "APZmedia",
"title": "APZmedia Together Image Generator for ComfyUI",
"reference": "https://github.com/APZmedia/APZmedia-comfy-together-lora",
"files": [
"https://github.com/APZmedia/APZmedia-comfy-together-lora"
],
"install_type": "git-clone",
"description": "A ComfyUI node to implement Together AI API image generation"
},
{ {
"author": "N3rd00d", "author": "N3rd00d",
"title": "ComfyUI-Paint3D-Nodes", "title": "ComfyUI-Paint3D-Nodes",
@@ -13894,16 +13895,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "This node provides advanced text-to-speech functionality powered by KokoroTTS. Follow the instructions below to install, configure, and use the node within your portable ComfyUI installation." "description": "This node provides advanced text-to-speech functionality powered by KokoroTTS. Follow the instructions below to install, configure, and use the node within your portable ComfyUI installation."
}, },
{
"author": "MushroomFleet",
"title": "DJZ-Pedalboard",
"reference": "https://github.com/MushroomFleet/DJZ-Pedalboard",
"files": [
"https://github.com/MushroomFleet/DJZ-Pedalboard"
],
"install_type": "git-clone",
"description": "This project provides a collection of custom nodes designed for enhanced audio effects in ComfyUI. With an intuitive pedalboard interface, users can easily integrate and manipulate various audio effects within their workflows."
},
{ {
"author": "var1ableX", "author": "var1ableX",
"title": "ComfyUI_Accessories", "title": "ComfyUI_Accessories",
@@ -14202,6 +14193,17 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "multiline text node that strips c-style comments (i.e.'//' and '/* ... */') before passing output string downstream" "description": "multiline text node that strips c-style comments (i.e.'//' and '/* ... */') before passing output string downstream"
}, },
{
"author": "noarche",
"title": "noarche/Color Enhance",
"id": "color-enhance",
"reference": "https://github.com/noarche/sd-webui-color-enhance",
"files": [
"https://github.com/noarche/sd-webui-color-enhance"
],
"install_type": "git-clone",
"description": "Script for [a/AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui) and node for ComfyUI to enhance colors.\nThis is the same algorithm GIMP/GEGL uses for color enhancement. The gist of this implementation is that it converts the color space to [CIELCh(ab) and normalizes the chroma (or '[a/colorfulness](https://en.wikipedia.org/wiki/Colorfulness)') component. Original source can be found in the link below."
},
{ {
"author": "emojiiii", "author": "emojiiii",
"title": "ComfyUI_Emojiiii_Custom_Nodes", "title": "ComfyUI_Emojiiii_Custom_Nodes",
@@ -16442,16 +16444,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "preprocessing images, presented in a visual way. It also calculates the corresponding image area." "description": "preprocessing images, presented in a visual way. It also calculates the corresponding image area."
}, },
{
"author": "SSsnap",
"title": "ComfyUI-LBW_flux",
"reference": "https://github.com/SS-snap/ComfyUI-LBW_flux",
"files": [
"https://github.com/SS-snap/ComfyUI-LBW_flux"
],
"install_type": "git-clone",
"description": "Through this node, you can more easily test the impact of different blocks in flux_lora on the final result."
},
{ {
"author": "RiceRound", "author": "RiceRound",
"title": "ComfyUI Compression and Encryption Node", "title": "ComfyUI Compression and Encryption Node",
@@ -20441,6 +20433,16 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "ComfyUI-SendToDiscord is a custom node for ComfyUI that simplifies sending preview images to Discord via webhooks. It supports both single-image uploads and batch mode, making it an efficient tool for sharing your generated images directly with your Discord server." "description": "ComfyUI-SendToDiscord is a custom node for ComfyUI that simplifies sending preview images to Discord via webhooks. It supports both single-image uploads and batch mode, making it an efficient tool for sharing your generated images directly with your Discord server."
}, },
{
"author": "gmorks",
"title": "ComfyUI Animagine prompt",
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
"files": [
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
],
"install_type": "git-clone",
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model"
},
{ {
"author": "jinanlongen", "author": "jinanlongen",
"title": "ComfyUI Prompt Expander Node", "title": "ComfyUI Prompt Expander Node",
@@ -20821,13 +20823,13 @@
}, },
{ {
"author": "mie", "author": "mie",
"title": "ComfyUI_CaptionThis", "title": "ComfyUI_JanusProCaption",
"reference": "https://github.com/MieMieeeee/ComfyUI-CaptionThis", "reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
"files": [ "files": [
"https://github.com/MieMieeeee/ComfyUI-CaptionThis" "https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "Describe a single image or all images in a directory using models such as Janus Pro, Florence2 (coming soon), or JoyCaption (coming soon), with a particular focus on building datasets for training LoRA." "description": "Describe image or create caption files using Janus Pro Model"
}, },
{ {
"author": "lum3on", "author": "lum3on",
@@ -20880,27 +20882,123 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "A comprehensive node package that seamlessly integrates all BiRefNet series models into ComfyUI" "description": "A comprehensive node package that seamlessly integrates all BiRefNet series models into ComfyUI"
}, },
{
"author": "wirytiox",
"title": "ComfyUI-SelectStringFromListWithIndex",
"id": "ComfyUI-SelectStringFromListWithIndex",
"reference": "https://github.com/wirytiox/ComfyUI-SelectStringFromListWithIndex",
"files": [
"https://github.com/wirytiox/ComfyUI-SelectStringFromListWithIndex"
],
"install_type": "git-clone",
"description": "This node is a node made by GMapeSplat/ComfyUI_ezXY that i copied while his node doesn't work"
},
{
"author": "thanhduong0213929",
"title": "ComfyUI-DeepUnlock",
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
"files": [
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
],
"install_type": "git-clone",
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
},

View File

@@ -1114,15 +1114,6 @@
"title_aux": "ComfyUI_yanc" "title_aux": "ComfyUI_yanc"
} }
], ],
"https://github.com/APZmedia/APZmedia-comfy-together-lora": [
[
"TogetherImageGenerator",
"TogetherImageGeneratorLoRA"
],
{
"title_aux": "APZmedia Together Image Generator for ComfyUI"
}
],
"https://github.com/APZmedia/APZmedia-comfyui-fast-image-save": [ "https://github.com/APZmedia/APZmedia-comfyui-fast-image-save": [
[ [
"APZmedia Fast image save" "APZmedia Fast image save"
@@ -1916,7 +1907,6 @@
"ComfyUIDeployExternalAudio", "ComfyUIDeployExternalAudio",
"ComfyUIDeployExternalBoolean", "ComfyUIDeployExternalBoolean",
"ComfyUIDeployExternalCheckpoint", "ComfyUIDeployExternalCheckpoint",
"ComfyUIDeployExternalEXR",
"ComfyUIDeployExternalFaceModel", "ComfyUIDeployExternalFaceModel",
"ComfyUIDeployExternalImage", "ComfyUIDeployExternalImage",
"ComfyUIDeployExternalImageAlpha", "ComfyUIDeployExternalImageAlpha",
@@ -3932,6 +3922,27 @@
"title_aux": "ComfyUI-Counternodes" "title_aux": "ComfyUI-Counternodes"
} }
], ],
"https://github.com/GMapeSplat/ComfyUI_ezXY": [
[
"ConcatenateString",
"ItemFromDropdown",
"IterationDriver",
"JoinImages",
"LineToConsole",
"NumberFromList",
"NumbersToList",
"PlotImages",
"StringFromList",
"StringToLabel",
"StringsToList",
"ezMath",
"ezXY_AssemblePlot",
"ezXY_Driver"
],
{
"title_aux": "ezXY scripts and nodes"
}
],
"https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [
[ [
"Danbooru (ID)", "Danbooru (ID)",
@@ -6446,7 +6457,6 @@
"BlackBarsV1", "BlackBarsV1",
"BlackBarsV2", "BlackBarsV2",
"BlackBarsV3", "BlackBarsV3",
"BracketCleaner",
"CRT_Effect_v1", "CRT_Effect_v1",
"CathodeRayEffect", "CathodeRayEffect",
"ClassicFilmEffect", "ClassicFilmEffect",
@@ -6499,7 +6509,6 @@
"ParametricMeshGenV2", "ParametricMeshGenV2",
"ProjectFilePathNode", "ProjectFilePathNode",
"PromptCleaner", "PromptCleaner",
"PromptCleanerV2",
"PromptDupeRemover", "PromptDupeRemover",
"PromptDupeRemoverV2", "PromptDupeRemoverV2",
"PromptInject", "PromptInject",
@@ -6541,13 +6550,10 @@
"VideoTrails", "VideoTrails",
"VideoTrailsV2", "VideoTrailsV2",
"VideoVignettingV1", "VideoVignettingV1",
"VoiceEffects",
"VoiceEffects2",
"WaveletCompose", "WaveletCompose",
"WaveletDecompose", "WaveletDecompose",
"WinampViz", "WinampViz",
"WinampVizV2", "WinampVizV2",
"ZenkaiPoseMap",
"ZenkaiPrompt", "ZenkaiPrompt",
"ZenkaiPromptV2", "ZenkaiPromptV2",
"ZenkaiPromptV3", "ZenkaiPromptV3",
@@ -6560,14 +6566,6 @@
"title_aux": "DJZ-Nodes" "title_aux": "DJZ-Nodes"
} }
], ],
"https://github.com/MushroomFleet/DJZ-Pedalboard": [
[
"DJZ_Pedalboard"
],
{
"title_aux": "DJZ-Pedalboard"
}
],
"https://github.com/MuziekMagie/ComfyUI-Matchering": [ "https://github.com/MuziekMagie/ComfyUI-Matchering": [
[ [
"Matchering", "Matchering",
@@ -6968,7 +6966,6 @@
"SUPIR Sampler \ud83d\udcacED", "SUPIR Sampler \ud83d\udcacED",
"Save Image \ud83d\udd14ED", "Save Image \ud83d\udd14ED",
"Simple Text \ud83d\udcacED", "Simple Text \ud83d\udcacED",
"TIPO Script \ud83d\udcacED",
"Ultimate SD Upscale \ud83d\udcacED", "Ultimate SD Upscale \ud83d\udcacED",
"Wildcard Encode \ud83d\udcacED" "Wildcard Encode \ud83d\udcacED"
], ],
@@ -7562,14 +7559,6 @@
"title_aux": "ComfyUI-LexTools" "title_aux": "ComfyUI-LexTools"
} }
], ],
"https://github.com/SS-snap/ComfyUI-LBW_flux": [
[
"LoraBlockWeight_Flux"
],
{
"title_aux": "ComfyUI-LBW_flux"
}
],
"https://github.com/SS-snap/ComfyUI-Snap_Processing": [ "https://github.com/SS-snap/ComfyUI-Snap_Processing": [
[ [
"AreaCalculator", "AreaCalculator",
@@ -10324,7 +10313,6 @@
"ConvertRasterToVectorBW", "ConvertRasterToVectorBW",
"ConvertRasterToVectorColor", "ConvertRasterToVectorColor",
"ConvertVectorToRaster", "ConvertVectorToRaster",
"SVGPreview",
"SaveSVG" "SaveSVG"
], ],
{ {
@@ -11367,7 +11355,6 @@
"Noise from Palette [Dream]", "Noise from Palette [Dream]",
"Palette Color Align [Dream]", "Palette Color Align [Dream]",
"Palette Color Shift [Dream]", "Palette Color Shift [Dream]",
"Random Prompt Words [Dream]",
"Sample Image Area as Palette [Dream]", "Sample Image Area as Palette [Dream]",
"Sample Image as Palette [Dream]", "Sample Image as Palette [Dream]",
"Saw Curve [Dream]", "Saw Curve [Dream]",
@@ -11483,7 +11470,6 @@
"https://github.com/arcum42/ComfyUI_SageUtils": [ "https://github.com/arcum42/ComfyUI_SageUtils": [
[ [
"Sage_AdvSamplerInfo", "Sage_AdvSamplerInfo",
"Sage_CLIPTextEncodeLumina2",
"Sage_CacheMaintenance", "Sage_CacheMaintenance",
"Sage_CheckpointLoaderRecent", "Sage_CheckpointLoaderRecent",
"Sage_CheckpointLoaderSimple", "Sage_CheckpointLoaderSimple",
@@ -11495,7 +11481,6 @@
"Sage_ConstructMetadata", "Sage_ConstructMetadata",
"Sage_ConstructMetadataLite", "Sage_ConstructMetadataLite",
"Sage_DualCLIPTextEncode", "Sage_DualCLIPTextEncode",
"Sage_DualCLIPTextEncodeLumina2",
"Sage_EmptyLatentImagePassthrough", "Sage_EmptyLatentImagePassthrough",
"Sage_GetFileHash", "Sage_GetFileHash",
"Sage_JoinText", "Sage_JoinText",
@@ -11663,11 +11648,10 @@
], ],
"https://github.com/austinbrown34/ComfyUI-IO-Helpers": [ "https://github.com/austinbrown34/ComfyUI-IO-Helpers": [
[ [
"EncodedPromptFromFile", "Encoded Prompt from File",
"EncodedPromptToFile", "Encoded Prompt to File",
"IO_LoadImage", "Sampled Latents from File",
"SampledLatentsFromFile", "Sampled Latents to File"
"SampledLatentsToFile"
], ],
{ {
"title_aux": "ComfyUI-IO-Helpers" "title_aux": "ComfyUI-IO-Helpers"
@@ -11825,7 +11809,6 @@
"SP_HiresGen_HiresCfg", "SP_HiresGen_HiresCfg",
"SP_HiresGen_Sharpen", "SP_HiresGen_Sharpen",
"SP_HunyuanLoader", "SP_HunyuanLoader",
"SP_ImpactSwitchCombo",
"SP_KSampler", "SP_KSampler",
"SP_KSamplerSelect", "SP_KSamplerSelect",
"SP_KoboldCpp", "SP_KoboldCpp",
@@ -14145,7 +14128,6 @@
"Mahiro", "Mahiro",
"MaskComposite", "MaskComposite",
"MaskToImage", "MaskToImage",
"ModelComputeDtype",
"ModelMergeAdd", "ModelMergeAdd",
"ModelMergeAuraflow", "ModelMergeAuraflow",
"ModelMergeBlocks", "ModelMergeBlocks",
@@ -15051,9 +15033,6 @@
"DavchaCLIPTextEncode", "DavchaCLIPTextEncode",
"DavchaConditioningConcat", "DavchaConditioningConcat",
"DavchaEmptyLatentImage", "DavchaEmptyLatentImage",
"DavchaLLM",
"DavchaLLMAdvanced",
"DavchaLoadLLM",
"DavchaLoadVideo", "DavchaLoadVideo",
"DavchaMaskImage", "DavchaMaskImage",
"DavchaModelMergeSD1", "DavchaModelMergeSD1",
@@ -16660,6 +16639,14 @@
"title_aux": "String Converter" "title_aux": "String Converter"
} }
], ],
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
[
"AnimaginePrompt"
],
{
"title_aux": "ComfyUI Animagine prompt"
}
],
"https://github.com/gmorks/ComfyUI-SendToDiscord": [ "https://github.com/gmorks/ComfyUI-SendToDiscord": [
[ [
"PreviewImageWithDiscord" "PreviewImageWithDiscord"
@@ -17447,7 +17434,6 @@
"WWAA_GBCamera", "WWAA_GBCamera",
"WWAA_ImageLoader", "WWAA_ImageLoader",
"WWAA_ImageToTextFile", "WWAA_ImageToTextFile",
"WWAA_NestedLoopCounter",
"WWAA_PromptWriter" "WWAA_PromptWriter"
], ],
{ {
@@ -17568,11 +17554,12 @@
"BiRefNet", "BiRefNet",
"ControlImagePreprocessor", "ControlImagePreprocessor",
"ControlNetModelLoader", "ControlNetModelLoader",
"DiffusersMVModelMakeup",
"DiffusersMVPipelineLoader",
"DiffusersMVSampler", "DiffusersMVSampler",
"DiffusersMVSchedulerLoader", "DiffusersModelMakeup",
"DiffusersMVVaeLoader", "DiffusersPipelineLoader",
"DiffusersSampler",
"DiffusersSchedulerLoader",
"DiffusersVaeLoader",
"ImagePreprocessor", "ImagePreprocessor",
"LdmPipelineLoader", "LdmPipelineLoader",
"LdmVaeLoader", "LdmVaeLoader",
@@ -19773,7 +19760,6 @@
"TorchCompileCosmosModel", "TorchCompileCosmosModel",
"TorchCompileLTXModel", "TorchCompileLTXModel",
"TorchCompileModelFluxAdvanced", "TorchCompileModelFluxAdvanced",
"TorchCompileModelHyVideo",
"TorchCompileVAE", "TorchCompileVAE",
"TransitionImagesInBatch", "TransitionImagesInBatch",
"TransitionImagesMulti", "TransitionImagesMulti",
@@ -21771,7 +21757,6 @@
], ],
"https://github.com/lum3on/comfyui_LLM_Polymath": [ "https://github.com/lum3on/comfyui_LLM_Polymath": [
[ [
"polymath_SaveAbsolute",
"polymath_chat", "polymath_chat",
"polymath_scraper" "polymath_scraper"
], ],
@@ -23301,7 +23286,6 @@
], ],
"https://github.com/olduvai-jp/ComfyUI-HfLoader": [ "https://github.com/olduvai-jp/ComfyUI-HfLoader": [
[ [
"ControlNet Loader From HF",
"Lora Loader From HF" "Lora Loader From HF"
], ],
{ {
@@ -24796,7 +24780,6 @@
"FlipStreamSwitchLatent", "FlipStreamSwitchLatent",
"FlipStreamTextBox", "FlipStreamTextBox",
"FlipStreamTextReplace", "FlipStreamTextReplace",
"FlipStreamVideoInput",
"FlipStreamViewer" "FlipStreamViewer"
], ],
{ {
@@ -26466,20 +26449,6 @@
"title_aux": "ComfyUI-Helper-Nodes" "title_aux": "ComfyUI-Helper-Nodes"
} }
], ],
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock": [
[
"DeepFuze Save",
"DeepFuzeAdavance",
"DeepFuzeFaceSwap",
"DeepfuzePreview",
"LLM_node",
"PlayBackAudio",
"TTS_generation"
],
{
"title_aux": "ComfyUI-DeepUnlock"
}
],
"https://github.com/theAdamColton/ComfyUI-texflow-extension": [ "https://github.com/theAdamColton/ComfyUI-texflow-extension": [
[ [
"Load Texflow Depth Image", "Load Texflow Depth Image",
@@ -27441,14 +27410,6 @@
"title_aux": "zsq_prompt" "title_aux": "zsq_prompt"
} }
], ],
"https://github.com/wirytiox/ComfyUI-SelectStringFromListWithIndex": [
[
"StringFromList"
],
{
"title_aux": "ComfyUI-SelectStringFromListWithIndex"
}
],
"https://github.com/wjl0313/ComfyUI_KimNodes": [ "https://github.com/wjl0313/ComfyUI_KimNodes": [
[ [
"Add_ImageMetadata", "Add_ImageMetadata",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -173,10 +173,7 @@ def read_cnr_info(fullpath):
project = data.get('project', {}) project = data.get('project', {})
name = project.get('name').strip().lower() name = project.get('name').strip().lower()
version = project.get('version')
# normalize version
# for example: 2.5 -> 2.5.0
version = str(manager_util.StrictVersion(project.get('version')))
urls = project.get('urls', {}) urls = project.get('urls', {})
repository = urls.get('Repository') repository = urls.get('Repository')

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 22] version_code = [3, 21]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -345,7 +345,6 @@ class ManagedResult:
self.msg = None self.msg = None
self.target = None self.target = None
self.postinstall = lambda: True self.postinstall = lambda: True
self.ver = None
def append(self, item): def append(self, item):
self.items.append(item) self.items.append(item)
@@ -367,10 +366,6 @@ class ManagedResult:
self.postinstall = postinstall self.postinstall = postinstall
return self return self
def with_ver(self, ver):
self.ver = ver
return self
class UnifiedManager: class UnifiedManager:
def __init__(self): def __init__(self):
@@ -518,10 +513,7 @@ class UnifiedManager:
if info: if info:
cnr = self.cnr_map.get(info['id']) cnr = self.cnr_map.get(info['id'])
if cnr: if cnr:
# normalize version return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
# for example: 2.5 -> 2.5.0
ver = str(manager_util.StrictVersion(info['version']))
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
else: else:
return None return None
else: else:
@@ -794,7 +786,6 @@ class UnifiedManager:
node_id = v['id'] node_id = v['id']
else: else:
node_id = v['files'][0].split('/')[-1] node_id = v['files'][0].split('/')[-1]
v['repository'] = v['files'][0]
res[node_id] = v res[node_id] = v
elif len(v['files']) > 1: elif len(v['files']) > 1:
res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path
@@ -821,14 +812,14 @@ class UnifiedManager:
print("Install: pip packages") print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages()) pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
res = True res = True
lines = manager_util.robust_readlines(requirements_path) with open(requirements_path, "r") as requirements_file:
for line in lines: for line in requirements_file:
package_name = remap_pip_package(line.strip()) package_name = remap_pip_package(line.strip())
if package_name and not package_name.startswith('#') and package_name not in self.processed_install: if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
self.processed_install.add(package_name) self.processed_install.add(package_name)
install_cmd = manager_util.make_pip_cmd(["install", package_name]) install_cmd = manager_util.make_pip_cmd(["install", package_name])
if package_name.strip() != "" and not package_name.startswith('#'): if package_name.strip() != "" and not package_name.startswith('#'):
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution) res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
pip_fixer.fix_broken() pip_fixer.fix_broken()
return res return res
@@ -1258,8 +1249,7 @@ class UnifiedManager:
return result.fail(f"Failed to execute install script: {url}") return result.fail(f"Failed to execute install script: {url}")
except Exception as e: except Exception as e:
traceback.print_exc() return result.fail(f"Install(git-clone) error: {url} / {e}")
return result.fail(f"Install(git-clone) error[2]: {url} / {e}")
print("Installation was successful.") print("Installation was successful.")
return result return result
@@ -1340,14 +1330,14 @@ class UnifiedManager:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active') version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
if version_spec is None: if version_spec is None:
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec) return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
if version_spec == 'nightly': if version_spec == 'nightly':
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly') return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
elif version_spec == 'unknown': elif version_spec == 'unknown':
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown') return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
else: else:
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr') return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False): async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
""" """
@@ -1593,6 +1583,16 @@ def read_config():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(manager_config_path) config.read(manager_config_path)
default_conf = config['default'] default_conf = config['default']
# policy migration: disable_unsecure_features -> security_level
if 'disable_unsecure_features' in default_conf:
if default_conf['disable_unsecure_features'].lower() == 'true':
security_level = 'strong'
else:
security_level = 'normal'
else:
security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
def get_bool(key, default_value): def get_bool(key, default_value):
@@ -1600,25 +1600,26 @@ def read_config():
return { return {
'http_channel_enabled': get_bool('http_channel_enabled', False), 'http_channel_enabled': get_bool('http_channel_enabled', False),
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(), 'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()),
'git_exe': default_conf.get('git_exe', ''), 'git_exe': default_conf.get('git_exe', ''),
'use_uv': get_bool('use_uv', False), 'use_uv': get_bool('use_uv', False),
'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL), 'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False), 'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
'share_option': default_conf.get('share_option', 'all').lower(), 'share_option': default_conf.get('share_option', 'all'),
'bypass_ssl': get_bool('bypass_ssl', False), 'bypass_ssl': get_bool('bypass_ssl', False),
'file_logging': get_bool('file_logging', True), 'file_logging': get_bool('file_logging', True),
'component_policy': default_conf.get('component_policy', 'workflow').lower(), 'component_policy': default_conf.get('component_policy', 'workflow'),
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False), 'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
'model_download_by_agent': get_bool('model_download_by_agent', False), 'model_download_by_agent': get_bool('model_download_by_agent', False),
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(), 'downgrade_blacklist': default_conf.get('downgrade_blacklist', ''),
'skip_migration_check': get_bool('skip_migration_check', False), 'skip_migration_check': get_bool('skip_migration_check', False),
'always_lazy_install': get_bool('always_lazy_install', False), 'always_lazy_install': get_bool('always_lazy_install', False),
'network_mode': default_conf.get('network_mode', 'public').lower(), 'network_mode': default_conf.get('network_mode', 'public'),
'security_level': default_conf.get('security_level', 'normal').lower(), 'security_level': security_level,
} }
except Exception: except Exception:
traceback.print_exc()
manager_util.use_uv = False manager_util.use_uv = False
return { return {
'http_channel_enabled': False, 'http_channel_enabled': False,
@@ -2055,8 +2056,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr) print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
return result.fail(f"Install(git-clone)[1] error: {url} / {e}") return result.fail(f"Install(git-clone) error: {url} / {e}")
def git_pull(path): def git_pull(path):
@@ -2155,7 +2156,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
return False return False
except Exception as e: except Exception as e:
print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr) print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
return False return False
print(f"Attempt to fixing '{files}' is done.") print(f"Attempt to fixing '{files}' is done.")

View File

@@ -55,14 +55,8 @@ def handle_stream(stream, prefix):
from comfy.cli_args import args from comfy.cli_args import args
import latent_preview import latent_preview
def is_loopback(address):
import ipaddress
try:
return ipaddress.ip_address(address).is_loopback
except ValueError:
return False
is_local_mode = is_loopback(args.listen) is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
model_dir_name_map = { model_dir_name_map = {
@@ -91,11 +85,11 @@ def is_allowed_security_level(level):
return False return False
elif level == 'high': elif level == 'high':
if is_local_mode: if is_local_mode:
return core.get_config()['security_level'] in ['weak', 'normal-'] return core.get_config()['security_level'].lower() in ['weak', 'normal-']
else: else:
return core.get_config()['security_level'] == 'weak' return core.get_config()['security_level'].lower() == 'weak'
elif level == 'middle': elif level == 'middle':
return core.get_config()['security_level'] in ['weak', 'normal', 'normal-'] return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
else: else:
return True return True
@@ -416,41 +410,25 @@ async def task_worker():
traceback.print_exc() traceback.print_exc()
return f"Installation failed:\n{node_spec_str}" return f"Installation failed:\n{node_spec_str}"
async def do_update(item): async def do_update(item) -> str:
ui_id, node_name, node_ver = item ui_id, node_name, node_ver = item
try: try:
res = core.unified_manager.unified_update(node_name, node_ver) res = core.unified_manager.unified_update(node_name, node_ver)
if res.ver == 'unknown':
url = core.unified_manager.unknown_active_nodes[node_name][0]
title = os.path.basename(url)
else:
url = core.unified_manager.cnr_map[node_name].get('repository')
title = core.unified_manager.cnr_map[node_name]['name']
manager_util.clear_pip_cache() manager_util.clear_pip_cache()
if url is not None:
base_res = {'url': url, 'title': title}
else:
base_res = {'title': title}
if res.result: if res.result:
if res.action == 'skip': if res.action == 'skip':
base_res['msg'] = 'skip' return 'skip'
return base_res
else: else:
base_res['msg'] = 'success' return 'success'
return base_res
base_res['msg'] = f"An error occurred while updating '{node_name}'."
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.") logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
return base_res
except Exception: except Exception:
traceback.print_exc() traceback.print_exc()
return {'msg':f"An error occurred while updating '{node_name}'."} return f"An error occurred while updating '{node_name}'."
async def do_update_comfyui() -> str: async def do_update_comfyui() -> str:
try: try:
@@ -621,11 +599,7 @@ async def task_worker():
nodepack_result[ui_id] = msg nodepack_result[ui_id] = msg
ui_target = "main" ui_target = "main"
elif kind == 'update-comfyui': elif kind == 'update-comfyui':
nodepack_result['comfyui'] = msg
ui_target = "main" ui_target = "main"
elif kind == 'update':
nodepack_result[ui_id] = msg['msg']
ui_target = "nodepack_manager"
else: else:
nodepack_result[ui_id] = msg nodepack_result[ui_id] = msg
ui_target = "nodepack_manager" ui_target = "nodepack_manager"
@@ -730,15 +704,6 @@ async def update_all(request):
update_item = k, k, v[0] update_item = k, k, v[0]
task_queue.put(("update-main", update_item)) task_queue.put(("update-main", update_item))
for k, v in core.unified_manager.unknown_active_nodes.items():
if k == 'comfyui-manager':
# skip updating comfyui-manager if desktop version
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
continue
update_item = k, k, 'unknown'
task_queue.put(("update-main", update_item))
return web.Response(status=200) return web.Response(status=200)

View File

@@ -12,7 +12,6 @@ import subprocess
import sys import sys
import re import re
import logging import logging
import chardet
cache_lock = threading.Lock() cache_lock = threading.Lock()
@@ -270,18 +269,27 @@ class PIPFixer:
self.prev_pip_versions = { **prev_pip_versions } self.prev_pip_versions = { **prev_pip_versions }
def torch_rollback(self): def torch_rollback(self):
print("[DBG] point(torch_rollback) 1")
spec = self.prev_pip_versions['torch'].split('+') spec = self.prev_pip_versions['torch'].split('+')
print("[DBG] point(torch_rollback) 2")
if len(spec) > 0: if len(spec) > 0:
platform = spec[1] platform = spec[1]
else: else:
print("[DBG] point(torch_rollback) 3")
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio']) cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 4")
logging.error(cmd) logging.error(cmd)
print("[DBG] point(torch_rollback) 5")
return return
print("[DBG] point(torch_rollback) 6")
torch_ver = StrictVersion(spec[0]) torch_ver = StrictVersion(spec[0])
print("[DBG] point(torch_rollback) 7")
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}" torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
print("[DBG] point(torch_rollback) 8")
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver) torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
print("[DBG] point(torch_rollback) 9")
if torch_torchvision_torchaudio_ver is None: if torch_torchvision_torchaudio_ver is None:
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio', cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
@@ -293,46 +301,64 @@ class PIPFixer:
'--index-url', f"https://download.pytorch.org/whl/{platform}"]) '--index-url', f"https://download.pytorch.org/whl/{platform}"])
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}") logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
print("[DBG] point(torch_rollback) 10")
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 11")
def fix_broken(self): def fix_broken(self):
print("[DBG] point9-1")
new_pip_versions = get_installed_packages(True) new_pip_versions = get_installed_packages(True)
print("[DBG] point9-2")
# remove `comfy` python package # remove `comfy` python package
try: try:
print("[DBG] point9-3")
if 'comfy' in new_pip_versions: if 'comfy' in new_pip_versions:
print("[DBG] point9-3-1")
cmd = make_pip_cmd(['uninstall', 'comfy']) cmd = make_pip_cmd(['uninstall', 'comfy'])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.") logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
print("[DBG] point9-4")
except Exception as e: except Exception as e:
print("[DBG] point9-5")
logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package") logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
logging.error(e) logging.error(e)
# fix torch - reinstall torch packages if version is changed # fix torch - reinstall torch packages if version is changed
print("[DBG] point9-6")
try: try:
print("[DBG] point9-7")
if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions: if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
print("[DBG] point9-8")
logging.error("[ComfyUI-Manager] PyTorch is not installed") logging.error("[ComfyUI-Manager] PyTorch is not installed")
elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \ elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \ or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']: or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
print("[DBG] point9-9")
self.torch_rollback() self.torch_rollback()
print("[DBG] point9-10")
except Exception as e: except Exception as e:
print("[DBG] point9-11")
logging.error("[ComfyUI-Manager] Failed to restore PyTorch") logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
logging.error(e) logging.error(e)
# fix opencv # fix opencv
try: try:
print("[DBG] point9-12")
ocp = new_pip_versions.get('opencv-contrib-python') ocp = new_pip_versions.get('opencv-contrib-python')
ocph = new_pip_versions.get('opencv-contrib-python-headless') ocph = new_pip_versions.get('opencv-contrib-python-headless')
op = new_pip_versions.get('opencv-python') op = new_pip_versions.get('opencv-python')
oph = new_pip_versions.get('opencv-python-headless') oph = new_pip_versions.get('opencv-python-headless')
print("[DBG] point9-13")
versions = [ocp, ocph, op, oph] versions = [ocp, ocph, op, oph]
versions = [StrictVersion(x) for x in versions if x is not None] versions = [StrictVersion(x) for x in versions if x is not None]
versions.sort(reverse=True) versions.sort(reverse=True)
print("[DBG] point9-14")
if len(versions) > 0: if len(versions) > 0:
print("[DBG] point9-15")
# upgrade to maximum version # upgrade to maximum version
targets = [] targets = []
cur = versions[0] cur = versions[0]
@@ -345,27 +371,40 @@ class PIPFixer:
if oph is not None and StrictVersion(oph) != cur: if oph is not None and StrictVersion(oph) != cur:
targets.append('opencv-python-headless') targets.append('opencv-python-headless')
print("[DBG] point9-16")
if len(targets) > 0: if len(targets) > 0:
print("[DBG] point9-17")
for x in targets: for x in targets:
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"]) cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}") logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
print("[DBG] point9-18")
except Exception as e: except Exception as e:
print("[DBG] point9-19")
logging.error("[ComfyUI-Manager] Failed to restore opencv") logging.error("[ComfyUI-Manager] Failed to restore opencv")
logging.error(e) logging.error(e)
print("[DBG] point9-20")
# fix numpy # fix numpy
try: try:
print("[DBG] point9-21")
np = new_pip_versions.get('numpy') np = new_pip_versions.get('numpy')
print("[DBG] point9-22")
if np is not None: if np is not None:
print("[DBG] point9-23")
if StrictVersion(np) >= StrictVersion('2'): if StrictVersion(np) >= StrictVersion('2'):
print("[DBG] point9-24")
cmd = make_pip_cmd(['install', "numpy<2"]) cmd = make_pip_cmd(['install', "numpy<2"])
subprocess.check_output(cmd , universal_newlines=True) subprocess.check_output(cmd , universal_newlines=True)
print("[DBG] point9-25")
except Exception as e: except Exception as e:
print("[DBG] point9-26")
logging.error("[ComfyUI-Manager] Failed to restore numpy") logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e) logging.error(e)
print("[DBG] point9-28")
def sanitize(data): def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;") return data.replace("<", "&lt;").replace(">", "&gt;")
@@ -374,22 +413,3 @@ def sanitize(data):
def sanitize_filename(input_string): def sanitize_filename(input_string):
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string) result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
return result_string return result_string
def robust_readlines(fullpath):
try:
with open(fullpath, "r") as f:
return f.readlines()
except:
encoding = None
with open(fullpath, "rb") as f:
raw_data = f.read()
result = chardet.detect(raw_data)
encoding = result['encoding']
if encoding is not None:
with open(fullpath, "r", encoding=encoding) as f:
return f.readlines()
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
return []

View File

@@ -698,62 +698,35 @@ async function onQueueStatus(event) {
return; return;
} }
is_updating_all = false;
let success_list = []; let success_list = [];
let failed_list = []; let failed_list = [];
let comfyui_state = null;
for(let k in event.detail.nodepack_result){ for(let k in event.detail.nodepack_result){
let v = event.detail.nodepack_result[k]; let v = event.detail.nodepack_result[k];
if(k == 'comfyui') { if(v == 'success')
comfyui_state = v;
continue;
}
if(v.msg == 'success') {
success_list.push(k); success_list.push(k);
else if(v == 'skip') {
// do nothing
} }
else if(v.msg != 'skip') else
failed_list.push(k); failed_list.push(k);
} }
let msg = ""; let msg = "";
if(success_list.length == 0 && comfyui_state != 'success') { if(success_list.length == 0) {
if(failed_list.length == 0) { if(failed_list.length == 0) {
msg += "All custom nodes are already up to date."; msg += "All custom nodes are already up to date.";
} }
} }
else { else {
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>"; msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
msg += "The following custom nodes have been updated:<ul>";
if(comfyui_state == 'success') { for(let x in success_list) {
msg += "ComfyUI is updated.<BR><BR>"; msg += '<li>'+success_list[x]+'</li>';
}
else if(comfyui_state == 'skip') {
msg += "ComfyUI is already up-to-date.<BR><BR>"
}
else if(comfyui_state != null) {
msg += "Failed to update ComfyUI.<BR><BR>"
}
if(success_list.length > 0) {
msg += "The following custom nodes have been updated:<ul>";
for(let x in success_list) {
let k = success_list[x];
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
}
msg += "</ul>";
} }
msg += "</ul>";
setNeedRestart(true); setNeedRestart(true);
} }
@@ -761,15 +734,7 @@ async function onQueueStatus(event) {
if(failed_list.length > 0) { if(failed_list.length > 0) {
msg += '<br>The update for the following custom nodes has failed:<ul>'; msg += '<br>The update for the following custom nodes has failed:<ul>';
for(let x in failed_list) { for(let x in failed_list) {
let k = failed_list[x]; msg += '<li>'+failed_list[x]+'</li>';
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
} }
msg += '</ul>' msg += '</ul>'

View File

@@ -13,46 +13,6 @@
{
"author": "D1-3105",
"title": "ComfyUI-VideoStream",
"reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
"files": [
"https://github.com/D1-3105/ComfyUI-VideoStream"
],
"install_type": "git-clone",
"description": "NODES: FloWWeaverExportSingleFrameGRPC"
},
{
"author": "gmorks",
"title": "ComfyUI Animagine prompt [WIP]",
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
"files": [
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
],
"install_type": "git-clone",
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
},
{
"author": "wirytiox",
"title": "ComfyUI-Qwen [CONFLICT]",
"reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
"files": [
"https://github.com/mr-krak3n/ComfyUI-Qwen"
],
"install_type": "git-clone",
"description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
},
{
"author": "hiusdev",
"title": "ComfyUI_Lah_Toffee",
"reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
"files": [
"https://github.com/hiusdev/ComfyUI_Lah_Toffee"
],
"install_type": "git-clone",
"description": "NODES: Lah LoadVideoRandom"
},
{ {
"author": "hdfhssg", "author": "hdfhssg",
"title": "ComfyUI_pxtool [WIP]", "title": "ComfyUI_pxtool [WIP]",

View File

@@ -178,6 +178,7 @@
"https://github.com/807502278/ComfyUI_TensorRT_Merge": [ "https://github.com/807502278/ComfyUI_TensorRT_Merge": [
[ [
"BiRefNet2_tensort", "BiRefNet2_tensort",
"BiRefNet_ModelLoader_TRT",
"BiRefNet_TRT", "BiRefNet_TRT",
"Building_TRT", "Building_TRT",
"Custom_Building_TRT", "Custom_Building_TRT",
@@ -188,7 +189,6 @@
"UpscalerTensorrt", "UpscalerTensorrt",
"YoloNasPoseTensorrt", "YoloNasPoseTensorrt",
"load_BiRefNet2_tensort", "load_BiRefNet2_tensort",
"load_BiRefNet_TRT",
"load_DepthAnything_Tensorrt", "load_DepthAnything_Tensorrt",
"load_Dwpos_Tensorrt" "load_Dwpos_Tensorrt"
], ],
@@ -658,14 +658,6 @@
"title_aux": "ComfyUI OpenAI Nodes" "title_aux": "ComfyUI OpenAI Nodes"
} }
], ],
"https://github.com/D1-3105/ComfyUI-VideoStream": [
[
"FloWWeaverExportSingleFrameGRPC"
],
{
"title_aux": "ComfyUI-VideoStream"
}
],
"https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [ "https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [
[ [
"IPAAdapterFaceIDBatch", "IPAAdapterFaceIDBatch",
@@ -948,11 +940,9 @@
"DeepSeekImageGeneration", "DeepSeekImageGeneration",
"DeepSeekImageUnderstanding", "DeepSeekImageUnderstanding",
"DeepSeekModelLoader", "DeepSeekModelLoader",
"GoogleDriveUpload",
"ImagePreprocessor", "ImagePreprocessor",
"LLM_Loader", "LLM_Loader",
"OpenAICompatibleLoader", "OpenAICompatibleLoader"
"VideoFileUploader"
], ],
{ {
"title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]" "title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
@@ -1437,8 +1427,7 @@
[ [
"List Image Path \ud83d\udc24", "List Image Path \ud83d\udc24",
"List Model Path \ud83d\udc24", "List Model Path \ud83d\udc24",
"List Video Path \ud83d\udc24", "List Video Path \ud83d\udc24"
"Peaks Weights Generator \ud83d\udc24"
], ],
{ {
"title_aux": "Comfy UI Robe Nodes [UNSAFE]" "title_aux": "Comfy UI Robe Nodes [UNSAFE]"
@@ -2474,7 +2463,6 @@
"Mahiro", "Mahiro",
"MaskComposite", "MaskComposite",
"MaskToImage", "MaskToImage",
"ModelComputeDtype",
"ModelMergeAdd", "ModelMergeAdd",
"ModelMergeAuraflow", "ModelMergeAuraflow",
"ModelMergeBlocks", "ModelMergeBlocks",
@@ -2984,14 +2972,6 @@
"title_aux": "comfyui_median_filter" "title_aux": "comfyui_median_filter"
} }
], ],
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
[
"AnimaginePrompt"
],
{
"title_aux": "ComfyUI Animagine prompt [WIP]"
}
],
"https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [ "https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [
[ [
"Tools:CopyFile", "Tools:CopyFile",
@@ -3116,7 +3096,6 @@
"DanbooruCharacterTag", "DanbooruCharacterTag",
"E621CharacterTag", "E621CharacterTag",
"NegativeTag", "NegativeTag",
"PX_Seed",
"QualityTag", "QualityTag",
"RandomArtists", "RandomArtists",
"RandomArtistsAdvanced", "RandomArtistsAdvanced",
@@ -3126,14 +3105,6 @@
"title_aux": "ComfyUI_pxtool [WIP]" "title_aux": "ComfyUI_pxtool [WIP]"
} }
], ],
"https://github.com/hiusdev/ComfyUI_Lah_Toffee": [
[
"LoadVideoRandom"
],
{
"title_aux": "ComfyUI_Lah_Toffee"
}
],
"https://github.com/horidream/ComfyUI-Horidream": [ "https://github.com/horidream/ComfyUI-Horidream": [
[ [
"PassThroughWithSound" "PassThroughWithSound"
@@ -4057,7 +4028,6 @@
], ],
"https://github.com/lum3on/comfyui_LLM_Polymath": [ "https://github.com/lum3on/comfyui_LLM_Polymath": [
[ [
"polymath_SaveAbsolute",
"polymath_chat", "polymath_chat",
"polymath_scraper" "polymath_scraper"
], ],
@@ -4266,16 +4236,6 @@
"title_aux": "ComfyUI-Simple-Image-Tools [WIP]" "title_aux": "ComfyUI-Simple-Image-Tools [WIP]"
} }
], ],
"https://github.com/mr-krak3n/ComfyUI-Qwen": [
[
"DeepSeekResponseParser",
"QwenLoader",
"QwenSampler"
],
{
"title_aux": "ComfyUI-Qwen [CONFLICT]"
}
],
"https://github.com/mut-ex/comfyui-gligengui-node": [ "https://github.com/mut-ex/comfyui-gligengui-node": [
[ [
"GLIGEN_GUI" "GLIGEN_GUI"

View File

File diff suppressed because it is too large Load Diff

View File

@@ -10,28 +10,6 @@
}, },
{
"author": "apesplat",
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
"id": "ezxy",
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
"files": [
"https://github.com/GMapeSplat/ComfyUI_ezXY"
],
"install_type": "git-clone",
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
},
{
"author": "mie",
"title": "ComfyUI_JanusProCaption [REMOVED]",
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
"files": [
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
],
"install_type": "git-clone",
"description": "Describe image or create caption files using Janus Pro Model"
},
{ {
"author": "Njbx", "author": "Njbx",
"title": "ComfyUI-blockswap [REMOVED]", "title": "ComfyUI-blockswap [REMOVED]",

View File

@@ -11,56 +11,6 @@
{
"author": "SSsnap",
"title": "ComfyUI-LBW_flux",
"reference": "https://github.com/SS-snap/ComfyUI-LBW_flux",
"files": [
"https://github.com/SS-snap/ComfyUI-LBW_flux"
],
"install_type": "git-clone",
"description": "Through this node, you can more easily test the impact of different blocks in flux_lora on the final result."
},
{
"author": "thanhduong0213929",
"title": "ComfyUI-DeepUnlock",
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
"files": [
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
],
"install_type": "git-clone",
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
},
{
"author": "MushroomFleet",
"title": "DJZ-Pedalboard",
"reference": "https://github.com/MushroomFleet/DJZ-Pedalboard",
"files": [
"https://github.com/MushroomFleet/DJZ-Pedalboard"
],
"install_type": "git-clone",
"description": "This project provides a collection of custom nodes designed for enhanced audio effects in ComfyUI. With an intuitive pedalboard interface, users can easily integrate and manipulate various audio effects within their workflows."
},
{
"author": "mie",
"title": "ComfyUI_CaptionThis",
"reference": "https://github.com/MieMieeeee/ComfyUI-CaptionThis",
"files": [
"https://github.com/MieMieeeee/ComfyUI-CaptionThis"
],
"install_type": "git-clone",
"description": "Describe a single image or all images in a directory using models such as Janus Pro, Florence2 (coming soon), or JoyCaption (coming soon), with a particular focus on building datasets for training LoRA."
},
{
"author": "APZmedia",
"title": "APZmedia Together Image Generator for ComfyUI",
"reference": "https://github.com/APZmedia/APZmedia-comfy-together-lora",
"files": [
"https://github.com/APZmedia/APZmedia-comfy-together-lora"
],
"install_type": "git-clone",
"description": "A ComfyUI node to implement Together AI API image generation"
},
{ {
"author": "lum3on", "author": "lum3on",
"title": "LLM Polymath Chat Node", "title": "LLM Polymath Chat Node",
@@ -102,6 +52,16 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "This node calculates a contrasting complementary color based on an input RGB color. The goal is to ensure visibility and contrast when overlaying text, UI elements, or graphical components against a given background color." "description": "This node calculates a contrasting complementary color based on an input RGB color. The goal is to ensure visibility and contrast when overlaying text, UI elements, or graphical components against a given background color."
}, },
{
"author": "mie",
"title": "ComfyUI_JanusProCaption",
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
"files": [
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
],
"install_type": "git-clone",
"description": "Describe image or create caption files using Janus Pro Model"
},
{ {
"author": "moon7star9", "author": "moon7star9",
"title": "ComfyUI_BiRefNet_Universal", "title": "ComfyUI_BiRefNet_Universal",
@@ -621,6 +581,16 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "This node group contains a series of ComfyUI nodes with built-in counters and specific output results based on the counter's output, aimed at implementing folder traversal functionality in the ComfyUI frontend. For specific examples, please refer to the sample workflow. Of course, you can also use your imagination to create other interesting things." "description": "This node group contains a series of ComfyUI nodes with built-in counters and specific output results based on the counter's output, aimed at implementing folder traversal functionality in the ComfyUI frontend. For specific examples, please refer to the sample workflow. Of course, you can also use your imagination to create other interesting things."
}, },
{
"author": "gmorks",
"title": "ComfyUI Animagine prompt",
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
"files": [
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
],
"install_type": "git-clone",
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model"
},
{ {
"author": "Kayarte", "author": "Kayarte",
"title": "GeoNodes", "title": "GeoNodes",
@@ -693,6 +663,99 @@
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "About DeepSeek Chat API\nGo here to register and get the api-key [a/https://platform.deepseek.com/](https://platform.deepseek.com/) Then enter api_key in config.json" "description": "About DeepSeek Chat API\nGo here to register and get the api-key [a/https://platform.deepseek.com/](https://platform.deepseek.com/) Then enter api_key in config.json"
},
{
"author": "chflame163",
"title": "ComfyUI_Janus_Wrapper",
"reference": "https://github.com/chflame163/ComfyUI_Janus_Wrapper",
"files": [
"https://github.com/chflame163/ComfyUI_Janus_Wrapper"
],
"install_type": "git-clone",
"description": "Unofficial implementation of [a/deepseek-ai/Janus](https://github.com/deepseek-ai/Janus) in ComfyUI."
},
{
"author": "ReBeating",
"title": "ComfyUI-Artist-Selector",
"reference": "https://github.com/ReBeating/ComfyUI-Artist-Selector",
"files": [
"https://github.com/ReBeating/ComfyUI-Artist-Selector"
],
"install_type": "git-clone",
"description": "A useful comfyui node named LoadArtistTag for selecting artist tags, including 1000+ single-artist tags and 300 mixed-artists tags."
},
{
"author": "852wa",
"title": "ComfyUI-ColorshiftColor",
"reference": "https://github.com/852wa/ComfyUI-ColorshiftColor",
"files": [
"https://github.com/852wa/ComfyUI-ColorshiftColor"
],
"install_type": "git-clone",
"description": "This is a custom node for ComfyUI.\nIt reduces colors based on a specified number and allows for adjustments to hue, saturation, and brightness.\nFeatures:Each parameter can be set to random, You can toggle masking (not changing colors) using color numbers, Mask inversion can also be toggled on or off."
},
{
"author": "852wa",
"title": "ComfyUI-AdvancedAlphaProcessor",
"reference": "https://github.com/852wa/ComfyUI-AAP",
"files": [
"https://github.com/852wa/ComfyUI-AAP"
],
"install_type": "git-clone",
"description": "This is a custom node for ComfyUI.\nFeatures:Removes white areas in the input image by making them transparent based on brightness, Outputs in black and transparent, Outputs in gray and transparent.\nThis is a simple node with the above functionalities implemented. It also supports sequential processing."
},
{
"author": "jinanlongen",
"title": "ComfyUI Prompt Expander Node",
"reference": "https://github.com/jinanlongen/ComfyUI-Prompt-Expander",
"files": [
"https://github.com/jinanlongen/ComfyUI-Prompt-Expander"
],
"install_type": "git-clone",
"description": "A custom node for ComfyUI that expands text prompts using the SuperPrompt-v1 T5 model. This node helps generate more detailed and descriptive prompts from simple input text, which can be particularly useful for image generation workflows."
},
{
"author": "Style-Mosaic",
"title": "ComfyUI DINO-X Detector Node",
"reference": "https://github.com/Style-Mosaic/dino-x-comfyui-node",
"files": [
"https://github.com/Style-Mosaic/dino-x-comfyui-node"
],
"install_type": "git-clone",
"description": "A ComfyUI node that integrates DINO-X API for object detection and segmentation. This node allows you to detect and segment objects in images using text prompts."
},
{
"author": "gmorks",
"title": "ComfyUI-SendToDiscord",
"reference": "https://github.com/gmorks/ComfyUI-SendToDiscord",
"files": [
"https://github.com/gmorks/ComfyUI-SendToDiscord"
],
"install_type": "git-clone",
"description": "ComfyUI-SendToDiscord is a custom node for ComfyUI that simplifies sending preview images to Discord via webhooks. It supports both single-image uploads and batch mode, making it an efficient tool for sharing your generated images directly with your Discord server."
},
{
"author": "CY-CHENYUE",
"title": "ComfyUI-Janus-Pro",
"id": "ComfyUI-Janus-Pro",
"reference": "https://github.com/CY-CHENYUE/ComfyUI-Janus-Pro",
"files": [
"https://github.com/CY-CHENYUE/ComfyUI-Janus-Pro"
],
"description": "ComfyUI nodes for Janus-Pro, a unified multimodal understanding and generation framework.",
"install_type": "git-clone"
},
{
"author": "burnsbert",
"title": "EBU LMStudio LLM Integration",
"id": "ebu-lmstudio",
"reference": "https://github.com/burnsbert/ComfyUI-EBU-LMStudio",
"files": [
"https://github.com/burnsbert/ComfyUI-EBU-LMStudio"
],
"install_type": "git-clone",
"description": "Custom nodes for integrating LM Studio's LLM functionality into ComfyUI. Includes EBU-LMStudio-Load, EBU-LMStudio-Unload, and EBU-LMStudio-Request."
} }
] ]
} }

View File

@@ -1114,15 +1114,6 @@
"title_aux": "ComfyUI_yanc" "title_aux": "ComfyUI_yanc"
} }
], ],
"https://github.com/APZmedia/APZmedia-comfy-together-lora": [
[
"TogetherImageGenerator",
"TogetherImageGeneratorLoRA"
],
{
"title_aux": "APZmedia Together Image Generator for ComfyUI"
}
],
"https://github.com/APZmedia/APZmedia-comfyui-fast-image-save": [ "https://github.com/APZmedia/APZmedia-comfyui-fast-image-save": [
[ [
"APZmedia Fast image save" "APZmedia Fast image save"
@@ -1916,7 +1907,6 @@
"ComfyUIDeployExternalAudio", "ComfyUIDeployExternalAudio",
"ComfyUIDeployExternalBoolean", "ComfyUIDeployExternalBoolean",
"ComfyUIDeployExternalCheckpoint", "ComfyUIDeployExternalCheckpoint",
"ComfyUIDeployExternalEXR",
"ComfyUIDeployExternalFaceModel", "ComfyUIDeployExternalFaceModel",
"ComfyUIDeployExternalImage", "ComfyUIDeployExternalImage",
"ComfyUIDeployExternalImageAlpha", "ComfyUIDeployExternalImageAlpha",
@@ -3932,6 +3922,27 @@
"title_aux": "ComfyUI-Counternodes" "title_aux": "ComfyUI-Counternodes"
} }
], ],
"https://github.com/GMapeSplat/ComfyUI_ezXY": [
[
"ConcatenateString",
"ItemFromDropdown",
"IterationDriver",
"JoinImages",
"LineToConsole",
"NumberFromList",
"NumbersToList",
"PlotImages",
"StringFromList",
"StringToLabel",
"StringsToList",
"ezMath",
"ezXY_AssemblePlot",
"ezXY_Driver"
],
{
"title_aux": "ezXY scripts and nodes"
}
],
"https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [ "https://github.com/GTSuya-Studio/ComfyUI-Gtsuya-Nodes": [
[ [
"Danbooru (ID)", "Danbooru (ID)",
@@ -6446,7 +6457,6 @@
"BlackBarsV1", "BlackBarsV1",
"BlackBarsV2", "BlackBarsV2",
"BlackBarsV3", "BlackBarsV3",
"BracketCleaner",
"CRT_Effect_v1", "CRT_Effect_v1",
"CathodeRayEffect", "CathodeRayEffect",
"ClassicFilmEffect", "ClassicFilmEffect",
@@ -6499,7 +6509,6 @@
"ParametricMeshGenV2", "ParametricMeshGenV2",
"ProjectFilePathNode", "ProjectFilePathNode",
"PromptCleaner", "PromptCleaner",
"PromptCleanerV2",
"PromptDupeRemover", "PromptDupeRemover",
"PromptDupeRemoverV2", "PromptDupeRemoverV2",
"PromptInject", "PromptInject",
@@ -6541,13 +6550,10 @@
"VideoTrails", "VideoTrails",
"VideoTrailsV2", "VideoTrailsV2",
"VideoVignettingV1", "VideoVignettingV1",
"VoiceEffects",
"VoiceEffects2",
"WaveletCompose", "WaveletCompose",
"WaveletDecompose", "WaveletDecompose",
"WinampViz", "WinampViz",
"WinampVizV2", "WinampVizV2",
"ZenkaiPoseMap",
"ZenkaiPrompt", "ZenkaiPrompt",
"ZenkaiPromptV2", "ZenkaiPromptV2",
"ZenkaiPromptV3", "ZenkaiPromptV3",
@@ -6560,14 +6566,6 @@
"title_aux": "DJZ-Nodes" "title_aux": "DJZ-Nodes"
} }
], ],
"https://github.com/MushroomFleet/DJZ-Pedalboard": [
[
"DJZ_Pedalboard"
],
{
"title_aux": "DJZ-Pedalboard"
}
],
"https://github.com/MuziekMagie/ComfyUI-Matchering": [ "https://github.com/MuziekMagie/ComfyUI-Matchering": [
[ [
"Matchering", "Matchering",
@@ -6968,7 +6966,6 @@
"SUPIR Sampler \ud83d\udcacED", "SUPIR Sampler \ud83d\udcacED",
"Save Image \ud83d\udd14ED", "Save Image \ud83d\udd14ED",
"Simple Text \ud83d\udcacED", "Simple Text \ud83d\udcacED",
"TIPO Script \ud83d\udcacED",
"Ultimate SD Upscale \ud83d\udcacED", "Ultimate SD Upscale \ud83d\udcacED",
"Wildcard Encode \ud83d\udcacED" "Wildcard Encode \ud83d\udcacED"
], ],
@@ -7562,14 +7559,6 @@
"title_aux": "ComfyUI-LexTools" "title_aux": "ComfyUI-LexTools"
} }
], ],
"https://github.com/SS-snap/ComfyUI-LBW_flux": [
[
"LoraBlockWeight_Flux"
],
{
"title_aux": "ComfyUI-LBW_flux"
}
],
"https://github.com/SS-snap/ComfyUI-Snap_Processing": [ "https://github.com/SS-snap/ComfyUI-Snap_Processing": [
[ [
"AreaCalculator", "AreaCalculator",
@@ -10324,7 +10313,6 @@
"ConvertRasterToVectorBW", "ConvertRasterToVectorBW",
"ConvertRasterToVectorColor", "ConvertRasterToVectorColor",
"ConvertVectorToRaster", "ConvertVectorToRaster",
"SVGPreview",
"SaveSVG" "SaveSVG"
], ],
{ {
@@ -11367,7 +11355,6 @@
"Noise from Palette [Dream]", "Noise from Palette [Dream]",
"Palette Color Align [Dream]", "Palette Color Align [Dream]",
"Palette Color Shift [Dream]", "Palette Color Shift [Dream]",
"Random Prompt Words [Dream]",
"Sample Image Area as Palette [Dream]", "Sample Image Area as Palette [Dream]",
"Sample Image as Palette [Dream]", "Sample Image as Palette [Dream]",
"Saw Curve [Dream]", "Saw Curve [Dream]",
@@ -11483,7 +11470,6 @@
"https://github.com/arcum42/ComfyUI_SageUtils": [ "https://github.com/arcum42/ComfyUI_SageUtils": [
[ [
"Sage_AdvSamplerInfo", "Sage_AdvSamplerInfo",
"Sage_CLIPTextEncodeLumina2",
"Sage_CacheMaintenance", "Sage_CacheMaintenance",
"Sage_CheckpointLoaderRecent", "Sage_CheckpointLoaderRecent",
"Sage_CheckpointLoaderSimple", "Sage_CheckpointLoaderSimple",
@@ -11495,7 +11481,6 @@
"Sage_ConstructMetadata", "Sage_ConstructMetadata",
"Sage_ConstructMetadataLite", "Sage_ConstructMetadataLite",
"Sage_DualCLIPTextEncode", "Sage_DualCLIPTextEncode",
"Sage_DualCLIPTextEncodeLumina2",
"Sage_EmptyLatentImagePassthrough", "Sage_EmptyLatentImagePassthrough",
"Sage_GetFileHash", "Sage_GetFileHash",
"Sage_JoinText", "Sage_JoinText",
@@ -11663,11 +11648,10 @@
], ],
"https://github.com/austinbrown34/ComfyUI-IO-Helpers": [ "https://github.com/austinbrown34/ComfyUI-IO-Helpers": [
[ [
"EncodedPromptFromFile", "Encoded Prompt from File",
"EncodedPromptToFile", "Encoded Prompt to File",
"IO_LoadImage", "Sampled Latents from File",
"SampledLatentsFromFile", "Sampled Latents to File"
"SampledLatentsToFile"
], ],
{ {
"title_aux": "ComfyUI-IO-Helpers" "title_aux": "ComfyUI-IO-Helpers"
@@ -11825,7 +11809,6 @@
"SP_HiresGen_HiresCfg", "SP_HiresGen_HiresCfg",
"SP_HiresGen_Sharpen", "SP_HiresGen_Sharpen",
"SP_HunyuanLoader", "SP_HunyuanLoader",
"SP_ImpactSwitchCombo",
"SP_KSampler", "SP_KSampler",
"SP_KSamplerSelect", "SP_KSamplerSelect",
"SP_KoboldCpp", "SP_KoboldCpp",
@@ -14145,7 +14128,6 @@
"Mahiro", "Mahiro",
"MaskComposite", "MaskComposite",
"MaskToImage", "MaskToImage",
"ModelComputeDtype",
"ModelMergeAdd", "ModelMergeAdd",
"ModelMergeAuraflow", "ModelMergeAuraflow",
"ModelMergeBlocks", "ModelMergeBlocks",
@@ -15051,9 +15033,6 @@
"DavchaCLIPTextEncode", "DavchaCLIPTextEncode",
"DavchaConditioningConcat", "DavchaConditioningConcat",
"DavchaEmptyLatentImage", "DavchaEmptyLatentImage",
"DavchaLLM",
"DavchaLLMAdvanced",
"DavchaLoadLLM",
"DavchaLoadVideo", "DavchaLoadVideo",
"DavchaMaskImage", "DavchaMaskImage",
"DavchaModelMergeSD1", "DavchaModelMergeSD1",
@@ -16660,6 +16639,14 @@
"title_aux": "String Converter" "title_aux": "String Converter"
} }
], ],
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
[
"AnimaginePrompt"
],
{
"title_aux": "ComfyUI Animagine prompt"
}
],
"https://github.com/gmorks/ComfyUI-SendToDiscord": [ "https://github.com/gmorks/ComfyUI-SendToDiscord": [
[ [
"PreviewImageWithDiscord" "PreviewImageWithDiscord"
@@ -17447,7 +17434,6 @@
"WWAA_GBCamera", "WWAA_GBCamera",
"WWAA_ImageLoader", "WWAA_ImageLoader",
"WWAA_ImageToTextFile", "WWAA_ImageToTextFile",
"WWAA_NestedLoopCounter",
"WWAA_PromptWriter" "WWAA_PromptWriter"
], ],
{ {
@@ -17568,11 +17554,12 @@
"BiRefNet", "BiRefNet",
"ControlImagePreprocessor", "ControlImagePreprocessor",
"ControlNetModelLoader", "ControlNetModelLoader",
"DiffusersMVModelMakeup",
"DiffusersMVPipelineLoader",
"DiffusersMVSampler", "DiffusersMVSampler",
"DiffusersMVSchedulerLoader", "DiffusersModelMakeup",
"DiffusersMVVaeLoader", "DiffusersPipelineLoader",
"DiffusersSampler",
"DiffusersSchedulerLoader",
"DiffusersVaeLoader",
"ImagePreprocessor", "ImagePreprocessor",
"LdmPipelineLoader", "LdmPipelineLoader",
"LdmVaeLoader", "LdmVaeLoader",
@@ -19773,7 +19760,6 @@
"TorchCompileCosmosModel", "TorchCompileCosmosModel",
"TorchCompileLTXModel", "TorchCompileLTXModel",
"TorchCompileModelFluxAdvanced", "TorchCompileModelFluxAdvanced",
"TorchCompileModelHyVideo",
"TorchCompileVAE", "TorchCompileVAE",
"TransitionImagesInBatch", "TransitionImagesInBatch",
"TransitionImagesMulti", "TransitionImagesMulti",
@@ -21771,7 +21757,6 @@
], ],
"https://github.com/lum3on/comfyui_LLM_Polymath": [ "https://github.com/lum3on/comfyui_LLM_Polymath": [
[ [
"polymath_SaveAbsolute",
"polymath_chat", "polymath_chat",
"polymath_scraper" "polymath_scraper"
], ],
@@ -23301,7 +23286,6 @@
], ],
"https://github.com/olduvai-jp/ComfyUI-HfLoader": [ "https://github.com/olduvai-jp/ComfyUI-HfLoader": [
[ [
"ControlNet Loader From HF",
"Lora Loader From HF" "Lora Loader From HF"
], ],
{ {
@@ -24796,7 +24780,6 @@
"FlipStreamSwitchLatent", "FlipStreamSwitchLatent",
"FlipStreamTextBox", "FlipStreamTextBox",
"FlipStreamTextReplace", "FlipStreamTextReplace",
"FlipStreamVideoInput",
"FlipStreamViewer" "FlipStreamViewer"
], ],
{ {
@@ -26466,20 +26449,6 @@
"title_aux": "ComfyUI-Helper-Nodes" "title_aux": "ComfyUI-Helper-Nodes"
} }
], ],
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock": [
[
"DeepFuze Save",
"DeepFuzeAdavance",
"DeepFuzeFaceSwap",
"DeepfuzePreview",
"LLM_node",
"PlayBackAudio",
"TTS_generation"
],
{
"title_aux": "ComfyUI-DeepUnlock"
}
],
"https://github.com/theAdamColton/ComfyUI-texflow-extension": [ "https://github.com/theAdamColton/ComfyUI-texflow-extension": [
[ [
"Load Texflow Depth Image", "Load Texflow Depth Image",
@@ -27441,14 +27410,6 @@
"title_aux": "zsq_prompt" "title_aux": "zsq_prompt"
} }
], ],
"https://github.com/wirytiox/ComfyUI-SelectStringFromListWithIndex": [
[
"StringFromList"
],
{
"title_aux": "ComfyUI-SelectStringFromListWithIndex"
}
],
"https://github.com/wjl0313/ComfyUI_KimNodes": [ "https://github.com/wjl0313/ComfyUI_KimNodes": [
[ [
"Add_ImageMetadata", "Add_ImageMetadata",

View File

@@ -291,16 +291,6 @@
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off" "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
},
{
"author": "xhiroga",
"title": "ComfyUI-TypeScript-CustomNode",
"reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
"files": [
"https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
],
"install_type": "git-clone",
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
} }
] ]
} }

View File

@@ -421,33 +421,29 @@ except Exception as e:
print(f"[ComfyUI-Manager] Logging failed: {e}") print(f"[ComfyUI-Manager] Logging failed: {e}")
def ensure_dependencies(): try:
try: import git # noqa: F401
import git # noqa: F401 import toml # noqa: F401
import toml # noqa: F401 import rich # noqa: F401
import rich # noqa: F401 except ModuleNotFoundError:
import chardet # noqa: F401 my_path = os.path.dirname(__file__)
except ModuleNotFoundError: requirements_path = os.path.join(my_path, "requirements.txt")
my_path = os.path.dirname(__file__)
requirements_path = os.path.join(my_path, "requirements.txt")
print("## ComfyUI-Manager: installing dependencies. (GitPython)") print("## ComfyUI-Manager: installing dependencies. (GitPython)")
try:
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
try: try:
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path])) result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.") print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
try:
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
try: try:
print("## ComfyUI-Manager: installing dependencies done.") print("## ComfyUI-Manager: installing dependencies done.")
except: except:
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed") print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
ensure_dependencies()
print("** ComfyUI startup time:", current_timestamp()) print("** ComfyUI startup time:", current_timestamp())
@@ -479,6 +475,7 @@ def read_downgrade_blacklist():
read_downgrade_blacklist() read_downgrade_blacklist()
print("[DBG] point1")
def check_bypass_ssl(): def check_bypass_ssl():
try: try:
@@ -491,12 +488,14 @@ def check_bypass_ssl():
check_bypass_ssl() check_bypass_ssl()
print("[DBG] point2")
# Perform install # Perform install
processed_install = set() processed_install = set()
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt") script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages()) pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
print("[DBG] point3")
def is_installed(name): def is_installed(name):
name = name.strip() name = name.strip()
@@ -548,6 +547,7 @@ def is_installed(name):
return True # prevent downgrade return True # prevent downgrade
print("[DBG] point4")
if os.path.exists(restore_snapshot_path): if os.path.exists(restore_snapshot_path):
try: try:
@@ -597,23 +597,24 @@ if os.path.exists(restore_snapshot_path):
def execute_lazy_install_script(repo_path, executable): def execute_lazy_install_script(repo_path, executable):
global processed_install global processed_install
print("[DBG] point5")
install_script_path = os.path.join(repo_path, "install.py") install_script_path = os.path.join(repo_path, "install.py")
requirements_path = os.path.join(repo_path, "requirements.txt") requirements_path = os.path.join(repo_path, "requirements.txt")
if os.path.exists(requirements_path): if os.path.exists(requirements_path):
print(f"Install: pip packages for '{repo_path}'") print(f"Install: pip packages for '{repo_path}'")
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else:
install_cmd = manager_util.make_pip_cmd(["install", package_name])
lines = manager_util.robust_readlines(requirements_path) process_wrap(install_cmd, repo_path)
for line in lines:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else:
install_cmd = manager_util.make_pip_cmd(["install", package_name])
process_wrap(install_cmd, repo_path)
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install: 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') processed_install.add(f'{repo_path}/install.py')
@@ -630,6 +631,8 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
import uuid import uuid
import shutil import shutil
print("[DBG] point6")
# 1. download # 1. download
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
download_path = os.path.join(custom_nodes_path, archive_name) download_path = os.path.join(custom_nodes_path, archive_name)
@@ -679,12 +682,16 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
def execute_migration(moves): def execute_migration(moves):
import shutil import shutil
print("[DBG] point7")
for x in moves: for x in moves:
if os.path.exists(x[0]) and not os.path.exists(x[1]): if os.path.exists(x[0]) and not os.path.exists(x[1]):
shutil.move(x[0], x[1]) shutil.move(x[0], x[1])
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'") print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
script_executed = False
print("[DBG] point8")
# Check if script_list_path exists # Check if script_list_path exists
if os.path.exists(script_list_path): if os.path.exists(script_list_path):
@@ -739,43 +746,25 @@ if os.path.exists(script_list_path):
# Remove the script_list_path file # Remove the script_list_path file
if os.path.exists(script_list_path): if os.path.exists(script_list_path):
script_executed = True
os.remove(script_list_path) os.remove(script_list_path)
print("\n[ComfyUI-Manager] Startup script completed.") print("\n[ComfyUI-Manager] Startup script completed.")
print("#######################################################################\n") print("#######################################################################\n")
print("[DBG] point9")
pip_fixer.fix_broken() pip_fixer.fix_broken()
print("[DBG] point10")
del processed_install del processed_install
del pip_fixer del pip_fixer
manager_util.clear_pip_cache() manager_util.clear_pip_cache()
if script_executed: print("[DBG] point11")
# Restart
print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
if '__COMFY_CLI_SESSION__' in os.environ:
with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
pass
print("--------------------------------------------------------------------------\n")
exit(0)
else:
sys_argv = sys.argv.copy()
if sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv
print(f"Command: {cmds}", flush=True)
print("--------------------------------------------------------------------------\n")
os.execv(sys.executable, cmds)
def check_windows_event_loop_policy(): def check_windows_event_loop_policy():
print("[DBG] point12")
try: try:
import configparser import configparser
config = configparser.ConfigParser() config = configparser.ConfigParser()
@@ -793,6 +782,10 @@ def check_windows_event_loop_policy():
except Exception: except Exception:
pass pass
print("[DBG] point13")
if platform.system() == 'Windows': if platform.system() == 'Windows':
check_windows_event_loop_policy() check_windows_event_loop_policy()
print("[DBG] point14")

View File

@@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.22" version = "3.21"
license = { file = "LICENSE.txt" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"] dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]

View File

@@ -8,4 +8,3 @@ rich
typing-extensions typing-extensions
toml toml
uv uv
chardet