update DB

* Add ComfyUI-ArchAi3d-Qwen custom nodes

* Add new node entry for ComfyUI-GRAG-ArchAi3D

Adding GRAG (Guided Region-Adaptive Guidance) custom node with:
- Simple and Unified controllers
- Advanced sampler
- 54 presets
- Per-layer and adaptive control

* Update custom-node-list.json

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>

.env.example

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

.github/workflows/ci.yml

@@ -1,70 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ main, feat/*, fix/* ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  validate-openapi:
-    name: Validate OpenAPI Specification
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Check if OpenAPI changed
-      id: openapi-changed
-      uses: tj-actions/changed-files@v44
-      with:
-        files: openapi.yaml
-    
-    - name: Setup Node.js
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-    
-    - name: Install Redoc CLI
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      run: |
-        npm install -g @redocly/cli
-    
-    - name: Validate OpenAPI specification
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      run: |
-        redocly lint openapi.yaml
-
-  code-quality:
-    name: Code Quality Checks
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Fetch all history for proper diff
-    
-    - name: Get changed Python files
-      id: changed-py-files
-      uses: tj-actions/changed-files@v44
-      with:
-        files: |
-          **/*.py
-        files_ignore: |
-          comfyui_manager/legacy/**
-          
-    - name: Setup Python
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.9'
-    
-    - name: Install dependencies
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      run: |
-        pip install ruff
-    
-    - name: Run ruff linting on changed files
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      run: |
-        echo "Changed files: ${{ steps.changed-py-files.outputs.all_changed_files }}"
-        echo "${{ steps.changed-py-files.outputs.all_changed_files }}" | xargs -r ruff check

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

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - draft-v4
     paths:
       - "pyproject.toml"
 

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
   publish-node:
     name: Publish Custom Node to registry
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
+    if: ${{ github.repository_owner == 'ltdrdata' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4

.gitignore

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

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,14 +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
-include custom-node-list.json
-include extension-node-list.json
-include extras.json
-include github-stats.json
-include model-list.json
-include alter-list.json
-include comfyui_manager/channels.list.template

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:
+To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
-    * 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 .  
-      ```
 
+1. Go to `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 choose '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/macOS:
+```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 install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
-* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.
+* **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 choose '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
@@ -125,7 +176,7 @@ The following settings are applied based on the section marked as `is_default`.
 ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
 
 
-## cm-cli: command line tools for power user
+## cm-cli: command line tools for power users
 * A tool is provided that allows you to use the features of ComfyUI-Manager without running ComfyUI.
 * For more details, please refer to the [cm-cli documentation](docs/en/cm-cli.md).
 
@@ -171,7 +222,7 @@ The following settings are applied based on the section marked as `is_default`.
   * `<current timestamp>` Ensure that the timestamp is always unique.
     * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
       * `<component name>`: The name should be in the format `<prefix>::<node name>`.
-        * `<compnent nodeata>`: In the nodedata of the group node.
+        * `<component node data>`: In the node data of the group node.
           * `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
           * `<datetime>`: Saved time
           * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
@@ -189,7 +240,7 @@ The following settings are applied based on the section marked as `is_default`.
 * Dragging and dropping or pasting a single component will add a node. However, when adding multiple components, nodes will not be added.
 
 
-## Support of missing nodes installation
+## Support for installing missing nodes
 
 ![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-menu.jpg)
 
@@ -215,24 +266,23 @@ The following settings are applied based on the section marked as `is_default`.
     downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
     security_level = <Set the security level => strong|normal|normal-|weak>
     always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
-    network_mode = <Set the network mode => public|private|offline|personal_cloud>
+    network_mode = <Set the network mode => public|private|offline>
     ```
 
     * network_mode:
       - public: An environment that uses a typical public network.
       - private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
       - offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
-      - personal_cloud: Applies relaxed security features in cloud environments such as Google Colab or Runpod, where strong security is not required. 
 
 
 ## Additional Feature
 * Logging to file feature
   * This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
 
-* Fix node(recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
+* Fix node (recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
   * It is used to correct errors in nodes of old workflows created before, which are incompatible with the version changes of custom nodes.
 
-* Double-Click Node Title: You can set the double click behavior of nodes in the ComfyUI-Manager menu.
+* Double-Click Node Title: You can set the double-click behavior of nodes in the ComfyUI-Manager menu.
   * `Copy All Connections`, `Copy Input Connections`: Double-clicking a node copies the connections of the nearest node.
     * This action targets the nearest node within a straight-line distance of 1000 pixels from the center of the node.
     * In the case of `Copy All Connections`, it duplicates existing outputs, but since it does not allow duplicate connections, the existing output connections of the original node are disconnected.
@@ -298,7 +348,7 @@ When you run the `scan.sh` script:
 
 * It updates the `github-stats.json`.
   * This uses the GitHub API, so set your token with `export GITHUB_TOKEN=your_token_here` to avoid quickly reaching the rate limit and malfunctioning.
-  * To skip this step, add the `--skip-update-stat` option.
+  * To skip this step, add the `--skip-stat-update` option.
 
 * The `--skip-all` option applies both `--skip-update` and `--skip-stat-update`.
 
@@ -306,40 +356,38 @@ When you run the `scan.sh` script:
 ## Troubleshooting
 * If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
 * If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
-* If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
+* If you encounter the error message `Overlapped Object has pending operation at deallocation on ComfyUI Manager load` under Windows
   * Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
-* if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
+* If the `SSL: CERTIFICATE_VERIFY_FAILED` error occurs.
   * Edit `config.ini` file: add `bypass_ssl = True`
 
 
 ## Security policy
-
+  * Edit `config.ini` file: add `security_level = <LEVEL>`
-The security settings are applied based on whether the ComfyUI server's listener is non-local and whether the network mode is set to `personal_cloud`.
+    * `strong`
-
+      * doesn't allow `high` and `middle` level risky feature
-* **non-local**: When the server is launched with `--listen` and is bound to a network range other than the local `127.` range, allowing remote IP access.
+    * `normal`
-* **personal\_cloud**: When the `network_mode` is set to `personal_cloud`.
+      * doesn't allow `high` level risky feature
-
+      * `middle` level risky feature is available
-
+    * `normal-`
-### Risky Level Table
+      * doesn't allow `high` level risky feature if `--listen` is specified and not starts with `127.`
-
+      * `middle` level risky feature is available
-| Risky Level | features                                                                                                                              |
+    * `weak`
-|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
+      * all feature is available
-| high+       | * `Install via git url`, `pip install`<BR>* Installation of nodepack registered not in the `default channel`.                         |
+    
-| high        | * Fix nodepack                                                                                                                        |
+  * `high` level risky features
-| middle+     | * Uninstall/Update<BR>* Installation of nodepack registered in the `default channel`.<BR>* Restore/Remove Snapshot<BR>* Install model |
+    * `Install via git url`, `pip install`
-| middle      | * Restart                                                                                                                             |
+    * Installation of custom nodes registered not in the `default channel`.
-| low         | * Update ComfyUI                                                                                                                      |
+    * Fix custom nodes
-
+  
-
+  * `middle` level risky features
-### Security Level Table
+    * Uninstall/Update
-
+    * Installation of custom nodes registered in the `default channel`.
-| Security Level | local                                                                                                                    | non-local (personal_cloud)                                                                                               | non-local (not personal_cloud) |
+    * Restore/Remove Snapshot
-|----------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------|
+    * Restart
-| strong         | * Only `weak` level risky features are allowed                                                                           | * Only `weak` level risky features are allowed                                                                           | * Only `weak` level risky features are allowed                               |
+  
-| normal         | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available
+  * `low` level risky features
-| normal-        | * All features are available                                                                                             | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available 
+    * Update ComfyUI
-| weak           | * All features are available                                                                                             | * All features are available                                                                                             | * `high+` and `middle+` level risky features are not allowed<BR>* `high`, `middle` and `low` level risky features are available
-
 
 
 # Disclaimer

__init__.py

@@ -0,0 +1,25 @@
+"""
+This file is the entry point for the ComfyUI-Manager package, handling CLI-only mode and initial setup.
+"""
+
+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']
+
+
+

channels.list.template

@@ -0,0 +1,6 @@
+default::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
+recent::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/new
+legacy::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/legacy
+forked::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/forked
+dev::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/dev
+tutorial::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/tutorial

check.sh

@@ -37,7 +37,7 @@ find ~/.tmp/default -name "*.py" -print0 | xargs -0 grep -E "crypto|^_A="
 
 echo
 echo CHECK3
-find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*https\\?:"
+find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#]*https\?:"
-find ~/.tmp/default -name "requirements.txt" | xargs grep "\.whl"
+find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#].*\.whl"
 
 echo

cm-cli.py

@@ -15,31 +15,31 @@ import git
 import importlib
 
 
-from ..common import manager_util
+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]")
+    try:
-    exit(-1)
+        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 ..common import cm_global
+import cm_global
-from ..legacy import manager_core as core
+import manager_core as core
-from ..common import context
+from manager_core import unified_manager
-from ..legacy.manager_core import unified_manager
+import cnr_utils
-from ..common import cnr_utils
 
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 
@@ -66,7 +66,7 @@ def check_comfyui_hash():
         repo = git.Repo(comfy_path)
         core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
         core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-    except Exception:
+    except:
         print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
         core.comfy_ui_revision = 0
         core.comfy_ui_commit_datetime = 0
@@ -82,7 +82,7 @@ def read_downgrade_blacklist():
     try:
         import configparser
         config = configparser.ConfigParser(strict=False)
-        config.read(context.manager_config_path)
+        config.read(core.manager_config.path)
         default_conf = config['default']
 
         if 'downgrade_blacklist' in default_conf:
@@ -90,7 +90,7 @@ def read_downgrade_blacklist():
             items = [x.strip() for x in items if x != '']
             cm_global.pip_downgrade_blacklist += items
             cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
-    except Exception:
+    except:
         pass
 
 
@@ -105,7 +105,7 @@ class Ctx:
         self.no_deps = False
         self.mode = 'cache'
         self.user_directory = None
-        self.custom_nodes_paths = [os.path.join(context.comfy_base_path, 'custom_nodes')]
+        self.custom_nodes_paths = [os.path.join(core.comfy_base_path, 'custom_nodes')]
         self.manager_files_directory = os.path.dirname(__file__)
         
         if Ctx.folder_paths is None:
@@ -143,14 +143,14 @@ class Ctx:
         if os.path.exists(extra_model_paths_yaml):
             utils.extra_config.load_extra_path_config(extra_model_paths_yaml)
 
-        context.update_user_directory(user_directory)
+        core.update_user_directory(user_directory)
 
-        if os.path.exists(context.manager_pip_overrides_path):
+        if os.path.exists(core.manager_pip_overrides_path):
-            with open(context.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
+            with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
                 cm_global.pip_overrides = json.load(json_file)
 
-        if os.path.exists(context.manager_pip_blacklist_path):
+        if os.path.exists(core.manager_pip_blacklist_path):
-            with open(context.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
                 for x in f.readlines():
                     y = x.strip()
                     if y != '':
@@ -163,15 +163,15 @@ class Ctx:
 
     @staticmethod
     def get_startup_scripts_path():
-        return os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+        return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
 
     @staticmethod
     def get_restore_snapshot_path():
-        return os.path.join(context.manager_startup_script_path, "restore-snapshot.json")
+        return os.path.join(core.manager_startup_script_path, "restore-snapshot.json")
 
     @staticmethod
     def get_snapshot_path():
-        return context.manager_snapshot_path
+        return core.manager_snapshot_path
 
     @staticmethod
     def get_custom_nodes_paths():
@@ -438,11 +438,8 @@ def show_list(kind, simple=False):
     flag = kind in ['all', 'cnr', 'installed', 'enabled']
     for k, v in unified_manager.active_nodes.items():
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
+            cnr = unified_manager.cnr_map[k]
-            if cnr:
+            processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
-                processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
-            else:
-                processed[k] = None
         else:
             processed[k] = None
 
@@ -462,11 +459,8 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)  # NOTE: can this be None if removed from CNR after installed
+            cnr = unified_manager.cnr_map[k]
-            if cnr:
+            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
-                processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
-            else:
-                processed[k] = None
         else:
             processed[k] = None
 
@@ -475,11 +469,8 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
+            cnr = unified_manager.cnr_map[k]
-            if cnr:
+            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
-                processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
-            else:
-                processed[k] = None
         else:
             processed[k] = None
 
@@ -499,12 +490,9 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
+            cnr = unified_manager.cnr_map[k]
-            if cnr:
+            ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
-                ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
+            processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
-                processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
-            else:
-                processed[k] = None
         else:
             processed[k] = None
 
@@ -670,7 +658,7 @@ def install(
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=install_node, exit_on_fail=exit_on_fail)
     pip_fixer.fix_broken()
 
@@ -708,7 +696,7 @@ def reinstall(
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=reinstall_node)
     pip_fixer.fix_broken()
 
@@ -762,7 +750,7 @@ def update(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
 
     for x in nodes:
         if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -863,7 +851,7 @@ def fix(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, fix_node, allow_all=True)
     pip_fixer.fix_broken()
 
@@ -1140,7 +1128,7 @@ def restore_snapshot(
             print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
             exit(1)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     try:
         asyncio.run(core.restore_snapshot(snapshot_path, extras))
     except Exception:
@@ -1172,7 +1160,7 @@ def restore_dependencies(
     total = len(node_paths)
     i = 1
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for x in node_paths:
         print("----------------------------------------------------------------------------------------------------")
         print(f"Restoring [{i}/{total}]: {x}")
@@ -1191,7 +1179,7 @@ def post_install(
 ):
     path = os.path.expanduser(path)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     unified_manager.execute_install_script('', path, instant_execution=True)
     pip_fixer.fix_broken()
 
@@ -1231,11 +1219,11 @@ def install_deps(
         with open(deps, 'r', encoding="UTF-8", errors="ignore") as json_file:
             try:
                 json_obj = json.load(json_file)
-            except Exception:
+            except:
                 print(f"[bold red]Invalid json file: {deps}[/bold red]")
                 exit(1)
 
-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
             for k in json_obj['custom_nodes'].keys():
                 state = core.simple_check_custom_node(k)
                 if state == 'installed':
@@ -1292,10 +1280,6 @@ def export_custom_node_ids(
                     print(f"{x['id']}@unknown", file=output_file)
 
 
-def main():
-    app()
-
-
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(app())

cm-cli.sh

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

comfyui_manager/__init__.py

@@ -1,104 +0,0 @@
-import os
-import logging
-from aiohttp import web
-from .common.manager_security import HANDLER_POLICY
-from .common import manager_security
-from comfy.cli_args import args
-
-
-def prestartup():
-    from . import prestartup_script  # noqa: F401
-    logging.info('[PRE] ComfyUI-Manager')
-
-
-def start():
-    logging.info('[START] ComfyUI-Manager')
-    from .common import cm_global     # noqa: F401
-
-    if not args.disable_manager:
-        if args.enable_manager_legacy_ui:
-            try:
-                from .legacy import manager_server  # noqa: F401
-                from .legacy import share_3rdparty  # noqa: F401
-                from .legacy import manager_core as core
-                import nodes
-
-                logging.info("[ComfyUI-Manager] Legacy UI is enabled.")
-                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)
-                core = None
-        else:
-            from .glob import manager_server  # noqa: F401
-            from .glob import share_3rdparty  # noqa: F401
-            from .glob import manager_core as core
-
-        if core is not None:
-            manager_security.is_personal_cloud_mode = core.get_config()['network_mode'].lower() == 'personal_cloud'
-
-
-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
-
-
-def get_client_ip(request):
-    peername = request.transport.get_extra_info("peername")
-    if peername is not None:
-        host, port = peername
-        return host
-    
-    return "unknown"
-
-
-def create_middleware():
-    connected_clients = set()
-    is_local_mode = manager_security.is_loopback(args.listen)
-
-    @web.middleware
-    async def manager_middleware(request: web.Request, handler):
-        nonlocal connected_clients
-
-        # security policy for remote environments
-        prev_client_count = len(connected_clients)
-        client_ip = get_client_ip(request)
-        connected_clients.add(client_ip)
-        next_client_count = len(connected_clients)
-
-        if prev_client_count == 1 and next_client_count > 1:
-            manager_security.multiple_remote_alert()
-
-        policy = manager_security.get_handler_policy(handler)
-        is_banned = False
-
-        # policy check
-        if len(connected_clients) > 1:
-            if is_local_mode:
-                if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NON_LOCAL in policy:
-                    is_banned = True
-                if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD in policy:
-                    is_banned = not manager_security.is_personal_cloud_mode
-
-        if HANDLER_POLICY.BANNED in policy:
-            is_banned = True
-
-        if is_banned:
-            logging.warning(f"[Manager] Banning request from {client_ip}: {request.path}")
-            response = web.Response(text="[Manager] This request is banned.", status=403)
-        else:
-            response: web.Response = await handler(request)
-
-        return response
-
-    return manager_middleware
-    

comfyui_manager/channels.list.template

@@ -1,6 +0,0 @@
-default::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main
-recent::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/new
-legacy::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/legacy
-forked::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/forked
-dev::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/dev
-tutorial::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/tutorial

comfyui_manager/common/README.md

@@ -1,16 +0,0 @@
-# ComfyUI-Manager: Core Backend (glob)
-
-This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
-
-## Core Modules
-
-- **manager_downloader.py**: Handles downloading operations for models, extensions, and other resources.
-- **manager_util.py**: Provides utility functions used throughout the system.
-
-## Specialized Modules
-
-- **cm_global.py**: Maintains global variables and state management across the system.
-- **cnr_utils.py**: Helper utilities for interacting with the custom node registry (CNR).
-- **git_utils.py**: Git-specific utilities for repository operations.
-- **node_package.py**: Handles the packaging and installation of node extensions.
-- **security_check.py**: Implements the multi-level security system for installation safety.

comfyui_manager/common/context.py

@@ -1,108 +0,0 @@
-import sys
-import os
-import logging
-from . import manager_util
-import toml
-import git
-
-
-# read env vars
-comfy_path: str = 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 Exception:
-        logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
-        exit(-1)
-
-if comfy_base_path is None:
-    comfy_base_path = comfy_path
-
-channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
-git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
-
-manager_files_path = None
-manager_config_path = None
-manager_channel_list_path = None
-manager_startup_script_path:str = None
-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
-    global manager_config_path
-    global manager_channel_list_path
-    global manager_startup_script_path
-    global manager_snapshot_path
-    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):
-        os.makedirs(manager_files_path)
-
-    manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
-    if not os.path.exists(manager_snapshot_path):
-        os.makedirs(manager_snapshot_path)
-
-    manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
-    if not os.path.exists(manager_startup_script_path):
-        os.makedirs(manager_startup_script_path)
-
-    manager_config_path = os.path.join(manager_files_path, 'config.ini')
-    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
-    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
-    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())
-
-except Exception:
-    # fallback:
-    # This case is only possible when running with cm-cli, and in practice, this case is not actually used.
-    update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
-
-
-def get_current_comfyui_ver():
-    """
-    Extract version from pyproject.toml
-    """
-    toml_path = os.path.join(comfy_path, 'pyproject.toml')
-    if not os.path.exists(toml_path):
-        return None
-    else:
-        try:
-            with open(toml_path, "r", encoding="utf-8") as f:
-                data = toml.load(f)
-
-                project = data.get('project', {})
-                return project.get('version')
-        except Exception:
-            return None
-
-
-def get_comfyui_tag():
-    try:
-        with git.Repo(comfy_path) as repo:
-            return repo.git.describe('--tags')
-    except Exception:
-        return None
-

comfyui_manager/common/enums.py

@@ -1,18 +0,0 @@
-import enum
-
-class NetworkMode(enum.Enum):
-    PUBLIC = "public"
-    PRIVATE = "private"
-    OFFLINE = "offline"
-    PERSONAL_CLOUD = "personal_cloud"
-
-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/common/manager_security.py

@@ -1,36 +0,0 @@
-from enum import Enum
-
-is_personal_cloud_mode = False
-handler_policy = {}
-
-class HANDLER_POLICY(Enum):
-    MULTIPLE_REMOTE_BAN_NON_LOCAL = 1
-    MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD = 2
-    BANNED = 3
-
-
-def is_loopback(address):
-    import ipaddress
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-def do_nothing():
-    pass
-
-
-def get_handler_policy(x):
-    return handler_policy.get(x) or set()
-
-def add_handler_policy(x, policy):
-    s = handler_policy.get(x)
-    if s is None:
-        s = set()
-        handler_policy[x] = s
-    
-    s.add(policy)
-    
-    
-multiple_remote_alert = do_nothing

comfyui_manager/common/snapshot_util.py

@@ -1,136 +0,0 @@
-from . import manager_util
-from . import git_utils
-import json
-import yaml
-import logging
-
-def read_snapshot(snapshot_path):
-    try:
-
-        with open(snapshot_path, 'r', encoding="UTF-8") as snapshot_file:
-            if snapshot_path.endswith('.json'):
-                info = json.load(snapshot_file)
-            elif snapshot_path.endswith('.yaml'):
-                info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
-                info = info['custom_nodes']
-
-            return info
-    except Exception as e:
-        logging.warning(f"Failed to read snapshot file: {snapshot_path}\nError: {e}")
-
-    return None
-
-
-def diff_snapshot(a, b):
-    if not a or not b:
-        return None
-
-    nodepack_diff = {
-        'added': {},
-        'removed': [],
-        'upgraded': {},
-        'downgraded': {},
-        'changed': []
-    }
-
-    pip_diff = {
-        'added': {},
-        'upgraded': {},
-        'downgraded': {}
-    }
-    
-    # check: comfyui
-    if a.get('comfyui') != b.get('comfyui'):
-        nodepack_diff['changed'].append('comfyui')
-
-    # check: cnr nodes
-    a_cnrs = a.get('cnr_custom_nodes', {})
-    b_cnrs = b.get('cnr_custom_nodes', {})
-
-    if 'comfyui-manager' in a_cnrs:
-        del a_cnrs['comfyui-manager']
-    if 'comfyui-manager' in b_cnrs:
-        del b_cnrs['comfyui-manager']
-
-    for k, v in a_cnrs.items():
-        if k not in b_cnrs.keys():
-            nodepack_diff['removed'].append(k)
-        elif a_cnrs[k] != b_cnrs[k]:
-            a_ver = manager_util.StrictVersion(a_cnrs[k])
-            b_ver = manager_util.StrictVersion(b_cnrs[k])
-            if a_ver < b_ver:
-                nodepack_diff['upgraded'][k] = {'from': a_cnrs[k], 'to': b_cnrs[k]}
-            elif a_ver > b_ver:
-                nodepack_diff['downgraded'][k] = {'from': a_cnrs[k], 'to': b_cnrs[k]}
-
-    added_cnrs = set(b_cnrs.keys()) - set(a_cnrs.keys())
-    for k in added_cnrs:
-        nodepack_diff['added'][k] = b_cnrs[k]
-
-    # check: git custom nodes
-    a_gits = a.get('git_custom_nodes', {})
-    b_gits = b.get('git_custom_nodes', {})
-
-    a_gits = {git_utils.normalize_url(k): v for k, v in a_gits.items() if k.lower() != 'comfyui-manager'}
-    b_gits = {git_utils.normalize_url(k): v for k, v in b_gits.items() if k.lower() != 'comfyui-manager'}
-
-    for k, v in a_gits.items():
-        if k not in b_gits.keys():
-            nodepack_diff['removed'].append(k)
-        elif not v['disabled'] and b_gits[k]['disabled']:
-            nodepack_diff['removed'].append(k)
-        elif v['disabled'] and not b_gits[k]['disabled']:
-            nodepack_diff['added'].append(k)
-        elif v['hash'] != b_gits[k]['hash']:
-            a_date = v.get('commit_timestamp')
-            b_date = b_gits[k].get('commit_timestamp')
-            if a_date is not None and b_date is not None:
-                if a_date < b_date:
-                    nodepack_diff['upgraded'].append(k)
-                elif a_date > b_date:
-                    nodepack_diff['downgraded'].append(k)
-            else:
-                nodepack_diff['changed'].append(k)
-
-    # check: pip packages
-    a_pip = a.get('pips', {})
-    b_pip = b.get('pips', {})
-    for k, v in a_pip.items():
-        if '==' in k:
-            package_name, version = k.split('==', 1)
-        else:
-            package_name, version = k, None
-        
-        for k2, v2 in b_pip.items():
-            if '==' in k2:
-                package_name2, version2 = k2.split('==', 1)
-            else:
-                package_name2, version2 = k2, None
-            
-            if package_name.lower() == package_name2.lower():
-                if version != version2:
-                    a_ver = manager_util.StrictVersion(version) if version else None
-                    b_ver = manager_util.StrictVersion(version2) if version2 else None
-                    if a_ver and b_ver:
-                        if a_ver < b_ver:
-                            pip_diff['upgraded'][package_name] = {'from': version, 'to': version2}
-                        elif a_ver > b_ver:
-                            pip_diff['downgraded'][package_name] = {'from': version, 'to': version2}
-                    elif not a_ver and b_ver:
-                        pip_diff['added'][package_name] = version2
-
-    a_pip_names = {k.split('==', 1)[0].lower() for k in a_pip.keys()}
-
-    for k in b_pip.keys():
-        if '==' in k:
-            package_name = k.split('==', 1)[0]
-            package_version = k.split('==', 1)[1]
-        else:
-            package_name = k
-            package_version = None
-        
-        if package_name.lower() not in a_pip_names:
-            if package_version:
-                pip_diff['added'][package_name] = package_version
-
-    return {'nodepack_diff': nodepack_diff, 'pip_diff': pip_diff}

comfyui_manager/data_models/README.md

@@ -1,68 +0,0 @@
-# Data Models
-
-This directory contains Pydantic models for ComfyUI Manager, providing type safety, validation, and serialization for the API and internal data structures.
-
-## Overview
-
-- `generated_models.py` - All models auto-generated from OpenAPI spec
-- `__init__.py` - Package exports for all models
-
-**Note**: All models are now auto-generated from the OpenAPI specification. Manual model files (`task_queue.py`, `state_management.py`) have been deprecated in favor of a single source of truth.
-
-## Generating Types from OpenAPI
-
-The state management models are automatically generated from the OpenAPI specification using `datamodel-codegen`. This ensures type safety and consistency between the API specification and the Python code.
-
-### Prerequisites
-
-Install the code generator:
-```bash
-pipx install datamodel-code-generator
-```
-
-### Generation Command
-
-To regenerate all models after updating the OpenAPI spec:
-
-```bash
-datamodel-codegen \
-  --use-subclass-enum \
-  --field-constraints \
-  --strict-types bytes \
-  --use-double-quotes \
-  --input openapi.yaml \
-  --output comfyui_manager/data_models/generated_models.py \
-  --output-model-type pydantic_v2.BaseModel
-```
-
-### When to Regenerate
-
-You should regenerate the models when:
-
-1. **Adding new API endpoints** that return new data structures
-2. **Modifying existing schemas** in the OpenAPI specification  
-3. **Adding new state management features** that require new models
-
-### Important Notes
-
-- **Single source of truth**: All models are now generated from `openapi.yaml`
-- **No manual models**: All previously manual models have been migrated to the OpenAPI spec
-- **OpenAPI requirements**: New schemas must be referenced in API paths to be generated by datamodel-codegen
-- **Validation**: Always validate the OpenAPI spec before generation:
-  ```bash
-  python3 -c "import yaml; yaml.safe_load(open('openapi.yaml'))"
-  ```
-
-### Example: Adding New State Models
-
-1. Add your schema to `openapi.yaml` under `components/schemas/`
-2. Reference the schema in an API endpoint response
-3. Run the generation command above
-4. Update `__init__.py` to export the new models
-5. Import and use the models in your code
-
-### Troubleshooting
-
-- **Models not generated**: Ensure schemas are under `components/schemas/` (not `parameters/`)
-- **Missing models**: Verify schemas are referenced in at least one API path
-- **Import errors**: Check that new models are added to `__init__.py` exports

comfyui_manager/data_models/__init__.py

@@ -1,125 +0,0 @@
-"""
-Data models for ComfyUI Manager.
-
-This package contains Pydantic models used throughout the ComfyUI Manager
-for data validation, serialization, and type safety.
-
-All models are auto-generated from the OpenAPI specification to ensure
-consistency between the API and implementation.
-"""
-
-from .generated_models import (
-    # Core Task Queue Models
-    QueueTaskItem,
-    TaskHistoryItem,
-    TaskStateMessage,
-    TaskExecutionStatus,
-    
-    # WebSocket Message Models
-    MessageTaskDone,
-    MessageTaskStarted,
-    MessageTaskFailed,
-    MessageUpdate,
-    ManagerMessageName,
-    
-    # State Management Models
-    BatchExecutionRecord,
-    ComfyUISystemState,
-    BatchOperation,
-    InstalledNodeInfo,
-    InstalledModelInfo,
-    ComfyUIVersionInfo,
-    
-    # Other models
-    OperationType,
-    OperationResult,
-    ManagerPackInfo,
-    ManagerPackInstalled,
-    SelectedVersion,
-    ManagerChannel,
-    ManagerDatabaseSource,
-    ManagerPackState,
-    ManagerPackInstallType,
-    ManagerPack,
-    InstallPackParams,
-    UpdatePackParams,
-    UpdateAllPacksParams,
-    UpdateComfyUIParams,
-    FixPackParams,
-    UninstallPackParams,
-    DisablePackParams,
-    EnablePackParams,
-    UpdateAllQueryParams,
-    UpdateComfyUIQueryParams,
-    ComfyUISwitchVersionQueryParams,
-    QueueStatus,
-    ManagerMappings,
-    ModelMetadata,
-    NodePackageMetadata,
-    SnapshotItem,
-    Error,
-    InstalledPacksResponse,
-    HistoryResponse,
-    HistoryListResponse,
-    InstallType,
-    SecurityLevel,
-    RiskLevel,
-)
-
-__all__ = [
-    # Core Task Queue Models
-    "QueueTaskItem",
-    "TaskHistoryItem",
-    "TaskStateMessage",
-    "TaskExecutionStatus",
-    
-    # WebSocket Message Models
-    "MessageTaskDone",
-    "MessageTaskStarted",
-    "MessageTaskFailed",
-    "MessageUpdate",
-    "ManagerMessageName",
-    
-    # State Management Models
-    "BatchExecutionRecord",
-    "ComfyUISystemState",
-    "BatchOperation",
-    "InstalledNodeInfo",
-    "InstalledModelInfo",
-    "ComfyUIVersionInfo",
-    
-    # Other models
-    "OperationType",
-    "OperationResult",
-    "ManagerPackInfo",
-    "ManagerPackInstalled",
-    "SelectedVersion",
-    "ManagerChannel",
-    "ManagerDatabaseSource",
-    "ManagerPackState",
-    "ManagerPackInstallType",
-    "ManagerPack",
-    "InstallPackParams",
-    "UpdatePackParams",
-    "UpdateAllPacksParams",
-    "UpdateComfyUIParams",
-    "FixPackParams",
-    "UninstallPackParams",
-    "DisablePackParams",
-    "EnablePackParams",
-    "UpdateAllQueryParams",
-    "UpdateComfyUIQueryParams",
-    "ComfyUISwitchVersionQueryParams",
-    "QueueStatus",
-    "ManagerMappings",
-    "ModelMetadata",
-    "NodePackageMetadata",
-    "SnapshotItem",
-    "Error",
-    "InstalledPacksResponse",
-    "HistoryResponse",
-    "HistoryListResponse",
-    "InstallType",
-    "SecurityLevel",
-    "RiskLevel",
-]

comfyui_manager/data_models/generated_models.py

@@ -1,539 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  openapi.yaml
-#   timestamp: 2025-06-27T04:01:45+00:00
-
-from __future__ import annotations
-
-from datetime import datetime
-from enum import Enum
-from typing import Any, Dict, List, Optional, Union
-
-from pydantic import BaseModel, Field, RootModel
-
-
-class OperationType(str, Enum):
-    install = "install"
-    uninstall = "uninstall"
-    update = "update"
-    update_comfyui = "update-comfyui"
-    fix = "fix"
-    disable = "disable"
-    enable = "enable"
-    install_model = "install-model"
-
-
-class OperationResult(str, Enum):
-    success = "success"
-    failed = "failed"
-    skipped = "skipped"
-    error = "error"
-    skip = "skip"
-
-
-class TaskExecutionStatus(BaseModel):
-    status_str: OperationResult
-    completed: bool = Field(..., description="Whether the task completed")
-    messages: List[str] = Field(..., description="Additional status messages")
-
-
-class ManagerMessageName(str, Enum):
-    cm_task_completed = "cm-task-completed"
-    cm_task_started = "cm-task-started"
-    cm_queue_status = "cm-queue-status"
-
-
-class ManagerPackInfo(BaseModel):
-    id: str = Field(
-        ...,
-        description="Either github-author/github-repo or name of pack from the registry",
-    )
-    version: str = Field(..., description="Semantic version or Git commit hash")
-    ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
-
-
-class ManagerPackInstalled(BaseModel):
-    ver: str = Field(
-        ...,
-        description="The version of the pack that is installed (Git commit hash or semantic version)",
-    )
-    cnr_id: Optional[str] = Field(
-        None, description="The name of the pack if installed from the registry"
-    )
-    aux_id: Optional[str] = Field(
-        None,
-        description="The name of the pack if installed from github (author/repo-name format)",
-    )
-    enabled: bool = Field(..., description="Whether the pack is enabled")
-
-
-class SelectedVersion(str, Enum):
-    latest = "latest"
-    nightly = "nightly"
-
-
-class ManagerChannel(str, Enum):
-    default = "default"
-    recent = "recent"
-    legacy = "legacy"
-    forked = "forked"
-    dev = "dev"
-    tutorial = "tutorial"
-
-
-class ManagerDatabaseSource(str, Enum):
-    remote = "remote"
-    local = "local"
-    cache = "cache"
-
-
-class ManagerPackState(str, Enum):
-    installed = "installed"
-    disabled = "disabled"
-    not_installed = "not_installed"
-    import_failed = "import_failed"
-    needs_update = "needs_update"
-
-
-class ManagerPackInstallType(str, Enum):
-    git_clone = "git-clone"
-    copy = "copy"
-    cnr = "cnr"
-
-
-class SecurityLevel(str, Enum):
-    strong = "strong"
-    normal = "normal"
-    normal_ = "normal-"
-    weak = "weak"
-
-
-class RiskLevel(str, Enum):
-    block = "block"
-    high_ = "high+"
-    high = "high"
-    middle_ = "middle+"
-    middle = "middle"
-
-
-class UpdateState(Enum):
-    false = "false"
-    true = "true"
-
-
-class ManagerPack(ManagerPackInfo):
-    author: Optional[str] = Field(
-        None, description="Pack author name or 'Unclaimed' if added via GitHub crawl"
-    )
-    files: Optional[List[str]] = Field(
-        None,
-        description="Repository URLs for installation (typically contains one GitHub URL)",
-    )
-    reference: Optional[str] = Field(
-        None, description="The type of installation reference"
-    )
-    title: Optional[str] = Field(None, description="The display name of the pack")
-    cnr_latest: Optional[SelectedVersion] = None
-    repository: Optional[str] = Field(None, description="GitHub repository URL")
-    state: Optional[ManagerPackState] = None
-    update_state: Optional[UpdateState] = Field(
-        None, alias="update-state", description="Update availability status"
-    )
-    stars: Optional[int] = Field(None, description="GitHub stars count")
-    last_update: Optional[datetime] = Field(None, description="Last update timestamp")
-    health: Optional[str] = Field(None, description="Health status of the pack")
-    description: Optional[str] = Field(None, description="Pack description")
-    trust: Optional[bool] = Field(None, description="Whether the pack is trusted")
-    install_type: Optional[ManagerPackInstallType] = None
-
-
-class InstallPackParams(ManagerPackInfo):
-    selected_version: Union[str, SelectedVersion] = Field(
-        ..., description="Semantic version, Git commit hash, latest, or nightly"
-    )
-    repository: Optional[str] = Field(
-        None,
-        description="GitHub repository URL (required if selected_version is nightly)",
-    )
-    pip: Optional[List[str]] = Field(None, description="PyPi dependency names")
-    mode: ManagerDatabaseSource
-    channel: ManagerChannel
-    skip_post_install: Optional[bool] = Field(
-        None, description="Whether to skip post-installation steps"
-    )
-
-
-class UpdateAllPacksParams(BaseModel):
-    mode: Optional[ManagerDatabaseSource] = None
-    ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
-
-
-class UpdatePackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to update")
-    node_ver: Optional[str] = Field(
-        None, description="Current version of the node package"
-    )
-
-
-class UpdateComfyUIParams(BaseModel):
-    is_stable: Optional[bool] = Field(
-        True,
-        description="Whether to update to stable version (true) or nightly (false)",
-    )
-    target_version: Optional[str] = Field(
-        None,
-        description="Specific version to switch to (for version switching operations)",
-    )
-
-
-class FixPackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to fix")
-    node_ver: str = Field(..., description="Version of the node package")
-
-
-class UninstallPackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to uninstall")
-    is_unknown: Optional[bool] = Field(
-        False, description="Whether this is an unknown/unregistered package"
-    )
-
-
-class DisablePackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to disable")
-    is_unknown: Optional[bool] = Field(
-        False, description="Whether this is an unknown/unregistered package"
-    )
-
-
-class EnablePackParams(BaseModel):
-    cnr_id: str = Field(
-        ..., description="ComfyUI Node Registry ID of the package to enable"
-    )
-
-
-class UpdateAllQueryParams(BaseModel):
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="Base UI identifier for task tracking")
-    mode: Optional[ManagerDatabaseSource] = None
-
-
-class UpdateComfyUIQueryParams(BaseModel):
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="UI identifier for task tracking")
-    stable: Optional[bool] = Field(
-        True,
-        description="Whether to update to stable version (true) or nightly (false)",
-    )
-
-
-class ComfyUISwitchVersionQueryParams(BaseModel):
-    ver: str = Field(..., description="Version to switch to")
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="UI identifier for task tracking")
-
-
-class QueueStatus(BaseModel):
-    total_count: int = Field(
-        ..., description="Total number of tasks (pending + running)"
-    )
-    done_count: int = Field(..., description="Number of completed tasks")
-    in_progress_count: int = Field(..., description="Number of tasks currently running")
-    pending_count: Optional[int] = Field(
-        None, description="Number of tasks waiting to be executed"
-    )
-    is_processing: bool = Field(..., description="Whether the task worker is active")
-    client_id: Optional[str] = Field(
-        None, description="Client ID (when filtered by client)"
-    )
-
-
-class ManagerMappings1(BaseModel):
-    title_aux: Optional[str] = Field(None, description="The display name of the pack")
-
-
-class ManagerMappings(
-    RootModel[Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]]]
-):
-    root: Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]] = Field(
-        None, description="Tuple of [node_names, metadata]"
-    )
-
-
-class ModelMetadata(BaseModel):
-    name: str = Field(..., description="Name of the model")
-    type: str = Field(..., description="Type of model")
-    base: Optional[str] = Field(None, description="Base model type")
-    save_path: Optional[str] = Field(None, description="Path for saving the model")
-    url: str = Field(..., description="Download URL")
-    filename: str = Field(..., description="Target filename")
-    ui_id: Optional[str] = Field(None, description="ID for UI reference")
-
-
-class InstallType(str, Enum):
-    git = "git"
-    copy = "copy"
-    pip = "pip"
-
-
-class NodePackageMetadata(BaseModel):
-    title: Optional[str] = Field(None, description="Display name of the node package")
-    name: Optional[str] = Field(None, description="Repository/package name")
-    files: Optional[List[str]] = Field(None, description="Source URLs for the package")
-    description: Optional[str] = Field(
-        None, description="Description of the node package functionality"
-    )
-    install_type: Optional[InstallType] = Field(None, description="Installation method")
-    version: Optional[str] = Field(None, description="Version identifier")
-    id: Optional[str] = Field(
-        None, description="Unique identifier for the node package"
-    )
-    ui_id: Optional[str] = Field(None, description="ID for UI reference")
-    channel: Optional[str] = Field(None, description="Source channel")
-    mode: Optional[str] = Field(None, description="Source mode")
-
-
-class SnapshotItem(RootModel[str]):
-    root: str = Field(..., description="Name of the snapshot")
-
-
-class Error(BaseModel):
-    error: str = Field(..., description="Error message")
-
-
-class InstalledPacksResponse(RootModel[Optional[Dict[str, ManagerPackInstalled]]]):
-    root: Optional[Dict[str, ManagerPackInstalled]] = None
-
-
-class HistoryListResponse(BaseModel):
-    ids: Optional[List[str]] = Field(
-        None, description="List of available batch history IDs"
-    )
-
-
-class InstalledNodeInfo(BaseModel):
-    name: str = Field(..., description="Node package name")
-    version: str = Field(..., description="Installed version")
-    repository_url: Optional[str] = Field(None, description="Git repository URL")
-    install_method: str = Field(
-        ..., description="Installation method (cnr, git, pip, etc.)"
-    )
-    enabled: Optional[bool] = Field(
-        True, description="Whether the node is currently enabled"
-    )
-    install_date: Optional[datetime] = Field(
-        None, description="ISO timestamp of installation"
-    )
-
-
-class InstalledModelInfo(BaseModel):
-    name: str = Field(..., description="Model filename")
-    path: str = Field(..., description="Full path to model file")
-    type: str = Field(..., description="Model type (checkpoint, lora, vae, etc.)")
-    size_bytes: Optional[int] = Field(None, description="File size in bytes", ge=0)
-    hash: Optional[str] = Field(None, description="Model file hash for verification")
-    install_date: Optional[datetime] = Field(
-        None, description="ISO timestamp when added"
-    )
-
-
-class ComfyUIVersionInfo(BaseModel):
-    version: str = Field(..., description="ComfyUI version string")
-    commit_hash: Optional[str] = Field(None, description="Git commit hash")
-    branch: Optional[str] = Field(None, description="Git branch name")
-    is_stable: Optional[bool] = Field(
-        False, description="Whether this is a stable release"
-    )
-    last_updated: Optional[datetime] = Field(
-        None, description="ISO timestamp of last update"
-    )
-
-
-class BatchOperation(BaseModel):
-    operation_id: str = Field(..., description="Unique operation identifier")
-    operation_type: OperationType
-    target: str = Field(
-        ..., description="Target of the operation (node name, model name, etc.)"
-    )
-    target_version: Optional[str] = Field(
-        None, description="Target version for the operation"
-    )
-    result: OperationResult
-    error_message: Optional[str] = Field(
-        None, description="Error message if operation failed"
-    )
-    start_time: datetime = Field(
-        ..., description="ISO timestamp when operation started"
-    )
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when operation completed"
-    )
-    client_id: Optional[str] = Field(
-        None, description="Client that initiated the operation"
-    )
-
-
-class ComfyUISystemState(BaseModel):
-    snapshot_time: datetime = Field(
-        ..., description="ISO timestamp when snapshot was taken"
-    )
-    comfyui_version: ComfyUIVersionInfo
-    frontend_version: Optional[str] = Field(
-        None, description="ComfyUI frontend version if available"
-    )
-    python_version: str = Field(..., description="Python interpreter version")
-    platform_info: str = Field(
-        ..., description="Operating system and platform information"
-    )
-    installed_nodes: Optional[Dict[str, InstalledNodeInfo]] = Field(
-        None, description="Map of installed node packages by name"
-    )
-    installed_models: Optional[Dict[str, InstalledModelInfo]] = Field(
-        None, description="Map of installed models by name"
-    )
-    manager_config: Optional[Dict[str, Any]] = Field(
-        None, description="ComfyUI Manager configuration settings"
-    )
-    comfyui_root_path: Optional[str] = Field(
-        None, description="ComfyUI root installation directory"
-    )
-    model_paths: Optional[Dict[str, List[str]]] = Field(
-        None, description="Map of model types to their configured paths"
-    )
-    manager_version: Optional[str] = Field(None, description="ComfyUI Manager version")
-    security_level: Optional[SecurityLevel] = None
-    network_mode: Optional[str] = Field(
-        None, description="Network mode (online, offline, private)"
-    )
-    cli_args: Optional[Dict[str, Any]] = Field(
-        None, description="Selected ComfyUI CLI arguments"
-    )
-    custom_nodes_count: Optional[int] = Field(
-        None, description="Total number of custom node packages", ge=0
-    )
-    failed_imports: Optional[List[str]] = Field(
-        None, description="List of custom nodes that failed to import"
-    )
-    pip_packages: Optional[Dict[str, str]] = Field(
-        None, description="Map of installed pip packages to their versions"
-    )
-    embedded_python: Optional[bool] = Field(
-        None,
-        description="Whether ComfyUI is running from an embedded Python distribution",
-    )
-
-
-class BatchExecutionRecord(BaseModel):
-    batch_id: str = Field(..., description="Unique batch identifier")
-    start_time: datetime = Field(..., description="ISO timestamp when batch started")
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when batch completed"
-    )
-    state_before: ComfyUISystemState
-    state_after: Optional[ComfyUISystemState] = Field(
-        None, description="System state after batch execution"
-    )
-    operations: Optional[List[BatchOperation]] = Field(
-        None, description="List of operations performed in this batch"
-    )
-    total_operations: Optional[int] = Field(
-        0, description="Total number of operations in batch", ge=0
-    )
-    successful_operations: Optional[int] = Field(
-        0, description="Number of successful operations", ge=0
-    )
-    failed_operations: Optional[int] = Field(
-        0, description="Number of failed operations", ge=0
-    )
-    skipped_operations: Optional[int] = Field(
-        0, description="Number of skipped operations", ge=0
-    )
-
-
-class QueueTaskItem(BaseModel):
-    ui_id: str = Field(..., description="Unique identifier for the task")
-    client_id: str = Field(..., description="Client identifier that initiated the task")
-    kind: OperationType
-    params: Union[
-        InstallPackParams,
-        UpdatePackParams,
-        UpdateAllPacksParams,
-        UpdateComfyUIParams,
-        FixPackParams,
-        UninstallPackParams,
-        DisablePackParams,
-        EnablePackParams,
-        ModelMetadata,
-    ]
-
-
-class TaskHistoryItem(BaseModel):
-    ui_id: str = Field(..., description="Unique identifier for the task")
-    client_id: str = Field(..., description="Client identifier that initiated the task")
-    kind: str = Field(..., description="Type of task that was performed")
-    timestamp: datetime = Field(..., description="ISO timestamp when task completed")
-    result: str = Field(..., description="Task result message or details")
-    status: Optional[TaskExecutionStatus] = None
-    batch_id: Optional[str] = Field(
-        None, description="ID of the batch this task belongs to"
-    )
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when task execution ended"
-    )
-
-
-class TaskStateMessage(BaseModel):
-    history: Dict[str, TaskHistoryItem] = Field(
-        ..., description="Map of task IDs to their history items"
-    )
-    running_queue: List[QueueTaskItem] = Field(
-        ..., description="Currently executing tasks"
-    )
-    pending_queue: List[QueueTaskItem] = Field(
-        ..., description="Tasks waiting to be executed"
-    )
-    installed_packs: Dict[str, ManagerPackInstalled] = Field(
-        ..., description="Map of currently installed node packages by name"
-    )
-
-
-class MessageTaskDone(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    result: str = Field(..., description="Task result message")
-    kind: str = Field(..., description="Type of task")
-    status: Optional[TaskExecutionStatus] = None
-    timestamp: datetime = Field(..., description="ISO timestamp when task completed")
-    state: TaskStateMessage
-
-
-class MessageTaskStarted(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    kind: str = Field(..., description="Type of task")
-    timestamp: datetime = Field(..., description="ISO timestamp when task started")
-    state: TaskStateMessage
-
-
-class MessageTaskFailed(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    error: str = Field(..., description="Error message")
-    kind: str = Field(..., description="Type of task")
-    timestamp: datetime = Field(..., description="ISO timestamp when task failed")
-    state: TaskStateMessage
-
-
-class MessageUpdate(
-    RootModel[Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed]]
-):
-    root: Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed] = Field(
-        ..., description="Union type for all possible WebSocket message updates"
-    )
-
-
-class HistoryResponse(BaseModel):
-    history: Optional[Dict[str, TaskHistoryItem]] = Field(
-        None, description="Map of task IDs to their history items"
-    )

comfyui_manager/glob/CLAUDE.md

@@ -1,11 +0,0 @@
-- Anytime you make a change to the data being sent or received, you should follow this process:
-  1. Adjust the openapi.yaml file first
-  2. Verify the syntax of the openapi.yaml file using `yaml.safe_load`
-  3. Regenerate the types following the instructions in the `data_models/README.md` file
-  4. Verify the new data model is generated
-  5. Verify the syntax of the generated types files
-  6. Run formatting and linting on the generated types files
-  7. Adjust the `__init__.py` files in the `data_models` directory to match/export the new data model
-  8. Only then, make the changes to the rest of the codebase
-  9. Run the CI tests to verify that the changes are working
-- The comfyui_manager is a python package that is used to manage the comfyui server. There are two sub-packages `glob` and `legacy`. These represent the current version (`glob`) and the previous version (`legacy`), not including common utilities and data models. When developing, we work in the `glob` package. You can ignore the `legacy` package entirely, unless you have a very good reason to research how things were done in the legacy or prior major versions of the package. But in those cases, you should just look for the sake of knowledge or reflection, not for changing code (unless explicitly asked to do so).

comfyui_manager/glob/constants.py

@@ -1,55 +0,0 @@
-
-SECURITY_MESSAGE_MIDDLE = "ERROR: To use this action, a security_level of `normal or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_MIDDLE_P = "ERROR: To use this action, security_level must be `normal or below`, and network_mode must be set to `personal_cloud`. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
-
-
-def is_loopback(address):
-    import ipaddress
-
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-model_dir_name_map = {
-    "checkpoints": "checkpoints",
-    "checkpoint": "checkpoints",
-    "unclip": "checkpoints",
-    "text_encoders": "text_encoders",
-    "clip": "text_encoders",
-    "vae": "vae",
-    "lora": "loras",
-    "t2i-adapter": "controlnet",
-    "t2i-style": "controlnet",
-    "controlnet": "controlnet",
-    "clip_vision": "clip_vision",
-    "gligen": "gligen",
-    "upscale": "upscale_models",
-    "embedding": "embeddings",
-    "embeddings": "embeddings",
-    "unet": "diffusion_models",
-    "diffusion_model": "diffusion_models",
-}
-
-# List of all model directory names used for checking installed models
-MODEL_DIR_NAMES = [
-    "checkpoints",
-    "loras",
-    "vae",
-    "text_encoders",
-    "diffusion_models",
-    "clip_vision",
-    "embeddings",
-    "diffusers",
-    "vae_approx",
-    "controlnet",
-    "gligen",
-    "upscale_models",
-    "hypernetworks",
-    "photomaker",
-    "classifiers",
-]

comfyui_manager/glob/share_3rdparty.py

@@ -1,386 +0,0 @@
-import mimetypes
-from ..common import context
-from . import manager_core as core
-
-import os
-from aiohttp import web
-import aiohttp
-import json
-import hashlib
-
-import folder_paths
-from server import PromptServer
-import logging
-
-
-def extract_model_file_names(json_data):
-    """Extract unique file names from the input JSON data."""
-    file_names = set()
-    model_filename_extensions = {'.safetensors', '.ckpt', '.pt', '.pth', '.bin'}
-
-    # Recursively search for file names in the JSON data
-    def recursive_search(data):
-        if isinstance(data, dict):
-            for value in data.values():
-                recursive_search(value)
-        elif isinstance(data, list):
-            for item in data:
-                recursive_search(item)
-        elif isinstance(data, str) and '.' in data:
-            file_names.add(os.path.basename(data))  # file_names.add(data)
-
-    recursive_search(json_data)
-    return [f for f in list(file_names) if os.path.splitext(f)[1] in model_filename_extensions]
-
-
-def find_file_paths(base_dir, file_names):
-    """Find the paths of the files in the base directory."""
-    file_paths = {}
-
-    for root, dirs, files in os.walk(base_dir):
-        # Exclude certain directories
-        dirs[:] = [d for d in dirs if d not in ['.git']]
-
-        for file in files:
-            if file in file_names:
-                file_paths[file] = os.path.join(root, file)
-    return file_paths
-
-
-def compute_sha256_checksum(filepath):
-    """Compute the SHA256 checksum of a file, in chunks"""
-    sha256 = hashlib.sha256()
-    with open(filepath, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b''):
-            sha256.update(chunk)
-    return sha256.hexdigest()
-
-
-@PromptServer.instance.routes.get("/v2/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']
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['share_option'], status=200)
-
-    return web.Response(status=200)
-
-
-def get_openart_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
-            openart_key = f.read().strip()
-        return openart_key if openart_key else None
-    except Exception:
-        return None
-
-
-def get_matrix_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, "matrix_auth"), "r") as f:
-            matrix_auth = f.read()
-            homeserver, username, password = matrix_auth.strip().split("\n")
-            if not homeserver or not username or not password:
-                return None
-        return {
-            "homeserver": homeserver,
-            "username": username,
-            "password": password,
-        }
-    except Exception:
-        return None
-
-
-def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
-            share_key = f.read()
-            if not share_key.strip():
-                return None
-        return share_key
-    except Exception:
-        return None
-
-
-def get_youml_settings():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
-            youml_settings = f.read().strip()
-        return youml_settings if youml_settings else None
-    except Exception:
-        return None
-
-
-def set_youml_settings(settings):
-    with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
-        f.write(settings)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
-async def api_get_openart_auth(request):
-    # print("Getting stored Matrix credentials...")
-    openart_key = get_openart_auth()
-    if not openart_key:
-        return web.Response(status=404)
-    return web.json_response({"openart_key": openart_key})
-
-
-@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
-async def api_set_openart_auth(request):
-    json_data = await request.json()
-    openart_key = json_data['openart_key']
-    with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
-        f.write(openart_key)
-    return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
-async def api_get_matrix_auth(request):
-    # print("Getting stored Matrix credentials...")
-    matrix_auth = get_matrix_auth()
-    if not matrix_auth:
-        return web.Response(status=404)
-    return web.json_response(matrix_auth)
-
-
-@PromptServer.instance.routes.get("/v2/manager/youml/settings")
-async def api_get_youml_settings(request):
-    youml_settings = get_youml_settings()
-    if not youml_settings:
-        return web.Response(status=404)
-    return web.json_response(json.loads(youml_settings))
-
-
-@PromptServer.instance.routes.post("/v2/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")
-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
-    # print("Getting stored Comfyworkflows.com auth...")
-    comfyworkflows_auth = get_comfyworkflows_auth()
-    if not comfyworkflows_auth:
-        return web.Response(status=404)
-    return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
-
-
-@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
-async def set_esheep_workflow_and_images(request):
-    json_data = await request.json()
-    with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
-        json.dump(json_data, file, indent=4)
-        return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
-async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
-        data = json.load(file)
-        return web.Response(status=200, text=json.dumps(data))
-
-
-def set_matrix_auth(json_data):
-    homeserver = json_data['homeserver']
-    username = json_data['username']
-    password = json_data['password']
-    with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
-        f.write("\n".join([homeserver, username, password]))
-
-
-def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
-        f.write(comfyworkflows_sharekey)
-
-
-def has_provided_matrix_auth(matrix_auth):
-    return matrix_auth['homeserver'].strip() and matrix_auth['username'].strip() and matrix_auth['password'].strip()
-
-
-def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
-    return comfyworkflows_sharekey.strip()
-
-
-@PromptServer.instance.routes.post("/v2/manager/share")
-async def share_art(request):
-    # get json data
-    json_data = await request.json()
-
-    matrix_auth = json_data['matrix_auth']
-    comfyworkflows_sharekey = json_data['cw_auth']['cw_sharekey']
-
-    set_matrix_auth(matrix_auth)
-    set_comfyworkflows_auth(comfyworkflows_sharekey)
-
-    share_destinations = json_data['share_destinations']
-    credits = json_data['credits']
-    title = json_data['title']
-    description = json_data['description']
-    is_nsfw = json_data['is_nsfw']
-    prompt = json_data['prompt']
-    potential_outputs = json_data['potential_outputs']
-    selected_output_index = json_data['selected_output_index']
-
-    try:
-        output_to_share = potential_outputs[int(selected_output_index)]
-    except Exception:
-        # for now, pick the first output
-        output_to_share = potential_outputs[0]
-
-    assert output_to_share['type'] in ('image', 'output')
-    output_dir = folder_paths.get_output_directory()
-
-    if output_to_share['type'] == 'image':
-        asset_filename = output_to_share['image']['filename']
-        asset_subfolder = output_to_share['image']['subfolder']
-
-        if output_to_share['image']['type'] == 'temp':
-            output_dir = folder_paths.get_temp_directory()
-    else:
-        asset_filename = output_to_share['output']['filename']
-        asset_subfolder = output_to_share['output']['subfolder']
-
-    if asset_subfolder:
-        asset_filepath = os.path.join(output_dir, asset_subfolder, asset_filename)
-    else:
-        asset_filepath = os.path.join(output_dir, asset_filename)
-
-    # get the mime type of the asset
-    assetFileType = mimetypes.guess_type(asset_filepath)[0]
-
-    share_website_host = "UNKNOWN"
-    if "comfyworkflows" in share_destinations:
-        share_website_host = "https://comfyworkflows.com"
-        share_endpoint = f"{share_website_host}/api"
-
-        # get presigned urls
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.post(
-                    f"{share_endpoint}/get_presigned_urls",
-                    json={
-                        "assetFileName": asset_filename,
-                        "assetFileType": assetFileType,
-                        "workflowJsonFileName": 'workflow.json',
-                        "workflowJsonFileType": 'application/json',
-                    },
-            ) as resp:
-                assert resp.status == 200
-                presigned_urls_json = await resp.json()
-                assetFilePresignedUrl = presigned_urls_json["assetFilePresignedUrl"]
-                assetFileKey = presigned_urls_json["assetFileKey"]
-                workflowJsonFilePresignedUrl = presigned_urls_json["workflowJsonFilePresignedUrl"]
-                workflowJsonFileKey = presigned_urls_json["workflowJsonFileKey"]
-
-        # upload asset
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(assetFilePresignedUrl, data=open(asset_filepath, "rb")) as resp:
-                assert resp.status == 200
-
-        # upload workflow json
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(workflowJsonFilePresignedUrl, data=json.dumps(prompt['workflow']).encode('utf-8')) as resp:
-                assert resp.status == 200
-
-        model_filenames = extract_model_file_names(prompt['workflow'])
-        model_file_paths = find_file_paths(folder_paths.base_path, model_filenames)
-
-        models_info = {}
-        for filename, filepath in model_file_paths.items():
-            models_info[filename] = {
-                "filename": filename,
-                "sha256_checksum": compute_sha256_checksum(filepath),
-                "relative_path": os.path.relpath(filepath, folder_paths.base_path),
-            }
-
-        # make a POST request to /api/upload_workflow with form data key values
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            form = aiohttp.FormData()
-            if comfyworkflows_sharekey:
-                form.add_field("shareKey", comfyworkflows_sharekey)
-            form.add_field("source", "comfyui_manager")
-            form.add_field("assetFileKey", assetFileKey)
-            form.add_field("assetFileType", assetFileType)
-            form.add_field("workflowJsonFileKey", workflowJsonFileKey)
-            form.add_field("sharedWorkflowWorkflowJsonString", json.dumps(prompt['workflow']))
-            form.add_field("sharedWorkflowPromptJsonString", json.dumps(prompt['output']))
-            form.add_field("shareWorkflowCredits", credits)
-            form.add_field("shareWorkflowTitle", title)
-            form.add_field("shareWorkflowDescription", description)
-            form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
-            form.add_field("currentSnapshot", json.dumps(await core.get_current_snapshot()))
-            form.add_field("modelsInfo", json.dumps(models_info))
-
-            async with session.post(
-                    f"{share_endpoint}/upload_workflow",
-                    data=form,
-            ) as resp:
-                assert resp.status == 200
-                upload_workflow_json = await resp.json()
-                workflowId = upload_workflow_json["workflowId"]
-
-    # check if the user has provided Matrix credentials
-    if "matrix" in share_destinations:
-        comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
-        filename = os.path.basename(asset_filepath)
-        content_type = assetFileType
-
-        try:
-            from matrix_client.api import MatrixHttpApi
-            from matrix_client.client import MatrixClient
-
-            homeserver = 'matrix.org'
-            if matrix_auth:
-                homeserver = matrix_auth.get('homeserver', 'matrix.org')
-            homeserver = homeserver.replace("http://", "https://")
-            if not homeserver.startswith("https://"):
-                homeserver = "https://" + homeserver
-
-            client = MatrixClient(homeserver)
-            try:
-                token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
-                if not token:
-                    return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-            except Exception:
-                return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-
-            matrix = MatrixHttpApi(homeserver, token=token)
-            with open(asset_filepath, 'rb') as f:
-                mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
-
-            workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
-
-            text_content = ""
-            if title:
-                text_content += f"{title}\n"
-            if description:
-                text_content += f"{description}\n"
-            if credits:
-                text_content += f"\ncredits: {credits}\n"
-            matrix.send_message(comfyui_share_room_id, text_content)
-            matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
-            matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
-        except Exception:
-            logging.exception("An error occurred")
-            return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)
-
-    return web.json_response({
-        "comfyworkflows": {
-            "url": None if "comfyworkflows" not in share_destinations else f"{share_website_host}/workflows/{workflowId}",
-        },
-        "matrix": {
-            "success": None if "matrix" not in share_destinations else True
-        }
-    }, content_type='application/json', status=200)

comfyui_manager/glob/utils/environment_utils.py

@@ -1,142 +0,0 @@
-import os
-import git
-import logging
-import traceback
-
-from comfyui_manager.common import context
-import folder_paths
-from comfy.cli_args import args
-import latent_preview
-
-from comfyui_manager.glob import manager_core as core
-from comfyui_manager.common import cm_global
-
-
-comfy_ui_hash = "-"
-comfyui_tag = None
-
-
-def print_comfyui_version():
-    global comfy_ui_hash
-    global comfyui_tag
-
-    is_detached = False
-    try:
-        repo = git.Repo(os.path.dirname(folder_paths.__file__))
-        core.comfy_ui_revision = len(list(repo.iter_commits("HEAD")))
-
-        comfy_ui_hash = repo.head.commit.hexsha
-        cm_global.variables["comfyui.revision"] = core.comfy_ui_revision
-
-        core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-        cm_global.variables["comfyui.commit_datetime"] = core.comfy_ui_commit_datetime
-
-        is_detached = repo.head.is_detached
-        current_branch = repo.active_branch.name
-
-        comfyui_tag = context.get_comfyui_tag()
-
-        try:
-            if (
-                not os.environ.get("__COMFYUI_DESKTOP_VERSION__")
-                and core.comfy_ui_commit_datetime.date()
-                < core.comfy_ui_required_commit_datetime.date()
-            ):
-                logging.warning(
-                    f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n"
-                )
-        except Exception:
-            pass
-
-        # process on_revision_detected -->
-        if "cm.on_revision_detected_handler" in cm_global.variables:
-            for k, f in cm_global.variables["cm.on_revision_detected_handler"]:
-                try:
-                    f(core.comfy_ui_revision)
-                except Exception:
-                    logging.error(f"[ERROR] '{k}' on_revision_detected_handler")
-                    traceback.print_exc()
-
-            del cm_global.variables["cm.on_revision_detected_handler"]
-        else:
-            logging.warning(
-                "[ComfyUI-Manager] Some features are restricted due to your ComfyUI being outdated."
-            )
-        # <--
-
-        if current_branch == "master":
-            if comfyui_tag:
-                logging.info(
-                    f"### ComfyUI Version: {comfyui_tag} | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-            else:
-                logging.info(
-                    f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-        else:
-            if comfyui_tag:
-                logging.info(
-                    f"### ComfyUI Version: {comfyui_tag} on '{current_branch}' | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-            else:
-                logging.info(
-                    f"### ComfyUI Revision: {core.comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-    except Exception:
-        if is_detached:
-            logging.info(
-                f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] *DETACHED | Released on '{core.comfy_ui_commit_datetime.date()}'"
-            )
-        else:
-            logging.info(
-                "### ComfyUI Revision: UNKNOWN (The currently installed ComfyUI is not a Git repository)"
-            )
-
-
-def set_preview_method(method):
-    if method == "auto":
-        args.preview_method = latent_preview.LatentPreviewMethod.Auto
-    elif method == "latent2rgb":
-        args.preview_method = latent_preview.LatentPreviewMethod.Latent2RGB
-    elif method == "taesd":
-        args.preview_method = latent_preview.LatentPreviewMethod.TAESD
-    else:
-        args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
-
-    core.get_config()["preview_method"] = method
-
-
-def set_update_policy(mode):
-    core.get_config()["update_policy"] = mode
-
-
-def set_db_mode(mode):
-    core.get_config()["db_mode"] = mode
-
-
-def setup_environment():
-    git_exe = core.get_config()["git_exe"]
-
-    if git_exe != "":
-        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe)
-
-
-def initialize_environment():
-    context.comfy_path = os.path.dirname(folder_paths.__file__)
-    core.js_path = os.path.join(context.comfy_path, "web", "extensions")
-
-    # Legacy database paths - kept for potential future use
-    # local_db_model = os.path.join(manager_util.comfyui_manager_path, "model-list.json")
-    # local_db_alter = os.path.join(manager_util.comfyui_manager_path, "alter-list.json")
-    # local_db_custom_node_list = os.path.join(
-    #     manager_util.comfyui_manager_path, "custom-node-list.json"
-    # )
-    # local_db_extension_node_mappings = os.path.join(
-    #     manager_util.comfyui_manager_path, "extension-node-map.json"
-    # )
-
-    set_preview_method(core.get_config()["preview_method"])
-    print_comfyui_version()
-    setup_environment()
-
-    core.check_invalid_nodes()

comfyui_manager/glob/utils/formatting_utils.py

@@ -1,60 +0,0 @@
-import locale
-import sys
-import re
-
-
-def handle_stream(stream, prefix):
-    stream.reconfigure(encoding=locale.getpreferredencoding(), errors="replace")
-    for msg in stream:
-        if (
-            prefix == "[!]"
-            and ("it/s]" in msg or "s/it]" in msg)
-            and ("%|" in msg or "it [" in msg)
-        ):
-            if msg.startswith("100%"):
-                print("\r" + msg, end="", file=sys.stderr),
-            else:
-                print("\r" + msg[:-1], end="", file=sys.stderr),
-        else:
-            if prefix == "[!]":
-                print(prefix, msg, end="", file=sys.stderr)
-            else:
-                print(prefix, msg, end="")
-
-
-def convert_markdown_to_html(input_text):
-    pattern_a = re.compile(r"\[a/([^]]+)]\(([^)]+)\)")
-    pattern_w = re.compile(r"\[w/([^]]+)]")
-    pattern_i = re.compile(r"\[i/([^]]+)]")
-    pattern_bold = re.compile(r"\*\*([^*]+)\*\*")
-    pattern_white = re.compile(r"%%([^*]+)%%")
-
-    def replace_a(match):
-        return f"<a href='{match.group(2)}' target='blank'>{match.group(1)}</a>"
-
-    def replace_w(match):
-        return f"<p class='cm-warn-note'>{match.group(1)}</p>"
-
-    def replace_i(match):
-        return f"<p class='cm-info-note'>{match.group(1)}</p>"
-
-    def replace_bold(match):
-        return f"<B>{match.group(1)}</B>"
-
-    def replace_white(match):
-        return f"<font color='white'>{match.group(1)}</font>"
-
-    input_text = (
-        input_text.replace("\\[", "&#91;")
-        .replace("\\]", "&#93;")
-        .replace("<", "&lt;")
-        .replace(">", "&gt;")
-    )
-
-    result_text = re.sub(pattern_a, replace_a, input_text)
-    result_text = re.sub(pattern_w, replace_w, result_text)
-    result_text = re.sub(pattern_i, replace_i, result_text)
-    result_text = re.sub(pattern_bold, replace_bold, result_text)
-    result_text = re.sub(pattern_white, replace_white, result_text)
-
-    return result_text.replace("\n", "<BR>")

comfyui_manager/glob/utils/model_utils.py

@@ -1,161 +0,0 @@
-import os
-import logging
-import concurrent.futures
-import folder_paths
-
-from comfyui_manager.glob import manager_core as core
-from comfyui_manager.glob.constants import model_dir_name_map, MODEL_DIR_NAMES
-
-
-def get_model_dir(data, show_log=False):
-    if "download_model_base" in folder_paths.folder_names_and_paths:
-        models_base = folder_paths.folder_names_and_paths["download_model_base"][0][0]
-    else:
-        models_base = folder_paths.models_dir
-
-    # NOTE: Validate to prevent path traversal.
-    if any(char in data["filename"] for char in {"/", "\\", ":"}):
-        return None
-
-    def resolve_custom_node(save_path):
-        save_path = save_path[13:]  # remove 'custom_nodes/'
-
-        # NOTE: Validate to prevent path traversal.
-        if save_path.startswith(os.path.sep) or ":" in save_path:
-            return None
-
-        repo_name = save_path.replace("\\", "/").split("/")[
-            0
-        ]  # get custom node repo name
-
-        # NOTE: The creation of files within the custom node path should be removed in the future.
-        repo_path = core.lookup_installed_custom_nodes_legacy(repo_name)
-        if repo_path is not None and repo_path[0]:
-            # Returns the retargeted path based on the actually installed repository
-            return os.path.join(os.path.dirname(repo_path[1]), save_path)
-        else:
-            return None
-
-    if data["save_path"] != "default":
-        if ".." in data["save_path"] or data["save_path"].startswith("/"):
-            if show_log:
-                logging.info(
-                    f"[WARN] '{data['save_path']}' is not allowed path. So it will be saved into 'models/etc'."
-                )
-            base_model = os.path.join(models_base, "etc")
-        else:
-            if data["save_path"].startswith("custom_nodes"):
-                base_model = resolve_custom_node(data["save_path"])
-                if base_model is None:
-                    if show_log:
-                        logging.info(
-                            f"[ComfyUI-Manager] The target custom node for model download is not installed: {data['save_path']}"
-                        )
-                    return None
-            else:
-                base_model = os.path.join(models_base, data["save_path"])
-    else:
-        model_dir_name = model_dir_name_map.get(data["type"].lower())
-        if model_dir_name is not None:
-            base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
-        else:
-            base_model = os.path.join(models_base, "etc")
-
-    return base_model
-
-
-def get_model_path(data, show_log=False):
-    base_model = get_model_dir(data, show_log)
-    if base_model is None:
-        return None
-    else:
-        if data["filename"] == "<huggingface>":
-            return os.path.join(base_model, os.path.basename(data["url"]))
-        else:
-            return os.path.join(base_model, data["filename"])
-
-
-def check_model_installed(json_obj):
-    def is_exists(model_dir_name, filename, url):
-        if filename == "<huggingface>":
-            filename = os.path.basename(url)
-
-        dirs = folder_paths.get_folder_paths(model_dir_name)
-
-        for x in dirs:
-            if os.path.exists(os.path.join(x, filename)):
-                return True
-
-        return False
-
-    total_models_files = set()
-    for x in MODEL_DIR_NAMES:
-        for y in folder_paths.get_filename_list(x):
-            total_models_files.add(y)
-
-    def process_model_phase(item):
-        if (
-            "diffusion" not in item["filename"]
-            and "pytorch" not in item["filename"]
-            and "model" not in item["filename"]
-        ):
-            # non-general name case
-            if item["filename"] in total_models_files:
-                item["installed"] = "True"
-                return
-
-        if item["save_path"] == "default":
-            model_dir_name = model_dir_name_map.get(item["type"].lower())
-            if model_dir_name is not None:
-                item["installed"] = str(
-                    is_exists(model_dir_name, item["filename"], item["url"])
-                )
-            else:
-                item["installed"] = "False"
-        else:
-            model_dir_name = item["save_path"].split("/")[0]
-            if model_dir_name in folder_paths.folder_names_and_paths:
-                if is_exists(model_dir_name, item["filename"], item["url"]):
-                    item["installed"] = "True"
-
-            if "installed" not in item:
-                if item["filename"] == "<huggingface>":
-                    filename = os.path.basename(item["url"])
-                else:
-                    filename = item["filename"]
-
-                fullpath = os.path.join(
-                    folder_paths.models_dir, item["save_path"], filename
-                )
-
-                item["installed"] = "True" if os.path.exists(fullpath) else "False"
-
-    with concurrent.futures.ThreadPoolExecutor(8) as executor:
-        for item in json_obj["models"]:
-            executor.submit(process_model_phase, item)
-
-
-async def check_whitelist_for_model(item):
-    from comfyui_manager.data_models import ManagerDatabaseSource
-    
-    json_obj = await core.get_data_by_mode(ManagerDatabaseSource.cache.value, "model-list.json")
-
-    for x in json_obj.get("models", []):
-        if (
-            x["save_path"] == item["save_path"]
-            and x["base"] == item["base"]
-            and x["filename"] == item["filename"]
-        ):
-            return True
-
-    json_obj = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "model-list.json")
-
-    for x in json_obj.get("models", []):
-        if (
-            x["save_path"] == item["save_path"]
-            and x["base"] == item["base"]
-            and x["filename"] == item["filename"]
-        ):
-            return True
-
-    return False

comfyui_manager/glob/utils/node_pack_utils.py

@@ -1,65 +0,0 @@
-import concurrent.futures
-
-from comfyui_manager.glob import manager_core as core
-
-
-def check_state_of_git_node_pack(
-    node_packs, do_fetch=False, do_update_check=True, do_update=False
-):
-    if do_fetch:
-        print("Start fetching...", end="")
-    elif do_update:
-        print("Start updating...", end="")
-    elif do_update_check:
-        print("Start update check...", end="")
-
-    def process_custom_node(item):
-        core.check_state_of_git_node_pack_single(
-            item, do_fetch, do_update_check, do_update
-        )
-
-    with concurrent.futures.ThreadPoolExecutor(4) as executor:
-        for k, v in node_packs.items():
-            if v.get("active_version") in ["unknown", "nightly"]:
-                executor.submit(process_custom_node, v)
-
-    if do_fetch:
-        print("\x1b[2K\rFetching done.")
-    elif do_update:
-        update_exists = any(
-            item.get("updatable", False) for item in node_packs.values()
-        )
-        if update_exists:
-            print("\x1b[2K\rUpdate done.")
-        else:
-            print("\x1b[2K\rAll extensions are already up-to-date.")
-    elif do_update_check:
-        print("\x1b[2K\rUpdate check done.")
-
-
-def nickname_filter(json_obj):
-    preemptions_map = {}
-
-    for k, x in json_obj.items():
-        if "preemptions" in x[1]:
-            for y in x[1]["preemptions"]:
-                preemptions_map[y] = k
-        elif k.endswith("/ComfyUI"):
-            for y in x[0]:
-                preemptions_map[y] = k
-
-    updates = {}
-    for k, x in json_obj.items():
-        removes = set()
-        for y in x[0]:
-            k2 = preemptions_map.get(y)
-            if k2 is not None and k != k2:
-                removes.add(y)
-
-        if len(removes) > 0:
-            updates[k] = [y for y in x[0] if y not in removes]
-
-    for k, v in updates.items():
-        json_obj[k][0] = v
-
-    return json_obj

comfyui_manager/glob/utils/security_utils.py

@@ -1,67 +0,0 @@
-from comfyui_manager.glob import manager_core as core
-from comfy.cli_args import args
-from comfyui_manager.data_models import SecurityLevel, RiskLevel, ManagerDatabaseSource
-
-
-def is_loopback(address):
-    import ipaddress
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-def is_allowed_security_level(level):
-    is_local_mode = is_loopback(args.listen)
-    is_personal_cloud = core.get_config()['network_mode'].lower() == 'personal_cloud'
-
-    if level == RiskLevel.block.value:
-        return False
-    elif level == RiskLevel.high_.value:
-        if is_local_mode:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
-        elif is_personal_cloud:
-            return core.get_config()['security_level'] == SecurityLevel.weak.value
-        else:
-            return False
-    elif level == RiskLevel.high.value:
-        if is_local_mode:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
-        else:
-            return core.get_config()['security_level'] == SecurityLevel.weak.value
-    elif level == RiskLevel.middle_.value:
-        if is_local_mode or is_personal_cloud:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
-        else:
-            return False
-    elif level == RiskLevel.middle.value:
-        return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
-    else:
-        return True
-
-
-async def get_risky_level(files, pip_packages):
-    json_data1 = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "custom-node-list.json")
-    json_data2 = await core.get_data_by_mode(
-        ManagerDatabaseSource.cache.value,
-        "custom-node-list.json",
-        channel_url="https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main",
-    )
-
-    all_urls = set()
-    for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
-        all_urls.update(x.get("files", []))
-
-    for x in files:
-        if x not in all_urls:
-            return RiskLevel.high_.value
-
-    all_pip_packages = set()
-    for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
-        all_pip_packages.update(x.get("pip", []))
-
-    for p in pip_packages:
-        if p not in all_pip_packages:
-            return RiskLevel.block.value
-
-    return RiskLevel.middle_.value

docs/en/cm-cli.md

@@ -139,9 +139,9 @@ You can set whether to use ComfyUI-Manager solely via CLI.
 `restore-dependencies`
 
 * This command can be used if custom nodes are installed under the `ComfyUI/custom_nodes` path but their dependencies are not installed.
-* It is useful when starting a new cloud instance, like colab, where dependencies need to be reinstalled and installation scripts re-executed.
+* It is useful when starting a new cloud instance, like Colab, where dependencies need to be reinstalled and installation scripts re-executed.
 * It can also be utilized if ComfyUI is reinstalled and only the custom_nodes path has been backed up and restored.
 
 ### 7. Clear
 
-In the GUI, installations, updates, or snapshot restorations are scheduled to execute the next time ComfyUI is launched. The `clear` command clears this scheduled state, ensuring no pre-execution actions are applied.
+In the GUI, installations, updates, or snapshot restorations are scheduled to execute the next time ComfyUI is launched. The `clear` command clears this scheduled state, ensuring no pre-execution actions are applied.

docs/ko/cm-cli.md

@@ -23,13 +23,13 @@ OPTIONS:
 ## How To Use?
 * `python cm-cli.py` 를 통해서 실행 시킬 수 있습니다.
 * 예를 들어 custom node를 모두 업데이트 하고 싶다면
-    * ComfyUI-Manager경로 에서 `python cm-cli.py update all` 를 command를 실행할 수 있습니다.
+    * ComfyUI-Manager 경로에서 `python cm-cli.py update all` 명령을 실행할 수 있습니다.
     * ComfyUI 경로에서 실행한다면, `python custom_nodes/ComfyUI-Manager/cm-cli.py update all` 와 같이 cm-cli.py 의 경로를 지정할 수도 있습니다.
 
 ## Prerequisite
 * ComfyUI 를 실행하는 python과 동일한 python 환경에서 실행해야 합니다.
     * venv를 사용할 경우 해당 venv를 activate 한 상태에서 실행해야 합니다.
-    * portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 코맨드를 실행해야 합니다.
+* portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 명령을 실행해야 합니다.
         `.\python_embeded\python.exe ComfyUI\custom_nodes\ComfyUI-Manager\cm-cli.py update all`
 * ComfyUI 의 경로는 COMFYUI_PATH 환경 변수로 설정할 수 있습니다. 만약 생략할 경우 다음과 같은 경고 메시지가 나타나며, ComfyUI-Manager가 설치된 경로를 기준으로 상대 경로로 설정됩니다.
         ```
@@ -40,8 +40,8 @@ OPTIONS:
 
 ### 1. --channel, --mode
 * 정보 보기 기능과 커스텀 노드 관리 기능의 경우는 --channel과 --mode를 통해 정보 DB를 설정할 수 있습니다.
-* 예들 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 command를 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
+* 예를 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 명령을 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
-* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` command에서만 사용 가능합니다.
+* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` 명령에서만 사용 가능합니다.
 
 ### 2. 관리 정보 보기
 
@@ -51,7 +51,7 @@ OPTIONS:
 * `[show|simple-show]` - `show`는 상세하게 정보를 보여주며, `simple-show`는 간단하게 정보를 보여줍니다.
 
 
-`python cm-cli.py show installed` 와 같은 코맨드를 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
+`python cm-cli.py show installed` 와 같은 명령을 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
 ```
 -= ComfyUI-Manager CLI (V2.24) =-
 
@@ -67,7 +67,7 @@ FETCH DATA from: https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
 [    DISABLED   ]  ComfyUI-Loopchain                                 (author: Fannovel16)
 ```
 
-`python cm-cli.py simple-show installed` 와 같은 코맨드를 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.
+`python cm-cli.py simple-show installed` 와 같은 명령을 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.
 
 ```
 -= ComfyUI-Manager CLI (V2.24) =-
@@ -89,7 +89,7 @@ ComfyUI-Loopchain
     * `installed`: enable, disable 여부와 상관없이 설치된 모든 노드를 보여줍니다
     * `not-installed`: 설치되지 않은 커스텀 노드의 목록을 보여줍니다.
     * `all`: 모든 커스텀 노드의 목록을 보여줍니다.
-    * `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`롤 통해서 볼 경우는 json 출력 형태로  보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
+    * `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`를 통해서 볼 경우는 json 출력 형태로 보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
     * `snapshot-list`: ComfyUI-Manager/snapshots 에 저장된 snapshot 파일의 목록을 보여줍니다.
 
 ### 3. 커스텀 노드 관리 하기
@@ -98,7 +98,7 @@ ComfyUI-Loopchain
 
 * `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다.
 * 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다. 
-(추후 nickname 을 사용가능하돌고 업데이트 할 예정입니다.)
+(추후 nickname을 사용 가능하도록 업데이트할 예정입니다.)
 
 `[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]`
 
@@ -124,7 +124,7 @@ ComfyUI-Loopchain
   * `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
   * `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행 
   * `--user-directory`: 사용자 디렉토리 설정
-  * `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes 만 설치된 것으로 인식함.)
+  * `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes만 설치된 것으로 인식함.)
 
 ### 5. CLI only mode
 
@@ -133,7 +133,7 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
 `cli-only-mode [enable|disable]`
 
 * security 혹은 policy 의 이유로 GUI 를 통한 ComfyUI-Manager 사용을 제한하고 싶은 경우 이 모드를 사용할 수 있습니다.
-    * CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화 되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.
+    * CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.
 
 
 ### 6. 의존성 설치
@@ -141,10 +141,10 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
 `restore-dependencies`
 
 * `ComfyUI/custom_nodes` 하위 경로에 커스텀 노드들이 설치되어 있긴 하지만, 의존성이 설치되지 않은 경우 사용할 수 있습니다.
-* colab 과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행 되어야 하는 경우 사용합니다.
+* Colab과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행되어야 하는 경우 사용합니다.
-* ComfyUI을 재설치할 경우, custom_nodes 경로만 백업했다가 재설치 할 경우 활용 가능합니다.
+* ComfyUI를 재설치할 경우, custom_nodes 경로만 백업했다가 재설치할 경우 활용 가능합니다.
 
 
 ### 7. clear
 
-GUI에서 install, update를 하거나 snapshot 을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.
+GUI에서 install, update를 하거나 snapshot을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.

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.")
+    print("\nWARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.", file=sys.stderr)
-    exit(-1)
+    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
@@ -156,27 +153,27 @@ def switch_to_default_branch(repo):
         default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
         repo.git.checkout(default_branch)
         return True
-    except Exception:
+    except:
         # try checkout master
         # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
             return True
-        except Exception:
+        except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
                     return True
-            except Exception:
+            except:
                 try:
                     repo.git.checkout(repo.heads.main)
                     return True
-                except Exception:
+                except:
                     try:
                         if remote_name is not None:
                             repo.git.checkout('-b', 'main', f'{remote_name}/main')
                             return True
-                    except Exception:
+                    except:
                         pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -447,7 +444,7 @@ def restore_pip_snapshot(pips, options):
         res = 1
         try:
             res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
-        except Exception:
+        except:
             pass
 
         # fallback
@@ -456,7 +453,7 @@ def restore_pip_snapshot(pips, options):
                 res = 1
                 try:
                     res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-                except Exception:
+                except:
                     pass
 
                 if res != 0:
@@ -467,7 +464,7 @@ def restore_pip_snapshot(pips, options):
             res = 1
             try:
                 res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except Exception:
+            except:
                 pass
 
             if res != 0:
@@ -478,7 +475,7 @@ def restore_pip_snapshot(pips, options):
             res = 1
             try:
                 res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except Exception:
+            except:
                 pass
 
             if res != 0:

glob/README.md

@@ -2,16 +2,20 @@
 
 This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
 
-## Directory Structure
-- **glob/** - code for new cacheless ComfyUI-Manager
-- **legacy/** - code for legacy ComfyUI-Manager
-
 ## Core Modules
+
 - **manager_core.py**: The central implementation of management functions, handling configuration, installation, updates, and node management.
 - **manager_server.py**: Implements server functionality and API endpoints for the web interface to interact with the backend.
+- **manager_downloader.py**: Handles downloading operations for models, extensions, and other resources.
+- **manager_util.py**: Provides utility functions used throughout the system.
 
 ## Specialized Modules
 
+- **cm_global.py**: Maintains global variables and state management across the system.
+- **cnr_utils.py**: Helper utilities for interacting with the custom node registry (CNR).
+- **git_utils.py**: Git-specific utilities for repository operations.
+- **node_package.py**: Handles the packaging and installation of node extensions.
+- **security_check.py**: Implements the multi-level security system for installation safety.
 - **share_3rdparty.py**: Manages integration with third-party sharing platforms.
 
 ## Architecture

glob/cnr_utils.py

@@ -6,9 +6,8 @@ import time
 from dataclasses import dataclass
 from typing import List
 
-from . import context
+import manager_core
-from . import manager_util
+import manager_util
-
 import requests
 import toml
 
@@ -48,9 +47,9 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
         # Get ComfyUI version tag
         if is_desktop:
             # extract version from pyproject.toml instead of git tag
-            comfyui_ver = context.get_current_comfyui_ver() or 'unknown'
+            comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
         else:
-            comfyui_ver = context.get_comfyui_tag() or 'unknown'
+            comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
 
         if is_desktop:
             if is_windows:
@@ -112,7 +111,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
         json_obj = await fetch_all()
         manager_util.save_to_cache(uri, json_obj)
         return json_obj['nodes']
-    except Exception:
+    except:
         res = {}
         print("Cannot connect to comfyregistry.")
     finally:
@@ -237,7 +236,7 @@ def generate_cnr_id(fullpath, cnr_id):
         if not os.path.exists(cnr_id_path):
             with open(cnr_id_path, "w") as f:
                 return f.write(cnr_id)
-    except Exception:
+    except:
         print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
 
 
@@ -247,7 +246,7 @@ def read_cnr_id(fullpath):
         if os.path.exists(cnr_id_path):
             with open(cnr_id_path) as f:
                 return f.read().strip()
-    except Exception:
+    except:
         pass
 
     return None

glob/manager_core.py

@@ -23,6 +23,7 @@ import yaml
 import zipfile
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
+import toml
 
 orig_print = print
 
@@ -31,17 +32,18 @@ from packaging import version
 
 import uuid
 
-from ..common import cm_global
+glob_path = os.path.join(os.path.dirname(__file__))  # ComfyUI-Manager/glob
-from ..common import cnr_utils
+sys.path.append(glob_path)
-from ..common import manager_util
+
-from ..common import git_utils
+import cm_global
-from ..common import manager_downloader
+import cnr_utils
-from ..common.node_package import InstalledNodePackage
+import manager_util
-from ..common.enums import NetworkMode, SecurityLevel, DBMode
+import git_utils
-from ..common import context
+import manager_downloader
+from node_package import InstalledNodePackage
 
 
-version_code = [4, 0]
+version_code = [3, 37]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -56,14 +58,13 @@ 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:
         try:
             import folder_paths
             default_custom_nodes_path = folder_paths.get_folder_paths("custom_nodes")[0]
-        except Exception:
+        except:
             default_custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
 
     return default_custom_nodes_path
@@ -73,11 +74,37 @@ def get_custom_nodes_paths():
         try:
             import folder_paths
             return folder_paths.get_folder_paths("custom_nodes")
-        except Exception:
+        except:
             custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
             return [custom_nodes_path]
 
 
+def get_comfyui_tag():
+    try:
+        repo = git.Repo(comfy_path)
+        return repo.git.describe('--tags')
+    except:
+        return None
+
+
+def get_current_comfyui_ver():
+    """
+    Extract version from pyproject.toml
+    """
+    toml_path = os.path.join(comfy_path, 'pyproject.toml')
+    if not os.path.exists(toml_path):
+        return None
+    else:
+        try:
+            with open(toml_path, "r", encoding="utf-8") as f:
+                data = toml.load(f)
+
+                project = data.get('project', {})
+                return project.get('version')
+        except:
+            return None
+
+
 def get_script_env():
     new_env = os.environ.copy()
     git_exe = get_config().get('git_exe')
@@ -85,10 +112,10 @@ def get_script_env():
         new_env['GIT_EXE_PATH'] = git_exe
 
     if 'COMFYUI_PATH' not in new_env:
-        new_env['COMFYUI_PATH'] = context.comfy_path
+        new_env['COMFYUI_PATH'] = comfy_path
 
     if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
-        new_env['COMFYUI_FOLDERS_BASE_PATH'] = context.comfy_path
+        new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
 
     return new_env
 
@@ -110,12 +137,12 @@ def check_invalid_nodes():
 
     try:
         import folder_paths
-    except Exception:
+    except:
         try:
-            sys.path.append(context.comfy_path)
+            sys.path.append(comfy_path)
             import folder_paths
-        except Exception:
+        except:
-            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {context.comfy_path}")
+            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")
 
     def check(root):
         global invalid_nodes
@@ -150,6 +177,75 @@ def check_invalid_nodes():
         print("\n---------------------------------------------------------------------------\n")
 
 
+# read env vars
+comfy_path: str = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
+if comfy_path is None:
+    try:
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+    except:
+        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
+
+if comfy_base_path is None:
+    comfy_base_path = comfy_path
+
+
+channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
+git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
+
+manager_files_path = None
+manager_config_path = None
+manager_channel_list_path = None
+manager_startup_script_path:str = None
+manager_snapshot_path = None
+manager_pip_overrides_path = None
+manager_pip_blacklist_path = None
+manager_components_path = None
+
+def update_user_directory(user_dir):
+    global manager_files_path
+    global manager_config_path
+    global manager_channel_list_path
+    global manager_startup_script_path
+    global manager_snapshot_path
+    global manager_pip_overrides_path
+    global manager_pip_blacklist_path
+    global manager_components_path
+
+    manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
+    if not os.path.exists(manager_files_path):
+        os.makedirs(manager_files_path)
+
+    manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
+    if not os.path.exists(manager_snapshot_path):
+        os.makedirs(manager_snapshot_path)
+
+    manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
+    if not os.path.exists(manager_startup_script_path):
+        os.makedirs(manager_startup_script_path)
+
+    manager_config_path = os.path.join(manager_files_path, 'config.ini')
+    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
+    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    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")
+
+    if not os.path.exists(manager_util.cache_dir):
+        os.makedirs(manager_util.cache_dir)
+
+try:
+    import folder_paths
+    update_user_directory(folder_paths.get_user_directory())
+
+except Exception:
+    # fallback:
+    # This case is only possible when running with cm-cli, and in practice, this case is not actually used.
+    update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
+
+
 cached_config = None
 js_path = None
 
@@ -525,7 +621,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
 
@@ -701,9 +797,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):
-        import folder_paths
-
         self.custom_node_map_cache = {}
         self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
         self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -711,18 +805,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'
-            # reload 'cnr_map' and 'repo_cnr_map'
+        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
-            cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
 
-            for x in cnrs:
+        for x in cnrs:
-                self.cnr_map[x['id']] = x
+            self.cnr_map[x['id']] = x
-                if 'repository' in x:
+            if 'repository' in x:
-                    normalized_url = git_utils.normalize_url(x['repository'])
+                normalized_url = git_utils.normalize_url(x['repository'])
-                    self.repo_cnr_map[normalized_url] = x
+                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'):
@@ -770,7 +863,7 @@ class UnifiedManager:
                 if 'id' in x:
                     if x['id'] not in res:
                         res[x['id']] = (x, True)
-            except Exception:
+            except:
                 logging.error(f"[ComfyUI-Manager] broken item:{x}")
 
         return res
@@ -823,7 +916,7 @@ class UnifiedManager:
     def safe_version(ver_str):
         try:
             return version.parse(ver_str)
-        except Exception:
+        except:
             return version.parse("0.0.0")
 
     def execute_install_script(self, url, repo_path, instant_execution=False, lazy_mode=False, no_deps=False):
@@ -837,7 +930,7 @@ class UnifiedManager:
         else:
             if os.path.exists(requirements_path) and not no_deps:
                 print("Install: pip packages")
-                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
+                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
                 lines = manager_util.robust_readlines(requirements_path)
                 for line in lines:
                     package_name = remap_pip_package(line.strip())
@@ -859,7 +952,7 @@ class UnifiedManager:
         return res
 
     def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
-        script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
         with open(script_path, "a") as file:
             obj = [target, "#LAZY-CNR-SWITCH-SCRIPT", zip_url, from_path, to_path, no_deps, get_default_custom_nodes_path(), sys.executable]
             file.write(f"{obj}\n")
@@ -1265,7 +1358,7 @@ class UnifiedManager:
             print(f"Download: git clone '{clone_url}'")
 
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
                     return result.fail(f"Failed to clone repo: {clone_url}")
             else:
@@ -1391,6 +1484,7 @@ class UnifiedManager:
                 return ManagedResult('skip')
             elif self.is_disabled(node_id):
                 return self.unified_enable(node_id)
+
             else:
                 version_spec = self.resolve_unspecified_version(node_id)
 
@@ -1417,20 +1511,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)
+            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
-                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))
-
             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':
@@ -1491,7 +1577,7 @@ def identify_node_pack_from_path(fullpath):
         if github_id is None:
             try:
                 github_id = os.path.basename(repo_url)
-            except Exception:
+            except:
                 logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
                 github_id = module_name
 
@@ -1546,10 +1632,10 @@ def get_channel_dict():
     if channel_dict is None:
         channel_dict = {}
 
-        if not os.path.exists(context.manager_channel_list_path):
+        if not os.path.exists(manager_channel_list_path):
-            shutil.copy(context.channel_list_template_path, context.manager_channel_list_path)
+            shutil.copy(channel_list_template_path, manager_channel_list_path)
 
-        with open(context.manager_channel_list_path, 'r') as file:
+        with open(manager_channel_list_path, 'r') as file:
             channels = file.read()
             for x in channels.split('\n'):
                 channel_info = x.split("::")
@@ -1613,18 +1699,18 @@ def write_config():
         'db_mode': get_config()['db_mode'],
     }
 
-    directory = os.path.dirname(context.manager_config_path)
+    directory = os.path.dirname(manager_config_path)
     if not os.path.exists(directory):
         os.makedirs(directory)
 
-    with open(context.manager_config_path, 'w') as configfile:
+    with open(manager_config_path, 'w') as configfile:
         config.write(configfile)
 
 
 def read_config():
     try:
         config = configparser.ConfigParser(strict=False)
-        config.read(context.manager_config_path)
+        config.read(manager_config_path)
         default_conf = config['default']
 
         def get_bool(key, default_value):
@@ -1637,7 +1723,7 @@ def read_config():
                     'http_channel_enabled': get_bool('http_channel_enabled', False),
                     'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
                     'git_exe': default_conf.get('git_exe', ''),
-                    'use_uv': get_bool('use_uv', True),
+                    'use_uv': get_bool('use_uv', False),
                     'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
                     'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
                     'share_option': default_conf.get('share_option', 'all').lower(),
@@ -1649,9 +1735,9 @@ def read_config():
                     'model_download_by_agent': get_bool('model_download_by_agent', False),
                     'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
                     'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
+                    'network_mode': default_conf.get('network_mode', 'public').lower(),
-                    'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
+                    'security_level': default_conf.get('security_level', 'normal').lower(),
-                    'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
+                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
                }
 
     except Exception:
@@ -1676,9 +1762,9 @@ def read_config():
             'model_download_by_agent': False,
             'downgrade_blacklist': '',
             'always_lazy_install': False,
-            'network_mode': NetworkMode.PUBLIC.value,
+            'network_mode': 'public',   # public | private | offline
-            'security_level': SecurityLevel.NORMAL.value,
+            'security_level': 'normal', # strong | normal | normal- | weak
-            'db_mode': DBMode.CACHE.value,
+            'db_mode': 'cache',         # local | cache | remote
         }
 
 
@@ -1722,27 +1808,27 @@ def switch_to_default_branch(repo):
         default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
         repo.git.checkout(default_branch)
         return True
-    except Exception:
+    except:
         # try checkout master
         # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
             return True
-        except Exception:
+        except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
                     return True
-            except Exception:
+            except:
                 try:
                     repo.git.checkout(repo.heads.main)
                     return True
-                except Exception:
+                except:
                     try:
                         if remote_name is not None:
                             repo.git.checkout('-b', 'main', f'{remote_name}/main')
                             return True
-                    except Exception:
+                    except:
                         pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -1750,10 +1836,10 @@ def switch_to_default_branch(repo):
 
 
 def reserve_script(repo_path, install_cmds):
-    if not os.path.exists(context.manager_startup_script_path):
+    if not os.path.exists(manager_startup_script_path):
-        os.makedirs(context.manager_startup_script_path)
+        os.makedirs(manager_startup_script_path)
 
-    script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+    script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
     with open(script_path, "a") as file:
         obj = [repo_path] + install_cmds
         file.write(f"{obj}\n")
@@ -1793,7 +1879,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
                     print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
                     print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
                     print("###################################################################\n\n")
-            except Exception:
+            except:
                 pass
 
         if code != 0:
@@ -1808,11 +1894,11 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
 # use subprocess to avoid file system lock by git (Windows)
 def __win_check_git_update(path, do_fetch=False, do_update=False):
     if do_fetch:
-        command = [sys.executable, context.git_script_path, "--fetch", path]
+        command = [sys.executable, git_script_path, "--fetch", path]
     elif do_update:
-        command = [sys.executable, context.git_script_path, "--pull", path]
+        command = [sys.executable, git_script_path, "--pull", path]
     else:
-        command = [sys.executable, context.git_script_path, "--check", path]
+        command = [sys.executable, git_script_path, "--check", path]
 
     new_env = get_script_env()
     process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
@@ -1866,7 +1952,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
 
 
 def __win_check_git_pull(path):
-    command = [sys.executable, context.git_script_path, "--pull", path]
+    command = [sys.executable, git_script_path, "--pull", path]
     process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
     process.wait()
 
@@ -1882,7 +1968,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
     else:
         if os.path.exists(requirements_path) and not no_deps:
             print("Install: pip packages")
-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
             with open(requirements_path, "r") as requirements_file:
                 for line in requirements_file:
                     #handle comments
@@ -2118,7 +2204,7 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
             clone_url = git_utils.get_url_for_clone(url)
 
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
                     return result.fail(f"Failed to clone '{clone_url}' into  '{repo_path}'")
             else:
@@ -2189,7 +2275,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)
@@ -2209,7 +2295,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)
 
@@ -2280,7 +2366,7 @@ def gitclone_uninstall(files):
             url = url[:-1]
         try:
             for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                 dir_path = os.path.join(custom_nodes_dir, dir_name)
 
                 # safety check
@@ -2328,7 +2414,7 @@ def gitclone_set_active(files, is_disable):
             url = url[:-1]
         try:
             for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                 dir_path = os.path.join(custom_nodes_dir, dir_name)
 
                 # safety check
@@ -2425,7 +2511,7 @@ def update_to_stable_comfyui(repo_path):
         repo = git.Repo(repo_path)
         try:
             repo.git.checkout(repo.heads.master)
-        except Exception:
+        except:
             logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
             for branch in repo.branches:
                 logging.error('\t'+branch.name)
@@ -2448,7 +2534,7 @@ def update_to_stable_comfyui(repo_path):
             logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
             repo.git.checkout(latest_tag)
             return 'updated', latest_tag
-    except Exception:
+    except:
         traceback.print_exc()
         return "fail", None
             
@@ -2601,7 +2687,7 @@ async def get_current_snapshot(custom_nodes_only = False):
     await unified_manager.get_custom_nodes('default', 'cache')
 
     # Get ComfyUI hash
-    repo_path = context.comfy_path
+    repo_path = comfy_path
 
     comfyui_commit_hash = None
     if not custom_nodes_only:
@@ -2646,8 +2732,8 @@ async def get_current_snapshot(custom_nodes_only = False):
                         commit_hash = git_utils.get_commit_hash(fullpath)
                         url = git_utils.git_url(fullpath)
                         git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
-                except Exception as e:
+                except:
-                    print(f"Failed to extract snapshots for the custom node '{path}'. / {e}")
+                    print(f"Failed to extract snapshots for the custom node '{path}'.")
 
             elif path.endswith('.py'):
                 is_disabled = path.endswith(".py.disabled")
@@ -2677,7 +2763,7 @@ async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = Fal
         date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
         file_name = f"{date_time_format}_{postfix}"
 
-        path = os.path.join(context.manager_snapshot_path, f"{file_name}.json")
+        path = os.path.join(manager_snapshot_path, f"{file_name}.json")
     else:
         file_name = path.replace('\\', '/').split('/')[-1]
         file_name = file_name.split('.')[-2]
@@ -2704,7 +2790,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
         with open(filepath, "r", encoding="UTF-8", errors="ignore") as json_file:
             try:
                 workflow = json.load(json_file)
-            except Exception:
+            except:
                 print(f"Invalid workflow file: {filepath}")
                 exit(-1)
 
@@ -2717,7 +2803,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
             else:
                 try:
                     workflow = json.loads(img.info['workflow'])
-                except Exception:
+                except:
                     print(f"This is not a valid .png file containing a ComfyUI workflow: {filepath}")
                     exit(-1)
 
@@ -2988,7 +3074,7 @@ def populate_github_stats(node_packs, json_obj_github):
                 v['stars'] = -1
                 v['last_update'] = -1
                 v['trust'] = False
-        except Exception:
+        except:
             logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
 
 
@@ -3266,12 +3352,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
 
 def get_comfyui_versions(repo=None):
     if repo is None:
-        repo = git.Repo(context.comfy_path)
+        repo = git.Repo(comfy_path)
 
     try:
         remote = get_remote_name(repo)   
         repo.remotes[remote].fetch()    
-    except Exception:
+    except:
         logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
 
     versions = [x.name for x in repo.tags if x.name.startswith('v')]
@@ -3300,7 +3386,7 @@ def get_comfyui_versions(repo=None):
 
 
 def switch_comfyui(tag):
-    repo = git.Repo(context.comfy_path)
+    repo = git.Repo(comfy_path)
 
     if tag == 'nightly':
         repo.git.checkout('master')
@@ -3340,5 +3426,5 @@ def repo_switch_commit(repo_path, commit_hash):
 
         repo.git.checkout(commit_hash)
         return True
-    except Exception:
+    except:
         return None

glob/manager_util.py

@@ -15,10 +15,10 @@ import re
 import logging
 import platform
 import shlex
-from packaging import version
+from functools import lru_cache
+
 
 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**.
@@ -26,9 +26,6 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also up
 use_uv = False
 bypass_ssl = 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":
         sep = ':'
@@ -38,52 +35,128 @@ def add_python_path_to_env():
     os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
 
 
+@lru_cache(maxsize=2)
+def get_pip_cmd(force_uv=False):
+    """
+    Get the base pip command, with automatic fallback to uv if pip is unavailable.
+
+    Args:
+        force_uv (bool): If True, use uv directly without trying pip
+
+    Returns:
+        list: Base command for pip operations
+    """
+    embedded = 'python_embeded' in sys.executable
+
+    # Try pip first (unless forcing uv)
+    if not force_uv:
+        try:
+            test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip', '--version']
+            subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
+            return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip']
+        except Exception:
+            logging.warning("[ComfyUI-Manager] python -m pip not available. Falling back to uv.")
+
+    # Try uv (either forced or pip failed)
+    import shutil
+
+    # Try uv as Python module
+    try:
+        test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', '--version']
+        subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
+        logging.info("[ComfyUI-Manager] Using uv as Python module for pip operations.")
+        return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', 'pip']
+    except Exception:
+        pass
+
+    # Try standalone uv
+    if shutil.which('uv'):
+        logging.info("[ComfyUI-Manager] Using standalone uv for pip operations.")
+        return ['uv', 'pip']
+
+    # Nothing worked
+    logging.error("[ComfyUI-Manager] Neither python -m pip nor uv are available. Cannot proceed with package operations.")
+    raise Exception("Neither pip nor uv are available for package management")
+
+
 def make_pip_cmd(cmd):
-    if 'python_embeded' in sys.executable:
+    """
-        if use_uv:
+    Create a pip command by combining the cached base pip command with the given arguments.
-            return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
+
-        else:
+    Args:
-            return [sys.executable, '-s', '-m', 'pip'] + cmd
+        cmd (list): List of pip command arguments (e.g., ['install', 'package'])
-    else:
+
-        # FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
+    Returns:
-        if use_uv:
+        list: Complete command list ready for subprocess execution
-            return [sys.executable, '-m', 'uv', 'pip'] + cmd
+    """
-        else:
+    global use_uv
-            return [sys.executable, '-m', 'pip'] + cmd
+    base_cmd = get_pip_cmd(force_uv=use_uv)
+    return base_cmd + cmd
+
 
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
 #     from distutils.version import StrictVersion
-# except Exception:
+# except:
 #     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
 class StrictVersion:
     def __init__(self, version_string):
-        self.obj = version.parse(version_string)
         self.version_string = version_string
-        self.major = self.obj.major
+        self.major = 0
-        self.minor = self.obj.minor
+        self.minor = 0
-        self.patch = self.obj.micro
+        self.patch = 0
+        self.pre_release = None
+        self.parse_version_string()
+
+    def parse_version_string(self):
+        parts = self.version_string.split('.')
+        if not parts:
+            raise ValueError("Version string must not be empty")
+
+        self.major = int(parts[0])
+        self.minor = int(parts[1]) if len(parts) > 1 else 0
+        self.patch = int(parts[2]) if len(parts) > 2 else 0
+
+        # Handling pre-release versions if present
+        if len(parts) > 3:
+            self.pre_release = parts[3]
 
     def __str__(self):
-        return self.version_string
+        version = f"{self.major}.{self.minor}.{self.patch}"
+        if self.pre_release:
+            version += f"-{self.pre_release}"
+        return version
 
     def __eq__(self, other):
-        return self.obj == other.obj
+        return (self.major, self.minor, self.patch, self.pre_release) == \
+            (other.major, other.minor, other.patch, other.pre_release)
 
     def __lt__(self, other):
-        return self.obj < other.obj
+        if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
+            return self.pre_release_compare(self.pre_release, other.pre_release) < 0
+        return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
+
+    @staticmethod
+    def pre_release_compare(pre1, pre2):
+        if pre1 == pre2:
+            return 0
+        if pre1 is None:
+            return 1
+        if pre2 is None:
+            return -1
+        return -1 if pre1 < pre2 else 1
 
     def __le__(self, other):
-        return self.obj == other.obj or self.obj < other.obj
+        return self == other or self < other
 
     def __gt__(self, other):
-        return not self.obj <= other.obj
+        return not self <= other
 
     def __ge__(self, other):
-        return not self.obj < other.obj
+        return not self < other
 
     def __ne__(self, other):
-        return not self.obj == other.obj
+        return not self == other
 
 
 def simple_hash(input_string):
@@ -479,7 +552,7 @@ def robust_readlines(fullpath):
     try:
         with open(fullpath, "r") as f:
             return f.readlines()
-    except Exception:
+    except:
         encoding = None
         with open(fullpath, "rb") as f:
             raw_data = f.read()

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/security_check.py

@@ -2,7 +2,7 @@ import sys
 import subprocess
 import os
 
-from . import manager_util
+import manager_util
 
 
 def security_check():

glob/share_3rdparty.py

@@ -1,7 +1,5 @@
 import mimetypes
-from ..common import context
+import manager_core as core
-from . import manager_core as core
-
 import os
 from aiohttp import web
 import aiohttp
@@ -55,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']
@@ -67,21 +65,21 @@ async def share_option(request):
 
 
 def get_openart_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
+    if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
+        with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
             openart_key = f.read().strip()
         return openart_key if openart_key else None
-    except Exception:
+    except:
         return None
 
 
 def get_matrix_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
+    if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, "matrix_auth"), "r") as f:
+        with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
             matrix_auth = f.read()
             homeserver, username, password = matrix_auth.strip().split("\n")
             if not homeserver or not username or not password:
@@ -91,40 +89,40 @@ def get_matrix_auth():
             "username": username,
             "password": password,
         }
-    except Exception:
+    except:
         return None
 
 
 def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
+    if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
+        with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
             share_key = f.read()
             if not share_key.strip():
                 return None
         return share_key
-    except Exception:
+    except:
         return None
 
 
 def get_youml_settings():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
+    if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
+        with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
             youml_settings = f.read().strip()
         return youml_settings if youml_settings else None
-    except Exception:
+    except:
         return None
 
 
 def set_youml_settings(settings):
-    with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
+    with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
         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()
@@ -133,16 +131,16 @@ 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']
-    with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
+    with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
         f.write(openart_key)
     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()
@@ -151,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:
@@ -159,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
@@ -177,17 +175,17 @@ 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(context.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
+    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
         json.dump(json_data, file, indent=4)
         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(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
+    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
         data = json.load(file)
         return web.Response(status=200, text=json.dumps(data))
 
@@ -196,12 +194,12 @@ def set_matrix_auth(json_data):
     homeserver = json_data['homeserver']
     username = json_data['username']
     password = json_data['password']
-    with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
+    with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
         f.write("\n".join([homeserver, username, password]))
 
 
 def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
+    with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
         f.write(comfyworkflows_sharekey)
 
 
@@ -213,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()
@@ -235,7 +233,7 @@ async def share_art(request):
 
     try:
         output_to_share = potential_outputs[int(selected_output_index)]
-    except Exception:
+    except:
         # for now, pick the first output
         output_to_share = potential_outputs[0]
 

js/README.md

@@ -13,7 +13,7 @@ This directory contains the JavaScript frontend implementation for ComfyUI-Manag
 ## Sharing Components
 
 - **comfyui-share-common.js**: Base functionality for workflow sharing features.
-- **comfyui-share-copus.js**: Integration with the ComfyUI Opus sharing platform.
+- **comfyui-share-copus.js**: Integration with the ComfyUI Copus sharing platform.
 - **comfyui-share-openart.js**: Integration with the OpenArt sharing platform.
 - **comfyui-share-youml.js**: Integration with the YouML sharing platform.
 
@@ -47,4 +47,4 @@ CSS files are included for specific components:
 - **custom-nodes-manager.css**: Styling for the node management UI
 - **model-manager.css**: Styling for the model management UI
 
-This frontend implementation provides a comprehensive yet user-friendly interface for managing the ComfyUI ecosystem.
+This frontend implementation provides a comprehensive yet user-friendly interface for managing the ComfyUI ecosystem.

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

@@ -14,9 +14,9 @@ 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
+	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') {
@@ -231,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
@@ -414,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';
@@ -422,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;
@@ -473,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();
+	is_updating = true;
-
+	await api.fetchApi('/manager/queue/start');
-	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)
-	});
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -616,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 = "";
@@ -635,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}`);
 			}
@@ -660,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(!is_updating)  {
-		if(batch_id != event.detail.batch_id) {
 			return;
 		}
 
+		is_updating = false;
+
 		let success_list = [];
 		let failed_list = [];
 		let comfyui_state = null;
@@ -770,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`, {
+	if (response.status == 401) {
-		method: 'POST',
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
-		body: JSON.stringify(batch)
+	}
-	});
+	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)
  */
@@ -804,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.');
 	}
 }
@@ -952,12 +962,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
@@ -969,19 +979,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 {
@@ -994,7 +1004,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;
@@ -1022,7 +1032,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';
@@ -1032,7 +1042,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";
@@ -1047,7 +1057,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;
@@ -1055,7 +1065,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);
 		});
 
@@ -1068,14 +1078,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 [
@@ -1378,12 +1388,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: [
 		{

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-copus.js

@@ -201,13 +201,15 @@ export class CopusShareDialog extends ComfyDialog {
     });
     this.LockInput = $el("input", {
       type: "text",
-      placeholder: "",
+      placeholder: "0",
       style: {
         width: "100px",
         padding: "7px",
+        paddingLeft: "30px",
         borderRadius: "4px",
         border: "1px solid #ddd",
         boxSizing: "border-box",
+        position: "relative",
       },
       oninput: (event) => {
         let input = event.target.value;
@@ -375,7 +377,7 @@ export class CopusShareDialog extends ComfyDialog {
     });
 
     const blockChainSection_lock = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
+      $el("label", { style: labelStyle }, ["6️⃣ Download threshold"]),
       $el(
         "label",
         {
@@ -395,6 +397,7 @@ export class CopusShareDialog extends ComfyDialog {
                 marginLeft: "5px",
                 display: "flex",
                 alignItems: "center",
+                position: "relative",
               },
             },
             [
@@ -408,8 +411,18 @@ export class CopusShareDialog extends ComfyDialog {
                     color: "#fff",
                   },
                 },
-                ["Price US$"]
+                ["Unlock with"]
               ),
+              $el("img", {
+                style: {
+                  width: "16px",
+                  height: "16px",
+                  position: "absolute",
+                  right: "75px",
+                  zIndex: "100",
+                },
+                src: "https://static.copus.io/images/admin/202507/prod/e2919a1d8f3c2d99d3b8fe27ff94b841.png",
+              }),
               this.LockInput,
             ]
           ),
@@ -420,7 +433,7 @@ export class CopusShareDialog extends ComfyDialog {
         { style: { display: "flex", alignItems: "center", cursor: "pointer" } },
         [
           this.radioButtonsCheckOff_lock,
-            $el(
+          $el(
             "div",
             {
               style: {
@@ -429,9 +442,7 @@ export class CopusShareDialog extends ComfyDialog {
                 alignItems: "center",
               },
             },
-            [
+            [$el("span", { style: { marginLeft: "5px" } }, ["OFF"])]
-              $el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
-            ]
           ),
         ]
       ),
@@ -440,7 +451,6 @@ export class CopusShareDialog extends ComfyDialog {
         "p",
         { style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
         [
-          "Get paid from your workflow. You can change the price and withdraw your earnings on Copus.",
         ]
       ),
     ]);

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

@@ -172,7 +172,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) {}
 		}
@@ -210,7 +210,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 +245,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,
 	});
@@ -630,14 +630,6 @@ export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {
 	});
 }
 
-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;

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/custom-nodes-manager.css

@@ -1,5 +1,5 @@
 .cn-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	--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%;

js/custom-nodes-manager.js

@@ -7,7 +7,7 @@ import {
 	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
 	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
 	storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
-	showPopover, hidePopover, generateUUID
+	showPopover, hidePopover
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
@@ -66,7 +66,7 @@ export class CustomNodesManager {
 		this.id = "cn-manager";
 
 		app.registerExtension({
-			name: "Comfy.Legacy.CustomNodesManager",
+			name: "Comfy.CustomNodesManager",
 			afterConfigureGraph: (missingNodeTypes) => {
 				const item = this.getFilterItem(ShowMode.MISSING);
 				if (item) {
@@ -459,7 +459,7 @@ export class CustomNodesManager {
 
 			".cn-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.');
 				}
 			},
@@ -635,7 +635,7 @@ export class CustomNodesManager {
 			};
 		}
 
-		const response = await api.fetchApi(`/v2/customnode/import_fail_info`, {
+		const response = await api.fetchApi(`/customnode/import_fail_info`, {
 									method: 'POST',
 									headers: { 'Content-Type': 'application/json' },
 									body: JSON.stringify(info)
@@ -1244,7 +1244,7 @@ export class CustomNodesManager {
 	async loadNodes(node_packs) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading node mappings (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			console.log(res.error);
 			return;
@@ -1396,10 +1396,10 @@ export class CustomNodesManager {
 		this.showLoading();
 		let res;
 		if(is_enable) {
-			res = await api.fetchApi(`/v2/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
 		}
 		else {
-			res = await api.fetchApi(`/v2/customnode/versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/customnode/versions/${node_id}`, { cache: "no-store" });
 		}
 		this.hideLoading();
 
@@ -1441,6 +1441,13 @@ export class CustomNodesManager {
 	}
 
 	async installNodes(list, btn, title, selected_version) {
+		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;
+		}
+
 		const { target, label, mode} = btn;
 
 		if(mode === "uninstall") {
@@ -1467,9 +1474,9 @@ export class CustomNodesManager {
 		let needRestart = false;
 		let errorMsg = "";
 
-		let target_items = [];
+		await api.fetchApi('/manager/queue/reset');
 
-		let batch = {};
+		let target_items = [];
 
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
@@ -1512,11 +1519,23 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}
 
-			if(batch[api_mode]) {
+			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
-				batch[api_mode].push(data);
+				method: 'POST',
-			}
+				body: JSON.stringify(data)
-			else {
+			});
-				batch[api_mode] = [data];
+
+			if (res.status != 200) {
+				errorMsg = `'${item.title}': `;
+
+				if(res.status == 403) {
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else if(res.status == 404) {
+					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
 		}
 
@@ -1533,24 +1552,7 @@ export class CustomNodesManager {
 			}
 		}
 		else {
-			this.batch_id = generateUUID();
+			await api.fetchApi('/manager/queue/start');
-			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 = this.grid.getRowItemBy("hash", hash);
-					errorMsg = `[FAIL] ${item.title}`;
-				}
-			}
-
 			this.showStop();
 			showTerminal();
 		}
@@ -1558,9 +1560,6 @@ export class CustomNodesManager {
 
 	async onQueueStatus(event) {
 		let self = CustomNodesManager.instance;
-		// If legacy manager front is not open, return early (using new manager front)
-		if (self.element?.style.display === 'none') return
-
 		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
 			const hash = event.detail.target;
 
@@ -1571,7 +1570,7 @@ export class CustomNodesManager {
 			self.grid.updateCell(item, "action");
 			self.grid.setRowSelected(item, false);
 		}
-		else if(event.detail.status == 'batch-done' && event.detail.batch_id == self.batch_id) {
+		else if(event.detail.status == 'done') {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -1626,17 +1625,35 @@ export class CustomNodesManager {
 	getNodesInWorkflow() {
 		let usedGroupNodes = new Set();
 		let allUsedNodes = {};
+		const visitedGraphs = new Set();
 
-		for(let k in app.graph._nodes) {
+		const visitGraph = (graph) => {
-			let node = app.graph._nodes[k];
+			if (!graph || visitedGraphs.has(graph)) return;
+			visitedGraphs.add(graph);
 
-			if(node.type.startsWith('workflow>')) {
+			const nodes = graph._nodes || graph.nodes || [];
-				usedGroupNodes.add(node.type.slice(9));
+			for(let k in nodes) {
-				continue;
+				let node = nodes[k];
+				if (!node) continue;
+
+				// If it's a SubgraphNode, recurse into its graph and continue searching
+				if (node.isSubgraphNode?.() && node.subgraph) {
+					visitGraph(node.subgraph);
+				}
+
+				if (!node.type) continue;
+
+				// Group nodes / components
+				if(typeof node.type === 'string' && node.type.startsWith('workflow>')) {
+					usedGroupNodes.add(node.type.slice(9));
+					continue;
+				}
+
+				allUsedNodes[node.type] = node;
 			}
+		};
 
-			allUsedNodes[node.type] = node;
+		visitGraph(app.graph);
-		}
 
 		for(let k of usedGroupNodes) {
 			let subnodes = app.graph.extra.groupNodes[k]?.nodes;
@@ -1747,7 +1764,7 @@ export class CustomNodesManager {
 	async getMissingNodesLegacy(hashMap, missing_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get custom node mappings: ${res.error}`);
 			return;
@@ -1862,7 +1879,7 @@ export class CustomNodesManager {
 	async getAlternatives() {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/alternatives?mode=${mode}`);
+		const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get alternatives: ${res.error}`);
 			return [];
@@ -1910,7 +1927,7 @@ export class CustomNodesManager {
 			infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
 		}
 
-		const res = await fetchData(`/v2/customnode/getlist?mode=${mode}${skip_update}`);
+		const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
 		if (res.error) {
 			this.showError("Failed to get custom node list.");
 			this.hideLoading();

js/model-manager.js

@@ -3,7 +3,7 @@ import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
 	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
-	storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
+	storeColumnWidth, restoreColumnWidth, loadCss
 } from  "./common.js";
 import { api } from "../../scripts/api.js";
 
@@ -175,7 +175,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.');
 				}
 			},
@@ -435,15 +435,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);
@@ -460,12 +468,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']) {
+			if (res.status != 200) {
-				batch['install_model'].push(data);
+				errorMsg = `'${item.name}': `;
-			}
+
-			else {
+				if(res.status == 403) {
-				batch['install_model'] = [data];
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
 		}
 
@@ -482,24 +499,7 @@ export class ModelManager {
 			}
 		}
 		else {
-			this.batch_id = generateUUID();
+			await api.fetchApi('/manager/queue/start');
-			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}`;
-				}
-			}
-
 			this.showStop();
 			showTerminal();
 		}
@@ -519,7 +519,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);
 		}
@@ -645,7 +645,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

@@ -5045,6 +5045,105 @@
       "size": "1.26GB"
     },
 
+    {
+      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_high_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_low_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_high_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_low_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 ti2v 5B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for ti2v 5B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_ti2v_5B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_ti2v_5B_fp16.safetensors",
+      "size": "10.0GB"
+    },
 
     {
       "name": "Comfy-Org/umt5_xxl_fp16.safetensors",
@@ -5256,6 +5355,317 @@
       "filename": "LBM_relighting.safetensors",
       "url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
       "size": "5.02GB"
+    },
+    {
+      "name": "Qwen-Image VAE",
+      "type": "VAE",
+      "base": "Qwen-Image",
+      "save_path": "vae/qwen-image",
+      "description": "VAE model for Qwen-Image",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
+      "filename": "qwen_image_vae.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/vae/qwen_image_vae.safetensors",
+      "size": "335MB"
+    },
+    {
+      "name": "Qwen 2.5 VL 7B Text Encoder (fp8_scaled)",
+      "type": "clip",
+      "base": "Qwen-2.5-VL",
+      "save_path": "text_encoders/qwen",
+      "description": "Qwen 2.5 VL 7B text encoder model (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
+      "filename": "qwen_2.5_vl_7b_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b_fp8_scaled.safetensors",
+      "size": "3.75GB"
+    },
+    {
+      "name": "Qwen 2.5 VL 7B Text Encoder",
+      "type": "clip",
+      "base": "Qwen-2.5-VL",
+      "save_path": "text_encoders/qwen",
+      "description": "Qwen 2.5 VL 7B text encoder model",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
+      "filename": "qwen_2.5_vl_7b.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/text_encoders/qwen_2.5_vl_7b.safetensors",
+      "size": "7.51GB"
+    },
+    {
+      "name": "Qwen-Image Diffusion Model (fp8_e4m3fn)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image",
+      "save_path": "diffusion_models/qwen-image",
+      "description": "Qwen-Image diffusion model (fp8_e4m3fn)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
+      "filename": "qwen_image_fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_fp8_e4m3fn.safetensors",
+      "size": "4.89GB"
+    },
+    {
+      "name": "Qwen-Image Diffusion Model (bf16)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image",
+      "save_path": "diffusion_models/qwen-image",
+      "description": "Qwen-Image diffusion model (bf16)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI",
+      "filename": "qwen_image_bf16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_bf16.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Edit 2509 Diffusion Model (fp8_e4m3fn)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image-Edit",
+      "save_path": "diffusion_models/qwen-image-edit",
+      "description": "Qwen-Image-Edit 2509 diffusion model (fp8_e4m3fn)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
+      "filename": "qwen_image_edit_2509_fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2509_fp8_e4m3fn.safetensors",
+      "size": "4.89GB"
+    },
+
+    {
+      "name": "Qwen-Image-Edit 2509 Diffusion Model (bf16)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image-Edit",
+      "save_path": "diffusion_models/qwen-image-edit",
+      "description": "Qwen-Image-Edit 2509 diffusion model (bf16)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
+      "filename": "qwen_image_edit_2509_bf16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_2509_bf16.safetensors",
+      "size": "9.78GB"
+    },
+
+    {
+      "name": "Qwen-Image-Edit Diffusion Model (fp8_e4m3fn)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image-Edit",
+      "save_path": "diffusion_models/qwen-image-edit",
+      "description": "Qwen-Image-Edit diffusion model (fp8_e4m3fn)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
+      "filename": "qwen_image_edit_fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_fp8_e4m3fn.safetensors",
+      "size": "4.89GB"
+    },
+
+    {
+      "name": "Qwen-Image-Edit Diffusion Model (bf16)",
+      "type": "diffusion_model",
+      "base": "Qwen-Image-Edit",
+      "save_path": "diffusion_models/qwen-image-edit",
+      "description": "Qwen-Image-Edit diffusion model (bf16)",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI",
+      "filename": "qwen_image_edit_bf16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-Edit_ComfyUI/resolve/main/split_files/diffusion_models/qwen_image_edit_bf16.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 8steps V1.0",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 8-step LoRA model V1.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-8steps-V1.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 4steps V1.0",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 4-step LoRA model V1.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-4steps-V1.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V1.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 4steps V1.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 4-step LoRA model V1.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-4steps-V1.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V1.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 4steps V2.0",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 4-step LoRA model V2.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-4steps-V2.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V2.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 4steps V2.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 4-step LoRA model V2.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-4steps-V2.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-4steps-V2.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 8steps V1.1",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 8-step LoRA model V1.1",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-8steps-V1.1.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.1.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 8steps V1.1 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 8-step LoRA model V1.1 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-8steps-V1.1-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V1.1-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 8steps V2.0",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 8-step LoRA model V2.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-8steps-V2.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V2.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Lightning 8steps V2.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image",
+      "save_path": "loras/qwen-image-lightning",
+      "description": "Qwen-Image-Lightning 8-step LoRA model V2.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Lightning-8steps-V2.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Lightning-8steps-V2.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-Lightning 4steps V1.0",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-Lightning 4-step LoRA model V1.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-Lightning-4steps-V1.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-4steps-V1.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-Lightning 4steps V1.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-Lightning 4-step LoRA model V1.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-4steps-V1.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-Lightning 8steps V1.0",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-Lightning 8-step LoRA model V1.0",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-Lightning-8steps-V1.0.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-8steps-V1.0.safetensors",
+      "size": "9.78GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-Lightning 8steps V1.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-Lightning 8-step LoRA model V1.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-Lightning-8steps-V1.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-Lightning-8steps-V1.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-2509-Lightning 4steps V1.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-2509-Lightning 4-step LoRA model V1.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-2509-Lightning 4steps V1.0 (fp32)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-2509-Lightning 4-step LoRA model V1.0 (fp32)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-2509-Lightning-4steps-V1.0-fp32.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-4steps-V1.0-fp32.safetensors",
+      "size": "39.1GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-2509-Lightning 8steps V1.0 (bf16)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-2509-Lightning 8-step LoRA model V1.0 (bf16)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-8steps-V1.0-bf16.safetensors",
+      "size": "19.6GB"
+    },
+    {
+      "name": "Qwen-Image-Edit-2509-Lightning 8steps V1.0 (fp32)",
+      "type": "lora",
+      "base": "Qwen-Image-Edit",
+      "save_path": "loras/qwen-image-edit-lightning",
+      "description": "Qwen-Image-Edit-2509-Lightning 8-step LoRA model V1.0 (fp32)",
+      "reference": "https://huggingface.co/lightx2v/Qwen-Image-Lightning",
+      "filename": "Qwen-Image-Edit-2509-Lightning-8steps-V1.0-fp32.safetensors",
+      "url": "https://huggingface.co/lightx2v/Qwen-Image-Lightning/resolve/main/Qwen-Image-Edit-2509/Qwen-Image-Edit-2509-Lightning-8steps-V1.0-fp32.safetensors",
+      "size": "39.1GB"
+    },
+    {
+      "name": "Qwen-Image InstantX ControlNet Union",
+      "type": "controlnet",
+      "base": "Qwen-Image",
+      "save_path": "controlnet/qwen-image/instantx",
+      "description": "Qwen-Image InstantX ControlNet Union model",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets",
+      "filename": "Qwen-Image-InstantX-ControlNet-Union.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Union.safetensors",
+      "size": "2.54GB"
+    },
+    {
+      "name": "Qwen-Image InstantX ControlNet Inpainting",
+      "type": "controlnet",
+      "base": "Qwen-Image",
+      "save_path": "controlnet/qwen-image/instantx",
+      "description": "Qwen-Image InstantX ControlNet Inpainting model",
+      "reference": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets",
+      "filename": "Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Qwen-Image-InstantX-ControlNets/resolve/main/split_files/controlnet/Qwen-Image-InstantX-ControlNet-Inpainting.safetensors",
+      "size": "2.54GB"
     }
   ]
-}
+}

node_db/forked/custom-node-list.json

@@ -1,5 +1,15 @@
 {
     "custom_nodes": [
+        {
+            "author": "synchronicity-labs",
+            "title": "ComfyUI Sync Lipsync Node",
+            "reference": "https://github.com/synchronicity-labs/sync-comfyui",
+            "files": [
+                "https://github.com/synchronicity-labs/sync-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node allows you to perform audio-video lip synchronization inside ComfyUI using a simple interface."
+        },
         {
             "author": "joaomede",
             "title": "ComfyUI-Unload-Model-Fork",

node_db/legacy/custom-node-list.json

@@ -1,8 +1,877 @@
 {
     "custom_nodes": [
+        {
+            "author": "neocrz",
+            "title": "comfyui-tinyae [REMOVED]",
+            "reference": "https://github.com/neocrz/comfyui-tinyae",
+            "files": [
+                "https://github.com/neocrz/comfyui-tinyae"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: TinyAE Encode (Image/Video), TinyAE Decode (Image/Video), TinyAE Encode Tiled (Image), TinyAE Decode Tiled (Image)"
+        },
+        {
+            "author": "Laser-one",
+            "title": "ComfyUI-align-pose [REMOVED]",
+            "reference": "https://github.com/Laser-one/ComfyUI-align-pose",
+            "files": [
+                "https://github.com/Laser-one/ComfyUI-align-pose"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:align pose"
+        },
+        {
+            "author": "nomadoor",
+            "title": "ComfyUI Video Stabilizer",
+            "reference": "https://github.com/nomadoor/ComfyUI-Video-Stabilizer",
+            "files": [
+                "https://github.com/nomadoor/ComfyUI-Video-Stabilizer"
+            ],
+            "install_type": "git-clone",
+            "description": "Two complementary stabiliser nodes for ComfyUI: Video Stabilizer (Classic), Video Stabilizer (Flow)"
+        },
+        {
+            "author": "0xhappydev",
+            "title": "comfyui-qwen-image-tools",
+            "reference": "https://github.com/0xhappydev/comfyui-qwen-image-tools",
+            "files": [
+                "https://github.com/0xhappydev/comfyui-qwen-image-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for Qwen-Image-Edit with multi-image support, more flexibility around the vision transformer (qwen2.5-vl), custom system prompts, and some other experimental things to come."
+        },
+        {
+            "author": "Rathius-Saranoth",
+            "title": "Rathius ComfyUI Nodes",
+            "reference": "https://github.com/Rathius-Saranoth/rathius-comfyui-nodes",
+            "files": [
+                "https://github.com/Rathius-Saranoth/rathius-comfyui-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI by Rathius"
+        },
+        {
+            "author": "Hiero207",
+            "title": "Hiero-Nodes [REMOVED]",
+            "id": "hiero",
+            "reference": "https://github.com/Hiero207/ComfyUI-Hiero-Nodes",
+            "files": [
+                "https://github.com/Hiero207/ComfyUI-Hiero-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Post to Discord w/ Webhook"
+        },
+        {
+            "author": "NeoDroleDeGueule",
+            "title": "comfyui-image-mixer",
+            "reference": "https://github.com/NeoDroleDeGueule/comfyui-image-mixer [REMOVED]",
+            "files": [
+                "https://github.com/NeoDroleDeGueule/comfyui-image-mixer"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node that blends two images in latent space using a mix factor slider."
+        },
+        {
+            "author": "Glarus-akash",
+            "title": "ComfyUI_Image_Upscaler [REMOVED]",
+            "reference": "https://github.com/Glarus-akash/ComfyUI_Image_Upscaler",
+            "files": [
+                "https://github.com/Glarus-akash/ComfyUI_Image_Upscaler"
+            ],
+            "install_type": "git-clone",
+            "description": "Welcome to the Image Upscaler & Restorer project! This tool utilizes the [a/GFPGAN](https://github.com/TencentARC/GFPGAN) algorithm to enhance and restore images, providing a seamless way to improve image quality."
+        },
+        {
+            "author": "styletransfer",
+            "title": "Sequential Group Controller for ComfyUI [REMOVED]",
+            "reference": "https://github.com/styletransfer/ComfyUI_SequentialGroupController",
+            "files": [
+                "https://github.com/styletransfer/ComfyUI_SequentialGroupController"
+            ],
+            "install_type": "git-clone",
+            "description": "Control which groups execute based on iteration ranges - a simplified alternative to complex conditional branching workflows."
+        },
+        {
+            "author": "xl0",
+            "title": "q_tools [REMOVED]",
+            "reference": "https://github.com/xl0/q_tools",
+            "files": [
+                "https://github.com/xl0/q_tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: QLoadLatent, QLinearScheduler, QPreviewLatent, QGaussianLatent, QUniformLatent, QKSampler"
+        },
+        {
+            "author": "tmode-1960",
+            "title": "comfyui-ta-nodes-pack [REMOVED]",
+            "reference": "https://github.com/tmode-1960/comfyui-ta-nodes-pack",
+            "files": [
+                "https://github.com/tmode-1960/comfyui-ta-nodes-pack"
+            ],
+            "install_type": "git-clone",
+            "description": "Model loaders with an additional model name output"
+        },
+        {
+            "author": "Shadetail",
+            "title": "Eagleshadow Custom Nodes [REMOVED]",
+            "id": "eagleshadow",
+            "reference": "https://github.com/Shadetail/ComfyUI_Eagleshadow",
+            "files": [
+                "https://github.com/Shadetail/ComfyUI_Eagleshadow"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI by Eagleshadow."
+        },
+        {
+            "author": "manycore-maas",
+            "title": "ComfyUI-SpatialGen [REMOVED]",
+            "reference": "https://github.com/manycore-maas/ComfyUI-SpatialGen",
+            "files": [
+                "https://github.com/manycore-maas/ComfyUI-SpatialGen"
+            ],
+            "install_type": "git-clone",
+            "description": "Scene Viewer of SpatialGen"
+        },
+        {
+            "author": "YinBailiang",
+            "title": "MergeBlockWeighted_fo_ComfyUI [REMOVED]",
+            "id": "mergeblockweighted_fo_comfyui",
+            "reference": "https://github.com/YinBailiang/MergeBlockWeighted_fo_ComfyUI",
+            "files": [
+                "https://github.com/YinBailiang/MergeBlockWeighted_fo_ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: MergeBlockWeighted"
+        },
+        {
+            "author": "facok",
+            "title": "ComfyUI-FokToolset [REMOVED]",
+            "reference": "https://github.com/facok/ComfyUI-FokToolset",
+            "files": [
+                "https://github.com/facok/ComfyUI-FokToolset"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Fok Preprocess Ref Image (Phantom)"
+        },
+        {
+            "author": "Elawphant",
+            "title": "ComfyUI-MusicGen [WIP]",
+            "id": "musicgen",
+            "reference": "https://github.com/Elawphant/ComfyUI-MusicGen",
+            "files": [
+                "https://github.com/Elawphant/ComfyUI-MusicGen"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI for Meta MusicGen."
+        },
+        {
+            "author": "isaac-mcfadyen",
+            "title": "ComfyUI-QwenClip [REMOVED]",
+            "reference": "https://github.com/isaac-mcfadyen/ComfyUI-QwenClip",
+            "files": [
+                "https://github.com/isaac-mcfadyen/ComfyUI-QwenClip"
+            ],
+            "install_type": "git-clone",
+            "description": "A variety of random text encoder tools intended for use with ComfyUI and Qwen Image/Qwen Image Edit. More (may) be added as I try out various modifications to Qwen Image."
+        },
+        {
+            "author": "Gaotian",
+            "title": "KLComfyUI-Nodes [REMOVED]",
+            "reference": "https://github.com/Gaotian-cpu/KLComfyUI-Nodes",
+            "files": [
+                "https://github.com/Gaotian-cpu/KLComfyUI-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Single Video_Img Callback"
+        },
+        {
+            "author": "geltz",
+            "title": "Momentum Guidance for ComfyUI [REMOVED]",
+            "reference": "https://github.com/geltz/ComfyUI-MomentumGuidance",
+            "files": [
+                "https://github.com/geltz/ComfyUI-MomentumGuidance"
+            ],
+            "install_type": "git-clone",
+            "description": "Momentum Guidance (MG) is a training-free guidance method that reduces computational cost by 40% compared to standard guidance techniques like CFG or PAG."
+        },
+        {
+            "author": "GeekyGhost",
+            "title": "Studio42 Image, Audio, and Video Editing Suite for ComfyUI [REMOVED]",
+            "reference": "https://github.com/GeekyGhost/24oiduts-ComfyUI",
+            "files": [
+                "https://github.com/GeekyGhost/24oiduts-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Studio42 is a comprehensive suite of advanced custom nodes that brings professional-grade image and video editing capabilities to ComfyUI. Designed for efficiency, quality, and creative flexibility, this suite provides cutting-edge background removal, layer composition, and patch manipulation tools used in modern VFX and content creation workflows."
+        },
+        {
+            "author": "rvage",
+            "title": "ComfyUI-RvTools-X [REMOVED]",
+            "reference": "https://github.com/r-vage/ComfyUI-RvTools-X",
+            "files": [
+                "https://github.com/r-vage/ComfyUI-RvTools-X"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom nodes and utilities for workflow building, type conversions, checkpoint/pipe loaders and file utilities."
+        },
+        {
+            "author": "heyburns",
+            "title": "LinxUtil [REMOVED]",
+            "reference": "https://github.com/heyburns/LinxUtil",
+            "files": [
+                "https://github.com/heyburns/LinxUtil"
+            ],
+            "install_type": "git-clone",
+            "description": "Utility nodes for ComfyUI. Created solely for my own use case, shared as a courtesy only.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "fcanfora",
+            "title": "comfyui-camera-tools [REMOVED]",
+            "reference": "https://github.com/fcanfora/comfyui-camera-tools",
+            "files": [
+                "https://github.com/fcanfora/comfyui-camera-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Load Camera From File, Load 3D, Load 3D - Animation, Preview 3D, Preview 3D - Animation"
+        },
+        {
+            "author": "ziwang-com",
+            "title": "comfyui-deepseek-r1 [REMOVED]",
+            "reference": "https://github.com/ziwang-com/comfyui-deepseek-r1",
+            "files": [
+                "https://github.com/ziwang-com/comfyui-deepseek-r1"
+            ],
+            "install_type": "git-clone",
+            "description": "Comfyui-deepseek-r1 Node Plugin"
+        },
+        {
+            "author": "leeguandong",
+            "title": "ComfyUI nodes to use Xverse [REMOVED]",
+            "reference": "https://github.com/leeguandong/ComfyUI_Xverse",
+            "files": [
+                "https://github.com/leeguandong/ComfyUI_Xverse"
+            ],
+            "install_type": "git-clone",
+            "description": "The ComfyUI version of [a/XVerse](https://github.com/bytedance/XVerse)"
+        },
+        {
+            "author": "Dehypnotic",
+            "title": "Dehypnotic Save nodes [REMOVED]",
+            "reference": "https://github.com/Dehypnotic/comfyui-dehypnotic-save-nodes",
+            "files": [
+                "https://github.com/Dehypnotic/comfyui-dehypnotic-save-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Save toolkit for audio, image, and video: MP3 audio export with VBR/CBR options, multi-format image saving with workflow/thumbnail metadata, and video + frame encoding (MP4/MKV/WEBM/MOV) — all sharing whitelist-safe paths and rich placeholder templating."
+        },
+        {
+            "author": "znuost10",
+            "title": "comfyui-multi-float-output [REMOVED]",
+            "reference": "https://github.com/znuost10/comfyui-multi-float-output",
+            "files": [
+                "https://github.com/znuost10/comfyui-multi-float-output"
+            ],
+            "install_type": "git-clone",
+            "description": "System monitoring API endpoints for ComfyUI by otoy SKW"
+        },
+        {
+            "author": "rakki194",
+            "title": "ComfyUI_WolfSigmas [UNSAFE/REMOVED]",
+            "reference": "https://github.com/rakki194/ComfyUI_WolfSigmas",
+            "files": [
+                "https://github.com/rakki194/ComfyUI_WolfSigmas"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom nodepack for ComfyUI provides a suite of tools for generating and manipulating sigma schedules for diffusion models. These nodes are particularly useful for fine-tuning the sampling process, experimenting with different step counts, and adapting schedules for specific models.[w/Security Warning: Remote Code Execution]"
+        },
+        {
+            "author": "Maff3u",
+            "title": "MattiaNodes - Points Editor On Cropped [REMOVED]",
+            "reference": "https://github.com/Maff3u/MattiaNodes",
+            "files": [
+                "https://github.com/Maff3u/MattiaNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A standalone ComfyUI custom node for interactive coordinate editing with crop factor correction.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "rakki194",
+            "title": "ComfyUI-ImageCompare [REMOVED]",
+            "reference": "https://github.com/rakki194/ComfyUI-ImageCompare",
+            "files": [
+                "https://github.com/rakki194/ComfyUI-ImageCompare"
+            ],
+            "install_type": "git-clone",
+            "description": "A simple custom node for ComfyUI that allows you to compare two images (or batches of images) side-by-side within the UI."
+        },
+        {
+            "author": "APZmedia",
+            "title": "NormalMapLightEstimator [REMOVED]",
+            "reference": "https://github.com/APZmedia/Comfyui-LightDirection-estimation",
+            "files": [
+                "https://github.com/APZmedia/Comfyui-LightDirection-estimation"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node for estimating light direction and quality from normal maps using luma masking. The system analyzes surface normals to infer lighting information for downstream tasks like adaptive relighting, directional masking, or stylized effects."
+        },
+        {
+            "author": "APZmedia",
+            "title": "ComfyUI APZmedia PSD Tools [REMOVED]",
+            "reference": "https://github.com/APZmedia/APZmedia-ComfyUI-PSDtools",
+            "files": [
+                "https://github.com/APZmedia/APZmedia-ComfyUI-PSDtools"
+            ],
+            "install_type": "git-clone",
+            "description": "This extension provides PSD layer saving functionalities with mask support for ComfyUI."
+        },
+        {
+            "author": "huixingyun",
+            "title": "ComfyUI-HX-Pimg [REMOVED]",
+            "reference": "https://github.com/huixingyun/ComfyUI-HX-Pimg",
+            "files": [
+                "https://github.com/huixingyun/ComfyUI-HX-Pimg"
+            ],
+            "install_type": "git-clone",
+            "description": "Some custom nodes used for pimg (a comfyui controller deployed in huixingyun)."
+        },
+        {
+            "author": "rvage",
+            "title": "ComfyUI-RvToolsX [REMOVED]",
+            "reference": "https://github.com/r-vage/ComfyUI-RvToolsX",
+            "files": [
+                "https://github.com/r-vage/ComfyUI-RvToolsX"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom nodes and utilities for workflow building, type conversions, checkpoint/pipe loaders and file utilities."
+        },
+        {
+            "author": "usman2003",
+            "title": "ComfyUI-RaceDetect [REMOVED]",
+            "reference": "https://github.com/usman2003/ComfyUI-RaceDetect",
+            "files": [
+                "https://github.com/usman2003/ComfyUI-RaceDetect"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Race Detection V2"
+        },
+        {
+            "author": "lihaoyun6",
+            "title": "ComfyUI-CSV-Random-Picker [REMOVED]",
+            "reference": "https://github.com/lihaoyun6/ComfyUI-CSV-Random-Picker",
+            "files": [
+                "https://github.com/lihaoyun6/ComfyUI-CSV-Random-Picker"
+            ],
+            "install_type": "git-clone",
+            "description": "String random picker for ComfyUI"
+        },
+        {
+            "author": "r-vage",
+            "title": "ComfyUI-RvTools_v2 [REMOVED]",
+            "reference": "https://github.com/r-vage/ComfyUI-RvTools_v2",
+            "files": [
+                "https://github.com/r-vage/ComfyUI-RvTools_v2"
+            ],
+            "install_type": "git-clone",
+            "description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
+        },
+        {
+            "author": "Yuxi Liu",
+            "title": "comfyui-ddu [REMOVED]",
+            "reference": "https://github.com/YL-Lyx/Comfyui-ddu-toolchain",
+            "files": [
+                "https://github.com/YL-Lyx/Comfyui-ddu-toolchain"
+            ],
+            "install_type": "git-clone",
+            "description": "ai-driven toolchain for digital design and fabrication "
+        },
+        {
+            "author": "lu64k",
+            "title": "SK-Nodes [REMOVED]",
+            "reference": "https://github.com/lu64k/SK-Nodes",
+            "files": [
+                "https://github.com/lu64k/SK-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:image select, Load AnyLLM, Ask LLM, OpenAI DAlle Node, SK Text_String, SK Random File Name"
+        },
+        {
+            "author": "SiggEye",
+            "title": "FaceCanon — Consistent Faces at Any Resolution [REMOVED]",
+            "reference": "https://github.com/SiggEye/FaceCanon",
+            "files": [
+                "https://github.com/SiggEye/FaceCanon"
+            ],
+            "install_type": "git-clone",
+            "description": "FaceCanon scales a detected face to a canonical pixel size, lets you run your favorite face detailer at that sweet spot, then maps the result back into the original image with seamless blending. The payoff is consistent face style no matter the input resolution or framing."
+        },
+        {
+            "author": "AlfredClark",
+            "title": "ComfyUI-ModelSpec [REMOVED]",
+            "reference": "https://github.com/AlfredClark/ComfyUI-ModelSpec",
+            "files": [
+                "https://github.com/AlfredClark/ComfyUI-ModelSpec"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI model metadata editing nodes."
+        },
+        {
+            "author": "VraethrDalkr",
+            "title": "ComfyUI-ProgressiveBlend [REMOVED]",
+            "reference": "https://github.com/VraethrDalkr/ComfyUI-ProgressiveBlend",
+            "files": [
+                "https://github.com/VraethrDalkr/ComfyUI-ProgressiveBlend"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI that enable progressive blending and color matching effects across image batches/video frames."
+        },
+        {
+            "author": "xmarked-ai",
+            "title": "ComfyUI_misc [REMOVED]",
+            "reference": "https://github.com/xmarked-ai/ComfyUI_misc",
+            "files": [
+                "https://github.com/xmarked-ai/ComfyUI_misc"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Ace IntegerX, Ace FloatX, Ace Color FixX, White Balance X, Depth Displace X, Empty Latent X, KSampler Combo X, ..."
+        },
+        {
+            "author": "sm079",
+            "title": "ComfyUI-Face-Detection [REMOVED]",
+            "reference": "https://github.com/sm079/ComfyUI-Face-Detection",
+            "files": [
+                "https://github.com/sm079/ComfyUI-Face-Detection"
+            ],
+            "install_type": "git-clone",
+            "description": "face detection nodes for comfyui"
+        },
+        {
+            "author": "42lux",
+            "title": "ComfyUI-42lux [REMOVED]",
+            "reference": "https://github.com/42lux/ComfyUI-42lux",
+            "files": [
+                "https://github.com/42lux/ComfyUI-42lux"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI focused on enhanced sampling, model optimization, and quality improvements."
+        },
+        {
+            "author": "lucak5s",
+            "title": "ComfyUI GFPGAN [REMOVED]",
+            "reference": "https://github.com/lucak5s/comfyui_gfpgan",
+            "files": [
+                "https://github.com/lucak5s/comfyui_gfpgan"
+            ],
+            "install_type": "git-clone",
+            "description": "Face restoration with GFPGAN."
+        },
+        {
+            "author": "impactframes",
+            "title": "IF_AI_tools [DEPRECATED]",
+            "id": "impactframes-tools",
+            "reference": "https://github.com/if-ai/ComfyUI-IF_AI_tools",
+            "files": [
+                "https://github.com/if-ai/ComfyUI-IF_AI_tools"
+            ],
+            "install_type": "git-clone",
+            "description": "Various AI tools to use in Comfy UI. Starting with VL and prompt making tools using Ollma as backend will evolve as I find time."
+        },
+        {
+            "author": "netroxin",
+            "title": "comfyui_netro [REMOVED]",
+            "reference": "https://github.com/netroxin/comfyui_netro",
+            "files": [
+                "https://github.com/netroxin/comfyui_netro"
+            ],
+            "install_type": "git-clone",
+            "description": "#Camera Movement Prompt Node for ComfyUI\nThis custom node script for ComfyUI generates descriptive camera movement prompts based on user-selected movement options for Wan2.2"
+        },
+        {
+            "author": "aistudynow",
+            "title": "comfyui-HunyuanImage-2.1 [REMOVED]",
+            "reference": "https://github.com/aistudynow/comfyui-HunyuanImage-2.1",
+            "files": [
+                "https://github.com/aistudynow/comfyui-HunyuanImage-2.1"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Load HunyuanImage DiT, Load HunyuanImage VAE, Load HunyuanImage Dual Text Encoder, HunyuanImage Sampler, HunyuanImage VAE Decode, HunyuanImage CLIP Text Encode, Empty HunyuanImage Latent Image"
+        },
+        {
+            "author": "SlackinJack",
+            "title": "distrifuser_comfyui [DEPRECATED]",
+            "reference": "https://github.com/SlackinJack/distrifuser_comfyui",
+            "files": [
+                "https://github.com/SlackinJack/distrifuser_comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "[a/Distrifuser](https://github.com/mit-han-lab/distrifuser) sampler node for ComfyUI\n"
+        },
+        {
+            "author": "SlackinJack",
+            "title": "asyncdiff_comfyui [DEPRECATED]",
+            "reference": "https://github.com/SlackinJack/asyncdiff_comfyui",
+            "files": [
+                "https://github.com/SlackinJack/asyncdiff_comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "AsyncDiff node for ComfyUI"
+        },
+        {
+            "author": "TheBill2001",
+            "title": "Save Images with Captions [REMOVED]",
+            "reference": "https://github.com/TheBill2001/ComfyUI-Save-Image-Caption",
+            "files": [
+                "https://github.com/TheBill2001/ComfyUI-Save-Image-Caption"
+            ],
+            "install_type": "git-clone",
+            "description": "Provide two custom nodes to load and save images with captions as separate files."
+        },
+        {
+            "author": "ShmuelRonen",
+            "title": "ComfyUI Flux 1.1 Ultra & Raw Node [REMOVED]",
+            "reference": "https://github.com/ShmuelRonen/ComfyUI_Flux_1.1_RAW_API",
+            "files": [
+                "https://github.com/ShmuelRonen/ComfyUI_Flux_1.1_RAW_API"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node for Black Forest Labs' FLUX 1.1 [pro] API, supporting both regular and Ultra modes with optional Raw mode."
+        },
+        {
+            "author": "mattwilliamson",
+            "title": "ComfyUI AI GameDev Nodes [UNSAFE/REMOVED]",
+            "reference": "https://github.com/mattwilliamson/comfyui-ai-gamedev",
+            "files": [
+                "https://github.com/mattwilliamson/comfyui-ai-gamedev"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom ComfyUI nodes for AI-powered game asset generation, providing a comprehensive toolkit for game developers to create 3D models, animations, and audio assets using state-of-the-art AI models.[w/This node pack has an implementation that dynamically generates scripts.]"
+        },
+        {
+            "author": "manifestations",
+            "title": "ComfyUI Outfit Nodes [DEPRECATED]",
+            "reference": "https://github.com/manifestations/comfyui-outfit",
+            "files": [
+                "https://github.com/manifestations/comfyui-outfit"
+            ],
+            "install_type": "git-clone",
+            "description": "Advanced, professional outfit and makeup generation nodes for ComfyUI, with dynamic UI and AI-powered prompt formatting."
+        },
+        {
+            "author": "Poukpalaova",
+            "title": "ComfyUI-FRED-Nodes [DEPRECATED]",
+            "reference": "https://github.com/Poukpalaova/ComfyUI-FRED-Nodes",
+            "files": [
+                "https://github.com/Poukpalaova/ComfyUI-FRED-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Multiple nodes that ease the process.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "cwebbi1",
+            "title": "VoidCustomNodes [REMOVED]",
+            "reference": "https://github.com/cwebbi1/VoidCustomNodes",
+            "files": [
+                "https://github.com/cwebbi1/VoidCustomNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Prompt Parser, String Combiner"
+        },
+        {
+            "author": "Shellishack",
+            "title": "ComfyUI Remote Media Loaders [REMOVED]",
+            "reference": "https://github.com/Shellishack/comfyui-remote-media-loaders",
+            "files": [
+                "https://github.com/Shellishack/comfyui-remote-media-loaders"
+            ],
+            "install_type": "git-clone",
+            "description": "Load media (image/video/audio) from remote URL"
+        },
+       {
+            "author": "D3lUX3I",
+            "title": "VideoPromptEnhancer [REMOVED]",
+            "reference": "https://github.com/D3lUX3I/ComfyUI-VideoPromptEnhancer",
+            "files": [
+                "https://github.com/D3lUX3I/ComfyUI-VideoPromptEnhancer"
+            ],
+            "install_type": "git-clone",
+            "description": "This node generates a professional prompt from an input text for modern video AI models (e.g., Alibaba Wan 2.2) via the OpenRouter API."
+        },
+        {
+            "author": "perilli",
+            "title": "apw_nodes [REMOVED]",
+            "reference": "https://github.com/alessandroperilli/APW_Nodes",
+            "files": [
+                "https://github.com/alessandroperilli/APW_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom node suite to augment the capabilities of the [a/AP Workflows for ComfyUI](https://perilli.com/ai/comfyui/)\nNOTE: See [a/Open Creative Studio Nodes](https://github.com/alessandroperilli/OCS_Nodes)"
+        },
+        {
+            "author": "greengerong",
+            "title": "ComfyUI-Lumina-Video [REMOVED]",
+            "reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
+            "files": [
+                "https://github.com/greengerong/ComfyUI-Lumina-Video"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
+        },
+        {
+            "author": "SatadalAI",
+            "title": "Combined Upscale Node for ComfyUI [REMOVED]",
+            "reference": "https://github.com/SatadalAI/SATA_UtilityNode",
+            "files": [
+                "https://github.com/SatadalAI/SATA_UtilityNode"
+            ],
+            "install_type": "git-clone",
+            "description": "Combined_Upscale is a custom ComfyUI node designed for high-quality image enhancement workflows. It intelligently combines model-based upscaling with efficient CPU-based resizing, offering granular control over output dimensions and quality. Ideal for asset pipelines, UI prototyping, and generative workflows.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "netroxin",
+            "title": "Netro_wildcards [REMOVED]",
+            "reference": "https://github.com/netroxin/comfyui_netro_wildcards",
+            "files": [
+                "https://github.com/netroxin/comfyui_netro_wildcards"
+            ],
+            "install_type": "git-clone",
+            "description": "Since I used 'simple wildcards' from Vanilla and it no longer works with the new Comfy UI version for me, I created an alternative. This CustomNode takes the entire contents of your wildcards-folder(comfyui wildcards) and creates a node for each one."
+        },
+        {
+            "author": "takoyaki1118",
+            "title": "ComfyUI-MangaTools [REMOVED]",
+            "reference": "https://github.com/takoyaki1118/ComfyUI-MangaTools",
+            "files": [
+                "https://github.com/takoyaki1118/ComfyUI-MangaTools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Manga Panel Detector, Manga Panel Dispatcher, GateImage, MangaPageAssembler"
+        },
+        {
+            "author": "lucasgattas",
+            "title": "comfyui-egregora-regional [REMOVED]",
+            "reference": "https://github.com/lucasgattas/comfyui-egregora-regional",
+            "files": [
+                "https://github.com/lucasgattas/comfyui-egregora-regional"
+            ],
+            "install_type": "git-clone",
+            "description": "Image Tile Split with Region-Aware Prompting for ComfyUI"
+        },
+        {
+            "author": "lucasgattas",
+            "title": "comfyui-egregora-tiled [REMOVED]",
+            "reference": "https://github.com/lucasgattas/comfyui-egregora-tiled",
+            "files": [
+                "https://github.com/lucasgattas/comfyui-egregora-tiled"
+            ],
+            "install_type": "git-clone",
+            "description": "Tiled regional prompting + tiled VAE decode with seam-free blending for ComfyUI"
+        },
+        {
+            "author": "Seedsa",
+            "title": "ComfyUI Fooocus Nodes [REMOVED]",
+            "id": "fooocus-nodes",
+            "reference": "https://github.com/Seedsa/Fooocus_Nodes",
+            "files": [
+                "https://github.com/Seedsa/Fooocus_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This extension provides image generation features based on Fooocus."
+        },
+        {
+            "author": "zhilemann",
+            "title": "ComfyUI-moondream2 [REMOVED]",
+            "reference": "https://github.com/zhilemann/ComfyUI-moondream2",
+            "files": [
+                "https://github.com/zhilemann/ComfyUI-moondream2"
+            ],
+            "install_type": "git-clone",
+            "description": "nodes for nightly moondream2 VLM inference\nsupports only captioning and visual queries at the moment"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-textarea-is-shit [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-textarea-is-shit",
+            "files": [
+               "https://github.com/shinich39/comfyui-textarea-is-shit"
+            ],
+            "description": "HTML gives me a textarea like piece of shit.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-poor-textarea [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-poor-textarea",
+            "files": [
+                "https://github.com/shinich39/comfyui-poor-textarea"
+            ],
+            "install_type": "git-clone",
+            "description": "Add commentify, indentation, auto-close brackets in textarea."
+        },
+        {
+            "author": "InfiniNode",
+            "title": "Comfyui-InfiniNode-Model-Suite [UNSAFE/REMOVED]",
+            "reference": "https://github.com/InfiniNode/Comfyui-InfiniNode-Model-Suite",
+            "files": [
+                "https://github.com/InfiniNode/Comfyui-InfiniNode-Model-Suite"
+            ],
+            "install_type": "git-clone",
+            "description": "Welcome to the InfiniNode Model Suite, a custom node pack for ComfyUI that transforms the process of manipulating generative AI models. Our suite is a direct implementation of the 'GUI-Based Key Converter Development Plan,' designed to remove technical barriers for advanced AI practitioners and integrate seamlessly with existing image generation pipelines.[w/This node pack contains a node that has a vulnerability allowing write to arbitrary file paths.]"
+        },
+        {
+            "author": "Avalre",
+            "title": "ComfyUI-avaNodes [REMOVED]",
+            "reference": "https://github.com/Avalre/ComfyUI-avaNodes",
+            "files": [
+                "https://github.com/Avalre/ComfyUI-avaNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "These nodes were created to personalize/optimize several ComfyUI nodes for my own use. You can replicate the functionality of most of my nodes by some combination of default ComfyUI nodes and custom nodes from other developers."
+        },
+        {
+            "author": "Alectriciti",
+            "title": "comfyui-creativeprompts [REMOVED]",
+            "reference": "https://github.com/Alectriciti/comfyui-creativeprompts",
+            "files": [
+                "https://github.com/Alectriciti/comfyui-creativeprompts"
+            ],
+            "install_type": "git-clone",
+            "description": "A creative alternative to dynamicprompts"
+        },
+        {
+            "author": "flybirdxx",
+            "title": "ComfyUI Sliding Window [REMOVED]",
+            "reference": "https://github.com/PixWizardry/ComfyUI_Sliding_Window",
+            "files": [
+                "https://github.com/PixWizardry/ComfyUI_Sliding_Window"
+            ],
+            "install_type": "git-clone",
+            "description": "This set of nodes provides a powerful sliding window or 'tiling' technique for processing long videos and animations in ComfyUI. It allows you to work on animations that are longer than your VRAM would typically allow by breaking the job into smaller, overlapping chunks and seamlessly blending them back together."
+        },
+        {
+            "author": "SykkoAtHome",
+            "title": "Sykko Tools for ComfyUI [REMOVED]",
+            "reference": "https://github.com/SykkoAtHome/ComfyUI_SykkoTools",
+            "files": [
+                "https://github.com/SykkoAtHome/ComfyUI_SykkoTools"
+             ],
+             "install_type": "git-clone",
+             "description": "Utilities for working with camera animations inside ComfyUI. The repository currently provides a node for loading camera motion from ASCII FBX files and a corresponding command line helper for debugging."
+        },
+        {
+            "author": "hananbeer",
+            "title": "node_dev - ComfyUI Node Development Helper [REMOVED]",
+            "reference": "https://github.com/hananbeer/node_dev",
+            "files": [
+                "https://github.com/hananbeer/node_dev"
+            ],
+            "install_type": "git-clone",
+            "description": "Browse to this endpoint to reload custom nodes for more streamlined development:\nhttp://127.0.0.1:8188/node_dev/reload/<module_name>"
+        },
+        {
+            "author": "Charonartist",
+            "title": "Comfyui_gemini_tts_node [REMOVED]",
+            "reference": "https://github.com/Charonartist/Comfyui_gemini_tts_node",
+            "files": [
+                "https://github.com/Charonartist/Comfyui_gemini_tts_node"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node is a ComfyUI node for generating speech from text using the Gemini 2.5 Flash Preview TTS API."
+        },
+        {
+            "author": "squirrel765",
+            "title": "lorasubdirectory [REMOVED]",
+            "reference": "https://github.com/andrewsthomasj/lorasubdirectory",
+            "files": [
+                "https://github.com/andrewsthomasj/lorasubdirectory"
+            ],
+            "install_type": "git-clone",
+            "description": "only show dropdown of loras ina a given subdirectory"
+        },
+        {
+            "author": "shingo1228",
+            "title": "ComfyUI-send-Eagle(slim) [REVMOED]",
+            "id": "send-eagle",
+            "reference": "https://github.com/shingo1228/ComfyUI-send-eagle-slim",
+            "files": [
+                "https://github.com/shingo1228/ComfyUI-send-eagle-slim"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Send Webp Image to Eagle. This is an extension node for ComfyUI that allows you to send generated images in webp format to Eagle. This extension node is a re-implementation of the Eagle linkage functions of the previous ComfyUI-send-Eagle node, focusing on the functions required for this node."
+        },
+        {
+            "author": "shingo1228",
+            "title": "ComfyUI-SDXL-EmptyLatentImage [REVMOED]",
+            "id": "sdxl-emptylatent",
+            "reference": "https://github.com/shingo1228/ComfyUI-SDXL-EmptyLatentImage",
+            "files": [
+                "https://github.com/shingo1228/ComfyUI-SDXL-EmptyLatentImage"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:SDXL Empty Latent Image. An extension node for ComfyUI that allows you to select a resolution from the pre-defined json files and output a Latent Image."
+        },
+        {
+            "author": "chaunceyyann",
+            "title": "ComfyUI Image Processing Nodes [REMOVED]",
+            "reference": "https://github.com/chaunceyyann/comfyui-image-processing-nodes",
+            "files": [
+                "https://github.com/chaunceyyann/comfyui-image-processing-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI focused on image processing operations."
+        },
+        {
+            "author": "OgreLemonSoup",
+            "title": "Gallery&Tabs [DEPRECATED]",
+            "id": "LoadImageGallery",
+            "reference": "https://github.com/OgreLemonSoup/ComfyUI-Load-Image-Gallery",
+            "files": [
+                "https://github.com/OgreLemonSoup/ComfyUI-Load-Image-Gallery"
+            ],
+            "install_type": "git-clone",
+            "description": "Adds a gallery to the Load Image node and tabs for Load Checkpoint/Lora/etc nodes"
+        },
+        {
+            "author": "11dogzi",
+            "title": "Qwen-Image ComfyUI [REMOVED]",
+            "reference": "https://github.com/11dogzi/Comfyui-Qwen-Image",
+            "files": [
+                "https://github.com/11dogzi/Comfyui-Qwen-Image"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a custom node package that integrates the Qwen-Image model into ComfyUI."
+        },
+        {
+            "author": "BAIS1C",
+            "title": "ComfyUI-AudioDuration [REMOVED]",
+            "reference": "https://github.com/BAIS1C/ComfyUI_BASICDancePoser",
+            "files": [
+                "https://github.com/BAIS1C/ComfyUI_BASICDancePoser"
+            ],
+            "install_type": "git-clone",
+            "description": "Node to extract Dance poses from Music to control Video Generations.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "BAIS1C",
+            "title": "ComfyUI_BASICSAdvancedDancePoser [REMOVED]",
+            "reference": "https://github.com/BAIS1C/ComfyUI_BASICSAdvancedDancePoser",
+            "files": [
+                "https://github.com/BAIS1C/ComfyUI_BASICSAdvancedDancePoser"
+            ],
+            "install_type": "git-clone",
+            "description": "Professional COCO-WholeBody 133-keypoint dance animation system for ComfyUI"
+        },
+        {
+            "author": "fablestudio",
+            "title": "ComfyUI-Showrunner-Utils [REMOVED]",
+            "reference": "https://github.com/fablestudio/ComfyUI-Showrunner-Utils",
+            "files": [
+                "https://github.com/fablestudio/ComfyUI-Showrunner-Utils"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Align Face, Generate Timestamp, GetMostCommonColors, Alpha Crop and Position Image, Shrink Image"
+        },
         {
             "author": "skayka",
-            "title": "ComfyUI-DreamFit []REMOVED]",
+            "title": "ComfyUI-DreamFit [REMOVED]",
             "reference": "https://github.com/skayka/ComfyUI-DreamFit",
             "files": [
                 "https://github.com/skayka/ComfyUI-DreamFit"

node_db/new/model-list.json

@@ -1,5 +1,106 @@
 {
   "models": [
+
+    {
+      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_high_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_low_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_high_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_low_noise_14B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp16.safetensors",
+      "size": "28.6GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp8_scaled)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp8_scaled)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+      "size": "14.3GB"
+    },
+    {
+      "name": "Comfy-Org/Wan2.2 ti2v 5B (fp16)",
+      "type": "diffusion_model",
+      "base": "Wan2.2",
+      "save_path": "diffusion_models/Wan2.2",
+      "description": "Wan2.2 diffusion model for ti2v 5B (fp16)",
+      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
+      "filename": "wan2.2_ti2v_5B_fp16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_ti2v_5B_fp16.safetensors",
+      "size": "10.0GB"
+    },
+
     {
       "name": "sam2.1_hiera_tiny.pt",
       "type": "sam2.1",
@@ -586,109 +687,6 @@
       "filename": "llava_llama3_fp16.safetensors",
       "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
       "size": "16.1GB"
-    },
-
-    {
-      "name": "PixArt-Sigma-XL-2-512-MS.safetensors (diffusion)",
-      "type": "diffusion_model",
-      "base": "pixart-sigma",
-      "save_path": "diffusion_models/PixArt-Sigma",
-      "description": "PixArt-Sigma Diffusion model",
-      "reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS",
-      "filename": "PixArt-Sigma-XL-2-512-MS.safetensors",
-      "url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
-      "size": "2.44GB"
-    },
-    {
-      "name": "PixArt-Sigma-XL-2-1024-MS.safetensors (diffusion)",
-      "type": "diffusion_model",
-      "base": "pixart-sigma",
-      "save_path": "diffusion_models/PixArt-Sigma",
-      "description": "PixArt-Sigma Diffusion model",
-      "reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS",
-      "filename": "PixArt-Sigma-XL-2-1024-MS.safetensors",
-      "url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
-      "size": "2.44GB"
-    },
-    {
-      "name": "PixArt-XL-2-1024-MS.safetensors (diffusion)",
-      "type": "diffusion_model",
-      "base": "pixart-alpha",
-      "save_path": "diffusion_models/PixArt-Alpha",
-      "description": "PixArt-Alpha Diffusion model",
-      "reference": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS",
-      "filename": "PixArt-XL-2-1024-MS.safetensors",
-      "url": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
-      "size": "2.45GB"
-    },
-    
-    {
-      "name": "Comfy-Org/hunyuan_video_t2v_720p_bf16.safetensors",
-      "type": "diffusion_model",
-      "base": "Hunyuan Video",
-      "save_path": "diffusion_models/hunyuan_video",
-      "description": "Huyuan Video diffusion model. repackaged version.",
-      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
-      "filename": "hunyuan_video_t2v_720p_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_t2v_720p_bf16.safetensors",
-      "size": "25.6GB"
-    },
-    {
-      "name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
-      "type": "VAE",
-      "base": "Hunyuan Video",
-      "save_path": "VAE",
-      "description": "Huyuan Video VAE model. repackaged version.",
-      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
-      "filename": "hunyuan_video_vae_bf16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
-      "size": "493MB"
-    },
-
-    {
-      "name": "LTX-Video 2B v0.9.1 Checkpoint",
-      "type": "checkpoint",
-      "base": "LTX-Video",
-      "save_path": "checkpoints/LTXV",
-      "description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
-      "reference": "https://huggingface.co/Lightricks/LTX-Video",
-      "filename": "ltx-video-2b-v0.9.1.safetensors",
-      "url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
-      "size": "5.72GB"
-    },
-
-    {
-      "name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
-      "type": "controlnet",
-      "base": "FLUX.1",
-      "save_path": "xlabs/controlnets",
-      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
-      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
-      "filename": "flux-canny-controlnet-v3.safetensors",
-      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-canny-controlnet-v3.safetensors",
-      "size": "1.49GB"
-    },
-    {
-      "name": "XLabs-AI/flux-depth-controlnet-v3.safetensors",
-      "type": "controlnet",
-      "base": "FLUX.1",
-      "save_path": "xlabs/controlnets",
-      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
-      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
-      "filename": "flux-depth-controlnet-v3.safetensors",
-      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-depth-controlnet-v3.safetensors",
-      "size": "1.49GB"
-    },
-    {
-      "name": "XLabs-AI/flux-hed-controlnet-v3.safetensors",
-      "type": "controlnet",
-      "base": "FLUX.1",
-      "save_path": "xlabs/controlnets",
-      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
-      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
-      "filename": "flux-hed-controlnet-v3.safetensors",
-      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-hed-controlnet-v3.safetensors",
-      "size": "1.49GB"
     }
   ]
 }

node_db/tutorial/custom-node-list.json

@@ -10,6 +10,16 @@
             "install_type": "git-clone",
             "description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
         },
+        {
+            "author": "comfyui-wiki",
+            "title": "ComfyUI-i18n-demo",
+            "reference": "https://github.com/comfyui-wiki/ComfyUI-i18n-demo",
+            "files": [
+                "https://github.com/comfyui-wiki/ComfyUI-i18n-demo"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom node develop i18n support demo "
+        },
         {
             "author": "Suzie1",
             "title": "Guide To Making Custom Nodes in ComfyUI",
@@ -341,6 +351,26 @@
             ],
             "install_type": "git-clone",
             "description": "A minimal test suite demonstrating how remote COMBO inputs behave in ComfyUI, with and without force_input"
+        },
+        {
+            "author": "J1mB091",
+            "title": "ComfyUI-J1mB091 Custom Nodes",
+            "reference": "https://github.com/J1mB091/ComfyUI-J1mB091",
+            "files": [
+                "https://github.com/J1mB091/ComfyUI-J1mB091"
+            ],
+            "install_type": "git-clone",
+            "description": "Vibe Coded ComfyUI Custom Nodes"
+        },
+        {
+            "author": "aiforhumans",
+            "title": "XDev Nodes - Complete Toolkit",
+            "reference": "https://github.com/aiforhumans/comfyui-xdev-nodes",
+            "files": [
+                "https://github.com/aiforhumans/comfyui-xdev-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Complete ComfyUI development toolkit with 8 professional nodes including VAE tools, universal type testing, and comprehensive debugging infrastructure."
         }
     ]
 }

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,10 +12,13 @@ import ast
 import logging
 import traceback
 
-from .common import security_check
+glob_path = os.path.join(os.path.dirname(__file__), "glob")
-from .common import manager_util
+sys.path.append(glob_path)
-from .common import cm_global
+
-from .common import manager_downloader
+import security_check
+import manager_util
+import cm_global
+import manager_downloader
 import folder_paths
 
 manager_util.add_python_path_to_env()
@@ -63,14 +66,16 @@ def is_import_failed_extension(name):
 comfy_path = os.environ.get('COMFYUI_PATH')
 comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
 
+if comfy_path is None:
+    # 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__))
-    os.environ['COMFYUI_PATH'] = comfy_path
 
 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)
@@ -86,6 +91,9 @@ manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.lis
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
 manager_config_path = os.path.join(manager_files_path, 'config.ini')
 
+cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
+
+
 default_conf = {}
 
 def read_config():
@@ -392,11 +400,7 @@ try:
         def emit(self, record):
             global is_start_mode
 
-            try:
+            message = record.getMessage()
-                message = record.getMessage()
-            except Exception as e:
-                message = f"<<logging error>>: {record} - {e}"
-                original_stderr.write(message)
 
             if is_start_mode:
                 match = re.search(pat_import_fail, message)
@@ -439,6 +443,35 @@ except Exception as e:
     print(f"[ComfyUI-Manager] Logging failed: {e}")
 
 
+def ensure_dependencies():
+    try:
+        import git     # noqa: F401
+        import toml    # noqa: F401
+        import rich    # noqa: F401
+        import chardet # noqa: F401
+    except ModuleNotFoundError:
+        my_path = os.path.dirname(__file__)
+        requirements_path = os.path.join(my_path, "requirements.txt")
+
+        print("## ComfyUI-Manager: installing dependencies. (GitPython)")
+        try:
+            subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
+        except subprocess.CalledProcessError:
+            print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+            try:
+                subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
+            except subprocess.CalledProcessError:
+                print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+
+    try:
+        print("## ComfyUI-Manager: installing dependencies done.")
+    except:
+        # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
+        print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+
+ensure_dependencies()
+
+
 print("** ComfyUI startup time:", current_timestamp())
 print("** Platform:", platform.system())
 print("** Python version:", sys.version)
@@ -462,7 +495,7 @@ def read_downgrade_blacklist():
             items = [x.strip() for x in items if x != '']
             cm_global.pip_downgrade_blacklist += items
             cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
-    except Exception:
+    except:
         pass
 
 
@@ -568,10 +601,7 @@ if os.path.exists(restore_snapshot_path):
         if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
             new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
 
-        if 'COMFYUI_PATH' not in new_env:
+        cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
-            new_env['COMFYUI_PATH'] = os.path.dirname(folder_paths.__file__)
-
-        cmd_str = [sys.executable, '-m', 'comfyui_manager.cm_cli', 'restore-snapshot', restore_snapshot_path]
         exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
 
         if exit_code != 0:

pyproject.toml

@@ -1,65 +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.10"
-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"
+version = "3.37"
-keywords = ["comfyui", "comfyui-manager"]
+license = { file = "LICENSE.txt" }
-
+dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
-maintainers = [
-  { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
-  { name = "Yoland Yan", email = "yoland@comfy.org" },
-  { name = "James Kwon", email = "hongilkwon316@gmail.com" },
-  { name = "Robin Huang", email = "robin@comfy.org" },
-]
-
-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"]
 
 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
+#  Used by Comfy Registry https://comfyregistry.org
 
-[tool.setuptools.packages.find]
+[tool.comfy]
-where = ["."]
+PublisherId = "drltdata"
-include = ["comfyui_manager*"]
+DisplayName = "ComfyUI-Manager"
-
+Icon = ""
-[project.scripts]
-cm-cli = "comfyui_manager.cm_cli.__main__:main"
-
-[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)
-]

requirements.txt

@@ -2,7 +2,7 @@ GitPython
 PyGithub
 matrix-nio
 transformers
-huggingface-hub>0.20
+huggingface-hub
 typer
 rich
 typing-extensions

scanner.py

@@ -13,7 +13,7 @@ builtin_nodes = set()
 import sys
 
 from urllib.parse import urlparse
-from github import Github
+from github import Github, Auth
 
 
 def download_url(url, dest_folder, filename=None):
@@ -53,7 +53,8 @@ skip_update = '--skip-update' in sys.argv or '--skip-all' in sys.argv
 skip_stat_update = '--skip-stat-update' in sys.argv or '--skip-all' in sys.argv
 
 if not skip_stat_update:
-    g = Github(os.environ.get('GITHUB_TOKEN'))
+    auth = Auth.Token(os.environ.get('GITHUB_TOKEN'))
+    g = Github(auth=auth)
 else:
     g = None
 
@@ -94,7 +95,7 @@ def extract_nodes(code_text):
             return s
         else:
             return set()
-    except Exception:
+    except:
         return set()
 
 
@@ -396,7 +397,7 @@ def update_custom_nodes():
 
         try:
             download_url(url, temp_dir)
-        except Exception:
+        except:
             print(f"[ERROR] Cannot download '{url}'")
 
     with concurrent.futures.ThreadPoolExecutor(10) as executor:

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