From ac66df1d761ea1562848a099b109f406fc24afd4 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Thu, 4 Jan 2024 00:09:41 +0900 Subject: [PATCH] improve: download_url update DB --- __init__.py | 10 ++++++---- custom-node-list.json | 10 ++++++++++ extension-node-map.json | 13 +++++++++++-- model-list.json | 10 ++++++++++ node_db/new/custom-node-list.json | 10 ++++++++++ node_db/new/extension-node-map.json | 13 +++++++++++-- node_db/new/model-list.json | 10 ++++++++++ 7 files changed, 68 insertions(+), 8 deletions(-) diff --git a/__init__.py b/__init__.py index 77dee6b..fd636a3 100644 --- a/__init__.py +++ b/__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, 19, 1] +version = [1, 19, 2] version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') print(f"### Loading: ComfyUI-Manager ({version_str})") @@ -1604,13 +1604,15 @@ async def install_model(request): if model_path is not None: print(f"Install model '{json_data['name']}' into '{model_path}'") - if json_data['url'].startswith('https://github.com') or json_data['url'].startswith('https://huggingface.co'): + model_url = json_data['url'] + + if model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de'): model_dir = get_model_dir(json_data) - download_url(json_data['url'], model_dir) + download_url(model_url, model_dir, filename=json_data['filename']) return web.json_response({}, content_type='application/json') else: - res = download_url_with_agent(json_data['url'], model_path) + res = download_url_with_agent(model_url, model_path) else: print(f"Model installation error: invalid model type - {json_data['type']}") diff --git a/custom-node-list.json b/custom-node-list.json index 6c00e05..277329f 100644 --- a/custom-node-list.json +++ b/custom-node-list.json @@ -3964,6 +3964,16 @@ "install_type": "git-clone", "description": "This is a custom node that lets you take advantage of Latent Diffusion Super Resolution (LDSR) models inside ComfyUI." }, + { + "author": "massao000", + "title": "ComfyUI_aspect_ratios", + "reference": "https://github.com/massao000/ComfyUI_aspect_ratios", + "files": [ + "https://github.com/massao000/ComfyUI_aspect_ratios" + ], + "install_type": "git-clone", + "description": "Aspect ratio selector for ComfyUI based on [a/sd-webui-ar](https://github.com/alemelis/sd-webui-ar?tab=readme-ov-file)." + }, diff --git a/extension-node-map.json b/extension-node-map.json index f1f3baa..bb72d5b 100644 --- a/extension-node-map.json +++ b/extension-node-map.json @@ -2153,10 +2153,11 @@ "0246.Pick", "0246.RandomInt", "0246.Script", - "0246.ScriptImbue", "0246.ScriptNode", - "0246.ScriptPlan", + "0246.ScriptPile", "0246.ScriptRule", + "0246.StrAdd", + "0246.StrAddBatch", "0246.Stringify" ], { @@ -4904,6 +4905,14 @@ "title_aux": "comfyui-previewlatent" } ], + "https://github.com/massao000/ComfyUI_aspect_ratios": [ + [ + "Aspect Ratios Node" + ], + { + "title_aux": "ComfyUI_aspect_ratios" + } + ], "https://github.com/matan1905/ComfyUI-Serving-Toolkit": [ [ "DiscordServing", diff --git a/model-list.json b/model-list.json index 505629d..d059f76 100644 --- a/model-list.json +++ b/model-list.json @@ -120,6 +120,16 @@ "filename": "8x_NMKD-Superscale_150000_G.pth", "url": "https://huggingface.co/uwg/upscaler/resolve/main/ESRGAN/8x_NMKD-Superscale_150000_G.pth" }, + { + "name": "LDSR", + "type": "upscale", + "base": "upscale", + "save_path": "upscale_models/ldsr", + "description": "LDSR upscale model. Through the [a/ComfyUI-Flowty-LDSR](https://github.com/flowtyone/ComfyUI-Flowty-LDSR) extension, the upscale model can be utilized.", + "reference": "https://github.com/CompVis/latent-diffusion", + "filename": "last.ckpt", + "url": "https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1" + }, { "name": "Inswapper-fp16 (face swap)", "type": "insightface", diff --git a/node_db/new/custom-node-list.json b/node_db/new/custom-node-list.json index e5fe41d..1d66706 100644 --- a/node_db/new/custom-node-list.json +++ b/node_db/new/custom-node-list.json @@ -20,6 +20,16 @@ "install_type": "git-clone", "description": "This is a custom node that lets you take advantage of Latent Diffusion Super Resolution (LDSR) models inside ComfyUI." }, + { + "author": "massao000", + "title": "ComfyUI_aspect_ratios", + "reference": "https://github.com/massao000/ComfyUI_aspect_ratios", + "files": [ + "https://github.com/massao000/ComfyUI_aspect_ratios" + ], + "install_type": "git-clone", + "description": "Aspect ratio selector for ComfyUI based on [a/sd-webui-ar](https://github.com/alemelis/sd-webui-ar?tab=readme-ov-file)." + }, { "author": "Crystian", "title": "Crystools-save", diff --git a/node_db/new/extension-node-map.json b/node_db/new/extension-node-map.json index f1f3baa..bb72d5b 100644 --- a/node_db/new/extension-node-map.json +++ b/node_db/new/extension-node-map.json @@ -2153,10 +2153,11 @@ "0246.Pick", "0246.RandomInt", "0246.Script", - "0246.ScriptImbue", "0246.ScriptNode", - "0246.ScriptPlan", + "0246.ScriptPile", "0246.ScriptRule", + "0246.StrAdd", + "0246.StrAddBatch", "0246.Stringify" ], { @@ -4904,6 +4905,14 @@ "title_aux": "comfyui-previewlatent" } ], + "https://github.com/massao000/ComfyUI_aspect_ratios": [ + [ + "Aspect Ratios Node" + ], + { + "title_aux": "ComfyUI_aspect_ratios" + } + ], "https://github.com/matan1905/ComfyUI-Serving-Toolkit": [ [ "DiscordServing", diff --git a/node_db/new/model-list.json b/node_db/new/model-list.json index c839bfc..f21cc39 100644 --- a/node_db/new/model-list.json +++ b/node_db/new/model-list.json @@ -10,6 +10,16 @@ "filename": "control_sd15_inpaint_depth_hand_fp16.safetensors", "url": "https://huggingface.co/hr16/ControlNet-HandRefiner-pruned/resolve/main/control_sd15_inpaint_depth_hand_fp16.safetensors" }, + { + "name": "LDSR", + "type": "upscale", + "base": "upscale", + "save_path": "upscale_models/ldsr", + "description": "LDSR upscale model. Through the [a/ComfyUI-Flowty-LDSR](https://github.com/flowtyone/ComfyUI-Flowty-LDSR) extension, the upscale model can be utilized.", + "reference": "https://github.com/CompVis/latent-diffusion", + "filename": "last.ckpt", + "url": "https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1" + }, { "name": "ip-adapter-faceid_sd15.bin",