fixed: close dialogs before restart

fixed: visual bug

.gitignore

@@ -17,3 +17,4 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
+/venv/

README.md

@@ -2,15 +2,13 @@
 
 **ComfyUI-Manager** is an extension designed to enhance the usability of [ComfyUI](https://github.com/comfyanonymous/ComfyUI). It offers management functions to **install, remove, disable, and enable** various custom nodes of ComfyUI. Furthermore, this extension provides a hub feature and convenience functions to access a wide range of information within ComfyUI.
 
-![menu](misc/menu.jpg)
+![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
-* V2.48.1: Security policy has been changed. Downloads of models in the list are allowed under the 'normal' security level.
+* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
-* V2.47: Security policy has been changed. The former 'normal' is now 'normal-', and 'normal' no longer allows high-risk features, even if your ComfyUI is local.
+* V3.10: `double-click feature` is removed
-* V2.37 Show a ✅ mark to accounts that have been active on GitHub for more than six months.
+  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
-* V2.33 Security policy is applied.
+* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
-* V2.21 [cm-cli](docs/en/cm-cli.md) tool is added.
-* V2.18 to V2.18.3 is not functioning due to a severe bug. Users on these versions are advised to promptly update to V2.18.4. Please navigate to the `ComfyUI/custom_nodes/ComfyUI-Manager` directory and execute `git pull` to update.
 * You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
 
 ## Installation
@@ -20,7 +18,7 @@
 To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
 
 1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
-2. `git clone https://github.com/ltdrdata/ComfyUI-Manager.git`
+2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
 3. Restart ComfyUI
 
 
@@ -30,9 +28,10 @@ To install ComfyUI-Manager in addition to an existing installation of ComfyUI, y
 - standalone version  
 - select option: use windows default console window
 2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
+- Don't click. Right click the link and use save as...
 3. double click `install-manager-for-portable-version.bat` batch file
 
-![portable-install](misc/portable-install.png)
+![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.)  
@@ -55,6 +54,7 @@ python -m venv venv
 pip install comfy-cli
 comfy install
 ```
+* See also: https://github.com/Comfy-Org/comfy-cli
 
 
 ### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
@@ -63,20 +63,19 @@ To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you c
 * **prerequisite: python-is-python3, python3-venv, git**
 
 1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
+- Don't click. Right click the link and use save as...
 - ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
 2. `chmod +x install-comfyui-venv-linux.sh`
 3. `./install-comfyui-venv-linux.sh`
 
 ### Installation Precautions
-* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/ComfyUI-Manager`
+* **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`.
-  * You have to move `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager` to `ComfyUI/custom_nodes/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.
+  * 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 have to rename `ComfyUI/custom_nodes/ComfyUI-Manager-main` to `ComfyUI/custom_nodes/ComfyUI-Manager`
 
 
 You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
@@ -87,42 +86,17 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 * Support for basic installation of ComfyUI-Manager
 * Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
 
-## Changes
-* **2.38** `Install Custom Nodes` menu is changed to `Custom Nodes Manager`.
-* **2.21** [cm-cli](docs/en/cm-cli.md) tool is added.
-* **2.4** Copy the connections of the nearest node by double-clicking.
-* **2.2.3** Support Components System
-* **0.29** Add `Update all` feature
-* **0.25** support db channel
-  * You can directly modify the db channel settings in the `config.ini` file.
-  * If you want to maintain a new DB channel, please modify the `channels.list` and submit a PR.
-* **0.23** support multiple selection
-* **0.18.1** `skip update check` feature added.
-  * A feature that allows quickly opening windows in environments where update checks take a long time.
-* **0.17.1** Bug fix for the issue where enable/disable of the web extension was not working. Compatibility patch for StableSwarmUI.
-  * Requires latest version of ComfyUI (Revision: 1240)
-* **0.17** Support preview method setting feature.
-* **0.14** Support robust update.
-* **0.13** Support additional 'pip' section for install spec.
-* **0.12** Better installation support for Windows.
-* **0.9** Support keyword search in installer menu.
-* **V0.7.1** Bug fix for the issue where updates were not being applied on Windows.
-  * **For those who have been using versions 0.6, please perform a manual git pull in the custom_nodes/ComfyUI-Manager directory.**
-* **V0.7** To address the issue of a slow list refresh, separate the fetch update and update check processes.
-* **V0.6** Support extension installation for missing nodes.
-* **V0.5** Removed external git program dependencies.
-
 
 ## How To Use
 
 1. Click "Manager" button on main menu
 
-    ![mainmenu](misc/main.jpg)
+    ![mainmenu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg)
 
 
 2. If you click on 'Install Custom Nodes' or 'Install Models', an installer dialog will open.
 
-    ![menu](misc/menu.jpg)
+    ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
     * There are three DB modes: `DB: Channel (1day cache)`, `DB: Local`, and `DB: Channel (remote)`. 
       * `Channel (1day cache)` utilizes Channel cache information with a validity period of one day to quickly display the list.
@@ -138,9 +112,9 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 3. Click 'Install' or 'Try Install' button.
 
-    ![node-install-dialog](misc/custom-nodes.jpg)
+    ![node-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/custom-nodes.jpg)
 
-    ![model-install-dialog](misc/models.png)
+    ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/models.jpg)
 
     * Installed: This item is already installed.
     * Install: Clicking this button will install the item.
@@ -150,39 +124,54 @@ This repository provides Colab notebooks that allow you to install and use Comfy
       * Channel settings have a broad impact, affecting not only the node list but also all functions like "Update all."
     * Conflicted Nodes with a yellow background show a list of nodes conflicting with other extensions in the respective extension. This issue needs to be addressed by the developer, and users should be aware that due to these conflicts, some nodes may not function correctly and may need to be installed accordingly.
 
-4. If you set the `Badge:` item in the menu as `Badge: Nickname`, `Badge: Nickname (hide built-in)`, `Badge: #ID Nickname`, `Badge: #ID Nickname (hide built-in)` the information badge will be displayed on the node.
+4. Share
-    * When selecting (hide built-in), it hides the 🦊 icon, which signifies built-in nodes.
+  ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg) ![share](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share.jpg) 
-      * Nodes without any indication on the badge are custom nodes that Manager cannot recognize.
-    * `Badge: Nickname` displays the nickname of custom nodes, while `Badge: #ID Nickname` also includes the internal ID of the node.
-
-    ![model-install-dialog](misc/nickname.jpg)
-
-
-5. Share
-  ![menu](misc/main.jpg) ![share](misc/share.jpg) 
 
   * You can share the workflow by clicking the Share button at the bottom of the main menu or selecting Share Output from the Context Menu of the Image node.
   * Currently, it supports sharing via [https://comfyworkflows.com/](https://comfyworkflows.com/),
     [https://openart.ai](https://openart.ai/workflows/dev), [https://youml.com](https://youml.com) 
     as well as through the Matrix channel.
 
-  ![menu](misc/share-setting.jpg)
+  ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share-setting.jpg)
   
-  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Ouput button on Context Menu.
+  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Output button on Context Menu.
     * `None`: hide from Main menu
     * `All`: Show a dialog where the user can select a title for sharing.
 
 
+## Paths
+In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.
+
+* <USER_DIRECTORY>  
+  * If executed without any options, the path defaults to ComfyUI/user.  
+  * It can be set using --user-directory <USER_DIRECTORY>.  
+
+* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
+* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
+* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
+* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
+
+
+## `extra_model_paths.yaml` Configuration
+The following settings are applied based on the section marked as `is_default`.
+
+* `custom_nodes`: Path for installing custom nodes
+    * Importing does not need to adhere to the path set as `is_default`, but this is the path where custom nodes are installed by the `ComfyUI Nodes Manager`.
+* `download_model_base`: Path for downloading models
+
+
 ## Snapshot-Manager
 * When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
-  * Snapshot file dir: `ComfyUI-Manager/snapshots`
+  * Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
   * You can rename snapshot file.
 * Press the "Restore" button to revert to the installation status of the respective snapshot.
   * However, for custom nodes not managed by Git, snapshot support is incomplete.
 * When you press `Restore`, it will take effect on the next ComfyUI startup.
-  * The selected snapshot file is saved in `ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
+  * The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
 
-![model-install-dialog](misc/snapshot.jpg)
+![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
@@ -199,48 +188,18 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 ## Custom node support guide
 
-* Currently, the system operates by cloning the git repository and sequentially installing the dependencies listed in requirements.txt using pip, followed by invoking the install.py script. In the future, we plan to discuss and determine the specifications for supporting custom nodes.
+* **NOTICE:**
+    - You should no longer assume that the GitHub repository name will match the subdirectory name under `custom_nodes`. The name of the subdirectory under `custom_nodes` will now use the normalized name from the `name` field in `pyproject.toml`.
+    - Avoid relying on directory names for imports whenever possible.
 
-* Please submit a pull request to update either the custom-node-list.json or model-list.json file.
+* https://docs.comfy.org/registry/overview
+* https://github.com/Comfy-Org/rfcs
 
-* The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
+**Special purpose files** (optional)
-
+  * `pyproject.toml` - Spec file for comfyregistry.
-```
-NODE_CLASS_MAPPINGS = {
-    "ExecutionSwitch": ExecutionSwitch,
-    "ExecutionBlocker": ExecutionBlocker,
-    ...
-}
-
-NODE_CLASS_MAPPINGS.update({
-    "UniFormer-SemSegPreprocessor": Uniformer_SemSegPreprocessor,
-    "SemSegPreprocessor": Uniformer_SemSegPreprocessor,
-})
-```
-  * Or you can provide manually `node_list.json` file.
-
-* When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
-  * Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
-  * The `nickname` will be the name displayed on the badge of the node.
-  * If there is no `nickname`, it will be truncated to 20 characters from the arbitrarily written title and used.
-```
-"""
-@author: Dr.Lt.Data
-@title: Impact Pack
-@nickname: Impact Pack
-@description: This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler.
-"""
-```
-
-
-* **Special purpose files** (optional)
   * `node_list.json` - When your custom nodes pattern of NODE_CLASS_MAPPINGS is not conventional, it is used to manually provide a list of nodes for reference. ([example](https://github.com/melMass/comfy_mtb/raw/main/node_list.json))
   * `requirements.txt` - When installing, this pip requirements will be installed automatically 
   * `install.py` - When installing, it is automatically called
-  * `uninstall.py` - When uninstalling, it is automatically called
-  * `disable.py` - When disabled, it is automatically called
-    * When installing a custom node setup `.js` file, it is recommended to write this script for disabling.
-  * `enable.py` - When enabled, it is automatically called
   * **All scripts are executed from the root path of the corresponding custom node.**
 
 
@@ -259,12 +218,12 @@ NODE_CLASS_MAPPINGS.update({
     }
     ```
   * `<current timestamp>` Ensure that the timestamp is always unique.
-    * "components" should have the same structure as the content of the file stored in ComfyUI-Manager/components.
+    * "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.
           * `<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 ComfyUI-Manager/components.
+          * `<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`.
           * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
           ```
               "version":"1.0",
@@ -281,13 +240,32 @@ NODE_CLASS_MAPPINGS.update({
 
 ## Support of missing nodes installation
 
-![missing-menu](misc/missing-menu.jpg)
+![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-menu.jpg)
 
 * When you click on the ```Install Missing Custom Nodes``` button in the menu, it displays a list of extension nodes that contain nodes not currently present in the workflow.
 
-![missing-list](misc/missing-list.jpg)
+![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
 
 
+# Config
+* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
+    * The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
+    * See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
+* Configuration options:
+    ```
+    [default]
+    git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
+    use_uv = <Use uv instead of pip for dependency installation.>
+    channel_url = https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
+    bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
+    file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
+    windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
+    model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
+    downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
+    security_level = <Set the security level.>
+    always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
+    ```
+
 ## 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`.
@@ -323,6 +301,7 @@ NODE_CLASS_MAPPINGS.update({
 * If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
   * This option can be used if performance issues occur in a Colab+GDrive environment.
 
+
 ## Scanner
 When you run the `scan.sh` script:
 
@@ -339,17 +318,14 @@ 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 ComfyUI-Manager/config.ini file that is generated.
+* 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`.
- * Alternatively, download the update-fix.py script from [update-fix.py](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/update-fix.py) and place it in the ComfyUI-Manager directory. Then, run it using your Python command.
-   For the portable version, use `..\..\..\python_embeded\python.exe update-fix.py`.
-* For cases where nodes like `PreviewTextNode` from `ComfyUI_Custom_Nodes_AlekPet` are only supported as front-end nodes, we currently do not provide missing nodes for them.
-* Currently, `vid2vid` is not being updated, causing compatibility issues.
 * 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.
   * Edit `config.ini` file: add `bypass_ssl = True`
 
+
 ## Security policy
   * Edit `config.ini` file: add `security_level = <LEVEL>`
     * `strong`
@@ -378,41 +354,6 @@ When you run the `scan.sh` script:
     * Update ComfyUI
 
 
-## TODO: Unconventional form of custom node list
-
-* https://github.com/diontimmer/Sample-Diffusion-ComfyUI-Extension
-* https://github.com/senshilabs/NINJA-plugin
-* https://github.com/MockbaTheBorg/Nodes
-* https://github.com/StartHua/Comfyui_GPT_Story
-* https://github.com/NielsGercama/comfyui_customsampling
-* https://github.com/wrightdaniel2017/ComfyUI-VideoLipSync
-* https://github.com/bxdsjs/ComfyUI-Image-preprocessing
-* https://github.com/SMUELDigital/ComfyUI-ONSET
-* https://github.com/SimithWang/comfyui-renameImages
-* https://github.com/icefairy64/comfyui-model-tilt
-* https://github.com/andrewharp/ComfyUI-EasyNodes
-* https://github.com/SimithWang/comfyui-renameImages
-* https://github.com/Tcheko243/ComfyUI-Photographer-Alpha7-Nodes
-* https://github.com/Limbicnation/ComfyUINodeToolbox
-* https://github.com/APZmedia/ComfyUI-APZmedia-srtTools
-
-## Roadmap
-
-- [x] System displaying information about failed custom nodes import.
-- [x] Guide for missing nodes in ComfyUI vanilla nodes.
-- [x] Collision checking system for nodes with the same ID across extensions.
-- [x] Template sharing system. (-> Component system based on Group Nodes)
-- [x] 3rd party API system.
-- [ ] Auto migration for custom nodes with changed structures.
-- [ ] Version control feature for nodes.
-- [ ] List of currently used custom nodes.
-- [x] Download support multiple model download.
-- [x] Model download via url.
-- [x] List sorting (custom nodes).
-- [x] List sorting (model).
-- [ ] Provides description of node.
-
-
 # Disclaimer
 
 * This extension simply provides the convenience of installing custom nodes and does not guarantee their proper functioning.

cm-cli.py

@@ -12,6 +12,7 @@ from rich import print
 from typing_extensions import List, Annotated
 import re
 import git
+import importlib
 
 
 sys.path.append(os.path.dirname(__file__))
@@ -19,12 +20,16 @@ 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:
     try:
         import folder_paths
         comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
     except:
+        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
         comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
 sys.path.append(comfy_path)
@@ -35,15 +40,7 @@ import manager_core as core
 from manager_core import unified_manager
 import cnr_utils
 
-
-
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
-comfy_path = os.environ.get('COMFYUI_PATH')
-
-if comfy_path is None:
-    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(comfyui_manager_path, '..', '..'))
-
 
 cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
@@ -70,9 +67,8 @@ core.check_invalid_nodes()
 def read_downgrade_blacklist():
     try:
         import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
         config = configparser.ConfigParser()
-        config.read(config_path)
+        config.read(core.manager_config.path)
         default_conf = config['default']
 
         if 'downgrade_blacklist' in default_conf:
@@ -88,12 +84,21 @@ read_downgrade_blacklist()  # This is a preparation step for manager_core
 
 
 class Ctx:
+    folder_paths = None
+    
     def __init__(self):
         self.channel = 'default'
         self.no_deps = False
         self.mode = 'cache'
         self.user_directory = None
-        self.custom_nodes_paths = [os.path.join(core.comfy_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:
+            try:
+                Ctx.folder_paths = importlib.import_module('folder_paths')
+            except ImportError:
+                print("Warning: Unable to import folder_paths module")
 
     def set_channel_mode(self, channel, mode):
         if mode is not None:
@@ -110,7 +115,7 @@ class Ctx:
         if channel is not None:
             self.channel = channel
 
-        asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache'))
+        asyncio.run(unified_manager.reload(cache_mode=self.mode, dont_wait=False))
         asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
 
     def set_no_deps(self, no_deps):
@@ -127,9 +132,9 @@ class Ctx:
         core.update_user_directory(user_directory)
 
         if os.path.exists(core.manager_pip_overrides_path):
-            cm_global.pip_overrides = {'numpy': 'numpy<2'}
             with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
                 cm_global.pip_overrides = json.load(json_file)
+                cm_global.pip_overrides = {'numpy': 'numpy<2'}
 
     @staticmethod
     def get_startup_scripts_path():
@@ -145,7 +150,10 @@ class Ctx:
 
     @staticmethod
     def get_custom_nodes_paths():
-        return folder_paths.get_folder_paths('custom_nodes')
+        if Ctx.folder_paths is None:
+            print("Error: folder_paths module is not available")
+            return []
+        return Ctx.folder_paths.get_folder_paths('custom_nodes')
 
 
 cmd_ctx = Ctx()
@@ -224,7 +232,7 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
         print(f"ERROR: f{res.msg}")
 
 
-def uninstall_node(node_spec_str, is_all=False, cnt_msg=''):
+def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
     spec = node_spec_str.split('@')
     if len(spec) == 2 and spec[1] == 'unknown':
         node_name = spec[0]
@@ -481,8 +489,8 @@ def show_list(kind, simple=False):
             print(f"{prefix} {title:50} {short_id:30} (author: {author:20}) [UNKNOWN]")
 
 
-def show_snapshot(simple_mode=False):
+async def show_snapshot(simple_mode=False):
-    json_obj = core.get_current_snapshot()
+    json_obj = await core.get_current_snapshot()
 
     if simple_mode:
         print(f"[{json_obj['comfyui']}] comfyui")
@@ -513,8 +521,8 @@ def cancel():
         os.remove(cmd_ctx.get_restore_snapshot_path())
 
 
-def auto_save_snapshot():
+async def auto_save_snapshot():
-    path = core.save_snapshot_with_postfix('cli-autosave')
+    path = await core.save_snapshot_with_postfix('cli-autosave')
     print(f"Current snapshot is saved as `{path}`")
 
 
@@ -526,7 +534,7 @@ def get_all_installed_node_specs():
         res.append(node_spec_str)
         processed.add(k)
 
-    for k, _ in unified_manager.cnr_inactive_nodes.keys():
+    for k in unified_manager.cnr_inactive_nodes.keys():
         if k in processed:
             continue
 
@@ -535,7 +543,7 @@ def get_all_installed_node_specs():
             node_spec_str = f"{k}@{str(latest[0])}"
             res.append(node_spec_str)
 
-    for k, _ in unified_manager.nightly_inactive_nodes.keys():
+    for k in unified_manager.nightly_inactive_nodes.keys():
         if k in processed:
             continue
 
@@ -613,7 +621,10 @@ def install(
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, act=install_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Reinstall custom nodes")
@@ -648,7 +659,10 @@ def reinstall(
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, act=reinstall_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Uninstall custom nodes")
@@ -698,7 +712,9 @@ def update(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
 
     for x in nodes:
         if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -706,6 +722,7 @@ def update(
             break
 
     update_parallel(nodes)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Disable custom nodes")
@@ -734,7 +751,7 @@ def disable(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
     for_each_nodes(nodes, disable_node, allow_all=True)
 
@@ -765,7 +782,7 @@ def enable(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
     for_each_nodes(nodes, enable_node, allow_all=True)
 
@@ -796,9 +813,11 @@ def fix(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, fix_node, allow_all=True)
+    pip_fixer.fix_broken()
 
 
 @app.command("show-versions", help="Show all available versions of the node")
@@ -997,7 +1016,7 @@ def save_snapshot(
 ):
     cmd_ctx.set_user_directory(user_directory)
 
-    path = core.save_snapshot_with_postfix('snapshot', output)
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
     print(f"Current snapshot is saved as `{path}`")
 
 
@@ -1049,12 +1068,14 @@ 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())
     try:
         asyncio.run(core.restore_snapshot(snapshot_path, extras))
     except Exception:
         print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
         traceback.print_exc()
         raise typer.Exit(code=1)
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1078,11 +1099,14 @@ def restore_dependencies(
 
     total = len(node_paths)
     i = 1
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for x in node_paths:
         print("----------------------------------------------------------------------------------------------------")
         print(f"Restoring [{i}/{total}]: {x}")
         unified_manager.execute_install_script('', x, instant_execution=True)
         i += 1
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1094,7 +1118,10 @@ def post_install(
         )
 ):
     path = os.path.expanduser(path)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     unified_manager.execute_install_script('', path, instant_execution=True)
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1123,7 +1150,7 @@ def install_deps(
 ):
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
-    auto_save_snapshot()
+    asyncio.run(auto_save_snapshot())
 
     if not os.path.exists(deps):
         print(f"[bold red]File not found: {deps}[/bold red]")
@@ -1136,6 +1163,8 @@ def install_deps(
                 print(f"[bold red]Invalid json file: {deps}[/bold red]")
                 exit(1)
 
+
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
             for k in json_obj['custom_nodes'].keys():
                 state = core.simple_check_custom_node(k)
                 if state == 'installed':
@@ -1144,6 +1173,7 @@ def install_deps(
                     asyncio.run(core.gitclone_install(k, instant_execution=True))
                 else:  # disabled
                     core.gitclone_set_active([k], False)
+            pip_fixer.fix_broken()
 
         print("Dependency installation and activation complete.")
 

extras.json

@@ -4,11 +4,12 @@
         "comfyui-animatediff-evolved",
         "comfyui_controlnet_aux",
         "comfyui-impact-pack",
+        "comfyui-impact-subpack",
         "comfyui-custom-scripts",
         "comfyui-layerdiffuse",
         "comfyui-liveportraitkj",
         "aigodlike-comfyui-translation",
-        "comfyui-reactor-node",
+        "comfyui-reactor",
         "comfyui_instantid",
         "sd-dynamic-thresholding",
         "pr-was-node-suite-comfyui-47064894",

git_helper.py

@@ -4,7 +4,6 @@ import os
 import traceback
 
 import git
-import configparser
 import json
 import yaml
 import requests
@@ -13,13 +12,13 @@ from git.remote import RemoteProgress
 
 
 comfy_path = os.environ.get('COMFYUI_PATH')
+git_exe_path = os.environ.get('GIT_EXE_PATH')
 
 if comfy_path is None:
-    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)
+    print("\nWARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.", file=sys.stderr)
     comfy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
 
-
 def download_url(url, dest_folder, filename=None):
     # Ensure the destination folder exists
     if not os.path.exists(dest_folder):
@@ -43,7 +42,6 @@ def download_url(url, dest_folder, filename=None):
         print(f"Failed to download file from {url}")
 
 
-config_path = os.path.join(os.path.dirname(__file__), "config.ini")
 nodelist_path = os.path.join(os.path.dirname(__file__), "custom-node-list.json")
 working_directory = os.getcwd()
 
@@ -126,9 +124,47 @@ def gitcheck(path, do_fetch=False):
         print("CUSTOM NODE CHECK: Error")
 
 
+def get_remote_name(repo):
+    available_remotes = [remote.name for remote in repo.remotes]
+    if 'origin' in available_remotes:
+        return 'origin'
+    elif 'upstream' in available_remotes:
+        return 'upstream'
+    elif len(available_remotes) > 0:
+        return available_remotes[0]
+
+    if not available_remotes:
+        print(f"[ComfyUI-Manager] No remotes are configured for this repository: {repo.working_dir}")
+    else:
+        print(f"[ComfyUI-Manager] Available remotes in '{repo.working_dir}': ")
+        for remote in available_remotes:
+            print(f"- {remote}")
+
+    return None
+
+
 def switch_to_default_branch(repo):
-    default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
+    remote_name = get_remote_name(repo)
-    repo.git.checkout(default_branch)
+
+    try:
+        if remote_name is None:
+            return False
+
+        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:
+        try:
+            repo.git.checkout(repo.heads.master)
+        except:
+            try:
+                if remote_name is not None:
+                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+            except:
+                pass
+
+    print("[ComfyUI Manager] Failed to switch to the default branch")
+    return False
 
 
 def gitpull(path):
@@ -159,7 +195,11 @@ def gitpull(path):
             branch_name = current_branch.name
 
         remote.fetch()
-        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            print("CUSTOM NODE PULL: Fail")  # update fail
+            return
 
         if commit_hash == remote_commit_hash:
             print("CUSTOM NODE PULL: None")  # there is no update
@@ -206,7 +246,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
         repo_name_to_url[repo_name] = url
 
     for path in os.listdir(working_directory):
-        if '@' in path or path.endswith("ComfyUI-Manager"):
+        if path.endswith("ComfyUI-Manager"):
             continue
 
         fullpath = os.path.join(working_directory, path)
@@ -431,10 +471,8 @@ def restore_pip_snapshot(pips, options):
 
 
 def setup_environment():
-    config = configparser.ConfigParser()
+    if git_exe_path is not None:
-    config.read(config_path)
+        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe_path)
-    if 'default' in config and 'git_exe' in config['default'] and config['default']['git_exe'] != '':
-        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=config['default']['git_exe'])
 
 
 setup_environment()
@@ -467,5 +505,5 @@ try:
 except Exception as e:
     print(e)
     sys.exit(-1)
-    
+
-    
+

glob/cm_global.py

@@ -110,3 +110,6 @@ def add_on_revision_detected(k, f):
             traceback.print_exc()
     else:
         variables['cm.on_revision_detected_handler'].append((k, f))
+
+
+error_dict = {}

glob/cnr_utils.py

@@ -2,23 +2,84 @@ import requests
 from dataclasses import dataclass
 from typing import List
 import manager_util
+import toml
+import os
+import asyncio
+import json
+import time
 
 base_url = "https://api.comfy.org"
 
 
-async def get_cnr_data(page=1, limit=1000, cache_mode=True):
+lock = asyncio.Lock()
-    try:
-        uri = f'{base_url}/nodes?page={page}&limit={limit}'
-        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
 
-        for v in json_obj['nodes']:
+is_cache_loading = False
+
+async def get_cnr_data(cache_mode=True, dont_wait=True):
+    try:
+        return await _get_cnr_data(cache_mode, dont_wait)
+    except asyncio.TimeoutError:
+        print("A timeout occurred during the fetch process from ComfyRegistry.")
+        return await _get_cnr_data(cache_mode=True, dont_wait=True)  # timeout fallback
+
+async def _get_cnr_data(cache_mode=True, dont_wait=True):
+    global is_cache_loading
+
+    uri = f'{base_url}/nodes'
+
+    async def fetch_all():
+        remained = True
+        page = 1
+
+        full_nodes = {}
+        while remained:
+            sub_uri = f'{base_url}/nodes?page={page}&limit=30'
+            sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=30)
+            remained = page < sub_json_obj['totalPages']
+
+            for x in sub_json_obj['nodes']:
+                full_nodes[x['id']] = x
+
+            if page % 5 == 0:
+                print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
+
+            page += 1
+            time.sleep(0.5)
+
+        print("FETCH ComfyRegistry Data [DONE]")
+
+        for v in full_nodes.values():
             if 'latest_version' not in v:
                 v['latest_version'] = dict(version='nightly')
 
+        return {'nodes': list(full_nodes.values())}
+
+    if cache_mode:
+        is_cache_loading = True
+        cache_state = manager_util.get_cache_state(uri)
+
+        if dont_wait:
+            if cache_state == 'not-cached':
+                return {}
+            else:
+                print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
+                with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                    return json.load(json_file)['nodes']
+
+        if cache_state == 'cached':
+            with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                return json.load(json_file)['nodes']
+
+    try:
+        json_obj = await fetch_all()
+        manager_util.save_to_cache(uri, json_obj)
         return json_obj['nodes']
     except:
         res = {}
         print("Cannot connect to comfyregistry.")
+    finally:
+        if cache_mode:
+            is_cache_loading = False
 
     return res
 
@@ -90,7 +151,7 @@ def install_node(node_id, version=None):
 
 
 def all_versions_of_node(node_id):
-    url = f"https://api.comfy.org/nodes/{node_id}/versions"
+    url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
 
     response = requests.get(url)
     if response.status_code == 200:
@@ -98,3 +159,55 @@ def all_versions_of_node(node_id):
     else:
         return None
 
+
+def read_cnr_info(fullpath):
+    try:
+        toml_path = os.path.join(fullpath, 'pyproject.toml')
+        tracking_path = os.path.join(fullpath, '.tracking')
+
+        if not os.path.exists(toml_path) or not os.path.exists(tracking_path):
+            return None  # not valid CNR node pack
+
+        with open(toml_path, "r", encoding="utf-8") as f:
+            data = toml.load(f)
+
+            project = data.get('project', {})
+            name = project.get('name').strip().lower()
+            version = project.get('version')
+
+            urls = project.get('urls', {})
+            repository = urls.get('Repository')
+
+            if name and version:  # repository is optional
+                return {
+                    "id": name,
+                    "version": version,
+                    "url": repository
+                }
+
+        return None
+    except Exception:
+        return None  # not valid CNR node pack
+
+
+def generate_cnr_id(fullpath, cnr_id):
+    cnr_id_path = os.path.join(fullpath, '.git', '.cnr-id')
+    try:
+        if not os.path.exists(cnr_id_path):
+            with open(cnr_id_path, "w") as f:
+                return f.write(cnr_id)
+    except:
+        print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
+
+
+def read_cnr_id(fullpath):
+    cnr_id_path = os.path.join(fullpath, '.git', '.cnr-id')
+    try:
+        if os.path.exists(cnr_id_path):
+            with open(cnr_id_path) as f:
+                return f.read().strip()
+    except:
+        pass
+
+    return None
+

glob/git_utils.py

@@ -0,0 +1,61 @@
+import os
+import configparser
+
+
+def is_git_repo(path: str) -> bool:
+    """ Check if the path is a git repository. """
+    # NOTE: Checking it through `git.Repo` must be avoided.
+    #       It locks the file, causing issues on Windows.
+    return os.path.exists(os.path.join(path, '.git'))
+
+
+def get_commit_hash(fullpath):
+    git_head = os.path.join(fullpath, '.git', 'HEAD')
+    if os.path.exists(git_head):
+        with open(git_head) as f:
+            line = f.readline()
+
+            if line.startswith("ref: "):
+                ref = os.path.join(fullpath, '.git', line[5:].strip())
+                if os.path.exists(ref):
+                    with open(ref) as f2:
+                        return f2.readline().strip()
+                else:
+                    return "unknown"
+            else:
+                return line
+
+    return "unknown"
+
+
+def git_url(fullpath):
+    """
+    resolve version of unclassified custom node based on remote url in .git/config
+    """
+    git_config_path = os.path.join(fullpath, '.git', 'config')
+
+    if not os.path.exists(git_config_path):
+        return None
+
+    config = configparser.ConfigParser()
+    config.read(git_config_path)
+
+    for k, v in config.items():
+        if k.startswith('remote ') and 'url' in v:
+            return v['url']
+
+    return None
+
+def normalize_url(url) -> str:
+    url = url.replace("git@github.com:", "https://github.com/")
+    if url.endswith('.git'):
+        url = url[:-4]
+
+    return url
+
+def normalize_url_http(url) -> str:
+    url = url.replace("https://github.com/", "git@github.com:")
+    if url.endswith('.git'):
+        url = url[:-4]
+
+    return url

glob/manager_downloader.py

@@ -2,7 +2,7 @@ import os
 from urllib.parse import urlparse
 import urllib
 import sys
-
+import logging
 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')
 
@@ -16,7 +16,11 @@ if aria2 is not None:
     aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
 
 
-def basic_download_url(url, dest_folder, filename):
+def basic_download_url(url, dest_folder: str, filename: str):
+    '''
+    Download file from url to dest_folder with filename
+    using requests library.
+    '''
     import requests
 
     # Ensure the destination folder exists
@@ -38,6 +42,9 @@ def basic_download_url(url, dest_folder, filename):
 
 
 def download_url(model_url: str, model_dir: str, filename: str):
+    if HF_ENDPOINT:
+        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
+        logging.info(f"model_url replaced by HF_ENDPOINT, new = {model_url}")
     if aria2:
         return aria2_download_url(model_url, model_dir, filename)
     else:
@@ -66,9 +73,6 @@ def aria2_download_url(model_url: str, model_dir: str, filename: str):
     if model_dir.startswith(core.comfy_path):
         model_dir = model_dir[len(core.comfy_path) :]
 
-    if HF_ENDPOINT:
-        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
-
     download_dir = model_dir if model_dir.startswith('/') else os.path.join('/models', model_dir)
 
     download = aria2_find_task(download_dir, filename)
@@ -112,4 +116,4 @@ def download_url_with_agent(url, save_path):
         return False
 
     print("Installation was successful.")
-    return True
+    return True

glob/manager_server.py

@@ -18,6 +18,8 @@ import manager_core as core
 import manager_util
 import cm_global
 import logging
+import asyncio
+import queue
 
 
 logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
@@ -31,7 +33,6 @@ SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this secu
 
 routes = PromptServer.instance.routes
 
-
 def handle_stream(stream, prefix):
     stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
     for msg in stream:
@@ -54,6 +55,27 @@ import latent_preview
 is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
 
 
+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",
+}
+
+
 def is_allowed_security_level(level):
     if level == 'block':
         return False
@@ -108,7 +130,7 @@ class ManagerFuncsInComfyUI(core.ManagerFuncs):
             logging.error(f"[ComfyUI-Manager] Unexpected behavior: `{cmd}`")
             return 0
 
-        process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, bufsize=1)
+        process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, bufsize=1, env=core.get_script_env())
 
         stdout_thread = threading.Thread(target=handle_stream, args=(process.stdout, ""))
         stderr_thread = threading.Thread(target=handle_stream, args=(process.stderr, "[!]"))
@@ -135,7 +157,6 @@ local_db_model = os.path.join(manager_util.comfyui_manager_path, "model-list.jso
 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")
-components_path = os.path.join(manager_util.comfyui_manager_path, 'components')
 
 
 def set_preview_method(method):
@@ -154,22 +175,10 @@ def set_preview_method(method):
 set_preview_method(core.get_config()['preview_method'])
 
 
-def set_badge_mode(mode):
-    core.get_config()['badge_mode'] = mode
-
-
-def set_default_ui_mode(mode):
-    core.get_config()['default_ui'] = mode
-
-
 def set_component_policy(mode):
     core.get_config()['component_policy'] = mode
 
 
-def set_double_click_policy(mode):
-    core.get_config()['double_click_policy'] = mode
-
-
 def print_comfyui_version():
     global comfy_ui_hash
     global comfyui_tag
@@ -283,43 +292,9 @@ def get_model_dir(data, show_log=False):
             else:
                 base_model = os.path.join(models_base, data['save_path'])
     else:
-        model_type = data['type']
+        model_dir_name = model_dir_name_map.get(data['type'].lower())
-        if model_type == "checkpoints" or model_type == "checkpoint":
+        if model_dir_name is not None:
-            base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
+            base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
-        elif model_type == "unclip":
-            base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
-        elif model_type == "clip" or model_type == "text_encoders":
-            if folder_paths.folder_names_and_paths.get("text_encoders"):
-                base_model = folder_paths.folder_names_and_paths["text_encoders"][0][0]
-            else:
-                if show_log:
-                    logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
-                base_model = folder_paths.folder_names_and_paths["clip"][0][0]  # outdated version
-        elif model_type == "VAE":
-            base_model = folder_paths.folder_names_and_paths["vae"][0][0]
-        elif model_type == "lora":
-            base_model = folder_paths.folder_names_and_paths["loras"][0][0]
-        elif model_type == "T2I-Adapter":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "T2I-Style":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "controlnet":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "clip_vision":
-            base_model = folder_paths.folder_names_and_paths["clip_vision"][0][0]
-        elif model_type == "gligen":
-            base_model = folder_paths.folder_names_and_paths["gligen"][0][0]
-        elif model_type == "upscale":
-            base_model = folder_paths.folder_names_and_paths["upscale_models"][0][0]
-        elif model_type == "embeddings":
-            base_model = folder_paths.folder_names_and_paths["embeddings"][0][0]
-        elif model_type == "unet" or model_type == "diffusion_model":
-            if folder_paths.folder_names_and_paths.get("diffusion_models"):
-                base_model = folder_paths.folder_names_and_paths["diffusion_models"][0][1]
-            else:
-                if show_log:
-                    logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
-                base_model = folder_paths.folder_names_and_paths["unet"][0][0]  # outdated version
         else:
             base_model = os.path.join(models_base, "etc")
 
@@ -390,6 +365,204 @@ def nickname_filter(json_obj):
     return json_obj
 
 
+task_queue = queue.Queue()
+nodepack_result = {}
+model_result = {}
+tasks_in_progress = set()
+task_worker_lock = threading.Lock()
+
+async def task_worker():
+    global task_queue
+    global nodepack_result
+    global model_result
+    global tasks_in_progress
+
+    async def do_install(item) -> str:
+        ui_id, node_spec_str, channel, mode, skip_post_install = item
+
+        try:
+            node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
+
+            if node_spec is None:
+                logging.error(f"Cannot resolve install target: '{node_spec_str}'")
+                return f"Cannot resolve install target: '{node_spec_str}'"
+
+            node_name, version_spec, is_specified = node_spec
+            res = await core.unified_manager.install_by_id(node_name, version_spec, channel, mode, return_postinstall=skip_post_install)
+            # discard post install if skip_post_install mode
+
+            if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
+                logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+                return res.msg
+
+            elif not res.result:
+                logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+                return res.msg
+
+            return 'success'
+        except Exception:
+            traceback.print_exc()
+            return f"Installation failed:\n{node_spec_str}"
+
+    async def do_update(item) -> str:
+        ui_id, node_name, node_ver = item
+
+        try:
+            res = core.unified_manager.unified_update(node_name, node_ver)
+
+            manager_util.clear_pip_cache()
+
+            if res.result:
+                return 'success'
+
+            logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while updating '{node_name}'."
+
+    async def do_fix(item) -> str:
+        ui_id, node_name, node_ver = item
+
+        try:
+            res = core.unified_manager.unified_fix(node_name, node_ver)
+
+            if res.result:
+                return 'success'
+            else:
+                logging.error(res.msg)
+
+            logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while fixing '{node_name}@{node_ver}'."
+
+    async def do_uninstall(item) -> str:
+        ui_id, node_name, is_unknown = item
+
+        try:
+            res = core.unified_manager.unified_uninstall(node_name, is_unknown)
+
+            if res.result:
+                return 'success'
+
+            logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while uninstalling '{node_name}'."
+
+    async def do_disable(item) -> str:
+        ui_id, node_name, is_unknown = item
+
+        try:
+            res = core.unified_manager.unified_disable(node_name, is_unknown)
+
+            if res:
+                return 'success'
+
+        except Exception:
+            traceback.print_exc()
+
+        return f"Failed to disable: '{node_name}'"
+
+    async def do_install_model(item) -> str:
+        ui_id, json_data = item
+
+        model_path = get_model_path(json_data)
+        model_url = json_data['url']
+
+        res = False
+
+        try:
+            if model_path is not None:
+                logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
+                if not core.get_config()['model_download_by_agent'] and (
+                        model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
+                    model_dir = get_model_dir(json_data, True)
+                    download_url(model_url, model_dir, filename=json_data['filename'])
+                    if model_path.endswith('.zip'):
+                        res = core.unzip(model_path)
+                    else:
+                        res = True
+
+                    if res:
+                        return 'success'
+                else:
+                    res = download_url_with_agent(model_url, model_path)
+                    if res and model_path.endswith('.zip'):
+                        res = core.unzip(model_path)
+            else:
+                logging.error(f"Model installation error: invalid model type - {json_data['type']}")
+
+            if res:
+                return 'success'
+
+        except Exception as e:
+            logging.error(f"[ERROR] {e}", file=sys.stderr)
+
+        return f"Model installation error: {model_url}"
+
+    stats = {}
+
+    while True:
+        done_count = len(nodepack_result) + len(model_result)
+        total_count = done_count + task_queue.qsize()
+
+        if task_queue.empty():
+            logging.info(f"\n[ComfyUI-Manager] Queued works are completed.\n{stats}")
+
+            logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
+            PromptServer.instance.send_sync("cm-queue-status",
+                                            {'status': 'done',
+                                             'nodepack_result': nodepack_result, 'model_result': model_result,
+                                             'total_count': total_count, 'done_count': done_count})
+            nodepack_result = {}
+            task_queue = queue.Queue()
+            return  # terminate worker thread
+
+        with task_worker_lock:
+            kind, item = task_queue.get()
+            tasks_in_progress.add((kind, item[0]))
+
+        try:
+            if kind == 'install':
+                msg = await do_install(item)
+            elif kind == 'install-model':
+                msg = await do_install_model(item)
+            elif kind == 'update':
+                msg = await do_update(item)
+            elif kind == 'fix':
+                msg = await do_fix(item)
+            elif kind == 'uninstall':
+                msg = await do_uninstall(item)
+            elif kind == 'disable':
+                msg = await do_disable(item)
+            else:
+                msg = "Unexpected kind: " + kind
+        except Exception:
+            traceback.print_exc()
+            msg = f"Exception: {(kind, item)}"
+
+        with task_worker_lock:
+            tasks_in_progress.remove((kind, item[0]))
+
+            ui_id = item[0]
+            if kind == 'install-model':
+                model_result[ui_id] = msg
+                ui_target = "model_manager"
+            else:
+                nodepack_result[ui_id] = msg
+                ui_target = "nodepack_manager"
+
+        stats[kind] = stats.get(kind, 0) + 1
+
+        PromptServer.instance.send_sync("cm-queue-status",
+                                        {'status': 'in_progress', 'target': item[0], 'ui_target': ui_target,
+                                         'total_count': total_count, 'done_count': done_count})
+
+
 @routes.get("/customnode/getmappings")
 async def fetch_customnode_mappings(request):
     """
@@ -460,7 +633,7 @@ async def update_all(request):
         return web.Response(status=403)
 
     try:
-        core.save_snapshot_with_postfix('autosave')
+        await core.save_snapshot_with_postfix('autosave')
 
         if request.rel_url.query["mode"] == "local":
             channel = 'local'
@@ -542,39 +715,18 @@ def populate_markdown(x):
         x['title'] = manager_util.sanitize_tag(x['title'])
 
 
+# freeze imported version
+startup_time_installed_node_packs = core.get_installed_node_packs()
 @routes.get("/customnode/installed")
 async def installed_list(request):
-    result = {}
+    mode = request.query.get('mode', 'default')
-    for x in folder_paths.get_folder_paths('custom_nodes'):
-        for module_name in os.listdir(x):
-            if (
-                module_name.endswith('.disabled') or
-                module_name == '__pycache__' or
-                module_name.endswith('.py') or
-                module_name.endswith('.example') or
-                module_name.endswith('.pyc')
-            ):
-                continue
 
-            spec = module_name.split('@')
+    if mode == 'imported':
+        res = startup_time_installed_node_packs
+    else:
+        res = core.get_installed_node_packs()
 
-            if len(spec) == 2:
+    return web.json_response(res, content_type='application/json')
-                node_package_name = spec[0]
-                ver = spec[1].replace('_', '.')
-
-                if ver == 'nightly':
-                    ver = None
-            else:
-                node_package_name = module_name
-                ver = None
-
-            # extract commit hash
-            if ver is None:
-                ver = core.get_commit_hash(os.path.join(x, node_package_name))
-
-            result[node_package_name] = ver
-
-    return web.json_response(result, content_type='application/json')
 
 
 @routes.get("/customnode/getlist")
@@ -592,7 +744,7 @@ async def fetch_customnode_list(request):
     else:
         channel = core.get_config()['channel_url']
 
-    node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"])
+    node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"], 'cache')
     json_obj_github = core.get_data_by_mode(request.rel_url.query["mode"], 'github-stats.json', 'default')
     json_obj_extras = core.get_data_by_mode(request.rel_url.query["mode"], 'extras.json', 'default')
 
@@ -635,25 +787,50 @@ async def fetch_customnode_alternatives(request):
 
 
 def check_model_installed(json_obj):
-    def process_model(item):
+    def is_exists(model_dir_name, file_name):
-        model_path = get_model_path(item, False)
+        dirs = folder_paths.get_folder_paths(model_dir_name)
-        item['installed'] = 'None'
+        for x in dirs:
+            if os.path.exists(os.path.join(x, file_name)):
+                return True
 
-        if model_path is not None:
+        return False
-            if model_path.endswith('.zip'):
+
-                if os.path.exists(model_path[:-4]):
+
-                    item['installed'] = 'True'
+    model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
-                else:
+                       'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
-                    item['installed'] = 'False'
+                       'photomaker', 'classifiers']
-            elif os.path.exists(model_path):
+
+    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']))
             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['installed'] = 'True'
+
+            if 'installed' not in item:
+                fullpath = os.path.join(folder_paths.models_dir, item['save_path'], item['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, item)
+            executor.submit(process_model_phase, item)
-
 
 @routes.get("/externalmodel/getlist")
 async def fetch_externalmodel_list(request):
@@ -721,7 +898,7 @@ async def restore_snapshot(request):
 @routes.get("/snapshot/get_current")
 async def get_current_snapshot_api(request):
     try:
-        return web.json_response(core.get_current_snapshot(), content_type='application/json')
+        return web.json_response(await core.get_current_snapshot(), content_type='application/json')
     except:
         return web.Response(status=400)
 
@@ -729,7 +906,7 @@ async def get_current_snapshot_api(request):
 @routes.get("/snapshot/save")
 async def save_snapshot(request):
     try:
-        core.save_snapshot_with_postfix('snapshot')
+        await core.save_snapshot_with_postfix('snapshot')
         return web.Response(status=200)
     except:
         return web.Response(status=400)
@@ -843,7 +1020,7 @@ async def get_cnr_versions(request):
     node_name = request.match_info.get("node_name", None)
     versions = core.cnr_utils.all_versions_of_node(node_name)
 
-    if versions:
+    if versions is not None:
         return web.json_response(versions, content_type='application/json')
 
     return web.Response(status=400)
@@ -865,13 +1042,52 @@ async def get_disabled_versions(request):
     return web.Response(status=400)
 
 
-@routes.post("/customnode/reinstall")
+@routes.post("/customnode/import_fail_info")
+async def import_fail_info(request):
+    json_data = await request.json()
+
+    if 'cnr_id' in json_data:
+        module_name = core.unified_manager.get_module_name(json_data['cnr_id'])
+    else:
+        module_name = core.unified_manager.get_module_name(json_data['url'])
+
+    if module_name is not None:
+        info = cm_global.error_dict.get(module_name)
+        if info is not None:
+            return web.json_response(info)
+
+    return web.Response(status=400)
+
+
+@routes.post("/manager/queue/reinstall")
 async def reinstall_custom_node(request):
     await uninstall_custom_node(request)
     await install_custom_node(request)
 
 
-@routes.post("/customnode/install")
+@routes.get("/manager/queue/reset")
+async def reset_queue(request):
+    global task_queue
+    task_queue = queue.Queue()
+    return web.Response(status=200)
+
+
+@routes.get("/manager/queue/status")
+async def queue_count(request):
+    global task_queue
+
+    with task_worker_lock:
+        done_count = len(nodepack_result) + len(model_result)
+        in_progress_count = len(tasks_in_progress)
+        total_count = done_count + in_progress_count + task_queue.qsize()
+        is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
+
+    return web.json_response({
+        'total_count': total_count, 'done_count': done_count, 'in_progress_count': in_progress_count,
+        'is_processing': is_processing})
+
+
+@routes.post("/manager/queue/install")
 async def install_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -884,6 +1100,8 @@ async def install_custom_node(request):
     cnr_id = json_data.get('id')
     skip_post_install = json_data.get('skip_post_install')
 
+    git_url = None
+
     if json_data['version'] != 'unknown':
         selected_version = json_data.get('selected_version', 'latest')
         if selected_version != 'nightly':
@@ -891,35 +1109,54 @@ async def install_custom_node(request):
             node_spec_str = f"{cnr_id}@{selected_version}"
         else:
             node_spec_str = f"{cnr_id}@nightly"
+            git_url = [json_data.get('repository')]
+            if git_url is None:
+                logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
+                return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
     else:
         # unknown
         unknown_name = os.path.basename(json_data['files'][0])
         node_spec_str = f"{unknown_name}@unknown"
+        git_url = json_data.get('files')
 
     # apply security policy if not cnr node (nightly isn't regarded as cnr node)
     if risky_level is None:
-        risky_level = await get_risky_level(json_data['files'], json_data.get('pip', []))
+        if git_url is not None:
+            risky_level = await get_risky_level(git_url, json_data.get('pip', []))
+        else:
+            return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
 
     if not is_allowed_security_level(risky_level):
         logging.error(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=404, text="A security error has occurred. Please check the terminal logs")
 
-    node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
+    install_item = json_data.get('ui_id'), node_spec_str, json_data['channel'], json_data['mode'], skip_post_install
+    task_queue.put(("install", install_item))
 
-    if node_spec is None:
+    return web.Response(status=200)
-        return web.Response(status=400, text=f"Cannot resolve install target: '{node_spec_str}'")
-
-    node_name, version_spec, is_specified = node_spec
-    res = await core.unified_manager.install_by_id(node_name, version_spec, json_data['channel'], json_data['mode'], return_postinstall=skip_post_install)
-    # discard post install if skip_post_install mode
-
-    if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
-        return web.Response(status=400, text=f"Installation failed: {res}")
-
-    return web.Response(status=200, text="Installation success.")
 
 
-@routes.post("/customnode/fix")
+task_worker_thread:threading.Thread = None
+
+@routes.get("/manager/queue/start")
+async def queue_start(request):
+    global nodepack_result
+    global model_result
+    global task_worker_thread
+
+    if task_worker_thread is not None and task_worker_thread.is_alive():
+        return web.Response(status=201) # already in-progress
+
+    nodepack_result = {}
+    model_result = {}
+
+    task_worker_thread = threading.Thread(target=lambda: asyncio.run(task_worker()))
+    task_worker_thread.start()
+
+    return web.Response(status=200)
+
+
+@routes.post("/manager/queue/fix")
 async def fix_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_GENERAL)
@@ -935,14 +1172,10 @@ async def fix_custom_node(request):
         # unknown
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_fix(node_name, node_ver)
+    update_item = json_data.get('ui_id'), node_name, json_data['version']
+    task_queue.put(("fix", update_item))
 
-    if res.result:
+    return web.Response(status=200)
-        logging.info("After restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"ERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
-    return web.Response(status=400, text=f"An error occurred while fixing '{node_name}@{node_ver}'.")
 
 
 @routes.post("/customnode/install/git_url")
@@ -955,10 +1188,10 @@ async def install_custom_node_git_url(request):
     res = await core.gitclone_install(url)
 
     if res.action == 'skip':
-        logging.info(f"Already installed: '{res.target}'")
+        logging.info(f"\nAlready installed: '{res.target}'")
         return web.Response(status=200)
     elif res.result:
-        logging.info("After restarting ComfyUI, please refresh the browser.")
+        logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
         return web.Response(status=200)
 
     logging.error(res.msg)
@@ -977,7 +1210,7 @@ async def install_custom_node_pip(request):
     return web.Response(status=200)
 
 
-@routes.post("/customnode/uninstall")
+@routes.post("/manager/queue/uninstall")
 async def uninstall_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -994,17 +1227,13 @@ async def uninstall_custom_node(request):
         is_unknown = True
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_uninstall(node_name, is_unknown)
+    uninstall_item = json_data.get('ui_id'), node_name, is_unknown
+    task_queue.put(("uninstall", uninstall_item))
 
-    if res.result:
+    return web.Response(status=200)
-        logging.info("After restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"ERROR: An error occurred while uninstalling '{node_name}'.")
-    return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
 
 
-@routes.post("/customnode/update")
+@routes.post("/manager/queue/update")
 async def update_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1019,16 +1248,10 @@ async def update_custom_node(request):
         # unknown
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_update(node_name, json_data['version'])
+    update_item = json_data.get('ui_id'), node_name, json_data['version']
+    task_queue.put(("update", update_item))
 
-    manager_util.clear_pip_cache()
+    return web.Response(status=200)
-
-    if res.result:
-        logging.info("After restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"ERROR: An error occurred while updating '{node_name}'.")
-    return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
 
 
 @routes.get("/comfyui_manager/update_comfyui")
@@ -1042,8 +1265,10 @@ async def update_comfyui(request):
             logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
             return web.Response(status=400)
         elif res == "updated":
+            logging.info("ComfyUI is updated.")
             return web.Response(status=201)
         else:  # skipped
+            logging.info("ComfyUI is up-to-date.")
             return web.Response(status=200)
     except Exception as e:
         logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1075,7 +1300,7 @@ async def comfyui_switch_version(request):
     return web.Response(status=400)
 
 
-@routes.post("/customnode/disable")
+@routes.post("/manager/queue/disable")
 async def disable_node(request):
     json_data = await request.json()
 
@@ -1088,12 +1313,10 @@ async def disable_node(request):
         is_unknown = True
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_disable(node_name, is_unknown)
+    update_item = json_data.get('ui_id'), node_name, is_unknown
+    task_queue.put(("disable", update_item))
 
-    if res:
+    return web.Response(status=200)
-        return web.json_response({}, content_type='application/json')
-
-    return web.Response(status=400, text="Failed to disable")
 
 
 @routes.get("/manager/migrate_unmanaged_nodes")
@@ -1109,12 +1332,10 @@ async def need_to_migrate(request):
     return web.Response(text=str(core.need_to_migrate), status=200)
 
 
-@routes.post("/model/install")
+@routes.post("/manager/queue/install_model")
 async def install_model(request):
     json_data = await request.json()
 
-    model_path = get_model_path(json_data)
-
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
@@ -1132,37 +1353,10 @@ async def install_model(request):
             logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
             return web.Response(status=403)
 
-    res = False
+    install_item = json_data.get('ui_id'), json_data
+    task_queue.put(("install-model", install_item))
 
-    try:
+    return web.Response(status=200)
-        if model_path is not None:
-            logging.info(f"Install model '{json_data['name']}' into '{model_path}'")
-
-            model_url = json_data['url']
-            if not core.get_config()['model_download_by_agent'] and (
-                    model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
-                model_dir = get_model_dir(json_data, True)
-                download_url(model_url, model_dir, filename=json_data['filename'])
-                if model_path.endswith('.zip'):
-                    res = core.unzip(model_path)
-                else:
-                    res = True
-
-                if res:
-                    return web.json_response({}, content_type='application/json')
-            else:
-                res = download_url_with_agent(model_url, model_path)
-                if res and model_path.endswith('.zip'):
-                    res = core.unzip(model_path)
-        else:
-            logging.error(f"Model installation error: invalid model type - {json_data['type']}")
-
-        if res:
-            return web.json_response({}, content_type='application/json')
-    except Exception as e:
-        logging.error(f"[ERROR] {e}", file=sys.stderr)
-
-    return web.Response(status=400)
 
 
 @routes.get("/manager/preview_method")
@@ -1176,28 +1370,6 @@ async def preview_method(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/badge_mode")
-async def badge_mode(request):
-    if "value" in request.rel_url.query:
-        set_badge_mode(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['badge_mode'], status=200)
-
-    return web.Response(status=200)
-
-
-@routes.get("/manager/default_ui")
-async def default_ui_mode(request):
-    if "value" in request.rel_url.query:
-        set_default_ui_mode(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['default_ui'], status=200)
-
-    return web.Response(status=200)
-
-
 @routes.get("/manager/component/policy")
 async def component_policy(request):
     if "value" in request.rel_url.query:
@@ -1209,17 +1381,6 @@ async def component_policy(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/dbl_click/policy")
-async def dbl_click_policy(request):
-    if "value" in request.rel_url.query:
-        set_double_click_policy(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['double_click_policy'], status=200)
-
-    return web.Response(status=200)
-
-
 @routes.get("/manager/channel_url_list")
 async def channel_url_list(request):
     channels = core.get_channel_dict()
@@ -1324,9 +1485,13 @@ def restart(self):
         sys_argv.remove('--windows-standalone-build')
 
     if sys.platform.startswith('win32'):
-        return os.execv(sys.executable, ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:])
+        cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
     else:
-        return os.execv(sys.executable, [sys.executable] + sys_argv)
+        cmds = [sys.executable] + sys_argv
+
+    print(f"Command: {cmds}", flush=True)
+
+    return os.execv(sys.executable, cmds)
 
 
 @routes.post("/manager/component/save")
@@ -1336,15 +1501,15 @@ async def save_component(request):
         name = data['name']
         workflow = data['workflow']
 
-        if not os.path.exists(components_path):
+        if not os.path.exists(core.manager_components_path):
-            os.mkdir(components_path)
+            os.mkdir(core.manager_components_path)
 
         if 'packname' in workflow and workflow['packname'] != '':
             sanitized_name = manager_util.sanitize_filename(workflow['packname']) + '.pack'
         else:
             sanitized_name = manager_util.sanitize_filename(name) + '.json'
 
-        filepath = os.path.join(components_path, sanitized_name)
+        filepath = os.path.join(core.manager_components_path, sanitized_name)
         components = {}
         if os.path.exists(filepath):
             with open(filepath) as f:
@@ -1361,24 +1526,32 @@ async def save_component(request):
 
 @routes.post("/manager/component/loads")
 async def load_components(request):
-    try:
+    if os.path.exists(core.manager_components_path):
-        json_files = [f for f in os.listdir(components_path) if f.endswith('.json')]
+        try:
-        pack_files = [f for f in os.listdir(components_path) if f.endswith('.pack')]
+            json_files = [f for f in os.listdir(core.manager_components_path) if f.endswith('.json')]
+            pack_files = [f for f in os.listdir(core.manager_components_path) if f.endswith('.pack')]
 
-        components = {}
+            components = {}
-        for json_file in json_files + pack_files:
+            for json_file in json_files + pack_files:
-            file_path = os.path.join(components_path, json_file)
+                file_path = os.path.join(core.manager_components_path, json_file)
-            with open(file_path, 'r') as file:
+                with open(file_path, 'r') as file:
-                try:
+                    try:
-                    # When there is a conflict between the .pack and the .json, the pack takes precedence and overrides.
+                        # When there is a conflict between the .pack and the .json, the pack takes precedence and overrides.
-                    components.update(json.load(file))
+                        components.update(json.load(file))
-                except json.JSONDecodeError as e:
+                    except json.JSONDecodeError as e:
-                    logging.error(f"[ComfyUI-Manager] Error decoding component file in file {json_file}: {e}")
+                        logging.error(f"[ComfyUI-Manager] Error decoding component file in file {json_file}: {e}")
 
-        return web.json_response(components)
+            return web.json_response(components)
-    except Exception as e:
+        except Exception as e:
-        logging.error(f"[ComfyUI-Manager] failed to load components\n{e}")
+            logging.error(f"[ComfyUI-Manager] failed to load components\n{e}")
-        return web.Response(status=400)
+            return web.Response(status=400)
+    else:
+        return web.json_response({})
+
+
+@routes.get("/manager/version")
+async def get_version(request):
+    return web.Response(text=core.version_str, status=200)
 
 
 async def _confirm_try_install(sender, custom_node_url, msg):
@@ -1401,12 +1574,11 @@ def confirm_try_install(sender, custom_node_url, msg):
 
 cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
 
-import asyncio
-
 
 async def default_cache_update():
+    channel_url = core.get_config()['channel_url']
     async def get_cache(filename):
-        uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+        uri = f"{channel_url}/{filename}"
         cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
         cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
@@ -1425,11 +1597,17 @@ async def default_cache_update():
 
     await asyncio.gather(a, b, c, d, e)
 
-    if not core.get_config()['skip_migration_check']:
+    # load at least once
-        await core.check_need_to_migrate()
+    await core.unified_manager.reload('remote', dont_wait=False)
-    else:
+    await core.unified_manager.get_custom_nodes(channel_url, 'remote')
-        logging.info("[ComfyUI-Manager] Migration check is skipped...")
 
+    logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
+
+    # NOTE: hide migration button temporarily.
+    # if not core.get_config()['skip_migration_check']:
+    #     await core.check_need_to_migrate()
+    # else:
+    #     logging.info("[ComfyUI-Manager] Migration check is skipped...")
 
 threading.Thread(target=lambda: asyncio.run(default_cache_update())).start()
 
@@ -1444,3 +1622,4 @@ cm_global.register_extension('ComfyUI-Manager',
                                  'nodes': {},
                                  'description': 'This extension provides the ability to manage custom nodes in ComfyUI.', })
 
+

glob/manager_util.py

@@ -1,3 +1,8 @@
+"""
+description:
+    `manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
+"""
+
 import aiohttp
 import json
 import threading
@@ -6,11 +11,21 @@ from datetime import datetime
 import subprocess
 import sys
 import re
+import logging
+
 
 cache_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')
+cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
+
+use_uv = False
+
+def make_pip_cmd(cmd):
+    if use_uv:
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
+    else:
+        return [sys.executable, '-m', 'pip'] + cmd
 
 
 # DON'T USE StrictVersion - cannot handle pre_release version
@@ -103,7 +118,12 @@ async def get_data(uri, silent=False):
 
     if uri.startswith("http"):
         async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.get(uri) as resp:
+            headers = {
+                'Cache-Control': 'no-cache',
+                'Pragma': 'no-cache',
+                'Expires': '0'
+            }
+            async with session.get(uri, headers=headers) as resp:
                 json_text = await resp.text()
     else:
         with cache_lock:
@@ -118,20 +138,56 @@ async def get_data(uri, silent=False):
     return json_obj
 
 
-async def get_data_with_cache(uri, silent=False, cache_mode=True):
+def get_cache_path(uri):
     cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
-    cache_uri = os.path.join(cache_dir, cache_uri+'.json')
+    return os.path.join(cache_dir, cache_uri+'.json')
+
+
+def get_cache_state(uri):
+    cache_uri = get_cache_path(uri)
+
+    if not os.path.exists(cache_uri):
+        return "not-cached"
+    elif is_file_created_within_one_day(cache_uri):
+        return "cached"
+
+    return "expired"
+
+
+def save_to_cache(uri, json_obj, silent=False):
+    cache_uri = get_cache_path(uri)
+
+    with cache_lock:
+        with open(cache_uri, "w", encoding='utf-8') as file:
+            json.dump(json_obj, file, indent=4, sort_keys=True)
+            if not silent:
+                logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
+
+
+async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
+    cache_uri = get_cache_path(uri)
+
+    if cache_mode and dont_wait:
+        # NOTE: return the cache if possible, even if it is expired, so do not cache
+        if not os.path.exists(cache_uri):
+            logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in fallback mode: {uri}")
+
+            return {}
+        else:
+            if not is_file_created_within_one_day(cache_uri):
+                logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in outdated cache mode: {uri}")
+
+            return await get_data(cache_uri, silent=silent)
 
     if cache_mode and is_file_created_within_one_day(cache_uri):
         json_obj = await get_data(cache_uri, silent=silent)
     else:
         json_obj = await get_data(uri, silent=silent)
-
         with cache_lock:
             with open(cache_uri, "w", encoding='utf-8') as file:
                 json.dump(json_obj, file, indent=4, sort_keys=True)
                 if not silent:
-                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+                    logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
 
     return json_obj
 
@@ -146,10 +202,10 @@ def extract_package_as_zip(file_path, extract_path):
         with zipfile.ZipFile(file_path, "r") as zip_ref:
             zip_ref.extractall(extract_path)
             extracted_files = zip_ref.namelist()
-        print(f"Extracted zip file to {extract_path}")
+        logging.info(f"Extracted zip file to {extract_path}")
         return extracted_files
     except zipfile.BadZipFile:
-        print(f"File '{file_path}' is not a zip or is corrupted.")
+        logging.error(f"File '{file_path}' is not a zip or is corrupted.")
         return None
 
 
@@ -161,7 +217,7 @@ def get_installed_packages(renew=False):
 
     if renew or pip_map is None:
         try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+            result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
 
             pip_map = {}
             for line in result.split('\n'):
@@ -173,7 +229,7 @@ def get_installed_packages(renew=False):
 
                     pip_map[y[0]] = y[1]
         except subprocess.CalledProcessError:
-            print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
+            logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
             return set()
 
     return pip_map
@@ -184,21 +240,22 @@ def clear_pip_cache():
     pip_map = None
 
 
-torch_torchvision_version_map = {
+torch_torchvision_torchaudio_version_map = {
-    '2.5.1': '0.20.1',
+    '2.6.0': ('0.21.0', '2.6.0'),
-    '2.5.0': '0.20.0',
+    '2.5.1': ('0.20.0', '2.5.0'),
-    '2.4.1': '0.19.1',
+    '2.5.0': ('0.20.0', '2.5.0'),
-    '2.4.0': '0.19.0',
+    '2.4.1': ('0.19.1', '2.4.1'),
-    '2.3.1': '0.18.1',
+    '2.4.0': ('0.19.0', '2.4.0'),
-    '2.3.0': '0.18.0',
+    '2.3.1': ('0.18.1', '2.3.1'),
-    '2.2.2': '0.17.2',
+    '2.3.0': ('0.18.0', '2.3.0'),
-    '2.2.1': '0.17.1',
+    '2.2.2': ('0.17.2', '2.2.2'),
-    '2.2.0': '0.17.0',
+    '2.2.1': ('0.17.1', '2.2.1'),
-    '2.1.2': '0.16.2',
+    '2.2.0': ('0.17.0', '2.2.0'),
-    '2.1.1': '0.16.1',
+    '2.1.2': ('0.16.2', '2.1.2'),
-    '2.1.0': '0.16.0',
+    '2.1.1': ('0.16.1', '2.1.1'),
-    '2.0.1': '0.15.2',
+    '2.1.0': ('0.16.0', '2.1.0'),
-    '2.0.0': '0.15.1',
+    '2.0.1': ('0.15.2', '2.0.1'),
+    '2.0.0': ('0.15.1', '2.0.0'),
 }
 
 
@@ -211,25 +268,24 @@ class PIPFixer:
         if len(spec) > 0:
             platform = spec[1]
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
             subprocess.check_output(cmd, universal_newlines=True)
-            print(cmd)
+            logging.error(cmd)
             return
 
         torch_ver = StrictVersion(spec[0])
         torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
-        torchvision_ver = torch_torchvision_version_map.get(torch_ver)
+        torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
 
-        if torchvision_ver is None:
+        if torch_torchvision_torchaudio_ver is None:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
+            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
-                   'torch', 'torchvision', 'torchaudio',
+                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
-                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
+            logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
-            print("[manager-core] restore PyTorch to nightly version")
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install',
+            torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
-                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
+            cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
-                   '--index-url', f"https://download.pytorch.org/whl/{platform}"]
+                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
-            print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
+            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
 
         subprocess.check_output(cmd, universal_newlines=True)
 
@@ -239,23 +295,25 @@ class PIPFixer:
         # remove `comfy` python package
         try:
             if 'comfy' in new_pip_versions:
-                cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
+                cmd = make_pip_cmd(['uninstall', 'comfy'])
                 subprocess.check_output(cmd, universal_newlines=True)
 
-                print("[manager-core] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
+                logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
         except Exception as e:
-            print("[manager-core] Failed to uninstall `comfy` python package")
+            logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
-            print(e)
+            logging.error(e)
 
         # fix torch - reinstall torch packages if version is changed
         try:
-            if self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
+            if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
+                logging.error("[ComfyUI-Manager] PyTorch is not installed")
+            elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
                 or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
                 or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
                     self.torch_rollback()
         except Exception as e:
-            print("[manager-core] Failed to restore PyTorch")
+            logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
-            print(e)
+            logging.error(e)
 
         # fix opencv
         try:
@@ -283,23 +341,24 @@ class PIPFixer:
 
                 if len(targets) > 0:
                     for x in targets:
-                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
                         subprocess.check_output(cmd, universal_newlines=True)
 
-                    print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
+                    logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
         except Exception as e:
-            print("[manager-core] Failed to restore opencv")
+            logging.error("[ComfyUI-Manager] Failed to restore opencv")
-            print(e)
+            logging.error(e)
 
         # fix numpy
         try:
             np = new_pip_versions.get('numpy')
             if np is not None:
                 if StrictVersion(np) >= StrictVersion('2'):
-                    subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
+                    cmd = make_pip_cmd(['install', "numpy<2"])
+                    subprocess.check_output(cmd , universal_newlines=True)
         except Exception as e:
-            print("[manager-core] Failed to restore numpy")
+            logging.error("[ComfyUI-Manager] Failed to restore numpy")
-            print(e)
+            logging.error(e)
 
 
 def sanitize(data):

glob/node_package.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+import os
+
+from git_utils import get_commit_hash
+
+
+@dataclass
+class InstalledNodePackage:
+    """Information about an installed node package."""
+
+    id: str
+    fullpath: str
+    disabled: bool
+    version: str
+
+    @property
+    def is_unknown(self) -> bool:
+        return self.version == "unknown"
+
+    @property
+    def is_nightly(self) -> bool:
+        return self.version == "nightly"
+
+    @property
+    def is_from_cnr(self) -> bool:
+        return not self.is_unknown and not self.is_nightly
+
+    @property
+    def is_enabled(self) -> bool:
+        return not self.disabled
+
+    @property
+    def is_disabled(self) -> bool:
+        return self.disabled
+
+    def get_commit_hash(self) -> str:
+        return get_commit_hash(self.fullpath)
+
+    def isValid(self) -> bool:
+        if self.is_from_cnr:
+            return os.path.exists(os.path.join(self.fullpath, '.tracking'))
+
+        return True
+
+    @staticmethod
+    def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage:
+        parent_folder_name = os.path.basename(os.path.dirname(fullpath))
+        module_name = os.path.basename(fullpath)
+
+        if module_name.endswith(".disabled"):
+            node_id = module_name[:-9]
+            disabled = True
+        elif parent_folder_name == ".disabled":
+            # Nodes under custom_nodes/.disabled/* are disabled
+            node_id = module_name
+            disabled = True
+        else:
+            node_id = module_name
+            disabled = False
+
+        info = resolve_from_path(fullpath)
+        if info is None:
+            version = 'unknown'
+        else:
+            node_id = info['id']    # robust module guessing
+            version = info['ver']
+
+        return InstalledNodePackage(
+            id=node_id, fullpath=fullpath, disabled=disabled, version=version
+        )

glob/share_3rdparty.py

@@ -317,7 +317,7 @@ async def share_art(request):
             form.add_field("shareWorkflowTitle", title)
             form.add_field("shareWorkflowDescription", description)
             form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
-            form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
+            form.add_field("currentSnapshot", json.dumps(await core.get_current_snapshot()))
             form.add_field("modelsInfo", json.dumps(models_info))
 
             async with session.post(

js/cm-api.js

@@ -1,6 +1,6 @@
 import { api } from "../../scripts/api.js";
 import { app } from "../../scripts/app.js";
-import { sleep } from "./common.js";
+import { sleep, customConfirm, customAlert } from "./common.js";
 
 async function tryInstallCustomNode(event) {
 	let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
@@ -19,11 +19,10 @@ async function tryInstallCustomNode(event) {
 	msg += `\n\nRequest message:\n${event.detail.msg}`;
 
 	if(event.detail.target.installed == 'True') {
-		alert(msg);
+		customAlert(msg);
 		return;
 	}
-
+	const res = await customConfirm(msg);
-	let res = confirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
 			const response = await api.fetchApi(`/customnode/toggle_active`, {
@@ -46,6 +45,11 @@ async function tryInstallCustomNode(event) {
 				show_message('This action is not allowed with this security level configuration.');
 				return false;
 			}
+			else if(response.status == 400) {
+				let msg = await res.text();
+				show_message(msg);
+				return false;
+			}
 		}
 
 		let response = await api.fetchApi("/manager/reboot");

js/comfyui-manager.js

@@ -11,11 +11,12 @@ import {
 	showYouMLShareDialog
 } from "./comfyui-share-common.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
-import { free_models, install_pip, install_via_git_url, manager_instance, rebootAPI, migrateAPI, setManagerInstance, show_message } from "./common.js";
+import {
+	free_models, install_pip, install_via_git_url, manager_instance,
+	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.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 { set_double_click_policy } from "./node_fixer.js";
 import { SnapshotManager } from "./snapshot.js";
 
 var docStyle = document.createElement('style');
@@ -39,9 +40,9 @@ docStyle.innerHTML = `
 
 #cm-manager-dialog {
 	width: 1000px;
-	height: 520px;
+	height: 450px;
 	box-sizing: content-box;
-	z-index: 10000;
+	z-index: 1000;
 	overflow-y: auto;
 }
 
@@ -49,7 +50,7 @@ docStyle.innerHTML = `
 	width: 400px;
 	height: 25px;
 	box-sizing: border-box;
-	z-index: 10000;
+	z-index: 1000;
 	margin-top: 10px;
 	margin-bottom: 5px;
 }
@@ -101,24 +102,6 @@ docStyle.innerHTML = `
 	vertical-align: middle;
 }
 
-#cm-channel-badge {
-	color: white;
-	background-color: #AA0000;
-	width: 220px;
-	height: 23px;
-	font-size: 13px;
-	border-radius: 5px;
-	left: 5px;
-	top: 5px;
-	align-content: center;
-	justify-content: center;
-	text-align: center;
-	font-weight: bold;
-	float: left;
-	vertical-align: middle;
-	position: relative;
-}
-
 #custom-nodes-grid a {
 	color: #5555FF;
 	font-weight: bold;
@@ -154,7 +137,7 @@ docStyle.innerHTML = `
 
 .cm-notice-board {
 	width: 290px;
-	height: 270px;
+	height: 210px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -242,7 +225,6 @@ var update_comfyui_button = null;
 var switch_comfyui_button = null;
 var fetch_updates_button = null;
 var update_all_button = null;
-var badge_mode = "none";
 let share_option = 'all';
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -424,14 +406,6 @@ const style = `
 }
 `;
 
-
-
-async function init_badge_mode() {
-	api.fetchApi('/manager/badge_mode')
-		.then(response => response.text())
-		.then(data => { badge_mode = data; })
-}
-
 async function init_share_option() {
 	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
@@ -448,7 +422,6 @@ async function init_notice(notice) {
 		})
 }
 
-await init_badge_mode();
 await init_share_option();
 
 async function fetchNicknames() {
@@ -515,65 +488,6 @@ function getNickname(node, nodename) {
 	}
 }
 
-function drawBadge(node, orig, restArgs) {
-	let ctx = restArgs[0];
-	const r = orig?.apply?.(node, restArgs);
-
-	if (!node.flags.collapsed && badge_mode != 'none' && node.constructor.title_mode != LiteGraph.NO_TITLE) {
-		let text = "";
-		if (badge_mode.startsWith('id_nick'))
-			text = `#${node.id} `;
-
-		let nick = node.getNickname();
-		if (nick) {
-			if (nick == 'ComfyUI') {
-				if(badge_mode.endsWith('hide')) {
-					nick = "";
-				}
-				else {
-					nick = "🦊"
-				}
-			}
-
-			if (nick.length > 25) {
-				text += nick.substring(0, 23) + "..";
-			}
-			else {
-				text += nick;
-			}
-		}
-
-		if (text != "") {
-			let fgColor = "white";
-			let bgColor = "#0F1F0F";
-			let visible = true;
-
-			ctx.save();
-			ctx.font = "12px sans-serif";
-			const sz = ctx.measureText(text);
-			ctx.fillStyle = bgColor;
-			ctx.beginPath();
-			ctx.roundRect(node.size[0] - sz.width - 12, -LiteGraph.NODE_TITLE_HEIGHT - 20, sz.width + 12, 20, 5);
-			ctx.fill();
-
-			ctx.fillStyle = fgColor;
-			ctx.fillText(text, node.size[0] - sz.width - 6, -LiteGraph.NODE_TITLE_HEIGHT - 6);
-			ctx.restore();
-
-			if (node.has_errors) {
-				ctx.save();
-				ctx.font = "bold 14px sans-serif";
-				const sz2 = ctx.measureText(node.type);
-				ctx.fillStyle = 'white';
-				ctx.fillText(node.type, node.size[0] / 2 - sz2.width / 2, node.size[1] / 2);
-				ctx.restore();
-			}
-		}
-	}
-	return r;
-}
-
-
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
@@ -610,7 +524,7 @@ async function updateComfyUI() {
 
 function showVersionSelectorDialog(versions, current, onSelect) {
 		const dialog = new ComfyDialog();
-		dialog.element.style.zIndex = 100003;
+		dialog.element.style.zIndex = 1100;
 		dialog.element.style.width = "300px";
 		dialog.element.style.padding = "0";
 		dialog.element.style.backgroundColor = "#2a2a2a";
@@ -710,7 +624,7 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 							onSelect(selectedVersion);
 							dialog.close();
 						} else {
-							alert("Please select a version.");
+							customAlert("Please select a version.");
 						}
 					},
 					style: {
@@ -897,11 +811,15 @@ const isOutputNode = (node) => {
 class ManagerMenuDialog extends ComfyDialog {
 	createControlsMid() {
 		let self = this;
+    const isElectron = 'electronAPI' in window;
 
 		update_comfyui_button =
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => updateComfyUI()
 			});
@@ -910,6 +828,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Switch ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => switchComfyUI()
 			});
@@ -972,8 +893,8 @@ class ManagerMenuDialog extends ComfyDialog {
 				$el("button.cm-button", {
 					type: "button",
 					textContent: "Install via Git URL",
-					onclick: () => {
+					onclick: async () => {
-						var url = prompt("Please enter the URL of the Git repository to install", "");
+						var url = await customPrompt("Please enter the URL of the Git repository to install", "");
 
 						if (url !== null) {
 							install_via_git_url(url, self);
@@ -987,19 +908,6 @@ class ManagerMenuDialog extends ComfyDialog {
 				switch_comfyui_button,
 				fetch_updates_button,
 
-				$el("br", {}, []),
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Alternatives of A1111",
-					onclick:
-						() => {
-							if(!CustomNodesManager.instance) {
-								CustomNodesManager.instance = new CustomNodesManager(app, self);
-							}
-							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
-						}
-				}),
-
 				$el("br", {}, []),
 				$el("button.cm-button-red", {
 					type: "button",
@@ -1048,7 +956,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.className = "cm-menu-combo";
 		this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
-		this.datasrc_combo.appendChild($el('option', { value: 'url', text: 'DB: Channel (remote)' }, []));
+		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
 
 		// preview method
 		let preview_combo = document.createElement("select");
@@ -1067,32 +975,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
 		});
 
-		// nickname
-		let badge_combo = "";
-		if(is_legacy_front()) {
-            badge_combo = document.createElement("select");
-            badge_combo.setAttribute("title", "Configure the content to be displayed on the badge at the top right corner of the node. The ID is the identifier of the node. If 'hide built-in' is selected, both unknown nodes and built-in nodes will be omitted, making them indistinguishable");
-            badge_combo.className = "cm-menu-combo";
-            badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick_hide', text: 'Badge: Nickname (hide built-in)' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick', text: 'Badge: #ID Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick_hide', text: 'Badge: #ID Nickname (hide built-in)' }, []));
-
-            api.fetchApi('/manager/badge_mode')
-                .then(response => response.text())
-                .then(data => { badge_combo.value = data; badge_mode = data; });
-
-            badge_combo.addEventListener('change', function (event) {
-                api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
-                badge_mode = event.target.value;
-                app.graph.setDirtyCanvas(true);
-            });
-		}
-
 		// 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. Note that the badge utilizes local information.");
+		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('/manager/channel_url_list')
 			.then(response => response.json())
@@ -1117,21 +1002,6 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});
 
-		// default ui state
-		let default_ui_combo = document.createElement("select");
-		default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
-		default_ui_combo.className = "cm-menu-combo";
-		default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
-		api.fetchApi('/manager/default_ui')
-			.then(response => response.text())
-			.then(data => { default_ui_combo.value = data; });
-
-		default_ui_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
-		});
-
 
 		// share
 		let share_combo = document.createElement("select");
@@ -1169,28 +1039,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			set_component_policy(event.target.value);
 		});
 
-		let dbl_click_policy_combo = document.createElement("select");
-		dbl_click_policy_combo.setAttribute("title", "Sets the behavior when you double-click the title area of a node.");
-		dbl_click_policy_combo.className = "cm-menu-combo";
-		dbl_click_policy_combo.appendChild($el('option', { value: 'none', text: 'Double-Click: None' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-all', text: 'Double-Click: Copy All Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-full', text: 'Double-Click: Copy All Connections and shape' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-input', text: 'Double-Click: Copy Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'possible-input', text: 'Double-Click: Possible Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'dual', text: 'Double-Click: Possible(left) + Copy(right)' }, []));
-
-		api.fetchApi('/manager/dbl_click/policy')
-			.then(response => response.text())
-			.then(data => {
-				dbl_click_policy_combo.value = data;
-				set_double_click_policy(data);
-			});
-
-		dbl_click_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/dbl_click/policy?value=${event.target.value}`);
-			set_double_click_policy(event.target.value);
-		});
-
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1216,11 +1064,8 @@ class ManagerMenuDialog extends ComfyDialog {
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			badge_combo,
-			default_ui_combo,
 			share_combo,
 			component_policy_combo,
-			dbl_click_policy_combo,
 			$el("br", {}, []),
 
 			$el("br", {}, []),
@@ -1240,8 +1085,8 @@ class ManagerMenuDialog extends ComfyDialog {
 						type: "button",
 						textContent: "Install PIP packages",
 						onclick:
-							() => {
+							async () => {
-								var url = prompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
+								var url = await customPrompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
 
 								if (url !== null) {
 									install_pip(url, self);
@@ -1401,10 +1246,22 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
 	}
 
+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
+
 	show() {
 		this.element.style.display = "block";
 	}
 
+	toggleVisibility() {
+		if (this.isVisible) {
+			this.close();
+		} else {
+			this.show();
+		}
+	}
+
 	handleWorkflowGalleryButtonClick(e) {
 		e.preventDefault();
 		e.stopPropagation();
@@ -1505,9 +1362,58 @@ class ManagerMenuDialog extends ComfyDialog {
 	}
 }
 
+async function getVersion() {
+	let version = await api.fetchApi(`/manager/version`);
+	return await version.text();
+}
+
 
 app.registerExtension({
 	name: "Comfy.ManagerMenu",
+
+	aboutPageBadges: [
+		{
+			label: `ComfyUI-Manager ${await getVersion()}`,
+			url: 'https://github.com/ltdrdata/ComfyUI-Manager',
+			icon: 'pi pi-th-large'
+		}
+	],
+
+	commands: [
+	{
+		id: "Comfy.Manager.Menu.ToggleVisibility",
+		label: "Toggle Manager Menu Visibility",
+		icon: "mdi mdi-puzzle",
+		function: () => {
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+				manager_instance.show();
+			} else {
+				manager_instance.toggleVisibility();
+			}
+		},
+	},
+	{
+		id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
+		label: "Toggle Custom Nodes Manager Visibility",
+		icon: "pi pi-server",
+		function: () => {
+			if (CustomNodesManager.instance?.isVisible) {
+				CustomNodesManager.instance.close();
+				return;
+			}
+
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+			}
+			if (!CustomNodesManager.instance) {
+				CustomNodesManager.instance = new CustomNodesManager(app, self);
+			}
+			CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
+		},
+	}
+	],
+
 	init() {
 		$el("style", {
 			textContent: style,
@@ -1647,32 +1553,6 @@ app.registerExtension({
 		this._addExtraNodeContextMenu(nodeType, app);
 	},
 
-	async nodeCreated(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
-                let orig = node.onDrawForeground;
-                if(!orig)
-                    orig = node.__proto__.onDrawForeground;
-
-                node.onDrawForeground = function (ctx) {
-                    drawBadge(node, orig, arguments)
-                };
-                node.badge_enabled = true;
-            }
-		}
-	},
-
-	async loadedGraphNode(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                const orig = node.onDrawForeground;
-                node.getNickname = function () { return getNickname(node, node.type.trim()) };
-                node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
-            }
-		}
-	},
-
 	_addExtraNodeContextMenu(node, app) {
 		const origGetExtraMenuOptions = node.prototype.getExtraMenuOptions;
 		node.prototype.cm_menu_added = true;
@@ -1728,27 +1608,3 @@ app.registerExtension({
 		}
 	},
 });
-
-
-async function set_default_ui()
-{
-	let res = await api.fetchApi('/manager/default_ui');
-	if(res.status == 200) {
-		let mode = await res.text();
-		switch(mode) {
-		case 'history':
-			app.ui.queue.hide();
-			app.ui.history.show();
-			break;
-		case 'queue':
-			app.ui.queue.show();
-			app.ui.history.hide();
-			break;
-		default:
-			// do nothing
-			break;
-		}
-	}
-}
-
-set_default_ui();

js/comfyui-share-common.js

@@ -4,6 +4,7 @@ import { $el, ComfyDialog } from "../../scripts/ui.js";
 import { CopusShareDialog } from "./comfyui-share-copus.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import { YouMLShareDialog } from "./comfyui-share-youml.js";
+import { customAlert } from "./common.js";
 
 export const SUPPORTED_OUTPUT_NODE_TYPES = [
 	"PreviewImage",
@@ -252,9 +253,9 @@ export const showShareDialog = async (share_option) => {
         if (potential_output_nodes.length === 0) {
           // todo: add support for other output node types (animatediff combine, etc.)
           const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
-          alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
+          customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
         } else {
-          alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
+          customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
         }
         return false;
       }
@@ -512,7 +513,7 @@ export class ShareDialogChooser extends ComfyDialog {
 	}
 	show() {
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1099;
 	}
 }
 export class ShareDialog extends ComfyDialog {
@@ -861,7 +862,7 @@ export class ShareDialog extends ComfyDialog {
 			if (destinations.includes("matrix")) {
 				let definedMatrixAuth = !!this.matrix_homeserver_input.value && !!this.matrix_username_input.value && !!this.matrix_password_input.value;
 				if (!definedMatrixAuth) {
-					alert("Please set your Matrix account details.");
+					customAlert("Please set your Matrix account details.");
 					return;
 				}
 			}
@@ -878,9 +879,9 @@ export class ShareDialog extends ComfyDialog {
 				if (potential_output_nodes.length === 0) {
 					// todo: add support for other output node types (animatediff combine, etc.)
 					const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
-					alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
+					customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
 				} else {
-					alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
+					customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
 				}
 				this.selectedOutputIndex = 0;
 				this.close();
@@ -918,16 +919,16 @@ export class ShareDialog extends ComfyDialog {
 				try {
 					const response_json = await response.json();
 					if (response_json.error) {
-						alert(response_json.error);
+						customAlert(response_json.error);
 						this.close();
 						return;
 					} else {
-						alert("Failed to share your art. Please try again.");
+						customAlert("Failed to share your art. Please try again.");
 						this.close();
 						return;
 					}
 				} catch (e) {
-					alert("Failed to share your art. Please try again.");
+					customAlert("Failed to share your art. Please try again.");
 					this.close();
 					return;
 				}

js/comfyui-share-copus.js

@@ -1,5 +1,7 @@
 import { app } from "../../scripts/app.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
+
 const env = "prod";
 
 let DEFAULT_HOMEPAGE_URL = "https://copus.io";
@@ -603,7 +605,7 @@ export class CopusShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";

js/comfyui-share-openart.js

@@ -1,6 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
 
 const LOCAL_STORAGE_KEY = "openart_comfy_workflow_key";
 const DEFAULT_HOMEPAGE_URL = "https://openart.ai/workflows/dev?developer=true";
@@ -431,7 +432,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";

js/comfyui-share-youml.js

@@ -1,6 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
 
 const BASE_URL = "https://youml.com";
 //const BASE_URL = "http://localhost:3000";
@@ -347,7 +348,7 @@ export class YouMLShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     } finally {
       this.shareButton.disabled = false;
       this.shareButton.textContent = "Share";

js/common.js

@@ -2,36 +2,188 @@ import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
 
+
+function internalCustomConfirm(message, confirmMessage, cancelMessage) {
+	return new Promise((resolve) => {
+		// transparent bg
+		const modalOverlay = document.createElement('div');
+		modalOverlay.style.position = 'fixed';
+		modalOverlay.style.top = 0;
+		modalOverlay.style.left = 0;
+		modalOverlay.style.width = '100%';
+		modalOverlay.style.height = '100%';
+		modalOverlay.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+		modalOverlay.style.display = 'flex';
+		modalOverlay.style.alignItems = 'center';
+		modalOverlay.style.justifyContent = 'center';
+		modalOverlay.style.zIndex = '1101';
+
+		// Modal window container (dark bg)
+		const modalDialog = document.createElement('div');
+		modalDialog.style.backgroundColor = '#333';
+		modalDialog.style.padding = '20px';
+		modalDialog.style.borderRadius = '4px';
+		modalDialog.style.maxWidth = '400px';
+		modalDialog.style.width = '80%';
+		modalDialog.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.5)';
+		modalDialog.style.color = '#fff';
+
+		// Display message
+		const modalMessage = document.createElement('p');
+		modalMessage.textContent = message;
+		modalMessage.style.margin = '0';
+		modalMessage.style.padding = '0 0 20px';
+		modalMessage.style.wordBreak = 'keep-all';
+
+		// Button container
+		const modalButtons = document.createElement('div');
+		modalButtons.style.display = 'flex';
+		modalButtons.style.justifyContent = 'flex-end';
+
+		// Confirm button (green)
+		const confirmButton = document.createElement('button');
+		if(confirmMessage)
+			confirmButton.textContent = confirmMessage;
+		else
+			confirmButton.textContent = 'Confirm';
+		confirmButton.style.marginLeft = '10px';
+		confirmButton.style.backgroundColor = '#28a745'; // green
+		confirmButton.style.color = '#fff';
+		confirmButton.style.border = 'none';
+		confirmButton.style.padding = '6px 12px';
+		confirmButton.style.borderRadius = '4px';
+		confirmButton.style.cursor = 'pointer';
+		confirmButton.style.fontWeight = 'bold';
+
+		// Cancel button (red)
+		const cancelButton = document.createElement('button');
+		if(cancelMessage)
+			cancelButton.textContent = cancelMessage;
+		else
+			cancelButton.textContent = 'Cancel';
+
+		cancelButton.style.marginLeft = '10px';
+		cancelButton.style.backgroundColor = '#dc3545'; // red
+		cancelButton.style.color = '#fff';
+		cancelButton.style.border = 'none';
+		cancelButton.style.padding = '6px 12px';
+		cancelButton.style.borderRadius = '4px';
+		cancelButton.style.cursor = 'pointer';
+		cancelButton.style.fontWeight = 'bold';
+
+		const closeModal = () => {
+			document.body.removeChild(modalOverlay);
+		};
+
+		confirmButton.addEventListener('click', () => {
+			closeModal();
+			resolve(true);
+		});
+
+		cancelButton.addEventListener('click', () => {
+			closeModal();
+			resolve(false);
+		});
+
+		modalButtons.appendChild(confirmButton);
+		modalButtons.appendChild(cancelButton);
+		modalDialog.appendChild(modalMessage);
+		modalDialog.appendChild(modalButtons);
+		modalOverlay.appendChild(modalDialog);
+		document.body.appendChild(modalOverlay);
+	});
+}
+
 export function show_message(msg) {
 	app.ui.dialog.show(msg);
-	app.ui.dialog.element.style.zIndex = 10010;
+	app.ui.dialog.element.style.zIndex = 1100;
 }
 
 export async function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+export async function customConfirm(message) {
+	try {
+		let res = await
+			window['app'].extensionManager.dialog
+			.confirm({
+				title: 'Confirm',
+				message: message
+			});
+
+		return res;
+	}
+	catch {
+		let res = await internalCustomConfirm(message);
+		return res;
+	}
+}
+
+
+export function customAlert(message) {
+	try {
+		window['app'].extensionManager.toast.addAlert(message);
+	}
+	catch {
+		alert(message);
+	}
+}
+
+export function infoToast(summary, message) {
+	try {
+		app.extensionManager.toast.add({
+			severity: 'info',
+			summary: summary,
+			detail: message,
+			life: 3000
+		})
+	}
+	catch {
+		// do nothing
+	}
+}
+
+
+export async function customPrompt(title, message) {
+	try {
+		let res = await
+				window['app'].extensionManager.dialog
+				.prompt({
+					title: title,
+					message: message
+				});
+
+		return res;
+	}
+	catch {
+		return prompt(title, message)
+	}
+}
+
+
 export function rebootAPI() {
 	if ('electronAPI' in window) {
-      		window.electronAPI.restartApp();
+			window.electronAPI.restartApp();
-      		return true;
+			return true;
-    	}
-	if (confirm("Are you sure you'd like to reboot the server?")) {
-		try {
-			api.fetchApi("/manager/reboot");
-		}
-		catch(exception) {
-
-		}
-		return true;
 	}
 
+	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
+		if (isConfirmed) {
+			try {
+				api.fetchApi("/manager/reboot");
+			}
+			catch(exception) {}
+		}
+	});
+
 	return false;
 }
 
 
 export async function migrateAPI() {
-	if (confirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")) {
+	let confirmed = await customConfirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")
+	if (confirmed) {
 		try {
 			await api.fetchApi("/manager/migrate_unmanaged_nodes");
 			api.fetchApi("/manager/reboot");
@@ -259,3 +411,12 @@ export const icons = {
 	passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
 	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
 }
+
+export function sanitizeHTML(str) {
+    return str
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;")
+        .replace(/'/g, "&#039;");
+}

js/components-manager.js

@@ -1,6 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js"
-import { sleep, show_message } from "./common.js";
+import { sleep, show_message, customConfirm, customAlert } from "./common.js";
 import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 
@@ -365,7 +365,7 @@ function checkVersion(name, component) {
 	return msg;
 }
 
-function handle_import_components(components) {
+async function handle_import_components(components) {
 	let msg = 'Components:\n';
 	let cnt = 0;
 	for(let name in components) {
@@ -387,8 +387,9 @@ function handle_import_components(components) {
 
 	let last_name = null;
 	msg += '\nWill you load components?\n';
-	if(confirm(msg)) {
+	const confirmed = await customConfirm(msg);
-		let mode = confirm('\nWill you save components?\n(cancel=load without save)');
+	if(confirmed) {
+		const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
 
 		for(let name in components) {
 			let component = components[name];
@@ -411,7 +412,7 @@ function handle_import_components(components) {
 	}
 }
 
-function handlePaste(e) {
+async function handlePaste(e) {
 	let data = (e.clipboardData || window.clipboardData);
 	const items = data.items;
 	for(const item of items) {
@@ -421,7 +422,7 @@ function handlePaste(e) {
 				let json_data = JSON.parse(data);
 				if(json_data.kind == 'ComfyUI Components' && last_paste_timestamp != json_data.timestamp) {
 					last_paste_timestamp = json_data.timestamp;
-					handle_import_components(json_data.components);
+					await handle_import_components(json_data.components);
 
 					// disable paste node
 					localStorage.removeItem("litegrapheditor_clipboard", null);
@@ -455,7 +456,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 		this.invalidateControl();
 
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1099;
 		this.element.style.width = "500px";
 		this.element.style.height = "480px";
 	}
@@ -621,7 +622,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 				self.version_string.value = self.default_ver;
 			}
 			else {
-				alert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
+				customAlert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
 			}
 		};
 
@@ -677,7 +678,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 
 let orig_handleFile = app.handleFile;
 
-function handleFile(file) {
+async function handleFile(file) {
 	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
 		const reader = new FileReader();
 		reader.onload = async () => {
@@ -690,7 +691,7 @@ function handleFile(file) {
 			}
 
 			if(is_component) {
-				handle_import_components(jsonContent);
+				await handle_import_components(jsonContent);
 			}
 			else {
 				orig_handleFile.call(app, file);

js/custom-nodes-manager.js

@@ -4,7 +4,7 @@ import { api } from "../../scripts/api.js";
 
 import {
 	manager_instance, rebootAPI, install_via_git_url,
-	fetchData, md5, icons, show_message
+	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt, sanitizeHTML, infoToast
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
@@ -13,7 +13,7 @@ import TG from "./turbogrid.esm.js";
 const pageCss = `
 .cn-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 10001;
+	z-index: 1099;
 	width: 80%;
 	height: 80%;
 	display: flex;
@@ -55,6 +55,24 @@ const pageCss = `
 	color: white;
 }
 
+.cn-manager .cn-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
+.cn-manager .cn-manager-back {
+	align-items: center;
+	justify-content: center;
+}
+
+.arrow-icon {
+	height: 1em;
+	width: 1em;
+	margin-right: 5px;
+	transform: translateY(2px);
+}
+
 .cn-manager-header {
 	display: flex;
 	flex-wrap: wrap;
@@ -238,6 +256,13 @@ const pageCss = `
 	color: white;
 }
 
+.cn-manager .cn-btn-import-failed {
+	background-color: #AA1111;
+    font-size: 10px;
+	font-weight: bold;
+	color: white;
+}
+
 .cn-manager .cn-btn-install {
 	background-color: black;
 	color: white;
@@ -325,8 +350,14 @@ const pageHtml = `
 <div class="cn-manager-selection"></div>
 <div class="cn-manager-message"></div>
 <div class="cn-manager-footer">
-	<button class="cn-manager-back">◀ Back</button>
+	<button class="cn-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
 	<button class="cn-manager-restart">Restart</button>
+	<button class="cn-manager-stop">Stop</button>
 	<div class="cn-flex-auto"></div>
 	<button class="cn-manager-check-update">Check Update</button>
 	<button class="cn-manager-check-missing">Check Missing</button>
@@ -367,6 +398,9 @@ export class CustomNodesManager {
 		this.restartMap = {};
 
 		this.init();
+
+        api.addEventListener("cm-queue-status", this.onQueueStatus);
+        api.addEventListener('reconnected', this.onReconnected);
 	}
 
 	init() {
@@ -389,7 +423,7 @@ export class CustomNodesManager {
 
 	showVersionSelectorDialog(versions, onSelect) {
 		const dialog = new ComfyDialog();
-		dialog.element.style.zIndex = 100003;
+		dialog.element.style.zIndex = 1100;
 		dialog.element.style.width = "300px";
 		dialog.element.style.padding = "0";
 		dialog.element.style.backgroundColor = "#2a2a2a";
@@ -489,7 +523,7 @@ export class CustomNodesManager {
 							onSelect(selectedVersion);
 							dialog.close();
 						} else {
-							alert("Please select a version.");
+							customAlert("Please select a version.");
 						}
 					},
 					style: {
@@ -729,10 +763,16 @@ export class CustomNodesManager {
 
 			".cn-manager-restart": {
 				click: () => {
-					if(rebootAPI()) {
+					this.close();
-						this.close();
+					this.manager_dialog.close();
-						this.manager_dialog.close();
+					rebootAPI();
-					}
+				}
+			},
+
+			".cn-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
 
@@ -753,8 +793,8 @@ export class CustomNodesManager {
 			},
 
 			".cn-manager-install-url": {
-				click: (e) => {
+				click: async (e) => {
-					const url = prompt("Please enter the URL of the Git repository to install", "");
+					const url = await customPrompt("Please enter the URL of the Git repository to install", "");
 					if (url !== null) {
 						install_via_git_url(url, this.manager_dialog);
 					}
@@ -855,6 +895,38 @@ export class CustomNodesManager {
 		return this.filter === ShowMode.ALTERNATIVES
 	}
 
+	async handleImportFail(rowItem) {
+		var info;
+		if(rowItem.version == 'unknown'){
+			info = {
+				'url': rowItem.originalData.files[0]
+			};
+		}
+		else{
+			info = {
+				'cnr_id': rowItem.originalData.id
+			};
+		}
+
+		const response = await api.fetchApi(`/customnode/import_fail_info`, {
+									method: 'POST',
+									headers: { 'Content-Type': 'application/json' },
+									body: JSON.stringify(info)
+								});
+
+		let res = await response.json();
+
+		let title = `<FONT COLOR=GREEN><B>Error message occurred while importing the '${rowItem.title}' module.</B></FONT><BR><HR><BR>`
+
+		if(res.code == 400)
+		{
+			show_message(title+'The information is not available.')
+		}
+		else {
+			show_message(title+sanitizeHTML(res['msg']).replace(/ /g, '&nbsp;').replace(/\n/g, '<BR>'));
+		}
+	}
+
 	renderGrid() {
 
 		// update theme
@@ -888,6 +960,7 @@ export class CustomNodesManager {
 			}
 		}
 
+		let self = this;
 		const columns = [{
 			id: 'id',
 			name: 'ID',
@@ -901,16 +974,32 @@ export class CustomNodesManager {
 			maxWidth: 500,
 			classMap: 'cn-node-name',
 			formatter: (title, rowItem, columnItem) => {
-			    var prefix = '';
+				const container = document.createElement('div');
-			    if(rowItem.action === 'invalid-installation') {
-			        prefix = '<font color="red"><B>(INVALID)</B></font>';
-			    }
 
-			    else if(rowItem.action === 'import-fail') {
+				if (rowItem.action === 'invalid-installation') {
-			        prefix = '<font color="red"><B>(IMPORT FAILED)</B></font>';
+					const invalidTag = document.createElement('span');
-			    }
+					invalidTag.style.color = 'red';
+					invalidTag.innerHTML = '<b>(INVALID)</b>';
+					container.appendChild(invalidTag);
+				} else if (rowItem.action === 'import-fail') {
+					const button = document.createElement('button');
+					button.className = 'cn-btn-import-failed';
+					button.innerText = 'IMPORT FAILED ↗';
+					button.onclick = () => self.handleImportFail(rowItem);
+					container.appendChild(button);
+					container.appendChild(document.createElement('br'));
+				}
 
-				return `${prefix}<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
+				const link = document.createElement('a');
+				if(rowItem.originalData.repository)
+					link.href = rowItem.originalData.repository;
+				else
+					link.href = rowItem.reference;
+				link.target = '_blank';
+				link.innerHTML = `<b>${title}</b>`;
+				container.appendChild(link);
+
+				return container;
 			}
 		}, {
 			id: 'version',
@@ -1131,7 +1220,7 @@ export class CustomNodesManager {
 	}
 
 	focusInstall(item, mode) {
-		const cellNode = this.grid.getCellNode(item, "installed");
+		const cellNode = this.grid.getCellNode(item, "action");
 		if (cellNode) {
 			const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`);
 			if (cellBtn) {
@@ -1173,7 +1262,7 @@ export class CustomNodesManager {
 					version_cnt++;
 				}
 
-				if(rowItem.cnr_latest != rowItem.originalData.active_version) {
+				if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
 					versions.push('latest');
 				}
 			}
@@ -1196,18 +1285,29 @@ 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") {
 			title = title || `${list.length} custom nodes`;
-			if (!confirm(`Are you sure uninstall ${title}?`)) {
+
+			const confirmed = await customConfirm(`Are you sure uninstall ${title}?`);
+			if (!confirmed) {
 				return;
 			}
 		}
 
 		if(mode === "reinstall") {
 			title = title || `${list.length} custom nodes`;
-			if (!confirm(`Are you sure reinstall ${title}?`)) {
+
+			const confirmed = await customConfirm(`Are you sure reinstall ${title}?`);
+			if (!confirmed) {
 				return;
 			}
 		}
@@ -1217,8 +1317,15 @@ export class CustomNodesManager {
 
 		let needRestart = false;
 		let errorMsg = "";
+
+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
+			target_items.push(item);
+
 			if (!item) {
 				errorMsg = `Not found custom node: ${hash}`;
 				break;
@@ -1238,6 +1345,7 @@ export class CustomNodesManager {
 			data.selected_version = selected_version;
 			data.channel = this.channel;
 			data.mode = this.mode;
+			data.ui_id = hash;
 
 			let install_mode = mode;
 			if(mode == 'switch') {
@@ -1255,49 +1363,119 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}
 
-			const res = await api.fetchApi(`/customnode/${api_mode}`, {
+			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
 				method: 'POST',
 				body: JSON.stringify(data)
 			});
 
-			if (res.error) {
+			if (res.status != 200) {
-
 				errorMsg = `${item.title} ${mode} failed: `;
+
 				if(res.status == 403) {
 					errorMsg += `This action is not allowed with this security level configuration.`;
 				} else if(res.status == 404) {
 					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
 				} else {
-					errorMsg += res.error.message;
+					errorMsg += await res.text();
 				}
 
 				break;
 			}
-
-			needRestart = true;
-
-			this.grid.setRowSelected(item, false);
-			item.restart = true;
-			this.restartMap[item.hash] = true;
-			this.grid.updateCell(item, "action");
-
-			//console.log(res.data);
-
 		}
 
+		this.install_context = {btn: btn, targets: target_items};
+
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
+
+			// reset
+			for(let k in target_items) {
+				let item = this.install_context.targets[k];
+				this.grid.updateCell(item, "action");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+		}
+	}
+
+	async onReconnected(event) {
+		let self = CustomNodesManager.instance;
+
+		if(self.need_restart) {
+			self.need_restart = false;
+
+			const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
+			if (!confirmed) {
+				return;
+			}
+
+			window.location.reload(true);
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = CustomNodesManager.instance;
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);
+
+			item.restart = true;
+			self.restartMap[item.hash] = true;
+			self.grid.updateCell(item, "action");
+			self.grid.setRowSelected(item, false);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}
+
+	async onQueueCompleted(info) {
+		let result = info.nodepack_result;
+
+		if(result.length == 0) {
+			return;
+		}
+
+		let self = CustomNodesManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		const { target, label, mode } = self.install_context.btn;
 		target.classList.remove("cn-btn-loading");
 
+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success')
+				errorMsg += v+'\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "action");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`${label} ${list.length} custom node(s) successfully`);
+			self.showStatus(`${label} ${result.length} custom node(s) successfully`);
 		}
 
-		if (needRestart) {
+		self.showRestart();
-			this.showRestart();
+		self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red");
-			this.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red")
-		}
 
+		infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}
 
 	// ===========================================================================================
@@ -1522,6 +1700,9 @@ export class CustomNodesManager {
 		for (const k in node_packs) {
 			let item = node_packs[k];
 			item.originalData = JSON.parse(JSON.stringify(item));
+			if(item.originalData.id == undefined) {
+				item.originalData.id = k;
+			}
 			item.hash = md5(k);
 		}
 
@@ -1675,9 +1856,9 @@ export class CustomNodesManager {
 	}
 
 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cn-manager-close");
 		const $restart = this.element.querySelector(".cn-manager-restart");
+		const $stop = this.element.querySelector(".cn-manager-stop");
 
 		const list = [
 			".cn-manager-header input",
@@ -1689,7 +1870,7 @@ export class CustomNodesManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close && it !== $restart;
+			return it !== $close && it !== $restart && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -1708,6 +1889,15 @@ export class CustomNodesManager {
 
 	showRestart() {
 		this.element.querySelector(".cn-manager-restart").style.display = "block";
+		this.need_restart = true;
+	}
+
+	showStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "none";
 	}
 
 	setFilter(filterValue) {
@@ -1737,4 +1927,8 @@ export class CustomNodesManager {
 	close() {
 		this.element.style.display = "none";
 	}
+
+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
 }

js/model-manager.js

@@ -1,8 +1,10 @@
+import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
-	fetchData, md5, icons 
+	fetchData, md5, icons, show_message, customAlert, infoToast
 } from  "./common.js";
+import { api } from "../../scripts/api.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
@@ -10,7 +12,7 @@ import TG from "./turbogrid.esm.js";
 const pageCss = `
 .cmm-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 10001;
+	z-index: 1099;
 	width: 80%;
 	height: 80%;
 	display: flex;
@@ -46,6 +48,18 @@ const pageCss = `
 	background-color: var(--comfy-input-bg);
 }
 
+.cmm-manager .cmm-manager-refresh {
+	display: none;
+	background-color: #000080;
+	color: white;
+}
+
+.cmm-manager .cmm-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
 .cmm-manager-header {
 	display: flex;
 	flex-wrap: wrap;
@@ -235,7 +249,14 @@ const pageHtml = `
 <div class="cmm-manager-selection"></div>
 <div class="cmm-manager-message"></div>
 <div class="cmm-manager-footer">
-	<button class="cmm-manager-back">Back</button>
+	<button class="cmm-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
+	<button class="cmm-manager-refresh">Refresh</button>
+	<button class="cmm-manager-stop">Stop</button>
 	<div class="cmm-flex-auto"></div>
 </div>
 `;
@@ -254,6 +275,8 @@ export class ModelManager {
 		this.keywords = '';
 
 		this.init();
+
+		api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}
 
 	init() {
@@ -365,12 +388,25 @@ export class ModelManager {
 				}
 			},
 
+			".cmm-manager-refresh": {
+				click: () => {
+					app.refreshComboInNodes();
+				}
+			},
+
+			".cmm-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+				}
+			},
+
 			".cmm-manager-back": {
 				click: (e) => {
 				    this.close()
 				    manager_instance.show();
 				}
-			},
+			}
 		};
 		Object.keys(eventsMap).forEach(selector => {
 			const target = this.element.querySelector(selector);
@@ -595,17 +631,28 @@ 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.showLoading();
 		this.showError("");
 
-		let needRestart = false;
+		let needRefresh = false;
 		let errorMsg = "";
 
+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const item of list) {
-			
 			this.grid.scrollRowIntoView(item);
+			target_items.push(item);
 
 			if (!this.focusInstall(item)) {
 				this.grid.onNextUpdated(() => {
@@ -616,48 +663,104 @@ export class ModelManager {
 			this.showStatus(`Install ${item.name} ...`);
 
 			const data = item.originalData;
-			const res = await fetchData('/model/install', {
+			data.ui_id = item.hash;
+
+			const res = await api.fetchApi(`/manager/queue/install_model`, {
 				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify(data)
 			});
 
-
+			if (res.status != 200) {
-			if (res.error) {
 				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
-				break;;
+				break;
 			}
+		}
 
-			needRestart = true;
+		this.install_context = {btn: btn, targets: target_items};
 
-			this.grid.setRowSelected(item, false);
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
+
+			// reset
+			for (const hash of list) {
+				const item = this.grid.getRowItemBy("hash", hash);
+				this.grid.updateCell(item, "installed");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = ModelManager.instance;
+
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);
 
 			item.refresh = true;
+			self.grid.setRowSelected(item, false);
 			item.selectable = false;
-			this.grid.updateCell(item, "installed");
+//			self.grid.updateCell(item, "tg-column-select");
-			this.grid.updateCell(item, "tg-column-select");
+			self.grid.updateRow(item);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}
 
-			this.showStatus(`Install ${item.name} successfully`);
+	async onQueueCompleted(info) {
+		let result = info.model_result;
 
+		if(result.length == 0) {
+			return;
 		}
 
-		this.hideLoading();
+		let self = ModelManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		let btn = self.install_context.btn;
+
+		self.hideLoading();
 		btn.classList.remove("cmm-btn-loading");
 
+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success')
+				errorMsg += v + '\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "installed");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`Install ${list.length} models successfully`);
+			self.showStatus(`Install ${result.length} models successfully`);
 		}
 
-		if (needRestart) {
+		self.showRefresh();
-			this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red")
+		self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")
-		}
 
+		infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}
 
 	getModelList(models) {
-
 		const typeMap = new Map();
 		const baseMap = new Map();
 
@@ -826,7 +929,7 @@ export class ModelManager {
 	}
 
 	showLoading() {
-		this.setDisabled(true);
+//		this.setDisabled(true);
 		if (this.grid) {
 			this.grid.showLoading();
 			this.grid.showMask({
@@ -836,7 +939,7 @@ export class ModelManager {
 	}
 
 	hideLoading() {
-		this.setDisabled(false);
+//		this.setDisabled(false);
 		if (this.grid) {
 			this.grid.hideLoading();
 			this.grid.hideMask();
@@ -844,8 +947,9 @@ export class ModelManager {
 	}
 
 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cmm-manager-close");
+		const $refresh = this.element.querySelector(".cmm-manager-refresh");
+		const $stop = this.element.querySelector(".cmm-manager-stop");
 
 		const list = [
 			".cmm-manager-header input",
@@ -857,7 +961,7 @@ export class ModelManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close;
+			return it !== $close && it !== $refresh && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -874,6 +978,18 @@ export class ModelManager {
 
 	}
 
+	showRefresh() {
+		this.element.querySelector(".cmm-manager-refresh").style.display = "block";
+	}
+
+	showStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "none";
+	}
+
 	setKeywords(keywords = "") {
 		this.keywords = keywords;
 		this.element.querySelector(".cmm-manager-keywords").value = keywords;

js/node_fixer.js

@@ -1,16 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 
-let double_click_policy = "copy-all";
-
-api.fetchApi('/manager/dbl_click/policy')
-	.then(response => response.text())
-	.then(data => set_double_click_policy(data));
-
-export function set_double_click_policy(mode) {
-	double_click_policy = mode;
-}
-
 function addMenuHandler(nodeType, cb) {
 	const getOpts = nodeType.prototype.getExtraMenuOptions;
 	nodeType.prototype.getExtraMenuOptions = function () {
@@ -153,62 +143,6 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
 
 app.registerExtension({
 	name: "Comfy.Manager.NodeFixer",
-
-	async nodeCreated(node, app) {
-		let orig_dblClick = node.onDblClick;
-		node.onDblClick = function (e, pos, self) {
-			orig_dblClick?.apply?.(this, arguments);
-
-			if((!node.inputs && !node.outputs) || pos[1] > 0)
-				return;
-
-			switch(double_click_policy) {
-				case "copy-all":
-				case "copy-full":
-				case "copy-input":
-					{
-						if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-							return;
-
-						let src_node = lookup_nearest_nodes(node);
-						if(src_node)
-						{
-							let both_connection = double_click_policy != "copy-input";
-							let copy_shape = double_click_policy == "copy-full";
-							node_info_copy(src_node, node, both_connection, copy_shape);
-						}
-					}
-					break;
-				case "possible-input":
-					{
-						let nearest_inputs = lookup_nearest_inputs(node);
-						if(nearest_inputs)
-							connect_inputs(nearest_inputs, node);
-					}
-					break;
-				case "dual":
-					{
-						if(pos[0] < node.size[0]/2) {
-							// left: possible-input
-							let nearest_inputs = lookup_nearest_inputs(node);
-							if(nearest_inputs)
-								connect_inputs(nearest_inputs, node);
-						}
-						else {
-							// right: copy-all
-							if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-								return;
-
-							let src_node = lookup_nearest_nodes(node);
-							if(src_node)
-								node_info_copy(src_node, node, true);
-						}
-					}
-					break;
-			}
-		}
-	},
-
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({

js/snapshot.js

@@ -291,7 +291,7 @@ export class SnapshotManager extends ComfyDialog {
 		try {
 			this.invalidateControl();
 			this.element.style.display = "block";
-			this.element.style.zIndex = 10001;
+			this.element.style.zIndex = 1099;
 		}
 		catch(exception) {
 			app.ui.dialog.show(`Failed to get external model list. / ${exception}`);

js/workflow-metadata.js

@@ -17,16 +17,18 @@ import { api } from "../../scripts/api.js";
 class WorkflowMetadataExtension {
   constructor() {
     this.name = "Comfy.CustomNodesManager.WorkflowMetadata";
-    this.installedNodeVersions = {};
+    this.installedNodes = {};
     this.comfyCoreVersion = null;
   }
 
   /**
-   * Get the installed node versions
+   * Get the installed nodes info
-   * @returns {Promise<Record<string, string>>} The mapping from node name to version
+   * @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
-   * version can either be a git commit hash or a semantic version such as "1.0.0"
+   * ver can either be a git commit hash or a semantic version such as "1.0.0"
+   * cnr_id is the id of the node in the ComfyRegistry
+   * enabled is true if the node is enabled, false if it is disabled
    */
-  async getInstalledNodeVersions() {
+  async getInstalledNodes() {
     const res = await api.fetchApi("/customnode/installed");
     return await res.json();
   }
@@ -47,9 +49,13 @@ class WorkflowMetadataExtension {
       const modules = nodeData.python_module.split(".");
 
       if (modules[0] === "custom_nodes") {
-        const nodePackageName = modules[1].split("@")[0];
+        const nodePackageName = modules[1];
-        const nodeVersion = this.installedNodeVersions[nodePackageName];
+        const nodeInfo =
-        nodeVersions[nodePackageName] = nodeVersion;
+          this.installedNodes[nodePackageName] ??
+          this.installedNodes[nodePackageName.toLowerCase()];
+        if (nodeInfo) {
+          nodeVersions[nodePackageName] = nodeInfo.ver;
+        }
       } else if (["nodes", "comfy_extras"].includes(modules[0])) {
         nodeVersions["comfy-core"] = this.comfyCoreVersion;
       } else {
@@ -61,7 +67,7 @@ class WorkflowMetadataExtension {
 
   async init() {
     const extension = this;
-    this.installedNodeVersions = await this.getInstalledNodeVersions();
+    this.installedNodes = await this.getInstalledNodes();
     this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
 
     // Attach metadata when app.graphToPrompt is called.
@@ -74,7 +80,11 @@ class WorkflowMetadataExtension {
         workflow.extra = {};
       }
       const graph = this;
-      workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+      try {
+        workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+      } catch (e) {
+        console.error(e);
+      }
 
       return workflow;
     };

model-list.json

@@ -310,7 +310,7 @@
     },
     {
       "name": "negative_hand Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.",
@@ -321,7 +321,7 @@
     },
     {
       "name": "bad_prompt Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.",
@@ -332,7 +332,7 @@
     },
     {
       "name": "Deep Negative V1.75",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.",
@@ -343,7 +343,7 @@
     },
     {
       "name": "EasyNegative",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.",
@@ -488,7 +488,7 @@
       "name": "stabilityai/Stable Cascade: text_encoder (CLIP)",
       "type": "clip",
       "base": "Stable Cascade",
-      "save_path": "clip/Stable-Cascade",
+      "save_path": "text_encoders/Stable-Cascade",
       "description": "Stable Cascade: text_encoder",
       "reference": "https://huggingface.co/stabilityai/stable-cascade",
       "filename": "model.safetensors",
@@ -877,11 +877,67 @@
       "size": "5.16GB"
     },
 
+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
     {
       "name": "google-t5/t5-base",
       "type": "clip",
       "base": "t5-base",
-      "save_path": "clip/t5-base",
+      "save_path": "text_encoders/t5-base",
       "description": "T5 Base: Text-To-Text Transfer Transformer. This model can be loaded via CLIPLoader for Stable Audio workflow.",
       "reference": "https://huggingface.co/google-t5/t5-base",
       "filename": "model.safetensors",
@@ -892,7 +948,7 @@
       "name": "google-t5/t5-v1_1-xxl_encoderonly-fp16",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
       "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
       "filename": "google_t5-v1_1-xxl_encoderonly-fp16.safetensors",
@@ -903,7 +959,7 @@
       "name": "google-t5/t5-v1_1-xxl_encoderonly-fp8_e4m3fn",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
       "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
       "filename": "google_t5-v1_1-xxl_encoderonly-fp8_e4m3fn.safetensors",
@@ -916,7 +972,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_L.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_L quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_L.gguf",
@@ -927,7 +983,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
@@ -938,7 +994,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_S.gguf",
@@ -949,7 +1005,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q4_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q4_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q4_K_M.gguf",
@@ -960,7 +1016,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q4_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q4_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q4_K_S.gguf",
@@ -971,7 +1027,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q5_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q5_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q5_K_M.gguf",
@@ -982,7 +1038,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q5_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q5_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q5_K_S.gguf",
@@ -993,7 +1049,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q6_K.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q6_K quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q6_K.gguf",
@@ -1004,7 +1060,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q8_0.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q8_0 quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q8_0.gguf",
@@ -1015,7 +1071,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-f16.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (float 16)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-f16.gguf",
@@ -1026,7 +1082,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-f32.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (float 32)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-f32.gguf",
@@ -1665,17 +1721,6 @@
       "url": "https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors",
       "size": "774.5MB"
     },
-    {
-      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
-      "type": "controlnet",
-      "base": "SDXL",
-      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
-      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
-      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
-      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "size": "46.2MB"
-    },
     {
       "name": "SDXL-controlnet: OpenPose (v2)",
       "type": "controlnet",
@@ -2259,6 +2304,18 @@
       "url": "https://huggingface.co/CiaraRowles/TemporalDiff/resolve/main/temporaldiff-v1-animatediff.ckpt",
       "size": "1.67GB"
     },
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
     {
       "name": "animatediff/v2_lora_PanLeft.ckpt (ComfyUI-AnimateDiff-Evolved) (Updated path)",
       "type": "motion lora",
@@ -2746,39 +2803,6 @@
 
 
 
-    {
-      "name": "pfg-novel-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-novel-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
-      "size": "23.6MB"
-    },
-    {
-      "name": "pfg-wd14-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd14-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
-      "size": "31.5MB"
-    },
-    {
-      "name": "pfg-wd15beta2-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd15beta2-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
-      "size": "31.5MB"
-    },
     {
       "name": "GFPGANv1.4.pth",
       "type": "GFPGAN",
@@ -2944,50 +2968,6 @@
       "url": "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors",
       "size": "2.50GB"
     },
-    {
-      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_cpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_gpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
-      "type": "Shape Predictor",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "shape_predictor_68_face_landmarks.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
-      "size": "99.7MB"
-    },
-    {
-      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
-      "type": "Face Recognition",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "dlib_face_recognition_resnet_model_v1.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
-      "size": "22.5MB"
-    },
     {
       "name": "InstanceDiffusion/fusers",
       "type": "InstanceDiffusion",
@@ -3362,50 +3342,6 @@
       "url": "https://huggingface.co/lllyasviel/ic-light/resolve/main/iclight_sd15_fcon.safetensors",
       "size": "1.72GB"
     },
-    {
-      "name": "ID-Animator/animator.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models",
-      "description": "ID-Animator checkpoint",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "animator.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
-      "size": "247.3MB"
-    },
-    {
-      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/animatediff_models",
-      "description": "AnimateDiff checkpoint for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "mm_sd_v15_v2.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
-      "size": "1.82GB"
-    },
-    {
-      "name": "ID-Animator/image_encoder",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/image_encoder",
-      "description": "CLIP Image encoder for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "model.safetensors",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
-      "size": "2.53GB"
-    },
-    {
-      "name": "TencentARC/CustomNet",
-      "type": "CustomNet",
-      "base": "CustomNet",
-      "save_path": "custom_nodes/ComfyUI_CustomNet/pretrain",
-      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
-      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
-      "filename": "customnet_v1.pt",
-      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
-      "size": "5.71GB"
-    },
     {
       "name": "TTPlanet/TTPLanet_SDXL_Controlnet_Tile_Realistic v2 (fp16)",
       "type": "controlnet",
@@ -3494,17 +3430,6 @@
       "url": "https://huggingface.co/ViperYX/RGT/resolve/main/RGT_S/RGT_S_x4.pth",
       "size": "136.0MB"
     },
-    {
-      "name": "Doubiiu/ToonCrafter model checkpoint",
-      "type": "checkpoint",
-      "base": "ToonCrafter",
-      "save_path": "custom_nodes/ComfyUI-ToonCrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
-      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
-      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
-      "filename": "model.ckpt",
-      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
-      "size": "10.5GB"
-    },
 
     {
       "name": "InstantX/FLUX.1-dev Controlnet (Union)",
@@ -3943,8 +3868,9 @@
       "url": "https://huggingface.co/Kijai/DepthAnythingV2-safetensors/resolve/main/depth_anything_v2_vits_fp32.safetensors",
       "size": "99.2MB"
     },
+
     {
-      "name": "PixArt-Sigma-XL-2-1024-MS.pth",
+      "name": "PixArt-Sigma-XL-2-1024-MS.pth (checkpoint)",
       "type": "checkpoint",
       "base": "pixart-sigma",
       "save_path": "checkpoints/PixArt-Sigma",
@@ -3955,6 +3881,41 @@
       "size": "2.47GB"
     },
 
+    {
+      "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": "hunyuan_dit_1.2.safetensors",
       "type": "checkpoint",
@@ -3989,6 +3950,52 @@
       "size": "8.24GB"
     },
 
+    {
+      "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": "default",
+      "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": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
+      "type": "clip",
+      "base": "LLaVA-Llama-3",
+      "save_path": "text_encoders",
+      "description": "llava_llama3_fp8_scaled text encoder model. This is required for using Hunyuan Video.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "filename": "llava_llama3_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp8_scaled.safetensors",
+      "size": "9.09GB"
+    },
+    {
+      "name": "Comfy-Org/llava_llama3_fp16.safetensors",
+      "type": "clip",
+      "base": "LLaVA-Llama-3",
+      "save_path": "text_encoders",
+      "description": "llava_llama3_fp16 text encoder model. This is required for using Hunyuan Video.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "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": "FLUX.1 [Schnell] Diffusion model",
       "type": "diffusion_model",
@@ -4315,23 +4322,11 @@
       "size": "12.7GB"
     },
 
-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
     {
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -4342,7 +4337,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -4552,6 +4547,143 @@
       "filename": "ltx-video-2b-v0.9.safetensors",
       "url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.safetensors",
       "size": "9.37GB"
+    },
+    {
+      "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"
+    },
+
+    {
+      "name": "XLabs-AI/realism_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "realism_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/realism_lora.safetensors",
+      "size": "44.8MB"
+    },
+    {
+      "name": "XLabs-AI/art_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "art_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/scenery_lora.safetensors",
+      "size": "44.8MB"
+    },
+    {
+      "name": "XLabs-AI/mjv6_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "mjv6_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/mjv6_lora.safetensors",
+      "size": "44.8MB"
+    },
+
+    {
+      "name": "XLabs-AI/flux-ip-adapter",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/ipadapters",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-ip-adapter",
+      "filename": "ip_adapter.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
+      "size": "982MB"
+    },
+
+    {
+      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_cpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
+      "size": "106.0MB"
+    },
+    {
+      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_gpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
+      "size": "106.0MB"
+    },
+
+    {
+      "name": "TencentARC/CustomNet V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
+      "size": "5.71GB"
+    },
+    {
+      "name": "TencentARC/CustomNet Inpaint V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet Inpaint pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_inpaint_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
+      "size": "5.71GB"
     }
   ]
 }

node_db/forked/custom-node-list.json

@@ -1,5 +1,15 @@
 {
     "custom_nodes": [
+        {
+            "author": "PramaLLC",
+            "title": "ComfyUI BEN - Background Erase Network",
+            "reference": "https://github.com/PramaLLC/BEN2_ComfyUI",
+            "files": [
+                "https://github.com/PramaLLC/BEN2_ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Remove backgrounds from images with [a/BEN2](https://huggingface.co/PramaLLC/BEN2) in ComfyUI\nOriginal repo: [a/https://github.com/DoctorDiffusion/ComfyUI-BEN](https://github.com/DoctorDiffusion/ComfyUI-BEN)"
+        },
         {
             "author": "BlenderNeko",
             "title": "ltdrdata/ComfyUI_TiledKSampler",

node_db/legacy/custom-node-list.json

@@ -11,6 +11,192 @@
         
 
         
+        {
+            "author": "myAiLemon",
+            "title": "MagicGetPromptAutomatically",
+            "reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
+            "files": [
+                "https://github.com/myAiLemon/MagicGetPromptAutomatically"
+            ],
+            "install_type": "git-clone",
+            "description": "A plug-in that can automatically generate pictures and save txt files in comfyui"
+        },
+        {
+            "author": "ryanontheinside",
+            "title": "ComfyUI_ScavengerHunt [REMOVED]",
+            "reference": "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt",
+            "files": [
+                "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Compare Image Similarity (ResNet), Compare Image Similarity (CLIP), Compare Image Types\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "vpakarinen",
+            "title": "ComfyUI-GenerationTimer [REMOVED]",
+            "reference": "https://github.com/vpakarinen/ComfyUI-GenerationTimer",
+            "files": [
+                "https://github.com/vpakarinen/ComfyUI-GenerationTimer"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Generation Timer, Image Timer, Timer Display"
+        },
+        {
+            "author": "RedRayz",
+            "title": "ComfyUI-Danbooru-To-WD [REMOVED]",
+            "id": "danbooru2wd",
+            "reference": "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD",
+            "files": [
+                "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD"
+            ],
+            "install_type": "git-clone",
+            "description": "Converts booru tags to a format suitable for Waifu Diffusion(or Danbooru based models)."
+        },
+        {
+            "author": "alexgenovese",
+            "title": "comfyui_CfgPlusPlus [REMOVED]",
+            "id": "cfgpp",
+            "reference": "https://gitea.com/NotEvilGirl/cfgpp",
+            "files": [
+                "https://gitea.com/NotEvilGirl/cfgpp"
+            ],
+            "install_type": "git-clone",
+            "description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
+        },
+        {
+            "author": "hosterosi",
+            "title": "ComfyUI OpenAI Node",
+            "reference": "https://github.com/hosterosi/ComfyUI_OpenAI [REMOVED]",
+            "files": [
+                "https://github.com/hosterosi/ComfyUI_OpenAI"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI allows users to input multiline text and select a specific line by its number. The node processes the input and returns the selected line along with its index."
+        },
+        {
+            "author": "Gourieff",
+            "title": "ReActor Node for ComfyUI [DISABLED]",
+            "id": "reactor",
+            "reference": "https://github.com/Gourieff/comfyui-reactor-node",
+            "files": [
+                "https://github.com/Gourieff/comfyui-reactor-node"
+            ],
+            "install_type": "git-clone",
+            "description": "The Fast and Simple 'roop-like' Face Swap Extension Node for ComfyUI, based on ReActor (ex Roop-GE) SD-WebUI Face Swap Extension"
+        },
+        {
+            "author": "prismwastaken",
+            "title": "prism-tools [REMOVED]",
+            "reference": "https://github.com/prismwastaken/prism-comfyui-tools",
+            "files": [
+                "https://github.com/prismwastaken/prism-comfyui-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "prism-tools"
+        },
+        {
+            "author": "42lux",
+            "title": "ComfyUI-safety-checker [DEPRECATED]",
+            "reference": "https://github.com/42lux/ComfyUI-safety-checker",
+            "files": [
+                "https://github.com/42lux/ComfyUI-safety-checker"
+            ],
+            "install_type": "git-clone",
+            "description": "A NSFW/Safety Checker Node for ComfyUI."
+        },
+        {
+            "author": "riverolls",
+            "title": "ComfyUI-FJDH",
+            "reference": "https://github.com/riverolls/ComfyUI-FJDH [REMOVED]",
+            "files": [
+                "https://github.com/riverolls/ComfyUI-FJDH"
+            ],
+            "install_type": "git-clone",
+            "description": "bbox tools, image tools, mask generators, point tools"
+        },
+        {
+            "author": "jetchopper",
+            "title": "ComfyUI-GeneraNodes",
+            "id": "genera",
+            "reference": "https://github.com/evolox/ComfyUI-GeneraNodes [REMOVED]",
+            "files": [
+                "https://github.com/evolox/ComfyUI-GeneraNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Genera custom nodes and extensions"
+        },
+        {
+            "author": "Pos13",
+            "title": "Cyclist [DEPRECATED]",
+            "id": "cyclist",
+            "reference": "https://github.com/Pos13/comfyui-cyclist",
+            "files": [
+                "https://github.com/Pos13/comfyui-cyclist"
+            ],
+            "install_type": "git-clone",
+            "description": "This extension provides tools to iterate generation results between runs. In general, it's for cycles."
+        },
+        {
+            "author": "leiweiqiang",
+            "title": "ComfyUI-TRA",
+            "id": "tra",
+            "reference": "https://github.com/leiweiqiang/ComfyUI-TRA",
+            "files": [
+                "https://github.com/leiweiqiang/ComfyUI-TRA"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:TCL EbSynth, TCL Extract Frames (From File), TCL Extract Frames (From Video), TCL Combine Frames, TCL Save Video (From Frames)"
+        },
+        {
+            "author": "ai-business-hql",
+            "title": "comfyUIAgent [REMOVED]",
+            "reference": "https://github.com/ai-business-hql/comfyUIAgent",
+            "files": [
+                "https://github.com/ai-business-hql/comfyUIAgent"
+            ],
+            "install_type": "git-clone",
+            "description": "test"
+        },
+        {
+            "author": "daqingliu",
+            "title": "ComfyUI-SaveImageOSS [REMOVED]",
+            "reference": "https://github.com/daqingliu/ComfyUI-SaveImageOSS",
+            "files": [
+                "https://github.com/daqingliu/ComfyUI-SaveImageOSS"
+            ],
+            "install_type": "git-clone",
+            "description": "Save images directly to URL, e.g., OSS. Just input the url in the text box!"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-textarea-keybindings [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-textarea-keybindings",
+            "files": [
+                "https://github.com/shinich39/comfyui-textarea-keybindings"
+            ],
+            "install_type": "git-clone",
+            "description": "Add keybindings to textarea."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-load-image-with-cmd [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-load-image-with-cmd",
+            "files": [
+                "https://github.com/shinich39/comfyui-load-image-with-cmd"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image and partially workflow with javascript."
+        },
+        {
+            "author": "neuratech-ai",
+            "title": "ComfyUI-MultiGPU [NOT MAINTAINED]",
+            "reference": "https://github.com/neuratech-ai/ComfyUI-MultiGPU",
+            "files": [
+                "https://github.com/neuratech-ai/ComfyUI-MultiGPU"
+            ],
+            "install_type": "git-clone",
+            "description": "Experimental nodes for using multiple GPUs in a single ComfyUI workflow.\nThis extension adds new nodes for model loading that allow you to specify the GPU to use for each model. It monkey patches the memory management of ComfyUI in a hacky way and is neither a comprehensive solution nor a well-tested one. Use at your own risk.\nNote that this does not add parallelism. The workflow steps are still executed sequentially just on different GPUs. Any potential speedup comes from not having to constantly load and unload models from VRAM."
+        },
         {
             "author": "jefferyharrell",
             "title": "ComfyUI-JHXMP [REMOVED]",
@@ -563,17 +749,6 @@
             "install_type": "git-clone",
             "description": "Some simple string tools to modify text and strings in ComfyUI."
         },
-        {
-            "author": "zmwv823",
-            "title": "ComfyUI-AnyText [DEPRECATED]",
-            "id": "anytext",
-            "reference": "https://github.com/zmwv823/ComfyUI-AnyText",
-            "files": [
-                "https://github.com/zmwv823/ComfyUI-AnyText"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial Simple And Rough Implementation Of [a/AnyText](https://github.com/tyxsspa/AnyText)"
-        },
         {
             "author": "Millyarde",
             "title": "Pomfy - Photoshop and ComfyUI 2-way sync [REMOVED]",

node_db/legacy/model-list.json

@@ -1,3 +1,126 @@
 {
-  "models": []
+  "models": [
+    {
+      "name": "pfg-novel-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-novel-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
+      "size": "23.6MB"
+    },
+    {
+      "name": "pfg-wd14-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd14-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "pfg-wd15beta2-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd15beta2-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
+      "type": "Shape Predictor",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "shape_predictor_68_face_landmarks.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
+      "size": "99.7MB"
+    },
+    {
+      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
+      "type": "Face Recognition",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "dlib_face_recognition_resnet_model_v1.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
+      "size": "22.5MB"
+    },
+    {
+      "name": "ID-Animator/animator.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models",
+      "description": "ID-Animator checkpoint",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "animator.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
+      "size": "247.3MB"
+    },
+    {
+      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/animatediff_models",
+      "description": "AnimateDiff checkpoint for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "mm_sd_v15_v2.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
+      "size": "1.82GB"
+    },
+    {
+      "name": "ID-Animator/image_encoder",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/image_encoder",
+      "description": "CLIP Image encoder for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "model.safetensors",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
+      "size": "2.53GB"
+    },
+    {
+      "name": "Doubiiu/ToonCrafter model checkpoint",
+      "type": "checkpoint",
+      "base": "ToonCrafter",
+      "save_path": "custom_nodes/comfyui-tooncrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
+      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
+      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
+      "filename": "model.ckpt",
+      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
+      "size": "10.5GB"
+    },
+
+    {
+      "name": "BAAI/SegGPT",
+      "type": "SegGPT",
+      "base": "SegGPT",
+      "save_path": "custom_nodes/comfyui-seggpt",
+      "description": "SegGPT",
+      "reference": "https://huggingface.co/BAAI/SegGPT",
+      "filename": "seggpt_vit_large.pth",
+      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
+      "size": "1.48GB"
+    },
+    {
+      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
+      "type": "controlnet",
+      "base": "SDXL",
+      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
+      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
+      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
+      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "size": "46.2MB"
+    }
+  ]
 }

node_db/new/model-list.json

@@ -1,5 +1,245 @@
 {
   "models": [
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
+    {
+      "name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
+      "type": "clip",
+      "base": "LLaVA-Llama-3",
+      "save_path": "text_encoders",
+      "description": "llava_llama3_fp8_scaled text encoder model. This is required for using Hunyuan Video.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "filename": "llava_llama3_fp8_scaled.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp8_scaled.safetensors",
+      "size": "9.09GB"
+    },
+    {
+      "name": "Comfy-Org/llava_llama3_fp16.safetensors",
+      "type": "clip",
+      "base": "LLaVA-Llama-3",
+      "save_path": "text_encoders",
+      "description": "llava_llama3_fp16 text encoder model. This is required for using Hunyuan Video.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "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"
+    },
+
+    {
+      "name": "XLabs-AI/realism_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "realism_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/realism_lora.safetensors",
+      "size": "44.8MB"
+    },
+    {
+      "name": "XLabs-AI/art_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "art_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/scenery_lora.safetensors",
+      "size": "44.8MB"
+    },
+    {
+      "name": "XLabs-AI/mjv6_lora.safetensors",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/loras",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-lora-collection",
+      "filename": "mjv6_lora.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-lora-collection/resolve/main/mjv6_lora.safetensors",
+      "size": "44.8MB"
+    },
+
+    {
+      "name": "XLabs-AI/flux-ip-adapter",
+      "type": "lora",
+      "base": "FLUX.1",
+      "save_path": "xlabs/ipadapters",
+      "description": "A checkpoint with trained LoRAs for FLUX.1-dev model by Black Forest Labs",
+      "reference": "https://huggingface.co/XLabs-AI/flux-ip-adapter",
+      "filename": "ip_adapter.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
+      "size": "982MB"
+    },
+    
     {
       "name": "stabilityai/SD3.5-Large-Controlnet-Blur",
       "type": "controlnet",
@@ -335,7 +575,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -346,7 +586,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -389,18 +629,6 @@
       "size": "1.39GB"
     },
 
-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
     {
       "name": "DMD2 LoRA (4steps)",
       "type": "lora",
@@ -422,264 +650,6 @@
       "filename": "dmd2_sdxl_4step_lora_fp16.safetensors",
       "url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors",
       "size": "394MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (1step) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-1step-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (2steps) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-2steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (4steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (12steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-12steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (1step) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-1step-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (2steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-2steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (4steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "size": "787MB"
-    },
-
-    {
-      "name": "Hyper-SD CFG LoRA (4steps) - SD3",
-      "type": "lora",
-      "base": "SD3",
-      "save_path": "loras/HyperSD/SD3",
-      "description": "Hyper-SD CFG LoRA (4steps) - SD3",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD3-4steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD3-4steps-CFG-lora.safetensors",
-      "size": "472MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SD3",
-      "type": "lora",
-      "base": "SD3",
-      "save_path": "loras/HyperSD/SD3",
-      "description": "Hyper-SD CFG LoRA (8steps) - SD3",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD3-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD3-8steps-CFG-lora.safetensors",
-      "size": "472MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (16steps) - SD3",
-      "type": "lora",
-      "base": "SD3",
-      "save_path": "loras/HyperSD/SD3",
-      "description": "Hyper-SD CFG LoRA (16steps) - SD3",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD3-16steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD3-16steps-CFG-lora.safetensors",
-      "size": "472MB"
-    },
-
-    {
-      "name": "InstantX/FLUX.1-dev Controlnet (Union)",
-      "type": "controlnet",
-      "base": "FLUX.1",
-      "save_path": "controlnet/FLUX.1/InstantX-FLUX1-Dev-Union",
-      "description": "FLUX.1 [Dev] Union Controlnet. Supports Canny, Depth, Pose, Tile, Blur, Gray Low Quality.",
-      "reference": "https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union",
-      "filename": "diffusion_pytorch_model.safetensors",
-      "url": "https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union/resolve/main/diffusion_pytorch_model.safetensors",
-      "size": "6.6GB"
-    },
-
-    {
-      "name": "city96/flux1-dev-F16.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_model/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (f16/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-F16.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-F16.gguf",
-      "size": "23.8GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q2_K.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q2_K/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q2_K.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q2_K.gguf",
-      "size": "4.03GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q3_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q3_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q3_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q3_K_S.gguf",
-      "size": "5.23GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q4_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q4_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_0.gguf",
-      "size": "6.79GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q4_1.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_1/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q4_1.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_1.gguf",
-      "size": "7.53GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q4_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q4_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q4_K_S.gguf",
-      "size": "6.81GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q5_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q5_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_0.gguf",
-      "size": "8.27GB"
     }
   ]
 }

node_db/tutorial/custom-node-list.json

@@ -240,6 +240,57 @@
             ],
             "install_type": "git-clone",
             "description": "RAG Demo for LLM"
+        },
+        {
+            "author": "FelixTeutsch",
+            "title": "BachelorThesis",
+            "reference": "https://github.com/FelixTeutsch/BachelorThesis",
+            "files": [
+                "https://github.com/FelixTeutsch/BachelorThesis"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a ComfyUi custom node, that build a new UI on top of the already existing AI, to enable the use of custom controllers"
+        },
+        {
+            "author": "jhj0517",
+            "title": "ComfyUI-CustomNodes-Template",
+            "reference": "https://github.com/jhj0517/ComfyUI-CustomNodes-Template",
+            "files": [
+                "https://github.com/jhj0517/ComfyUI-CustomNodes-Template"
+            ],
+            "install_type": "git-clone",
+            "description": "This is the ComfyUI custom node template repository that anyone can use to create their own custom nodes."
+        },
+        {
+            "author": "laogou666",
+            "title": "Comfyui_LG_Advertisement",
+            "reference": "https://github.com/LAOGOU-666/Comfyui_LG_Advertisement",
+            "files": [
+                "https://github.com/LAOGOU-666/Comfyui_LG_Advertisement"
+            ],
+            "install_type": "git-clone",
+            "description": "A node for demonstration."
+        },
+        {
+            "author": "amorano",
+            "title": "cozy_spoke",
+            "reference": "https://github.com/cozy-comfyui/cozy_spoke",
+            "files": [
+                "https://github.com/cozy-comfyui/cozy_spoke"
+            ],
+            "install_type": "git-clone",
+            "description": "Example node communicating between ComfyUI Javascript and Python."
+        },
+        {
+            "author": "amorano",
+            "title": "Cozy Link Toggle",
+            "id": "cozyLinkToggle",
+            "reference": "https://github.com/cozy-comfyui/cozy_link_toggle",
+            "files": [
+                "https://github.com/cozy-comfyui/cozy_link_toggle"
+            ],
+            "install_type": "git-clone",
+            "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
         }
     ]
 }

node_db/tutorial/extension-node-map.json

@@ -172,6 +172,7 @@
             "CLIPTextEncodeControlnet",
             "CLIPTextEncodeFlux",
             "CLIPTextEncodeHunyuanDiT",
+            "CLIPTextEncodePixArtAlpha",
             "CLIPTextEncodeSD3",
             "CLIPTextEncodeSDXL",
             "CLIPTextEncodeSDXLRefiner",
@@ -189,6 +190,7 @@
             "ConditioningSetAreaStrength",
             "ConditioningSetMask",
             "ConditioningSetTimestepRange",
+            "ConditioningStableAudio",
             "ConditioningZeroOut",
             "ControlNetApply",
             "ControlNetApplyAdvanced",
@@ -202,7 +204,9 @@
             "DisableNoise",
             "DualCFGGuider",
             "DualCLIPLoader",
+            "EmptyHunyuanLatentVideo",
             "EmptyImage",
+            "EmptyLTXVLatentVideo",
             "EmptyLatentAudio",
             "EmptyLatentImage",
             "EmptyMochiLatentVideo",
@@ -245,6 +249,9 @@
             "KSamplerAdvanced",
             "KSamplerSelect",
             "KarrasScheduler",
+            "LTXVConditioning",
+            "LTXVImgToVideo",
+            "LTXVScheduler",
             "LaplaceScheduler",
             "LatentAdd",
             "LatentApplyOperation",
@@ -265,6 +272,8 @@
             "LatentSubtract",
             "LatentUpscale",
             "LatentUpscaleBy",
+            "Load3D",
+            "Load3DAnimation",
             "LoadAudio",
             "LoadImage",
             "LoadImageMask",
@@ -272,11 +281,15 @@
             "LoraLoader",
             "LoraLoaderModelOnly",
             "LoraSave",
+            "Mahiro",
             "MaskComposite",
             "MaskToImage",
             "ModelMergeAdd",
+            "ModelMergeAuraflow",
             "ModelMergeBlocks",
             "ModelMergeFlux1",
+            "ModelMergeLTXV",
+            "ModelMergeMochiPreview",
             "ModelMergeSD1",
             "ModelMergeSD2",
             "ModelMergeSD35_Large",
@@ -289,6 +302,7 @@
             "ModelSamplingContinuousV",
             "ModelSamplingDiscrete",
             "ModelSamplingFlux",
+            "ModelSamplingLTXV",
             "ModelSamplingSD3",
             "ModelSamplingStableCascade",
             "ModelSave",
@@ -301,6 +315,7 @@
             "PhotoMakerLoader",
             "PolyexponentialScheduler",
             "PorterDuffImageComposite",
+            "Preview3D",
             "PreviewAudio",
             "PreviewImage",
             "RandomNoise",
@@ -334,6 +349,7 @@
             "SelfAttentionGuidance",
             "SetLatentNoiseMask",
             "SetUnionControlNetType",
+            "SkipLayerGuidanceDiT",
             "SkipLayerGuidanceSD3",
             "SolidMask",
             "SplitImageWithAlpha",
@@ -462,6 +478,17 @@
             "title_aux": "comfyui-custom-nodes"
         }
     ],
+    "https://github.com/jhj0517/ComfyUI-CustomNodes-Template": [
+        [
+            "(Down)Load My Model",
+            "Calculate Minus",
+            "Calculate Plus",
+            "Example Output Node"
+        ],
+        {
+            "title_aux": "ComfyUI-CustomNodes-Template"
+        }
+    ],
     "https://github.com/jtong/comfyui-jtong-workflow": [
         [
             "Example",

pip_overrides.json.template

@@ -4,8 +4,8 @@
     "imageio_ffmpeg": "imageio",
     "diffusers~=0.21.4": "diffusers",
     "huggingface_hub": "huggingface-hub",
-    "numpy<1.24>=1.18": "numpy",
+    "numpy<1.24>=1.18": "numpy==1.26.4",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
     "opencv-contrib-python": "opencv-contrib-python-headless",
     "opencv-python": "opencv-contrib-python-headless",
     "opencv-python-headless": "opencv-contrib-python-headless",

pip_overrides.osx.template

@@ -4,8 +4,8 @@
     "imageio_ffmpeg": "imageio",
     "diffusers~=0.21.4": "diffusers",
     "huggingface_hub": "huggingface-hub",
-    "numpy<1.24>=1.18": "numpy",
+    "numpy<1.24>=1.18": "numpy==1.26.4",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
     "opencv-contrib-python": "opencv-contrib-python-headless",
     "opencv-python": "opencv-contrib-python-headless",
     "opencv-python-headless": "opencv-contrib-python-headless",

prestartup_script.py

@@ -9,6 +9,7 @@ import platform
 import json
 import ast
 import logging
+import traceback
 
 glob_path = os.path.join(os.path.dirname(__file__), "glob")
 sys.path.append(glob_path)
@@ -17,9 +18,19 @@ import security_check
 import manager_util
 import cm_global
 import manager_downloader
-from datetime import datetime
 import folder_paths
 
+import datetime
+if hasattr(datetime, 'datetime'):
+    def current_timestamp():
+        return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+else:
+    # NOTE: Occurs in some Mac environments.
+    import time
+    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{datetime.__file__}'")
+    def current_timestamp():
+        return str(time.time()).split('.')[0]
+
 security_check.security_check()
 
 cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
@@ -50,9 +61,8 @@ def check_file_logging():
     global enable_file_logging
     try:
         import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
         config = configparser.ConfigParser()
-        config.read(config_path)
+        config.read(manager_config_path)
         default_conf = config['default']
 
         if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
@@ -64,9 +74,18 @@ def check_file_logging():
 check_file_logging()
 
 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__))
 
+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)
@@ -79,12 +98,30 @@ custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
 manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
 manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
 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')
 
-git_script_path = os.path.join(comfyui_manager_path, "git_helper.py")
 cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
 
 
-cm_global.pip_overrides = {}
+default_conf = {}
+
+def read_config():
+    global default_conf
+    import configparser
+    config = configparser.ConfigParser()
+    config.read(manager_config_path)
+    default_conf = config['default']
+
+def read_uv_mode():
+    if 'use_uv' in default_conf:
+        manager_util.use_uv = default_conf['use_uv']
+
+
+read_config()
+read_uv_mode()
+
+
+cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
 if os.path.exists(manager_pip_overrides_path):
     with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
         cm_global.pip_overrides = json.load(json_file)
@@ -137,6 +174,48 @@ def process_wrap(cmd_str, cwd_path, handler=None, env=None):
     return process.wait()
 
 
+original_stdout = sys.stdout
+
+
+def try_get_custom_nodes(x):
+    for custom_nodes_dir in folder_paths.get_folder_paths('custom_nodes'):
+        if x.startswith(custom_nodes_dir):
+            relative_path = os.path.relpath(x, custom_nodes_dir)
+            next_segment = relative_path.split(os.sep)[0]
+            if next_segment.lower() != 'comfyui-manager':
+                return next_segment, os.path.join(custom_nodes_dir, next_segment)
+    return None
+
+
+def extract_origin_module():
+    stack = traceback.extract_stack()[:-2]
+    for frame in reversed(stack):
+        info = try_get_custom_nodes(frame.filename)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+def extract_origin_module_from_strings(file_paths):
+    for filepath in file_paths:
+        info = try_get_custom_nodes(filepath)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+
+def finalize_startup():
+    res = {}
+    for k, v in cm_global.error_dict.items():
+        if v['path'] in import_failed_extensions:
+            res[k] = v
+
+    cm_global.error_dict = res
+
+
 try:
     if '--port' in sys.argv:
         port_index = sys.argv.index('--port')
@@ -153,6 +232,9 @@ try:
     if enable_file_logging:
         log_path_base = os.path.join(folder_paths.user_directory, 'comfyui')
 
+        if not os.path.exists(folder_paths.user_directory):
+            os.makedirs(folder_paths.user_directory)
+
         if os.path.exists(f"{log_path_base}{postfix}.log"):
             if os.path.exists(f"{log_path_base}{postfix}.prev.log"):
                 if os.path.exists(f"{log_path_base}{postfix}.prev2.log"):
@@ -216,8 +298,16 @@ try:
                 if match:
                     import_failed_extensions.add(match.group(1).strip())
 
-                if 'Starting server' in message:
+                if not self.is_stdout:
-                    is_start_mode = False
+                    origin_info = extract_origin_module()
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message
 
             if not self.is_stdout:
                 match = re.search(pat_tqdm, message)
@@ -236,7 +326,7 @@ try:
 
         def sync_write(self, message, file_only=False):
             with log_lock:
-                timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+                timestamp = current_timestamp()
                 if self.last_char != '\n':
                     log_file.write(message)
                 else:
@@ -302,12 +392,34 @@ try:
                 if match:
                     import_failed_extensions.add(match.group(1).strip())
 
+                if 'Traceback' in message:
+                    file_lists = self._extract_file_paths(message)
+                    origin_info = extract_origin_module_from_strings(file_lists)
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message
+
                 if 'Starting server' in message:
                     is_start_mode = False
+                    finalize_startup()
 
             if stderr_wrapper:
                 stderr_wrapper.sync_write(message+'\n', file_only=True)
 
+        def _extract_file_paths(self, msg):
+            file_paths = []
+            for line in msg.split('\n'):
+                match = re.findall(r'File \"(.*?)\", line \d+', line)
+                for x in match:
+                    if not x.startswith('<'):
+                        file_paths.extend(match)
+            return file_paths
+
 
     logging.getLogger().addHandler(LoggingHandler())
 
@@ -318,17 +430,18 @@ except Exception as e:
 
 try:
     import git  # noqa: F401
+    import toml  # 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:
-        result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
+        result = 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:
-            result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
+            result = 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)")
 
@@ -339,11 +452,15 @@ except:
     print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
 
 
-print("** ComfyUI startup time:", datetime.now())
+print("** ComfyUI startup time:", current_timestamp())
 print("** Platform:", platform.system())
 print("** Python version:", sys.version)
 print("** Python executable:", sys.executable)
 print("** ComfyUI Path:", comfy_path)
+print("** ComfyUI Base Folder Path:", comfy_base_path)
+print("** User directory:", folder_paths.user_directory)
+print("** ComfyUI-Manager config path:", manager_config_path)
+
 
 if log_path_base is not None:
     print("** Log path:", os.path.abspath(f'{log_path_base}.log'))
@@ -353,12 +470,6 @@ else:
 
 def read_downgrade_blacklist():
     try:
-        import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
-        config = configparser.ConfigParser()
-        config.read(config_path)
-        default_conf = config['default']
-
         if 'downgrade_blacklist' in default_conf:
             items = default_conf['downgrade_blacklist'].split(',')
             items = [x.strip() for x in items if x != '']
@@ -373,20 +484,13 @@ read_downgrade_blacklist()
 
 def check_bypass_ssl():
     try:
-        import configparser
         import ssl
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
-        config = configparser.ConfigParser()
-        config.read(config_path)
-        default_conf = config['default']
-
         if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
-            print("[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)")
+            print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
             ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
     except Exception:
         pass
 
-
 check_bypass_ssl()
 
 
@@ -402,7 +506,7 @@ def is_installed(name):
     if name.startswith('#'):
         return True
 
-    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
+    pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
     match = re.search(pattern, name)
 
     if match:
@@ -417,7 +521,7 @@ def is_installed(name):
         if match is None:
             if name in pips:
                 return True
-        elif match.group(2) in ['<=', '==', '<']:
+        elif match.group(2) in ['<=', '==', '<', '~=']:
             if name in pips:
                 if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
                     print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
@@ -436,6 +540,14 @@ def is_installed(name):
         elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
             print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
 
+    if match.group(2) == '==':
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+
+    if match.group(2) == '~=':
+        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
+            return False
+
     return True       # prevent downgrade
 
 
@@ -466,7 +578,8 @@ if os.path.exists(restore_snapshot_path):
 
         print("[ComfyUI-Manager] Restore snapshot.")
         new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
 
         cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
         exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
@@ -497,9 +610,9 @@ def execute_lazy_install_script(repo_path, executable):
                 if package_name and not is_installed(package_name):
                     if '--index-url' in package_name:
                         s = package_name.split('--index-url')
-                        install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                        install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                     else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
 
                     process_wrap(install_cmd, repo_path)
 
@@ -509,7 +622,8 @@ def execute_lazy_install_script(repo_path, executable):
         install_cmd = [executable, "install.py"]
 
         new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
         process_wrap(install_cmd, repo_path, env=new_env)
 
 
@@ -611,7 +725,8 @@ if os.path.exists(script_list_path):
                     print(f"\n## Execute install/(de)activation script for '{script[0]}'")
 
                     new_env = os.environ.copy()
-                    new_env["COMFYUI_PATH"] = comfy_path
+                    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+                        new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
                     exit_code = process_wrap(script[1:], script[0], env=new_env)
 
                     if exit_code != 0:
@@ -639,9 +754,8 @@ manager_util.clear_pip_cache()
 def check_windows_event_loop_policy():
     try:
         import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
         config = configparser.ConfigParser()
-        config.read(config_path)
+        config.read(manager_config_path)
         default_conf = config['default']
 
         if 'windows_selector_event_loop_policy' in default_conf and default_conf['windows_selector_event_loop_policy'].lower() == 'true':

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.1"
+version = "3.17.2"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 

requirements.txt

@@ -5,4 +5,5 @@ transformers
 huggingface-hub>0.20
 typer
 rich
-typing-extensions
+typing-extensions
+toml

scripts/install-comfyui-venv-linux.sh

@@ -1,12 +1,12 @@
 git clone https://github.com/comfyanonymous/ComfyUI
 cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager
+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
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
 cd ..
 echo "#!/bin/bash" > run_gpu.sh
 echo "cd ComfyUI" >> run_gpu.sh

scripts/install-comfyui-venv-win.bat

@@ -1,6 +1,6 @@
 git clone https://github.com/comfyanonymous/ComfyUI
 cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager
+git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
 cd ..
 python -m venv venv
 call venv/Scripts/activate

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

@@ -1,2 +1,2 @@
 .\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 -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"

scripts/update-fix.py

@@ -1,12 +0,0 @@
-import git
-
-commit_hash = "a361cc1"
-
-repo = git.Repo('.')
-
-if repo.is_dirty():
-    repo.git.stash()
-
-repo.git.update_ref("refs/remotes/origin/main", commit_hash)
-repo.remotes.origin.fetch()
-repo.git.pull("origin", "main")