wip: pygit2

* feat: add  ComfyUI MiaoShua Creator

* Update custom-node-list.json

---------

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

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - main-blocked
     paths:
       - "pyproject.toml"
 

.gitignore

@@ -14,4 +14,4 @@ comfyworkflows_sharekey
 github-stats-cache.json
 pip_overrides.json
 *.json
-
+check2.sh

README.md

@@ -204,7 +204,6 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 * Please submit a pull request to update either the custom-node-list.json or model-list.json file.
 
 * The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
-  * Or you can provide manually `node_list.json` file.
 
 ```
 NODE_CLASS_MAPPINGS = {
@@ -218,6 +217,7 @@ NODE_CLASS_MAPPINGS.update({
     "SemSegPreprocessor": Uniformer_SemSegPreprocessor,
 })
 ```
+  * Or you can provide manually `node_list.json` file.
 
 * When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
   * Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
@@ -363,10 +363,10 @@ When you run the `scan.sh` script:
   * `high` level risky features
     * `Install via git url`, `pip install`
     * Installation of custom nodes registered not in the `default channel`.
-    * Display terminal log
+    * Fix custom nodes
   
   * `middle` level risky features
-    * Uninstall/Update/Fix custom nodes
+    * Uninstall/Update
     * Installation of custom nodes registered in the `default channel`.
     * Restore/Remove Snapshot
     * Restart

cm-cli.py

@@ -109,7 +109,7 @@ class Ctx:
             install_script_path = os.path.join(repo_path, 'install.py')
 
             if os.path.exists(requirements_path):
-                with (open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file):
+                with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
                     for line in file:
                         package_name = core.remap_pip_package(line.strip())
                         if package_name and not core.is_installed(package_name):

glob/git_wrapper.py

@@ -0,0 +1,174 @@
+import pygit2
+import os
+from tqdm import tqdm
+import traceback
+
+class GitProgress(pygit2.RemoteCallbacks):
+    def __init__(self):
+        super().__init__()
+        self.pbar = None
+
+    def transfer_progress(self, stats):
+        if self.pbar is None:
+            self.pbar = tqdm(total=stats.total_objects, unit="obj", desc="Fetching objects")
+        self.pbar.n = stats.received_objects
+        self.pbar.refresh()
+        if stats.received_objects == stats.total_objects:
+            self.pbar.close()
+            self.pbar = None
+
+
+class Remote:
+    def __init__(self, repo, remote):
+        self.repo = repo
+        self.remote = remote
+
+    def get_default_branch(self, remote_name='origin'):
+        remote = self.repo.remotes[remote_name]
+        remote.fetch()  # Fetch latest data from the remote
+
+        # Look for the remote HEAD reference
+        head_ref = f'refs/remotes/{remote_name}/HEAD'
+        if head_ref in self.repo.references:
+            # Resolve the symbolic reference to get the actual branch
+            target_ref = self.repo.references[head_ref].resolve().name
+            return target_ref.replace(f'refs/remotes/{remote_name}/', '')
+        else:
+            raise ValueError(f"Could not determine the default branch for remote '{remote_name}'")
+
+
+    def pull(self, remote_name='origin'):
+        try:
+            # Detect if we are in detached HEAD state
+            if self.repo.head_is_detached:
+                # Find the default branch
+                branch_name = self.get_default_branch(remote_name)
+                
+                # Checkout the branch if exists, or create it
+                branch_ref = f"refs/heads/{branch_name}"
+                if branch_ref in self.repo.references:
+                    self.repo.checkout(branch_ref)
+                else:
+                    # Create and checkout the branch
+                    target_commit = self.repo.lookup_reference(f"refs/remotes/{remote_name}/{branch_name}").target
+                    self.repo.create_branch(branch_name, self.repo[target_commit])
+                    self.repo.checkout(branch_ref)
+            
+            # Get the current branch
+            current_branch = self.repo.head.shorthand
+            
+            # Fetch from the remote
+            remote = self.repo.remotes[remote_name]
+            remote.fetch()
+            
+            # Merge changes from the remote
+            remote_branch_ref = f"refs/remotes/{remote_name}/{current_branch}"
+            remote_branch = self.repo.lookup_reference(remote_branch_ref).target
+            
+            self.repo.merge(remote_branch)
+            
+            # Check for merge conflicts
+            if self.repo.index.conflicts is not None:
+                print("Merge conflicts detected!")
+                for conflict in self.repo.index.conflicts:
+                    print(f"Conflict: {conflict}")
+                return
+            
+            # Commit the merge
+            user = self.repo.default_signature
+            merge_commit = self.repo.create_commit(
+                'HEAD',
+                user,
+                user,
+                f"Merge branch '{current_branch}' from {remote_name}",
+                self.repo.index.write_tree(),
+                [self.repo.head.target, remote_branch]
+            )
+        
+        except Exception as e:
+            traceback.print_exc()
+            print(f"An error occurred: {e}")
+            self.repo.state_cleanup()  # Clean up the merge state if necessary
+
+
+class Repo:
+    def __init__(self, repo_path):
+        self.repo = pygit2.Repository(repo_path)
+
+    def remote(self, name="origin"):
+        return Remote(self.repo, self.repo.remotes[name])
+
+    def update_recursive(self):
+        update_submodules(self.repo)
+
+
+def resolve_repository_state(repo):
+    if repo.is_empty:
+        raise ValueError("Repository is empty. Cannot proceed with submodule update.")
+
+    try:
+        state = repo.state()  # Call the state method
+    except Exception as e:
+        print(f"Error retrieving repository state: {e}")
+        raise
+
+    if state != pygit2.GIT_REPOSITORY_STATE_NONE:
+        if state in (pygit2.GIT_REPOSITORY_STATE_MERGE, pygit2.GIT_REPOSITORY_STATE_REVERT):
+            print(f"Conflict detected. Cleaning up repository state... {repo.path} / {state}")
+            repo.state_cleanup()
+            print("Repository state cleaned up.")
+        else:
+            raise RuntimeError(f"Unsupported repository state: {state}")
+
+
+def update_submodules(repo):
+    try:
+        resolve_repository_state(repo)
+    except Exception as e:
+        print(f"Error resolving repository state: {e}")
+        return
+
+    gitmodules_path = os.path.join(repo.workdir, ".gitmodules")
+    if not os.path.exists(gitmodules_path):
+        return
+
+    with open(gitmodules_path, "r") as f:
+        lines = f.readlines()
+
+    submodules = []
+    submodule_path = None
+    submodule_url = None
+
+    for line in lines:
+        if line.strip().startswith("[submodule"):
+            if submodule_path and submodule_url:
+                submodules.append((submodule_path, submodule_url))
+            submodule_path = None
+            submodule_url = None
+        elif line.strip().startswith("path ="):
+            submodule_path = line.strip().split("=", 1)[1].strip()
+        elif line.strip().startswith("url ="):
+            submodule_url = line.strip().split("=", 1)[1].strip()
+
+    if submodule_path and submodule_url:
+        submodules.append((submodule_path, submodule_url))
+
+    for path, url in submodules:
+        submodule_repo_path = os.path.join(repo.workdir, path)
+
+        print(f"submodule_repo_path: {submodule_repo_path}")
+
+        if not os.path.exists(submodule_repo_path):
+            print(f"Cloning submodule {path}...")
+            pygit2.clone_repository(url, submodule_repo_path, callbacks=GitProgress())
+        else:
+            print(f"Updating submodule {path}...")
+            submodule_repo = Repo(submodule_repo_path)
+            submodule_repo.remote("origin").pull()
+
+        update_submodules(submodule_repo)
+
+
+def clone_from(git_url, repo_dir, recursive=True):
+    pygit2.clone_repository(git_url, repo_dir, callbacks=GitProgress())
+    Repo(repo_dir).update_recursive()

glob/manager_core.py

@@ -23,13 +23,35 @@ sys.path.append(glob_path)
 import cm_global
 from manager_util import *
 
-version = [2, 50, 1]
+version = [2, 53]
 version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
 
 
 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 custom_nodes_path = os.path.abspath(os.path.join(comfyui_manager_path, '..'))
 
+default_custom_nodes_path = None
+
+def get_default_custom_nodes_path():
+    global default_custom_nodes_path
+    if default_custom_nodes_path is None:
+        try:
+            import folder_paths
+            default_custom_nodes_path = folder_paths.get_folder_paths("custom_nodes")[0]
+        except:
+            default_custom_nodes_path = custom_nodes_path
+
+    return default_custom_nodes_path
+
+
+def get_custom_nodes_paths():
+        try:
+            import folder_paths
+            return folder_paths.get_folder_paths("custom_nodes")
+        except:
+            return [custom_nodes_path]
+
+
 comfy_path = os.environ.get('COMFYUI_PATH')
 if comfy_path is None:
     comfy_path = os.path.abspath(os.path.join(custom_nodes_path, '..'))
@@ -340,7 +362,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
 
     new_env = os.environ.copy()
     new_env["COMFYUI_PATH"] = comfy_path
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=custom_nodes_path)
+    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()
 
@@ -367,13 +389,13 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
     if do_update:
         if "CUSTOM NODE PULL: Success" in output:
             process.wait()
-            print(f"\rUpdated: {path}")
+            print(f"\x1b[2K\rUpdated: {path}")
             return True, True    # updated
         elif "CUSTOM NODE PULL: None" in output:
             process.wait()
             return False, True   # there is no update
         else:
-            print(f"\rUpdate error: {path}")
+            print(f"\x1b[2K\rUpdate error: {path}")
             process.wait()
             return False, False  # update failed
     else:
@@ -384,7 +406,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
             process.wait()
             return False, True
         else:
-            print(f"\rFetch error: {path}")
+            print(f"\x1b[2K\rFetch error: {path}")
             print(f"\n{output}\n")
             process.wait()
             return False, True
@@ -394,7 +416,7 @@ 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=custom_nodes_path)
+    process = subprocess.Popen(command, env=new_env, cwd=get_default_custom_nodes_path())
     process.wait()
 
 
@@ -408,8 +430,17 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
     else:
         if os.path.exists(requirements_path):
             print("Install: pip packages")
+            pip_fixer = PIPFixer(get_installed_packages())
             with open(requirements_path, "r") as requirements_file:
                 for line in requirements_file:
+                    #handle comments
+                    if '#' in line:
+                        if line.strip()[0] == '#':
+                            print("Line is comment...skipping")
+                            continue
+                        else:
+                            line = line.split('#')[0].strip()
+
                     package_name = remap_pip_package(line.strip())
 
                     if package_name and not package_name.startswith('#'):
@@ -422,6 +453,8 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
                         if package_name.strip() != "" and not package_name.startswith('#'):
                             try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
+            pip_fixer.fix_broken()
+
         if os.path.exists(install_script_path):
             print(f"Install: install script")
             install_cmd = [sys.executable, "install.py"]
@@ -551,11 +584,11 @@ def gitclone_install(files, instant_execution=False, msg_prefix=''):
         try:
             print(f"Download: git clone '{url}'")
             repo_name = os.path.splitext(os.path.basename(url))[0]
-            repo_path = os.path.join(custom_nodes_path, repo_name)
+            repo_path = os.path.join(get_default_custom_nodes_path(), repo_name)
 
             # Clone the repository from the remote URL
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", custom_nodes_path, url], cwd=custom_nodes_path)
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url], cwd=get_default_custom_nodes_path())
                 if res != 0:
                     return False
             else:
@@ -679,6 +712,22 @@ async def get_data_by_mode(mode, filename, channel_url=None):
     return json_obj
 
 
+def lookup_installed_custom_nodes(repo_name):
+    try:
+        import folder_paths
+        base_paths = folder_paths.get_folder_paths("custom_nodes")
+    except:
+        base_paths = [custom_nodes_path]
+
+    for base_path in base_paths:
+        repo_path = os.path.join(base_path, repo_name)
+        if os.path.exists(repo_path):
+            return True, repo_path
+        elif os.path.exists(repo_path+'.disabled'):
+            return False, repo_path
+        
+    return None
+
 def gitclone_fix(files, instant_execution=False):
     print(f"Try fixing: {files}")
     for url in files:
@@ -690,13 +739,15 @@ def gitclone_fix(files, instant_execution=False):
             url = url[:-1]
         try:
             repo_name = os.path.splitext(os.path.basename(url))[0]
-            repo_path = os.path.join(custom_nodes_path, repo_name)
+            repo_path = lookup_installed_custom_nodes(repo_name)
 
-            if os.path.exists(repo_path+'.disabled'):
+            if repo_path is not None:
-                repo_path = repo_path+'.disabled'
+                repo_path = repo_path[1]
 
-            if not execute_install_script(url, repo_path, instant_execution=instant_execution):
+                if not execute_install_script(url, repo_path, instant_execution=instant_execution):
-                return False
+                    return False
+            else:
+                print(f"Custom node not found: {repo_name}")
 
         except Exception as e:
             print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
@@ -743,12 +794,12 @@ def gitclone_uninstall(files):
             url = url[:-1]
         try:
             dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
-            dir_path = os.path.join(custom_nodes_path, dir_name)
+            repo_path = lookup_installed_custom_nodes(dir_name)
 
-            # safety check
+            if repo_path is None:
-            if dir_path == '/' or dir_path[1:] == ":/" or dir_path == '':
+                continue
-                print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'")
+            
-                return False
+            dir_path = repo_path[1]
 
             install_script_path = os.path.join(dir_path, "uninstall.py")
             disable_script_path = os.path.join(dir_path, "disable.py")
@@ -764,10 +815,7 @@ def gitclone_uninstall(files):
                 if code != 0:
                     print(f"An error occurred during the execution of the disable.py script. Only the '{dir_path}' will be deleted.")
 
-            if os.path.exists(dir_path):
+            rmtree(dir_path)
-                rmtree(dir_path)
-            elif os.path.exists(dir_path + ".disabled"):
-                rmtree(dir_path + ".disabled")
         except Exception as e:
             print(f"Uninstall(git-clone) error: {url} / {e}", file=sys.stderr)
             return False
@@ -790,12 +838,12 @@ def gitclone_set_active(files, is_disable):
             url = url[:-1]
         try:
             dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
-            dir_path = os.path.join(custom_nodes_path, dir_name)
+            repo_path = lookup_installed_custom_nodes(dir_name)
 
-            # safety check
+            if repo_path is None:
-            if dir_path == '/' or dir_path[1:] == ":/" or dir_path == '':
+                continue
-                print(f"{action_name}(git-clone) error: invalid path '{dir_path}' for '{url}'")
+
-                return False
+            dir_path = repo_path[1]
             
             if is_disable:
                 current_path = dir_path
@@ -832,10 +880,12 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
             url = url[:-1]
         try:
             repo_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
-            repo_path = os.path.join(custom_nodes_path, repo_name)
+            repo_path = lookup_installed_custom_nodes(repo_name)
 
-            if os.path.exists(repo_path+'.disabled'):
+            if repo_path is None:
-                repo_path = repo_path+'.disabled'
+                continue
+
+            repo_path = repo_path[1]
             
             git_pull(repo_path)
 
@@ -906,10 +956,14 @@ def lookup_customnode_by_url(data, target):
     for x in data['custom_nodes']:
         if target in x['files']:
             dir_name = os.path.splitext(os.path.basename(target))[0].replace(".git", "")
-            dir_path = os.path.join(custom_nodes_path, dir_name)
+            repo_path = lookup_installed_custom_nodes(dir_name)
-            if os.path.exists(dir_path):
+
+            if repo_path is None:
+                continue
+
+            if repo_path[0]:
                 x['installed'] = 'True'
-            elif os.path.exists(dir_path + ".disabled"):
+            else:
                 x['installed'] = 'Disabled'
             return x
 
@@ -918,13 +972,15 @@ def lookup_customnode_by_url(data, target):
 
 def simple_check_custom_node(url):
     dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
-    dir_path = os.path.join(custom_nodes_path, dir_name)
+    repo_path = lookup_installed_custom_nodes(dir_name)
-    if os.path.exists(dir_path):
-        return 'installed'
-    elif os.path.exists(dir_path+'.disabled'):
-        return 'disabled'
 
-    return 'not-installed'
+    if repo_path is None:
+        return 'not-installed'
+    
+    if repo_path[0]:
+        return 'installed'
+    else:
+        return 'disabled'
 
 
 def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do_update=False):
@@ -937,8 +993,12 @@ def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do
             url = url[:-1]
 
         dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
-        dir_path = os.path.join(custom_nodes_path, dir_name)
+        repo_path = lookup_installed_custom_nodes(dir_name)
-        if os.path.exists(dir_path):
+
+        if repo_path is None:
+            item['installed'] = 'False'
+        elif repo_path[0]:
+            dir_path = repo_path[1]
             try:
                 item['installed'] = 'True'  # default
 
@@ -957,17 +1017,23 @@ def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do
                 else:
                     item['installed'] = 'True'
 
-        elif os.path.exists(dir_path + ".disabled"):
-            item['installed'] = 'Disabled'
-
         else:
-            item['installed'] = 'False'
+            item['installed'] = 'Disabled'
 
     elif item['install_type'] == 'copy' and len(item['files']) == 1:
         dir_name = os.path.basename(item['files'][0])
 
         if item['files'][0].endswith('.py'):
-            base_path = custom_nodes_path
+            base_path = lookup_installed_custom_nodes(item['files'][0])
+            if base_path is None:
+                item['installed'] = 'False'
+                return
+            elif base_path[0]:
+                item['installed'] = 'True'
+            else:
+                item['installed'] = 'Disabled'
+
+            return
         elif 'js_path' in item:
             base_path = os.path.join(js_path, item['js_path'])
         else:
@@ -979,8 +1045,6 @@ def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do
                 item['installed'] = 'Fail'
             else:
                 item['installed'] = 'True'
-        elif os.path.exists(file_path + ".disabled"):
-            item['installed'] = 'Disabled'
         else:
             item['installed'] = 'False'
 
@@ -1017,39 +1081,46 @@ def get_current_snapshot():
     git_custom_nodes = {}
     file_custom_nodes = []
 
+    try:
+        import folder_paths
+        base_paths = folder_paths.get_folder_paths("custom_nodes")
+    except:
+        base_paths = [custom_nodes_path]
+
     # Get custom nodes hash
-    for path in os.listdir(custom_nodes_path):
+    for base_path in base_paths:
-        fullpath = os.path.join(custom_nodes_path, path)
+        for path in os.listdir(base_path):
+            fullpath = os.path.join(base_path, path)
 
-        if os.path.isdir(fullpath):
+            if os.path.isdir(fullpath):
-            is_disabled = path.endswith(".disabled")
+                is_disabled = path.endswith(".disabled")
 
-            try:
+                try:
-                git_dir = os.path.join(fullpath, '.git')
+                    git_dir = os.path.join(fullpath, '.git')
 
-                if not os.path.exists(git_dir):
+                    if not os.path.exists(git_dir):
-                    continue
+                        continue
 
-                repo = git.Repo(fullpath)
+                    repo = git.Repo(fullpath)
-                commit_hash = repo.head.commit.hexsha
+                    commit_hash = repo.head.commit.hexsha
-                url = repo.remotes.origin.url
+                    url = repo.remotes.origin.url
-                git_custom_nodes[url] = {
+                    git_custom_nodes[url] = {
-                    'hash': commit_hash,
+                        'hash': commit_hash,
+                        'disabled': is_disabled
+                    }
+
+                except:
+                    print(f"Failed to extract snapshots for the custom node '{path}'.")
+
+            elif path.endswith('.py'):
+                is_disabled = path.endswith(".py.disabled")
+                filename = os.path.basename(path)
+                item = {
+                    'filename': filename,
                     'disabled': is_disabled
                 }
 
-            except:
+                file_custom_nodes.append(item)
-                print(f"Failed to extract snapshots for the custom node '{path}'.")
-
-        elif path.endswith('.py'):
-            is_disabled = path.endswith(".py.disabled")
-            filename = os.path.basename(path)
-            item = {
-                'filename': filename,
-                'disabled': is_disabled
-            }
-
-            file_custom_nodes.append(item)
 
     pip_packages = get_installed_pip_packages()
 
@@ -1127,7 +1198,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
             if node_name in ['Reroute', 'Note']:
                 continue
 
-            if node_name is not None and not node_name.startswith('workflow/'):
+            if node_name is not None and not (node_name.startswith('workflow/') or node_name.startswith('workflow>')):
                 used_nodes.add(node_name)
 
     if 'nodes' in workflow:

glob/manager_server.py

@@ -47,7 +47,9 @@ is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.
 
 
 def is_allowed_security_level(level):
-    if level == 'high':
+    if level == 'block':
+        return False
+    elif level == 'high':
         if is_local_mode:
             return core.get_config()['security_level'].lower() in ['weak', 'normal-']
         else:
@@ -58,9 +60,9 @@ def is_allowed_security_level(level):
         return True
 
 
-async def get_risky_level(files):
+async def get_risky_level(files, pip_packages):
     json_data1 = await core.get_data_by_mode('local', 'custom-node-list.json')
-    json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://github.com/ltdrdata/ComfyUI-Manager/raw/main')
+    json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main')
 
     all_urls = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
@@ -70,6 +72,15 @@ async def get_risky_level(files):
         if x not in all_urls:
             return "high"
 
+    all_pip_packages = set()
+    for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
+        if "pip" in x:
+            all_pip_packages.update(x['pip'])
+
+    for p in pip_packages:
+        if p not in all_pip_packages:
+            return "block"
+
     return "middle"
 
 
@@ -240,7 +251,7 @@ def get_model_dir(data):
     if data['save_path'] != 'default':
         if '..' in data['save_path'] or data['save_path'].startswith('/'):
             print(f"[WARN] '{data['save_path']}' is not allowed path. So it will be saved into 'models/etc'.")
-            base_model = "etc"
+            base_model = os.path.join(folder_paths.models_dir, "etc")
         else:
             if data['save_path'].startswith("custom_nodes"):
                 base_model = os.path.join(core.comfy_path, data['save_path'])
@@ -248,9 +259,7 @@ def get_model_dir(data):
                 base_model = os.path.join(folder_paths.models_dir, data['save_path'])
     else:
         model_type = data['type']
-        if model_type == "checkpoints":
+        if model_type == "checkpoints" or model_type == "checkpoint":
-            base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
-        elif model_type == "checkpoint":
             base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
         elif model_type == "unclip":
             base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
@@ -274,8 +283,14 @@ def get_model_dir(data):
             base_model = folder_paths.folder_names_and_paths["upscale_models"][0][0]
         elif model_type == "embeddings":
             base_model = folder_paths.folder_names_and_paths["embeddings"][0][0]
+        elif model_type == "unet" or model_type == "diffusion_model":
+            if folder_paths.folder_names_and_paths.get("diffusion_models"):
+                base_model = folder_paths.folder_names_and_paths["diffusion_models"][0][1]
+            else:
+                print(f"[ComfyUI-Manager] Your ComfyUI is outdated version.")
+                base_model = folder_paths.folder_names_and_paths["unet"][0][0]  # outdated version
         else:
-            base_model = "etc"
+            base_model = os.path.join(folder_paths.models_dir, "etc")
 
     return base_model
 
@@ -787,7 +802,7 @@ async def install_custom_node(request):
 
     json_data = await request.json()
 
-    risky_level = await get_risky_level(json_data['files'])
+    risky_level = await get_risky_level(json_data['files'], json_data.get('pip', []))
     if not is_allowed_security_level(risky_level):
         print(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=404)
@@ -805,7 +820,14 @@ async def install_custom_node(request):
         res = unzip_install(json_data['files'])
 
     if install_type == "copy":
-        js_path_name = json_data['js_path'] if 'js_path' in json_data else '.'
+        if 'js_path' in json_data:
+            if '.' in json_data['js_path'] or ':' in json_data['js_path'] or json_data['js_path'].startswith('/'):
+                print(f"[ComfyUI Manager] An abnormal JS path has been transmitted. This could be the result of a security attack.\n{json_data['js_path']}")
+                return web.Response(status=400)
+            else:
+                js_path_name = json_data['js_path']
+        else:
+            js_path_name = '.'
         res = copy_install(json_data['files'], js_path_name)
 
     elif install_type == "git-clone":
@@ -829,7 +851,7 @@ async def install_custom_node(request):
 @PromptServer.instance.routes.post("/customnode/fix")
 async def fix_custom_node(request):
     if not is_allowed_security_level('middle'):
-        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
+        print(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=403)
 
     json_data = await request.json()
@@ -849,6 +871,10 @@ async def fix_custom_node(request):
         return web.Response(status=400)
 
     if 'pip' in json_data:
+        if not is_allowed_security_level('high'):
+            print(SECURITY_MESSAGE_GENERAL)
+            return web.Response(status=403)
+
         for pname in json_data['pip']:
             install_cmd = [sys.executable, "-m", "pip", "install", '-U', pname]
             core.try_install_script(json_data['files'][0], ".", install_cmd)
@@ -1044,32 +1070,6 @@ async def install_model(request):
     return web.Response(status=400)
 
 
-class ManagerTerminalHook:
-    def write_stderr(self, msg):
-        PromptServer.instance.send_sync("manager-terminal-feedback", {"data": msg})
-
-    def write_stdout(self, msg):
-        PromptServer.instance.send_sync("manager-terminal-feedback", {"data": msg})
-
-
-manager_terminal_hook = ManagerTerminalHook()
-
-
-@PromptServer.instance.routes.get("/manager/terminal")
-async def terminal_mode(request):
-    if not is_allowed_security_level('high'):
-        print(SECURITY_MESSAGE_NORMAL_MINUS)
-        return web.Response(status=403)
-
-    if "mode" in request.rel_url.query:
-        if request.rel_url.query['mode'] == 'true':
-            sys.__comfyui_manager_terminal_hook.add_hook('cm', manager_terminal_hook)
-        else:
-            sys.__comfyui_manager_terminal_hook.remove_hook('cm')
-
-    return web.Response(status=200)
-
-
 @PromptServer.instance.routes.get("/manager/preview_method")
 async def preview_method(request):
     if "value" in request.rel_url.query:
@@ -1216,6 +1216,11 @@ def restart(self):
         exit(0)
 
     print(f"\nRestarting... [Legacy Mode]\n\n")
+
+    sys_argv = sys.argv.copy()
+    if '--windows-standalone-build' in sys_argv:
+        sys_argv.remove('--windows-standalone-build')
+
     if sys.platform.startswith('win32'):
         return os.execv(sys.executable, ['"' + sys.executable + '"', '"' + sys.argv[0] + '"'] + sys.argv[1:])
     else:
@@ -1346,6 +1351,6 @@ if not os.path.exists(core.config_path):
 cm_global.register_extension('ComfyUI-Manager',
                              {'version': core.version,
                                  'name': 'ComfyUI Manager',
-                                 'nodes': {'Terminal Log //CM'},
+                                 'nodes': {},
                                  'description': 'It provides the ability to manage custom nodes in ComfyUI.', })
 

glob/manager_util.py

@@ -1,3 +1,6 @@
+import subprocess
+import sys
+
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
 #     from distutils.version import StrictVersion
@@ -62,3 +65,150 @@ class StrictVersion:
     def __ne__(self, other):
         return not self == other
 
+
+pip_map = None
+
+def get_installed_packages(renew=False):
+    global pip_map
+
+    if renew or pip_map is None:
+        try:
+            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+
+            pip_map = {}
+            for line in result.split('\n'):
+                x = line.strip()
+                if x:
+                    y = line.split()
+                    if y[0] == 'Package' or y[0].startswith('-'):
+                        continue
+
+                    pip_map[y[0]] = y[1]
+        except subprocess.CalledProcessError as e:
+            print(f"[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
+            return set()
+
+    return pip_map
+
+
+def clear_pip_cache():
+    global pip_map
+    pip_map = None
+
+
+torch_torchvision_version_map = {
+    '2.5.1': '0.20.1',
+    '2.5.0': '0.20.0',
+    '2.4.1': '0.19.1',
+    '2.4.0': '0.19.0',
+    '2.3.1': '0.18.1',
+    '2.3.0': '0.18.0',
+    '2.2.2': '0.17.2',
+    '2.2.1': '0.17.1',
+    '2.2.0': '0.17.0',
+    '2.1.2': '0.16.2',
+    '2.1.1': '0.16.1',
+    '2.1.0': '0.16.0',
+    '2.0.1': '0.15.2',
+    '2.0.0': '0.15.1',
+}
+
+
+class PIPFixer:
+    def __init__(self, prev_pip_versions):
+        self.prev_pip_versions = { **prev_pip_versions }
+
+    def torch_rollback(self):
+        spec = self.prev_pip_versions['torch'].split('+')
+        if len(spec) > 0:
+            platform = spec[1]
+        else:
+            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            subprocess.check_output(cmd, universal_newlines=True)
+            print(cmd)
+            return
+
+        torch_ver = StrictVersion(spec[0])
+        torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
+        torchvision_ver = torch_torchvision_version_map.get(torch_ver)
+
+        if torchvision_ver is None:
+            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
+                   'torch', 'torchvision', 'torchaudio',
+                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
+            print("[manager-core] restore PyTorch to nightly version")
+        else:
+            cmd = [sys.executable, '-m', 'pip', 'install',
+                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
+                   '--index-url', f"https://download.pytorch.org/whl/{platform}"]
+            print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
+
+        subprocess.check_output(cmd, universal_newlines=True)
+
+    def fix_broken(self):
+        new_pip_versions = get_installed_packages(True)
+
+        # remove `comfy` python package
+        try:
+            if 'comfy' in new_pip_versions:
+                cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
+                subprocess.check_output(cmd, universal_newlines=True)
+
+                print(f"[manager-core] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
+        except Exception as e:
+            print(f"[manager-core] Failed to uninstall `comfy` python package")
+            print(e)
+
+        # fix torch - reinstall torch packages if version is changed
+        try:
+            if self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
+                or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
+                or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
+                    self.torch_rollback()
+        except Exception as e:
+            print(f"[manager-core] Failed to restore PyTorch")
+            print(e)
+
+        # fix opencv
+        try:
+            ocp = new_pip_versions.get('opencv-contrib-python')
+            ocph = new_pip_versions.get('opencv-contrib-python-headless')
+            op = new_pip_versions.get('opencv-python')
+            oph = new_pip_versions.get('opencv-python-headless')
+
+            versions = [ocp, ocph, op, oph]
+            versions = [StrictVersion(x) for x in versions if x is not None]
+            versions.sort(reverse=True)
+
+            if len(versions) > 0:
+                # upgrade to maximum version
+                targets = []
+                cur = versions[0]
+                if ocp is not None and StrictVersion(ocp) != cur:
+                    targets.append('opencv-contrib-python')
+                if ocph is not None and StrictVersion(ocph) != cur:
+                    targets.append('opencv-contrib-python-headless')
+                if op is not None and StrictVersion(op) != cur:
+                    targets.append('opencv-python')
+                if oph is not None and StrictVersion(oph) != cur:
+                    targets.append('opencv-python-headless')
+
+                if len(targets) > 0:
+                    for x in targets:
+                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        subprocess.check_output(cmd, universal_newlines=True)
+
+                    print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
+        except Exception as e:
+            print(f"[manager-core] Failed to restore opencv")
+            print(e)
+
+        # fix numpy
+        try:
+            np = new_pip_versions.get('numpy')
+            if np is not None:
+                if StrictVersion(np) >= StrictVersion('2'):
+                    subprocess.check_output([sys.executable, '-m', 'pip', 'install', f"numpy<2"], universal_newlines=True)
+        except Exception as e:
+            print(f"[manager-core] Failed to restore numpy")
+            print(e)

js/comfyui-manager.js

@@ -202,6 +202,40 @@ docStyle.innerHTML = `
 }
 `;
 
+function is_legacy_front() {
+    let compareVersion = '1.2.49';
+    try {
+        const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
+        if (typeof frontendVersion !== 'string') {
+            return false;
+        }
+
+        function parseVersion(versionString) {
+            const parts = versionString.split('.').map(Number);
+            return parts.length === 3 && parts.every(part => !isNaN(part)) ? parts : null;
+        }
+
+        const currentVersion = parseVersion(frontendVersion);
+        const comparisonVersion = parseVersion(compareVersion);
+
+        if (!currentVersion || !comparisonVersion) {
+            return false;
+        }
+
+        for (let i = 0; i < 3; i++) {
+            if (currentVersion[i] > comparisonVersion[i]) {
+                return false;
+            } else if (currentVersion[i] < comparisonVersion[i]) {
+                return true;
+            }
+        }
+
+        return false;
+    } catch {
+        return true;
+    }
+}
+
 document.head.appendChild(docStyle);
 
 var update_comfyui_button = null;
@@ -842,24 +876,27 @@ class ManagerMenuDialog extends ComfyDialog {
 		});
 
 		// nickname
-		let badge_combo = document.createElement("select");
+		let badge_combo = "";
-		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");
+		if(is_legacy_front()) {
-		badge_combo.className = "cm-menu-combo";
+            badge_combo = document.createElement("select");
-		badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
+            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.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
+            badge_combo.className = "cm-menu-combo";
-		badge_combo.appendChild($el('option', { value: 'nick_hide', text: 'Badge: Nickname (hide built-in)' }, []));
+            badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
-		badge_combo.appendChild($el('option', { value: 'id_nick', text: 'Badge: #ID Nickname' }, []));
+            badge_combo.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
-		badge_combo.appendChild($el('option', { value: 'id_nick_hide', text: 'Badge: #ID Nickname (hide built-in)' }, []));
+            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')
+            api.fetchApi('/manager/badge_mode')
-			.then(response => response.text())
+                .then(response => response.text())
-			.then(data => { badge_combo.value = data; badge_mode = data; });
+                .then(data => { badge_combo.value = data; badge_mode = data; });
 
-		badge_combo.addEventListener('change', function (event) {
+            badge_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
+                api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
-			badge_mode = event.target.value;
+                badge_mode = event.target.value;
-			app.graph.setDirtyCanvas(true);
+                app.graph.setDirtyCanvas(true);
-		});
+            });
+		}
 
 		// channel
 		let channel_combo = document.createElement("select");
@@ -945,6 +982,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		dbl_click_policy_combo.className = "cm-menu-combo";
 		dbl_click_policy_combo.appendChild($el('option', { value: 'none', text: 'Double-Click: None' }, []));
 		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-all', text: 'Double-Click: Copy All Connections' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-full', text: 'Double-Click: Copy All Connections and shape' }, []));
 		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-input', text: 'Double-Click: Copy Input Connections' }, []));
 		dbl_click_policy_combo.appendChild($el('option', { value: 'possible-input', text: 'Double-Click: Possible Input Connections' }, []));
 		dbl_click_policy_combo.appendChild($el('option', { value: 'dual', text: 'Double-Click: Possible(left) + Copy(right)' }, []));
@@ -1044,6 +1082,10 @@ class ManagerMenuDialog extends ComfyDialog {
 							LiteGraph.closeAllContextMenus();
 							const menu = new LiteGraph.ContextMenu(
 								[
+									{
+										title: "ComfyUI Docs",
+										callback: () => { window.open("https://docs.comfy.org/", "comfyui-official-manual"); },
+									},
 									{
 										title: "Comfy Custom Node How To",
 										callback: () => { window.open("https://github.com/chrisgoringe/Comfy-Custom-Node-How-To/wiki/aaa_index", "comfyui-community-manual1"); },
@@ -1095,7 +1137,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						textContent: 'Workflow Gallery',
 						style: {
 							'text-align': 'center',
-							'color': 'white',
+							'color': 'var(--input-text)',
 							'font-size': '18px',
 							'margin': 0,
 							'padding': 0,
@@ -1106,7 +1148,7 @@ class ManagerMenuDialog extends ComfyDialog {
 							textContent: `(${localStorage.getItem("wg_last_visited") ? localStorage.getItem("wg_last_visited").split('/')[2] : ''})`,
 							style: {
 								'text-align': 'center',
-								'color': 'white',
+								'color': 'var(--input-text)',
 								'font-size': '12px',
 								'margin': 0,
 								'padding': 0,
@@ -1234,15 +1276,6 @@ class ManagerMenuDialog extends ComfyDialog {
 						modifyButtonStyle(url);
 					},
 				},
-				{
-					title: "Open 'flowt.ai'",
-					callback: () => {
-						const url = "https://flowt.ai/";
-						localStorage.setItem("wg_last_visited", url);
-						window.open(url, url);
-						modifyButtonStyle(url);
-					},
-				},
 				{
 					title: "Open 'esheep'",
 					callback: () => {
@@ -1411,24 +1444,28 @@ app.registerExtension({
 	},
 
 	async nodeCreated(node, app) {
-		if(!node.badge_enabled) {
+	    if(is_legacy_front()) {
-			node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
+            if(!node.badge_enabled) {
-			let orig = node.onDrawForeground;
+                node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
-			if(!orig)
+                let orig = node.onDrawForeground;
-				orig = node.__proto__.onDrawForeground;
+                if(!orig)
+                    orig = node.__proto__.onDrawForeground;
 
-			node.onDrawForeground = function (ctx) {
+                node.onDrawForeground = function (ctx) {
-				drawBadge(node, orig, arguments)
+                    drawBadge(node, orig, arguments)
-			};
+                };
-			node.badge_enabled = true;
+                node.badge_enabled = true;
+            }
 		}
 	},
 
 	async loadedGraphNode(node, app) {
-		if(!node.badge_enabled) {
+	    if(is_legacy_front()) {
-			const orig = node.onDrawForeground;
+            if(!node.badge_enabled) {
-			node.getNickname = function () { return getNickname(node, node.type.trim()) };
+                const orig = node.onDrawForeground;
-			node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
+                node.getNickname = function () { return getNickname(node, node.type.trim()) };
+                node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
+            }
 		}
 	},
 
@@ -1438,7 +1475,7 @@ app.registerExtension({
 		node.prototype.getExtraMenuOptions = function (_, options) {
 			origGetExtraMenuOptions?.apply?.(this, arguments);
 
-			if (node.category.startsWith('group nodes/')) {
+			if (node.category.startsWith('group nodes>')) {
 				options.push({
 					content: "Save As Component",
 					callback: (obj) => {

js/comfyui-share-common.js

@@ -315,7 +315,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "comfyworkflows",
 				textContent: "ComfyWorkflows",
 				website: "https://comfyworkflows.com",
-				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:white;' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
+				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:var(--input-text);' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
 				onclick: () => {
 				  showShareDialog('comfyworkflows').then((suc) => {
 				    suc && this.close();
@@ -326,7 +326,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "esheep",
 				textContent: "eSheep",
 				website: "https://www.esheep.com",
-				description: "Share & download thousands of ComfyUI workflows on <a style='color:white;' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
+				description: "Share & download thousands of ComfyUI workflows on <a style='color:var(--input-text);' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
 				onclick: () => {
 					shareToEsheep();
 				  	this.close();
@@ -336,7 +336,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "Copus",
 				textContent: "Copus",
 				website: "https://www.copus.io",
-				description: "🔴 Permanently store and secure ownership of your workflow on the open-source platform: <a style='color:white;' href='https://copus.io' target='_blank'>Copus.io</a>",
+				description: "🔴 Permanently store and secure ownership of your workflow on the open-source platform: <a style='color:var(--input-text);' href='https://copus.io' target='_blank'>Copus.io</a>",
 				onclick: () => {
 					showCopusShareDialog();
 				  this.close();
@@ -382,7 +382,7 @@ export class ShareDialogChooser extends ComfyDialog {
 					innerHTML: b.description,
 					style: {
 						'text-align': 'left',
-						color: 'white',
+						color: 'var(--input-text)',
 						'font-size': '14px',
 						'margin-bottom': '0',
 					},
@@ -393,7 +393,7 @@ export class ShareDialogChooser extends ComfyDialog {
 					href: b.website,
 					target: "_blank",
 					style: {
-						color: 'white',
+						color: 'var(--input-text)',
 						'margin-left': '10px',
 						'font-size': '12px',
 						'text-decoration': 'none',
@@ -440,7 +440,7 @@ export class ShareDialogChooser extends ComfyDialog {
 		      textContent: 'Choose a platform to share your workflow',
 			    style: {
 				  'text-align': 'center',
-				  'color': 'white',
+				  'color': 'var(--input-text)',
 				  'font-size': '18px',
 				  'margin-bottom': '10px',
 				},
@@ -686,7 +686,7 @@ export class ShareDialog extends ComfyDialog {
 				$el("div", {}, [
 					$el("p", {
 						size: 3, color: "white", style: {
-							color: 'white'
+							color: 'var(--input-text)'
 						}
 					}, [`Select where to share your art:`]),
 					this.matrix_destination_checkbox,
@@ -701,7 +701,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.credits_input,
@@ -712,7 +712,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.title_input,
@@ -723,7 +723,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.description_input,
@@ -989,7 +989,7 @@ export class ShareDialog extends ComfyDialog {
 			}
 			const radio_button_text = $el("label", {
 				// style: {
-				// 	color: 'white'
+				// 	color: 'var(--input-text)'
 				// }
 			}, [output.title])
 			radio_button.style.color = "var(--fg-color)";
@@ -1028,7 +1028,7 @@ export class ShareDialog extends ComfyDialog {
 			color: "white",
 			style: {
 				'text-align': 'center',
-				color: 'white',
+				color: 'var(--input-text)',
 				backgroundColor: 'black',
 				padding: '10px',
 				'margin-top': '0px',
@@ -1040,7 +1040,7 @@ export class ShareDialog extends ComfyDialog {
 				color: "white",
 				style: {
 					'text-align': 'center',
-					color: 'white',
+					color: 'var(--input-text)',
 					'margin-bottom': '5px',
 					'font-style': 'italic',
 					'font-size': '12px',

js/comfyui-share-openart.js

@@ -199,7 +199,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       color: "white",
       style: {
         'text-align': 'center',
-        color: 'white',
+        color: 'var(--input-text)',
         margin: '0 0 10px 0',
       }
     });
@@ -733,7 +733,7 @@ export class OpenArtShareDialog extends ComfyDialog {
         size: 2,
         color: "white",
         style: {
-          color: 'white',
+          color: 'var(--input-text)',
           margin: '0 0 5px 0',
           fontSize: '12px',
         },

js/common.js

@@ -12,6 +12,10 @@ export async function sleep(ms) {
 }
 
 export function rebootAPI() {
+	if ('electronAPI' in window) {
+      		window.electronAPI.restartApp();
+      		return true;
+    	}
 	if (confirm("Are you sure you'd like to reboot the server?")) {
 		try {
 			api.fetchApi("/manager/reboot");

js/components-manager.js

@@ -4,6 +4,8 @@ import { sleep, show_message } from "./common.js";
 import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 
+const SEPARATOR = ">"
+
 let pack_map = {};
 let rpack_map = {};
 
@@ -20,7 +22,7 @@ export function getPureName(node) {
 		let purename = node.comfyClass.substring(category.length+1);
 		return purename;
 	}
-	else if(node.comfyClass.startsWith('workflow/')) {
+	else if(node.comfyClass.startsWith('workflow/') || node.comfyClass.startsWith(`workflow${SEPARATOR}`)) {
 		return node.comfyClass.substring(9);
 	}
 	else {
@@ -76,7 +78,7 @@ export async function load_components() {
 
 				let category = data.packname;
 				if(data.category) {
-					category += "/" + data.category;
+					category += SEPARATOR + data.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -100,7 +102,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -139,7 +141,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -174,7 +176,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.workflow.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -234,7 +236,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
 
 		let category = body.workflow.packname;
 		if(body.workflow.category) {
-			category += "/" + body.workflow.category;
+			category += SEPARATOR + body.workflow.category;
 		}
 		if(category == '') {
 			category = 'components';
@@ -266,7 +268,7 @@ async function import_component(component_name, component, mode) {
 
 	let category = component.packname;
 	if(component.category) {
-		category += "/" + component.category;
+		category += SEPARATOR + component.category;
 	}
 	if(category == '') {
 		category = 'components';
@@ -403,7 +405,7 @@ function handle_import_components(components) {
 	}
 
 	if(cnt == 1 && last_name) {
-		const node = LiteGraph.createNode(`workflow/${last_name}`);
+		const node = LiteGraph.createNode(`workflow${SEPARATOR}${last_name}`);
 		node.pos = [app.canvas.graph_mouse[0], app.canvas.graph_mouse[1]];
 		app.canvas.graph.add(node, false);
 	}
@@ -786,7 +788,7 @@ app.graphToPrompt = async function () {
 			// get used group nodes
 			let used_group_nodes = new Set();
 			for(let node of p.workflow.nodes) {
-				if(node.type.startsWith('workflow/')) {
+				if(node.type.startsWith(`workflow/`) || node.type.startsWith(`workflow${SEPARATOR}`)) {
 					used_group_nodes.add(node.type.substring(9));
 				}
 			}

js/custom-nodes-manager.js

@@ -1106,7 +1106,7 @@ export class CustomNodesManager {
 
 		for (let i in nodes) {
 			const node_type = nodes[i].type;
-			if(node_type.startsWith('workflow/'))
+			if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
 				continue;
 
 			if (!registered_nodes.has(node_type)) {

js/node_fixer.js

@@ -101,7 +101,7 @@ function connect_inputs(nearest_inputs, node) {
 	}
 }
 
-function node_info_copy(src, dest, connect_both) {
+function node_info_copy(src, dest, connect_both, copy_shape) {
 	// copy input connections
 	for(let i in src.inputs) {
 		let input = src.inputs[i];
@@ -142,9 +142,11 @@ function node_info_copy(src, dest, connect_both) {
 		}
 	}
 
-	dest.color = src.color;
+	if(copy_shape) {
-	dest.bgcolor = src.bgcolor;
+		dest.color = src.color;
-	dest.size = src.size;
+		dest.bgcolor = src.bgcolor;
+		dest.size = max(src.size, dest.size);
+	}
 
 	app.graph.afterChange();
 }
@@ -162,6 +164,7 @@ app.registerExtension({
 
 			switch(double_click_policy) {
 				case "copy-all":
+				case "copy-full":
 				case "copy-input":
 					{
 						if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
@@ -169,7 +172,11 @@ app.registerExtension({
 
 						let src_node = lookup_nearest_nodes(node);
 						if(src_node)
-							node_info_copy(src_node, node, double_click_policy == "copy-all");
+						{
+							let both_connection = double_click_policy != "copy-input";
+							let copy_shape = double_click_policy == "copy-full";
+							node_info_copy(src_node, node, both_connection, copy_shape);
+						}
 					}
 					break;
 				case "possible-input":

js/terminal.js

@@ -1,81 +0,0 @@
-import {app} from "../../scripts/app.js";
-import {ComfyWidgets} from "../../scripts/widgets.js";
-// Node that add notes to your project
-
-let terminal_node;
-let log_mode = false;
-
-app.registerExtension({
-	name: "Comfy.Manager.Terminal",
-
-	registerCustomNodes() {
-		class TerminalNode {
-			color = "#222222";
-			bgcolor = "#000000";
-			groupcolor = LGraphCanvas.node_colors.black.groupcolor;
-			constructor() {
-				this.logs = [];
-
-				if (!this.properties) {
-					this.properties = {};
-					this.properties.text="";
-				}
-
-				ComfyWidgets.STRING(this, "", ["", {default:this.properties.text, multiline: true}], app)
-				ComfyWidgets.BOOLEAN(this, "mode", ["", {default:true, label_on:'Logging', label_off:'Stop'}], app)
-				ComfyWidgets.INT(this, "lines", ["", {default:500, min:10, max:10000, steps:1}], app)
-
-				let self = this;
-				Object.defineProperty(this.widgets[1], 'value', {
-					set: (v) => {
-						api.fetchApi(`/manager/terminal?mode=${v}`, {});
-						log_mode = v;
-					},
-					get: () => {
-						return log_mode;
-					}
-				});
-
-				this.serialize_widgets = false;
-				this.isVirtualNode = true;
-
-				if(terminal_node) {
-					try {
-						terminal_node.widgets[0].value = 'The output of this node is disabled because another terminal node has appeared.';
-					}
-					catch {}
-				}
-				terminal_node = this;
-			}
-		}
-
-		// Load default visibility
-		LiteGraph.registerNodeType(
-			"Terminal Log //CM",
-			Object.assign(TerminalNode, {
-				title_mode: LiteGraph.NORMAL_TITLE,
-				title: "Terminal Log (Manager)",
-				collapsable: true,
-			})
-		);
-
-		TerminalNode.category = "utils";
-	},
-});
-
-
-import { api } from "../../scripts/api.js";
-
-function terminalFeedback(event) {
-	if(terminal_node) {
-		terminal_node.logs.push(event.detail.data);
-		if(terminal_node.logs.length > terminal_node.widgets[2].value) {
-			terminal_node.logs.shift();
-			if(terminal_node.logs[0] == '' || terminal_node.logs[0] == '\n')
-				terminal_node.logs.shift();
-		}
-		terminal_node.widgets[0].value = [...terminal_node.logs].reverse().join('').trim();
-	}
-}
-
-api.addEventListener("manager-terminal-feedback", terminalFeedback);

json-checker.py

@@ -3,10 +3,12 @@ import argparse
 
 def check_json_syntax(file_path):
     try:
-        with open(file_path, 'r') as file:
+        with open(file_path, 'r', encoding='utf-8') as file:
             json_str = file.read()
             json.loads(json_str)
             print(f"[ OK ] {file_path}")
+    except UnicodeDecodeError as e:
+        print(f"Unicode decode error: {e}")
     except json.JSONDecodeError as e:
         print(f"[FAIL] {file_path}\n\n       {e}\n")
     except FileNotFoundError:

node_db/forked/custom-node-list.json

@@ -1,5 +1,65 @@
 {
     "custom_nodes": [
+        {
+            "author": "BlenderNeko",
+            "title": "ltdrdata/ComfyUI_TiledKSampler",
+            "reference": "https://github.com/ltdrdata/ComfyUI_TiledKSampler",
+            "files": [
+                "https://github.com/ltdrdata/ComfyUI_TiledKSampler"
+            ],
+            "install_type": "git-clone",
+            "description": "PR for [a/https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59](https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-Hamer",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-Hamer",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-Hamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/hamer](https://github.com/geopavlakos/hamer)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-GVHMR",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-GVHMR",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-GVHMR"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/GVHMR](https://github.com/zju3dv/GVHMR)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "RealisDance-ComfyUI",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-RealisDance",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-RealisDance"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice RealisDance-ComfyUI by leo\nNOTE:base on [a/RealisDance](https://github.com/damo-cv/RealisDance), modified on [a/RealisDanceComfyui](https://github.com/AIFSH/RealisDance-ComfyUI)"
+        },
+        {
+            "author": "jags111",
+            "title": "NyaamZ/efficiency-nodes-ED",
+            "reference": "https://github.com/NyaamZ/efficiency-nodes-ED",
+            "files": [
+                "https://github.com/NyaamZ/efficiency-nodes-ED"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports efficiency-nodes-comfyui. Additional features."
+        },
+        {
+            "author": "SeaArtLab",
+            "title": "zer0int/ComfyUI-Long-CLIP",
+            "reference": "https://github.com/zer0int/ComfyUI-Long-CLIP",
+            "files": [
+                "https://github.com/zer0int/ComfyUI-Long-CLIP"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports FLUX.1 not only SD1.5, SDXL."
+        },
         {
             "author": "meimeilook",
             "title": "ComfyUI_IPAdapter_plus.old [backward compatbility]",

node_db/legacy/custom-node-list.json

@@ -10,7 +10,338 @@
         },
         
 
-
+        {
+            "author": "huangyangke",
+            "title": "ComfyUI-Kolors-IpadapterFaceId [DEPRECATED]",
+            "reference": "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId",
+            "files": [
+                "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:kolors_ipadapter_faceid\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI_Ctrlora [DEPRECATED]",
+            "reference": "https://github.com/zmwv823/ComfyUI_Ctrlora",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI_Ctrlora"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial custom_node for [a/xyfJASON/ctrlora](https://github.com/xyfJASON/ctrlora)."
+        },
+        {
+            "author": "Fannovel16",
+            "title": "ComfyUI Loopchain [DEPRECATED]",
+            "id": "loopchain",
+            "reference": "https://github.com/Fannovel16/ComfyUI-Loopchain",
+            "files": [
+                "https://github.com/Fannovel16/ComfyUI-Loopchain"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of nodes which can be useful for animation in ComfyUI. The main focus of this extension is implementing a mechanism called loopchain. A loopchain in this case is the chain of nodes only executed repeatly in the workflow. If a node chain contains a loop node from this extension, it will become a loop chain."
+        },
+        {
+            "author": "DonBaronFactory",
+            "title": "ComfyUI-Cre8it-Nodes [DEPRECATED]",
+            "reference": "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes",
+            "files": [
+                "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:CRE8IT Serial Prompter, CRE8IT Apply Serial Prompter, CRE8IT Image Sizer. A few simple nodes to facilitate working wiht ComfyUI Workflows"
+        },
+        {
+            "author": "thecooltechguy",
+            "title": "ComfyUI-ComfyRun [DEPRECATED/UNSAFE]",
+            "reference": "https://github.com/thecooltechguy/ComfyUI-ComfyRun",
+            "files": [
+                "https://github.com/thecooltechguy/ComfyUI-ComfyRun"
+            ],
+            "install_type": "git-clone",
+            "description": "The easiest way to run & share any ComfyUI workflow [a/https://comfyrun.com](https://comfyrun.com)\nNOTE: Vulnerability discovered. Not being managed."
+        },
+        {
+            "author": "Cardoso-topdev",
+            "title": "comfyui_meshanything_v1 [REMOVED]",
+            "reference": "https://github.com/Cardoso-topdev/comfyui_meshanything_v1",
+            "files": [
+                "https://github.com/Cardoso-topdev/comfyui_meshanything_v1"
+            ],
+            "install_type": "git-clone",
+            "description": "MeshAnything V2: Artist-Created Mesh Generation With Adjacent Mesh Tokenization"
+        },
+        {
+            "author": "palant",
+            "title": "Extended Save Image for ComfyUI [DEPRECATED]",
+            "reference": "https://github.com/palant/extended-saveimage-comfyui",
+            "files": [
+                "https://github.com/palant/extended-saveimage-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node is largely identical to the usual Save Image but allows saving images also in JPEG and WEBP formats, the latter with both lossless and lossy compression. Metadata is embedded in the images as usual, and the resulting images can be used to load a workflow."
+        },
+        {
+            "author": "1038lab",
+            "title": "ComfyUI-GPT2P [REMOVED]",
+            "id": "gpt2p",
+            "reference": "https://github.com/1038lab/ComfyUI-GPT2P",
+            "files": [
+                "https://github.com/1038lab/ComfyUI-GPT2P"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Node - Hugging Face repositories GTP2 Prompt"
+        },
+        {
+            "author": "yushan777",
+            "title": "Y7 Nodes for ComfyUI [REMOVED]",
+            "id": "y7nodes",
+            "reference": "https://github.com/yushan777/ComfyUI-Y7Nodes",
+            "files": [
+                "https://github.com/yushan777/ComfyUI-Y7Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Count_Tokens_(Y7)"
+        },
+        {
+            "author": "city96",
+            "title": "SD-Advanced-Noise [DEPRECATED]",
+            "id": "adv-noise",
+            "reference": "https://github.com/city96/SD-Advanced-Noise",
+            "files": [
+                "https://github.com/city96/SD-Advanced-Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: LatentGaussianNoise, MathEncode. An experimental custom node that generates latent noise directly by utilizing the linear characteristics of the latent space."
+        },
+        {
+            "author": "shockz0rz",
+            "title": "InterpolateEverything [DEPRECATED]",
+            "id": "interpolate-everything",
+            "reference": "https://github.com/shockz0rz/ComfyUI_InterpolateEverything",
+            "files": [
+                "https://github.com/shockz0rz/ComfyUI_InterpolateEverything"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: Interpolate Poses, Interpolate Lineart, ... Custom nodes for interpolating between, well, everything in the Stable Diffusion ComfyUI."
+        },
+        {
+            "author": "svdC1",
+            "title": "LoRa Dataset Tools [REMOVED]",
+            "reference": "https://github.com/svdC1/comfy-ui-lora-dataset-tools",
+            "files": [
+                "https://github.com/svdC1/comfy-ui-lora-dataset-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Directory Loader, Filter Images Without Faces, Detect Faces and Draw Detection Box"
+        },
+        {
+            "author": "MiddleKD",
+            "title": "ComfyUI-default-workflow-setter [REMOVED]",
+            "reference": "https://github.com/MiddleKD/ComfyUI-default-workflow-setter",
+            "files": [
+                "https://github.com/MiddleKD/ComfyUI-default-workflow-setter"
+            ],
+            "install_type": "git-clone",
+            "description": "Default workflow setter"
+        },
+        {
+            "author": "Firetheft",
+            "title": "ComfyUI-Flux-Prompt-Tools [REMOVED]",
+            "reference": "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools",
+            "files": [
+                "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Flux Prompt Enhance, Flux Prompt Gemini Flash, Flux Prompt Generator, MiniCPM V2.6 Int4"
+        },
+        {
+            "author": "jtydhr88",
+            "title": "ComfyUI Unique3D [DEPRECATED]",
+            "id": "unique3d",
+            "reference": "https://github.com/jtydhr88/ComfyUI-Unique3D",
+            "files": [
+                "https://github.com/jtydhr88/ComfyUI-Unique3D"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Unique3D is custom nodes that running AiuniAI/Unique3D into ComfyUI[w/Please follow readme to install with ComfyUI embedded python.]"
+        },
+        {
+            "author": "mpiquero7164",
+            "title": "SaveImgPrompt [DEPRECATED]",
+            "id": "save-imgprompt",
+            "reference": "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt",
+            "files": [
+                "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt"
+            ],
+            "install_type": "git-clone",
+            "description": "Save a png or jpeg and option to save prompt/workflow in a text or json file for each image in Comfy + Workflow loading."
+        },
+        {
+            "author": "guoyk93",
+            "title": "y.k.'s ComfyUI node suite [DEPRECATED]",
+            "id": "yks",
+            "reference": "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui",
+            "files": [
+                "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: YKImagePadForOutpaint, YKMaskToImage"
+        },
+        {
+            "author": "adityathiru",
+            "title": "ComfyUI LLMs [REMOVED]",
+            "reference": "https://github.com/adityathiru/ComfyUI-LLMs",
+            "files": [
+                "https://github.com/adityathiru/ComfyUI-LLMs"
+            ],
+            "install_type": "git-clone",
+            "description": "Goal: To enable folks to rapidly build complex workflows with LLMs\nNOTE:☠️ This is experimental and not recommended to use in a production environment (yet!)"
+        },
+        {
+            "author": "DannyStone1999",
+            "title": "ComfyUI-Depth2Mask [REMOVED]",
+            "reference": "https://github.com/DannyStone1999/ComfyUI-Depth2Mask",
+            "files": [
+                "https://github.com/DannyStone1999/ComfyUI-Depth2Mask/raw/main/Depth2Mask.py"
+            ],
+            "install_type": "copy",
+            "description": "Nodes:Depth2Mask"
+        },
+        {
+            "author": "syaofox",
+            "title": "ComfyUI_FoxTools [REMOVED]",
+            "reference": "https://github.com/syaofox/ComfyUI_FoxTools",
+            "files": [
+                "https://github.com/syaofox/ComfyUI_FoxTools"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:BatchImageFromList, Load Face Occlusion Model, Create Face Mask, Simple FaceAlign, Cacul FaceAlign, Gen Blurbord, Face Align, Face Rotate, ImageAdd, LoadImageList, SaveImage Plus, RegTextFind"
+        },
+        {
+            "author": "AIFSH",
+            "title": "SeedVC-ComfyUI [REMOVED]",
+            "reference": "https://github.com/AIFSH/SeedVC-ComfyUI",
+            "files": [
+                "https://github.com/AIFSH/SeedVC-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "a custom node for [a/seed-vc](https://github.com/Plachtaa/seed-vc)"
+        },
+        {
+            "author": "jazhang00",
+            "title": "ComfyUI Node for Slicedit [REMOVED]",
+            "reference": "https://github.com/jazhang00/ComfyUI-Slicedit",
+            "files": [
+                "https://github.com/jazhang00/ComfyUI-Slicedit"
+            ],
+            "install_type": "git-clone",
+            "description": "Slicedit main page: [a/https://matankleiner.github.io/slicedit/](https://matankleiner.github.io/slicedit/). Use Slicedit with ComfyUI."
+        },
+        {
+            "author": "rklaffehn",
+            "title": "rk-comfy-nodes [REMOVED]",
+            "id": "rknodes",
+            "reference": "https://github.com/rklaffehn/rk-comfy-nodes",
+            "files": [
+                "https://github.com/rklaffehn/rk-comfy-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: RK_CivitAIMetaChecker, RK_CivitAIAddHashes."
+        },
+        {
+            "author": "Extraltodeus",
+            "title": "CLIP-Token-Injection [REMOVED]",
+            "reference": "https://github.com/Extraltodeus/CLIP-Token-Injection",
+            "files": [
+                "https://github.com/Extraltodeus/CLIP-Token-Injection"
+            ],
+            "install_type": "git-clone",
+            "description": "These nodes are to edit the text vectors of CLIP models, so to customize how the prompts will be interpreted. You could see it as either customisation, 'one token prompt' up to some limitation and a way to mess with how the text will be interpreted. The edited CLIP can then be saved, or as well the edited tokens themselves. The shared example weights does not contain any image-knowledge but the text vector of the words affected."
+        },
+        {
+            "author": "openart",
+            "title": "openart-comfyui-deploy [REMOVED]",
+            "id": "openart-comfyui-deploy",
+            "reference": "https://github.com/kulsisme/openart-comfyui-deploy",
+            "files": [
+                "https://github.com/kulsisme/openart-comfyui-deploy"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: External Boolean (ComfyUI Deploy), External Checkpoint (ComfyUI Deploy), External Image (ComfyUI Deploy), External Video (ComfyUI Deploy x VHS), OpenArt Text, Image Websocket Output (ComfyDeploy), ..."
+        },
+        {
+            "author": "mittimi",
+            "title": "ComfyUI_mittimiLoadPreset [DEPRECATED]",
+            "id": "comfyui-mittimi-load-preset",
+            "reference": "https://github.com/mittimi/ComfyUI_mittimiLoadPreset",
+            "files": [
+                "https://github.com/mittimi/ComfyUI_mittimiLoadPreset"
+            ],
+            "install_type": "git-clone",
+            "description": "The system selects and loads preset."
+        },
+        {
+            "author": "jinljin",
+            "title": "ComfyUI-Talking-Head [REMOVED]",
+            "reference": "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine",
+            "files": [
+                "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI-Talking-Head"
+        },
+        {
+            "author": "jh-leon-kim",
+            "title": "ComfyUI-JHK-utils [REMOVED]",
+            "id": "jhk",
+            "reference": "https://github.com/jh-leon-kim/ComfyUI-JHK-utils",
+            "files": [
+                "https://github.com/jh-leon-kim/ComfyUI-JHK-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:JHK_Utils_LoadEmbed, JHK_Utils_string_merge, JHK_Utils_ImageRemoveBackground"
+        },
+        {
+            "author": "ilovejohnwhite",
+            "title": "TatToolkit [REMOVED]",
+            "reference": "https://github.com/ilovejohnwhite/UncleBillyGoncho",
+            "files": [
+                "https://github.com/ilovejohnwhite/UncleBillyGoncho"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:UWU TTK Preprocessor, Pixel Perfect Resolution, Generation Resolution From Image, Generation Resolution From Latent, Enchance And Resize Hint Images, ..."
+        },
+        {
+            "author": "hzchet",
+            "title": "ComfyUI_QueueGeneration [REMOVED]",
+            "reference": "https://github.com/hzchet/ComfyUI_QueueGeneration",
+            "files": [
+                "https://github.com/hzchet/ComfyUI_QueueGeneration"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Queue Img2Vid Generation"
+        },
+        {
+            "author": "ader47",
+            "title": "ComfyUI-MeshHamer [REMOVED]",
+            "reference": "https://github.com/ader47/comfyui_meshhamer",
+            "files": [
+                "https://github.com/ader47/comfyui_meshhamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:MeshHamer Hand Refiner. See also: [a/HaMeR: Hand Mesh Recovery](https://github.com/geopavlakos/hamer/tree/main)"
+        },
+        {
+            "author": "SEkINVR",
+            "title": "ComfyUI-Animator",
+            "reference": "https://github.com/SEkINVR/ComfyUI-Animator [REMOVED]",
+            "files": [
+                "https://github.com/SEkINVR/ComfyUI-Animator"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI provides full-body animation capabilities, including facial rigging, various lighting styles, and green screen output."
+        },
         {
             "author": "ZHO-ZHO-ZHO",
             "title": "ComfyUI-AnyText [NOT MAINTAINED]",

node_db/tutorial/custom-node-list.json

@@ -90,16 +90,6 @@
             "install_type": "git-clone",
             "description": "Nodes:WW_ImageResize"
         },
-        {
-            "author": "bmz55",
-            "title": "bmz nodes",
-            "reference": "https://github.com/bmz55/comfyui-bmz-nodes",
-            "files": [
-                "https://github.com/bmz55/comfyui-bmz-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Load Images From Dir With Name (Inspire - BMZ), Count Images In Dir (BMZ), Get Level Text (BMZ), Get Level Float (BMZ)"
-        },
         {
             "author": "azure-dragon-ai",
             "title": "ComfyUI-HPSv2-Nodes",
@@ -150,36 +140,6 @@
             "install_type": "git-clone",
             "description": "This module provides an annotation @ComfyFunc to streamline adding custom node types in ComfyUI. It processes your function's signature to create a wrapped function and custom node definition required for ComfyUI, eliminating all the boilerplate code. In most cases you can just add a @ComfyFunc(\"category\") annotation to your existing function."
         },
-        {
-            "author": "MokkaBoss1",
-            "title": "Woman_in_a_dress",
-            "reference": "https://github.com/MokkaBoss1/Woman_in_a_dress",
-            "files": [
-                "https://github.com/MokkaBoss1/Woman_in_a_dress/raw/main/Woman_In_A_Dress.py"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Woman_in_a_dress"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-concat-text-39",
-            "reference": "https://github.com/shinich39/comfyui-concat-text-39",
-            "files": [
-                "https://github.com/shinich39/comfyui-concat-text-39"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Concatenate multiple text nodes."
-        },
-        {
-            "author": "nilor-corp",
-            "title": "nilor-nodes",
-            "reference": "https://github.com/nilor-corp/nilor-nodes",
-            "files": [
-                "https://github.com/nilor-corp/nilor-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Nilor Floats, Nilor Int To List Of Bools, Nilor Bool From List Of Bools, Nilor Int From List Of Ints, Nilor List of Ints, Nilor Count Images In Directory"
-        },
         {
             "author": "OuticNZ",
             "title": "ComfyUI-Simple-Of-Complex",
@@ -260,6 +220,26 @@
             ],
             "install_type": "git-clone",
             "description": "The primitive node and dummy input are required because comfy doesn't accept requests with identical graphs. You'll also need a show text node. I like the one from ComfyUI-Custom-Scripts. I got the generic tetris remake from claude so it may or may not be ripped from somewhere else."
+        },
+        {
+            "author": "FlyMyAI",
+            "title": "ComfyUI-ExampleNode",
+            "reference": "https://github.com/FlyMyAI/ComfyUI-ExampleNode",
+            "files": [
+                "https://github.com/FlyMyAI/ComfyUI-ExampleNode"
+            ],
+            "install_type": "git-clone",
+            "description": "Node to provide convenient ComfyUI standard, supported by flymy_comfyui."
+        },
+        {
+            "author": "Wanghanying",
+            "title": "ComfyUI_RAGDemo",
+            "reference": "https://github.com/Wanghanying/ComfyUI_RAGDemo",
+            "files": [
+                "https://github.com/Wanghanying/ComfyUI_RAGDemo"
+            ],
+            "install_type": "git-clone",
+            "description": "RAG Demo for LLM"
         }
     ]
 }

node_db/tutorial/extension-node-map.json

@@ -1 +1,546 @@
-{}
+{
+    "https://github.com/BadCafeCode/execution-inversion-demo-comfyui": [
+        [
+            "AccumulateNode",
+            "AccumulationGetItemNode",
+            "AccumulationGetLengthNode",
+            "AccumulationHeadNode",
+            "AccumulationSetItemNode",
+            "AccumulationTailNode",
+            "AccumulationToListNode",
+            "BoolOperationNode",
+            "ComponentInput",
+            "ComponentMetadata",
+            "ComponentOutput",
+            "DebugPrint",
+            "ExecutionBlocker",
+            "FloatConditions",
+            "ForLoopClose",
+            "ForLoopOpen",
+            "IntConditions",
+            "IntMathOperation",
+            "InversionDemoAdvancedPromptNode",
+            "InversionDemoLazyConditional",
+            "InversionDemoLazyIndexSwitch",
+            "InversionDemoLazyMixImages",
+            "InversionDemoLazySwitch",
+            "ListToAccumulationNode",
+            "MakeListNode",
+            "StringConditions",
+            "ToBoolNode",
+            "WhileLoopClose",
+            "WhileLoopOpen"
+        ],
+        {
+            "title_aux": "execution-inversion-demo-comfyui"
+        }
+    ],
+    "https://github.com/BetaDoggo/ComfyUI-Tetris": [
+        [
+            "Tetris"
+        ],
+        {
+            "title_aux": "ComfyUI Tetris"
+        }
+    ],
+    "https://github.com/BoosterCore/ComfyUI-BC-Experimental": [
+        [
+            "ClipTextEncodeBC",
+            "ClipTextEncodeBCA",
+            "FluxEmptyLatentSize",
+            "LoraWithTriggerWord",
+            "SaveAnyText",
+            "SimpleText"
+        ],
+        {
+            "title_aux": "ComfyUI-BC-Experimental"
+        }
+    ],
+    "https://github.com/FlyMyAI/ComfyUI-ExampleNode": [
+        [
+            "ExampleT2IFMANode"
+        ],
+        {
+            "title_aux": "ComfyUI-ExampleNode"
+        }
+    ],
+    "https://github.com/IvanRybakov/comfyui-node-int-to-string-convertor": [
+        [
+            "Int To String"
+        ],
+        {
+            "title_aux": "comfyui-node-int-to-string-convertor"
+        }
+    ],
+    "https://github.com/LarryJane491/Custom-Node-Base": [
+        [
+            "My First Node"
+        ],
+        {
+            "title_aux": "Custom-Node-Base"
+        }
+    ],
+    "https://github.com/OuticNZ/ComfyUI-Simple-Of-Complex": [
+        [
+            "Pipe From Parameters",
+            "Pipe To Parameters",
+            "Prompt Tidy",
+            "Text Switch 2 Way",
+            "Text With Context"
+        ],
+        {
+            "title_aux": "ComfyUI-Simple-Of-Complex"
+        }
+    ],
+    "https://github.com/Suzie1/ComfyUI_Guide_To_Making_Custom_Nodes": [
+        [
+            "Concatenate Hello World",
+            "Hello World Overlay Text",
+            "Print Hello World"
+        ],
+        {
+            "title_aux": "Guide To Making Custom Nodes in ComfyUI"
+        }
+    ],
+    "https://github.com/Wanghanying/ComfyUI_RAGDemo": [
+        [
+            "testRAG"
+        ],
+        {
+            "title_aux": "ComfyUI_RAGDemo"
+        }
+    ],
+    "https://github.com/azure-dragon-ai/ComfyUI-HPSv2-Nodes": [
+        [
+            "GetImageSize",
+            "HaojihuiHPSv2ImageProcessor",
+            "HaojihuiHPSv2ImageScore",
+            "HaojihuiHPSv2ImageScores",
+            "HaojihuiHPSv2Loader",
+            "HaojihuiHPSv2SaveAnimatedWEBP",
+            "HaojihuiHPSv2SaveImage",
+            "HaojihuiHPSv2SaveWEBP",
+            "HaojihuiHPSv2SaveWebpImage",
+            "HaojihuiHPSv2TextProcessor",
+            "SaveImageWebp",
+            "ScaleShort"
+        ],
+        {
+            "title_aux": "ComfyUI-HPSv2-Nodes"
+        }
+    ],
+    "https://github.com/bamboodia/BAM_Nodes": [
+        [
+            "BAM Crop To Ratio",
+            "BAM Empty Latent By Ratio",
+            "BAM Get Shortest Side",
+            "BAM OnOff INT",
+            "BAM Random Float",
+            "BAM Random Image From Folder"
+        ],
+        {
+            "title_aux": "BAM Nodes"
+        }
+    ],
+    "https://github.com/boricuapab/ComfyUI_BoricuapabWFNodePack": [
+        [
+            "BoricuapabWF Concatenate Hello World",
+            "BoricuapabWF Integer",
+            "BoricuapabWF Print Hello Puerto Rican World",
+            "BoricuapabWF Print Puerto Rican"
+        ],
+        {
+            "title_aux": "ComfyUI_BoricuapabWFNodePack"
+        }
+    ],
+    "https://github.com/comfyanonymous/ComfyUI": [
+        [
+            "AddNoise",
+            "AlignYourStepsScheduler",
+            "BasicGuider",
+            "BasicScheduler",
+            "BetaSamplingScheduler",
+            "CFGGuider",
+            "CLIPAttentionMultiply",
+            "CLIPLoader",
+            "CLIPMergeAdd",
+            "CLIPMergeSimple",
+            "CLIPMergeSubtract",
+            "CLIPSave",
+            "CLIPSetLastLayer",
+            "CLIPTextEncode",
+            "CLIPTextEncodeControlnet",
+            "CLIPTextEncodeFlux",
+            "CLIPTextEncodeHunyuanDiT",
+            "CLIPTextEncodeSD3",
+            "CLIPTextEncodeSDXL",
+            "CLIPTextEncodeSDXLRefiner",
+            "CLIPVisionEncode",
+            "CLIPVisionLoader",
+            "Canny",
+            "CheckpointLoader",
+            "CheckpointLoaderSimple",
+            "CheckpointSave",
+            "ConditioningAverage",
+            "ConditioningCombine",
+            "ConditioningConcat",
+            "ConditioningSetArea",
+            "ConditioningSetAreaPercentage",
+            "ConditioningSetAreaStrength",
+            "ConditioningSetMask",
+            "ConditioningSetTimestepRange",
+            "ConditioningZeroOut",
+            "ControlNetApply",
+            "ControlNetApplyAdvanced",
+            "ControlNetApplySD3",
+            "ControlNetInpaintingAliMamaApply",
+            "ControlNetLoader",
+            "CropMask",
+            "DiffControlNetLoader",
+            "DifferentialDiffusion",
+            "DiffusersLoader",
+            "DisableNoise",
+            "DualCFGGuider",
+            "DualCLIPLoader",
+            "EmptyImage",
+            "EmptyLatentAudio",
+            "EmptyLatentImage",
+            "EmptyMochiLatentVideo",
+            "EmptySD3LatentImage",
+            "ExponentialScheduler",
+            "FeatherMask",
+            "FlipSigmas",
+            "FluxGuidance",
+            "FreeU",
+            "FreeU_V2",
+            "GITSScheduler",
+            "GLIGENLoader",
+            "GLIGENTextBoxApply",
+            "GrowMask",
+            "HyperTile",
+            "HypernetworkLoader",
+            "ImageBatch",
+            "ImageBlend",
+            "ImageBlur",
+            "ImageColorToMask",
+            "ImageCompositeMasked",
+            "ImageCrop",
+            "ImageFromBatch",
+            "ImageInvert",
+            "ImageOnlyCheckpointLoader",
+            "ImageOnlyCheckpointSave",
+            "ImagePadForOutpaint",
+            "ImageQuantize",
+            "ImageScale",
+            "ImageScaleBy",
+            "ImageScaleToTotalPixels",
+            "ImageSharpen",
+            "ImageToMask",
+            "ImageUpscaleWithModel",
+            "InpaintModelConditioning",
+            "InstructPixToPixConditioning",
+            "InvertMask",
+            "JoinImageWithAlpha",
+            "KSampler",
+            "KSamplerAdvanced",
+            "KSamplerSelect",
+            "KarrasScheduler",
+            "LaplaceScheduler",
+            "LatentAdd",
+            "LatentApplyOperation",
+            "LatentApplyOperationCFG",
+            "LatentBatch",
+            "LatentBatchSeedBehavior",
+            "LatentBlend",
+            "LatentComposite",
+            "LatentCompositeMasked",
+            "LatentCrop",
+            "LatentFlip",
+            "LatentFromBatch",
+            "LatentInterpolate",
+            "LatentMultiply",
+            "LatentOperationSharpen",
+            "LatentOperationTonemapReinhard",
+            "LatentRotate",
+            "LatentSubtract",
+            "LatentUpscale",
+            "LatentUpscaleBy",
+            "LoadAudio",
+            "LoadImage",
+            "LoadImageMask",
+            "LoadLatent",
+            "LoraLoader",
+            "LoraLoaderModelOnly",
+            "LoraSave",
+            "MaskComposite",
+            "MaskToImage",
+            "ModelMergeAdd",
+            "ModelMergeBlocks",
+            "ModelMergeFlux1",
+            "ModelMergeSD1",
+            "ModelMergeSD2",
+            "ModelMergeSD35_Large",
+            "ModelMergeSD3_2B",
+            "ModelMergeSDXL",
+            "ModelMergeSimple",
+            "ModelMergeSubtract",
+            "ModelSamplingAuraFlow",
+            "ModelSamplingContinuousEDM",
+            "ModelSamplingContinuousV",
+            "ModelSamplingDiscrete",
+            "ModelSamplingFlux",
+            "ModelSamplingSD3",
+            "ModelSamplingStableCascade",
+            "ModelSave",
+            "Morphology",
+            "PatchModelAddDownscale",
+            "PerpNeg",
+            "PerpNegGuider",
+            "PerturbedAttentionGuidance",
+            "PhotoMakerEncode",
+            "PhotoMakerLoader",
+            "PolyexponentialScheduler",
+            "PorterDuffImageComposite",
+            "PreviewAudio",
+            "PreviewImage",
+            "RandomNoise",
+            "RebatchImages",
+            "RebatchLatents",
+            "RepeatImageBatch",
+            "RepeatLatentBatch",
+            "RescaleCFG",
+            "SDTurboScheduler",
+            "SD_4XUpscale_Conditioning",
+            "SV3D_Conditioning",
+            "SVD_img2vid_Conditioning",
+            "SamplerCustom",
+            "SamplerCustomAdvanced",
+            "SamplerDPMAdaptative",
+            "SamplerDPMPP_2M_SDE",
+            "SamplerDPMPP_2S_Ancestral",
+            "SamplerDPMPP_3M_SDE",
+            "SamplerDPMPP_SDE",
+            "SamplerEulerAncestral",
+            "SamplerEulerAncestralCFGPP",
+            "SamplerEulerCFGpp",
+            "SamplerLCMUpscale",
+            "SamplerLMS",
+            "SaveAnimatedPNG",
+            "SaveAnimatedWEBP",
+            "SaveAudio",
+            "SaveImage",
+            "SaveImageWebsocket",
+            "SaveLatent",
+            "SelfAttentionGuidance",
+            "SetLatentNoiseMask",
+            "SetUnionControlNetType",
+            "SkipLayerGuidanceSD3",
+            "SolidMask",
+            "SplitImageWithAlpha",
+            "SplitSigmas",
+            "SplitSigmasDenoise",
+            "StableCascade_EmptyLatentImage",
+            "StableCascade_StageB_Conditioning",
+            "StableCascade_StageC_VAEEncode",
+            "StableCascade_SuperResolutionControlnet",
+            "StableZero123_Conditioning",
+            "StableZero123_Conditioning_Batched",
+            "StubConstantImage",
+            "StubFloat",
+            "StubImage",
+            "StubInt",
+            "StubMask",
+            "StyleModelApply",
+            "StyleModelLoader",
+            "TestAccumulateNode",
+            "TestAccumulationGetItemNode",
+            "TestAccumulationGetLengthNode",
+            "TestAccumulationHeadNode",
+            "TestAccumulationSetItemNode",
+            "TestAccumulationTailNode",
+            "TestAccumulationToListNode",
+            "TestBoolOperationNode",
+            "TestCustomIsChanged",
+            "TestCustomValidation1",
+            "TestCustomValidation2",
+            "TestCustomValidation3",
+            "TestCustomValidation4",
+            "TestCustomValidation5",
+            "TestDynamicDependencyCycle",
+            "TestExecutionBlocker",
+            "TestFloatConditions",
+            "TestForLoopClose",
+            "TestForLoopOpen",
+            "TestIntConditions",
+            "TestIntMathOperation",
+            "TestIsChangedWithConstants",
+            "TestLazyMixImages",
+            "TestListToAccumulationNode",
+            "TestMakeListNode",
+            "TestMixedExpansionReturns",
+            "TestStringConditions",
+            "TestToBoolNode",
+            "TestVariadicAverage",
+            "TestWhileLoopClose",
+            "TestWhileLoopOpen",
+            "ThresholdMask",
+            "TomePatchModel",
+            "TorchCompileModel",
+            "TripleCLIPLoader",
+            "UNETLoader",
+            "UNetCrossAttentionMultiply",
+            "UNetSelfAttentionMultiply",
+            "UNetTemporalAttentionMultiply",
+            "UpscaleModelLoader",
+            "VAEDecode",
+            "VAEDecodeAudio",
+            "VAEDecodeTiled",
+            "VAEEncode",
+            "VAEEncodeAudio",
+            "VAEEncodeForInpaint",
+            "VAEEncodeTiled",
+            "VAELoader",
+            "VAESave",
+            "VPScheduler",
+            "VideoLinearCFGGuidance",
+            "VideoTriangleCFGGuidance",
+            "WebcamCapture",
+            "unCLIPCheckpointLoader",
+            "unCLIPConditioning"
+        ],
+        {
+            "title_aux": "ComfyUI"
+        }
+    ],
+    "https://github.com/dynamixar/Atluris": [
+        [
+            "RandomLine"
+        ],
+        {
+            "title_aux": "Atluris"
+        }
+    ],
+    "https://github.com/ecjojo/ecjojo-example-nodes": [
+        [
+            "BiggerNote_Example",
+            "DisplayTextNode_Example",
+            "EmptyNode_Example",
+            "ExampleNode_Example",
+            "FilePrefixNode_Example",
+            "HelloWorldNode_Example",
+            "RandomSizeNode_Example",
+            "StringNode_Example",
+            "TextOverlayNode_Example"
+        ],
+        {
+            "title_aux": "ecjojo_example_nodes"
+        }
+    ],
+    "https://github.com/et118/ComfyUI-ElGogh-Nodes": [
+        [
+            "ElGoghCLIPSetLastLayer",
+            "ElGoghCheckpointLoaderSimple",
+            "ElGoghEmptyLatentImage",
+            "ElGoghKSamplerAdvanced",
+            "ElGoghNegativePrompt",
+            "ElGoghPositivePrompt",
+            "ElGoghPrimaryLoraLoader",
+            "ElGoghSecondaryLoraLoader",
+            "ElGoghSendWebsocketNSFWBool",
+            "ElGoghTertiaryLoraLoader",
+            "ElGoghVAELoader"
+        ],
+        {
+            "title_aux": "ComfyUI-ElGogh-Nodes"
+        }
+    ],
+    "https://github.com/foxtrot-roger/comfyui-custom-nodes": [
+        [
+            "RF_Tutorial"
+        ],
+        {
+            "title_aux": "comfyui-custom-nodes"
+        }
+    ],
+    "https://github.com/jtong/comfyui-jtong-workflow": [
+        [
+            "Example",
+            "high_workflow_caller",
+            "jtong.Highend",
+            "jtong.Highway"
+        ],
+        {
+            "author": "Trung0246",
+            "description": "Random nodes for ComfyUI I made to solve my struggle with ComfyUI (ex: pipe, process). Have varying quality.",
+            "nickname": "ComfyUI-0246",
+            "title": "ComfyUI-0246",
+            "title_aux": "comfyui-jtong-workflow"
+        }
+    ],
+    "https://github.com/kappa54m/ComfyUI_Usability": [
+        [
+            "KLoadImageByPath",
+            "KLoadImageByPathAdvanced",
+            "KLoadImageDedup"
+        ],
+        {
+            "title_aux": "ComfyUI-HPSv2-Nodes"
+        }
+    ],
+    "https://github.com/mira-6/mira-wildcard-node": [
+        [
+            "MiraWildcard"
+        ],
+        {
+            "author": "mira-6",
+            "description": "Single-node wildcard implementation.",
+            "nickname": "mira-wildcard-node",
+            "title": "mira-wildcard-node",
+            "title_aux": "mira-wildcard-node"
+        }
+    ],
+    "https://github.com/sonyeon-sj/ComfyUI-easy_ImageSize_Selecter": [
+        [
+            "ImageSizer",
+            "promptSelecter"
+        ],
+        {
+            "title_aux": "ComfyUI-easy_ImageSize_Selecter"
+        }
+    ],
+    "https://github.com/thinkthinking/ComfyUI-Ye": [
+        [
+            "CheckpointLoader|Ye",
+            "OllamaVision|Ye",
+            "PrintHelloWorld|Ye",
+            "Signature|Ye"
+        ],
+        {
+            "title_aux": "ComfyUI-Ye"
+        }
+    ],
+    "https://github.com/wailovet/ComfyUI-WW": [
+        [
+            "WW_AccumulationPreviewImages",
+            "WW_AppendString",
+            "WW_CurrentPreviewImages",
+            "WW_ImageResize",
+            "WW_PreviewTextNode",
+            "WW_RandString"
+        ],
+        {
+            "title_aux": "ComfyUI-WW"
+        }
+    ],
+    "https://github.com/yowipr/ComfyUI-Manual": [
+        [
+            "EXAMPLE",
+            "M_Layer",
+            "M_Output",
+            "M_RenderArea"
+        ],
+        {
+            "title_aux": "ComfyUI-Manual"
+        }
+    ]
+}

node_db/tutorial/scan.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
-source ../../../../venv/bin/activate
+rm ~/.tmp/dev/*.py > /dev/null 2>&1
-rm .tmp/*.py > /dev/null
+python ../../scanner.py ~/.tmp/tutorial
-python ../../scanner.py

prestartup_script.py

@@ -98,36 +98,6 @@ def remap_pip_package(pkg):
 std_log_lock = threading.Lock()
 
 
-class TerminalHook:
-    def __init__(self):
-        self.hooks = {}
-
-    def add_hook(self, k, v):
-        self.hooks[k] = v
-
-    def remove_hook(self, k):
-        if k in self.hooks:
-            del self.hooks[k]
-
-    def write_stderr(self, msg):
-        for v in self.hooks.values():
-            try:
-                v.write_stderr(msg)
-            except Exception:
-                pass
-
-    def write_stdout(self, msg):
-        for v in self.hooks.values():
-            try:
-                v.write_stdout(msg)
-            except Exception:
-                pass
-
-
-terminal_hook = TerminalHook()
-sys.__comfyui_manager_terminal_hook = terminal_hook
-
-
 def handle_stream(stream, prefix):
     stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
     for msg in stream:
@@ -257,7 +227,7 @@ try:
 
         def sync_write(self, message, file_only=False):
             with log_lock:
-                timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')[:-3]
+                timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
                 if self.last_char != '\n':
                     log_file.write(message)
                 else:
@@ -270,11 +240,9 @@ try:
                     if self.is_stdout:
                         write_stdout(message)
                         original_stdout.flush()
-                        terminal_hook.write_stderr(message)
                     else:
                         write_stderr(message)
                         original_stderr.flush()
-                        terminal_hook.write_stdout(message)
 
         def flush(self):
             log_file.flush()
@@ -417,30 +385,7 @@ check_bypass_ssl()
 # Perform install
 processed_install = set()
 script_list_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "startup-scripts", "install-scripts.txt")
-pip_map = None
+pip_fixer = PIPFixer(get_installed_packages())
-
-
-def get_installed_packages():
-    global pip_map
-
-    if pip_map is None:
-        try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
-
-            pip_map = {}
-            for line in result.split('\n'):
-                x = line.strip()
-                if x:
-                    y = line.split()
-                    if y[0] == 'Package' or y[0].startswith('-'):
-                        continue
-
-                    pip_map[y[0]] = y[1]
-        except subprocess.CalledProcessError as e:
-            print(f"[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
-            return set()
-
-    return pip_map
 
 
 def is_installed(name):
@@ -652,8 +597,11 @@ if os.path.exists(script_list_path):
     print("\n[ComfyUI-Manager] Startup script completed.")
     print("#######################################################################\n")
 
+pip_fixer.fix_broken()
+
 del processed_install
-del pip_map
+del pip_fixer
+clear_pip_cache()
 
 
 def check_windows_event_loop_policy():

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 = "2.50.1"
+version = "2.53"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 

requirements.txt

@@ -1,3 +1,4 @@
+pygit2
 GitPython
 PyGithub
 matrix-client==0.4.0

scan.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 rm ~/.tmp/default/*.py > /dev/null 2>&1
-python scanner.py ~/.tmp/default $*
+python -m scanner ~/.tmp/default $*
 cp extension-node-map.json node_db/new/.
 
-echo Integrity check
+echo "Integrity check"
-./check.sh
+if [ -f "check2.sh" ]; then
+    ./check2.sh
+else
+    ./check.sh
+fi

scanner.py

@@ -2,7 +2,8 @@ import ast
 import re
 import os
 import json
-from git import Repo
+import sys
+from glob import git_wrapper
 import concurrent
 import datetime
 import concurrent.futures
@@ -243,25 +244,27 @@ def get_py_urls_from_json(json_file):
 
     return py_files
 
-
+import traceback
 def clone_or_pull_git_repository(git_url):
     repo_name = git_url.split("/")[-1].split(".")[0]
     repo_dir = os.path.join(temp_dir, repo_name)
 
     if os.path.exists(repo_dir):
         try:
-            repo = Repo(repo_dir)
+            repo = git_wrapper.Repo(repo_dir)
             origin = repo.remote(name="origin")
             origin.pull()
-            repo.git.submodule('update', '--init', '--recursive')
+            repo.update_recursive()
             print(f"Pulling {repo_name}...")
         except Exception as e:
+            traceback.print_exc()
             print(f"Pulling {repo_name} failed: {e}")
     else:
         try:
-            Repo.clone_from(git_url, repo_dir, recursive=True)
+            git_wrapper.clone_from(git_url, repo_dir, recursive=True)
             print(f"Cloning {repo_name}...")
         except Exception as e:
+            traceback.print_exc()
             print(f"Cloning {repo_name} failed: {e}")