Browse Source

fix: `skip update check` doesn't work properly

fix: layout
improve: raise thread count 4 -> 8 for update check
pull/302/head
Dr.Lt.Data 11 months ago
parent
commit
10fe8fd42c
  1. 22
      __init__.py
  2. 37
      custom-node-list.json
  3. 53
      extension-node-map.json
  4. 4
      js/comfyui-manager.js
  5. 2
      js/custom-nodes-downloader.js
  6. 12
      node_db/dev/custom-node-list.json
  7. 32
      node_db/new/custom-node-list.json
  8. 53
      node_db/new/extension-node-map.json

22
__init__.py

@ -27,7 +27,7 @@ except:
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 '')
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)
if os.path.exists(dir_path):
try:
update_state, success = git_repo_has_updates(dir_path, do_fetch, do_update)
if (do_update_check or do_update) and update_state:
item['installed'] = 'Update'
elif do_update and not success:
item['installed'] = 'Fail'
elif cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
item['installed'] = 'True' # default
if cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
item['installed'] = 'Fail'
else:
item['installed'] = 'True'
if do_update_check:
update_state, success = git_repo_has_updates(dir_path, do_fetch, do_update)
if (do_update_check or do_update) and update_state:
item['installed'] = 'Update'
elif do_update and not success:
item['installed'] = 'Fail'
except:
if cm_global.try_call(api="cm.is_import_failed_extension", name=dir_name):
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):
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']:
executor.submit(process_custom_node, item)

37
custom-node-list.json

@ -4034,7 +4034,26 @@
"install_type": "git-clone",
"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",
@ -4129,7 +4148,8 @@
"reference": "https://github.com/lrzjason/ComfyUIJasonNode",
"files": [
"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",
"description": "Nodes:SDXLMixSampler, LatentByRatio"
@ -4284,6 +4304,19 @@
"install_type": "copy",
"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",

53
extension-node-map.json

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

4
js/comfyui-manager.js vendored

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

2
js/custom-nodes-downloader.js

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

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

@ -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."
},
{
"author": "Hangover3832",
"title": "ComfyUI-Hangover-Nodes",
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes",
"author": "nidefawl",
"title": "ComfyUI-nidefawl [UNSAFE]",
"reference": "https://github.com/nidefawl/ComfyUI-nidefawl",
"files": [
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes"
"https://github.com/nidefawl/ComfyUI-nidefawl"
],
"pip": ["transformers>=4.36.2"],
"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",

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

@ -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."
},
{
"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",
"title": "Knodes",

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

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

Loading…
Cancel
Save