improved: cm-cli.py - apply PIPFixer

* Update custom-node-list.json

Add ComfyUI-AppGen

* Update custom-node-list.json

Add ComfyUI-Pollinations

README.md

@@ -133,14 +133,29 @@ This repository provides Colab notebooks that allow you to install and use Comfy
     * `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`
+  
+
 ## 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](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
 
@@ -188,12 +203,12 @@ This repository provides Colab notebooks that allow you to install and use Comfy
     }
     ```
   * `<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",
@@ -210,7 +225,7 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 ## Support of missing nodes installation
 
-![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-dialog.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.
 
@@ -268,12 +283,8 @@ 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.

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__))
@@ -36,7 +37,6 @@ 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')
 
@@ -70,9 +70,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 +87,20 @@ 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')]
+        
+        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 +117,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 == 'cache', dont_wait=False))
         asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
 
     def set_no_deps(self, no_deps):
@@ -127,9 +134,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 +152,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()
@@ -526,7 +536,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 +545,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 +623,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 +661,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")
@@ -700,12 +716,15 @@ def update(
     if 'all' in nodes:
         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']:
             update_comfyui()
             break
 
     update_parallel(nodes)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Disable custom nodes")
@@ -798,7 +817,9 @@ def fix(
     if 'all' in nodes:
         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")
@@ -1049,12 +1070,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 +1101,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 +1120,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(
@@ -1136,6 +1165,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 +1175,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.")
 

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
@@ -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()

glob/cnr_utils.py

@@ -4,23 +4,49 @@ from typing import List
 import manager_util
 import toml
 import os
+import asyncio
 
 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)
 
+is_cache_loading = False
+
+async def get_cnr_data(page=1, limit=1000, cache_mode=True, dont_wait=True):
+    global is_cache_loading
+
+    uri = f'{base_url}/nodes?page={page}&limit={limit}'
+
+    def touch(json_obj):
         for v in json_obj['nodes']:
             if 'latest_version' not in v:
                 v['latest_version'] = dict(version='nightly')
 
+
+    if cache_mode:
+        if dont_wait:
+            json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode, dont_wait=True)  # fallback
+
+            if 'nodes' in json_obj:
+                touch(json_obj)
+                return json_obj['nodes']
+            else:
+                return {}
+
+        is_cache_loading = True
+
+    try:
+        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
+        touch(json_obj)
+
         return json_obj['nodes']
     except:
         res = {}
         print("Cannot connect to comfyregistry.")
+    finally:
+        if cache_mode:
+            is_cache_loading = False
 
     return res
 
@@ -92,7 +118,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:
@@ -113,7 +139,7 @@ def read_cnr_info(fullpath):
             data = toml.load(f)
 
             project = data.get('project', {})
-            name = project.get('name')
+            name = project.get('name').strip().lower()
             version = project.get('version')
 
             urls = project.get('urls', {})
@@ -129,3 +155,26 @@ def read_cnr_info(fullpath):
         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/manager_core.py

@@ -1,3 +1,8 @@
+"""
+description:
+    `manager_core` contains the core implementation of the management functions in ComfyUI-Manager.
+"""
+
 import json
 import os
 import sys
@@ -36,7 +41,7 @@ import manager_downloader
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 3, 2]
+version_code = [3, 7, 4]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -45,6 +50,7 @@ DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/ma
 
 default_custom_nodes_path = None
 
+
 def get_default_custom_nodes_path():
     global default_custom_nodes_path
     if default_custom_nodes_path is None:
@@ -74,6 +80,16 @@ def get_comfyui_tag():
         return None
 
 
+def get_script_env():
+    copied = os.environ.copy()
+    git_exe = get_config().get('git_exe')
+    if git_exe is not None:
+        copied['GIT_EXE_PATH'] = git_exe
+    copied['COMFYUI_PATH'] = comfy_path
+
+    return copied
+
+
 invalid_nodes = {}
 
 
@@ -150,6 +166,7 @@ manager_channel_list_path = None
 manager_startup_script_path = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
+manager_components_path = None
 
 def update_user_directory(user_dir):
     global manager_files_path
@@ -158,6 +175,7 @@ def update_user_directory(user_dir):
     global manager_startup_script_path
     global manager_snapshot_path
     global manager_pip_overrides_path
+    global manager_components_path
 
     manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
     if not os.path.exists(manager_files_path):
@@ -174,6 +192,11 @@ def update_user_directory(user_dir):
     manager_config_path = os.path.join(manager_files_path, 'config.ini')
     manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
     manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_components_path = os.path.join(manager_files_path, "components")
+    manager_util.cache_dir = os.path.join(manager_files_path, "cache")
+
+    if not os.path.exists(manager_util.cache_dir):
+        os.makedirs(manager_util.cache_dir)
 
 try:
     import folder_paths
@@ -210,7 +233,7 @@ def remap_pip_package(pkg):
 def is_blacklisted(name):
     name = name.strip()
 
-    pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
+    pattern = r'([^<>!~=]+)([<>!~=]=?)([^ ]*)'
     match = re.search(pattern, name)
 
     if match:
@@ -225,7 +248,7 @@ def is_blacklisted(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)):
                     return True
@@ -239,7 +262,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:
@@ -254,12 +277,33 @@ 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}'")
                     return True
 
+    pkg = manager_util.get_installed_packages().get(name.lower())
+    if pkg is None:
+        return False  # update if not installed
+
+    if match is None:
+        return True   # don't update if version is not specified
+
+    if match.group(2) in ['>', '>=']:
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+        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 name.lower() in manager_util.get_installed_packages()
 
 
@@ -433,6 +477,7 @@ class UnifiedManager:
             cnr = self.get_cnr_by_repo(url)
             commit_hash = git_utils.get_commit_hash(fullpath)
             if cnr:
+                cnr_utils.generate_cnr_id(fullpath, cnr['id'])
                 return {'id': cnr['id'], 'cnr': cnr, 'ver': 'nightly', 'hash': commit_hash}
             else:
                 url = os.path.basename(url)
@@ -462,7 +507,7 @@ class UnifiedManager:
         if node_package.is_disabled and node_package.is_nightly:
             self.nightly_inactive_nodes[node_package.id] = node_package.fullpath
 
-        if node_package.is_enabled:
+        if node_package.is_enabled and not node_package.is_unknown:
             self.active_nodes[node_package.id] = node_package.version, node_package.fullpath
 
         if node_package.is_enabled and node_package.is_unknown:
@@ -619,7 +664,7 @@ class UnifiedManager:
 
         return latest
 
-    async def reload(self, cache_mode):
+    async def reload(self, cache_mode, dont_wait=True):
         self.custom_node_map_cache = {}
         self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
         self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -628,7 +673,7 @@ class UnifiedManager:
         self.active_nodes = {}            # node_id -> node_version * fullpath
 
         # reload 'cnr_map' and 'repo_cnr_map'
-        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode)
+        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode, dont_wait=dont_wait)
 
         for x in cnrs:
             self.cnr_map[x['id']] = x
@@ -659,7 +704,7 @@ class UnifiedManager:
         res = {}
 
         channel_url = normalize_channel(channel)
-        if channel:
+        if channel_url:
             if mode not in ['remote', 'local', 'cache']:
                 print(f"[bold red]ERROR: Invalid mode is specified `--mode {mode}`[/bold red]", file=sys.stderr)
                 return {}
@@ -678,8 +723,12 @@ class UnifiedManager:
         return res
 
     async def get_custom_nodes(self, channel, mode):
-        default_channel = normalize_channel('default')
+        # default_channel = normalize_channel('default')
-        cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
+        # cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
+
+
+        channel = normalize_channel(channel)
+        cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
 
         if cache is not None:
             return cache
@@ -1182,16 +1231,21 @@ class UnifiedManager:
         repo = git.Repo(repo_path)
 
         if repo.head.is_detached:
-            switch_to_default_branch(repo)
+            if not switch_to_default_branch(repo):
+                return result.fail(f"Failed to switch to default branch: {repo_path}")
 
         current_branch = repo.active_branch
         branch_name = current_branch.name
 
         if current_branch.tracking_branch() is None:
             print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
-            remote_name = 'origin'
+            remote_name = get_remote_name(repo)
         else:
             remote_name = current_branch.tracking_branch().remote_name
+
+        if remote_name is None:
+            return result.fail(f"Failed to get remote when installing: {repo_path}")
+
         remote = repo.remote(name=remote_name)
 
         try:
@@ -1210,7 +1264,10 @@ class UnifiedManager:
                           "-----------------------------------------------------------------------------------------\n")
 
         commit_hash = repo.head.commit.hexsha
-        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:
+            return result.fail(f"Not updatable branch: {branch_name}")
 
         if commit_hash != remote_commit_hash:
             git_pull(repo_path)
@@ -1234,6 +1291,8 @@ class UnifiedManager:
             return ManagedResult('skip').with_msg('Up to date')
 
     def unified_update(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
+        orig_print(f"\x1b[2K\rUpdating: {node_id}", end='')
+
         if version_spec is None:
             version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
 
@@ -1269,7 +1328,10 @@ class UnifiedManager:
             custom_nodes = await self.get_custom_nodes(channel, mode)
             the_node = custom_nodes.get(node_id)
             if the_node is not None:
-                repo_url = the_node['files'][0]
+                if version_spec == 'unknown':
+                    repo_url = the_node['files'][0]
+                else:  # nightly
+                    repo_url = the_node['reference']
             else:
                 result = ManagedResult('install')
                 return result.fail(f"Node '{node_id}@{version_spec}' not found in [{channel}, {mode}]")
@@ -1292,7 +1354,10 @@ class UnifiedManager:
                 if version_spec == 'unknown':
                     self.unknown_active_nodes[node_id] = to_path
                 elif version_spec == 'nightly':
+                    cnr_utils.generate_cnr_id(to_path, node_id)
                     self.active_nodes[node_id] = 'nightly', to_path
+            else:
+                return res
 
             return res.with_target(version_spec)
 
@@ -1344,6 +1409,63 @@ class UnifiedManager:
 unified_manager = UnifiedManager()
 
 
+def identify_node_pack_from_path(fullpath):
+    module_name = os.path.basename(fullpath)
+    if module_name.endswith('.git'):
+        module_name = module_name[:-4]
+
+    repo_url = git_utils.git_url(fullpath)
+    if repo_url is None:
+        # cnr
+        cnr = cnr_utils.read_cnr_info(fullpath)
+        if cnr is not None:
+            return module_name, cnr['version'], cnr['id']
+
+        return None
+    else:
+        # nightly or unknown
+        cnr_id = cnr_utils.read_cnr_id(fullpath)
+        commit_hash = git_utils.get_commit_hash(fullpath)
+
+        if cnr_id is not None:
+            return module_name, commit_hash, cnr_id
+        else:
+            return module_name, commit_hash, ''
+
+
+def get_installed_node_packs():
+    res = {}
+
+    for x in get_custom_nodes_paths():
+        for y in os.listdir(x):
+            if y == '__pycache__' or y == '.disabled':
+                continue
+
+            fullpath = os.path.join(x, y)
+            info = identify_node_pack_from_path(fullpath)
+            if info is None:
+                continue
+
+            is_disabled = not y.endswith('.disabled')
+
+            res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
+
+        disabled_dirs = os.path.join(x, '.disabled')
+        if os.path.exists(disabled_dirs):
+            for y in os.listdir(disabled_dirs):
+                if y == '__pycache__':
+                    continue
+
+                fullpath = os.path.join(disabled_dirs, y)
+                info = identify_node_pack_from_path(fullpath)
+                if info is None:
+                    continue
+
+                res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
+
+    return res
+
+
 def get_channel_dict():
     global channel_dict
 
@@ -1386,9 +1508,7 @@ class ManagerFuncs:
             print(f"[ComfyUI-Manager] Unexpected behavior: `{cmd}`")
             return 0
 
-        new_env = os.environ.copy()
+        subprocess.check_call(cmd, cwd=cwd, env=get_script_env())
-        new_env["COMFYUI_PATH"] = comfy_path
-        subprocess.check_call(cmd, cwd=cwd, env=new_env)
 
         return 0
 
@@ -1400,7 +1520,6 @@ def write_config():
     config = configparser.ConfigParser()
     config['default'] = {
         'preview_method': manager_funcs.get_current_preview_method(),
-        'badge_mode': get_config()['badge_mode'],
         'git_exe':  get_config()['git_exe'],
         'channel_url': get_config()['channel_url'],
         'share_option': get_config()['share_option'],
@@ -1441,7 +1560,6 @@ def read_config():
 
         return {
                     'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
-                    'badge_mode': default_conf['badge_mode'] if 'badge_mode' in default_conf else 'none',
                     'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
                     'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
                     'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
@@ -1460,7 +1578,6 @@ def read_config():
     except Exception:
         return {
             'preview_method': manager_funcs.get_current_preview_method(),
-            'badge_mode': 'none',
             'git_exe': '',
             'channel_url': DEFAULT_CHANNEL,
             'share_option': 'all',
@@ -1486,9 +1603,47 @@ def get_config():
     return cached_config
 
 
+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 try_install_script(url, repo_path, install_cmd, instant_execution=False):
@@ -1539,9 +1694,8 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
     else:
         command = [sys.executable, git_script_path, "--check", path]
 
-    new_env = os.environ.copy()
+    new_env = get_script_env()
-    new_env["COMFYUI_PATH"] = comfy_path
+    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path())
     output, _ = process.communicate()
     output = output.decode('utf-8').strip()
 
@@ -1592,10 +1746,8 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
 
 
 def __win_check_git_pull(path):
-    new_env = os.environ.copy()
-    new_env["COMFYUI_PATH"] = comfy_path
     command = [sys.executable, git_script_path, "--pull", path]
-    process = subprocess.Popen(command, env=new_env, cwd=get_default_custom_nodes_path())
+    process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
     process.wait()
 
 
@@ -1672,7 +1824,11 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
         # Fetch the latest commits from the remote repository
         repo = git.Repo(path)
 
-        remote_name = 'origin'
+        remote_name = get_remote_name(repo)
+
+        if remote_name is None:
+            raise ValueError(f"No remotes are configured for this repository: {path}")
+
         remote = repo.remote(name=remote_name)
 
         if not do_update and repo.head.is_detached:
@@ -1682,7 +1838,8 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
             return True, True  # detached branch is treated as updatable
 
         if repo.head.is_detached:
-            switch_to_default_branch(repo)
+            if not switch_to_default_branch(repo):
+                raise ValueError(f"Failed to switch detached branch to default branch: {path}")
 
         current_branch = repo.active_branch
         branch_name = current_branch.name
@@ -1695,15 +1852,20 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
 
         if do_update:
             if repo.is_dirty():
-                print(f"STASH: '{path}' is dirty.")
+                print(f"\nSTASH: '{path}' is dirty.")
                 repo.git.stash()
 
             if f'{remote_name}/{branch_name}' not in repo.refs:
-                switch_to_default_branch(repo)
+                if not switch_to_default_branch(repo):
+                    raise ValueError(f"Failed to switch to default branch while updating: {path}")
+
                 current_branch = repo.active_branch
                 branch_name = current_branch.name
 
-            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:
+                return False, False
 
             if commit_hash == remote_commit_hash:
                 repo.close()
@@ -1858,7 +2020,8 @@ def git_pull(path):
             repo.git.stash()
 
         if repo.head.is_detached:
-            switch_to_default_branch(repo)
+            if not switch_to_default_branch(repo):
+                raise ValueError(f"Failed to switch to default branch while pulling: {path}")
 
         current_branch = repo.active_branch
         remote_name = current_branch.tracking_branch().remote_name
@@ -2122,14 +2285,15 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
     repo = git.Repo(repo_path)
 
     if repo.head.is_detached:
-        switch_to_default_branch(repo)
+        if not switch_to_default_branch(repo):
+            return "fail"
 
     current_branch = repo.active_branch
     branch_name = current_branch.name
 
     if current_branch.tracking_branch() is None:
         print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
-        remote_name = 'origin'
+        remote_name = get_remote_name(repo)
     else:
         remote_name = current_branch.tracking_branch().remote_name
     remote = repo.remote(name=remote_name)
@@ -2148,9 +2312,14 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
                       f"-----------------------------------------------------------------------------------------\n"
                       f'git config --global --add safe.directory "{safedir_path}"\n'
                       f"-----------------------------------------------------------------------------------------\n")
+                return "fail"
 
     commit_hash = repo.head.commit.hexsha
-    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:
+        return "fail"
 
     if commit_hash != remote_commit_hash:
         git_pull(repo_path)
@@ -2217,11 +2386,14 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
 
     if dir_path and os.path.exists(dir_path):
         if do_update_check:
-            update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
+            try:
-            if (do_update_check or do_update) and update_state:
+                update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
-                item['update-state'] = 'true'
+                if (do_update_check or do_update) and update_state:
-            elif do_update and not success:
+                    item['update-state'] = 'true'
-                item['update-state'] = 'fail'
+                elif do_update and not success:
+                    item['update-state'] = 'fail'
+            except Exception:
+                print(f"[ComfyUI-Manager] Failed to check state of the git node pack: {dir_path}")
 
 
 def get_installed_pip_packages():
@@ -2291,8 +2463,21 @@ async def get_current_snapshot():
                         cnr_custom_nodes[info['id']] = info['ver']
                     else:
                         repo = git.Repo(fullpath)
+
+                        if repo.head.is_detached:
+                            remote_name = get_remote_name(repo)
+                        else:
+                            current_branch = repo.active_branch
+
+                            if current_branch.tracking_branch() is None:
+                                remote_name = get_remote_name(repo)
+                            else:
+                                remote_name = current_branch.tracking_branch().remote_name
+
                         commit_hash = repo.head.commit.hexsha
-                        url = repo.remotes.origin.url
+
+                        url = repo.remotes[remote_name].url
+
                         git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
                 except:
                     print(f"Failed to extract snapshots for the custom node '{path}'.")
@@ -2946,7 +3131,7 @@ def get_comfyui_versions():
         versions = sorted(versions + [current_tag], reverse=True)
         versions = versions[:4]
 
-    main_branch = repo.heads.main
+    main_branch = repo.heads.master
     latest_commit = main_branch.commit
     latest_tag = repo.git.describe('--tags', latest_commit.hexsha)
 

glob/manager_server.py

@@ -108,7 +108,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 +135,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,10 +153,6 @@ 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
 
@@ -542,17 +537,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):
-    unified_manager = core.unified_manager
+    mode = request.query.get('mode', 'default')
 
-    await unified_manager.reload('cache')
+    if mode == 'imported':
-    await unified_manager.get_custom_nodes('default', 'cache')
+        res = startup_time_installed_node_packs
+    else:
+        res = core.get_installed_node_packs()
 
-    return web.json_response({
+    return web.json_response(res, content_type='application/json')
-        node_id: package.version if package.is_from_cnr else package.get_commit_hash()
-        for node_id, package in unified_manager.installed_node_packages.items() if not package.disabled
-    }, content_type='application/json')
 
 
 @routes.get("/customnode/getlist")
@@ -821,7 +817,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)
@@ -862,6 +858,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':
@@ -869,14 +867,22 @@ 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('reference')]
+            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)
@@ -892,7 +898,11 @@ async def install_custom_node(request):
     # 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}")
+        logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+        return web.Response(status=400, text=res.msg)
+    elif not res.result:
+        logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+        return web.Response(status=400, text=res.msg)
 
     return web.Response(status=200, text="Installation success.")
 
@@ -916,10 +926,10 @@ async def fix_custom_node(request):
     res = core.unified_manager.unified_fix(node_name, node_ver)
 
     if res.result:
-        logging.info("After restarting ComfyUI, please refresh the browser.")
+        logging.info("\nAfter 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}'.")
+    logging.error(f"\nERROR: 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}'.")
 
 
@@ -933,10 +943,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)
@@ -975,10 +985,10 @@ async def uninstall_custom_node(request):
     res = core.unified_manager.unified_uninstall(node_name, is_unknown)
 
     if res.result:
-        logging.info("After restarting ComfyUI, please refresh the browser.")
+        logging.info("\nAfter 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}'.")
+    logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
     return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
 
 
@@ -1002,10 +1012,10 @@ async def update_custom_node(request):
     manager_util.clear_pip_cache()
 
     if res.result:
-        logging.info("After restarting ComfyUI, please refresh the browser.")
+        logging.info("\nAfter 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}'.")
+    logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
     return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
 
 
@@ -1154,17 +1164,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:
@@ -1302,9 +1301,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")
@@ -1314,15 +1317,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:
@@ -1339,24 +1342,27 @@ 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")
@@ -1408,13 +1414,16 @@ async def default_cache_update():
 
     await asyncio.gather(a, b, c, d, e)
 
+    # load at least once
+    await core.unified_manager.reload('cache', dont_wait=False)
+    await core.unified_manager.get_custom_nodes('default', 'cache')
+
     # 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()
 
 if not os.path.exists(core.manager_config_path):

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,13 @@ 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**.
 
 
 # DON'T USE StrictVersion - cannot handle pre_release version
@@ -123,15 +130,26 @@ async def get_data(uri, silent=False):
     return json_obj
 
 
-async def get_data_with_cache(uri, silent=False, cache_mode=True):
+async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
     cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
     cache_uri = os.path.join(cache_dir, cache_uri+'.json')
 
+    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)

js/cm-api.js

@@ -45,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

@@ -103,24 +103,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;
@@ -244,7 +226,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
@@ -426,14 +407,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())
@@ -450,7 +423,6 @@ async function init_notice(notice) {
 		})
 }
 
-await init_badge_mode();
 await init_share_option();
 
 async function fetchNicknames() {
@@ -517,65 +489,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...";
@@ -1050,7 +963,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");
@@ -1069,32 +982,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())
@@ -1218,7 +1108,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			badge_combo,
 			default_ui_combo,
 			share_combo,
 			component_policy_combo,
@@ -1663,32 +1552,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;

js/common.js

@@ -96,7 +96,7 @@ function internalCustomConfirm(message, confirmMessage, cancelMessage) {
 
 export function show_message(msg) {
 	app.ui.dialog.show(msg);
-	app.ui.dialog.element.style.zIndex = 1099;
+	app.ui.dialog.element.style.zIndex = 1100;
 }
 
 export async function sleep(ms) {

js/custom-nodes-manager.js

@@ -1190,7 +1190,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');
 				}
 			}
@@ -1281,7 +1281,7 @@ export class CustomNodesManager {
 				body: JSON.stringify(data)
 			});
 
-			if (res.error) {
+			if (res.status != 200) {
 
 				errorMsg = `${item.title} ${mode} failed: `;
 				if(res.status == 403) {
@@ -1289,7 +1289,7 @@ export class CustomNodesManager {
 				} 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;
@@ -1310,6 +1310,7 @@ export class CustomNodesManager {
 
 		if (errorMsg) {
 			this.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
 			this.showStatus(`${label} ${list.length} custom node(s) successfully`);
 		}

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();
   }
@@ -48,8 +50,12 @@ class WorkflowMetadataExtension {
 
       if (modules[0] === "custom_nodes") {
         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

@@ -4040,7 +4040,7 @@
       "name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
       "type": "VAE",
       "base": "Hunyuan Video",
-      "save_path": "VAE",
+      "save_path": "default",
       "description": "Huyuan Video VAE model. repackaged version.",
       "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
       "filename": "hunyuan_video_vae_bf16.safetensors",

node_db/dev/custom-node-list.json

@@ -10,7 +10,226 @@
         },
 
 
-        
+        {
+            "author": "Njbx",
+            "title": "ComfyUI-blockswap",
+            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
+            "files": [
+                "https://github.com/Njbx/ComfyUI-blockswap"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Block Swap"
+        },
+        {
+            "author": "PATATAJEC",
+            "title": "Patatajec-Nodes [WIP]",
+            "reference": "https://github.com/PATATAJEC/Patatajec-Nodes",
+            "files": [
+                "https://github.com/PATATAJEC/Patatajec-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: HyVid Switcher\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "sourceful-official",
+            "title": "comfyui-sourceful-official",
+            "reference": "https://github.com/sourceful-official/comfyui-sourceful-official",
+            "files": [
+               "https://github.com/sourceful-official/comfyui-sourceful-official"
+            ],
+            "description": "NODES: SourcefulOfficialComfyuiIncontextThreePanels, FalFluxLoraSourcefulOfficial, FalIcLightV2SourcefulOfficial",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "Alvaroeai",
+            "title": "ComfyUI-SunoAI-Mds",
+            "reference": "https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds",
+            "files": [
+                "https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Suno Generate, Suno Download, Suno Proxy Generate, Suno Proxy Download"
+        },
+        {
+            "author": "parmarjh",
+            "title": "ComfyUI-MochiWrapper-I2V [WIP]",
+            "reference": "https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V",
+            "files": [
+                "https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI wrapper nodes for [a/Mochi](https://github.com/genmoai/models) video generator"
+        },
+        {
+            "author": "Symbiomatrix",
+            "title": "Comfyui-Sort-Files",
+            "reference": "https://github.com/Symbiomatrix/Comfyui-Sort-Files",
+            "files": [
+                "https://github.com/Symbiomatrix/Comfyui-Sort-Files"
+            ],
+            "install_type": "git-clone",
+            "description": "Monkeypatch file sort to date modified or custom instead of lexicographic."
+        },
+        {
+            "author": "x3bits",
+            "title": "ComfyUI-Power-Flow [UNSAFE]",
+            "reference": "https://github.com/x3bits/ComfyUI-Power-Flow",
+            "files": [
+                "https://github.com/x3bits/ComfyUI-Power-Flow"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI node package that introduces common programming logic to enhance the flexibility of ComfyUI workflows. It supports features such as function definition and execution, 'for' loops, 'while' loops, and Python code execution.\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
+        },
+        {
+            "author": "EmilioPlumed",
+            "title": "ComfyUI-Math [WIP]",
+            "reference": "https://github.com/EmilioPlumed/ComfyUI-Math",
+            "files": [
+                "https://github.com/EmilioPlumed/ComfyUI-Math"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes that take 2 float inputs and calculates greatest common denominator and least common multiple, returning them as ints.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "mliand",
+            "title": "ComfyUI-Calendar-Node [WIP]",
+            "reference": "https://github.com/mliand/ComfyUI-Calendar-Node",
+            "files": [
+                "https://github.com/mliand/ComfyUI-Calendar-Node"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom node for Comfyui to create a Calendar like grid\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "phamngoctukts",
+            "title": "ComyUI-Tupham",
+            "reference": "https://github.com/phamngoctukts/ComyUI-Tupham",
+            "files": [
+                "https://github.com/phamngoctukts/ComyUI-Tupham"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Ghép Ảnh, Multi Prompt v2.0, Condition Upscale, Multi sampler, Run node selected"
+        },
+        {
+            "author": "5x00",
+            "title": "ComfyUI-Prompt-Plus [WIP]",
+            "reference": "https://github.com/5x00/ComfyUI-Prompt-Plus",
+            "files": [
+                "https://github.com/5x00/ComfyUI-Prompt-Plus"
+            ],
+            "install_type": "git-clone",
+            "description": "Prompt Plus is a collection of LLM and VLM nodes that make prompting easier for image and video generation.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "aria1th",
+            "title": "ComfyUI-CairoSVG",
+            "reference": "https://github.com/aria1th/ComfyUI-CairoSVG",
+            "files": [
+                "https://github.com/aria1th/ComfyUI-CairoSVG"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: VectorizedUpscaleScaling, VectorizedUpscaleSize"
+        },
+        {
+            "author": "gitmylo",
+            "title": "FlowNodes [WIP]",
+            "reference": "https://github.com/gitmylo/FlowNodes",
+            "files": [
+                "https://github.com/gitmylo/FlowNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI node pack containing nodes for basic programming logic."
+        },
+        {
+            "author": "chengzeyi",
+            "title": "Comfy-WaveSpeed [WIP]",
+            "reference": "https://github.com/chengzeyi/Comfy-WaveSpeed",
+            "files": [
+                "https://github.com/chengzeyi/Comfy-WaveSpeed"
+            ],
+            "install_type": "git-clone",
+            "description": "The all in one inference optimization solution for ComfyUI, universal, flexible, and fast."
+        },
+        {
+            "author": "zyd232",
+            "title": "ComfyUI-zyd232-Nodes",
+            "reference": "https://github.com/zyd232/ComfyUI-zyd232-Nodes",
+            "files": [
+                "https://github.com/zyd232/ComfyUI-zyd232-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Image Pixels Compare"
+        },
+        {
+            "author": "yanhuifair",
+            "title": "ComfyUI-FairLab",
+            "reference": "https://github.com/yanhuifair/ComfyUI-FairLab",
+            "files": [
+                "https://github.com/yanhuifair/ComfyUI-FairLab"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
+        },
+        {
+            "author": "nomcycle",
+            "title": "ComfyUI_Cluster [WIP]",
+            "reference": "https://github.com/nomcycle/ComfyUI_Cluster",
+            "files": [
+                "https://github.com/nomcycle/ComfyUI_Cluster"
+            ],
+            "install_type": "git-clone",
+            "description": "Very early W.I.P of clustered ComfyUI inference."
+        },
+        {
+            "author": "waynepimpzhang",
+            "title": "FindBrightestSpot [WIP]",
+            "reference": "https://github.com/waynepimpzhang/comfyui-opencv-brightestspot",
+            "files": [
+                "https://github.com/waynepimpzhang/comfyui-opencv-brightestspot"
+            ],
+            "install_type": "git-clone",
+            "description": "Analyze the image to find the x and y coordinates of the brightest point.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "power88",
+            "title": "ComfyUI-PDiD-Nodes [WIP]",
+            "reference": "https://github.com/power88/ComfyUI-PDiD-Nodes",
+            "files": [
+                "https://github.com/power88/ComfyUI-PDiD-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Get Image Size, Check Character Tag, Nearest SDXL Resolution divided by 64, Get Image Main Color, Blend Images, List Operations, Make Image Gray.\nNOTE: not working"
+        },
+        {
+            "author": "FinetunersAI",
+            "title": "ComfyUI Finetuners [WIP]",
+            "reference": "https://github.com/FinetunersAI/finetuners",
+            "files": [
+                "https://github.com/FinetunersAI/finetuners"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of utility nodes for ComfyUI to enhance your workflow.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "sourceful-official",
+            "title": "ComfyUI_InstructPixToPixConditioningLatent [WIP]",
+            "reference": "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent",
+            "files": [
+               "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent"
+            ],
+            "description": "ComfyUI-ComfyUI_InstructPixToPixConditioningLatent\nNOTE:invalid pyproject.toml",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "fritzprix",
+            "title": "ComfyUI-LLM-Utils [WIP]",
+            "reference": "https://github.com/fritzprix/ComfyUI-LLM-Utils",
+            "files": [
+                "https://github.com/fritzprix/ComfyUI-LLM-Utils"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of utility nodes for ComfyUI focused on text and LLM-related operations\nNOTE: The files in the repo are not organized."
+        },
         {
             "author": "ciga2011",
             "title": "ComfyUI-AppGen [UNSAFE]",
@@ -31,16 +250,6 @@
             "install_type": "git-clone",
             "description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)"
         },
-        {
-            "author": "ai-business-hql",
-            "title": "comfyUIAgent [WIP]",
-            "reference": "https://github.com/ai-business-hql/comfyUIAgent",
-            "files": [
-                "https://github.com/ai-business-hql/comfyUIAgent"
-            ],
-            "install_type": "git-clone",
-            "description": "test"
-        },
         {
             "author": "Grey3016",
             "title": "Save2Icon",
@@ -51,16 +260,6 @@
             "install_type": "git-clone",
             "description": "NODES: Save2Icon"
         },
-        {
-            "author": "sh570655308",
-            "title": "ComfyUI-TopazVideoAI [WIP]",
-            "reference": "https://github.com/sh570655308/ComfyUI-TopazVideoAI",
-            "files": [
-                "https://github.com/sh570655308/ComfyUI-TopazVideoAI"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Topaz Video AI (Upscale & Frame Interpolation)\nNOTE1:Requirements: Licensed installation of TopazVideoAI\nNOTE2: The files in the repo are not organized."
-        },
         {
             "author": "Chargeuk",
             "title": "ComfyUI-vts-nodes [WIP]",
@@ -190,7 +389,7 @@
                 "https://github.com/warshanks/Shank-Tools"
             ],
             "install_type": "git-clone",
-            "description": "NODES: Tile Calculator"
+            "description": "NODES: Tile Calculator, Resolution Divider"
         },
         {
             "author": "BaronVonBoolean",
@@ -224,13 +423,13 @@
         },
         {
             "author": "Maxim-Dey",
-            "title": "ComfyUI-MS_Tools",
+            "title": "ComfyUI-MS_Tools [WIP]",
             "reference": "https://github.com/Maxim-Dey/ComfyUI-MaksiTools",
             "files": [
                 "https://github.com/Maxim-Dey/ComfyUI-MaksiTools"
             ],
             "install_type": "git-clone",
-            "description": "NODES: MS Time Measure Node"
+            "description": "NODES: MS Time Measure NodeMaksiTools"
         },
         {
             "author": "jammyfu",
@@ -524,17 +723,6 @@
             "install_type": "git-clone",
             "description": "NODES: Image Clip Node, Audio Duration Node, Save Video Node,..."
         },
-        {
-            "author": "sh570655308",
-            "title": "ComfyUI-GigapixelAI [WIP]",
-            "reference": "https://github.com/sh570655308/ComfyUI-GigapixelAI",
-            "pip": ["GigapixelAI>=7.3.0"],
-            "files": [
-                "https://github.com/sh570655308/ComfyUI-GigapixelAI"
-            ],
-            "install_type": "git-clone",
-            "description": "custom nodes use gigapixelai ai in comfyui Thanks @choey for the https://github.com/choey/Comfy-Topaz nodes helps me a lot\nRequirements: Licensed installation of Gigapixel 8: the path of gigapixel.exe is in the installation folder of Topaz Gigapixel AI, manually fill it if your installation is not default. Need GigapixelAI>=7.3.0\nNOTE: The files in the repo are not organized."
-        },
         {
             "author": "Big Idea Technology",
             "title": "ComfyUI-Movie-Tools [WIP]",
@@ -967,7 +1155,7 @@
                 "https://github.com/m-ai-studio/mai-prompt-progress"
             ],
             "install_type": "git-clone",
-            "description": "mai-prompt-progress"
+            "description": "ComfyUI extensions for sending prompt progress to webhook"
         },
         {
             "author": "neeltheninja",
@@ -1170,11 +1358,11 @@
             "description": "for preprocessing images, presented in a visual way. It also calculates the corresponding image area."
         },
         {
-            "author": "void15700",
+            "author": "cwebbi1",
             "title": "VoidCustomNodes",
-            "reference": "https://github.com/void15700/VoidCustomNodes",
+            "reference": "https://github.com/cwebbi1/VoidCustomNodes",
             "files": [
-                "https://github.com/void15700/VoidCustomNodes"
+                "https://github.com/cwebbi1/VoidCustomNodes"
             ],
             "install_type": "git-clone",
             "description": "NODES:Prompt Parser, String Combiner"
@@ -1721,7 +1909,7 @@
                 "https://github.com/jimstudt/ComfyUI-Jims-Nodes"
             ],
             "install_type": "git-clone",
-            "description": "Zoom and Enhance Nodes, Text Dictionary Nodes"
+            "description": "NODES: Zoom and Enhance Nodes, Text To String List, Choose String, Define Word, Lookup Word, Substitute Words, Dictionary to JSON, JSON file to Dictionary, JSON to Dictionary, Load Image And Info From Path, CubbyHack, Image to Solid Background"
         },
         {
             "author": "hananbeer",

node_db/dev/extension-node-map.json

@@ -154,6 +154,22 @@
             "title_aux": "ComfyUI_Fooocus"
         }
     ],
+    "https://github.com/5x00/ComfyUI-Prompt-Plus": [
+        [
+            "LoadAPI",
+            "LoadCustomModel",
+            "LoadFlorenceModel",
+            "Prompt",
+            "RunAPIVLM",
+            "RunCustomVLM",
+            "TriggerToPromptAPI",
+            "TriggerToPromptCustom",
+            "TriggerToPromptSimple"
+        ],
+        {
+            "title_aux": "ComfyUI-Prompt-Plus [WIP]"
+        }
+    ],
     "https://github.com/A4P7J1N7M05OT/ComfyUI-ManualSigma": [
         [
             "ManualSigma"
@@ -358,6 +374,17 @@
             "title_aux": "ComfyUI-Xorbis-nodes [WIP]"
         }
     ],
+    "https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds": [
+        [
+            "Mideas_SunoAI_AudioManager",
+            "Mideas_SunoAI_Generator",
+            "Mideas_SunoAI_ProxyDownloadNode",
+            "Mideas_SunoAI_ProxyNode"
+        ],
+        {
+            "title_aux": "ComfyUI-SunoAI-Mds"
+        }
+    ],
     "https://github.com/Anze-/ComfyUI-OIDN": [
         [
             "OIDN Denoise"
@@ -510,8 +537,10 @@
     "https://github.com/Chargeuk/ComfyUI-vts-nodes": [
         [
             "VTS Clean Text",
+            "VTS Clip Text Encode",
             "VTS Color Mask To Mask",
             "VTS Conditioning Set Batch Mask",
+            "VTS Images Crop From Masks",
             "VTS Merge Delimited Text",
             "VTS Reduce Batch Size",
             "VTS To Text",
@@ -562,8 +591,10 @@
             "DevToolsNodeWithOnlyOptionalInput",
             "DevToolsNodeWithOptionalInput",
             "DevToolsNodeWithOutputList",
+            "DevToolsNodeWithSeedInput",
             "DevToolsNodeWithStringInput",
             "DevToolsNodeWithUnionInput",
+            "DevToolsObjectPatchNode",
             "DevToolsSimpleSlider"
         ],
         {
@@ -652,7 +683,7 @@
     ],
     "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
         [
-            "GetBooruImageInfo",
+            "GetBooruPost",
             "TagEncode"
         ],
         {
@@ -678,9 +709,28 @@
             "AD_TextListToString",
             "AD_TextSaver",
             "AD_TxtToCSVCombiner",
-            "AD_ZipSave"
+            "AD_ZipSave",
+            "AD_advanced-padding",
+            "AD_color-image",
+            "AD_image-concat",
+            "AD_image-resize",
+            "AD_mockup-maker",
+            "AD_poster-maker",
+            "AD_prompt-saver",
+            "ImageCaptioner",
+            "ImageResize",
+            "Incrementer \ud83e\udeb4",
+            "TextAppendNode",
+            "Width and height for scaling image to ideal resolution \ud83e\udeb4",
+            "Width and height from aspect ratio \ud83e\udeb4",
+            "YANC.MultilineString",
+            "comfyui-easy-padding",
+            "image concat mask"
         ],
         {
+            "author": "ComfyUI Addoor",
+            "description": "Save prompts to CSV file with customizable naming pattern",
+            "title": "ComfyUI-PromptSaver",
             "title_aux": "ComfyUI-Addoor [UNSAFE]"
         }
     ],
@@ -693,6 +743,15 @@
             "title_aux": "ComfyUI-MusicGen [WIP]"
         }
     ],
+    "https://github.com/EmilioPlumed/ComfyUI-Math": [
+        [
+            "GreatestCommonDenominator",
+            "LowestCommonMultiple"
+        ],
+        {
+            "title_aux": "ComfyUI-Math [WIP]"
+        }
+    ],
     "https://github.com/ExponentialML/ComfyUI_LiveDirector": [
         [
             "LiveDirector"
@@ -742,6 +801,16 @@
             "title_aux": "Fast Group Link [WIP]"
         }
     ],
+    "https://github.com/FinetunersAI/finetuners": [
+        [
+            "AutoImageResize",
+            "GroupLink",
+            "VariablesInjector"
+        ],
+        {
+            "title_aux": "ComfyUI Finetuners [WIP]"
+        }
+    ],
     "https://github.com/Fucci-Mateo/ComfyUI-Airtable": [
         [
             "Push pose to Airtable"
@@ -769,7 +838,7 @@
     ],
     "https://github.com/Grey3016/Save2Icon": [
         [
-            "Save2Icon"
+            "ConvertToIconNode"
         ],
         {
             "title_aux": "Save2Icon"
@@ -1075,10 +1144,14 @@
     ],
     "https://github.com/Maxim-Dey/ComfyUI-MaksiTools": [
         [
-            "MT Time Measure Node"
+            "\ud83d\udd22 Return Boolean",
+            "\ud83d\udd22 Return Float",
+            "\ud83d\udd22 Return Integer",
+            "\ud83d\udd22 Return Multiline String",
+            "\ud83d\udd27 Time Measure Node"
         ],
         {
-            "title_aux": "ComfyUI-MS_Tools"
+            "title_aux": "ComfyUI-MS_Tools [WIP]"
         }
     ],
     "https://github.com/MrAdamBlack/CheckProgress": [
@@ -1097,6 +1170,22 @@
             "title_aux": "ComfyUI-APG_ImYourCFGNow"
         }
     ],
+    "https://github.com/Njbx/ComfyUI-blockswap": [
+        [
+            "BlockSwap"
+        ],
+        {
+            "title_aux": "ComfyUI-blockswap"
+        }
+    ],
+    "https://github.com/PATATAJEC/Patatajec-Nodes": [
+        [
+            "HyvidSwitcher"
+        ],
+        {
+            "title_aux": "Patatajec-Nodes [WIP]"
+        }
+    ],
     "https://github.com/PluMaZero/ComfyUI-SpaceFlower": [
         [
             "SpaceFlower_HangulPrompt",
@@ -1230,6 +1319,7 @@
     ],
     "https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
         [
+            "AdvancedScript",
             "CheckpointLoaderSimpleShared //SeedV",
             "ControlNetLoaderAdvancedShared",
             "LoraLoader //SeedV",
@@ -1242,6 +1332,7 @@
     "https://github.com/ShahFaisalWani/ComfyUI-Mojen-Nodeset": [
         [
             "MojenAnalyzeProcessor",
+            "MojenAspectRatio",
             "MojenImageLoader",
             "MojenLogPercent",
             "MojenNSFWClassifier",
@@ -1585,6 +1676,7 @@
     "https://github.com/backearth1/Comfyui-MiniMax-Video": [
         [
             "MiniMaxAIAPIClient",
+            "MiniMaxImage2Prompt",
             "MiniMaxImage2Video",
             "MiniMaxPreviewVideo"
         ],
@@ -1908,6 +2000,20 @@
             "title_aux": "ComfyUI_StepFun"
         }
     ],
+    "https://github.com/chengzeyi/Comfy-WaveSpeed": [
+        [
+            "ApplyFBCacheOnModel",
+            "EnhancedCompileModel",
+            "EnhancedLoadDiffusionModel",
+            "VelocatorCompileModel",
+            "VelocatorLoadAndQuantizeClip",
+            "VelocatorLoadAndQuantizeDiffusionModel",
+            "VelocatorQuantizeModel"
+        ],
+        {
+            "title_aux": "Comfy-WaveSpeed [WIP]"
+        }
+    ],
     "https://github.com/christian-byrne/infinite-zoom-parallax-nodes": [
         [
             "Create Parallax Video",
@@ -1991,6 +2097,7 @@
             "DisableNoise",
             "DualCFGGuider",
             "DualCLIPLoader",
+            "EmptyCosmosLatentVideo",
             "EmptyHunyuanLatentVideo",
             "EmptyImage",
             "EmptyLTXVLatentVideo",
@@ -2257,6 +2364,15 @@
             "title_aux": "ComfyUI-Better-Dimensions"
         }
     ],
+    "https://github.com/cwebbi1/VoidCustomNodes": [
+        [
+            "Prompt Parser",
+            "String Combiner"
+        ],
+        {
+            "title_aux": "VoidCustomNodes"
+        }
+    ],
     "https://github.com/denislov/Comfyui_AutoSurvey": [
         [
             "AddDoc2Knowledge",
@@ -2425,7 +2541,6 @@
         [
             "DownloadAndLoadHyVideoTextEncoder",
             "HyVideoBlockSwap",
-            "HyVideoCustomPromptTemplate",
             "HyVideoDecode",
             "HyVideoEncode",
             "HyVideoModelLoader",
@@ -2445,7 +2560,10 @@
             "Genera.BatchTester",
             "Genera.GCPStorageNode",
             "Genera.MaskDrawer",
-            "Genera.Utils"
+            "Genera.Utils",
+            "PDPStage1",
+            "PainterNode",
+            "UniversalSwitch"
         ],
         {
             "title_aux": "ComfyUI-GeneraNodes"
@@ -2498,6 +2616,19 @@
             "title_aux": "comfyui-cem-tools"
         }
     ],
+    "https://github.com/fritzprix/ComfyUI-LLM-Utils": [
+        [
+            "WeightedDict",
+            "WeightedDictConcat",
+            "WeightedDictInput",
+            "WeightedDictSelect",
+            "WeightedDictSelectGroup",
+            "WeightedDictToPrompt"
+        ],
+        {
+            "title_aux": "ComfyUI-LLM-Utils [WIP]"
+        }
+    ],
     "https://github.com/galoreware/ComfyUI-GaloreNodes": [
         [
             "GNI_HEX_TO_COLOR",
@@ -2741,11 +2872,16 @@
     ],
     "https://github.com/hy134300/comfyui-hydit": [
         [
+            "DiffusersCLIPLoader",
+            "DiffusersCheckpointLoader",
             "DiffusersClipTextEncode",
+            "DiffusersControlNetLoader",
+            "DiffusersLoraLoader",
             "DiffusersModelMakeup",
             "DiffusersPipelineLoader",
             "DiffusersSampler",
-            "DiffusersSchedulerLoader"
+            "DiffusersSchedulerLoader",
+            "DiffusersVAELoader"
         ],
         {
             "title_aux": "comfyui-hydit"
@@ -2798,13 +2934,24 @@
             "ClickPopup",
             "ColorPicker",
             "DynamicImageCombiner",
+            "DynamicMaskCombiner",
+            "ImageLatentCreator",
             "ImageResolutionAdjuster",
+            "ImageSizeCreator",
+            "ImageToBase64",
             "MaskPreview",
             "MultilineTextInput",
+            "PaintingCoder::ImageSwitch",
+            "PaintingCoder::LatentSwitch",
+            "PaintingCoder::MaskSwitch",
+            "PaintingCoder::TextSwitch",
+            "PaintingCoder::WebImageLoader",
             "RemoveEmptyLinesAndLeadingSpaces",
             "RemoveEmptyLinesAndLeadingSpacesAdvance",
             "ShowTextPlus",
-            "TextCombiner"
+            "SimpleTextInput",
+            "TextCombiner",
+            "WebImageLoader"
         ],
         {
             "title_aux": "ComfyUI PaintingCoderUtils Nodes [WIP]"
@@ -2833,6 +2980,7 @@
             "DefineWord",
             "DictFromJSON",
             "DictionaryToJSON",
+            "ImageToSolidBackground",
             "JSONToDictionary",
             "LoadImageAndInfoFromPath",
             "LookupWord",
@@ -2979,7 +3127,10 @@
             "KAndyCivitPromptAPI",
             "KAndyImagesByCss",
             "KAndyLoadImageFromUrl",
-            "KAndyNoiseCondition"
+            "KAndyNoiseCondition",
+            "KCivitaiPostAPI",
+            "KPornImageAPI",
+            "KPromtGen"
         ],
         {
             "title_aux": "ComfyUI-KAndy"
@@ -3089,6 +3240,7 @@
             "HyVideoReSampler",
             "HyVideoSTG",
             "HyVideoSampler",
+            "HyVideoTeaCache",
             "HyVideoTextEmbedsLoad",
             "HyVideoTextEmbedsSave",
             "HyVideoTextEncode",
@@ -3594,6 +3746,14 @@
             "title_aux": "ComfyUI-LLM-Evaluation [WIP]"
         }
     ],
+    "https://github.com/mliand/ComfyUI-Calendar-Node": [
+        [
+            "Comfy Calendar Node"
+        ],
+        {
+            "title_aux": "ComfyUI-Calendar-Node [WIP]"
+        }
+    ],
     "https://github.com/monate0615/ComfyUI-Affine-Transform": [
         [
             "AffineTransform"
@@ -3721,6 +3881,14 @@
             "title_aux": "ComfyUI-PromptUtilities"
         }
     ],
+    "https://github.com/nomcycle/ComfyUI_Cluster": [
+        [
+            "FenceClusteredWorkflow"
+        ],
+        {
+            "title_aux": "ComfyUI_Cluster [WIP]"
+        }
+    ],
     "https://github.com/oshtz/ComfyUI-oshtz-nodes": [
         [
             "ImageOverlayNode",
@@ -3768,18 +3936,40 @@
             "ConditioningZeroOutCombine",
             "ConvertTimestepToSigma",
             "DynSamplerSelect",
+            "DynamicThresholdingSimplePost",
             "EmptyLatentImageAR",
             "FreeU2PPM",
             "Guidance Limiter",
             "LatentOperationTonemapLuminance",
             "LatentToMaskBB",
             "LatentToWidthHeight",
-            "PPMSamplerSelect"
+            "PPMSamplerSelect",
+            "RescaleCFGPost"
         ],
         {
             "title_aux": "ComfyUI-ppm"
         }
     ],
+    "https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V": [
+        [
+            "DownloadAndLoadMochiModel",
+            "MochiDecode",
+            "MochiDecodeSpatialTiling",
+            "MochiFasterCache",
+            "MochiImageEncode",
+            "MochiLatentPreview",
+            "MochiModelLoader",
+            "MochiSampler",
+            "MochiSigmaSchedule",
+            "MochiTextEncode",
+            "MochiTorchCompileSettings",
+            "MochiVAEEncoderLoader",
+            "MochiVAELoader"
+        ],
+        {
+            "title_aux": "ComfyUI-MochiWrapper-I2V [WIP]"
+        }
+    ],
     "https://github.com/paulhoux/Smart-Prompting": [
         [
             "SaveImageWithPrefix",
@@ -3796,6 +3986,18 @@
             "title_aux": "List Data Helper Nodes"
         }
     ],
+    "https://github.com/phamngoctukts/ComyUI-Tupham": [
+        [
+            "AreaCondition_v2",
+            "ConditionUpscale",
+            "MultiLatent",
+            "Runnodeselected",
+            "ghepanh"
+        ],
+        {
+            "title_aux": "ComyUI-Tupham"
+        }
+    ],
     "https://github.com/poisenbery/NudeNet-Detector-Provider": [
         [
             "NudeNetDetectorProvider"
@@ -3804,6 +4006,20 @@
             "title_aux": "NudeNet-Detector-Provider [WIP]"
         }
     ],
+    "https://github.com/power88/ComfyUI-PDiD-Nodes": [
+        [
+            "Blend Images",
+            "Check Character Tag",
+            "Get Image Colors",
+            "Get image size",
+            "List Operations",
+            "Make Image Gray",
+            "Nearest SDXL Resolution divided by 64"
+        ],
+        {
+            "title_aux": "ComfyUI-PDiD-Nodes [WIP]"
+        }
+    ],
     "https://github.com/prabinpebam/anyPython": [
         [
             "Any Python"
@@ -3938,23 +4154,6 @@
             "title_aux": "comfyui-creative-nodes"
         }
     ],
-    "https://github.com/sh570655308/ComfyUI-GigapixelAI": [
-        [
-            "GigapixelAI",
-            "GigapixelUpscaleSettings"
-        ],
-        {
-            "title_aux": "ComfyUI-GigapixelAI [WIP]"
-        }
-    ],
-    "https://github.com/sh570655308/ComfyUI-TopazVideoAI": [
-        [
-            "TopazVideoAI"
-        ],
-        {
-            "title_aux": "ComfyUI-TopazVideoAI [WIP]"
-        }
-    ],
     "https://github.com/shadowcz007/ComfyUI-PuLID-Test": [
         [
             "ApplyPulid",
@@ -4073,6 +4272,24 @@
             "title_aux": "dandy [UNSAFE]"
         }
     ],
+    "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent": [
+        [
+            "InstructPixToPixConditioningLatent"
+        ],
+        {
+            "title_aux": "ComfyUI_InstructPixToPixConditioningLatent [WIP]"
+        }
+    ],
+    "https://github.com/sourceful-official/comfyui-sourceful-official": [
+        [
+            "FalFluxLoraSourcefulOfficial",
+            "FalIcLightV2SourcefulOfficial",
+            "SourcefulOfficialComfyuiIncontextThreePanels"
+        ],
+        {
+            "title_aux": "comfyui-sourceful-official"
+        }
+    ],
     "https://github.com/sswink/comfyui-lingshang": [
         [
             "LS_ALY_Seg_Body_Utils",
@@ -4117,7 +4334,9 @@
     ],
     "https://github.com/sugarkwork/comfyui_psd": [
         [
-            "SavePSD"
+            "Convert PSD to Image",
+            "PSDLayer",
+            "Save PSD"
         ],
         {
             "title_aux": "comfyui_psd [WIP]"
@@ -4260,15 +4479,6 @@
             "title_aux": "ComfyUI-My-Handy-Nodes"
         }
     ],
-    "https://github.com/void15700/VoidCustomNodes": [
-        [
-            "Prompt Parser",
-            "String Combiner"
-        ],
-        {
-            "title_aux": "VoidCustomNodes"
-        }
-    ],
     "https://github.com/walterFeng/ComfyUI-Image-Utils": [
         [
             "Calculate Image Brightness",
@@ -4286,6 +4496,7 @@
     ],
     "https://github.com/warshanks/Shank-Tools": [
         [
+            "ResolutionDivider",
             "TileCalculator"
         ],
         {
@@ -4311,6 +4522,14 @@
             "title_aux": "ComfyUI-exit [UNSAFE]"
         }
     ],
+    "https://github.com/waynepimpzhang/comfyui-opencv-brightestspot": [
+        [
+            "FindBrightestSpot"
+        ],
+        {
+            "title_aux": "FindBrightestSpot [WIP]"
+        }
+    ],
     "https://github.com/willblaschko/ComfyUI-Unload-Models": [
         [
             "DeleteAnyObject",
@@ -4359,6 +4578,27 @@
             "title_aux": "ComfyUI-XYNodes"
         }
     ],
+    "https://github.com/yanhuifair/ComfyUI-FairLab": [
+        [
+            "CLIPTranslatedNode",
+            "DownloadImageNode",
+            "FixUTF8StringNode",
+            "ImageResizeNode",
+            "ImagesToVideoNode",
+            "LoadImageFromFolderNode",
+            "SaveImageToFolderNode",
+            "SaveImagesToFolderNode",
+            "SaveStringToFolderNode",
+            "SequenceStringListNode",
+            "StringCombineNode",
+            "StringFieldNode",
+            "TranslateStringNode",
+            "VideoToImagesNode"
+        ],
+        {
+            "title_aux": "ComfyUI-FairLab"
+        }
+    ],
     "https://github.com/yojimbodayne/ComfyUI-Dropbox-API": [
         [
             "FetchTokenFromDropbox",
@@ -4397,6 +4637,14 @@
             "title_aux": "Comfyui_image2prompt"
         }
     ],
+    "https://github.com/zyd232/ComfyUI-zyd232-Nodes": [
+        [
+            "zyd232 ImagesPixelsCompare"
+        ],
+        {
+            "title_aux": "ComfyUI-zyd232-Nodes"
+        }
+    ],
     "https://raw.githubusercontent.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions/main/EXT_VariationUtils.py": [
         [
             "BatchToList",

node_db/legacy/custom-node-list.json

@@ -11,6 +11,38 @@
         
 
         
+        {
+            "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]",

node_db/tutorial/custom-node-list.json

@@ -260,6 +260,37 @@
             ],
             "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",

prestartup_script.py

@@ -17,9 +17,19 @@ import security_check
 import manager_util
 import cm_global
 import manager_downloader
-from datetime import datetime
 import folder_paths
 
+try:
+    from datetime import datetime
+    def current_timestamp():
+        return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+except:
+    import time
+    import datetime
+    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 +60,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':
@@ -79,12 +88,12 @@ 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 = {}
+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)
@@ -236,7 +245,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:
@@ -318,6 +327,7 @@ 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")
@@ -339,11 +349,14 @@ 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("** 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'))
@@ -354,9 +367,8 @@ 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)
+        config.read(manager_config_path)
         default_conf = config['default']
 
         if 'downgrade_blacklist' in default_conf:
@@ -375,13 +387,12 @@ 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)
+        config.read(manager_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
@@ -402,7 +413,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 +428,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 +447,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
 
 
@@ -639,9 +658,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.3.2"
+version = "3.7.4"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 

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")