Merge branch 'main' into feat/cnr

This commit is contained in:
Dr.Lt.Data 2024-09-24 02:07:19 +09:00
commit d48c936770
10 changed files with 2061 additions and 1905 deletions

View File

@ -7381,6 +7381,16 @@
"install_type": "git-clone",
"description": "ComfyUI nodes to use [a/DiLightNet](https://github.com/iamNCJ/DiLightNet).\nThese nodes can run DiLightNet, but the Dust3r or BlenderPy implementations to create lighting are not included. Expect those to be added to seperate repos when time allows."
},
{
"author": "logtd",
"title": "ComfyUI-ViewCrafter",
"reference": "https://github.com/logtd/ComfyUI-ViewCrafter",
"files": [
"https://github.com/logtd/ComfyUI-ViewCrafter"
],
"install_type": "git-clone",
"description": "ComfyUI nodes to use [a/ViewCrafter](https://github.com/Drexubery/ViewCrafter/tree/main) for novel view synthesis."
},
{
"author": "Big-Idea-Technology",
"title": "ComfyUI-Book-Tools Nodes for ComfyUI",
@ -14732,6 +14742,26 @@
"install_type": "git-clone",
"description": "Custom node for ComfyUI. It adds additional metadata for saved images, ensuring compatibility with the Civitai website."
},
{
"author": "dfghsdh",
"title": "ComfyUI_FluxPromptGen",
"reference": "https://github.com/dfghsdh/ComfyUI_FluxPromptGen",
"files": [
"https://github.com/dfghsdh/ComfyUI_FluxPromptGen"
],
"install_type": "git-clone",
"description": "Flux Prompt Generator is a custom node set for ComfyUI that enhances prompt generation and image captioning capabilities. It integrates advanced language models and image captioning techniques to provide versatile and powerful prompt manipulation tools for your AI image generation workflows.\nNOTE:PORT OF [a/https://huggingface.co/Aitrepreneur/FLUX-Prompt-Generator](https://huggingface.co/Aitrepreneur/FLUX-Prompt-Generator) for COMFYUI"
},
{
"author": "liushuchun",
"title": "ComfyUI_Lora_List_With_Url_Loader",
"reference": "https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader",
"files": [
"https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader"
],
"install_type": "git-clone",
"description": "Nodes:ComfyUI_Lora_List_With_Url_Loader. Load loras from urls and auto fetch them on web if they are missing."
},

View File

@ -4010,6 +4010,7 @@
"MaraScottPasteInpaintingByMask_v1",
"MaraScottPromptFromImage_v1",
"MaraScottSetInpaintingByMask_v1",
"MaraScottTextConcatenate_v1",
"MaraScottUpscalerRefinerNode_v3",
"MaraScott_Kijai_TokenCounter_v1"
],
@ -7699,6 +7700,7 @@
],
"https://github.com/alexcong/ComfyUI_QwenVL": [
[
"Qwen2.5",
"Qwen2VL"
],
{
@ -9500,6 +9502,7 @@
"LayerUtility: GetMainColors",
"LayerUtility: GradientImage",
"LayerUtility: GradientImage V2",
"LayerUtility: GrayValue",
"LayerUtility: HLFrequencyDetailRestore",
"LayerUtility: HSV Value",
"LayerUtility: If",
@ -10801,7 +10804,10 @@
"ConditioningCompress",
"DStack",
"DavchaCLIPMergeSimple",
"DavchaCLIPTextEncode",
"DavchaConditioningConcat",
"DavchaEmptyLatentImage",
"DavchaLoadVideo",
"DavchaModelMergeSD1",
"DavchaModelMergeSDXL",
"DavchaModelMergeSimple",
@ -10885,6 +10891,15 @@
"title_aux": "demofusion-comfyui"
}
],
"https://github.com/dfghsdh/ComfyUI_FluxPromptGen": [
[
"FluxImageCaptionNode",
"FluxPromptGeneratorNode"
],
{
"title_aux": "ComfyUI_FluxPromptGen"
}
],
"https://github.com/dfl/comfyui-clip-with-break": [
[
"AdvancedCLIPTextEncodeWithBreak",
@ -12614,6 +12629,8 @@
"FileOnlineDelete_gitee",
"FileOnlineStorage_gitee",
"FilePathExists",
"FolderCleaner",
"GGUFLoader",
"GeocodeTool",
"Image2Video",
"Images2Image",
@ -12703,6 +12720,9 @@
"load_wikipedia",
"md_to_excel",
"md_to_html",
"mini_party",
"mini_sd_prompt",
"mini_translate",
"none2false",
"omost_decode",
"omost_json2py",
@ -13818,13 +13838,10 @@
"https://github.com/justUmen/Bjornulf_custom_nodes": [
[
"Bjornulf_CharacterDescriptionGenerator",
"Bjornulf_CheckBlackImage",
"Bjornulf_ClearVRAM",
"Bjornulf_CombineBackgroundOverlay",
"Bjornulf_CombineImages",
"Bjornulf_CombineTexts",
"Bjornulf_CombineTextsByLines",
"Bjornulf_CustomStringType",
"Bjornulf_FreeVRAM",
"Bjornulf_GrayscaleTransform",
"Bjornulf_GreenScreenToTransparency",
@ -13854,24 +13871,16 @@
"Bjornulf_RandomTexts",
"Bjornulf_RemoveTransparency",
"Bjornulf_ResizeImage",
"Bjornulf_SaveApiImage",
"Bjornulf_SaveBjornulfLobeChat",
"Bjornulf_SaveImagePath",
"Bjornulf_SaveImageToFolder",
"Bjornulf_SaveText",
"Bjornulf_SaveTmpImage",
"Bjornulf_SelectImageFromList",
"Bjornulf_ShowFloat",
"Bjornulf_ShowInt",
"Bjornulf_ShowText",
"Bjornulf_ShowWhatever",
"Bjornulf_TextToSpeech",
"Bjornulf_TextToStringAndSeed",
"Bjornulf_VideoPingPong",
"Bjornulf_WriteImageAllInOne",
"Bjornulf_WriteImageCharacter",
"Bjornulf_WriteImageCharacters",
"Bjornulf_WriteImageEnvironment",
"Bjornulf_WriteText",
"Bjornulf_WriteTextAdvanced",
"Bjornulf_imagesToVideo",
@ -14183,9 +14192,11 @@
"CogVideoDecode",
"CogVideoDualTextEncode_311",
"CogVideoImageEncode",
"CogVideoPABConfig",
"CogVideoSampler",
"CogVideoTextEncode",
"CogVideoTextEncodeCombine",
"CogVideoTransformerEdit",
"CogVideoXFunSampler",
"CogVideoXFunVid2VidSampler",
"DownloadAndLoadCogVideoGGUFModel",
@ -15055,6 +15066,14 @@
"title_aux": "comfyui-remote-tools"
}
],
"https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader": [
[
"LoraListUrlLoader"
],
{
"title_aux": "ComfyUI_Lora_List_With_Url_Loader"
}
],
"https://github.com/liusida/ComfyUI-AutoCropFaces": [
[
"AutoCropFaces"
@ -15351,6 +15370,16 @@
"title_aux": "Tracking Nodes for Videos"
}
],
"https://github.com/logtd/ComfyUI-ViewCrafter": [
[
"ApplyViewCrafter",
"LoadViewCrafter",
"ScaleImages"
],
{
"title_aux": "ComfyUI-ViewCrafter"
}
],
"https://github.com/longgui0318/comfyui-common-util": [
[
"Added Layer Info To Array",
@ -15841,6 +15870,7 @@
"LF_ResizeImageByEdge",
"LF_ResizeImageToSquare",
"LF_SaveImageForCivitAI",
"LF_SaveJSON",
"LF_SequentialSeedsGenerator",
"LF_SetValueInJSON",
"LF_Something2Number",

File diff suppressed because it is too large Load Diff

View File

@ -52,7 +52,9 @@ is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.
def is_allowed_security_level(level):
if level == 'high':
if level == 'block':
return False
elif level == 'high':
if is_local_mode:
return core.get_config()['security_level'].lower() in ['weak', 'normal-']
else:
@ -63,7 +65,7 @@ def is_allowed_security_level(level):
return True
async def get_risky_level(files):
async def get_risky_level(files, pip_packages):
json_data1 = await core.get_data_by_mode('local', 'custom-node-list.json')
json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://github.com/ltdrdata/ComfyUI-Manager/raw/main')
@ -75,6 +77,15 @@ async def get_risky_level(files):
if x not in all_urls:
return "high"
all_pip_packages = set()
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
if "pip" in x:
all_pip_packages.update(x['pip'])
for p in pip_packages:
if p not in all_pip_packages:
return "block"
return "middle"
@ -842,7 +853,7 @@ async def install_custom_node(request):
# apply security policy if not cnr node (nightly isn't regarded as cnr node)
if risky_level is None:
risky_level = await get_risky_level(json_data['files'])
risky_level = await get_risky_level(json_data['files'], json_data.get('pip', []))
if not is_allowed_security_level(risky_level):
print(SECURITY_MESSAGE_GENERAL)

View File

@ -12,6 +12,27 @@
{
"author": "jordancoult",
"title": "ComfyUI_HelpfulNodes",
"reference": "https://github.com/jordancoult/ComfyUI_HelpfulNodes",
"files": [
"https://github.com/jordancoult/ComfyUI_HelpfulNodes/raw/refs/heads/main/prep_crop_around_kps.py"
],
"install_type": "copy",
"description": "NODES: Prepare Crop Around Keypoints"
},
{
"author": "io-club",
"title": "ComfyUI-LuminaNext [WIP]",
"reference": "https://github.com/io-club/ComfyUI-LuminaNext",
"files": [
"https://github.com/io-club/ComfyUI-LuminaNext"
],
"install_type": "git-clone",
"description": "NODES: GemmaClipLoader"
},
{
"author": "shadowcz007",
"title": "Comfyui-EzAudio",

View File

@ -1905,6 +1905,14 @@
"title_aux": "ie-comfyui-color-nodes"
}
],
"https://github.com/io-club/ComfyUI-LuminaNext": [
[
"GemmaClipLoader"
],
{
"title_aux": "ComfyUI-LuminaNext [WIP]"
}
],
"https://github.com/jgbrblmd/ComfyUI-ComfyFluxSize": [
[
"ComfyFluxSize"
@ -2015,6 +2023,14 @@
"title_aux": "jn_node_suite_comfyui [WIP]"
}
],
"https://github.com/jordancoult/ComfyUI_HelpfulNodes/raw/refs/heads/main/prep_crop_around_kps.py": [
[
"CropAroundKPS"
],
{
"title_aux": "ComfyUI_HelpfulNodes"
}
],
"https://github.com/jp0215/comfyUI_padding-resize_node/raw/main/PaddingNode.py": [
[
"function"

File diff suppressed because it is too large Load Diff

View File

@ -10,6 +10,36 @@
{
"author": "logtd",
"title": "ComfyUI-ViewCrafter",
"reference": "https://github.com/logtd/ComfyUI-ViewCrafter",
"files": [
"https://github.com/logtd/ComfyUI-ViewCrafter"
],
"install_type": "git-clone",
"description": "ComfyUI nodes to use [a/ViewCrafter](https://github.com/Drexubery/ViewCrafter/tree/main) for novel view synthesis."
},
{
"author": "dfghsdh",
"title": "ComfyUI_FluxPromptGen",
"reference": "https://github.com/dfghsdh/ComfyUI_FluxPromptGen",
"files": [
"https://github.com/dfghsdh/ComfyUI_FluxPromptGen"
],
"install_type": "git-clone",
"description": "Flux Prompt Generator is a custom node set for ComfyUI that enhances prompt generation and image captioning capabilities. It integrates advanced language models and image captioning techniques to provide versatile and powerful prompt manipulation tools for your AI image generation workflows.\nNOTE:PORT OF [a/https://huggingface.co/Aitrepreneur/FLUX-Prompt-Generator](https://huggingface.co/Aitrepreneur/FLUX-Prompt-Generator) for COMFYUI"
},
{
"author": "liushuchun",
"title": "ComfyUI_Lora_List_With_Url_Loader",
"reference": "https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader",
"files": [
"https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader"
],
"install_type": "git-clone",
"description": "Nodes:ComfyUI_Lora_List_With_Url_Loader. Load loras from urls and auto fetch them on web if they are missing."
},
{
"author": "leeguandong",
"title": "ComfyUI_CompareModelWeights",
@ -661,38 +691,6 @@
],
"install_type": "git-clone",
"description": "Custom nodes for ComfyUI to automatically send generated images to Discord channels."
},
{
"author": "Extraltodeus",
"title": "DistanceSampler",
"id": "distancesampler",
"reference": "https://github.com/Extraltodeus/DistanceSampler",
"files": [
"https://github.com/Extraltodeus/Skimmed_CFG"
],
"install_type": "git-clone",
"description": "Heuristic modification of the Heun sampler using a custom function based on normalized distances. For ComfyUI."
},
{
"author": "SeanScripts",
"title": "ComfyUI-Unload-Model",
"reference": "https://github.com/SeanScripts/ComfyUI-Unload-Model",
"files": [
"https://github.com/SeanScripts/ComfyUI-Unload-Model"
],
"install_type": "git-clone",
"description": "For unloading a model or all models, using the memory management that is already present in ComfyUI. Copied from [a/https://github.com/willblaschko/ComfyUI-Unload-Models](https://github.com/willblaschko/ComfyUI-Unload-Models) but without the unnecessary extra stuff."
},
{
"author": "Shiba-2-shiba",
"title": "ComfyUI_DiffusionModel_fp8_converter",
"id": "fp8-converter",
"reference": "https://github.com/Shiba-2-shiba/ComfyUI_DiffusionModel_fp8_converter",
"files": [
"https://github.com/Shiba-2-shiba/ComfyUI_DiffusionModel_fp8_converter"
],
"install_type": "git-clone",
"description": "This is a custom node to convert only the Diffusion model part or CLIP model part to fp8 in ComfyUI.\nVAE fp8 conversion is not supported.\nThe advantage of this node is that you do not need to separate unet/clip/vae in advance when converting to fp8, but can use the safetenros files that ComfyUI provides."
}
]
}

View File

@ -4010,6 +4010,7 @@
"MaraScottPasteInpaintingByMask_v1",
"MaraScottPromptFromImage_v1",
"MaraScottSetInpaintingByMask_v1",
"MaraScottTextConcatenate_v1",
"MaraScottUpscalerRefinerNode_v3",
"MaraScott_Kijai_TokenCounter_v1"
],
@ -7699,6 +7700,7 @@
],
"https://github.com/alexcong/ComfyUI_QwenVL": [
[
"Qwen2.5",
"Qwen2VL"
],
{
@ -9500,6 +9502,7 @@
"LayerUtility: GetMainColors",
"LayerUtility: GradientImage",
"LayerUtility: GradientImage V2",
"LayerUtility: GrayValue",
"LayerUtility: HLFrequencyDetailRestore",
"LayerUtility: HSV Value",
"LayerUtility: If",
@ -10801,7 +10804,10 @@
"ConditioningCompress",
"DStack",
"DavchaCLIPMergeSimple",
"DavchaCLIPTextEncode",
"DavchaConditioningConcat",
"DavchaEmptyLatentImage",
"DavchaLoadVideo",
"DavchaModelMergeSD1",
"DavchaModelMergeSDXL",
"DavchaModelMergeSimple",
@ -10885,6 +10891,15 @@
"title_aux": "demofusion-comfyui"
}
],
"https://github.com/dfghsdh/ComfyUI_FluxPromptGen": [
[
"FluxImageCaptionNode",
"FluxPromptGeneratorNode"
],
{
"title_aux": "ComfyUI_FluxPromptGen"
}
],
"https://github.com/dfl/comfyui-clip-with-break": [
[
"AdvancedCLIPTextEncodeWithBreak",
@ -12614,6 +12629,8 @@
"FileOnlineDelete_gitee",
"FileOnlineStorage_gitee",
"FilePathExists",
"FolderCleaner",
"GGUFLoader",
"GeocodeTool",
"Image2Video",
"Images2Image",
@ -12703,6 +12720,9 @@
"load_wikipedia",
"md_to_excel",
"md_to_html",
"mini_party",
"mini_sd_prompt",
"mini_translate",
"none2false",
"omost_decode",
"omost_json2py",
@ -13818,13 +13838,10 @@
"https://github.com/justUmen/Bjornulf_custom_nodes": [
[
"Bjornulf_CharacterDescriptionGenerator",
"Bjornulf_CheckBlackImage",
"Bjornulf_ClearVRAM",
"Bjornulf_CombineBackgroundOverlay",
"Bjornulf_CombineImages",
"Bjornulf_CombineTexts",
"Bjornulf_CombineTextsByLines",
"Bjornulf_CustomStringType",
"Bjornulf_FreeVRAM",
"Bjornulf_GrayscaleTransform",
"Bjornulf_GreenScreenToTransparency",
@ -13854,24 +13871,16 @@
"Bjornulf_RandomTexts",
"Bjornulf_RemoveTransparency",
"Bjornulf_ResizeImage",
"Bjornulf_SaveApiImage",
"Bjornulf_SaveBjornulfLobeChat",
"Bjornulf_SaveImagePath",
"Bjornulf_SaveImageToFolder",
"Bjornulf_SaveText",
"Bjornulf_SaveTmpImage",
"Bjornulf_SelectImageFromList",
"Bjornulf_ShowFloat",
"Bjornulf_ShowInt",
"Bjornulf_ShowText",
"Bjornulf_ShowWhatever",
"Bjornulf_TextToSpeech",
"Bjornulf_TextToStringAndSeed",
"Bjornulf_VideoPingPong",
"Bjornulf_WriteImageAllInOne",
"Bjornulf_WriteImageCharacter",
"Bjornulf_WriteImageCharacters",
"Bjornulf_WriteImageEnvironment",
"Bjornulf_WriteText",
"Bjornulf_WriteTextAdvanced",
"Bjornulf_imagesToVideo",
@ -14183,9 +14192,11 @@
"CogVideoDecode",
"CogVideoDualTextEncode_311",
"CogVideoImageEncode",
"CogVideoPABConfig",
"CogVideoSampler",
"CogVideoTextEncode",
"CogVideoTextEncodeCombine",
"CogVideoTransformerEdit",
"CogVideoXFunSampler",
"CogVideoXFunVid2VidSampler",
"DownloadAndLoadCogVideoGGUFModel",
@ -15055,6 +15066,14 @@
"title_aux": "comfyui-remote-tools"
}
],
"https://github.com/liushuchun/ComfyUI_Lora_List_With_Url_Loader": [
[
"LoraListUrlLoader"
],
{
"title_aux": "ComfyUI_Lora_List_With_Url_Loader"
}
],
"https://github.com/liusida/ComfyUI-AutoCropFaces": [
[
"AutoCropFaces"
@ -15351,6 +15370,16 @@
"title_aux": "Tracking Nodes for Videos"
}
],
"https://github.com/logtd/ComfyUI-ViewCrafter": [
[
"ApplyViewCrafter",
"LoadViewCrafter",
"ScaleImages"
],
{
"title_aux": "ComfyUI-ViewCrafter"
}
],
"https://github.com/longgui0318/comfyui-common-util": [
[
"Added Layer Info To Array",
@ -15841,6 +15870,7 @@
"LF_ResizeImageByEdge",
"LF_ResizeImageToSquare",
"LF_SaveImageForCivitAI",
"LF_SaveJSON",
"LF_SequentialSeedsGenerator",
"LF_SetValueInJSON",
"LF_Something2Number",

View File

@ -1,7 +1,7 @@
[project]
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."
version = "2.51"
version = "2.51.1"
license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]