From 3f51b7d2dd519e643704757a9bdc1259a7422eae Mon Sep 17 00:00:00 2001
From: "dr.lt.data" <Dr.Lt.Data@gmail.com>
Date: Fri, 15 Dec 2023 16:14:40 +0900
Subject: [PATCH] improve: [a/]() link population update DB

---
 __init__.py                 |  10 ++-
 model-list.json             |  96 +++++++++++++++-------------
 node_db/new/model-list.json | 121 ++++++++++++++++++++++++++++++------
 3 files changed, 162 insertions(+), 65 deletions(-)

diff --git a/__init__.py b/__init__.py
index 64d6ac16..5de718f1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -20,7 +20,7 @@ import nodes
 import torch
 
 
-version = [1, 13, 6]
+version = [1, 13, 7]
 version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
 print(f"### Loading: ComfyUI-Manager ({version_str})")
 
@@ -756,7 +756,7 @@ def convert_markdown_to_html(input_text):
     pattern_white = re.compile(r'%%([^*]+)%%')
 
     def replace_a(match):
-        return f"<a href='{match.group(2)}'>{match.group(1)}</a>"
+        return f"<a href='{match.group(2)}' target='blank'>{match.group(1)}</a>"
 
     def replace_w(match):
         return f"<p class='cm-warn-note'>{match.group(1)}</p>"
@@ -785,6 +785,9 @@ def populate_markdown(x):
     if 'description' in x:
         x['description'] = convert_markdown_to_html(x['description'])
 
+    if 'name' in x:
+        x['name'] = x['name'].replace('<', '&lt;').replace('>', '&gt;')
+
     if 'title' in x:
         x['title'] = x['title'].replace('<', '&lt;').replace('>', '&gt;')
 
@@ -891,6 +894,9 @@ async def fetch_externalmodel_list(request):
 
     check_model_installed(json_obj)
 
+    for x in json_obj['models']:
+        populate_markdown(x)
+
     return web.json_response(json_obj, content_type='application/json')
 
 
diff --git a/model-list.json b/model-list.json
index 2db737ae..d95924ca 100644
--- a/model-list.json
+++ b/model-list.json
@@ -1338,94 +1338,104 @@
       "url": "https://huggingface.co/guoyww/animatediff/resolve/main/v2_lora_ZoomOut.ckpt"
     },
     {
-      "name": "ip-adapter_sd15.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter_sd15.safetensors",
       "type": "IP-Adapter",
       "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter_sd15.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15.bin"
+      "filename": "ip-adapter_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15.safetensors"
     },
     {
-      "name": "ip-adapter_sd15_light.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter_sd15_light.safetensors",
       "type": "IP-Adapter",
       "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Use this when text prompt is more important than reference images",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter_sd15_light.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15_light.bin"
+      "filename": "ip-adapter_sd15_light.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15_light.safetensors"
     },
     {
-      "name": "ip-adapter-plus_sd15.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter_sd15_vit-G.safetensors",
       "type": "IP-Adapter",
       "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-plus_sd15.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus_sd15.bin"
+      "filename": "ip-adapter_sd15_vit-G.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15_vit-G.safetensors"
     },
     {
-      "name": "ip-adapter-plus-face_sd15.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter-plus_sd15.safetensors",
       "type": "IP-Adapter",
       "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-plus-face_sd15.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus-face_sd15.bin"
+      "filename": "ip-adapter-plus_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus_sd15.safetensors"
     },
     {
-      "name": "ip-adapter-full-face_sd15.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter-plus-face_sd15.safetensors",
       "type": "IP-Adapter",
       "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-full-face_sd15.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-full-face_sd15.bin"
+      "filename": "ip-adapter-plus-face_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus-face_sd15.safetensors"
     },
     {
-      "name": "ip-adapter_sdxl.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter-full-face_sd15.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-full-face_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-full-face_sd15.safetensors"
+    },
+    {
+      "name": "ip-adapter_sdxl.safetensors",
       "type": "IP-Adapter",
       "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter_sdxl.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl.bin"
+      "filename": "ip-adapter_sdxl.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl.safetensors"
     },
     {
-      "name": "ip-adapter_sdxl_vit-h.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter_sdxl_vit-h.safetensors",
       "type": "IP-Adapter",
       "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
+      "save_path": "ipadapter",
       "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter_sdxl_vit-h.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl_vit-h.bin"
+      "filename": "ip-adapter_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl_vit-h.safetensors"
     },
     {
-      "name": "ip-adapter-plus_sdxl_vit-h.bin<BR>(ComfyUI_IPAdapter_plus)",
+      "name": "ip-adapter-plus_sdxl_vit-h.safetensors",
       "type": "IP-Adapter",
       "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
+      "save_path": "ipadapter",
       "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-plus_sdxl_vit-h.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus_sdxl_vit-h.bin"
+      "filename": "ip-adapter-plus_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus_sdxl_vit-h.safetensors"
     },
-        {
-      "name": "ip-adapter-plus-face_sdxl_vit-h.bin<BR>(ComfyUI_IPAdapter_plus)",
+    {
+      "name": "ip-adapter-plus-face_sdxl_vit-h.safetensors",
       "type": "IP-Adapter",
       "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
+      "save_path": "ipadapter",
       "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
       "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-plus-face_sdxl_vit-h.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus-face_sdxl_vit-h.bin"
+      "filename": "ip-adapter-plus-face_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus-face_sdxl_vit-h.safetensors"
     },
     {
       "name": "pfg-novel-n10.pt",
diff --git a/node_db/new/model-list.json b/node_db/new/model-list.json
index 63941285..f5e59612 100644
--- a/node_db/new/model-list.json
+++ b/node_db/new/model-list.json
@@ -1,5 +1,106 @@
 {
   "models": [
+    {
+      "name": "ip-adapter_sd15.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15.safetensors"
+    },
+    {
+      "name": "ip-adapter_sd15_light.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter_sd15_light.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15_light.safetensors"
+    },
+    {
+      "name": "ip-adapter_sd15_vit-G.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter_sd15_vit-G.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15_vit-G.safetensors"
+    },
+    {
+      "name": "ip-adapter-plus_sd15.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-plus_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus_sd15.safetensors"
+    },
+    {
+      "name": "ip-adapter-plus-face_sd15.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-plus-face_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-plus-face_sd15.safetensors"
+    },
+    {
+      "name": "ip-adapter-full-face_sd15.safetensors",
+      "type": "IP-Adapter",
+      "base": "SD1.5",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-full-face_sd15.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter-full-face_sd15.safetensors"
+    },
+    {
+      "name": "ip-adapter_sdxl.safetensors",
+      "type": "IP-Adapter",
+      "base": "SDXL",
+      "save_path": "ipadapter",
+      "description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter_sdxl.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl.safetensors"
+    },
+    {
+      "name": "ip-adapter_sdxl_vit-h.safetensors",
+      "type": "IP-Adapter",
+      "base": "SDXL",
+      "save_path": "ipadapter",
+      "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl_vit-h.safetensors"
+    },
+    {
+      "name": "ip-adapter-plus_sdxl_vit-h.safetensors",
+      "type": "IP-Adapter",
+      "base": "SDXL",
+      "save_path": "ipadapter",
+      "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-plus_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus_sdxl_vit-h.safetensors"
+    },
+    {
+      "name": "ip-adapter-plus-face_sdxl_vit-h.safetensors",
+      "type": "IP-Adapter",
+      "base": "SDXL",
+      "save_path": "ipadapter",
+      "description": "This model requires the use of the SD1.5 encoder despite being for SDXL checkpoints",
+      "reference": "https://huggingface.co/h94/IP-Adapter",
+      "filename": "ip-adapter-plus-face_sdxl_vit-h.safetensors",
+      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus-face_sdxl_vit-h.safetensors"
+    },
+
     {
       "name": "SDXL-Turbo 1.0 (fp16)",
       "type": "checkpoints",
@@ -235,26 +336,6 @@
       "url": "https://github.com/hben35096/assets/releases/download/yolo8/skin_yolov8n-seg_800.pt"
     },
 
-    {
-      "name": "ip-adapter-plus_sdxl_vit-h.bin<BR>(install to ComfyUI_IPAdapter_plus)",
-      "type": "IP-Adapter",
-      "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter-plus_sdxl_vit-h.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter-plus_sdxl_vit-h.bin"
-    },
-    {
-      "name": "ip-adapter_sdxl_vit-h.bin<BR>(install to ComfyUI_IPAdapter_plus)",
-      "type": "IP-Adapter",
-      "base": "SDXL",
-      "save_path": "custom_nodes/ComfyUI_IPAdapter_plus/models",
-      "description": "Pressing 'install' directly downloads the model from the ComfyUI_IPAdapter_plus/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/h94/IP-Adapter",
-      "filename": "ip-adapter_sdxl_vit-h.bin",
-      "url": "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl_vit-h.bin"
-    },
     {
       "name": "CiaraRowles/temporaldiff-v1-animatediff.ckpt (ComfyUI-AnimateDiff-Evolved)",
       "type": "animatediff",