Print form factor.

.env.example

@@ -1 +0,0 @@
-PYPI_TOKEN=your-pypi-token

.github/workflows/publish-to-pypi.yml

@@ -1,58 +0,0 @@
-name: Publish to PyPI
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - "pyproject.toml"
-
-jobs:
-  build-and-publish:
-    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-
-      - name: Install build dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install build twine
-
-      - name: Get current version
-        id: current_version
-        run: |
-          CURRENT_VERSION=$(grep -oP 'version = "\K[^"]+' pyproject.toml)
-          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "Current version: $CURRENT_VERSION"
-
-      - name: Build package
-        run: python -m build
-
-      - name: Create GitHub Release
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: dist/*
-          tag_name: v${{ steps.current_version.outputs.version }}
-          draft: false
-          prerelease: false
-          generate_release_notes: true
-
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_TOKEN }}
-          skip-existing: true
-          verbose: true 

.github/workflows/publish.yml

@@ -7,19 +7,15 @@ on:
     paths:
       - "pyproject.toml"
 
-permissions:
-  issues: write
-
 jobs:
   publish-node:
     name: Publish Custom Node to registry
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@v1
+        uses: Comfy-Org/publish-node-action@main
         with:
           ## Add your own personal access token to your Github Repository secrets and reference it here.
-          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.gitignore

@@ -17,7 +17,4 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
-/venv/
-build
-*.egg-info
-.env
+/venv/

CONTRIBUTING.md

@@ -1,47 +0,0 @@
-## Testing Changes
-
-1. Activate the ComfyUI environment.
-
-2. Build package locally after making changes.
-
-```bash
-# from inside the ComfyUI-Manager directory, with the ComfyUI environment activated
-python -m build
-```
-
-3. Install the package locally in the ComfyUI environment.
-
-```bash
-# Uninstall existing package
-pip uninstall comfyui-manager
-
-# Install the locale package
-pip install dist/comfyui-manager-*.whl
-```
-
-4. Start ComfyUI.
-
-```bash
-# after navigating to the ComfyUI directory
-python main.py
-```
-
-## Manually Publish Test Version to PyPi
-
-1. Set the `PYPI_TOKEN` environment variable in env file.
-
-2. If manually publishing, you likely want to use a release candidate version, so set the version in [pyproject.toml](pyproject.toml) to something like `0.0.1rc1`.
-
-3. Build the package.
-
-```bash
-python -m build
-```
-
-4. Upload the package to PyPi.
-
-```bash
-python -m twine upload dist/* --username __token__ --password $PYPI_TOKEN
-```
-
-5. View at https://pypi.org/project/comfyui-manager/

MANIFEST.in

@@ -1,7 +0,0 @@
-include comfyui_manager/js/*
-include comfyui_manager/*.json
-include comfyui_manager/glob/*
-include LICENSE.txt
-include README.md
-include requirements.txt
-include pyproject.toml

README.md

@@ -5,7 +5,6 @@
 ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
-* V4.0: Modify the structure to be installable via pip instead of using git clone.
 * V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
 * V3.10: `double-click feature` is removed
   * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
@@ -14,26 +13,78 @@
 
 ## Installation
 
-* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.
+### Installation[method1] (General installation method: ComfyUI-Manager only)
 
-* Manual installation of the nightly version:
-    * Clone to a temporary directory (**Note:** Do **not** clone into `ComfyUI/custom_nodes`.)
-      ```  
-      git clone https://github.com/Comfy-Org/ComfyUI-Manager  
-      ```  
-    * Install via pip
-      ```  
-      cd ComfyUI-Manager  
-      pip install .  
-      ```
+To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
 
+1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
+2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
+3. Restart ComfyUI
+
+
+### Installation[method2] (Installation for portable ComfyUI version: ComfyUI-Manager only)
+1. install git 
+- https://git-scm.com/download/win
+- standalone version  
+- select option: use windows default console window
+2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
+- Don't click. Right click the link and use save as...
+3. double click `install-manager-for-portable-version.bat` batch file
+
+![portable-install](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/portable-install.jpg)
+
+
+### Installation[method3] (Installation through comfy-cli: install ComfyUI and ComfyUI-Manager at once.)  
+> RECOMMENDED: comfy-cli provides various features to manage ComfyUI from the CLI.
+
+* **prerequisite: python 3, git**
+
+Windows:
+```commandline
+python -m venv venv
+venv\Scripts\activate
+pip install comfy-cli
+comfy install
+```
+
+Linux/OSX:
+```commandline
+python -m venv venv
+. venv/bin/activate
+pip install comfy-cli
+comfy install
+```
 * See also: https://github.com/Comfy-Org/comfy-cli
 
 
-## Front-end
+### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
 
-* The built-in front-end of ComfyUI-Manager is the legacy front-end. The front-end for ComfyUI-Manager is now provided via [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
-* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.
+To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
+* **prerequisite: python-is-python3, python3-venv, git**
+
+1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
+- Don't click. Right click the link and use save as...
+- ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
+2. `chmod +x install-comfyui-venv-linux.sh`
+3. `./install-comfyui-venv-linux.sh`
+
+### Installation Precautions
+* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
+  * Installing in a compressed file format is not recommended.
+* **DON'T**: Decompress directly into the `ComfyUI/custom_nodes` location, resulting in the Manager contents like `__init__.py` being placed directly in that directory.
+  * You have to remove all ComfyUI-Manager files from `ComfyUI/custom_nodes`
+* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager`.
+* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager-main`.
+  * In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations. Remove it and install properly via `git clone` method.
+
+
+You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
+
+## Colab Notebook
+This repository provides Colab notebooks that allow you to install and use ComfyUI, including ComfyUI-Manager. To use ComfyUI, [click on this link](https://colab.research.google.com/github/ltdrdata/ComfyUI-Manager/blob/main/notebooks/comfyui_colab_with_manager.ipynb).
+* Support for installing ComfyUI
+* Support for basic installation of ComfyUI-Manager
+* Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
 
 
 ## How To Use
@@ -263,6 +314,9 @@ The following settings are applied based on the section marked as `is_default`.
 * Use `aria2` as downloader
   * [howto](docs/en/use_aria2.md)
 
+* If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
+  * This option can be used if performance issues occur in a Colab+GDrive environment.
+
 
 ## Environment Variables
 

__init__.py

@@ -0,0 +1,21 @@
+import os
+import sys
+
+cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
+
+if not os.path.exists(cli_mode_flag):
+    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+    import manager_server  # noqa: F401
+    import share_3rdparty  # noqa: F401
+    import cm_global
+
+    if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
+        WEB_DIRECTORY = "js"
+else:
+    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
+
+NODE_CLASS_MAPPINGS = {}
+__all__ = ['NODE_CLASS_MAPPINGS']
+
+
+

cm-cli.py

@@ -15,30 +15,31 @@ import git
 import importlib
 
 
+sys.path.append(os.path.dirname(__file__))
+sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+
 import manager_util
 
 # read env vars
 # COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
 # `comfy_path` should be resolved before importing manager_core
-
 comfy_path = os.environ.get('COMFYUI_PATH')
-
 if comfy_path is None:
-    print("[bold red]cm-cli: environment variable 'COMFYUI_PATH' is not specified.[/bold red]")
-    exit(-1)
+    try:
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+    except:
+        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
+        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
+# This should be placed here
 sys.path.append(comfy_path)
 
-if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
-    print("[bold red]cm-cli: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.[/bold red]")
-    exit(-1)
-
-
 import utils.extra_config
-from .glob import cm_global
-from .glob import manager_core as core
-from .glob.manager_core import unified_manager
-from .glob import cnr_utils
+import cm_global
+import manager_core as core
+from manager_core import unified_manager
+import cnr_utils
 
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 
@@ -1046,16 +1047,18 @@ def save_snapshot(
 ):
     cmd_ctx.set_user_directory(user_directory)
 
-    if output is not None:
-        if(not output.endswith('.json') and not output.endswith('.yaml')):
-            print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
-            raise typer.Exit(code=1)
-    
-        dir_path = os.path.dirname(output)
+    if output is None:
+        print("[bold red]ERROR: missing output path[/bold red]")
+        raise typer.Exit(code=1)
         
-        if(dir_path != '' and not os.path.exists(dir_path)):
-            print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
-            raise typer.Exit(code=1)
+    if(not output.endswith('.json') and not output.endswith('.yaml')):
+        print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
+        raise typer.Exit(code=1)
+    
+    dir_path = os.path.dirname(output)
+    if(dir_path != '' and not os.path.exists(dir_path)):
+        print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
+        raise typer.Exit(code=1)
         
     path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
     print(f"Current snapshot is saved as `{path}`")
@@ -1268,6 +1271,20 @@ def export_custom_node_ids(
                     print(f"{x['id']}@unknown", file=output_file)
 
 
+@app.command(
+    "migrate",
+    help="Migrate legacy node system to new node system",
+)
+def migrate(
+        user_directory: str = typer.Option(
+            None,
+            help="user directory"
+        )
+):
+    cmd_ctx.set_user_directory(user_directory)
+    asyncio.run(unified_manager.migrate_unmanaged_nodes())
+
+
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(app())

cm-cli.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-python ./comfyui_manager/cm-cli.py $*
+python cm-cli.py $*

comfyui_manager/__init__.py

@@ -1,40 +0,0 @@
-import os
-import logging
-from comfy.cli_args import args
-
-ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT = True # Enable legacy ComfyUI Manager frontend while new UI is in beta phase
-
-def prestartup():
-    from . import prestartup_script  # noqa: F401
-    logging.info('[PRE] ComfyUI-Manager')
-
-
-def start():
-    logging.info('[START] ComfyUI-Manager')
-    from .glob import manager_server  # noqa: F401
-    from .glob import share_3rdparty  # noqa: F401
-    from .glob import cm_global       # noqa: F401
-
-    should_show_legacy_manager_front = os.environ.get('ENABLE_LEGACY_COMFYUI_MANAGER_FRONT', 'false') == 'true' or ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT
-    if not args.disable_manager and should_show_legacy_manager_front:
-        try:
-            import nodes
-            nodes.EXTENSION_WEB_DIRS['comfyui-manager-legacy'] = os.path.join(os.path.dirname(__file__), 'js')
-        except Exception as e:
-            print("Error enabling legacy ComfyUI Manager frontend:", e)
-
-
-def should_be_disabled(fullpath:str) -> bool:
-    """
-    1. Disables the legacy ComfyUI-Manager.
-    2. The blocklist can be expanded later based on policies.
-    """
-
-    if not args.disable_manager:
-        # In cases where installation is done via a zip archive, the directory name may not be comfyui-manager, and it may not contain a git repository.
-        # It is assumed that any installed legacy ComfyUI-Manager will have at least 'comfyui-manager' in its directory name.
-        dir_name = os.path.basename(fullpath).lower()
-        if 'comfyui-manager' in dir_name:
-            return True
-
-    return False

comfyui_manager/glob/enums.py

@@ -1,17 +0,0 @@
-import enum
-
-class NetworkMode(enum.Enum):
-    PUBLIC = "public"
-    PRIVATE = "private"
-    OFFLINE = "offline"
-
-class SecurityLevel(enum.Enum):
-    STRONG = "strong"
-    NORMAL = "normal"
-    NORMAL_MINUS = "normal-minus"
-    WEAK = "weak"
-
-class DBMode(enum.Enum):
-    LOCAL = "local"
-    CACHE = "cache"
-    REMOTE = "remote"

comfyui_manager/js/custom-nodes-manager.css

@@ -1,699 +0,0 @@
-.cn-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-	text-underline-offset: 3px;
-	outline: none;
-}
-
-.cn-manager .cn-flex-auto {
-	flex: auto;
-}
-
-.cn-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 8px;
-	border-color: var(--border-color);
-	border-style: solid;
-	margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.cn-manager button:disabled,
-.cn-manager input:disabled,
-.cn-manager select:disabled {
-	color: gray;
-}
-
-.cn-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.cn-manager .cn-manager-restart {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cn-manager .cn-manager-stop {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cn-manager .cn-manager-back {
-	align-items: center;
-	justify-content: center;
-}
-
-.arrow-icon {
-	height: 1em;
-	width: 1em;
-	margin-right: 5px;
-	transform: translateY(2px);
-}
-
-.cn-icon {
-	display: block;
-	width: 16px;
-	height: 16px;
-}
-
-.cn-icon svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-}
-
-.cn-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.cn-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.cn-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.cn-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-}
-
-.cn-manager-status {
-	padding-left: 10px;
-}
-
-.cn-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-	position: relative;
-}
-
-.cn-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cn-manager-message {
-	position: relative;
-}
-
-.cn-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cn-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.cn-manager-grid .tg-turbogrid .tg-highlight::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	display: block;
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-	background-color: #80bdff11;
-	pointer-events: none;
-}
-
-.cn-manager-grid .cn-pack-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.cn-manager-grid .cn-pack-desc a {
-	color: #5555FF;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.cn-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.cn-manager-grid .cn-pack-version {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100%;
-	gap: 5px;
-}
-
-.cn-manager-grid .cn-pack-nodes {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	gap: 5px;
-	cursor: pointer;
-	height: 100%;
-}
-
-.cn-manager-grid .cn-pack-nodes:hover {
-	text-decoration: underline;
-}
-
-.cn-manager-grid .cn-pack-conflicts {
-	color: orange;
-}
-
-.cn-popover {
-	position: fixed;
-	z-index: 10000;
-	padding: 20px;
-	color: #1e1e1e;
-	filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
-	overflow: hidden;
-}
-
-.cn-flyover {
-	position: absolute;
-    top: 0;
-	right: 0;
-    z-index: 1000;
-    display: none;
-    width: 50%;
-    height: 100%;
-    background-color: var(--comfy-menu-bg);
-    animation-duration: 0.2s;
-    animation-fill-mode: both;
-	flex-direction: column;
-}
-
-.cn-flyover::before {
-    position: absolute;
-    top: 0;
-    content: "";
-    z-index: 10;
-    display: block;
-    width: 10px;
-    height: 100%;
-    pointer-events: none;
-	left: -10px;
-    background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
-}
-
-.cn-flyover-header {
-	height: 45px;
-	display: flex;
-	align-items: center;
-	gap: 5px;
-	border-bottom: 1px solid var(--border-color);
-}
-
-.cn-flyover-close {
-	display: flex;
-	align-items: center;
-	padding: 0 10px;
-	justify-content: center;
-	cursor: pointer;
-	opacity: 0.8;
-	height: 100%;
-}
-
-.cn-flyover-close:hover {
-	opacity: 1;
-}
-
-.cn-flyover-close svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-	width: 20px;
-	height: 20px;
-}
-
-.cn-flyover-title {
-	display: flex;
-	align-items: center;
-	font-weight: bold;
-	gap: 10px;
-	flex: auto;
-}
-
-.cn-flyover-body {
-	height: calc(100% - 45px);
-	overflow-y: auto;
-	position: relative;
-	background-color: var(--comfy-menu-secondary-bg);
-}
-
-@keyframes cn-slide-in-right {
-    from {
-        visibility: visible;
-        transform: translate3d(100%, 0, 0);
-    }
-
-    to {
-        transform: translate3d(0, 0, 0);
-    }
-}
-
-.cn-slide-in-right {
-    animation-name: cn-slide-in-right;
-}
-
-@keyframes cn-slide-out-right {
-    from {
-        transform: translate3d(0, 0, 0);
-    }
-
-    to {
-        visibility: hidden;
-        transform: translate3d(100%, 0, 0);
-    }
-}
-
-.cn-slide-out-right {
-    animation-name: cn-slide-out-right;
-}
-
-.cn-nodes-list {
-	width: 100%;
-}
-
-.cn-nodes-row {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-}
-
-.cn-nodes-row:nth-child(odd) {
-	background-color: rgb(0 0 0 / 5%);
-}
-
-.cn-nodes-row:hover {
-    background-color: rgb(0 0 0 / 10%);
-}
-
-.cn-nodes-sn {
-	text-align: right;
-	min-width: 35px;
-	color: var(--drag-text);
-	flex-shrink: 0;
-	font-size: 12px;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name {
-	cursor: pointer;
-	white-space: nowrap;
-	flex-shrink: 0;
-	position: relative;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name::after {
-	content: attr(action);
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 100%;
-	transform: translate(5px, -50%);
-	font-size: 12px;
-	color: var(--drag-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	display: none;
-}
-
-.cn-nodes-name.action::after {
-	display: block;
-}
-
-.cn-nodes-name:hover {
-	text-decoration: underline;
-}
-
-.cn-nodes-conflict .cn-nodes-name,
-.cn-nodes-conflict .cn-icon {
-	color: orange;
-}
-
-.cn-conflicts-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 5px 0;
-}
-
-.cn-conflicts-list b {
-	font-weight: normal;
-	color: var(--descrip-text);
-}
-
-.cn-nodes-pack {
-	cursor: pointer;
-	color: skyblue;
-}
-
-.cn-nodes-pack:hover {
-	text-decoration: underline;
-}
-
-.cn-pack-badge {
-	font-size: 12px;
-	font-weight: normal;
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	color: var(--error-text);
-}
-
-.cn-preview {
-	min-width: 300px;
-	max-width: 500px;
-	min-height: 120px;
-	overflow: hidden;
-  	font-size: 12px;
-	pointer-events: none;
-	padding: 12px;
-	color: var(--fg-color);
-}
-
-.cn-preview-header {
-	display: flex;
-	gap: 8px;
-	align-items: center;
-	border-bottom: 1px solid var(--comfy-input-bg);
-	padding: 5px 10px;
-}
-
-.cn-preview-dot {
-	width: 8px;
-	height: 8px;
-	border-radius: 50%;
-	background-color: grey;
-	position: relative;
-	filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
-}
-
-.cn-preview-dot.cn-preview-optional::after {
-	content: "";
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	background-color: var(--comfy-input-bg);
-	border-radius: 50%;
-	width: 3px;
-  	height: 3px;
-}
-
-.cn-preview-dot.cn-preview-grid {
-	border-radius: 0;
-}
-
-.cn-preview-dot.cn-preview-grid::before {
-	content: '';
-	position: absolute;
-	border-left: 1px solid var(--comfy-input-bg);
-	border-right: 1px solid var(--comfy-input-bg);
-	width: 4px;
-	height: 100%;
-	left: 2px;
-	top: 0;
-	z-index: 1;
-}
-
-.cn-preview-dot.cn-preview-grid::after {
-	content: '';
-	position: absolute;
-	border-top: 1px solid var(--comfy-input-bg);
-	border-bottom: 1px solid var(--comfy-input-bg);
-	width: 100%;
-	height: 4px;
-	left: 0;
-	top: 2px;
-	z-index: 1;
-}
-
-.cn-preview-name {
-	flex: auto;
-	font-size: 14px;
-}
-
-.cn-preview-io {
-	display: flex;
-	justify-content: space-between;
-	padding: 10px 10px;
-}
-
-.cn-preview-column > div {
-	display: flex;
-	gap: 10px;
-	align-items: center;
-	height: 18px;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.cn-preview-input {
-	justify-content: flex-start;
-}
-
-.cn-preview-output {
-	justify-content: flex-end;
-}
-
-.cn-preview-list {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 0 10px 10px 10px;
-}
-
-.cn-preview-switch {
-	position: relative;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	background: var(--bg-color);
-	border: 2px solid var(--border-color);
-	border-radius: 10px;
-	text-wrap: nowrap;
-	padding: 2px 20px;
-	gap: 10px;
-}
-
-.cn-preview-switch::before,
-.cn-preview-switch::after {
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	transform: translate(0, -50%);
-	color: var(--fg-color);
-	opacity: 0.8;
-}
-
-.cn-preview-switch::before {
-	content: "◀";
-	left: 5px;
-}
-
-.cn-preview-switch::after {
-	content: "▶";
-	right: 5px;
-}
-
-.cn-preview-value {
-	color: var(--descrip-text);
-}
-
-.cn-preview-string {
-	min-height: 30px;
-	max-height: 300px;
-	background: var(--bg-color);
-	color: var(--descrip-text);
-	border-radius: 3px;
-	padding: 3px 5px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.cn-preview-description {
-	margin: 0px 10px 10px 10px;
-	padding: 6px;
-	background: var(--border-color);
-	color: var(--descrip-text);
-	border-radius: 5px;
-	font-style: italic;
-	word-break: break-word;
-}
-
-.cn-tag-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	margin-bottom: 5px;
-}
-
-.cn-tag-list > div {
-	background-color: var(--border-color);
-	border-radius: 5px;
-	padding: 0 5px;
-}
-
-.cn-install-buttons {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 3px;
-	align-items: center;
-	justify-content: center;
-	height: 100%;
-}
-
-.cn-selected-buttons {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-	padding-right: 20px;
-}
-
-.cn-manager .cn-btn-enable {
-	background-color: #333399;
-	color: white;
-}
-
-.cn-manager .cn-btn-disable {
-	background-color: #442277;
-	color: white;
-}
-
-.cn-manager .cn-btn-update {
-	background-color: #1155AA;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-update {
-	background-color: Gray;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-fix {
-	background-color: #6495ED;
-	color: white;
-}
-
-.cn-manager .cn-btn-import-failed {
-	background-color: #AA1111;
-    font-size: 10px;
-	font-weight: bold;
-	color: white;
-}
-
-.cn-manager .cn-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-install {
-	background-color: Gray;
-	color: white;
-}
-
-.cn-manager .cn-btn-uninstall {
-	background-color: #993333;
-	color: white;
-}
-
-.cn-manager .cn-btn-reinstall {
-	background-color: #993333;
-	color: white;
-}
-
-.cn-manager .cn-btn-switch {
-	background-color: #448833;
-	color: white;
-
-}
-
-@keyframes cn-btn-loading-bg {
-	0% {
-		left: 0;
-	}
-	100% {
-		left: -105px;
-	}
-}
-
-.cn-manager button.cn-btn-loading {
-	position: relative;
-	overflow: hidden;
-	border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.cn-manager button.cn-btn-loading::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	width: 500px;
-	height: 100%;
-	background-image: repeating-linear-gradient(
-		-45deg,
-		rgb(0 119 207 / 30%),
-		rgb(0 119 207 / 30%) 10px,
-		transparent 10px,
-		transparent 15px
-	);
-	animation: cn-btn-loading-bg 2s linear infinite;
-}
-
-.cn-manager-light .cn-pack-name a {
-	color: blue;
-}
-
-.cn-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.cn-manager-light .cn-btn-install {
-	background-color: #333;
-}

comfyui_manager/js/model-manager.css

@@ -1,213 +0,0 @@
-.cmm-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-}
-
-.cmm-manager .cmm-flex-auto {
-	flex: auto;
-}
-
-.cmm-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-    background-color: var(--comfy-input-bg);
-    border-radius: 8px;
-    border-color: var(--border-color);
-    border-style: solid;
-    margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.cmm-manager button:disabled,
-.cmm-manager input:disabled,
-.cmm-manager select:disabled {
-	color: gray;
-}
-
-.cmm-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager .cmm-manager-refresh {
-	display: none;
-	background-color: #000080;
-	color: white;
-}
-
-.cmm-manager .cmm-manager-stop {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cmm-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.cmm-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.cmm-manager-type,
-.cmm-manager-base,
-.cmm-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.cmm-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-}
-
-.cmm-manager-status {
-	padding-left: 10px;
-}
-
-.cmm-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-}
-
-.cmm-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.cmm-manager-grid .cmm-node-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.cmm-manager-grid .cmm-node-desc a {
-	color: #5555FF;
-    font-weight: bold;
-	text-decoration: none;
-}
-
-.cmm-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.cmm-icon-passed {
-	width: 20px;
-	height: 20px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-}
-
-.cmm-manager .cmm-btn-enable {
-	background-color: blue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-disable {
-	background-color: MediumSlateBlue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.cmm-btn-download {
-	width: 18px;
-	height: 18px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-	cursor: pointer;
-	opacity: 0.8;
-	color: #fff;
-}
-
-.cmm-btn-download:hover {
-	opacity: 1;
-}
-
-.cmm-manager-light .cmm-btn-download {
-	color: #000;
-}
-
-@keyframes cmm-btn-loading-bg {
-    0% {
-        left: 0;
-    }
-    100% {
-        left: -105px;
-    }
-}
-
-.cmm-manager button.cmm-btn-loading {
-    position: relative;
-    overflow: hidden;
-    border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager button.cmm-btn-loading::after {
-    position: absolute;
-    top: 0;
-    left: 0;
-    content: "";
-    width: 500px;
-    height: 100%;
-    background-image: repeating-linear-gradient(
-        -45deg,
-        rgb(0 119 207 / 30%),
-        rgb(0 119 207 / 30%) 10px,
-        transparent 10px,
-        transparent 15px
-    );
-    animation: cmm-btn-loading-bg 2s linear infinite;
-}
-
-.cmm-manager-light .cmm-node-name a {
-	color: blue;
-}
-
-.cmm-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.cmm-manager-light .cmm-btn-install {
-	background-color: #333;
-}

comfyui_manager/js/popover-helper.js

@@ -1,619 +0,0 @@
-const hasOwn = function(obj, key) {
-    return Object.prototype.hasOwnProperty.call(obj, key);
-};
-
-const isNum = function(num) {
-    if (typeof num !== 'number' || isNaN(num)) {
-        return false;
-    }
-    const isInvalid = function(n) {
-        if (n === Number.MAX_VALUE || n === Number.MIN_VALUE || n === Number.NEGATIVE_INFINITY || n === Number.POSITIVE_INFINITY) {
-            return true;
-        }
-        return false;
-    };
-    if (isInvalid(num)) {
-        return false;
-    }
-    return true;
-};
-
-const toNum = (num) => {
-    if (typeof (num) !== 'number') {
-        num = parseFloat(num);
-    }
-    if (isNaN(num)) {
-        num = 0;
-    }
-    num = Math.round(num);
-    return num;
-};
-
-const clamp = function(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-};
-
-const isWindow = (obj) => {
-    return Boolean(obj && obj === obj.window);
-};
-
-const isDocument = (obj) => {
-    return Boolean(obj && obj.nodeType === 9);
-};
-
-const isElement = (obj) => {
-    return Boolean(obj && obj.nodeType === 1);
-};
-
-// ===========================================================================================
-
-export const toRect = (obj) => {
-    if (obj) {
-        return {
-            left: toNum(obj.left || obj.x),
-            top: toNum(obj.top || obj.y),
-            width: toNum(obj.width),
-            height: toNum(obj.height)
-        };
-    }
-    return {
-        left: 0,
-        top: 0,
-        width: 0,
-        height: 0
-    };
-};
-
-export const getElement = (selector) => {
-    if (typeof selector === 'string' && selector) {
-        if (selector.startsWith('#')) {
-            return document.getElementById(selector.slice(1));
-        }
-        return document.querySelector(selector);
-    }
-
-    if (isDocument(selector)) {
-        return selector.body;
-    }
-    if (isElement(selector)) {
-        return selector;
-    }
-};
-
-export const getRect = (target, fixed) => {
-    if (!target) {
-        return toRect();
-    }
-
-    if (isWindow(target)) {
-        return {
-            left: 0,
-            top: 0,
-            width: window.innerWidth,
-            height: window.innerHeight
-        };
-    }
-
-    const elem = getElement(target);
-    if (!elem) {
-        return toRect(target);
-    }
-
-    const br = elem.getBoundingClientRect();
-    const rect = toRect(br);
-
-    // fix offset
-    if (!fixed) {
-        rect.left += window.scrollX;
-        rect.top += window.scrollY;
-    }
-
-    rect.width = elem.offsetWidth;
-    rect.height = elem.offsetHeight;
-
-    return rect;
-};
-
-// ===========================================================================================
-
-const calculators = {
-
-    bottom: (info, containerRect, targetRect) => {
-        info.space = containerRect.top + containerRect.height - targetRect.top - targetRect.height - info.height;
-        info.top = targetRect.top + targetRect.height;
-        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
-    },
-
-    top: (info, containerRect, targetRect) => {
-        info.space = targetRect.top - info.height - containerRect.top;
-        info.top = targetRect.top - info.height;
-        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
-    },
-
-    right: (info, containerRect, targetRect) => {
-        info.space = containerRect.left + containerRect.width - targetRect.left - targetRect.width - info.width;
-        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
-        info.left = targetRect.left + targetRect.width;
-    },
-
-    left: (info, containerRect, targetRect) => {
-        info.space = targetRect.left - info.width - containerRect.left;
-        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
-        info.left = targetRect.left - info.width;
-    }
-};
-
-// with order
-export const getDefaultPositions = () => {
-    return Object.keys(calculators);
-};
-
-const calculateSpace = (info, containerRect, targetRect) => {
-    const calculator = calculators[info.position];
-    calculator(info, containerRect, targetRect);
-    if (info.space >= 0) {
-        info.passed += 1;
-    }
-};
-
-// ===========================================================================================
-
-const calculateAlignOffset = (info, containerRect, targetRect, alignType, sizeType) => {
-
-    const popoverStart = info[alignType];
-    const popoverSize = info[sizeType];
-
-    const containerStart = containerRect[alignType];
-    const containerSize = containerRect[sizeType];
-
-    const targetStart = targetRect[alignType];
-    const targetSize = targetRect[sizeType];
-
-    const targetCenter = targetStart + targetSize * 0.5;
-
-    // size overflow
-    if (popoverSize > containerSize) {
-        const overflow = (popoverSize - containerSize) * 0.5;
-        info[alignType] = containerStart - overflow;
-        info.offset = targetCenter - containerStart + overflow;
-        return;
-    }
-
-    const space1 = popoverStart - containerStart;
-    const space2 = (containerStart + containerSize) - (popoverStart + popoverSize);
-
-    // both side passed, default to center
-    if (space1 >= 0 && space2 >= 0) {
-        if (info.passed) {
-            info.passed += 2;
-        }
-        info.offset = popoverSize * 0.5;
-        return;
-    }
-
-    // one side passed
-    if (info.passed) {
-        info.passed += 1;
-    }
-
-    if (space1 < 0) {
-        const min = containerStart;
-        info[alignType] = min;
-        info.offset = targetCenter - min;
-        return;
-    }
-
-    // space2 < 0
-    const max = containerStart + containerSize - popoverSize;
-    info[alignType] = max;
-    info.offset = targetCenter - max;
-
-};
-
-const calculateHV = (info, containerRect) => {
-    if (['top', 'bottom'].includes(info.position)) {
-        info.top = clamp(info.top, containerRect.top, containerRect.top + containerRect.height - info.height);
-        return ['left', 'width'];
-    }
-    info.left = clamp(info.left, containerRect.left, containerRect.left + containerRect.width - info.width);
-    return ['top', 'height'];
-};
-
-const calculateOffset = (info, containerRect, targetRect) => {
-
-    const [alignType, sizeType] = calculateHV(info, containerRect);
-
-    calculateAlignOffset(info, containerRect, targetRect, alignType, sizeType);
-
-    info.offset = clamp(info.offset, 0, info[sizeType]);
-
-};
-
-// ===========================================================================================
-
-const calculateDistance = (info, previousPositionInfo) => {
-    if (!previousPositionInfo) {
-        return;
-    }
-    // no change if position no change with previous
-    if (info.position === previousPositionInfo.position) {
-        return;
-    }
-    const ax = info.left + info.width * 0.5;
-    const ay = info.top + info.height * 0.5;
-    const bx = previousPositionInfo.left + previousPositionInfo.width * 0.5;
-    const by = previousPositionInfo.top + previousPositionInfo.height * 0.5;
-    const dx = Math.abs(ax - bx);
-    const dy = Math.abs(ay - by);
-    info.distance = Math.round(Math.sqrt(dx * dx + dy * dy));
-};
-
-// ===========================================================================================
-
-const calculatePositionInfo = (info, containerRect, targetRect, previousPositionInfo) => {
-    calculateSpace(info, containerRect, targetRect);
-    calculateOffset(info, containerRect, targetRect);
-    calculateDistance(info, previousPositionInfo);
-};
-
-// ===========================================================================================
-
-const calculateBestPosition = (containerRect, targetRect, infoMap, withOrder, previousPositionInfo) => {
-
-    // position space: +1
-    // align space:
-    //    two side passed: +2
-    //    one side passed: +1
-
-    const safePassed = 3;
-
-    if (previousPositionInfo) {
-        const prevInfo = infoMap[previousPositionInfo.position];
-        if (prevInfo) {
-            calculatePositionInfo(prevInfo, containerRect, targetRect);
-            if (prevInfo.passed >= safePassed) {
-                return prevInfo;
-            }
-            prevInfo.calculated = true;
-        }
-    }
-
-    const positionList = [];
-    Object.values(infoMap).forEach((info) => {
-        if (!info.calculated) {
-            calculatePositionInfo(info, containerRect, targetRect, previousPositionInfo);
-        }
-        positionList.push(info);
-    });
-
-    positionList.sort((a, b) => {
-        if (a.passed !== b.passed) {
-            return b.passed - a.passed;
-        }
-
-        if (withOrder && a.passed >= safePassed && b.passed >= safePassed) {
-            return a.index - b.index;
-        }
-
-        if (a.space !== b.space) {
-            return b.space - a.space;
-        }
-
-        return a.index - b.index;
-    });
-
-    // logTable(positionList);
-
-    return positionList[0];
-};
-
-// const logTable = (() => {
-//     let time_id;
-//     return (info) => {
-//         clearTimeout(time_id);
-//         time_id = setTimeout(() => {
-//             console.table(info);
-//         }, 10);
-//     };
-// })();
-
-// ===========================================================================================
-
-const getAllowPositions = (positions, defaultAllowPositions) => {
-    if (!positions) {
-        return;
-    }
-    if (Array.isArray(positions)) {
-        positions = positions.join(',');
-    }
-    positions = String(positions).split(',').map((it) => it.trim().toLowerCase()).filter((it) => it);
-    positions = positions.filter((it) => defaultAllowPositions.includes(it));
-    if (!positions.length) {
-        return;
-    }
-    return positions;
-};
-
-const isPositionChanged = (info, previousPositionInfo) => {
-    if (!previousPositionInfo) {
-        return true;
-    }
-
-    if (info.left !== previousPositionInfo.left) {
-        return true;
-    }
-
-    if (info.top !== previousPositionInfo.top) {
-        return true;
-    }
-
-    return false;
-};
-
-// ===========================================================================================
-
-// const log = (name, time) => {
-//     if (time > 0.1) {
-//         console.log(name, time);
-//     }
-// };
-
-export const getBestPosition = (containerRect, targetRect, popoverRect, positions, previousPositionInfo) => {
-
-    const defaultAllowPositions = getDefaultPositions();
-    let withOrder = true;
-    let allowPositions = getAllowPositions(positions, defaultAllowPositions);
-    if (!allowPositions) {
-        allowPositions = defaultAllowPositions;
-        withOrder = false;
-    }
-
-    // console.log('withOrder', withOrder);
-
-    // const start_time = performance.now();
-
-    const infoMap = {};
-    allowPositions.forEach((k, i) => {
-        infoMap[k] = {
-            position: k,
-            index: i,
-
-            top: 0,
-            left: 0,
-            width: popoverRect.width,
-            height: popoverRect.height,
-
-            space: 0,
-
-            offset: 0,
-            passed: 0,
-
-            distance: 0
-        };
-    });
-
-    // log('infoMap', performance.now() - start_time);
-
-
-    const bestPosition = calculateBestPosition(containerRect, targetRect, infoMap, withOrder, previousPositionInfo);
-
-    // check left/top
-    bestPosition.changed = isPositionChanged(bestPosition, previousPositionInfo);
-
-    return bestPosition;
-};
-
-// ===========================================================================================
-
-const getTemplatePath = (width, height, arrowOffset, arrowSize, borderRadius) => {
-    const p = (px, py) => {
-        return [px, py].join(',');
-    };
-
-    const px = function(num, alignEnd) {
-        const floor = Math.floor(num);
-        let n = num < floor + 0.5 ? floor + 0.5 : floor + 1.5;
-        if (alignEnd) {
-            n -= 1;
-        }
-        return n;
-    };
-
-    const pxe = function(num) {
-        return px(num, true);
-    };
-
-    const ls = [];
-
-    const innerLeft = px(arrowSize);
-    const innerRight = pxe(width - arrowSize);
-    arrowOffset = clamp(arrowOffset, innerLeft, innerRight);
-
-    const innerTop = px(arrowSize);
-    const innerBottom = pxe(height - arrowSize);
-
-    const startPoint = p(innerLeft, innerTop + borderRadius);
-    const arrowPoint = p(arrowOffset, 1);
-
-    const LT = p(innerLeft, innerTop);
-    const RT = p(innerRight, innerTop);
-
-    const AOT = p(arrowOffset - arrowSize, innerTop);
-    const RRT = p(innerRight - borderRadius, innerTop);
-
-    ls.push(`M${startPoint}`);
-    ls.push(`V${innerBottom - borderRadius}`);
-    ls.push(`Q${p(innerLeft, innerBottom)} ${p(innerLeft + borderRadius, innerBottom)}`);
-    ls.push(`H${innerRight - borderRadius}`);
-    ls.push(`Q${p(innerRight, innerBottom)} ${p(innerRight, innerBottom - borderRadius)}`);
-    ls.push(`V${innerTop + borderRadius}`);
-
-    if (arrowOffset < innerLeft + arrowSize + borderRadius) {
-        ls.push(`Q${RT} ${RRT}`);
-        ls.push(`H${arrowOffset + arrowSize}`);
-        ls.push(`L${arrowPoint}`);
-        if (arrowOffset < innerLeft + arrowSize) {
-            ls.push(`L${LT}`);
-            ls.push(`L${startPoint}`);
-        } else {
-            ls.push(`L${AOT}`);
-            ls.push(`Q${LT} ${startPoint}`);
-        }
-    } else if (arrowOffset > innerRight - arrowSize - borderRadius) {
-        if (arrowOffset > innerRight - arrowSize) {
-            ls.push(`L${RT}`);
-        } else {
-            ls.push(`Q${RT} ${p(arrowOffset + arrowSize, innerTop)}`);
-        }
-        ls.push(`L${arrowPoint}`);
-        ls.push(`L${AOT}`);
-        ls.push(`H${innerLeft + borderRadius}`);
-        ls.push(`Q${LT} ${startPoint}`);
-    } else {
-        ls.push(`Q${RT} ${RRT}`);
-        ls.push(`H${arrowOffset + arrowSize}`);
-        ls.push(`L${arrowPoint}`);
-        ls.push(`L${AOT}`);
-        ls.push(`H${innerLeft + borderRadius}`);
-        ls.push(`Q${LT} ${startPoint}`);
-    }
-    return ls.join('');
-};
-
-const getPathData = function(position, width, height, arrowOffset, arrowSize, borderRadius) {
-
-    const handlers = {
-
-        bottom: () => {
-            const d = getTemplatePath(width, height, arrowOffset, arrowSize, borderRadius);
-            return {
-                d,
-                transform: ''
-            };
-        },
-
-        top: () => {
-            const d = getTemplatePath(width, height, width - arrowOffset, arrowSize, borderRadius);
-            return {
-                d,
-                transform: `rotate(180,${width * 0.5},${height * 0.5})`
-            };
-        },
-
-        left: () => {
-            const d = getTemplatePath(height, width, arrowOffset, arrowSize, borderRadius);
-            const x = (width - height) * 0.5;
-            const y = (height - width) * 0.5;
-            return {
-                d,
-                transform: `translate(${x} ${y}) rotate(90,${height * 0.5},${width * 0.5})`
-            };
-        },
-
-        right: () => {
-            const d = getTemplatePath(height, width, height - arrowOffset, arrowSize, borderRadius);
-            const x = (width - height) * 0.5;
-            const y = (height - width) * 0.5;
-            return {
-                d,
-                transform: `translate(${x} ${y}) rotate(-90,${height * 0.5},${width * 0.5})`
-            };
-        }
-    };
-
-    return handlers[position]();
-};
-
-// ===========================================================================================
-
-// position style cache
-const styleCache = {
-    // position: '',
-    // top: {},
-    // bottom: {},
-    // left: {},
-    // right: {}
-};
-
-export const getPositionStyle = (info, options = {}) => {
-
-    const o = {
-        bgColor: '#fff',
-        borderColor: '#ccc',
-        borderRadius: 5,
-        arrowSize: 10
-    };
-    Object.keys(o).forEach((k) => {
-
-        if (hasOwn(options, k)) {
-            const d = o[k];
-            const v = options[k];
-
-            if (typeof d === 'string') {
-                // string
-                if (typeof v === 'string' && v) {
-                    o[k] = v;
-                }
-            } else {
-                // number
-                if (isNum(v) && v >= 0) {
-                    o[k] = v;
-                }
-
-            }
-
-        }
-    });
-
-    const key = [
-        info.width,
-        info.height,
-        info.offset,
-        o.arrowSize,
-        o.borderRadius,
-        o.bgColor,
-        o.borderColor
-    ].join('-');
-
-    const positionCache = styleCache[info.position];
-    if (positionCache && key === positionCache.key) {
-        const st = positionCache.style;
-        st.changed = styleCache.position !== info.position;
-        styleCache.position = info.position;
-        return st;
-    }
-
-    // console.log(options);
-
-    const data = getPathData(info.position, info.width, info.height, info.offset, o.arrowSize, o.borderRadius);
-    // console.log(data);
-
-    const viewBox = [0, 0, info.width, info.height].join(' ');
-    const svg = [
-        `<svg viewBox="${viewBox}" xmlns="http://www.w3.org/2000/svg">`,
-        `<path d="${data.d}" fill="${o.bgColor}" stroke="${o.borderColor}" transform="${data.transform}" />`,
-        '</svg>'
-    ].join('');
-
-    // console.log(svg);
-    const backgroundImage = `url("data:image/svg+xml;charset=utf8,${encodeURIComponent(svg)}")`;
-
-    const background = `${backgroundImage} center no-repeat`;
-
-    const padding = `${o.arrowSize + o.borderRadius}px`;
-
-    const style = {
-        background,
-        backgroundImage,
-        padding,
-        changed: true
-    };
-
-    styleCache.position = info.position;
-    styleCache[info.position] = {
-        key,
-        style
-    };
-
-    return style;
-};

git_helper.py

@@ -15,12 +15,9 @@ comfy_path = os.environ.get('COMFYUI_PATH')
 git_exe_path = os.environ.get('GIT_EXE_PATH')
 
 if comfy_path is None:
-    print("git_helper: environment variable 'COMFYUI_PATH' is not specified.")
-    exit(-1)
+    print("\nWARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.", file=sys.stderr)
+    comfy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
-if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
-    print("git_helper: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.")
-    exit(-1)
 
 def download_url(url, dest_folder, filename=None):
     # Ensure the destination folder exists

glob/cnr_utils.py

@@ -6,9 +6,8 @@ import time
 from dataclasses import dataclass
 from typing import List
 
-from . import manager_core
-from . import manager_util
-
+import manager_core
+import manager_util
 import requests
 import toml
 
@@ -69,6 +68,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
             else:
                 form_factor = 'other'
         
+        print(f"form_factor: {form_factor}")
         while remained:
             # Add comfyui_version and form_factor to the API request
             sub_uri = f'{base_url}/nodes?page={page}&limit=30&comfyui_version={comfyui_ver}&form_factor={form_factor}'

glob/manager_core.py

@@ -32,15 +32,18 @@ from packaging import version
 
 import uuid
 
-from . import cm_global
-from . import cnr_utils
-from . import manager_util
-from . import git_utils
-from . import manager_downloader
-from .node_package import InstalledNodePackage
-from .enums import NetworkMode, SecurityLevel, DBMode
+glob_path = os.path.join(os.path.dirname(__file__))  # ComfyUI-Manager/glob
+sys.path.append(glob_path)
 
-version_code = [4, 0]
+import cm_global
+import cnr_utils
+import manager_util
+import git_utils
+import manager_downloader
+from node_package import InstalledNodePackage
+
+
+version_code = [3, 30, 9]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -55,7 +58,6 @@ class InvalidChannel(Exception):
         self.channel = channel
         super().__init__(channel)
 
-
 def get_default_custom_nodes_path():
     global default_custom_nodes_path
     if default_custom_nodes_path is None:
@@ -181,11 +183,10 @@ comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
 
 if comfy_path is None:
     try:
-        comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
-        os.environ['COMFYUI_PATH'] = comfy_path
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
     except:
-        logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
-        exit(-1)
+        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
 if comfy_base_path is None:
     comfy_base_path = comfy_path
@@ -202,7 +203,6 @@ manager_snapshot_path = None
 manager_pip_overrides_path = None
 manager_pip_blacklist_path = None
 manager_components_path = None
-manager_batch_history_path = None
 
 def update_user_directory(user_dir):
     global manager_files_path
@@ -213,7 +213,6 @@ def update_user_directory(user_dir):
     global manager_pip_overrides_path
     global manager_pip_blacklist_path
     global manager_components_path
-    global manager_batch_history_path
 
     manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
     if not os.path.exists(manager_files_path):
@@ -233,14 +232,10 @@ def update_user_directory(user_dir):
     manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
     manager_components_path = os.path.join(manager_files_path, "components")
     manager_util.cache_dir = os.path.join(manager_files_path, "cache")
-    manager_batch_history_path = os.path.join(manager_files_path, "batch_history")
 
     if not os.path.exists(manager_util.cache_dir):
         os.makedirs(manager_util.cache_dir)
 
-    if not os.path.exists(manager_batch_history_path):
-        os.makedirs(manager_batch_history_path)
-
 try:
     import folder_paths
     update_user_directory(folder_paths.get_user_directory())
@@ -261,7 +256,7 @@ comfy_ui_revision = "Unknown"
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
 
 channel_dict = None
-valid_channels = {'default', 'local'}
+valid_channels = set()
 channel_list = None
 
 
@@ -558,7 +553,7 @@ class UnifiedManager:
                     ver = str(manager_util.StrictVersion(info['version']))
                     return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                 else:
-                    return {'id': info['id'], 'ver': info['version']}
+                    return None
             else:
                 return None
 
@@ -734,7 +729,7 @@ class UnifiedManager:
 
         return latest
 
-    async def reload(self, cache_mode, dont_wait=True, update_cnr_map=True):
+    async def reload(self, cache_mode, dont_wait=True):
         self.custom_node_map_cache = {}
         self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
         self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -742,18 +737,17 @@ class UnifiedManager:
         self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
         self.active_nodes = {}            # node_id -> node_version * fullpath
 
-        if get_config()['network_mode'] != 'public' or manager_util.is_manager_pip_package():
+        if get_config()['network_mode'] != 'public':
             dont_wait = True
 
-        if update_cnr_map:
-            # reload 'cnr_map' and 'repo_cnr_map'
-            cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
+        # reload 'cnr_map' and 'repo_cnr_map'
+        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
 
-            for x in cnrs:
-                self.cnr_map[x['id']] = x
-                if 'repository' in x:
-                    normalized_url = git_utils.normalize_url(x['repository'])
-                    self.repo_cnr_map[normalized_url] = x
+        for x in cnrs:
+            self.cnr_map[x['id']] = x
+            if 'repository' in x:
+                normalized_url = git_utils.normalize_url(x['repository'])
+                self.repo_cnr_map[normalized_url] = x
 
         # reload node status info from custom_nodes/*
         for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
@@ -774,9 +768,6 @@ class UnifiedManager:
 
     @staticmethod
     async def load_nightly(channel, mode):
-        if channel is None:
-            return {}
-
         res = {}
 
         channel_url = normalize_channel(channel)
@@ -807,9 +798,8 @@ class UnifiedManager:
         return res
 
     async def get_custom_nodes(self, channel, mode):
-        if channel is None and mode is None:
-            channel = 'default'
-            mode = 'cache'
+        # default_channel = normalize_channel('default')
+        # cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
 
         channel = normalize_channel(channel)
         cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
@@ -818,6 +808,7 @@ class UnifiedManager:
             return cache
 
         channel = normalize_channel(channel)
+        print(f"nightly_channel: {channel}/{mode}")
         nodes = await self.load_nightly(channel, mode)
 
         res = {}
@@ -898,6 +889,14 @@ class UnifiedManager:
 
         return True
 
+    def reserve_migration(self, moves):
+        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
+        with open(script_path, "a") as file:
+            obj = ["", "#LAZY-MIGRATION", moves]
+            file.write(f"{obj}\n")
+
+        return True
+
     def unified_fix(self, node_id, version_spec, instant_execution=False, no_deps=False):
         """
         fix dependencies
@@ -1326,66 +1325,67 @@ class UnifiedManager:
             return result.fail(f'Path not found: {repo_path}')
 
         # version check
-        with git.Repo(repo_path) as repo:
-            if repo.head.is_detached:
-                if not switch_to_default_branch(repo):
-                    return result.fail(f"Failed to switch to default branch: {repo_path}")
+        repo = git.Repo(repo_path)
 
-            current_branch = repo.active_branch
-            branch_name = current_branch.name
+        if repo.head.is_detached:
+            if not switch_to_default_branch(repo):
+                return result.fail(f"Failed to switch to default branch: {repo_path}")
 
-            if current_branch.tracking_branch() is None:
-                print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
-                remote_name = get_remote_name(repo)
+        current_branch = repo.active_branch
+        branch_name = current_branch.name
+
+        if current_branch.tracking_branch() is None:
+            print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
+            remote_name = get_remote_name(repo)
+        else:
+            remote_name = current_branch.tracking_branch().remote_name
+
+        if remote_name is None:
+            return result.fail(f"Failed to get remote when installing: {repo_path}")
+
+        remote = repo.remote(name=remote_name)
+
+        try:
+            remote.fetch()
+        except Exception as e:
+            if 'detected dubious' in str(e):
+                print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
+                safedir_path = repo_path.replace('\\', '/')
+                subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
+                try:
+                    remote.fetch()
+                except Exception:
+                    print("\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n"
+                          "-----------------------------------------------------------------------------------------\n"
+                          f'git config --global --add safe.directory "{safedir_path}"\n'
+                          "-----------------------------------------------------------------------------------------\n")
+
+        commit_hash = repo.head.commit.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            return result.fail(f"Not updatable branch: {branch_name}")
+
+        if commit_hash != remote_commit_hash:
+            git_pull(repo_path)
+
+            if len(repo.remotes) > 0:
+                url = repo.remotes[0].url
             else:
-                remote_name = current_branch.tracking_branch().remote_name
+                url = "unknown repo"
 
-            if remote_name is None:
-                return result.fail(f"Failed to get remote when installing: {repo_path}")
+            def postinstall():
+                return self.execute_install_script(url, repo_path, instant_execution=instant_execution, no_deps=no_deps)
 
-            remote = repo.remote(name=remote_name)
-
-            try:
-                remote.fetch()
-            except Exception as e:
-                if 'detected dubious' in str(e):
-                    print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
-                    safedir_path = repo_path.replace('\\', '/')
-                    subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
-                    try:
-                        remote.fetch()
-                    except Exception:
-                        print("\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n"
-                              "-----------------------------------------------------------------------------------------\n"
-                              f'git config --global --add safe.directory "{safedir_path}"\n'
-                              "-----------------------------------------------------------------------------------------\n")
-
-            commit_hash = repo.head.commit.hexsha
-            if f'{remote_name}/{branch_name}' in repo.refs:
-                remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            if return_postinstall:
+                return result.with_postinstall(postinstall)
             else:
-                return result.fail(f"Not updatable branch: {branch_name}")
+                if not postinstall():
+                    return result.fail(f"Failed to execute install script: {url}")
 
-            if commit_hash != remote_commit_hash:
-                git_pull(repo_path)
-
-                if len(repo.remotes) > 0:
-                    url = repo.remotes[0].url
-                else:
-                    url = "unknown repo"
-
-                def postinstall():
-                    return self.execute_install_script(url, repo_path, instant_execution=instant_execution, no_deps=no_deps)
-
-                if return_postinstall:
-                    return result.with_postinstall(postinstall)
-                else:
-                    if not postinstall():
-                        return result.fail(f"Failed to execute install script: {url}")
-
-                return result
-            else:
-                return ManagedResult('skip').with_msg('Up to date')
+            return result
+        else:
+            return ManagedResult('skip').with_msg('Up to date')
 
     def unified_update(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
         orig_print(f"\x1b[2K\rUpdating: {node_id}", end='')
@@ -1447,20 +1447,12 @@ class UnifiedManager:
             return self.unified_enable(node_id, version_spec)
 
         elif version_spec == 'unknown' or version_spec == 'nightly':
-            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
-
             if version_spec == 'nightly':
                 # disable cnr nodes
                 if self.is_enabled(node_id, 'cnr'):
                     self.unified_disable(node_id, False)
 
-                # use `repo name` as a dir name instead of `cnr id` if system added nodepack (i.e. publisher is null)
-                cnr = self.cnr_map.get(node_id)
-
-                if cnr is not None and cnr.get('publisher') is None:
-                    repo_name = os.path.basename(git_utils.normalize_url(repo_url))
-                    to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), repo_name))
-
+            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
             res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
             if res.result:
                 if version_spec == 'unknown':
@@ -1638,6 +1630,7 @@ def write_config():
         'model_download_by_agent': get_config()['model_download_by_agent'],
         'downgrade_blacklist': get_config()['downgrade_blacklist'],
         'security_level': get_config()['security_level'],
+        'skip_migration_check': get_config()['skip_migration_check'],
         'always_lazy_install': get_config()['always_lazy_install'],
         'network_mode': get_config()['network_mode'],
         'db_mode': get_config()['db_mode'],
@@ -1676,10 +1669,11 @@ def read_config():
                     'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
                     'model_download_by_agent': get_bool('model_download_by_agent', False),
                     'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
+                    'skip_migration_check': get_bool('skip_migration_check', False),
                     'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
-                    'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
-                    'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
+                    'network_mode': default_conf.get('network_mode', 'public').lower(),
+                    'security_level': default_conf.get('security_level', 'normal').lower(),
+                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
                }
 
     except Exception:
@@ -1699,10 +1693,11 @@ def read_config():
             'windows_selector_event_loop_policy': False,
             'model_download_by_agent': False,
             'downgrade_blacklist': '',
+            'skip_migration_check': False,
             'always_lazy_install': False,
-            'network_mode': NetworkMode.OFFLINE.value,
-            'security_level': SecurityLevel.NORMAL.value,
-            'db_mode': DBMode.CACHE.value,
+            'network_mode': 'public',   # public | private | offline
+            'security_level': 'normal', # strong | normal | normal- | weak
+            'db_mode': 'cache',         # local | cache | remote
         }
 
 
@@ -2103,7 +2098,7 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
         cnr = unified_manager.get_cnr_by_repo(url)
         if cnr:
             cnr_id = cnr['id']
-            return await unified_manager.install_by_id(cnr_id, version_spec='nightly', channel='default', mode='cache')
+            return await unified_manager.install_by_id(cnr_id, version_spec='nightly')
         else:
             repo_name = os.path.splitext(os.path.basename(url))[0]
 
@@ -2199,7 +2194,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
             cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
             cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
-            if get_config()['network_mode'] == 'offline' or manager_util.is_manager_pip_package():
+            if get_config()['network_mode'] == 'offline':
                 # offline network mode
                 if os.path.exists(cache_uri):
                     json_obj = await manager_util.get_data(cache_uri)
@@ -2219,7 +2214,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
                         with open(cache_uri, "w", encoding='utf-8') as file:
                             json.dump(json_obj, file, indent=4, sort_keys=True)
     except Exception as e:
-        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename} @ {channel_url}/{mode}\n=> {e}")
+        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
         uri = os.path.join(manager_util.comfyui_manager_path, filename)
         json_obj = await manager_util.get_data(uri)
 
@@ -2653,8 +2648,22 @@ async def get_current_snapshot(custom_nodes_only = False):
 
                         cnr_custom_nodes[info['id']] = info['ver']
                     else:
-                        commit_hash = git_utils.get_commit_hash(fullpath)
-                        url = git_utils.git_url(fullpath)
+                        repo = git.Repo(fullpath)
+
+                        if repo.head.is_detached:
+                            remote_name = get_remote_name(repo)
+                        else:
+                            current_branch = repo.active_branch
+
+                            if current_branch.tracking_branch() is None:
+                                remote_name = get_remote_name(repo)
+                            else:
+                                remote_name = current_branch.tracking_branch().remote_name
+
+                        commit_hash = repo.head.commit.hexsha
+
+                        url = repo.remotes[remote_name].url
+
                         git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
                 except:
                     print(f"Failed to extract snapshots for the custom node '{path}'.")
@@ -3017,9 +3026,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
     enabled_repos = []
     disabled_repos = []
     skip_node_packs = []
-    switched_node_packs = []
-    installed_node_packs = []
-    failed = []
 
     await unified_manager.reload('cache')
     await unified_manager.get_custom_nodes('default', 'cache')
@@ -3065,13 +3071,8 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                 disabled_repos.append(x)
 
             for x in todo_checkout:
-                ps = unified_manager.cnr_switch_version(x[0], x[1], instant_execution=True, no_deps=True, return_postinstall=False)
-                if ps.action == 'switch-cnr' and ps.result:
-                    switched_node_packs.append(f"{x[0]}@{x[1]}")
-                elif ps.action == 'skip':
-                    skip_node_packs.append(f"{x[0]}@{x[1]}")
-                elif not ps.result:
-                    failed.append(f"{x[0]}@{x[1]}")
+                unified_manager.cnr_switch_version(x[0], x[1], instant_execution=True, no_deps=True, return_postinstall=False)
+                checkout_repos.append(x[1])
 
             # install listed cnr nodes
             for k, v in cnr_info.items():
@@ -3079,9 +3080,7 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                     continue
 
                 ps = await unified_manager.install_by_id(k, version_spec=v, instant_execution=True, return_postinstall=True)
-                if ps.action == 'install-cnr' and ps.result:
-                    installed_node_packs.append(f"{k}@{v}")
-
+                cloned_repos.append(k)
                 if ps is not None and ps.result:
                     if hasattr(ps, 'postinstall'):
                         postinstalls.append(ps.postinstall)
@@ -3139,41 +3138,40 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                 disabled_repos.append(x)
 
             for x in todo_enable:
-                res = unified_manager.unified_enable(x[0], 'nightly')
+                res = unified_manager.unified_enable(x, 'nightly')
 
                 is_switched = False
                 if res and res.target:
                     is_switched = repo_switch_commit(res.target, x[1])
 
                 if is_switched:
-                    checkout_repos.append(f"{x[0]}@{x[1]}")
+                    checkout_repos.append(x)
                 else:
-                    enabled_repos.append(x[0])
+                    enabled_repos.append(x)
 
             for x in todo_checkout:
                 is_switched = repo_switch_commit(x[0], x[1])
 
                 if is_switched:
-                    checkout_repos.append(f"{x[0]}@{x[1]}")
+                    checkout_repos.append(x)
+                else:
+                    skip_node_packs.append(x[0])
 
             for x in git_info.keys():
                 normalized_url = git_utils.normalize_url(x)
                 cnr = unified_manager.repo_cnr_map.get(normalized_url)
                 if cnr is not None:
                     pack_id = cnr['id']
-                    res = await unified_manager.install_by_id(pack_id, 'nightly', instant_execution=True, no_deps=False, return_postinstall=False)
-                    if res.action == 'install-git' and res.result:
-                        cloned_repos.append(pack_id)
-                    elif res.action == 'skip':
-                        skip_node_packs.append(pack_id)
-                    elif not res.result:
-                        failed.append(pack_id)
+                    await unified_manager.install_by_id(pack_id, 'nightly', instant_execution=True, no_deps=False, return_postinstall=False)
+                    cloned_repos.append(pack_id)
                     processed_urls.append(x)
 
             for x in processed_urls:
                 if x in git_info:
                     del git_info[x]
 
+            # remained nightly will be installed and migrated
+
     # for unknown restore
     todo_disable = []
     todo_enable = []
@@ -3220,15 +3218,15 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
             is_switched = repo_switch_commit(res.target, x[1])
 
         if is_switched:
-            checkout_repos.append(f"{x[0]}@{x[1]}")
+            checkout_repos.append(x)
         else:
-            enabled_repos.append(x[0])
+            enabled_repos.append(x)
 
     for x in todo_checkout:
         is_switched = repo_switch_commit(x[0], x[1])
 
         if is_switched:
-            checkout_repos.append(f"{x[0]}@{x[1]}")
+            checkout_repos.append(x)
         else:
             skip_node_packs.append(x[0])
 
@@ -3245,28 +3243,53 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
         unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
         cloned_repos.append(repo_name)
 
+    # reload
+    await unified_manager.migrate_unmanaged_nodes()
+
     # print summary
     for x in cloned_repos:
         print(f"[ INSTALLED ] {x}")
-    for x in installed_node_packs:
-        print(f"[ INSTALLED ] {x}")
     for x in checkout_repos:
         print(f"[  CHECKOUT ] {x}")
-    for x in switched_node_packs:
-        print(f"[  SWITCHED ] {x}")
     for x in enabled_repos:
         print(f"[  ENABLED  ] {x}")
     for x in disabled_repos:
         print(f"[  DISABLED ] {x}")
     for x in skip_node_packs:
-        print(f"[  SKIPPED  ] {x}")
-    for x in failed:
-        print(f"[  FAILED   ] {x}")
+        print(f"[  SKIPPED ] {x}")
 
     # if is_failed:
     #     print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
 
 
+# check need to migrate
+need_to_migrate = False
+
+
+async def check_need_to_migrate():
+    global need_to_migrate
+
+    await unified_manager.reload('cache')
+    await unified_manager.load_nightly(channel='default', mode='cache')
+
+    legacy_custom_nodes = []
+
+    for x in unified_manager.active_nodes.values():
+        if x[0] == 'nightly' and not x[1].endswith('@nightly'):
+            legacy_custom_nodes.append(x[1])
+
+    for x in unified_manager.nightly_inactive_nodes.values():
+        if not x.endswith('@nightly'):
+            legacy_custom_nodes.append(x)
+
+    if len(legacy_custom_nodes) > 0:
+        print("\n--------------------- ComfyUI-Manager migration notice --------------------")
+        print("The following custom nodes were installed using the old management method and require migration:\n")
+        print("\n".join(legacy_custom_nodes))
+        print("---------------------------------------------------------------------------\n")
+        need_to_migrate = True
+
+
 def get_comfyui_versions(repo=None):
     if repo is None:
         repo = git.Repo(comfy_path)

glob/manager_util.py

@@ -18,15 +18,12 @@ import shlex
 
 
 cache_lock = threading.Lock()
-session_lock = threading.Lock()
 
 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
 
 use_uv = False
 
-def is_manager_pip_package():
-    return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))
 
 def add_python_path_to_env():
     if platform.system() != "Windows":
@@ -38,17 +35,11 @@ def add_python_path_to_env():
 
 
 def make_pip_cmd(cmd):
-    if 'python_embeded' in sys.executable:
-        if use_uv:
-            return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
-        else:
-            return [sys.executable, '-s', '-m', 'pip'] + cmd
+    if use_uv:
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
     else:
-        # FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
-        if use_uv:
-            return [sys.executable, '-m', 'uv', 'pip'] + cmd
-        else:
-            return [sys.executable, '-m', 'pip'] + cmd
+        return [sys.executable, '-m', 'pip'] + cmd
+
 
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
@@ -448,12 +439,10 @@ class PIPFixer:
                     lines = file.readlines()
                 
                 front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
-                if front_line is None:
-                    logging.info("[ComfyUI-Manager] Skipped fixing the 'comfyui-frontend-package' dependency because the ComfyUI is outdated.")
-                else:
-                    cmd = make_pip_cmd(['install', front_line])
-                    subprocess.check_output(cmd , universal_newlines=True)
-                    logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
+                cmd = make_pip_cmd(['install', front_line])
+                subprocess.check_output(cmd , universal_newlines=True)
+
+                logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
         except Exception as e:
             logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
             logging.error(e)

glob/node_package.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import os
 
-from .git_utils import get_commit_hash
+from git_utils import get_commit_hash
 
 
 @dataclass

glob/share_3rdparty.py

@@ -1,6 +1,5 @@
 import mimetypes
-from . import manager_core as core
-
+import manager_core as core
 import os
 from aiohttp import web
 import aiohttp
@@ -54,7 +53,7 @@ def compute_sha256_checksum(filepath):
     return sha256.hexdigest()
 
 
-@PromptServer.instance.routes.get("/v2/manager/share_option")
+@PromptServer.instance.routes.get("/manager/share_option")
 async def share_option(request):
     if "value" in request.rel_url.query:
         core.get_config()['share_option'] = request.rel_url.query['value']
@@ -123,7 +122,7 @@ def set_youml_settings(settings):
         f.write(settings)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
+@PromptServer.instance.routes.get("/manager/get_openart_auth")
 async def api_get_openart_auth(request):
     # print("Getting stored Matrix credentials...")
     openart_key = get_openart_auth()
@@ -132,7 +131,7 @@ async def api_get_openart_auth(request):
     return web.json_response({"openart_key": openart_key})
 
 
-@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
+@PromptServer.instance.routes.post("/manager/set_openart_auth")
 async def api_set_openart_auth(request):
     json_data = await request.json()
     openart_key = json_data['openart_key']
@@ -141,7 +140,7 @@ async def api_set_openart_auth(request):
     return web.Response(status=200)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
+@PromptServer.instance.routes.get("/manager/get_matrix_auth")
 async def api_get_matrix_auth(request):
     # print("Getting stored Matrix credentials...")
     matrix_auth = get_matrix_auth()
@@ -150,7 +149,7 @@ async def api_get_matrix_auth(request):
     return web.json_response(matrix_auth)
 
 
-@PromptServer.instance.routes.get("/v2/manager/youml/settings")
+@PromptServer.instance.routes.get("/manager/youml/settings")
 async def api_get_youml_settings(request):
     youml_settings = get_youml_settings()
     if not youml_settings:
@@ -158,14 +157,14 @@ async def api_get_youml_settings(request):
     return web.json_response(json.loads(youml_settings))
 
 
-@PromptServer.instance.routes.post("/v2/manager/youml/settings")
+@PromptServer.instance.routes.post("/manager/youml/settings")
 async def api_set_youml_settings(request):
     json_data = await request.json()
     set_youml_settings(json.dumps(json_data))
     return web.Response(status=200)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
+@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
 async def api_get_comfyworkflows_auth(request):
     # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
     # in the same directory as the ComfyUI base folder
@@ -176,7 +175,7 @@ async def api_get_comfyworkflows_auth(request):
     return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
 
 
-@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
+@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
 async def set_esheep_workflow_and_images(request):
     json_data = await request.json()
     with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
@@ -184,7 +183,7 @@ async def set_esheep_workflow_and_images(request):
         return web.Response(status=200)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
+@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
 async def get_esheep_workflow_and_images(request):
     with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
         data = json.load(file)
@@ -212,7 +211,7 @@ def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
     return comfyworkflows_sharekey.strip()
 
 
-@PromptServer.instance.routes.post("/v2/manager/share")
+@PromptServer.instance.routes.post("/manager/share")
 async def share_art(request):
     # get json data
     json_data = await request.json()

js/cm-api.js

@@ -25,7 +25,7 @@ async function tryInstallCustomNode(event) {
 	const res = await customConfirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
-			const response = await api.fetchApi(`/v2/customnode/toggle_active`, {
+			const response = await api.fetchApi(`/customnode/toggle_active`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -35,7 +35,7 @@ async function tryInstallCustomNode(event) {
 			await sleep(300);
 			app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);
 
-			const response = await api.fetchApi(`/v2/customnode/install`, {
+			const response = await api.fetchApi(`/customnode/install`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -52,7 +52,7 @@ async function tryInstallCustomNode(event) {
 			}
 		}
 
-		let response = await api.fetchApi("/v2/manager/reboot");
+		let response = await api.fetchApi("/manager/reboot");
 		if(response.status == 403) {
 			show_message('This action is not allowed with this security level configuration.');
 			return false;

js/comfyui-manager.js

@@ -13,10 +13,10 @@ import {
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
-	infoToast, showTerminal, setNeedRestart, generateUUID
+	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
+	infoToast, showTerminal, setNeedRestart
 } from "./common.js";
-import { ComponentBuilderDialog, load_components, set_component_policy } from "./components-manager.js";
+import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";
@@ -189,7 +189,8 @@ docStyle.innerHTML = `
 }
 `;
 
-function isBeforeFrontendVersion(compareVersion) {
+function is_legacy_front() {
+    let compareVersion = '1.2.49';
     try {
         const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
         if (typeof frontendVersion !== 'string') {
@@ -222,9 +223,6 @@ function isBeforeFrontendVersion(compareVersion) {
     }
 }
 
-const is_legacy_front = () => isBeforeFrontendVersion('1.2.49');
-const isNotNewManagerUI = () => isBeforeFrontendVersion('1.16.4');
-
 document.head.appendChild(docStyle);
 
 var update_comfyui_button = null;
@@ -234,7 +232,7 @@ var restart_stop_button = null;
 var update_policy_combo = null;
 
 let share_option = 'all';
-var batch_id = null;
+var is_updating = false;
 
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -417,7 +415,7 @@ const style = `
 `;
 
 async function init_share_option() {
-	api.fetchApi('/v2/manager/share_option')
+	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
 		.then(data => {
 			share_option = data || 'all';
@@ -425,7 +423,7 @@ async function init_share_option() {
 }
 
 async function init_notice(notice) {
-	api.fetchApi('/v2/manager/notice')
+	api.fetchApi('/manager/notice')
 		.then(response => response.text())
 		.then(data => {
 			notice.innerHTML = data;
@@ -476,19 +474,14 @@ async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
 
-//	set_inprogress_mode();
+	set_inprogress_mode();
+
+	const response = await api.fetchApi('/manager/queue/update_comfyui');
+
 	showTerminal();
 
-	batch_id = generateUUID();
-
-	let batch = {};
-	batch['batch_id'] = batch_id;
-	batch['update_comfyui'] = true;
-
-	const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-		method: 'POST',
-		body: JSON.stringify(batch)
-	});
+	is_updating = true;
+	await api.fetchApi('/manager/queue/start');
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -619,7 +612,7 @@ async function switchComfyUI() {
 	switch_comfyui_button.disabled = true;
 	switch_comfyui_button.style.backgroundColor = "gray";
 	
-	let res = await api.fetchApi(`/v2/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
 
 	switch_comfyui_button.disabled = false;
 	switch_comfyui_button.style.backgroundColor = "";
@@ -638,14 +631,14 @@ async function switchComfyUI() {
 		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
 			if(selected_version == 'nightly') {
 				update_policy_combo.value = 'nightly-comfyui';
-				api.fetchApi('/v2/manager/policy/update?value=nightly-comfyui');
+				api.fetchApi('/manager/policy/update?value=nightly-comfyui');
 			}
 			else {
 				update_policy_combo.value = 'stable-comfyui';
-				api.fetchApi('/v2/manager/policy/update?value=stable-comfyui');
+				api.fetchApi('/manager/policy/update?value=stable-comfyui');
 			}
 
-			let response = await api.fetchApi(`/v2/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
 			if (response.status == 200) {
 				infoToast(`ComfyUI version is switched to ${selected_version}`);
 			}
@@ -663,17 +656,18 @@ async function onQueueStatus(event) {
 	const isElectron = 'electronAPI' in window;
 
 	if(event.detail.status == 'in_progress') {
-//		set_inprogress_mode();
+		set_inprogress_mode();
 		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
 	}
-	else if(event.detail.status == 'all-done') {
+	else if(event.detail.status == 'done') {
 		reset_action_buttons();
-	}
-	else if(event.detail.status == 'batch-done') {
-		if(batch_id != event.detail.batch_id) {
+
+		if(!is_updating)  {
 			return;
 		}
 
+		is_updating = false;
+
 		let success_list = [];
 		let failed_list = [];
 		let comfyui_state = null;
@@ -773,28 +767,41 @@ api.addEventListener("cm-queue-status", onQueueStatus);
 async function updateAll(update_comfyui) {
 	update_all_button.innerText = "Updating...";
 
-//	set_inprogress_mode();
+	set_inprogress_mode();
 
 	var mode = manager_instance.datasrc_combo.value;
 
 	showTerminal();
 
-	batch_id = generateUUID();
-
-	let batch = {};
 	if(update_comfyui) {
 		update_all_button.innerText = "Updating ComfyUI...";
-		batch['update_comfyui'] = true;
+		await api.fetchApi('/manager/queue/update_comfyui');
 	}
 
-	batch['update_all'] = mode;
+	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
 
-	const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-		method: 'POST',
-		body: JSON.stringify(batch)
-	});
+	if (response.status == 401) {
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
+	}
+	else if(response.status == 200) {
+		is_updating = true;
+		await api.fetchApi('/manager/queue/start');
+	}
 }
 
+function newDOMTokenList(initialTokens) {
+	const tmp = document.createElement(`div`);
+
+	const classList = tmp.classList;
+	if (initialTokens) {
+		initialTokens.forEach(token => {
+		classList.add(token);
+		});
+	}
+
+	return classList;
+	}
+
 /**
  * Check whether the node is a potential output node (img, gif or video output)
  */
@@ -807,7 +814,7 @@ function restartOrStop() {
 		rebootAPI();
 	}
 	else {
-		api.fetchApi('/v2/manager/queue/reset');
+		api.fetchApi('/manager/queue/reset');
 		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 	}
 }
@@ -939,6 +946,28 @@ class ManagerMenuDialog extends ComfyDialog {
 				restart_stop_button,
 			];
 
+		let migration_btn =
+			$el("button.cm-button-orange", {
+				type: "button",
+				textContent: "Migrate to New Node System",
+				onclick: () => migrateAPI()
+			});
+
+		migration_btn.style.display = 'none';
+
+		res.push(migration_btn);
+
+		api.fetchApi('/manager/need_to_migrate')
+			.then(response => response.text())
+			.then(text => {
+				if (text === 'True') {
+					migration_btn.style.display = 'block';
+				}
+			})
+			.catch(error => {
+				console.error('Error checking migration status:', error);
+			});
+
 		return res;
 	}
 
@@ -955,12 +984,12 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
 
-		api.fetchApi('/v2/manager/db_mode')
+		api.fetchApi('/manager/db_mode')
 			.then(response => response.text())
 			.then(data => { this.datasrc_combo.value = data; });
 
 		this.datasrc_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/v2/manager/db_mode?value=${event.target.value}`);
+			api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
 		});
 
 		// preview method
@@ -972,19 +1001,19 @@ class ManagerMenuDialog extends ComfyDialog {
 		preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Preview method: Latent2RGB (fast)' }, []));
 		preview_combo.appendChild($el('option', { value: 'none', text: 'Preview method: None (very fast)' }, []));
 
-		api.fetchApi('/v2/manager/preview_method')
+		api.fetchApi('/manager/preview_method')
 			.then(response => response.text())
 			.then(data => { preview_combo.value = data; });
 
 		preview_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/v2/manager/preview_method?value=${event.target.value}`);
+			api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
 		});
 
 		// channel
 		let channel_combo = document.createElement("select");
 		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
 		channel_combo.className = "cm-menu-combo";
-		api.fetchApi('/v2/manager/channel_url_list')
+		api.fetchApi('/manager/channel_url_list')
 			.then(response => response.json())
 			.then(async data => {
 				try {
@@ -997,7 +1026,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					}
 
 					channel_combo.addEventListener('change', function (event) {
-						api.fetchApi(`/v2/manager/channel_url_list?value=${event.target.value}`);
+						api.fetchApi(`/manager/channel_url_list?value=${event.target.value}`);
 					});
 
 					channel_combo.value = data.selected;
@@ -1025,7 +1054,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
 		}
 
-		api.fetchApi('/v2/manager/share_option')
+		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
 				share_combo.value = data || 'all';
@@ -1035,7 +1064,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		share_combo.addEventListener('change', function (event) {
 			const value = event.target.value;
 			share_option = value;
-			api.fetchApi(`/v2/manager/share_option?value=${value}`);
+			api.fetchApi(`/manager/share_option?value=${value}`);
 			const shareButton = document.getElementById("shareButton");
 			if (value === 'none') {
 				shareButton.style.display = "none";
@@ -1050,7 +1079,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
 		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
 		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
-		api.fetchApi('/v2/manager/policy/component')
+		api.fetchApi('/manager/policy/component')
 			.then(response => response.text())
 			.then(data => {
 				component_policy_combo.value = data;
@@ -1058,7 +1087,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			});
 
 		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/v2/manager/policy/component?value=${event.target.value}`);
+			api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
 			set_component_policy(event.target.value);
 		});
 
@@ -1071,14 +1100,14 @@ class ManagerMenuDialog extends ComfyDialog {
 		update_policy_combo.className = "cm-menu-combo";
 		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
 		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
-		api.fetchApi('/v2/manager/policy/update')
+		api.fetchApi('/manager/policy/update')
 			.then(response => response.text())
 			.then(data => {
 				update_policy_combo.value = data;
 			});
 
 		update_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/v2/manager/policy/update?value=${event.target.value}`);
+			api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
 		});
 
 		return [
@@ -1381,12 +1410,12 @@ class ManagerMenuDialog extends ComfyDialog {
 }
 
 async function getVersion() {
-	let version = await api.fetchApi(`/v2/manager/version`);
+	let version = await api.fetchApi(`/manager/version`);
 	return await version.text();
 }
 
 app.registerExtension({
-	name: "Comfy.Legacy.ManagerMenu",
+	name: "Comfy.ManagerMenu",
 
 	aboutPageBadges: [
 		{
@@ -1518,10 +1547,7 @@ app.registerExtension({
 				}).element
 			);
 
-			const shouldShowLegacyMenuItems = isNotNewManagerUI();
-			if (shouldShowLegacyMenuItems) {
-				app.menu?.settingsGroup.element.before(cmGroup.element);
-			}
+			app.menu?.settingsGroup.element.before(cmGroup.element);
 		}
 		catch(exception) {
 			console.log('ComfyUI is outdated. New style menu based features are disabled.');

js/comfyui-share-common.js

@@ -172,7 +172,7 @@ export const shareToEsheep= () => {
 		const nodes = app.graph._nodes
 		const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
 		const workflow = prompt['workflow']
-		api.fetchApi(`/v2/manager/set_esheep_workflow_and_images`, {
+		api.fetchApi(`/manager/set_esheep_workflow_and_images`, {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
@@ -812,7 +812,7 @@ export class ShareDialog extends ComfyDialog {
 		// get the user's existing matrix auth and share key
 		ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
 		try {
-			api.fetchApi(`/v2/manager/get_matrix_auth`)
+			api.fetchApi(`/manager/get_matrix_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.matrix_auth = data;
@@ -831,7 +831,7 @@ export class ShareDialog extends ComfyDialog {
 		ShareDialog.cw_sharekey = "";
 		try {
 			// console.log("Fetching comfyworkflows share key")
-			api.fetchApi(`/v2/manager/get_comfyworkflows_auth`)
+			api.fetchApi(`/manager/get_comfyworkflows_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
@@ -891,7 +891,7 @@ export class ShareDialog extends ComfyDialog {
 			// Change the text of the share button to "Sharing..." to indicate that the share process has started
 			this.share_button.textContent = "Sharing...";
 
-			const response = await api.fetchApi(`/v2/manager/share`, {
+			const response = await api.fetchApi(`/manager/share`, {
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify({

js/comfyui-share-openart.js

@@ -67,7 +67,7 @@ export class OpenArtShareDialog extends ComfyDialog {
   async readKey() {
     let key = ""
     try {
-      key = await api.fetchApi(`/v2/manager/get_openart_auth`)
+      key = await api.fetchApi(`/manager/get_openart_auth`)
         .then(response => response.json())
         .then(data => {
           return data.openart_key;
@@ -82,7 +82,7 @@ export class OpenArtShareDialog extends ComfyDialog {
   }
 
   async saveKey(value) {
-    await api.fetchApi(`/v2/manager/set_openart_auth`, {
+    await api.fetchApi(`/manager/set_openart_auth`, {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({
@@ -399,7 +399,7 @@ export class OpenArtShareDialog extends ComfyDialog {
     form.append("file", uploadFile);
     try {
       const res = await this.fetchApi(
-        `/v2/workflows/upload_thumbnail`,
+        `/workflows/upload_thumbnail`,
         {
           method: "POST",
           body: form,
@@ -459,7 +459,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       throw new Error("Title is required");
     }
 
-    const current_snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
+    const current_snapshot = await api.fetchApi(`/snapshot/get_current`)
       .then(response => response.json())
       .catch(error => {
         // console.log(error);
@@ -489,7 +489,7 @@ export class OpenArtShareDialog extends ComfyDialog {
 
     try {
       const response = await this.fetchApi(
-        "/v2/workflows/publish",
+        "/workflows/publish",
         {
           method: "POST",
           headers: {"Content-Type": "application/json"},

js/comfyui-share-youml.js

@@ -179,7 +179,7 @@ export class YouMLShareDialog extends ComfyDialog {
   async loadToken() {
     let key = ""
     try {
-      const response = await api.fetchApi(`/v2/manager/youml/settings`)
+      const response = await api.fetchApi(`/manager/youml/settings`)
       const settings = await response.json()
       return settings.token
     } catch (error) {
@@ -188,7 +188,7 @@ export class YouMLShareDialog extends ComfyDialog {
   }
 
   async saveToken(value) {
-    await api.fetchApi(`/v2/manager/youml/settings`, {
+    await api.fetchApi(`/manager/youml/settings`, {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({
@@ -380,7 +380,7 @@ export class YouMLShareDialog extends ComfyDialog {
     try {
       let snapshotData = null;
       try {
-        const snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
+        const snapshot = await api.fetchApi(`/snapshot/get_current`)
         snapshotData = await snapshot.json()
       } catch (e) {
         console.error("Failed to get snapshot", e)

js/common.js

@@ -1,7 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
-import { getBestPosition, getPositionStyle, getRect } from './popover-helper.js';
 
 
 function internalCustomConfirm(message, confirmMessage, cancelMessage) {
@@ -172,7 +171,7 @@ export function rebootAPI() {
 	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
 		if (isConfirmed) {
 			try {
-				api.fetchApi("/v2/manager/reboot");
+				api.fetchApi("/manager/reboot");
 			}
 			catch(exception) {}
 		}
@@ -182,6 +181,23 @@ export function rebootAPI() {
 }
 
 
+export async function migrateAPI() {
+	let confirmed = await customConfirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")
+	if (confirmed) {
+		try {
+			await api.fetchApi("/manager/migrate_unmanaged_nodes");
+			api.fetchApi("/manager/reboot");
+		}
+		catch(exception) {
+
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
 export var manager_instance = null;
 
 export function setManagerInstance(obj) {
@@ -210,7 +226,7 @@ export async function install_pip(packages) {
 	if(packages.includes('&'))
 		app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);
 
-	const res = await api.fetchApi("/v2/customnode/install/pip", {
+	const res = await api.fetchApi("/customnode/install/pip", {
 		method: "POST",
 		body: packages,
 	});
@@ -245,7 +261,7 @@ export async function install_via_git_url(url, manager_dialog) {
 
 	show_message(`Wait...<BR><BR>Installing '${url}'`);
 
-	const res = await api.fetchApi("/v2/customnode/install/git_url", {
+	const res = await api.fetchApi("/customnode/install/git_url", {
 		method: "POST",
 		body: url,
 	});
@@ -388,14 +404,12 @@ export async function fetchData(route, options) {
 	}
 }
 
-// https://cenfun.github.io/open-icons/
 export const icons = {
 	search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
+	extensions: '<svg viewBox="64 64 896 896" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7.2 3.5.3 5.2.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4S189.7 168 180.5 243.8s40 146.3 114.2 163.9 149.9-23.3 175.7-95.1c9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-.8-6.6-1.5-7.8-1.8l-3.1-.6c-2.2-.3-5.9-.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6M329.1 345.2a83.3 83.3 0 1 1 .01-166.61 83.3 83.3 0 0 1-.01 166.61M695.6 845a83.3 83.3 0 1 1 .01-166.61A83.3 83.3 0 0 1 695.6 845"/></svg>',
 	conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
 	passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
-	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>',
-	close: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 16 16"><g fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.116 8-4.558 4.558.884.884L8 8.884l4.558 4.558.884-.884L8.884 8l4.558-4.558-.884-.884L8 7.116 3.442 2.558l-.884.884L7.116 8z"/></g></svg>',
-	arrowRight: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 20 20"><path fill="currentColor" fill-rule="evenodd" d="m2.542 2.154 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Zm9 0 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Z"/></svg>'
+	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
 }
 
 export function sanitizeHTML(str) {
@@ -489,174 +503,3 @@ export function restoreColumnWidth(gridId, columns) {
 	});
 
 }
-
-export function getTimeAgo(dateStr) {
-	const date = new Date(dateStr);
-
-	if (!date || !(date instanceof Date) || isNaN(date.getTime())) {
-		return "";
-	}
-
-	const units = [
-		{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
-		{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
-		{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
-		{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
-		{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' }
-	];
-    const diff = Date.now() - date.getTime();
-    // less than a minute
-    if (Math.abs(diff) < 60000)
-        return 'just now';
-    for (let i = 0; i < units.length; i++) {
-        if (Math.abs(diff) < units[i].max) {
-            return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
-        }
-    }
-    function format(diff, divisor, unit, past, future, isInTheFuture) {
-		const val = Math.round(Math.abs(diff) / divisor);
-		if (isInTheFuture)
-			return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
-		return val <= 1 ? past : val + ' ' + unit + 's ago';
-	}
-    return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
-};
-
-export const loadCss = (cssFile) => {
-	const cssPath = import.meta.resolve(cssFile);
-	//console.log(cssPath);
-	const $link = document.createElement("link");
-	$link.setAttribute("rel", 'stylesheet');
-	$link.setAttribute("href", cssPath);
-	document.head.appendChild($link);
-};
-
-export const copyText = (text) => {
-	return new Promise((resolve) => {
-		let err;
-		try {
-			navigator.clipboard.writeText(text);
-		} catch (e) {
-			err = e;
-		}
-		if (err) {
-			resolve(false);
-		} else {
-			resolve(true);
-		}
-	});
-};
-
-function renderPopover($elem, target, options = {}) {
-	// async microtask
-	queueMicrotask(() => {
-		
-		const containerRect = getRect(window);
-		const targetRect = getRect(target);
-		const elemRect = getRect($elem);
-
-		const positionInfo = getBestPosition(
-			containerRect,
-			targetRect,
-			elemRect,
-			options.positions
-		);
-		const style = getPositionStyle(positionInfo, {
-			bgColor: options.bgColor,
-			borderColor: options.borderColor,
-			borderRadius: options.borderRadius
-		});
-
-		$elem.style.top = positionInfo.top + "px";
-		$elem.style.left = positionInfo.left + "px";
-		$elem.style.background = style.background;
-	
-	});
-}
-
-let $popover;
-export function hidePopover() {
-	if ($popover) {
-		$popover.remove();
-		$popover = null;
-	}
-}
-export function showPopover(target, text, className, options) {
-	hidePopover();
-	$popover = document.createElement("div");
-	$popover.className = ['cn-popover', className].filter(it => it).join(" ");
-	document.body.appendChild($popover);
-	$popover.innerHTML = text;
-	$popover.style.display = "block";
-	renderPopover($popover, target, {
-		borderRadius: 10,
-		... options
-	});
-}
-
-let $tooltip;
-export function hideTooltip(target) {
-	if ($tooltip) {
-		$tooltip.style.display = "none";
-		$tooltip.innerHTML = "";
-		$tooltip.style.top = "0px";
-		$tooltip.style.left = "0px";
-	}
-}
-export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
-	if (!$tooltip) {
-		$tooltip = document.createElement("div");
-		$tooltip.className = className;
-		$tooltip.style.cssText = `
-			pointer-events: none;
-			position: fixed;
-			z-index: 10001;
-			padding: 20px;
-			color: #1e1e1e;
-			max-width: 350px;
-			filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
-			${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
-		`;
-		document.body.appendChild($tooltip);
-	}
-
-	$tooltip.innerHTML = text;
-	$tooltip.style.display = "block";
-	renderPopover($tooltip, target, {
-		positions: ['top', 'bottom', 'right', 'center'],
-		bgColor: "#ffffff",
-		borderColor: "#cccccc",
-		borderRadius: 5
-	});
-}
-
-export function generateUUID() {
-	return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-		const r = Math.random() * 16 | 0;
-		const v = c === 'x' ? r : (r & 0x3 | 0x8);
-		return v.toString(16);
-	  });	
-}
-
-function initTooltip () {
-	const mouseenterHandler = (e) => {
-        const target = e.target;
-        const text = target.getAttribute('tooltip');
-        if (text) {
-            showTooltip(target, text);
-        }
-    };
-	const mouseleaveHandler = (e) => {
-        const target = e.target;
-        const text = target.getAttribute('tooltip');
-        if (text) {
-            hideTooltip(target);
-        }
-    };
-	document.body.removeEventListener('mouseenter', mouseenterHandler, true);
-	document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
-	document.body.addEventListener('mouseenter', mouseenterHandler, true);
-    document.body.addEventListener('mouseleave', mouseleaveHandler, true);
-}
-
-initTooltip();

js/components-manager.js

@@ -64,7 +64,7 @@ function storeGroupNode(name, data, register=true) {
 }
 
 export async function load_components() {
-	let data = await api.fetchApi('/v2/manager/component/loads', {method: "POST"});
+	let data = await api.fetchApi('/manager/component/loads', {method: "POST"});
 	let components = await data.json();
 
 	let start_time = Date.now();
@@ -222,7 +222,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
 	pack_map[packname] = component_name;
 	rpack_map[component_name] = subgraph;
 
-	const res = await api.fetchApi('/v2/manager/component/save', {
+	const res = await api.fetchApi('/manager/component/save', {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json",
@@ -259,7 +259,7 @@ async function import_component(component_name, component, mode) {
 				workflow: component
 			};
 
-		const res = await api.fetchApi('/v2/manager/component/save', {
+		const res = await api.fetchApi('/manager/component/save', {
 						method: "POST",
 						headers: { "Content-Type": "application/json", },
 						body: JSON.stringify(body)
@@ -709,7 +709,7 @@ app.handleFile = handleFile;
 
 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/v2/manager/policy/component')
+	api.fetchApi('/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }

js/model-manager.js

@@ -3,17 +3,236 @@ import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
 	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
-	storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
 import { api } from "../../scripts/api.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
-loadCss("./model-manager.css");
-
 const gridId = "model";
 
+const pageCss = `
+.cmm-manager {
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	z-index: 1099;
+	width: 80%;
+	height: 80%;
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	color: var(--fg-color);
+	font-family: arial, sans-serif;
+}
+
+.cmm-manager .cmm-flex-auto {
+	flex: auto;
+}
+
+.cmm-manager button {
+	font-size: 16px;
+	color: var(--input-text);
+    background-color: var(--comfy-input-bg);
+    border-radius: 8px;
+    border-color: var(--border-color);
+    border-style: solid;
+    margin: 0;
+	padding: 4px 8px;
+	min-width: 100px;
+}
+
+.cmm-manager button:disabled,
+.cmm-manager input:disabled,
+.cmm-manager select:disabled {
+	color: gray;
+}
+
+.cmm-manager button:disabled {
+	background-color: var(--comfy-input-bg);
+}
+
+.cmm-manager .cmm-manager-refresh {
+	display: none;
+	background-color: #000080;
+	color: white;
+}
+
+.cmm-manager .cmm-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
+.cmm-manager-header {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 5px;
+	align-items: center;
+	padding: 0 5px;
+}
+
+.cmm-manager-header label {
+	display: flex;
+	gap: 5px;
+	align-items: center;
+}
+
+.cmm-manager-type,
+.cmm-manager-base,
+.cmm-manager-filter {
+	height: 28px;
+	line-height: 28px;
+}
+
+.cmm-manager-keywords {
+	height: 28px;
+	line-height: 28px;
+	padding: 0 5px 0 26px;
+	background-size: 16px;
+	background-position: 5px center;
+	background-repeat: no-repeat;
+	background-image: url("data:image/svg+xml;charset=utf8,${encodeURIComponent(icons.search.replace("currentColor", "#888"))}");
+}
+
+.cmm-manager-status {
+	padding-left: 10px;
+}
+
+.cmm-manager-grid {
+	flex: auto;
+	border: 1px solid var(--border-color);
+	overflow: hidden;
+}
+
+.cmm-manager-selection {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-message {
+	
+}
+
+.cmm-manager-footer {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-grid .tg-turbogrid {
+	font-family: var(--grid-font);
+	font-size: 15px;
+	background: var(--bg-color);
+}
+
+.cmm-manager-grid .cmm-node-name a {
+	color: skyblue;
+	text-decoration: none;
+	word-break: break-word;
+}
+
+.cmm-manager-grid .cmm-node-desc a {
+	color: #5555FF;
+    font-weight: bold;
+	text-decoration: none;
+}
+
+.cmm-manager-grid .tg-cell a:hover {
+	text-decoration: underline;
+}
+
+.cmm-icon-passed {
+	width: 20px;
+	height: 20px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+}
+
+.cmm-manager .cmm-btn-enable {
+	background-color: blue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-disable {
+	background-color: MediumSlateBlue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-install {
+	background-color: black;
+	color: white;
+}
+
+.cmm-btn-download {
+	width: 18px;
+	height: 18px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+	cursor: pointer;
+	opacity: 0.8;
+	color: #fff;
+}
+
+.cmm-btn-download:hover {
+	opacity: 1;
+}
+
+.cmm-manager-light .cmm-btn-download {
+	color: #000;
+}
+
+@keyframes cmm-btn-loading-bg {
+    0% {
+        left: 0;
+    }
+    100% {
+        left: -105px;
+    }
+}
+
+.cmm-manager button.cmm-btn-loading {
+    position: relative;
+    overflow: hidden;
+    border-color: rgb(0 119 207 / 80%);
+	background-color: var(--comfy-input-bg);
+}
+
+.cmm-manager button.cmm-btn-loading::after {
+    position: absolute;
+    top: 0;
+    left: 0;
+    content: "";
+    width: 500px;
+    height: 100%;
+    background-image: repeating-linear-gradient(
+        -45deg,
+        rgb(0 119 207 / 30%),
+        rgb(0 119 207 / 30%) 10px,
+        transparent 10px,
+        transparent 15px
+    );
+    animation: cmm-btn-loading-bg 2s linear infinite;
+}
+
+.cmm-manager-light .cmm-node-name a {
+	color: blue;
+}
+
+.cmm-manager-light .cm-warn-note {
+	background-color: #ccc !important;
+}
+
+.cmm-manager-light .cmm-btn-install {
+	background-color: #333;
+}
+
+`;
+
 const pageHtml = `
 <div class="cmm-manager-header">
 	<label>Filter
@@ -64,6 +283,14 @@ export class ModelManager {
 	}
 
 	init() {
+
+		if (!document.querySelector(`style[context="${this.id}"]`)) {
+			const $style = document.createElement("style");
+			$style.setAttribute("context", this.id);
+			$style.innerHTML = pageCss;
+			document.head.appendChild($style);
+		}
+
 		this.element = $el("div", {
 			parent: document.body,
 			className: "comfy-modal cmm-manager"
@@ -172,7 +399,7 @@ export class ModelManager {
 
 			".cmm-manager-stop": {
 				click: () => {
-					api.fetchApi('/v2/manager/queue/reset');
+					api.fetchApi('/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -334,7 +561,7 @@ export class ModelManager {
 			sortable: false,
 			align: 'center',
 			formatter: (url, rowItem, columnItem) => {
-				return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
+				return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
 			}
 		}, {
 			id: 'size',
@@ -413,15 +640,23 @@ export class ModelManager {
 	}
 
 	async installModels(list, btn) {
+		let stats = await api.fetchApi('/manager/queue/status');
+
+		stats = await stats.json();
+		if(stats.is_processing) {
+			customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
+			return;
+		}
+
 		btn.classList.add("cmm-btn-loading");
 		this.showError("");
 
 		let needRefresh = false;
 		let errorMsg = "";
 
-		let target_items = [];
+		await api.fetchApi('/manager/queue/reset');
 
-		let batch = {};
+		let target_items = [];
 
 		for (const item of list) {
 			this.grid.scrollRowIntoView(item);
@@ -438,12 +673,21 @@ export class ModelManager {
 			const data = item.originalData;
 			data.ui_id = item.hash;
 
+			const res = await api.fetchApi(`/manager/queue/install_model`, {
+				method: 'POST',
+				body: JSON.stringify(data)
+			});
 
-			if(batch['install_model']) {
-				batch['install_model'].push(data);
-			}
-			else {
-				batch['install_model'] = [data];
+			if (res.status != 200) {
+				errorMsg = `'${item.name}': `;
+
+				if(res.status == 403) {
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
 		}
 
@@ -460,24 +704,7 @@ export class ModelManager {
 			}
 		}
 		else {
-			this.batch_id = generateUUID();
-			batch['batch_id'] = this.batch_id;
-
-			const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-				method: 'POST',
-				body: JSON.stringify(batch)
-			});
-
-			let failed = await res.json();
-
-			if(failed.length > 0) {
-				for(let k in failed) {
-					let hash = failed[k];
-					const item = self.grid.getRowItemBy("hash", hash);
-					errorMsg = `[FAIL] ${item.title}`;
-				}
-			}
-
+			await api.fetchApi('/manager/queue/start');
 			this.showStop();
 			showTerminal();
 		}
@@ -497,7 +724,7 @@ export class ModelManager {
 //			self.grid.updateCell(item, "tg-column-select");
 			self.grid.updateRow(item);
 		}
-		else if(event.detail.status == 'batch-done') {
+		else if(event.detail.status == 'done') {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -623,7 +850,7 @@ export class ModelManager {
 
 		const mode = manager_instance.datasrc_combo.value;
 
-		const res = await fetchData(`/v2/externalmodel/getlist?mode=${mode}`);
+		const res = await fetchData(`/externalmodel/getlist?mode=${mode}`);
 		if (res.error) {
 			this.showError("Failed to get external model list.");
 			this.hideLoading();

js/node_fixer.js

@@ -142,7 +142,7 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
 }
 
 app.registerExtension({
-	name: "Comfy.Legacy.Manager.NodeFixer",
+	name: "Comfy.Manager.NodeFixer",
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({

js/snapshot.js

@@ -7,7 +7,7 @@ import { manager_instance, rebootAPI, show_message } from  "./common.js";
 async function restore_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/v2/snapshot/restore?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/snapshot/restore?target=${target}`, { cache: "no-store" });
 
 			if(response.status == 403) {
 				show_message('This action is not allowed with this security level configuration.');
@@ -35,7 +35,7 @@ async function restore_snapshot(target) {
 async function remove_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/v2/snapshot/remove?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/snapshot/remove?target=${target}`, { cache: "no-store" });
 
 			if(response.status == 403) {
 				show_message('This action is not allowed with this security level configuration.');
@@ -61,7 +61,7 @@ async function remove_snapshot(target) {
 
 async function save_current_snapshot() {
 	try {
-		const response = await api.fetchApi('/v2/snapshot/save', { cache: "no-store" });
+		const response = await api.fetchApi('/snapshot/save', { cache: "no-store" });
 		app.ui.dialog.close();
 		return true;
 	}
@@ -76,7 +76,7 @@ async function save_current_snapshot() {
 }
 
 async function getSnapshotList() {
-	const response = await api.fetchApi(`/v2/snapshot/getlist`);
+	const response = await api.fetchApi(`/snapshot/getlist`);
 	const data = await response.json();
 	return data;
 }

js/workflow-metadata.js

@@ -38,7 +38,7 @@ class WorkflowMetadataExtension {
    * enabled is true if the node is enabled, false if it is disabled
    */
   async getInstalledNodes() {
-    const res = await api.fetchApi("/v2/customnode/installed");
+    const res = await api.fetchApi("/customnode/installed");
     return await res.json();
   }
 

model-list.json

@@ -4750,209 +4750,6 @@
       "filename": "diffusion_pytorch_model.safetensors",
       "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
       "size": "335MB"
-    },
-
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_bf16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
-      "size": "16.4GB"
-    },
-
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 1.3B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 1.3B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_1.3B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors",
-      "size": "2.84GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 1.3B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 1.3B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_1.3B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_fp16.safetensors",
-      "size": "2.84GB"
-    },
-
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_bf16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 VAE",
-      "type": "vae",
-      "base": "Wan2.1",
-      "save_path": "vae",
-      "description": "Wan2.1 VAE model",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan_2.1_vae.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors",
-      "size": "254MB"
-    },
-    {
-      "name": "Comfy-Org/clip_vision_h.safetensors",
-      "type": "clip_vision",
-      "base": "clip_vision_h",
-      "save_path": "clip_vision",
-      "description": "clip_vision_h model for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "clip_vision_h.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors",
-      "size": "1.26GB"
-    },
-
-
-    {
-      "name": "Comfy-Org/umt5_xxl_fp16.safetensors",
-      "type": "clip",
-      "base": "umt5_xxl",
-      "save_path": "text_encoders",
-      "description": "umt5_xxl_fp16 text encoder for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "umt5_xxl_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors",
-      "size": "11.4GB"
-    },
-    {
-      "name": "Comfy-Org/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "type": "clip",
-      "base": "umt5_xxl",
-      "save_path": "text_encoders",
-      "description": "umt5_xxl_fp8_e4m3fn_scaled text encoder for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "size": "6.74GB"
     }
   ]
 }

node_db/dev/custom-node-list.json

@@ -12,589 +12,6 @@
         
         
         
-        
-        
-        {
-            "author": "hunzmusic",
-            "title": "Comfyui-CraftsMan3DWrapper [WIP]",
-            "reference": "https://github.com/hunzmusic/Comfyui-CraftsMan3DWrapper",
-            "files": [
-                "https://github.com/hunzmusic/Comfyui-CraftsMan3DWrapper"
-            ],
-            "install_type": "git-clone",
-            "description": "A wrapper for CraftsMan\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "jax-explorer",
-            "title": "ComfyUI-H-flow",
-            "reference": "https://github.com/jax-explorer/ComfyUI-H-flow",
-            "files": [
-                "https://github.com/jax-explorer/ComfyUI-H-flow"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Wan2-1 Image To Video, LLM Task, Save Image, Save Video, Show Text, FluxPro Ultra, IdeogramV2 Turbo, Runway Image To Video, Kling Image To Video, Replace Text, Join Text, Test Image, Test Text"
-        },
-        {
-            "author": "Slix-M-Lestragg",
-            "title": "comfyui-enhanced [WIP]",
-            "reference": "https://github.com/Slix-M-Lestragg/comfyui-enhanced",
-            "files": [
-                "https://github.com/Slix-M-Lestragg/comfyui-enhanced"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "tzsoulcap",
-            "title": "ComfyUI-SaveImg-W-MetaData",
-            "reference": "https://github.com/tzsoulcap/ComfyUI-SaveImg-W-MetaData",
-            "files": [
-                "https://github.com/tzsoulcap/ComfyUI-SaveImg-W-MetaData"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: CAP Checkpoint Selector, CAP Save Image w/Metadata, CAP Load Image with Metadata, CAP Tag Image, CAP Sampler Selector, CAP Scheduler Selector, CAP Seed Generator, CAP String Literal, CAP Width/Height Literal, CAP Cfg Literal, CAP Int Literal"
-        },
-        {
-            "author": "hylarucoder",
-            "title": "comfyui-copilot",
-            "reference": "https://github.com/hylarucoder/comfyui-copilot",
-            "files": [
-                "https://github.com/hylarucoder/comfyui-copilot"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Eagle Image Node for PNGInfo, SDXL Resolution Presets (ws), SDXL Prompt Styler, SDXL Prompt Styler Advanced"
-        },
-        {
-            "author": "SS-snap",
-            "title": "Comfyui_SSsnap_pose-Remapping",
-            "reference": "https://github.com/SS-snap/Comfyui_SSsnap_pose-Remapping",
-            "files": [
-                "https://github.com/SS-snap/Comfyui_SSsnap_pose-Remapping"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: SSsnap Apply Pose Diff ✂️, SSsnap Pose Diff Calculator 🛠️"
-        },
-        {
-            "author": "AlejandroTuzzi",
-            "title": "TUZZI-ByPass [WIP]",
-            "reference": "https://github.com/AlejandroTuzzi/TUZZI-ByPass",
-            "files": [
-                "https://github.com/AlejandroTuzzi/TUZZI-ByPass"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes for automated AI pipelines\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "oxysoft",
-            "title": "Comfy-Compel",
-            "reference": "https://github.com/oxysoft/Comfy-Compel",
-            "files": [
-                "https://github.com/oxysoft/Comfy-Compel"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: CLIP Embed (Compel)"
-        },
-        {
-            "author": "QingLuanWithoutHeart",
-            "title": "ComfyUI File/Image Utils Nodes [UNSAFE]",
-            "reference": "https://github.com/QingLuanWithoutHeart/comfyui-file-image-utils",
-            "files": [
-                "https://github.com/QingLuanWithoutHeart/comfyui-file-image-utils"
-            ],
-            "install_type": "git-clone",
-            "description": "This custom node set provides useful utilities for file operations and image loading in ComfyUI."
-        },
-        {
-            "author": "pmarmotte2",
-            "title": "VibeVoiceSelector [WIP]",
-            "reference": "https://github.com/pmarmotte2/Comfyui-VibeVoiceSelector",
-            "files": [
-                "https://github.com/pmarmotte2/Comfyui-VibeVoiceSelector"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Vibe Voice Selector"
-        },
-        {
-            "author": "Temult",
-            "title": "TWanVideoSigmaSampler: EXPERIMENTAL [WIP]",
-            "reference": "https://github.com/Temult/TWanSigmaSampler",
-            "files": [
-                "https://github.com/Temult/TWanSigmaSampler"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI custom node that modifies the WanVideoSampler to accept an external sigma schedule. Allows for customized and non-standard noise schedules in Wan 2.1 video generation workflow.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "wordbrew",
-            "title": "WAN Control Nodes for ComfyUI [WIP]",
-            "reference": "https://github.com/wordbrew/comfyui-wan-control-nodes",
-            "files": [
-                "https://github.com/wordbrew/comfyui-wan-control-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "This pack provides enhanced control nodes for working with Wan video models in ComfyUI. It is under active development and may change regularly, or may not. Depends entirely on my free time and waning interest. Please don't come to rely on it for anything, but you are welcome to improve on it.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Kur0butiMegane",
-            "title": "Comfyui-StringUtils",
-            "reference": "https://github.com/Kur0butiMegane/Comfyui-StringUtils",
-            "files": [
-                "https://github.com/Kur0butiMegane/Comfyui-StringUtils"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Prompt Normalizer, String Splitter, String Line Selector, Extract Markup Value"
-        },
-        {
-            "author": "techtruth",
-            "title": "ComfyUI-Dreambooth",
-            "reference": "https://github.com/techtruth/ComfyUI-Dreambooth",
-            "files": [
-              "https://github.com/techtruth/ComfyUI-Dreambooth"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Dreambooth Trainer"
-        },
-        {
-            "author": "438443467",
-            "title": "ComfyUI-SanMian-Nodes",
-            "reference": "https://github.com/438443467/ComfyUI-SanMian-Nodes",
-            "files": [
-              "https://github.com/438443467/ComfyUI-SanMian-Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Add Text To Image, Adjust Hex Brightness, Adjust Transparency By Mask, Align Images with Mask, Align Restore Json, Binarize Mask, Blend ICLight, ..."
-        },
-        {
-            "author": "alexgenovese",
-            "title": "ComfyUI-Reica",
-            "reference": "https://github.com/alexgenovese/ComfyUI-Reica",
-            "files": [
-                "https://github.com/alexgenovese/ComfyUI-Reica"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Reica Text Image Display, Flux Image Generator, Reica GCP: Read Image, Reica GCP: Write Image & Get URL, Reica API: Send HTTP Notification"
-        },
-        {
-            "author": "yanlang0123",
-            "title": "ComfyUI_Lam",
-            "reference": "https://github.com/yanlang0123/ComfyUI_Lam",
-            "files": [
-                "https://github.com/yanlang0123/ComfyUI_Lam"
-            ],
-            "install_type": "git-clone",
-            "description": "This extension has some useful nodes, loops, wechat public number +AI chat drawing, distributed cluster."
-        },
-        {
-            "author": "Stable-X",
-            "title": "ComfyUI-Hi3DGen",
-            "reference": "https://github.com/Stable-X/ComfyUI-Hi3DGen",
-            "files": [
-                "https://github.com/Stable-X/ComfyUI-Hi3DGen"
-            ],
-            "install_type": "git-clone",
-            "description": "This extension integrates [a/Hi3DGen](https://github.com/Stable-X/Hi3DGen) into ComfyUI, allowing user to generate high-fidelity 3D geometry generation from Images.[w/If the *sageattention* package is installed, this node pack causes problems.]"
-        },
-        {
-            "author": "stiffy-committee",
-            "title": "comfyui-stiffy-nodes",
-            "reference": "https://github.com/stiffy-committee/comfyui-stiffy-nodes",
-            "files": [
-                "https://github.com/stiffy-committee/comfyui-stiffy-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: StiffyPrompter, StiffyPersistentPrompter, StiffyDecoder, StiffyDebugger, ..."
-        },
-        {
-            "author": "chetusangolgi",
-            "title": "Comfyui-supabase",
-            "reference": "https://github.com/chetusangolgi/Comfyui-supabase",
-            "files": [
-                "https://github.com/chetusangolgi/Comfyui-supabase"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Watch Supabase Bucket, Upload Image to Supabase"
-        },
-        {
-            "author": "rickyars",
-            "title": "sd-cn-animation",
-            "reference": "https://github.com/rickyars/sd-cn-animation",
-            "files": [
-                "https://github.com/rickyars/sd-cn-animation"
-            ],
-            "install_type": "git-clone",
-            "description": "SD-CN animation for Comfyui"
-        },
-        {
-            "author": "daracazamea",
-            "title": "DCNodess [WIP]",
-            "reference": "https://github.com/daracazamea/DCNodes",
-            "files": [
-                "https://github.com/daracazamea/DCNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Start Timer (Pass-Through), Get Generation Time, Manual Trigger, Flux: Resolution Picker, SDXL: Resolution Picker\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "hunzmusic",
-            "title": "ComfyUI-Hunyuan3DTools [WIP]",
-            "reference": "https://github.com/hunzmusic/ComfyUI-Hunyuan3DTools",
-            "files": [
-                "https://github.com/hunzmusic/ComfyUI-Hunyuan3DTools"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Hy3DTools Render Specific View, Hy3DTools Back-Project Inpaint\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "gondar-software",
-            "title": "comfyui-custom-padding",
-            "reference": "https://github.com/gondar-software/comfyui-custom-padding",
-            "files": [
-                "https://github.com/gondar-software/comfyui-custom-padding"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Adaptive image padding, Adaptive image unpadding"
-        },
-        {
-            "author": "grokuku",
-            "title": "Holaf Custom Nodes for ComfyUI",
-            "reference": "https://github.com/grokuku/ComfyUI-Holaf",
-            "files": [
-                "https://github.com/grokuku/ComfyUI-Holaf"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Neurogrid Overload, Tile Calculator, Slice Calculator, Save Image, Tiled KSampler, KSampler, Image Comparer, Upscale"
-        },
-        {
-            "author": "Burgstall-labs",
-            "title": "ComfyUI-BS_FalAi-API-Video [WIP]",
-            "reference": "https://github.com/Burgstall-labs/ComfyUI-BS_FalAi-API-Video",
-            "files": [
-                "https://github.com/Burgstall-labs/ComfyUI-BS_FalAi-API-Video"
-            ],
-            "install_type": "git-clone",
-            "description": "Experimental ComfyUI Custom Node for generating videos using various FAL AI API endpoints.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "uauaouau",
-            "title": "Mycraft [WIP]",
-            "reference": "https://github.com/uauaouau/mycraft-comfyui",
-            "files": [
-                "https://github.com/uauaouau/mycraft-comfyui"
-            ],
-            "install_type": "git-clone",
-            "description": "Mycraft provides a limitless storyboard experience for image generation, powered by the ComfyUI API.\nEach container functions as an independent ComfyUI workflow, Supports workflows (text-to-text) and fine-tuning (image-to-image), Supports workflow customization."
-        },
-        {
-            "author": "fredconex",
-            "title": "ComfyUI-PaintTurbo",
-            "reference": "https://github.com/fredconex/ComfyUI-PaintTurbo",
-            "files": [
-                "https://github.com/fredconex/ComfyUI-PaintTurbo"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Hunyuan3D Texture Mesh"
-        },
-        {
-            "author": "zhaorishuai",
-            "title": "ComfyUI-StoryboardDistributor",
-            "reference": "https://github.com/zhaorishuai/ComfyUI-StoryboardDistributor",
-            "files": [
-                "https://github.com/zhaorishuai/ComfyUI-StoryboardDistributor"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI plugin that automatically assigns storyboard content to 9 storyboard nodes."
-        },
-        {
-            "author": "Apache0ne",
-            "title": "ComfyUI-LantentCompose [WIP]",
-            "reference": "https://github.com/Apache0ne/ComfyUI-LantentCompose",
-            "files": [
-                "https://github.com/Apache0ne/ComfyUI-LantentCompose"
-            ],
-            "install_type": "git-clone",
-            "description": "Interpolate sdxl latents using slerp with and without a mask. use with unsample nodes for best effect.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "alexgenovese",
-            "title": "ComfyUI-Diffusion-4k [WIP]",
-            "reference": "https://github.com/alexgenovese/ComfyUI-Diffusion-4k",
-            "files": [
-                "https://github.com/alexgenovese/ComfyUI-Diffusion-4k"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI custom node implementation of the Diffusion 4K research paper.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "KERRY-YUAN",
-            "title": "Python_Executor [UNSAFE]",
-            "id": "PythonExecutor",
-            "reference": "https://github.com/KERRY-YUAN/ComfyUI_Python_Executor",
-            "files": [
-                "https://github.com/KERRY-YUAN/ComfyUI_Python_Executor"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes: Provides nodes to execute arbitrary Python code snippets and Resize images directly within ComfyUI workflows. [w/This node allows you to execute arbitrary code via the workflow.]"
-        },
-        {
-            "author": "ashllay",
-            "title": "ComfyUI_MoreComfy",
-            "reference": "https://github.com/ashllay/ComfyUI_MoreComfy",
-            "files": [
-                "https://github.com/ashllay/ComfyUI_MoreComfy"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: MC Switch Seed, MC Alter Seed, MC Set Tile Size, MC Multi Concat"
-        },
-        {
-            "author": "ayaoayaoayaoaya",
-            "title": "ComfyUI-KLUT-DeepSeek-API [WIP]",
-            "reference": "https://github.com/ayaoayaoayaoaya/ComfyUI-KLUT-DeepSeek-API",
-            "files": [
-                "https://github.com/ayaoayaoayaoaya/ComfyUI-KLUT-DeepSeek-API"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of utility / quality-of-life nodes for ComfyUI. Probably only useful to me.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "olyyarm",
-            "title": "ComfyUI-VLMStudio",
-            "reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke_Nodes",
-            "files": [
-                "https://github.com/KurtHokke/ComfyUI_KurtHokke_Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Node_BOOL/INT/Float, BooleanToPipe, BooleanFromPipe, ExpMath, ExpMathDual/Quad, ...."
-        },
-        {
-            "author": "olyyarm",
-            "title": "ComfyUI-VLMStudio",
-            "reference": "https://github.com/olyyarm/ComfyUI-VLMStudio",
-            "files": [
-                "https://raw.githubusercontent.com/olyyarm/ComfyUI-VLMStudio/refs/heads/master/vlm_visionary_node_v3_.py"
-            ],
-            "install_type": "copy",
-            "description": "NODES: GemmaMultimodalAnalyzer"
-        },
-        {
-            "author": "apetitbois",
-            "title": "nova_utils",
-            "reference": "https://github.com/apetitbois/nova_utils",
-            "files": [
-                "https://github.com/apetitbois/nova_utils"
-            ],
-            "install_type": "git-clone",
-            "description": "Nova utils for ComfyUI"
-        },
-        {
-            "author": "niknah",
-            "title": "niknah/ComfyUI-InfiniteYou",
-            "reference": "https://github.com/niknah/ComfyUI-InfiniteYou",
-            "files": [
-                "https://github.com/niknah/ComfyUI-InfiniteYou"
-            ],
-            "install_type": "git-clone",
-            "description": "Put anyone's face on anything with Byte Dance's [a/InfiniteYou](https://github.com/bytedance/InfiniteYou)."
-        },
-        {
-            "author": "sugarkwork",
-            "title": "comfyui_my_img_util",
-            "reference": "https://github.com/sugarkwork/comfyui_my_img_util",
-            "files": [
-                "https://github.com/sugarkwork/comfyui_my_img_util"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Simple Image Rotate"
-        },
-        {
-            "author": "DonutsDelivery",
-            "title": "ComfyUI-DonutDetailer",
-            "reference": "https://github.com/DonutsDelivery/ComfyUI-DonutDetailer",
-            "files": [
-                "https://github.com/DonutsDelivery/ComfyUI-DonutDetailer"
-            ],
-            "install_type": "git-clone",
-            "description": "This is an experimental node I made to mimick the 'adjust' in A1111 Supermerger [a/https://github.com/hako-mikan/sd-webui-supermerger?tab=readme-ov-file#adjust](https://github.com/hako-mikan/sd-webui-supermerger?tab=readme-ov-file#adjust)."
-        },
-        {
-            "author": "ZenAI-Vietnam",
-            "title": "ComfyUI-gemini-IG",
-            "reference": "https://github.com/ZenAI-Vietnam/ComfyUI-gemini-IG",
-            "files": [
-                "https://github.com/ZenAI-Vietnam/ComfyUI-gemini-IG"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Gemini Image Generation, Gemini Text Generation"
-        },
-        {
-            "author": "hunzmusic",
-            "title": "comfyui-hnznodes",
-            "reference": "https://github.com/hunzmusic/comfyui-hnznodes",
-            "files": [
-                "https://github.com/hunzmusic/comfyui-hnznodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Combine Channels Grayscale, Reorder Image Batch, Male Character Prompt"
-        },
-        {
-            "author": "cidiro",
-            "title": "cid-node-pack",
-            "reference": "https://github.com/cidiro/cid-node-pack",
-            "files": [
-                "https://github.com/cidiro/cid-node-pack"
-            ],
-            "install_type": "git-clone",
-            "description": "A lightweight node pack for ComfyUI that adds a few handy nodes that I use in my workflows"
-        },
-        {
-            "author": "markuryy",
-            "title": "ComfyUI Spiritparticle Nodes [WIP]",
-            "reference": "https://github.com/markuryy/comfyui-spiritparticle",
-            "files": [
-                "https://github.com/markuryy/comfyui-spiritparticle"
-            ],
-            "install_type": "git-clone",
-            "description": "A node pack by spiritparticle."
-        },
-        {
-            "author": "CeeVeeR",
-            "title": "ComfyUi-Text-Tiler",
-            "reference": "https://github.com/CeeVeeR/ComfyUi-Text-Tiler",
-            "files": [
-                "https://github.com/CeeVeeR/ComfyUi-Text-Tiler"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Text Tiler"
-        },
-        {
-            "author": "Dreamshot-io",
-            "title": "ComfyUI-Extend-Resolution",
-            "reference": "https://github.com/Dreamshot-io/ComfyUI-Extend-Resolution",
-            "files": [
-                "https://github.com/Dreamshot-io/ComfyUI-Extend-Resolution"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Resolution Padding"
-        },
-        {
-            "author": "l1yongch1",
-            "title": "ComfyUI-YcNodes",
-            "reference": "https://github.com/l1yongch1/ComfyUI-YcNodes",
-            "files": [
-                "https://github.com/l1yongch1/ComfyUI-YcNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: RemoveHighlightAndBlur, RoundedCorners, PaddingAccordingToBackground\npersonal custom nodes for learning"
-        },
-        {
-            "author": "vchopine",
-            "title": "ComfyUI_Toolbox",
-            "reference": "https://github.com/vchopine/ComfyUI_Toolbox",
-            "files": [
-                "https://github.com/vchopine/ComfyUI_Toolbox"
-            ],
-            "install_type": "git-clone",
-            "description": "Model & Aspect Ratio Selector Node for ComfyUI\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Solankimayursinh",
-            "title": "PMSnodes",
-            "reference": "https://github.com/Solankimayursinh/PMSnodes",
-            "files": [
-                "https://github.com/Solankimayursinh/PMSnodes"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom nodes for ComfyUI to Load audio in Base64 format and Send Audio to Websocket in Base64 Format for creating API of Audio related AI\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "rhinoflavored",
-            "title": "comfyui_QT",
-            "reference": "https://github.com/rhinoflavored/comfyui_QT",
-            "files": [
-                "https://github.com/rhinoflavored/comfyui_QT"
-            ],
-            "install_type": "git-clone",
-            "description": "bunch of image manipulation nodes....\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "ricklove",
-            "title": "ComfyUI-AutoSeg-SAM2",
-            "reference": "https://github.com/ricklove/ComfyUI-AutoSeg-SAM2",
-            "files": [
-                "https://github.com/ricklove/ComfyUI-AutoSeg-SAM2"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: AutoSeg-SAM2 Batch Segmentation"
-        },
-        {
-            "author": "JoeAu",
-            "title": "ComfyUI-PythonNode [UNSAFE]",
-            "reference": "https://github.com/JoeAu/ComfyUI-PythonNode",
-            "files": [
-                "https://github.com/JoeAu/ComfyUI-PythonNode"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom ComfyUI node that allows users to execute arbitrary Python code with a single input (value) and output (result), enabling flexible processing of the input value using any Python code before assigning the final result to result. It also captures print() output and exceptions for debugging.[w/This node is an unsafe node that includes the capability to execute arbitrary python script.]"
-        },
-        {
-            "author": "smthemex",
-            "title": "ComfyUI_GPT_SoVITS_Lite",
-            "reference": "https://github.com/smthemex/ComfyUI_GPT_SoVITS_Lite",
-            "files": [
-                "https://github.com/smthemex/ComfyUI_GPT_SoVITS_Lite"
-            ],
-            "install_type": "git-clone",
-            "description": "[a/GPT_SoVITS](https://github.com/RVC-Boss/GPT-SoVITS) infer only for ComfyUI users\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Nambi24",
-            "title": "ComfyUI-Save_Image",
-            "reference": "https://github.com/Nambi24/ComfyUI-Save_Image",
-            "files": [
-               "https://github.com/Nambi24/ComfyUI-Save_Image"
-            ],
-            "description": "NODES: Save Image With Subfolder, Extract Last Path Component\nNOTE: The files in the repo are not organized.",
-            "install_type": "git-clone"
-        },
-        {
-            "author": "sugarkwork",
-            "title": "comfyui_image_crop",
-            "reference": "https://github.com/sugarkwork/comfyui_image_crop",
-            "files": [
-               "https://github.com/sugarkwork/comfyui_image_crop"
-            ],
-            "description": "NODES: CropTransparent, RestoreCrop, ExpandMultiple, CropReapply",
-            "install_type": "git-clone"
-        },
-        {
-            "author": "AkiEvansDev",
-            "title": "ComfyUI-Tools",
-            "reference": "https://github.com/AkiEvansDev/ComfyUI-Tools",
-            "files": [
-                "https://github.com/AkiEvansDev/ComfyUI-Tools"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes for basic actions."
-        },
-        {
-            "author": "silveroxides",
-            "title": "ComfyUI-ModelUtils [WIP]",
-            "reference": "https://github.com/silveroxides/ComfyUI-ModelUtils",
-            "files": [
-                "https://github.com/silveroxides/ComfyUI-ModelUtils"
-            ],
-            "install_type": "git-clone",
-            "description": "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
-        },
-        {
-            "author": "thisiseddy-ab",
-            "title": "ComfyUI-Edins-Ultimate-Pack",
-            "reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
-            "files": [
-                "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
-            ],
-            "install_type": "git-clone",
-            "description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
-        },
         {
             "author": "longzoho",
             "title": "ComfyUI-Qdrant-Saver",
@@ -605,6 +22,16 @@
             "install_type": "git-clone",
             "description": "NODES: QDrant Saver Node"
         },
+        {
+            "author": "nova-florealis",
+            "title": "comfyui-alien",
+            "reference": "https://github.com/nova-florealis/comfyui-alien",
+            "files": [
+                "https://github.com/nova-florealis/comfyui-alien"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
+        },
         {
             "author": "RUFFY-369",
             "title": "ComfyUI-FeatureBank",
@@ -617,7 +44,7 @@
         },
         {
             "author": "Pablerdo",
-            "title": "ComfyUI-Sa2VAWrapper [WIP]",
+            "title": "ComfyUI-Sa2VAWrapper",
             "reference": "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper",
             "files": [
                 "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper"
@@ -655,6 +82,16 @@
             "install_type": "git-clone",
             "description": "A custom node for ComfyUI that enables high-quality image and video upscaling using Apple MetalFX technology.\nNOTE: The files in the repo are not organized."
         },
+        {
+            "author": "IfnotFr",
+            "title": "ComfyUI-Connect [WIP]",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Connect"
+            ],
+            "install_type": "git-clone",
+            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
+        },
         {
             "author": "RoyKillington",
             "title": "Miscomfy Nodes [WIP]",
@@ -695,6 +132,16 @@
             "install_type": "git-clone",
             "description": "This is a collection focused in give a little more flexibility in the use of Flux models."
         },
+        {
+            "author": "KurtHokke",
+            "title": "ComfyUI_KurtHokke-Nodes",
+            "reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
+            "files": [
+                "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI_KurtHokke-Nodes"
+        },
         {
             "author": "OSAnimate",
             "title": "ComfyUI-SpriteSheetMaker [WIP]",
@@ -815,6 +262,16 @@
             "install_type": "git-clone",
             "description": "disable torch.load's `weigths_only`"
         },
+        {
+            "author": "IfnotFr",
+            "title": "⚡ ComfyUI Connect [WIP]",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Connect"
+            ],
+            "install_type": "git-clone",
+            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
+        },
         {
             "author": "muvich3n",
             "title": "ComfyUI-Crop-Border",
@@ -944,7 +401,7 @@
                 "https://github.com/grinlau18/ComfyUI_XISER_Nodes"
              ],
              "install_type": "git-clone",
-             "description": "Custom nodes for customizing workflows\nNOTE: The files in the repo are not organized."
+             "description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "LAOGOU-666",
@@ -1557,6 +1014,16 @@
             "install_type": "git-clone",
             "description": "NODES: Kwaifont_Resnet50_Runner, Kwaifont_Resnet50_Loader, Kwaifont_Resnet101_Runner, Kwaifont_Resnet101_Loader, Kwaifont_Image_Cropper"
         },
+        {
+            "author": "SpatialDeploy",
+            "title": "ComfyUI-Voxels [WIP]",
+            "reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
+            "files": [
+                "https://github.com/SpatialDeploy/ComfyUI-Voxels"
+            ],
+            "install_type": "git-clone",
+            "description": "Tools for creating voxel based videos"
+        },
         {
             "author": "PATATAJEC",
             "title": "Patatajec-Nodes [WIP]",
@@ -1695,7 +1162,7 @@
                 "https://github.com/zyd232/ComfyUI-zyd232-Nodes"
             ],
             "install_type": "git-clone",
-            "description": "NODES: Image Pixels Compare, Save Preview Images"
+            "description": "NODES: Image Pixels Compare"
         },
         {
             "author": "yanhuifair",
@@ -2341,6 +1808,16 @@
             "install_type": "git-clone",
             "description": "a custom node for [a/Ultralight-Digital-Human](https://github.com/anliyuan/Ultralight-Digital-Human)\nNOTE: The files in the repo are not organized."
         },
+        {
+            "author": "vahidzxc",
+            "title": "ComfyUI-My-Handy-Nodes",
+            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
+            "files": [
+                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:VahCropImage"
+        },
         {
             "author": "StartHua",
             "title": "Comfyui_Flux_Style_Ctr [WIP]",
@@ -2634,6 +2111,16 @@
             "install_type": "git-clone",
             "description": "NODES:LETM Save Image, ETM Load Image From Local"
         },
+        {
+            "author": "oshtz",
+            "title": "ComfyUI-oshtz-nodes [WIP]",
+            "reference": "https://github.com/oshtz/ComfyUI-oshtz-nodes",
+            "files": [
+                "https://github.com/oshtz/ComfyUI-oshtz-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node\nNOTE: The files in the repo are not organized."
+        },
         {
             "author": "m-ai-studio",
             "title": "mai-prompt-progress",
@@ -2915,6 +2402,16 @@
             "install_type": "copy",
             "description": "This platform extension provides ZhipuAI nodes, enabling you to configure a workflow for online video generation."
         },
+        {
+            "author": "HavocsCall",
+            "title": "comfyui_HavocsCall_Custom_Nodes",
+            "reference": "https://github.com/HavocsCall/comfyui_HavocsCall_Custom_Nodes",
+            "files": [
+                "https://github.com/HavocsCall/comfyui_HavocsCall_Custom_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Prompt Combiner, Sampler Config, Text Box, Int to Float, Clip Switch, Conditioning Switch, Image Switch, Latent Switch, Model Switch, String Switch, VAE Switch"
+        },
         {
             "author": "mfg637",
             "title": "ComfyUI-ScheduledGuider-Ext",
@@ -5063,6 +4560,16 @@
             "install_type": "git-clone",
             "description": "Image manipulation nodes, Temperature control nodes, Tiling nodes, Primitive and operation nodes, ..."
         },
+        {
+            "author": "PluMaZero",
+            "title": "ComfyUI-SpaceFlower",
+            "reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
+            "files": [
+                "https://github.com/PluMaZero/ComfyUI-SpaceFlower"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
+        },
         {
             "author": "laksjdjf",
             "title": "ssd-1b-comfyui",

node_db/forked/custom-node-list.json

@@ -1,15 +1,5 @@
 {
     "custom_nodes": [
-        {
-            "author": "SanDiegoDude",
-            "title": "ComfyUI-HiDream-Sampler [WIP]",
-            "reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
-            "files": [
-                "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
-        },
         {
             "author": "PramaLLC",
             "title": "ComfyUI BEN - Background Erase Network",

node_db/legacy/custom-node-list.json

@@ -8,314 +8,9 @@
             "install_type": "git-clone",
             "description": "If you see this message, your ComfyUI-Manager is outdated.\nLegacy channel provides only the list of the deprecated nodes. If you want to find the complete node list, please go to the Default channel."
         },
-
         
-        {
-            "author": "AI2lab",
-            "title": "comfyUI-tool-2lab [REMOVED]",
-            "id": "tool-2lab",
-            "reference": "https://github.com/AI2lab/comfyUI-tool-2lab",
-            "files": [
-                "https://github.com/AI2lab/comfyUI-tool-2lab"
-            ],
-            "install_type": "git-clone",
-            "description": "tool set for developing workflow and publish to web api server"
-        },
-        {
-            "author": "AI2lab",
-            "title": "comfyUI-DeepSeek-2lab [REMOVED]",
-            "id": "deepseek",
-            "reference": "https://github.com/AI2lab/comfyUI-DeepSeek-2lab",
-            "files": [
-                "https://github.com/AI2lab/comfyUI-DeepSeek-2lab"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial implementation of DeepSeek for ComfyUI"
-        },
-        {
-            "author": "AI2lab",
-            "title": "comfyUI-kling-api-2lab [REMOVED]",
-            "reference": "https://github.com/AI2lab/comfyUI-kling-api-2lab",
-            "files": [
-                "https://github.com/AI2lab/comfyUI-kling-api-2lab"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial implementation of KLing for ComfyUI"
-        },
-        {
-            "author": "ZhiHui6",
-            "title": "comfyui_zhihui_nodes [REMOVED]",
-            "reference": "https://github.com/ZhiHui6/comfyui_zhihui_nodes",
-            "files": [
-                "https://github.com/ZhiHui6/comfyui_zhihui_nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Prompt Preset, Video Batch Loader, Video Combiner"
-        },
-        {
-            "author": "ImagineerNL",
-            "title": "comfyui_potrace_svg [REMOVED]",
-            "reference": "https://github.com/ImagineerNL/comfyui_potrace_svg",
-            "files": [
-                "https://github.com/ImagineerNL/comfyui_potrace_svg"
-            ],
-            "install_type": "git-clone",
-            "description": "This project converts raster images into SVG format using the Potrace library."
-        },
-        {
-            "author": "kayselmecnun",
-            "title": "ComfyUI-Qwen-25-VL [REMOVED]",
-            "reference": "https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL",
-            "files": [
-                "https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom Comfy UI node for using Qwen2.5-VL-3B/7B-Instruct models"
-        },
-        {
-            "author": "IfnotFr",
-            "title": "⚡ ComfyUI Connect [REMOVED]",
-            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
-            "files": [
-                "https://github.com/IfnotFr/ComfyUI-Connect"
-            ],
-            "install_type": "git-clone",
-            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
-        },
-        {
-            "author": "ginlov",
-            "title": "segment_to_mask_comfyui [REMOVED]",
-            "reference": "https://github.com/ginlov/segment_to_mask_comfyui",
-            "files": [
-                "https://github.com/ginlov/segment_to_mask_comfyui"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:SegToMask"
-        },
-        {
-            "author": "TGu-97",
-            "title": "TGu Utilities [REMOVED]",
-            "id": "tgu",
-            "reference": "https://github.com/TGu-97/ComfyUI-TGu-utils",
-            "files": [
-                "https://github.com/TGu-97/ComfyUI-TGu-utils"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes: MPN Switch, MPN Reroute, PN Switch. This is a set of custom nodes for ComfyUI. Mainly focus on control switches."
-        },
-        {
-            "author": "IfnotFr",
-            "title": "ComfyUI-Connect [REMOVED]",
-            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
-            "files": [
-                "https://github.com/IfnotFr/ComfyUI-Connect"
-            ],
-            "install_type": "git-clone",
-            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
-        },
-        {
-            "author": "KurtHokke",
-            "title": "ComfyUI_KurtHokke-Nodes [REMOVED]",
-            "reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
-            "files": [
-                "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI_KurtHokke-Nodes"
-        },
-        {
-            "author": "SpatialDeploy",
-            "title": "ComfyUI-Voxels [REMOVED]",
-            "reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
-            "files": [
-                "https://github.com/SpatialDeploy/ComfyUI-Voxels"
-            ],
-            "install_type": "git-clone",
-            "description": "Tools for creating voxel based videos"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-group-selection [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-group-selection",
-            "files": [
-                "https://github.com/shinich39/comfyui-group-selection"
-            ],
-            "install_type": "git-clone",
-            "description": "Create a new group of nodes."
-        },
-        {
-            "author": "shinich39",
-            "title": "connect-from-afar [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-connect-from-afar",
-            "files": [
-                "https://github.com/shinich39/comfyui-connect-from-afar"
-            ],
-            "install_type": "git-clone",
-            "description": "Connect a new link from out of screen."
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-local-db [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-local-db",
-            "files": [
-                "https://github.com/shinich39/comfyui-local-db"
-            ],
-            "install_type": "git-clone",
-            "description": "Store text to Key-Values pair json."
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-model-db [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-model-db",
-            "files": [
-                "https://github.com/shinich39/comfyui-model-db"
-            ],
-            "install_type": "git-clone",
-            "description": "Store settings by model."
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-target-search [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-target-search",
-            "files": [
-                "https://github.com/shinich39/comfyui-target-search"
-            ],
-            "install_type": "git-clone",
-            "description": "Move canvas to target on dragging connection."
-        },
-        {
-            "author": "chrisgoringe",
-            "title": "Image chooser [DEPRECATED]",
-            "id": "image-chooser",
-            "reference": "https://github.com/chrisgoringe/cg-image-picker",
-            "files": [
-                "https://github.com/chrisgoringe/cg-image-picker"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node that pauses the flow while you choose which image (or latent) to pass on to the rest of the workflow."
-        },
-        {
-            "author": "weilin9999",
-            "title": "WeiLin-ComfyUI-prompt-all-in-one [DEPRECATED]",
-            "id": "prompt-all-in-one",
-            "reference": "https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one",
-            "files": [
-                "https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one"
-            ],
-            "install_type": "git-clone",
-            "description": "Write prompt words like WebUI"
-        },
-        {
-            "author": "svetozarov",
-            "title": "AS_GeminiCaptioning Node [REMOVED]",
-            "reference": "https://github.com/svetozarov/AS_GeminiCaptioning",
-            "files": [
-                "https://github.com/svetozarov/AS_GeminiCaptioning"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI node that combines an image with simple text parameters to create a prompt, sends it to the Google Gemini API via the google-generativeai SDK, and returns the generated text response along with the original prompt and an execution log"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-load-image-in-seq [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-load-image-in-seq",
-            "files": [
-                "https://github.com/shinich39/comfyui-load-image-in-seq"
-            ],
-            "install_type": "git-clone",
-            "description": "This node is load png image sequentially with metadata. Only supported for PNG format that has been created by ComfyUI.[w/renamed from comfyui-load-image-39. You need to remove previous one and reinstall to this.]"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-model-metadata [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-model-metadata",
-            "files": [
-                "https://github.com/shinich39/comfyui-model-metadata"
-            ],
-            "install_type": "git-clone",
-            "description": "Print model metadata on note node"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-view-recommendations [REMOVED]",
-            "reference": "https://github.com/shinich39/comfyui-view-recommendations",
-            "files": [
-                "https://github.com/shinich39/comfyui-view-recommendations"
-            ],
-            "install_type": "git-clone",
-            "description": "Load model generation data from civitai."
-        },
-        {
-            "author": "jonstreeter",
-            "title": "Comfyui-PySceneDetect [REMOVED]",
-            "reference": "https://github.com/jonstreeter/Comfyui-PySceneDetect",
-            "files": [
-                "https://github.com/jonstreeter/Comfyui-PySceneDetect"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: PySceneDetect Video Processor"
-        },
-        {
-            "author": "muxueChen",
-            "title": "ComfyUI-NTQwen25-VL [REMOVED]",
-            "reference": "https://github.com/muxueChen/ComfyUI-NTQwen25-VL",
-            "files": [
-                "https://github.com/muxueChen/ComfyUI-NTQwen25-VL"
-            ],
-            "install_type": "git-clone",
-            "description": "Qwen25-VL is a plugin for ComfyU"
-        },
-        {
-            "author": "Makki_Shizu",
-            "title": "ComfyUI-SaveAnimatedGIF [DEPRECATED]",
-            "id": "SaveAnimatedGIF",
-            "reference": "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF",
-            "files": [
-                "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF"
-            ],
-            "install_type": "git-clone",
-            "description": "Save animated GIF format nodes in ComfyUI"
-        },
-        {
-            "author": "l1yongch1",
-            "title": "ComfyUI_PhiCaption [REMOVED]",
-            "reference": "https://github.com/l1yongch1/ComfyUI_PhiCaption",
-            "files": [
-                "https://github.com/l1yongch1/ComfyUI_PhiCaption"
-            ],
-            "install_type": "git-clone",
-            "description": "In addition to achieving conventional single-image, single-round reverse engineering, it can also achieve single-image multi-round and multi-image single-round reverse engineering. Moreover, the Phi model has a better understanding of prompts."
-        },
-        {
-            "author": "nova-florealis",
-            "title": "comfyui-alien [REMOVED]",
-            "reference": "https://github.com/nova-florealis/comfyui-alien",
-            "files": [
-                "https://github.com/nova-florealis/comfyui-alien"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
-        },
-        {
-            "author": "PluMaZero",
-            "title": "ComfyUI-SpaceFlower [REMOVED]",
-            "reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
-            "files": [
-                "https://github.com/PluMaZero/ComfyUI-SpaceFlower"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
-        },
-        {
-            "author": "vahidzxc",
-            "title": "ComfyUI-My-Handy-Nodes [REMOVED]",
-            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
-            "files": [
-                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES:VahCropImage"
-        },
+
+
         {
             "author": "Samulebotin",
             "title": "ComfyUI-FreeVC_wrapper [REMOVED]",

node_db/new/model-list.json

@@ -1,208 +1,5 @@
 {
   "models": [
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 480p 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_bf16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp16.safetensors",
-      "size": "32.8GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for i2v 720p 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
-      "size": "16.4GB"
-    },
-    {
-      "name": "Comfy-Org/clip_vision_h.safetensors",
-      "type": "clip_vision",
-      "base": "clip_vision_h",
-      "save_path": "clip_vision",
-      "description": "clip_vision_h model for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "clip_vision_h.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors",
-      "size": "1.26GB"
-    },
-
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 1.3B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 1.3B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_1.3B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors",
-      "size": "2.84GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 1.3B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 1.3B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_1.3B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_fp16.safetensors",
-      "size": "2.84GB"
-    },
-
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (bf16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (bf16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_bf16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp8_e4m3fn)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp8_e4m3fn)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 t2v 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.1",
-      "save_path": "diffusion_models/Wan2.1",
-      "description": "Wan2.1 difussion model for t2v 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan2.1_t2v_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.1 VAE",
-      "type": "vae",
-      "base": "Wan2.1",
-      "save_path": "vae",
-      "description": "Wan2.1 VAE model",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "wan_2.1_vae.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors",
-      "size": "254MB"
-    },
-
-
-    {
-      "name": "Comfy-Org/umt5_xxl_fp16.safetensors",
-      "type": "clip",
-      "base": "umt5_xxl",
-      "save_path": "text_encoders",
-      "description": "umt5_xxl_fp16 text encoder for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "umt5_xxl_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors",
-      "size": "11.4GB"
-    },
-    {
-      "name": "Comfy-Org/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "type": "clip",
-      "base": "umt5_xxl",
-      "save_path": "text_encoders",
-      "description": "umt5_xxl_fp8_e4m3fn_scaled text encoder for Wan2.1",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
-      "filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
-      "size": "6.74GB"
-    },
-
     {
       "name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
       "type": "diffusion_model",
@@ -705,6 +502,234 @@
       "filename": "Kolors-IP-Adapter-FaceID-Plus.bin",
       "url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-FaceID-Plus/resolve/main/ipa-faceid-plus.bin",
       "size": "2.39GB"
+    },
+    {
+      "name": "CLIPVision model (Kwai-Kolors/Kolors-IP-Adapter-Plus/clip-vit-large)",
+      "type": "clip_vision",
+      "base": "ViT-L",
+      "save_path": "clip_vision",
+      "description": "CLIPVision model (This is required in cubiq/ComfyUI_IPAdapter_plus)",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus",
+      "filename": "clip-vit-large-patch14-336.bin",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus/resolve/main/image_encoder/pytorch_model.bin",
+      "size": "1.71GB"
+    },
+
+    {
+      "name": "kijai/lotus depth d model v1.1 (fp16)",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus depth d model v1.1 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-depth-d-v-1-1-fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-d-v-1-1-fp16.safetensors",
+      "size": "1.74GB"
+    },
+    {
+      "name": "kijai/lotus depth g model v1.0 (fp16)",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus depth g model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-depth-g-v1-0-fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-g-v1-0-fp16.safetensors",
+      "size": "1.74GB"
+    },
+    {
+      "name": "kijai/lotus depth g model v1.0",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus depth g model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-depth-g-v1-0.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-g-v1-0.safetensors",
+      "size": "3.47GB"
+    },
+    {
+      "name": "kijai/lotus normal d model v1.0 (fp16)",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus normal d model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-normal-d-v1-0-fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-d-v1-0-fp16.safetensors",
+      "size": "1.74GB"
+    },
+    {
+      "name": "kijai/lotus normal d model v1.0",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus normal d model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-normal-d-v1-0.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-d-v1-0.safetensors",
+      "size": "3.47GB"
+    },
+    {
+      "name": "kijai/lotus normal g model v1.0 (fp16)",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus normal g model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-normal-g-v1-0-fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-g-v1-0-fp16.safetensors",
+      "size": "1.74GB"
+    },
+    {
+      "name": "kijai/lotus normal g model v1.0",
+      "type": "diffusion_model",
+      "base": "lotus",
+      "save_path": "diffusion_models",
+      "description": "lotus normal g model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
+      "reference": "https://huggingface.co/Kijai/lotus-comfyui",
+      "filename": "lotus-normal-g-v1-0.safetensors",
+      "url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-g-v1-0.safetensors",
+      "size": "3.47GB"
+    },
+
+    {
+      "name": "Depth Pro model",
+      "type": "depth-pro",
+      "base": "depth-pro",
+      "save_path": "depth/ml-depth-pro",
+      "description": "Depth pro model for [a/ComfyUI-Depth-Pro](https://github.com/spacepxl/ComfyUI-Depth-Pro)",
+      "reference": "https://huggingface.co/spacepxl/ml-depth-pro",
+      "filename": "depth_pro.fp16.safetensors",
+      "url": "https://huggingface.co/spacepxl/ml-depth-pro/resolve/main/depth_pro.fp16.safetensors",
+      "size": "1.9GB"
+    },
+
+    {
+      "name": "jasperai/FLUX.1-dev-Controlnet-Upscaler",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "controlnet/FLUX.1/jasperai-dev-Upscaler",
+      "description": "This is Flux.1-dev ControlNet for low resolution images developed by Jasper research team.",
+      "reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Upscaler",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Upscaler/resolve/main/diffusion_pytorch_model.safetensors",
+      "size": "3.58GB"
+    },
+    {
+      "name": "jasperai/FLUX.1-dev-Controlnet-Depth",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "controlnet/FLUX.1/jasperai-dev-Depth",
+      "description": "This is Flux.1-dev ControlNet for Depth map developed by Jasper research team.",
+      "reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Depth",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Depth/resolve/main/diffusion_pytorch_model.safetensors",
+      "size": "3.58GB"
+    },
+    {
+      "name": "jasperai/Flux.1-dev-Controlnet-Surface-Normals",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "controlnet/FLUX.1/jasperai-dev-Surface-Normals",
+      "description": "This is Flux.1-dev ControlNet for Surface Normals map developed by Jasper research team.",
+      "reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Surface-Normals",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Surface-Normals/resolve/main/diffusion_pytorch_model.safetensors",
+      "size": "3.58GB"
+    },
+
+    {
+      "name": "Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro (fp8_e4m3fn) by Kijai",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "controlnet/FLUX.1",
+      "description": "FLUX.1 [Dev] Union Controlnet. Supports Canny, Tile, Depth, Blur, Pose, Gray, Low Quality\nVersion quantized to fp8_e4m3fn by Kijai",
+      "reference": "https://huggingface.co/Kijai/flux-fp8",
+      "filename": "flux_shakker_labs_union_pro-fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/Kijai/flux-fp8/resolve/main/flux_shakker_labs_union_pro-fp8_e4m3fn.safetensors",
+      "size": "3.3GB"
+    },
+    
+    {
+      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
+      "type": "clip",
+      "base": "clip",
+      "save_path": "text_encoders/long_clip",
+      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
+      "reference": "https://huggingface.co/zer0int",
+      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
+      "url": "https://huggingface.co/zer0int/CLIP-GmP-ViT-L-14/resolve/main/ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
+      "size": "931MB"
+    },
+    {
+      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
+      "type": "clip",
+      "base": "clip",
+      "save_path": "text_encoders/long_clip",
+      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
+      "reference": "https://huggingface.co/zer0int",
+      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
+      "url": "https://huggingface.co/zer0int/CLIP-GmP-ViT-L-14/resolve/main/ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
+      "size": "323MB"
+    },
+
+    {
+      "name": "Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "controlnet/FLUX.1/Shakker-Labs-ControlNet-Union-Pro",
+      "description": "FLUX.1 [Dev] Union Controlnet. Supports Canny, Tile, Depth, Blur, Pose, Gray, Low Quality",
+      "reference": "https://huggingface.co/Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro/resolve/main/diffusion_pytorch_model.safetensors",
+      "size": "6.6GB"
+    },
+    
+    {
+      "name": "Hyper-SD LoRA (8steps) - FLUX.1 [Dev]",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "loras/HyperSD/FLUX.1",
+      "description": "Hyper-SD LoRA (8steps) - FLUX.1 [Dev]",
+      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
+      "filename": "Hyper-FLUX.1-dev-8steps-lora.safetensors",
+      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-FLUX.1-dev-8steps-lora.safetensors",
+      "size": "1.39GB"
+    },
+    {
+      "name": "Hyper-SD LoRA (16steps) - FLUX.1 [Dev]",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "loras/HyperSD/FLUX.1",
+      "description": "Hyper-SD LoRA (16steps) - FLUX.1 [Dev]",
+      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
+      "filename": "Hyper-FLUX.1-dev-16steps-lora.safetensors",
+      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-FLUX.1-dev-16steps-lora.safetensors",
+      "size": "1.39GB"
+    },
+
+    {
+      "name": "DMD2 LoRA (4steps)",
+      "type": "lora",
+      "base": "SDXL",
+      "save_path": "loras/DMD2",
+      "description": "DMD2 LoRA (4steps)",
+      "reference": "https://huggingface.co/tianweiy/DMD2",
+      "filename": "dmd2_sdxl_4step_lora.safetensors",
+      "url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora.safetensors",
+      "size": "787MB"
+    },
+    {
+      "name": "DMD2 LoRA (4steps/fp16)",
+      "type": "lora",
+      "base": "SDXL",
+      "save_path": "loras/DMD2",
+      "description": "DMD2 LoRA (4steps/fp16)",
+      "reference": "https://huggingface.co/tianweiy/DMD2",
+      "filename": "dmd2_sdxl_4step_lora_fp16.safetensors",
+      "url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors",
+      "size": "394MB"
     }
   ]
 }

node_db/tutorial/custom-node-list.json

@@ -311,16 +311,6 @@
             ],
             "description": "ComfyUI node for creating some Turtle Graphic demos.", 
             "install_type": "git-clone"
-        },
-        {
-            "author": "cozy-comfyui",
-            "title": "cozy_ex_dynamic",
-            "reference": "https://github.com/cozy-comfyui/cozy_ex_dynamic",
-            "files": [
-                "https://github.com/cozy-comfyui/cozy_ex_dynamic"
-            ],
-            "description": "Dynamic Node examples for ComfyUI",
-            "install_type": "git-clone"
         }
     ]
 }

notebooks/comfyui_colab_with_manager.ipynb

@@ -0,0 +1,373 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "aaaaaaaaaa"
+   },
+   "source": [
+    "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "bbbbbbbbbb"
+   },
+   "outputs": [],
+   "source": [
+    "# #@title Environment Setup\n",
+    "\n",
+    "from pathlib import Path\n",
+    "\n",
+    "OPTIONS = {}\n",
+    "\n",
+    "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
+    "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
+    "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
+    "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
+    "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
+    "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
+    "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
+    "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
+    "\n",
+    "current_dir = !pwd\n",
+    "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
+    "\n",
+    "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
+    "    !echo \"Mounting Google Drive...\"\n",
+    "    %cd /\n",
+    "\n",
+    "    from google.colab import drive\n",
+    "    drive.mount('/content/drive')\n",
+    "\n",
+    "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
+    "    %cd /content/drive/MyDrive\n",
+    "\n",
+    "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['UPDATE_COMFY_UI']:\n",
+    "  !echo -= Updating ComfyUI =-\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
+    "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
+    "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
+    "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
+    "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
+    "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
+    "\n",
+    "  !git pull\n",
+    "\n",
+    "!echo -= Install dependencies =-\n",
+    "!pip3 install accelerate\n",
+    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
+    "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
+    "!pip3 install torchsde\n",
+    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
+    "\n",
+    "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
+    "  %cd custom_nodes\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
+    "\n",
+    "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
+    "  %cd ComfyUI-Manager\n",
+    "  !git pull\n",
+    "\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
+    "  !echo -= Install custom nodes dependencies =-\n",
+    "  !pip install GitPython\n",
+    "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "cccccccccc"
+   },
+   "source": [
+    "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "dddddddddd"
+   },
+   "outputs": [],
+   "source": [
+    "# Checkpoints\n",
+    "\n",
+    "### SDXL\n",
+    "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
+    "\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# SDXL ReVision\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
+    "\n",
+    "# SD1.5\n",
+    "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
+    "\n",
+    "# SD2\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Some SD1.5 anime style\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
+    "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# unCLIP models\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# VAE\n",
+    "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
+    "\n",
+    "\n",
+    "# Loras\n",
+    "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
+    "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
+    "\n",
+    "\n",
+    "# T2I-Adapter\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
+    "\n",
+    "# T2I Styles Model\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
+    "\n",
+    "# CLIPVision model (needed for styles model)\n",
+    "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
+    "\n",
+    "\n",
+    "# ControlNet\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# ControlNet SDXL\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# Controlnet Preprocessor nodes by Fannovel16\n",
+    "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
+    "\n",
+    "\n",
+    "# GLIGEN\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
+    "\n",
+    "\n",
+    "# ESRGAN upscale model\n",
+    "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with cloudflared (Recommended Way)\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
+    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
+    "\n",
+    "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
+    "  for line in p.stderr:\n",
+    "    l = line.decode()\n",
+    "    if \"trycloudflare.com \" in l:\n",
+    "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
+    "    #print(l, end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with localtunnel\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!npm install -g localtunnel\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
+    "\n",
+    "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
+    "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
+    "  for line in p.stdout:\n",
+    "    print(line.decode(), end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "gggggggggg"
+   },
+   "source": [
+    "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
+    "\n",
+    "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
+    "\n",
+    "If you want to open it in another window use the link.\n",
+    "\n",
+    "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "hhhhhhhhhh"
+   },
+   "outputs": [],
+   "source": [
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  from google.colab import output\n",
+    "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
+    "  print(\"to open it in a window you can open this link here:\")\n",
+    "  output.serve_kernel_port_as_window(port)\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  }
+ ],
+ "metadata": {
+  "accelerator": "GPU",
+  "colab": {
+   "provenance": []
+  },
+  "gpuClass": "standard",
+  "kernelspec": {
+   "display_name": "Python 3",
+   "name": "python3"
+  },
+  "language_info": {
+   "name": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}

prestartup_script.py

@@ -12,31 +12,31 @@ import ast
 import logging
 import traceback
 
-from .glob import security_check
-from .glob import manager_util
-from .glob import cm_global
-from .glob import manager_downloader
+glob_path = os.path.join(os.path.dirname(__file__), "glob")
+sys.path.append(glob_path)
+
+import security_check
+import manager_util
+import cm_global
+import manager_downloader
 import folder_paths
 
-manager_util.add_python_path_to_env()
-
-import datetime as dt
-
-if hasattr(dt, 'datetime'):
-    from datetime import datetime as dt_datetime
-    
+import datetime
+if hasattr(datetime, 'datetime'):
+    from datetime import datetime
     def current_timestamp():
-        return dt_datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+        return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
 else:
     # NOTE: Occurs in some Mac environments.
     import time
-    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{dt.__file__}'")
-    
+    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{datetime.__file__}'")
     def current_timestamp():
         return str(time.time()).split('.')[0]
 
 security_check.security_check()
 
+manager_util.add_python_path_to_env()
+
 cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 
@@ -65,17 +65,15 @@ comfy_path = os.environ.get('COMFYUI_PATH')
 comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
 
 if comfy_path is None:
-    try:
-        comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
-        os.environ['COMFYUI_PATH'] = comfy_path
-    except:
-        print("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
-        exit(-1)
+    # legacy env var
+    comfy_path = os.environ.get('COMFYUI_PATH')
+
+if comfy_path is None:
+    comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
 
 if comfy_base_path is None:
     comfy_base_path = comfy_path
 
-
 sys.__comfyui_manager_register_message_collapse = register_message_collapse
 sys.__comfyui_manager_is_import_failed_extension = is_import_failed_extension
 cm_global.register_api('cm.register_message_collapse', register_message_collapse)
@@ -120,11 +118,12 @@ read_config()
 read_uv_mode()
 check_file_logging()
 
-cm_global.pip_overrides = {'numpy': 'numpy<2'}
+cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
 if os.path.exists(manager_pip_overrides_path):
     with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
         cm_global.pip_overrides = json.load(json_file)
         cm_global.pip_overrides['numpy'] = 'numpy<2'
+        cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security
 
 
 if os.path.exists(manager_pip_blacklist_path):
@@ -391,11 +390,7 @@ try:
         def emit(self, record):
             global is_start_mode
 
-            try:
-                message = record.getMessage()
-            except Exception as e:
-                message = f"<<logging error>>: {record} - {e}"
-                original_stderr.write(message)
+            message = record.getMessage()
 
             if is_start_mode:
                 match = re.search(pat_import_fail, message)
@@ -694,6 +689,14 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
         file.write('\n'.join(list(extracted)))
 
 
+def execute_migration(moves):
+    import shutil
+    for x in moves:
+        if os.path.exists(x[0]) and not os.path.exists(x[1]):
+            shutil.move(x[0], x[1])
+            print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
+
+
 script_executed = False
 
 def execute_startup_script():
@@ -751,6 +754,9 @@ def execute_startup_script():
                         execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
                         execute_lazy_install_script(script[3], script[7])
 
+                    elif script[1] == "#LAZY-MIGRATION":
+                        execute_migration(script[2])
+
                     elif script[1] == "#LAZY-DELETE-NODEPACK":
                         execute_lazy_delete(script[2])
 

pyproject.toml

@@ -1,62 +1,15 @@
-[build-system]
-requires = ["setuptools >= 61.0"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "comfyui-manager"
-license = { text = "GPL-3.0-only" }
-version = "4.0.0-beta.1"
-requires-python = ">= 3.9"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-readme = "README.md"
-keywords = ["comfyui", "comfyui-manager"]
-
-maintainers = [
-  { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
-  { name = "Yoland Yan", email = "yoland@drip.art" },
-  { name = "James Kwon", email = "hongilkwon316@gmail.com" },
-  { name = "Robin Huang", email = "robin@drip.art" },
-]
-
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "Intended Audience :: Developers",
-  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-]
-
-dependencies = [
-    "GitPython",
-    "PyGithub",
-    "matrix-client==0.4.0",
-    "transformers",
-    "huggingface-hub>0.20",
-    "typer",
-    "rich",
-    "typing-extensions",
-    "toml",
-    "uv",
-    "chardet"
-]
-
-[project.optional-dependencies]
-dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]
+version = "3.30.9"
+license = { file = "LICENSE.txt" }
+dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
 
 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
+#  Used by Comfy Registry https://comfyregistry.org
 
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["comfyui_manager*"]
-
-[tool.ruff]
-line-length = 120
-target-version = "py39"
-
-[tool.ruff.lint]
-select = [
-  "E4", # default
-  "E7", # default
-  "E9", # default
-  "F",  # default
-  "I",  # isort-like behavior (import statement sorting)
-]
+[tool.comfy]
+PublisherId = "drltdata"
+DisplayName = "ComfyUI-Manager"
+Icon = ""

scripts/colab-dependencies.py

@@ -0,0 +1,39 @@
+import os
+import subprocess
+
+
+def get_enabled_subdirectories_with_files(base_directory):
+    subdirs_with_files = []
+    for subdir in os.listdir(base_directory):
+        try:
+            full_path = os.path.join(base_directory, subdir)
+            if os.path.isdir(full_path) and not subdir.endswith(".disabled") and not subdir.startswith('.') and subdir != '__pycache__':
+                print(f"## Install dependencies for '{subdir}'")
+                requirements_file = os.path.join(full_path, "requirements.txt")
+                install_script = os.path.join(full_path, "install.py")
+
+                if os.path.exists(requirements_file) or os.path.exists(install_script):
+                    subdirs_with_files.append((full_path, requirements_file, install_script))
+        except Exception as e:
+            print(f"EXCEPTION During Dependencies INSTALL on '{subdir}':\n{e}")
+
+    return subdirs_with_files
+
+
+def install_requirements(requirements_file_path):
+    if os.path.exists(requirements_file_path):
+        subprocess.run(["pip", "install", "-r", requirements_file_path])
+
+
+def run_install_script(install_script_path):
+    if os.path.exists(install_script_path):
+        subprocess.run(["python", install_script_path])
+
+
+custom_nodes_directory = "custom_nodes"
+subdirs_with_files = get_enabled_subdirectories_with_files(custom_nodes_directory)
+
+
+for subdir, requirements_file, install_script in subdirs_with_files:
+    install_requirements(requirements_file)
+    run_install_script(install_script)

scripts/install-comfyui-venv-linux.sh

@@ -0,0 +1,21 @@
+git clone https://github.com/comfyanonymous/ComfyUI
+cd ComfyUI/custom_nodes
+git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
+cd ..
+python -m venv venv
+source venv/bin/activate
+python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
+python -m pip install -r requirements.txt
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
+cd ..
+echo "#!/bin/bash" > run_gpu.sh
+echo "cd ComfyUI" >> run_gpu.sh
+echo "source venv/bin/activate" >> run_gpu.sh
+echo "python main.py --preview-method auto" >> run_gpu.sh
+chmod +x run_gpu.sh
+
+echo "#!/bin/bash" > run_cpu.sh
+echo "cd ComfyUI" >> run_cpu.sh
+echo "source venv/bin/activate" >> run_cpu.sh
+echo "python main.py --preview-method auto --cpu" >> run_cpu.sh
+chmod +x run_cpu.sh

scripts/install-comfyui-venv-win.bat

@@ -0,0 +1,17 @@
+git clone https://github.com/comfyanonymous/ComfyUI
+cd ComfyUI/custom_nodes
+git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
+cd ..
+python -m venv venv
+call venv/Scripts/activate
+python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
+python -m pip install -r requirements.txt
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
+cd ..
+echo "cd ComfyUI" >> run_gpu.bat
+echo "call venv/Scripts/activate" >> run_gpu.bat
+echo "python main.py" >> run_gpu.bat
+
+echo "cd ComfyUI" >> run_cpu.bat
+echo "call venv/Scripts/activate" >> run_cpu.bat
+echo "python main.py --cpu" >> run_cpu.bat

scripts/install-manager-for-portable-version.bat

@@ -0,0 +1,3 @@
+.\python_embeded\python.exe -s -m pip install gitpython
+.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
+.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt