wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2026-01-01 09:40:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: skip update check doesn't work properly

Browse Source 
fix: layout
improve: raise thread count 4 -> 8 for update check
This commit is contained in:
Dr.Lt.Data 2024-01-06 11:54:27 +09:00
parent 66f86d2b40
commit 10fe8fd42c
8 changed files with 166 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
__init__.py
View File

@ -27,7 +27,7 @@ except:
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version is outdated. Please update to the latest version.") print(f"[WARN] ComfyUI-Manager: Your ComfyUI version is outdated. Please update to the latest version.")
version = [1, 25] version = [1, 25, 1]
version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
print(f"### Loading: ComfyUI-Manager ({version_str})") print(f"### Loading: ComfyUI-Manager ({version_str})")
@ -673,15 +673,17 @@ def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do
dir_path = os.path.join(custom_nodes_path, dir_name) dir_path = os.path.join(custom_nodes_path, dir_name)
if os.path.exists(dir_path): if os.path.exists(dir_path):
try: try:
update_state, success = git_repo_has_updates(dir_path, do_fetch, do_update) item['installed'] = 'True' # default
if (do_update_check or do_update) and update_state:
item['installed'] = 'Update' if cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
elif do_update and not success:
item['installed'] = 'Fail' item['installed'] = 'Fail'
elif cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
item['installed'] = 'Fail' if do_update_check:
else: update_state, success = git_repo_has_updates(dir_path, do_fetch, do_update)
item['installed'] = 'True' if (do_update_check or do_update) and update_state:
item['installed'] = 'Update'
elif do_update and not success:
item['installed'] = 'Fail'
except: except:
if cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name): if cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
item['installed'] = 'Fail' item['installed'] = 'Fail'
@ -727,7 +729,7 @@ def check_custom_nodes_installed(json_obj, do_fetch=False, do_update_check=True,
def process_custom_node(item): def process_custom_node(item):
check_a_custom_node_installed(item, do_fetch, do_update_check, do_update) check_a_custom_node_installed(item, do_fetch, do_update_check, do_update)
with concurrent.futures.ThreadPoolExecutor(4) as executor: with concurrent.futures.ThreadPoolExecutor(8) as executor:
for item in json_obj['custom_nodes']: for item in json_obj['custom_nodes']:
executor.submit(process_custom_node, item) executor.submit(process_custom_node, item)

37
custom-node-list.json
View File

@ -4034,7 +4034,26 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "Nodes: Image(s) To Websocket (Base64)" "description": "Nodes: Image(s) To Websocket (Base64)"
}, },
{
"author": "MrForExample",
"title": "ComfyUI-3D-Pack",
"reference": "https://github.com/MrForExample/ComfyUI-3D-Pack",
"files": [
"https://github.com/MrForExample/ComfyUI-3D-Pack"
],
"install_type": "git-clone",
"description": "An extensive node suite that enables ComfyUI to process 3D inputs (Mesh & UV Texture, etc) using cutting edge algorithms (3DGS, NeRF, etc.)"
},
{
"author": "Hangover3832",
"title": "ComfyUI-Hangover-Nodes",
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes",
"files": [
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes"
],
"install_type": "git-clone",
"description": "Nodes: MS kosmos-2 Interrogator. An implementation of Microsoft [a/kosmos-2](https://huggingface.co/microsoft/kosmos-2-patch14-224) image to text transformer."
},
{ {
"author": "Ser-Hilary", "author": "Ser-Hilary",
@ -4129,7 +4148,8 @@
"reference": "https://github.com/lrzjason/ComfyUIJasonNode", "reference": "https://github.com/lrzjason/ComfyUIJasonNode",
"files": [ "files": [
"https://github.com/lrzjason/ComfyUIJasonNode/raw/main/SDXLMixSampler.py", "https://github.com/lrzjason/ComfyUIJasonNode/raw/main/SDXLMixSampler.py",
"https://github.com/lrzjason/ComfyUIJasonNode/raw/main/LatentByRatio.py" "https://github.com/lrzjason/ComfyUIJasonNode/raw/main/LatentByRatio.py",
""
], ],
"install_type": "copy", "install_type": "copy",
"description": "Nodes:SDXLMixSampler, LatentByRatio" "description": "Nodes:SDXLMixSampler, LatentByRatio"
@ -4284,6 +4304,19 @@
"install_type": "copy", "install_type": "copy",
"description": "Nodes:tensor_trans_pil, Make Transparent mask, MergeImages, words_generatee, load_PIL image" "description": "Nodes:tensor_trans_pil, Make Transparent mask, MergeImages, words_generatee, load_PIL image"
}, },
{
"author": "celsojr2013",
"title": "ComfyUI SimpleTools Suit",
"reference": "https://github.com/celsojr2013/comfyui_simpletools",
"files": [
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/google_translator.py",
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/parameters.py",
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/resolution_solver.py"
],
"install_type": "copy",
"description": "Nodes:Simple Gooogle Translator Client, Simple Mustache Parameter Switcher, Simple Latent Resolution Solver."
},
{ {
"author": "theally", "author": "theally",

53
extension-node-map.json
View File

@ -1786,6 +1786,7 @@
"CR Float To Integer", "CR Float To Integer",
"CR Float To String", "CR Float To String",
"CR Font File List", "CR Font File List",
"CR Get Parameter From Prompt",
"CR Gradient Float", "CR Gradient Float",
"CR Gradient Integer", "CR Gradient Integer",
"CR Halftone Filter", "CR Halftone Filter",
@ -1958,7 +1959,7 @@
], ],
{ {
"author": "Suzie1", "author": "Suzie1",
"description": "157 custom nodes for artists, designers and animators.", "description": "159 custom nodes for artists, designers and animators.",
"nickname": "Comfyroll Studio", "nickname": "Comfyroll Studio",
"title": "Comfyroll Studio", "title": "Comfyroll Studio",
"title_aux": "ComfyUI_Comfyroll_CustomNodes" "title_aux": "ComfyUI_Comfyroll_CustomNodes"
@ -1995,17 +1996,15 @@
], ],
"https://github.com/THtianhao/ComfyUI-FaceChain": [ "https://github.com/THtianhao/ComfyUI-FaceChain": [
[ [
"FCStyleLoraLoad", "FC CropAndPaste",
"FC_CropAndPaste", "FC CropBottom",
"FC_CropBottom", "FC FaceDetectCrop",
"FC_CropFace", "FC FaceFusion",
"FC_CropMask", "FC FaceSegment",
"FC_FaceDetection", "FC MaskOP",
"FC_FaceFusion", "FC ReplaceImage",
"FC_MaskOP", "FC StyleLoraLoad",
"FC_ReplaceImage", "FCStyleLoraLoad"
"FC_Segment",
"FC_StyleLoraLoad"
], ],
{ {
"title_aux": "ComfyUI-FaceChain" "title_aux": "ComfyUI-FaceChain"
@ -2220,7 +2219,8 @@
], ],
"https://github.com/WASasquatch/FreeU_Advanced": [ "https://github.com/WASasquatch/FreeU_Advanced": [
[ [
"FreeU (Advanced)" "FreeU (Advanced)",
"FreeU_V2 (Advanced)"
], ],
{ {
"title_aux": "FreeU_Advanced" "title_aux": "FreeU_Advanced"
@ -3302,6 +3302,14 @@
"title_aux": "Image loader with subfolders" "title_aux": "Image loader with subfolders"
} }
], ],
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/google_translator.py": [
[
"GoogleTranslator"
],
{
"title_aux": "ComfyUI SimpleTools Suit"
}
],
"https://github.com/ceruleandeep/ComfyUI-LLaVA-Captioner": [ "https://github.com/ceruleandeep/ComfyUI-LLaVA-Captioner": [
[ [
"LlavaCaptioner" "LlavaCaptioner"
@ -3314,7 +3322,10 @@
[ [
"Load Motion Camera Preset", "Load Motion Camera Preset",
"Load Motion Traj Preset", "Load Motion Traj Preset",
"Load Motionctrl Checkpoint",
"Motionctrl Cond",
"Motionctrl Sample", "Motionctrl Sample",
"Motionctrl Sample Simple",
"Select Image Indices" "Select Image Indices"
], ],
{ {
@ -3439,12 +3450,15 @@
"LoadCurrentWorkflowJSON", "LoadCurrentWorkflowJSON",
"LoadDiskWorkflowJSON", "LoadDiskWorkflowJSON",
"LoadImageUrl", "LoadImageUrl",
"LoadLatentNumpy",
"LoadLatentUrl",
"RemoteChainEnd", "RemoteChainEnd",
"RemoteChainStart", "RemoteChainStart",
"RemoteQueueSimple", "RemoteQueueSimple",
"RemoteQueueWorker", "RemoteQueueWorker",
"SaveDiskWorkflowJSON", "SaveDiskWorkflowJSON",
"SaveImageUrl" "SaveImageUrl",
"SaveLatentNumpy"
], ],
{ {
"title_aux": "ComfyUI_NetDist" "title_aux": "ComfyUI_NetDist"
@ -3602,6 +3616,7 @@
"SplitImageWithAlpha", "SplitImageWithAlpha",
"SplitSigmas", "SplitSigmas",
"StableZero123_Conditioning", "StableZero123_Conditioning",
"StableZero123_Conditioning_Batched",
"StyleModelApply", "StyleModelApply",
"StyleModelLoader", "StyleModelLoader",
"TomePatchModel", "TomePatchModel",
@ -5621,6 +5636,7 @@
"MultiplicationNode", "MultiplicationNode",
"NewLayer", "NewLayer",
"NoiseImage", "NoiseImage",
"PromptImage",
"PromptSimplification", "PromptSimplification",
"PromptSlide", "PromptSlide",
"RandomPrompt", "RandomPrompt",
@ -6484,7 +6500,16 @@
[ [
"dynamicThresholdingFull", "dynamicThresholdingFull",
"easy LLLiteLoader", "easy LLLiteLoader",
"easy XYInputs: CFG Scale",
"easy XYInputs: ControlNet",
"easy XYInputs: Denoise",
"easy XYInputs: ModelMergeBlocks",
"easy XYInputs: PromptSR",
"easy XYInputs: Sampler/Scheduler",
"easy XYInputs: Seeds++ Batch",
"easy XYInputs: Steps",
"easy XYPlot", "easy XYPlot",
"easy XYPlotAdvanced",
"easy a1111Loader", "easy a1111Loader",
"easy comfyLoader", "easy comfyLoader",
"easy controlnetLoader", "easy controlnetLoader",

4
js/comfyui-manager.js
View File

@ -13,7 +13,7 @@ var docStyle = document.createElement('style');
docStyle.innerHTML = ` docStyle.innerHTML = `
#cm-manager-dialog { #cm-manager-dialog {
width: 1000px; width: 1000px;
height: 460px; height: 465px;
box-sizing: content-box; box-sizing: content-box;
z-index: 10000; z-index: 10000;
} }
@ -66,7 +66,7 @@ docStyle.innerHTML = `
.cm-notice-board { .cm-notice-board {
width: 310px; width: 310px;
padding: 0px !important; padding: 0px !important;
height: 250px; height: 230px;
overflow: auto; overflow: auto;
color: var(--input-text); color: var(--input-text);
border: 1px solid var(--descrip-text); border: 1px solid var(--descrip-text);

2
js/custom-nodes-downloader.js
View File

@ -568,7 +568,7 @@ export class CustomNodesInstaller extends ComfyDialog {
installBtn.style.color = 'white'; installBtn.style.color = 'white';
break; break;
default: default:
installBtn.innerHTML = `Try Install${data.installed}`; installBtn.innerHTML = `Try Install`;
installBtn.style.backgroundColor = 'Gray'; installBtn.style.backgroundColor = 'Gray';
installBtn.style.color = 'white'; installBtn.style.color = 'white';
} }

12
node_db/dev/custom-node-list.json
View File

@ -9,16 +9,16 @@
"description": "If you see this message, your ComfyUI-Manager is outdated.\nDev channel provides only the list of the developing nodes. If you want to find the complete node list, please go to the Default channel." "description": "If you see this message, your ComfyUI-Manager is outdated.\nDev channel provides only the list of the developing nodes. If you want to find the complete node list, please go to the Default channel."
}, },
{ {
"author": "Hangover3832", "author": "nidefawl",
"title": "ComfyUI-Hangover-Nodes", "title": "ComfyUI-nidefawl [UNSAFE]",
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes", "reference": "https://github.com/nidefawl/ComfyUI-nidefawl",
"files": [ "files": [
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes" "https://github.com/nidefawl/ComfyUI-nidefawl"
], ],
"pip": ["transformers>=4.36.2"],
"install_type": "git-clone", "install_type": "git-clone",
"description": "Nodes: MS kosmos-2 Interrogator. An implementation of Microsoft [a/kosmos-2](https://huggingface.co/microsoft/kosmos-2-patch14-224) image to text transformer." "description": "Nodes:PythonScript, BlendImagesWithBoundedMasks, CropImagesWithMasks, VAELoaderDataType, ModelSamplerTonemapNoiseTest, gcLatentTunnel, ReferenceOnlySimple, EmptyImageWithColor, MaskFromColor, SetLatentCustomNoise, LatentToImage, ImageToLatent, LatentScaledNoise, DisplayAnyType, SamplerCustomCallback, CustomCallback, SplitCustomSigmas, SamplerDPMPP_2M_SDE_nidefawl, LatentPerlinNoise.<BR>[w/This node is an unsafe node that includes the capability to execute arbitrary python script.]"
}, },
{ {
"author": "solarpush", "author": "solarpush",

32
node_db/new/custom-node-list.json
View File

@ -9,6 +9,38 @@
"description": "If you see this message, your ComfyUI-Manager is outdated.\nRecent channel provides only the list of the latest nodes. If you want to find the complete node list, please go to the Default channel." "description": "If you see this message, your ComfyUI-Manager is outdated.\nRecent channel provides only the list of the latest nodes. If you want to find the complete node list, please go to the Default channel."
}, },
{
"author": "Hangover3832",
"title": "ComfyUI-Hangover-Nodes",
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes",
"files": [
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes"
],
"install_type": "git-clone",
"description": "Nodes: MS kosmos-2 Interrogator. An implementation of Microsoft [a/kosmos-2](https://huggingface.co/microsoft/kosmos-2-patch14-224) image to text transformer."
},
{
"author": "celsojr2013",
"title": "ComfyUI SimpleTools Suit",
"reference": "https://github.com/celsojr2013/comfyui_simpletools",
"files": [
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/google_translator.py",
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/parameters.py",
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/resolution_solver.py"
],
"install_type": "copy",
"description": "Nodes:Simple Gooogle Translator Client, Simple Mustache Parameter Switcher, Simple Latent Resolution Solver."
},
{
"author": "MrForExample",
"title": "ComfyUI-3D-Pack",
"reference": "https://github.com/MrForExample/ComfyUI-3D-Pack",
"files": [
"https://github.com/MrForExample/ComfyUI-3D-Pack"
],
"install_type": "git-clone",
"description": "An extensive node suite that enables ComfyUI to process 3D inputs (Mesh & UV Texture, etc) using cutting edge algorithms (3DGS, NeRF, etc.)"
},
{ {
"author": "kft334", "author": "kft334",
"title": "Knodes", "title": "Knodes",

53
node_db/new/extension-node-map.json
View File

@ -1786,6 +1786,7 @@
"CR Float To Integer", "CR Float To Integer",
"CR Float To String", "CR Float To String",
"CR Font File List", "CR Font File List",
"CR Get Parameter From Prompt",
"CR Gradient Float", "CR Gradient Float",
"CR Gradient Integer", "CR Gradient Integer",
"CR Halftone Filter", "CR Halftone Filter",
@ -1958,7 +1959,7 @@
], ],
{ {
"author": "Suzie1", "author": "Suzie1",
"description": "157 custom nodes for artists, designers and animators.", "description": "159 custom nodes for artists, designers and animators.",
"nickname": "Comfyroll Studio", "nickname": "Comfyroll Studio",
"title": "Comfyroll Studio", "title": "Comfyroll Studio",
"title_aux": "ComfyUI_Comfyroll_CustomNodes" "title_aux": "ComfyUI_Comfyroll_CustomNodes"
@ -1995,17 +1996,15 @@
], ],
"https://github.com/THtianhao/ComfyUI-FaceChain": [ "https://github.com/THtianhao/ComfyUI-FaceChain": [
[ [
"FCStyleLoraLoad", "FC CropAndPaste",
"FC_CropAndPaste", "FC CropBottom",
"FC_CropBottom", "FC FaceDetectCrop",
"FC_CropFace", "FC FaceFusion",
"FC_CropMask", "FC FaceSegment",
"FC_FaceDetection", "FC MaskOP",
"FC_FaceFusion", "FC ReplaceImage",
"FC_MaskOP", "FC StyleLoraLoad",
"FC_ReplaceImage", "FCStyleLoraLoad"
"FC_Segment",
"FC_StyleLoraLoad"
], ],
{ {
"title_aux": "ComfyUI-FaceChain" "title_aux": "ComfyUI-FaceChain"
@ -2220,7 +2219,8 @@
], ],
"https://github.com/WASasquatch/FreeU_Advanced": [ "https://github.com/WASasquatch/FreeU_Advanced": [
[ [
"FreeU (Advanced)" "FreeU (Advanced)",
"FreeU_V2 (Advanced)"
], ],
{ {
"title_aux": "FreeU_Advanced" "title_aux": "FreeU_Advanced"
@ -3302,6 +3302,14 @@
"title_aux": "Image loader with subfolders" "title_aux": "Image loader with subfolders"
} }
], ],
"https://github.com/celsojr2013/comfyui_simpletools/raw/main/google_translator.py": [
[
"GoogleTranslator"
],
{
"title_aux": "ComfyUI SimpleTools Suit"
}
],
"https://github.com/ceruleandeep/ComfyUI-LLaVA-Captioner": [ "https://github.com/ceruleandeep/ComfyUI-LLaVA-Captioner": [
[ [
"LlavaCaptioner" "LlavaCaptioner"
@ -3314,7 +3322,10 @@
[ [
"Load Motion Camera Preset", "Load Motion Camera Preset",
"Load Motion Traj Preset", "Load Motion Traj Preset",
"Load Motionctrl Checkpoint",
"Motionctrl Cond",
"Motionctrl Sample", "Motionctrl Sample",
"Motionctrl Sample Simple",
"Select Image Indices" "Select Image Indices"
], ],
{ {
@ -3439,12 +3450,15 @@
"LoadCurrentWorkflowJSON", "LoadCurrentWorkflowJSON",
"LoadDiskWorkflowJSON", "LoadDiskWorkflowJSON",
"LoadImageUrl", "LoadImageUrl",
"LoadLatentNumpy",
"LoadLatentUrl",
"RemoteChainEnd", "RemoteChainEnd",
"RemoteChainStart", "RemoteChainStart",
"RemoteQueueSimple", "RemoteQueueSimple",
"RemoteQueueWorker", "RemoteQueueWorker",
"SaveDiskWorkflowJSON", "SaveDiskWorkflowJSON",
"SaveImageUrl" "SaveImageUrl",
"SaveLatentNumpy"
], ],
{ {
"title_aux": "ComfyUI_NetDist" "title_aux": "ComfyUI_NetDist"
@ -3602,6 +3616,7 @@
"SplitImageWithAlpha", "SplitImageWithAlpha",
"SplitSigmas", "SplitSigmas",
"StableZero123_Conditioning", "StableZero123_Conditioning",
"StableZero123_Conditioning_Batched",
"StyleModelApply", "StyleModelApply",
"StyleModelLoader", "StyleModelLoader",
"TomePatchModel", "TomePatchModel",
@ -5621,6 +5636,7 @@
"MultiplicationNode", "MultiplicationNode",
"NewLayer", "NewLayer",
"NoiseImage", "NoiseImage",
"PromptImage",
"PromptSimplification", "PromptSimplification",
"PromptSlide", "PromptSlide",
"RandomPrompt", "RandomPrompt",
@ -6484,7 +6500,16 @@
[ [
"dynamicThresholdingFull", "dynamicThresholdingFull",
"easy LLLiteLoader", "easy LLLiteLoader",
"easy XYInputs: CFG Scale",
"easy XYInputs: ControlNet",
"easy XYInputs: Denoise",
"easy XYInputs: ModelMergeBlocks",
"easy XYInputs: PromptSR",
"easy XYInputs: Sampler/Scheduler",
"easy XYInputs: Seeds++ Batch",
"easy XYInputs: Steps",
"easy XYPlot", "easy XYPlot",
"easy XYPlotAdvanced",
"easy a1111Loader", "easy a1111Loader",
"easy comfyLoader", "easy comfyLoader",
"easy controlnetLoader", "easy controlnetLoader",