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"
 

README.md

@@ -363,7 +363,6 @@ 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

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, 51, 8]
+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,6 +430,7 @@ 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
@@ -430,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"]
@@ -559,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:
@@ -687,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:
@@ -698,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)
@@ -751,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")
@@ -772,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
@@ -798,13 +838,13 @@ 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
                 new_path = dir_path + ".disabled"
@@ -840,11 +880,13 @@ 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)
 
             if not skip_script:
@@ -914,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
 
@@ -926,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):
@@ -945,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
 
@@ -965,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:
@@ -987,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'
 
@@ -1025,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()
 

glob/manager_server.py

@@ -62,7 +62,7 @@ def is_allowed_security_level(level):
 
 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']:
@@ -1070,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:
@@ -1242,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:
@@ -1372,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

@@ -1276,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: () => {

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");
@@ -237,4 +241,4 @@ export const icons = {
 	conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
 	passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
 	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
-}
+}

js/terminal.js

@@ -1,83 +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 extends LiteGraph.LGraphNode {
-			color = "#222222";
-			bgcolor = "#000000";
-			groupcolor = LGraphCanvas.node_colors.black.groupcolor;
-			constructor() {
-				super();
-				this.title = "Terminal Log (Manager)";
-				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:

model-list.json

@@ -312,7 +312,7 @@
       "name": "negative_hand Negative Embedding",
       "type": "embeddings",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "embeddings/SD1.5",
       "description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.",
       "reference": "https://civitai.com/models/56519/negativehand-negative-embedding",
       "filename": "negative_hand-neg.pt",
@@ -323,7 +323,7 @@
       "name": "bad_prompt Negative Embedding",
       "type": "embeddings",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "embeddings/SD1.5",
       "description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.",
       "reference": "https://civitai.com/models/55700/badprompt-negative-embedding",
       "filename": "bad_prompt_version2-neg.pt",
@@ -334,7 +334,7 @@
       "name": "Deep Negative V1.75",
       "type": "embeddings",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "embeddings/SD1.5",
       "description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.",
       "reference": "https://civitai.com/models/4629/deep-negative-v1x",
       "filename": "ng_deepnegative_v1_75t.pt",
@@ -345,7 +345,7 @@
       "name": "EasyNegative",
       "type": "embeddings",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "embeddings/SD1.5",
       "description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.",
       "reference": "https://civitai.com/models/7808/easynegative",
       "filename": "easynegative.safetensors",
@@ -521,7 +521,7 @@
       "name": "sd_xl_base_1.0_0.9vae.safetensors",
       "type": "checkpoint",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "checkpoints/SDXL",
       "description": "Stable Diffusion XL base model (VAE 0.9)",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0",
       "filename": "sd_xl_base_1.0_0.9vae.safetensors",
@@ -532,7 +532,7 @@
       "name": "sd_xl_base_1.0.safetensors",
       "type": "checkpoint",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "checkpoints/SDXL",
       "description": "Stable Diffusion XL base model",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0",
       "filename": "sd_xl_base_1.0.safetensors",
@@ -543,7 +543,7 @@
       "name": "sd_xl_refiner_1.0_0.9vae.safetensors",
       "type": "checkpoint",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "checkpoints/SDXL",
       "description": "Stable Diffusion XL refiner model (VAE 0.9)",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0",
       "filename": "sd_xl_refiner_1.0_0.9vae.safetensors",
@@ -554,7 +554,7 @@
       "name": "stable-diffusion-xl-refiner-1.0",
       "type": "checkpoint",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "checkpoints/SDXL",
       "description": "Stable Diffusion XL refiner model",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0",
       "filename": "sd_xl_refiner_1.0.safetensors",
@@ -587,7 +587,7 @@
       "name": "sd_xl_offset_example-lora_1.0.safetensors",
       "type": "lora",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "loras/SDXL",
       "description": "Stable Diffusion XL offset LoRA",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0",
       "filename": "sd_xl_offset_example-lora_1.0.safetensors",
@@ -843,6 +843,40 @@
       "size": "472MB"
     },
 
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp16)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp16)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp16.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp16.safetensors",
+      "size": "9.79GB"
+    },
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp8_e4m3fn)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn.safetensors",
+      "size": "4.89GB"
+    },
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn_scaled)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp16)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp8_e4m3fn_scaled.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors",
+      "size": "5.16GB"
+    },
+
     {
       "name": "google-t5/t5-base",
       "type": "clip",
@@ -854,7 +888,6 @@
       "url": "https://huggingface.co/google-t5/t5-base/resolve/main/model.safetensors",
       "size": "892MB"
     },
-
     {
       "name": "google-t5/t5-v1_1-xxl_encoderonly-fp16",
       "type": "clip",
@@ -1018,7 +1051,7 @@
       "name": "v1-5-pruned-emaonly.ckpt",
       "type": "checkpoint",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "checkpoints/SD1.5",
       "description": "Stable Diffusion 1.5 base model",
       "reference": "https://huggingface.co/runwayml/stable-diffusion-v1-5",
       "filename": "v1-5-pruned-emaonly.ckpt",
@@ -1029,7 +1062,7 @@
       "name": "v2-1_512-ema-pruned.safetensors",
       "type": "checkpoint",
       "base": "SD2",
-      "save_path": "default",
+      "save_path": "checkpoints/SD2.1",
       "description": "Stable Diffusion 2 base model (512)",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-2-1-base",
       "filename": "v2-1_512-ema-pruned.safetensors",
@@ -1040,7 +1073,7 @@
       "name": "v2-1_768-ema-pruned.safetensors",
       "type": "checkpoint",
       "base": "SD2",
-      "save_path": "default",
+      "save_path": "checkpoints/SD2.1",
       "description": "Stable Diffusion 2 base model (768)",
       "reference": "https://huggingface.co/stabilityai/stable-diffusion-2-1",
       "filename": "v2-1_768-ema-pruned.safetensors",
@@ -1051,7 +1084,7 @@
       "name": "AbyssOrangeMix2 (hard)",
       "type": "checkpoint",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "checkpoints/SD1.5",
       "description": "AbyssOrangeMix2 - hard version (anime style)",
       "reference": "https://huggingface.co/WarriorMama777/OrangeMixs",
       "filename": "AbyssOrangeMix2_hard.safetensors",
@@ -1062,7 +1095,7 @@
       "name": "AbyssOrangeMix3 A1",
       "type": "checkpoint",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "checkpoints/SD1.5",
       "description": "AbyssOrangeMix3 - A1 (anime style)",
       "reference": "https://huggingface.co/WarriorMama777/OrangeMixs",
       "filename": "AOM3A1_orangemixs.safetensors",
@@ -1073,7 +1106,7 @@
       "name": "AbyssOrangeMix3 A3",
       "type": "checkpoint",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "checkpoints/SD1.5",
       "description": "AbyssOrangeMix - A3 (anime style)",
       "reference": "https://huggingface.co/WarriorMama777/OrangeMixs",
       "filename": "AOM3A3_orangemixs.safetensors",
@@ -1084,7 +1117,7 @@
       "name": "Waifu Diffusion 1.5 Beta3 (fp16)",
       "type": "checkpoint",
       "base": "SD2.1",
-      "save_path": "default",
+      "save_path": "checkpoints/SD2.1",
       "description": "Waifu Diffusion 1.5 Beta3",
       "reference": "https://huggingface.co/waifu-diffusion/wd-1-5-beta3",
       "filename": "wd-illusion-fp16.safetensors",
@@ -1095,7 +1128,7 @@
       "name": "illuminatiDiffusionV1_v11 unCLIP model",
       "type": "unclip",
       "base": "SD2.1",
-      "save_path": "default",
+      "save_path": "checkpoints/SD2.1",
       "description": "Mix model (SD2.1 unCLIP + illuminatiDiffusionV1_v11)",
       "reference": "https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP",
       "filename": "illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors",
@@ -1106,7 +1139,7 @@
       "name": "Waifu Diffusion 1.5 unCLIP model",
       "type": "unclip",
       "base": "SD2.1",
-      "save_path": "default",
+      "save_path": "checkpoints/SD2.1",
       "description": "Mix model (SD2.1 unCLIP + Waifu Diffusion 1.5)",
       "reference": "https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP",
       "filename": "wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors",
@@ -1116,8 +1149,8 @@
     {
       "name": "sdxl_vae.safetensors",
       "type": "VAE",
-      "base": "SDXL VAE",
+      "base": "SDXL",
-      "save_path": "default",
+      "save_path": "vae/SDXL",
       "description": "SDXL-VAE",
       "reference": "https://huggingface.co/stabilityai/sdxl-vae",
       "filename": "sdxl_vae.safetensors",
@@ -1127,8 +1160,8 @@
     {
       "name": "vae-ft-mse-840000-ema-pruned",
       "type": "VAE",
-      "base": "SD1.5 VAE",
+      "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "vae/SD1.5",
       "description": "vae-ft-mse-840000-ema-pruned",
       "reference": "https://huggingface.co/stabilityai/sd-vae-ft-mse-original",
       "filename": "vae-ft-mse-840000-ema-pruned.safetensors",
@@ -1138,8 +1171,8 @@
     {
       "name": "orangemix.vae",
       "type": "VAE",
-      "base": "SD1.5 VAE",
+      "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "vae/SD1.5",
       "description": "orangemix vae model",
       "reference": "https://huggingface.co/WarriorMama777/OrangeMixs",
       "filename": "orangemix.vae.pt",
@@ -1149,8 +1182,8 @@
     {
       "name": "kl-f8-anime2",
       "type": "VAE",
-      "base": "SD2.1 VAE",
+      "base": "SD2.1",
-      "save_path": "default",
+      "save_path": "vae/SD2.1",
       "description": "kl-f8-anime2 vae model",
       "reference": "https://huggingface.co/hakurei/waifu-diffusion-v1-4",
       "filename": "kl-f8-anime2.ckpt",
@@ -1160,8 +1193,8 @@
     {
       "name": "OpenAI Consistency Decoder",
       "type": "VAE",
-      "base": "SD1.5 VAE",
+      "base": "SD1.5",
-      "save_path": "vae/openai_consistency_decoder",
+      "save_path": "vae/SD1.5/openai_consistency_decoder",
       "description": "OpenAI Consistency Decoder. Improved decoding for stable diffusion vaes.",
       "reference": "https://github.com/openai/consistencydecoder",
       "filename": "decoder.pt",
@@ -1172,7 +1205,7 @@
       "name": "LCM LoRA SD1.5",
       "type": "lora",
       "base": "SD1.5",
-      "save_path": "loras/lcm/SD1.5",
+      "save_path": "loras/SD1.5/lcm",
       "description": "Latent Consistency LoRA for SD1.5",
       "reference": "https://huggingface.co/latent-consistency/lcm-lora-sdv1-5",
       "filename": "pytorch_lora_weights.safetensors",
@@ -1183,7 +1216,7 @@
       "name": "LCM LoRA SSD-1B",
       "type": "lora",
       "base": "SSD-1B",
-      "save_path": "loras/lcm/SSD-1B",
+      "save_path": "loras/SSD-1B/lcm",
       "description": "Latent Consistency LoRA for SSD-1B",
       "reference": "https://huggingface.co/latent-consistency/lcm-lora-ssd-1b",
       "filename": "pytorch_lora_weights.safetensors",
@@ -1194,7 +1227,7 @@
       "name": "LCM LoRA SDXL",
       "type": "lora",
       "base": "SDXL",
-      "save_path": "loras/lcm/SDXL",
+      "save_path": "loras/SDXL/lcm",
       "description": "Latent Consistency LoRA for SDXL",
       "reference": "https://huggingface.co/latent-consistency/lcm-lora-sdxl",
       "filename": "pytorch_lora_weights.safetensors",
@@ -1227,7 +1260,7 @@
       "name": "Theovercomer8's Contrast Fix (SD2.1)",
       "type": "lora",
       "base": "SD2.1",
-      "save_path": "default",
+      "save_path": "loras/SD2.1",
       "description": "LORA: Theovercomer8's Contrast Fix (SD2.1)",
       "reference": "https://civitai.com/models/8765/theovercomer8s-contrast-fix-sd15sd21-768",
       "filename": "theovercomer8sContrastFix_sd21768.safetensors",
@@ -1238,7 +1271,7 @@
       "name": "Theovercomer8's Contrast Fix (SD1.5)",
       "type": "lora",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "loras/SD1.5",
       "description": "LORA: Theovercomer8's Contrast Fix (SD1.5)",
       "reference": "https://civitai.com/models/8765/theovercomer8s-contrast-fix-sd15sd21-768",
       "filename": "theovercomer8sContrastFix_sd15.safetensors",
@@ -1249,7 +1282,7 @@
       "name": "T2I-Adapter (depth)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for depth",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_depth_sd14v1.pth",
@@ -1260,7 +1293,7 @@
       "name": "T2I-Adapter (seg)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for seg",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_seg_sd14v1.pth",
@@ -1271,7 +1304,7 @@
       "name": "T2I-Adapter (sketch)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for sketch",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_sketch_sd14v1.pth",
@@ -1282,7 +1315,7 @@
       "name": "T2I-Adapter (keypose)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for keypose",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_keypose_sd14v1.pth",
@@ -1293,7 +1326,7 @@
       "name": "T2I-Adapter (openpose)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for openpose",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_openpose_sd14v1.pth",
@@ -1304,7 +1337,7 @@
       "name": "T2I-Adapter (color)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for color",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_color_sd14v1.pth",
@@ -1315,7 +1348,7 @@
       "name": "T2I-Adapter (canny)",
       "type": "T2I-Adapter",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter for canny",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_canny_sd14v1.pth",
@@ -1326,7 +1359,7 @@
       "name": "T2I-Style model",
       "type": "T2I-Style",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "ControlNet T2I-Adapter style model. Need to download CLIPVision model.",
       "reference": "https://huggingface.co/TencentARC/T2I-Adapter",
       "filename": "t2iadapter_style_sd14v1.pth",
@@ -1337,7 +1370,7 @@
       "name": "T2I-Adapter XL (lineart) FP16",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for lineart",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-lineart-sdxl-1.0",
       "filename": "t2i-adapter-lineart-sdxl-1.0.fp16.safetensors",
@@ -1348,7 +1381,7 @@
       "name": "T2I-Adapter XL (canny) FP16",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for canny",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-canny-sdxl-1.0",
       "filename": "t2i-adapter-canny-sdxl-1.0.fp16.safetensors",
@@ -1359,7 +1392,7 @@
       "name": "T2I-Adapter XL (depth-zoe) FP16",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for depth-zoe",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-depth-zoe-sdxl-1.0",
       "filename": "t2i-adapter-depth-zoe-sdxl-1.0.fp16.safetensors",
@@ -1370,7 +1403,7 @@
       "name": "T2I-Adapter XL (depth-midas) FP16",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for depth-midas",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-depth-midas-sdxl-1.0",
       "filename": "t2i-adapter-depth-midas-sdxl-1.0.fp16.safetensors",
@@ -1381,7 +1414,7 @@
       "name": "T2I-Adapter XL (sketch) FP16",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for sketch",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-sketch-sdxl-1.0",
       "filename": "t2i-adapter-sketch-sdxl-1.0.fp16.safetensors",
@@ -1392,7 +1425,7 @@
       "name": "T2I-Adapter XL (lineart)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for lineart",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-lineart-sdxl-1.0",
       "filename": "t2i-adapter-lineart-sdxl-1.0.safetensors",
@@ -1403,7 +1436,7 @@
       "name": "T2I-Adapter XL (canny)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for canny",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-canny-sdxl-1.0",
       "filename": "t2i-adapter-canny-sdxl-1.0.safetensors",
@@ -1414,7 +1447,7 @@
       "name": "T2I-Adapter XL (depth-zoe)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for depth-zoe",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-depth-zoe-sdxl-1.0",
       "filename": "t2i-adapter-depth-zoe-sdxl-1.0.safetensors",
@@ -1425,7 +1458,7 @@
       "name": "T2I-Adapter XL (depth-midas)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for depth-midas",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-depth-midas-sdxl-1.0",
       "filename": "t2i-adapter-depth-midas-sdxl-1.0.safetensors",
@@ -1436,7 +1469,7 @@
       "name": "T2I-Adapter XL (sketch)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for sketch",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-sketch-sdxl-1.0",
       "filename": "t2i-adapter-sketch-sdxl-1.0.safetensors",
@@ -1447,7 +1480,7 @@
       "name": "T2I-Adapter XL (openpose)",
       "type": "T2I-Adapter",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet T2I-Adapter XL for openpose",
       "reference": "https://huggingface.co/TencentARC/t2i-adapter-openpose-sdxl-1.0",
       "filename": "t2i-adapter-openpose-sdxl-1.0.safetensors",
@@ -1458,7 +1491,7 @@
       "name": "CiaraRowles/TemporalNet2",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/SD1.5",
       "description": "TemporalNet was a ControlNet model designed to enhance the temporal consistency of generated outputs",
       "reference": "https://huggingface.co/CiaraRowles/TemporalNet2",
       "filename": "temporalnetversion2.safetensors",
@@ -1468,14 +1501,27 @@
     {
       "name": "CiaraRowles/TemporalNet1XL (1.0)",
       "type": "controlnet",
-      "base": "SD1.5",
+      "base": "SDXL",
-      "save_path": "controlnet/TemporalNet1XL",
+      "save_path": "controlnet/SDXL/TemporalNet1XL",
       "description": "This is TemporalNet1XL, it is a re-train of the controlnet TemporalNet1 with Stable Diffusion XL.",
       "reference": "https://huggingface.co/CiaraRowles/controlnet-temporalnet-sdxl-1.0",
       "filename": "diffusion_pytorch_model.safetensors",
       "url": "https://huggingface.co/CiaraRowles/controlnet-temporalnet-sdxl-1.0/resolve/main/diffusion_pytorch_model.safetensors",
       "size": "5.00GB"
     },
+
+    {
+      "name": "Comfy-Org/sigclip_vision_384 (patch14_384)",
+      "type": "clip_vision",
+      "base": "sigclip",
+      "save_path": "clip_vision",
+      "description": "This clip vision model is required for FLUX.1 Redux.",
+      "reference": "https://huggingface.co/Comfy-Org/sigclip_vision_384/tree/main",
+      "filename": "sigclip_vision_patch14_384.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
+      "size": "857MB"
+    },
+
     {
       "name": "CLIPVision model (stabilityai/clip_vision_g)",
       "type": "clip_vision",
@@ -1535,7 +1581,7 @@
       "name": "stabilityai/control-lora-canny-rank128.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: canny rank128",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-canny-rank128.safetensors",
@@ -1546,7 +1592,7 @@
       "name": "stabilityai/control-lora-depth-rank128.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: depth rank128",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-depth-rank128.safetensors",
@@ -1557,7 +1603,7 @@
       "name": "stabilityai/control-lora-recolor-rank128.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: recolor rank128",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-recolor-rank128.safetensors",
@@ -1568,7 +1614,7 @@
       "name": "stabilityai/control-lora-sketch-rank128-metadata.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: sketch rank128 metadata",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-sketch-rank128-metadata.safetensors",
@@ -1579,7 +1625,7 @@
       "name": "stabilityai/control-lora-canny-rank256.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: canny rank256",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-canny-rank256.safetensors",
@@ -1590,7 +1636,7 @@
       "name": "stabilityai/control-lora-depth-rank256.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: depth rank256",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-depth-rank256.safetensors",
@@ -1601,7 +1647,7 @@
       "name": "stabilityai/control-lora-recolor-rank256.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: recolor rank256",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-recolor-rank256.safetensors",
@@ -1612,7 +1658,7 @@
       "name": "stabilityai/control-lora-sketch-rank256.safetensors",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "Control-LoRA: sketch rank256",
       "reference": "https://huggingface.co/stabilityai/control-lora",
       "filename": "control-lora-sketch-rank256.safetensors",
@@ -1634,7 +1680,7 @@
       "name": "SDXL-controlnet: OpenPose (v2)",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet openpose model for SDXL",
       "reference": "https://huggingface.co/thibaud/controlnet-openpose-sdxl-1.0",
       "filename": "OpenPoseXL2.safetensors",
@@ -1645,7 +1691,7 @@
       "name": "controlnet-SargeZT/controlnet-sd-xl-1.0-softedge-dexined",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet softedge model for SDXL",
       "reference": "https://huggingface.co/SargeZT/controlnet-sd-xl-1.0-softedge-dexined",
       "filename": "controlnet-sd-xl-1.0-softedge-dexined.safetensors",
@@ -1656,7 +1702,7 @@
       "name": "controlnet-SargeZT/controlnet-sd-xl-1.0-depth-16bit-zoe",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "ControlNet depth-zoe model for SDXL",
       "reference": "https://huggingface.co/SargeZT/controlnet-sd-xl-1.0-depth-16bit-zoe",
       "filename": "depth-zoe-xl-v1.0-controlnet.safetensors",
@@ -1667,7 +1713,7 @@
       "name": "ControlNet-v1-1 (ip2p; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (ip2p)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11e_sd15_ip2p_fp16.safetensors",
@@ -1678,7 +1724,7 @@
       "name": "ControlNet-v1-1 (shuffle; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (shuffle)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11e_sd15_shuffle_fp16.safetensors",
@@ -1689,7 +1735,7 @@
       "name": "ControlNet-v1-1 (canny; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (canny)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_canny_fp16.safetensors",
@@ -1700,7 +1746,7 @@
       "name": "ControlNet-v1-1 (depth; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (depth)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11f1p_sd15_depth_fp16.safetensors",
@@ -1711,7 +1757,7 @@
       "name": "ControlNet-v1-1 (inpaint; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (inpaint)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_inpaint_fp16.safetensors",
@@ -1722,7 +1768,7 @@
       "name": "ControlNet-v1-1 (lineart; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (lineart)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_lineart_fp16.safetensors",
@@ -1733,7 +1779,7 @@
       "name": "ControlNet-v1-1 (mlsd; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (mlsd)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_mlsd_fp16.safetensors",
@@ -1744,7 +1790,7 @@
       "name": "ControlNet-v1-1 (normalbae; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (normalbae)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_normalbae_fp16.safetensors",
@@ -1755,7 +1801,7 @@
       "name": "ControlNet-v1-1 (openpose; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (openpose)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_openpose_fp16.safetensors",
@@ -1766,7 +1812,7 @@
       "name": "ControlNet-v1-1 (scribble; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (scribble)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_scribble_fp16.safetensors",
@@ -1777,7 +1823,7 @@
       "name": "ControlNet-v1-1 (seg; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (seg)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_seg_fp16.safetensors",
@@ -1788,7 +1834,7 @@
       "name": "ControlNet-v1-1 (softedge; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (softedge)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15_softedge_fp16.safetensors",
@@ -1799,7 +1845,7 @@
       "name": "ControlNet-v1-1 (anime; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (anime)",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11p_sd15s2_lineart_anime_fp16.safetensors",
@@ -1810,7 +1856,7 @@
       "name": "ControlNet-v1-1 (tile; fp16; v11u)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (tile) / v11u",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11u_sd15_tile_fp16.safetensors",
@@ -1821,7 +1867,7 @@
       "name": "ControlNet-v1-1 (tile; fp16; v11f1e)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Safetensors/FP16 versions of the new ControlNet-v1-1 checkpoints (tile) / v11f1e\nYou need to this model for <B>Tiled Resample</B>",
       "reference": "https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors",
       "filename": "control_v11f1e_sd15_tile_fp16.safetensors",
@@ -1832,7 +1878,7 @@
       "name": "ControlNet-HandRefiner-pruned (inpaint-depth-hand; fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "This inpaint-depth controlnet model is specialized for the hand refiner.",
       "reference": "https://huggingface.co/hr16/ControlNet-HandRefiner-pruned",
       "filename": "control_sd15_inpaint_depth_hand_fp16.safetensors",
@@ -1843,7 +1889,7 @@
       "name": "control_boxdepth_LooseControlfp16 (fp16)",
       "type": "controlnet",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "controlnet/1.5",
       "description": "Loose ControlNet model",
       "reference": "https://huggingface.co/ioclab/LooseControl_WebUICombine",
       "filename": "control_boxdepth_LooseControlfp16.safetensors",
@@ -1854,7 +1900,7 @@
       "name": "GLIGEN textbox (fp16; pruned)",
       "type": "gligen",
       "base": "SD1.5",
-      "save_path": "default",
+      "save_path": "gligen/SD1.5",
       "description": "GLIGEN textbox model",
       "reference": "https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors",
       "filename": "gligen_sd14_textbox_pruned_fp16.safetensors",
@@ -3100,7 +3146,7 @@
       "name": "monster-labs - Controlnet QR Code Monster v1 For SDXL",
       "type": "controlnet",
       "base": "SDXL",
-      "save_path": "default",
+      "save_path": "controlnet/SDXL",
       "description": "monster-labs - Controlnet QR Code Monster v1 For SDXL",
       "reference": "https://huggingface.co/monster-labs/control_v1p_sdxl_qrcode_monster",
       "filename": "control_v1p_sdxl_qrcode_monster.safetensors",
@@ -3471,6 +3517,19 @@
       "url": "https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union/resolve/main/diffusion_pytorch_model.safetensors",
       "size": "6.6GB"
     },
+
+
+    {
+      "name": "InstantX/FLUX.1-dev-IP-Adapter",
+      "type": "IP-Adapter",
+      "base": "FLUX.1",
+      "save_path": "ipadapter-flux",
+      "description": "FLUX.1-dev-IP-Adapter",
+      "reference": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter",
+      "filename": "ip-adapter.bin",
+      "url": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter/resolve/main/ip-adapter.bin",
+      "size": "5.29GB"
+    },
     {
       "name": "Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro",
       "type": "controlnet",
@@ -3493,6 +3552,7 @@
       "url": "https://huggingface.co/Kijai/flux-fp8/resolve/main/flux_shakker_labs_union_pro-fp8_e4m3fn.safetensors",
       "size": "3.3GB"
     },
+
     {
       "name": "jasperai/FLUX.1-dev-Controlnet-Upscaler",
       "type": "controlnet",
@@ -3661,6 +3721,41 @@
       "size": "1.19GB"
     },
 
+
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Blur",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Blur Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_blur.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_blur.safetensors",
+      "size": "8.65GB"
+    },
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Canny",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Canny Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_canny.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_canny.safetensors",
+      "size": "8.65GB"
+    },
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Depth",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Depth Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_depth.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_depth.safetensors",
+      "size": "8.65GB"
+    },
+
     {
       "name": "Kijai/ToonCrafter model checkpoint (interpolation fp16)",
       "type": "checkpoint",
@@ -3929,6 +4024,18 @@
       "url": "https://huggingface.co/Kijai/flux-fp8/resolve/main/flux1-schnell-fp8.safetensors",
       "size": "11.9GB"
     },
+
+    {
+      "name": "FLUX.1 [Dev] Diffusion model (scaled fp8)",
+      "type": "diffusion_model",
+      "base": "FLUX.1",
+      "save_path": "diffusion_models/FLUX1",
+      "description": "FLUX.1 [Dev] Diffusion model (scaled fp8)[w/Due to the large size of the model, it is recommended to download it through a browser if possible.]",
+      "reference": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test",
+      "filename": "flux_dev_fp8_scaled_diffusion_model.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test/resolve/main/flux_dev_fp8_scaled_diffusion_model.safetensors",
+      "size": "11.9GB"
+    },
     {
       "name": "kijai/FLUX.1 [dev] Diffusion model (float8_e4m3fn)",
       "type": "diffusion_model",
@@ -4387,6 +4494,64 @@
       "filename": "chatglm3-fp16.safetensors",
       "url": "https://huggingface.co/Kijai/ChatGLM3-safetensors/resolve/main/chatglm3-fp16.safetensors",
       "size": "12.52GB"
+    },
+
+    {
+      "name": "pulid_flux_v0.9.1.safetensors",
+      "type": "PuLID",
+      "base": "FLUX",
+      "save_path": "pulid",
+      "description": "This is required for PuLID (FLUX)",
+      "reference": "https://huggingface.co/guozinan/PuLID",
+      "filename": "pulid_flux_v0.9.1.safetensors",
+      "url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_flux_v0.9.1.safetensors",
+      "size": "1.14GB"
+    },
+    {
+      "name": "pulid_v1.1.safetensors",
+      "type": "PuLID",
+      "base": "SDXL",
+      "save_path": "pulid",
+      "description": "This is required for PuLID (SDXL)",
+      "reference": "https://huggingface.co/guozinan/PuLID",
+      "filename": "pulid_v1.1.safetensors",
+      "url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_v1.1.safetensors",
+      "size": "984MB"
+    },
+
+    {
+      "name": "kijai/MoGe_ViT_L_fp16.safetensors",
+      "type": "MoGe",
+      "base": "MoGe",
+      "save_path": "MoGe",
+      "description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
+      "reference": "https://huggingface.co/Kijai/MoGe_safetensors",
+      "filename": "MoGe_ViT_L_fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
+      "size": "628MB"
+    },
+    {
+      "name": "kijai/MoGe_ViT_L_fp16.safetensors",
+      "type": "MoGe",
+      "base": "MoGe",
+      "save_path": "MoGe",
+      "description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
+      "reference": "https://huggingface.co/Kijai/MoGe_safetensors",
+      "filename": "MoGe_ViT_L_fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
+      "size": "1.26GB"
+    },
+    
+    {
+      "name": "LTX-Video 2B v0.9 Checkpoint",
+      "type": "checkpoint",
+      "base": "LTX-Video",
+      "save_path": "checkpoints/LTXV",
+      "description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
+      "reference": "https://huggingface.co/Lightricks/LTX-Video",
+      "filename": "ltx-video-2b-v0.9.safetensors",
+      "url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.safetensors",
+      "size": "9.37GB"
     }
   ]
 }

node_db/dev/custom-node-list.json

@@ -11,25 +11,552 @@
 
 
 
+
+
+
         {
-            "author": "logtd",
+            "author": "anze",
-            "title": "ComfyUI-Fluxtapoz [WIP]",
+            "title": "ComfyUI-OIDN [WIP]",
-            "reference": "https://github.com/logtd/ComfyUI-Fluxtapoz",
+            "reference": "https://github.com/Anze-/ComfyUI-OIDN",
             "files": [
-                "https://github.com/logtd/ComfyUI-Fluxtapoz"
+                "https://github.com/Anze-/ComfyUI-OIDN"
             ],
             "install_type": "git-clone",
-            "description": "A set of nodes for editing images using Flux in ComfyUI"
+            "description": "ComyUI wrapper for Intel OIDN image denoising\nWARNING! : this is a development repo, usage in production environments is not advised! Bugs are to be expected."
         },
         {
-            "author": "huangyangke",
+            "author": "techzuhaib",
-            "title": "ComfyUI-Kolors-IpadapterFaceId [WIP]",
+            "title": "ComfyUI-CacheImageNode",
-            "reference": "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId",
+            "reference": "https://github.com/techzuhaib/ComfyUI-CacheImageNode",
             "files": [
-                "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId"
+                "https://github.com/techzuhaib/ComfyUI-CacheImageNode"
             ],
             "install_type": "git-clone",
-            "description": "NODES:kolors_ipadapter_faceid\nNOTE: The files in the repo are not organized."
+            "description": "NODES: CacheImageNode"
+        },
+        {
+            "author": "hay86",
+            "title": "ComfyUI AceNodes [UNSAFE]",
+            "reference": "https://github.com/hay86/ComfyUI_AceNodes",
+            "files": [
+                "https://github.com/hay86/ComfyUI_AceNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Some useful custom nodes that are not included in ComfyUI core yet.\nNOTE: Vulnerability discovered. Not being managed."
+        },
+        {
+            "author": "dowands",
+            "title": "AddMaskForICLora",
+            "reference": "https://github.com/dowands/ComfyUI-AddMaskForICLora",
+            "files": [
+                "https://github.com/dowands/ComfyUI-AddMaskForICLora"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Add Mask For IC Lora x"
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-Sana [WIP]",
+            "reference": "https://github.com/zmwv823/ComfyUI-Sana",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-Sana"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial custom-node for [a/SANA: Efficient High-Resolution Image Synthesis with Linear Diffusion Transformer](https://github.com/NVlabs/Sana)\n[w/A init node with lots of bugs, do not try unless interested.]"
+        },
+        {
+            "author": "exectails",
+            "title": "Scripting",
+            "id": "et_scripting [UNSAFE]",
+            "reference": "https://github.com/exectails/comfyui-et_scripting",
+            "files": [
+                "https://github.com/exectails/comfyui-et_scripting"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes that can be used to write Python scripts directly on a node. Useful for quick prototyping and testing, at the cost of security.[w/This extension allows the execution of arbitrary Python code from a workflow.]"
+        },
+        {
+            "author": "AIFSH",
+            "title": "UltralightDigitalHuman-ComfyUI",
+            "reference": "https://github.com/AIFSH/UltralightDigitalHuman-ComfyUI",
+            "files": [
+                "https://github.com/AIFSH/UltralightDigitalHuman-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "a custom node for [a/Ultralight-Digital-Human](https://github.com/anliyuan/Ultralight-Digital-Human)\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "vahidzxc",
+            "title": "ComfyUI-My-Handy-Nodes",
+            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
+            "files": [
+                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:VahCropImage"
+        },
+        {
+            "author": "StartHua",
+            "title": "Comfyui_Flux_Style_Ctr [WIP]",
+            "reference": "https://github.com/StartHua/Comfyui_Flux_Style_Ctr",
+            "files": [
+                "https://github.com/StartHua/Comfyui_Flux_Style_Ctr"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:CXH_StyleModelApply\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "miragecoa",
+            "title": "ComfyUI-LLM-Evaluation [WIP]",
+            "reference": "https://github.com/miragecoa/ComfyUI-LLM-Evaluation",
+            "files": [
+                "https://github.com/miragecoa/ComfyUI-LLM-Evaluation"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Load File, Select Item by Index, Select Item by Key, JSONToListNode, MathOperationNode, F1ScoreNode, AccuracyNode, ..."
+        },
+        {
+            "author": "WASasquatch",
+            "title": "ASTERR [UNSAFE]",
+            "id": "asterr",
+            "reference": "https://github.com/WASasquatch/ASTERR",
+            "files": [
+                "https://github.com/WASasquatch/ASTERR"
+            ],
+            "install_type": "git-clone",
+            "description": "Abstract Syntax Trees Evaluated Restricted Run (ASTERR) is a Python Script executor for ComfyUI. [w/Warning:ASTERR runs Python Code from a Web Interface! It is highly recommended to run this in a closed-off environment, as it could have potential security risks.]"
+        },
+        {
+            "author": "BenjaMITM",
+            "title": "ComfyUI_On_The_Fly_Wildcards [WIP]",
+            "reference": "https://github.com/BenjaMITM/ComfyUI_On_The_Fly_Wildcards",
+            "files": [
+                "https://github.com/BenjaMITM/ComfyUI_On_The_Fly_Wildcards"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Wildcard Creator, Wildcard Loader, Wildcard Selector, Display String.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "celll1",
+            "title": "cel_sampler [WIP]",
+            "reference": "https://github.com/celll1/cel_sampler",
+            "files": [
+                "https://github.com/celll1/cel_sampler"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Latent Value Tracker\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "DataCTE",
+            "title": "ComfyUI-DataVoid-nodes [WIP]",
+            "reference": "https://github.com/DataCTE/ComfyUI-DataVoid-nodes",
+            "files": [
+                "https://github.com/DataCTE/ComfyUI-DataVoid-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI focused on model merging and style adaptation.[w/It may cause a lot of node conflicts with comfyui_ipadapter_plus.]"
+        },
+        {
+            "author": "minhtuannhn",
+            "title": "comfyui-gemini-studio [WIP]",
+            "reference": "https://github.com/minhtuannhn/comfyui-gemini-studio",
+            "files": [
+                "https://github.com/minhtuannhn/comfyui-gemini-studio"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui-gemini-studio[w/This extension uses the legacy method of copying JS.]"
+        },
+        {
+            "author": "artem-konevskikh",
+            "title": "ComfyUI Video Processing Nodes [WIP]",
+            "reference": "https://github.com/artem-konevskikh/comfyui-split-merge-video",
+            "files": [
+                "https://github.com/artem-konevskikh/comfyui-split-merge-video"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI that add video splitting and merging capabilities with crossfade transitions."
+        },
+        {
+            "author": "Poseidon-fan",
+            "title": "ComfyUI-fileCleaner [UNSAFE]",
+            "reference": "https://github.com/Poseidon-fan/ComfyUI-fileCleaner",
+            "files": [
+                "https://github.com/Poseidon-fan/ComfyUI-fileCleaner"
+            ],
+            "install_type": "git-clone",
+            "description": "In production environments, images are usually saved on storage servers such as S3, rather than local folders. So the method of placing images in local folders using ComfyUI's native LoadImage and SaveImage nodes cannot be used as a deployment service method, but can only be used as a temporary storage place for images. This requires a way to delete images from the input and output folders.\nThis node is used to delete images from the input and output folders. It is recommended to use this node through api call in the backend after the image processing is completed.[w/Users can use the file deletion feature through the workflow.]"
+        },
+        {
+            "author": "kostenickj",
+            "title": "comfyui-jk-easy-nodes",
+            "reference": "https://github.com/kostenickj/comfyui-jk-easy-nodes",
+            "files": [
+                "https://github.com/kostenickj/comfyui-jk-easy-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:JK Easy Prompt, JK Easy HiRes Fix"
+        },
+        {
+            "author": "yorkane",
+            "title": "Comfy UI Robe Nodes [UNSAFE]",
+            "reference": "https://github.com/RobeSantoro/ComfyUI-RobeNodes",
+            "files": [
+                "https://github.com/RobeSantoro/ComfyUI-RobeNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: List Video Path Node, List Image Path Node\nThis is a collection of utility nodes for the ComfyUI stable diffusion client that provides enhanced file path handling capabilities.[w/Users will be able to access images from arbitrary paths through the workflow.]"
+        },
+        {
+            "author": "Kimara.ai",
+            "title": "Advanced Watermarking Tools [WIP]",
+            "reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks",
+            "files": [
+                "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks"
+            ],
+            "install_type": "git-clone",
+            "description": "The KimaraAIWatermarker custom node allows you to apply watermark text and logo overlays to images (or a batch of images). It provides features like customizable watermark movement, rotation, and opacity. You can also apply both text and logo watermarks simultaneously, with fine-tuned control over positioning and scaling."
+        },
+        {
+            "author": "Clybius",
+            "title": "ComfyUI-FluxDeCLIP",
+            "reference": "https://github.com/Clybius/ComfyUI-FluxDeCLIP",
+            "files": [
+                "https://github.com/Clybius/ComfyUI-FluxDeCLIP"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:FluxDeCLIPCheckpointLoader"
+        },
+        {
+            "author": "ZHO-ZHO-ZHO",
+            "title": "ComfyUI-BiRefNet-ZHO [BROKEN]",
+            "id": "birefnet",
+            "reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-BiRefNet-ZHO",
+            "files": [
+                "https://github.com/ZHO-ZHO-ZHO/ComfyUI-BiRefNet-ZHO"
+            ],
+            "install_type": "git-clone",
+            "description": "Better version for [a/BiRefNet](https://github.com/zhengpeng7/birefnet) in ComfyUI | Both img and video.\nNOTE: You need to do [a/manual patch](https://github.com/ZHO-ZHO-ZHO/ComfyUI-BiRefNet-ZHO/issues/20)"
+        },
+        {
+            "author": "trashgraphicard",
+            "title": "Albedo-Sampler-for-ComfyUI",
+            "reference": "https://github.com/trashgraphicard/Albedo-Sampler-for-ComfyUI",
+            "files": [
+                "https://github.com/trashgraphicard/Albedo-Sampler-for-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Sample Image, Make Seamless Tile"
+        },
+        {
+            "author": "Anze-",
+            "title": "ComfyUI_deepDeband [WIP]",
+            "reference": "https://github.com/Anze-/ComfyUI_deepDeband",
+            "files": [
+                "https://github.com/Anze-/ComfyUI_deepDeband"
+            ],
+            "install_type": "git-clone",
+            "description": "ComyUI wrapper for RaymondLZhou/deepDeband image and video debanding\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "bmad4ever",
+            "title": "Bmad Nodes [UNSAFE]",
+            "id": "bmad",
+            "reference": "https://github.com/bmad4ever/comfyui_bmad_nodes",
+            "files": [
+                "https://github.com/bmad4ever/comfyui_bmad_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node offers the following functionalities: API support for setting up API requests, computer vision primarily for masking or collages, and general utility to streamline workflow setup or implement essential missing features.\nNOTE: Vulnerability discovered. Not being managed."
+        },
+        {
+            "author": "suncat2ps",
+            "title": "ComfyUI-SaveImgNextcloud",
+            "reference": "https://github.com/suncat2ps/ComfyUI-SaveImgNextcloud",
+            "files": [
+               "https://github.com/suncat2ps/ComfyUI-SaveImgNextcloud"
+            ],
+            "description": "NODES:Save Image to Nextcloud",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "KoreTeknology",
+            "title": "ComfyUI Production Nodes Pack [WIP]",
+            "reference": "https://github.com/KoreTeknology/ComfyUI-Nai-Production-Nodes-Pack",
+            "files": [
+               "https://github.com/KoreTeknology/ComfyUI-Nai-Production-Nodes-Pack"
+            ],
+            "description": "This is set of custom nodes for your ComfyUI1 production setup. It offers the very basic nodes that are missing in the official 'Vanilla' package. It is a research Node based project on Artificial Intelligence using ComfyUI visual editor. This repository also includes a set of workflows to test the nodes.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "DoctorDiffusion",
+            "title": "ComfyUI-Flashback",
+            "reference": "https://github.com/DoctorDiffusion/ComfyUI-Flashback",
+            "files": [
+               "https://github.com/DoctorDiffusion/ComfyUI-Flashback"
+            ],
+            "description": "NODES:Latent Export, Latent Import, Latent Loop",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "sswink",
+            "title": "comfyui-lingshang",
+            "reference": "https://github.com/sswink/comfyui-lingshang",
+            "files": [
+               "https://github.com/sswink/comfyui-lingshang"
+            ],
+            "description": "NODES:LS_SaveImageToOss, LS_LoadMaskFromUrl, LS_DigImageByMask, LS_ALY_Seg_Utils, LS_ALY_UploadToOssAndGetUrl, LS_GrowMaskWithBlur, LS_ALY_Seg_Body_Utils, LS_ALY_Seg_Common_Utils, LS_ALY_Seg_Clothes_Utils, LS_ALY_Seg_Body_Utils_Return_crop, ...",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "AICodeFactory",
+            "title": "ComfyUI-Viva",
+            "reference": "https://github.com/AICodeFactory/ComfyUI-Viva",
+            "files": [
+               "https://github.com/AICodeFactory/ComfyUI-Viva"
+            ],
+            "description": "NODES:HttpTrigger (Viva), HttpTrigger (Image), HttpTrigger (Common)",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "LogicAI",
+            "title": "ComfyUI-MagicAI [UNSAFE]",
+            "reference": "https://github.com/lcolok/ComfyUI-MagicAI",
+            "files": [
+                "https://github.com/lcolok/ComfyUI-MagicAI"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
+        },
+        {
+            "author": "T8star1984",
+            "title": "comfyui-purgevram",
+            "reference": "https://github.com/T8star1984/comfyui-purgevram",
+            "files": [
+                "https://github.com/T8star1984/comfyui-purgevram"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
+        },
+        {
+            "author": "Laser-one",
+            "title": "ComfyUI-align-pose",
+            "reference": "https://github.com/Laser-one/ComfyUI-align-pose",
+            "files": [
+                "https://github.com/Laser-one/ComfyUI-align-pose"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:align pose"
+        },
+        {
+            "author": "chenbaiyujason",
+            "title": "ComfyUI_StepFun",
+            "reference": "https://github.com/chenbaiyujason/ComfyUI_StepFun",
+            "files": [
+                "https://github.com/chenbaiyujason/ComfyUI_StepFun"
+            ],
+            "install_type": "git-clone",
+            "description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
+        },
+        {
+            "author": "attashe",
+            "title": "ComfyUI-FluxRegionAttention [WIP]",
+            "reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
+            "files": [
+                "https://github.com/attashe/ComfyUI-FluxRegionAttention"
+            ],
+            "install_type": "git-clone",
+            "description": "Implement Region Attention for Flux model"
+        },
+        {
+            "author": "aria1th",
+            "title": "ComfyUI-SkipCFGSigmas",
+            "reference": "https://github.com/aria1th/ComfyUI-SkipCFGSigmas",
+            "files": [
+                "https://github.com/aria1th/ComfyUI-SkipCFGSigmas"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:CFGControl_SKIPCFG"
+        },
+        {
+            "author": "PnthrLeo",
+            "title": "comfyUI-image-search",
+            "reference": "https://github.com/PnthrLeo/comfyUI-image-search",
+            "files": [
+                "https://github.com/PnthrLeo/comfyUI-image-search"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:CloseImagesSearcher"
+        },
+        {
+            "author": "Clelstyn",
+            "title": "ComfyUI-Inpaint_with_Detailer",
+            "reference": "https://github.com/Clelstyn/ComfyUI-Inpaint_with_Detailer",
+            "files": [
+                "https://github.com/Clelstyn/ComfyUI-Inpaint_with_Detailer"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Masked Resize Image, Paste Masked Image, Filter And Blur Mask"
+        },
+        {
+            "author": "Looking-Glass",
+            "title": "LKG-ComfyUI",
+            "reference": "https://github.com/Looking-Glass/LKG-ComfyUI",
+            "files": [
+                "https://github.com/Looking-Glass/LKG-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Side by Side Node, Bridge Preview Node, Load Folder, Scale Maintain Aspect Ratio Node, "
+        },
+        {
+            "author": "xiaoyumu",
+            "title": "ComfyUI-XYNodes",
+            "reference": "https://github.com/xiaoyumu/ComfyUI-XYNodes",
+            "files": [
+                "https://github.com/xiaoyumu/ComfyUI-XYNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:PrimitiveBBOX."
+        },
+        {
+            "author": "ainanoha",
+            "title": "etm_comfyui_nodes",
+            "reference": "https://github.com/ainanoha/etm_comfyui_nodes",
+            "files": [
+                "https://github.com/ainanoha/etm_comfyui_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:LETM Save Image, ETM Load Image From Local"
+        },
+        {
+            "author": "oshtz",
+            "title": "ComfyUI-oshtz-nodes [WIP]",
+            "reference": "https://github.com/oshtz/ComfyUI-oshtz-nodes",
+            "files": [
+                "https://github.com/oshtz/ComfyUI-oshtz-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node"
+        },
+        {
+            "author": "DoctorDiffusion",
+            "title": "DoctorDiffusion [WIP]",
+            "reference": "https://github.com/DoctorDiffusion/Doctor-Tools",
+            "files": [
+                "https://github.com/DoctorDiffusion/Doctor-Tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Final Frame Selector, Video Merge.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "m-ai-studio",
+            "title": "mai-prompt-progress",
+            "reference": "https://github.com/m-ai-studio/mai-prompt-progress",
+            "files": [
+                "https://github.com/m-ai-studio/mai-prompt-progress"
+            ],
+            "install_type": "git-clone",
+            "description": "mai-prompt-progress"
+        },
+        {
+            "author": "neeltheninja",
+            "title": "ComfyUI-TempFileDeleter [UNSAFE]",
+            "reference": "https://github.com/neeltheninja/ComfyUI-TempFileDeleter",
+            "files": [
+                "https://github.com/neeltheninja/ComfyUI-TempFileDeleter"
+            ],
+            "install_type": "git-clone",
+            "description": "This node is designed to streamline your workflow in ComfyUI by efficiently cleaning up temporary files on each run. This node takes no input. You can specify 'on' or 'off' in the node itself, or just bypass to not use use it.[w/This node can delete any files in the folder mentioned in 'folder_path' in the node. Be aware of this and change the folder path correctly before running any workflow with this node. I will NOT be responsible for wrongly deleted files because you didn't read this beforehand.]"
+        },
+        {
+            "author": "kylegrover",
+            "title": "comfyui-python-cowboy [UNSAFE]",
+            "reference": "https://github.com/kylegrover/comfyui-python-cowboy",
+            "files": [
+                "https://github.com/kylegrover/comfyui-python-cowboy"
+            ],
+            "install_type": "git-clone",
+            "description": "run python code in comfyui\nuses codemirror for nice syntax highlighting\nNOTE: based on ComfyUI-nidefawl[w/This node is an unsafe node that includes the capability to execute arbitrary python script.]"
+        },
+        {
+            "author": "kijai",
+            "title": "ComfyUI-MochiWrapper [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-MochiWrapper",
+            "files": [
+                "https://github.com/kijai/ComfyUI-MochiWrapper"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI wrapper nodes for [a/Mochi](https://github.com/genmoai/models) video generator"
+        },
+        {
+            "author": "kk8bit",
+            "title": "KayTool",
+            "reference": "https://github.com/kk8bit/KayTool",
+            "files": [
+                "https://github.com/kk8bit/KayTool"
+            ],
+            "install_type": "git-clone",
+            "description": "KayTool is a custom node utility package developed for ComfyUI. I plan to add more features in the future."
+        },
+        {
+            "author": "leadbreak",
+            "title": "Face Aging [WIP]",
+            "reference": "https://github.com/leadbreak/comfyui-faceaging",
+            "files": [
+                "https://github.com/leadbreak/comfyui-faceaging"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a comfyui custom node version of [a/Age Transformation](https://github.com/yuval-alaluf/SAM).\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "downlifted",
+            "title": "ComfyUI_BWiZ_Nodes [WIP]",
+            "reference": "https://github.com/downlifted/ComfyUI_BWiZ_Nodes",
+            "files": [
+                "https://github.com/downlifted/ComfyUI_BWiZ_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:CaptainWebhook, CaptainWebhook-Email, CaptainWebhook-Push, BWIZ_AdvancedLoadImageBatch, BWIZ_ErrorDetector, BWIZ_HFRepoBatchLoader, BWIZ_NotificationSound.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "Poukpalaova",
+            "title": "ComfyUI-FRED-Nodes [WIP]",
+            "reference": "https://github.com/Poukpalaova/ComfyUI-FRED-Nodes",
+            "files": [
+                "https://github.com/Poukpalaova/ComfyUI-FRED-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository contains custom nodes for ComfyUI. This is a work in progress (WIP).\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "blurymind",
+            "title": "cozy-fireplace [WIP]",
+            "reference": "https://github.com/blurymind/cozy-fireplace",
+            "files": [
+                "https://github.com/blurymind/cozy-fireplace"
+            ],
+            "install_type": "git-clone",
+            "description": "Cozy fireplace is a ComfyUI workflow prompter that brings a localhost server frontend for existing workflows created in ComfyUi. Just place your favorite or lovingly crafted workflows in a folder and cozy fireplace will let you select and run any of them (export them as API type in comfyui) It's a cozy UI that scales all the way down to mobile phone devices - to let you prompt your beefy pc at home with your smartphone."
+        },
+        {
+            "author": "lordwedggie",
+            "title": "xcpNodes [WIP]",
+            "reference": "https://github.com/lordwedggie/xcpNodes",
+            "files": [
+                "https://github.com/lordwedggie/xcpNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Slider nodes based on Smirnov75's codes [a/https://github.com/Smirnov75/ComfyUI-mxToolkit](https://github.com/Smirnov75/ComfyUI-mxToolkit)\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "kxh",
+            "title": "ComfyUI-ImageUpscaleWithModelMultipleTimes",
+            "reference": "https://github.com/kxh/ComfyUI-ImageUpscaleWithModelMultipleTimes",
+            "files": [
+                "https://github.com/kxh/ComfyUI-ImageUpscaleWithModelMultipleTimes"
+            ],
+            "install_type": "git-clone",
+            "description": "Upscale image with model multiple times !"
         },
         {
             "author": "rouxianmantou",
@@ -41,16 +568,6 @@
             "install_type": "git-clone",
             "description": "NODES:Check Value Type"
         },
-        {
-            "author": "Firetheft",
-            "title": "ComfyUI-Flux-Prompt-Tools",
-            "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-node, flux-prompt-generator, flux-prompt-gemini-flash-node"
-        },
         {
             "author": "SirVeggie",
             "title": "SirVeggie/Custom nodes for ComfyUI",
@@ -71,16 +588,6 @@
             "install_type": "git-clone",
             "description": "NODES:Random Video Mixer, Spotify Canvas Generator, Video Writer\ncustom comfyui nodes for audio/visual purposes# ComfyUI-Custom-Nodes"
         },
-        {
-            "author": "taches-ai",
-            "title": "ComfyUI Scene Composer [WIP]",
-            "reference": "https://github.com/taches-ai/comfyui-scene-composer",
-            "files": [
-                "https://github.com/taches-ai/comfyui-scene-composer"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of nodes to facilitate the creation of scenes in ComfyUI."
-        },
         {
             "author": "kxh",
             "title": "ComfyUI-sam2",
@@ -101,16 +608,6 @@
             "install_type": "git-clone",
             "description": "here put custom input nodes such as text,video...\nNOTE: The files in the repo are not organized."
         },
-        {
-            "author": "dafeng012",
-            "title": "comfyui-imgmake [WIP]",
-            "reference": "https://github.com/dafeng012/comfyui-imgmake",
-            "files": [
-                "https://github.com/dafeng012/comfyui-imgmake"
-            ],
-            "install_type": "git-clone",
-            "description": "This project is inspired by [a/https://github.com/s9roll7/ebsynth_utility](https://github.com/s9roll7/ebsynth_utility)\nNOTE: The files in the repo are not organized."
-        },
         {
             "author": "fablestudio",
             "title": "ComfyUI-Showrunner-Utils",
@@ -226,7 +723,7 @@
             "title": "VLLMVisionChatNode",
             "reference": "https://github.com/okg21/VLLMVisionChatNode",
             "files": [
-                "https://github.com/okg21/VLLMVisionChatNode/raw/refs/heads/main/VLLMVisionChatNode.py"
+                "https://raw.githubusercontent.com/okg21/VLLMVisionChatNode/refs/heads/main/VLLMVisionChatNode.py"
             ],
             "pip": ["openai", "numpy"],
             "install_type": "copy",
@@ -524,16 +1021,6 @@
             "install_type": "git-clone",
             "description": "NODES:image select, Load AnyLLM, Ask LLM, OpenAI DAlle Node, SK Text_String, SK Random File Name"
         },
-        {
-            "author": "Cardoso-topdev",
-            "title": "comfyui_meshanything_v1 [WIP]",
-            "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": "Lilien86",
             "title": "lauger NodePack for ComfyUI [WIP]",
@@ -999,17 +1486,6 @@
             ],
             "install_type": "git-clone",
             "description": "Nodes:LoadImgFromInputUrl"
-        },        
-        {
-            "author": "LevelPixel",
-            "title": "ComfyUI-LevelPixel",
-            "id": "levelpixel",
-            "reference": "https://github.com/LevelPixel/ComfyUI-LevelPixel",
-            "files": [
-                "https://github.com/LevelPixel/ComfyUI-LevelPixel"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Model Unloader, LLM Optional Memory Free Advanced"
         },
         {
             "author": "StartHua",
@@ -1154,8 +1630,8 @@
             "title": "ComfyUI-Waveform-Extensions",
             "reference": "https://github.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions",
             "files": [
-                "https://github.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions/raw/main/EXT_VariationUtils.py",
+                "https://raw.githubusercontent.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions/main/EXT_VariationUtils.py",
-                "https://github.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions/raw/main/EXT_AudioManipulation.py"
+                "https://raw.githubusercontent.com/NeuralNotW0rk/ComfyUI-Waveform-Extensions/main/EXT_AudioManipulation.py"
             ],
             "install_type": "copy",
             "description": "Some additional audio utilites for use on top of Sample Diffusion ComfyUI Extension"
@@ -1193,14 +1669,14 @@
         },
         {
             "author": "AllenEdgarPoe",
-            "title": "ComfyUI-Xorbis-nodes",
+            "title": "ComfyUI-Xorbis-nodes [WIP]",
             "id": "xorbis",
             "reference": "https://github.com/AllenEdgarPoe/ComfyUI-Xorbis-nodes",
             "files": [
                 "https://github.com/AllenEdgarPoe/ComfyUI-Xorbis-nodes"
             ],
             "install_type": "git-clone",
-            "description": "This repository is for MuseumX Update. We use ComfyUI as our framework, and the nodes are built for my comfort."
+            "description": "This repository is for MuseumX Update. We use ComfyUI as our framework, and the nodes are built for my comfort.\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "mikeymcfish",
@@ -1354,17 +1830,6 @@
             "install_type": "git-clone",
             "description": "Nodes:Add_text_by_mask.[w/This custom node cannot be installed simultaneously as it has the same repository name as MarkoCa1/ComfyUI-Text.]"
         },
-        {
-            "author": "yushan777",
-            "title": "Y7 Nodes for ComfyUI",
-            "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": "norgeous",
             "title": "UI Builder [WIP]",
@@ -1612,7 +2077,7 @@
                 "https://github.com/flyingdogsoftware/gyre_for_comfyui"
             ],
             "install_type": "git-clone",
-            "description": "Nodes:GyreLoopStart, GyreLoopEnd, GyreIfElse"
+            "description": "Nodes:BackgroundRemoval, GyreLoopStart, GyreLoopEnd, GyreIfElse"
         },
         {
             "author": "githubYiheng",
@@ -1652,8 +2117,8 @@
             "title": "comfyUI_padding-resize_node",
             "reference": "https://github.com/jp0215/comfyUI_padding-resize_node",
             "files": [
-                "https://github.com/jp0215/comfyUI_padding-resize_node/raw/main/PaddingNode.py",
+                "https://raw.githubusercontent.com/jp0215/comfyUI_padding-resize_node/main/PaddingNode.py",
-                "https://github.com/jp0215/comfyUI_padding-resize_node/raw/main/ResizeNode.py"
+                "https://raw.githubusercontent.com/jp0215/comfyUI_padding-resize_node/main/ResizeNode.py"
             ],
             "install_type": "copy",
             "description": "Padding image to 8x: input image and mask, if the side length is not an integer multiple of 8, expand the side length to the smallest multiple of 8 greater than the original side length. Output padding image and mask. Resize to the origin: input the generated image and the original image, crop the generated image to the size of the original image, output the cropped image."
@@ -2358,7 +2823,7 @@
             "title": "ComfyUI_Prompt_Template_CustomNodes",
             "reference": "https://github.com/komojini/ComfyUI_Prompt_Template_CustomNodes",
             "files": [
-                "https://github.com/komojini/ComfyUI_Prompt_Template_CustomNodes/raw/main/prompt_with_template.py"
+                "https://raw.githubusercontent.com/komojini/ComfyUI_Prompt_Template_CustomNodes/main/prompt_with_template.py"
             ],
             "install_type": "copy",
             "description": "Nodes:Prompt with Template"

node_db/forked/custom-node-list.json

@@ -1,8 +1,18 @@
 {
     "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-GVHMR",
+            "title": "ComfyUI-leo-Hamer",
             "reference": "https://github.com/leeooo001/ComfyUI-leo-Hamer",
             "files": [
                 "https://github.com/leeooo001/ComfyUI-leo-Hamer"
@@ -32,7 +42,7 @@
         },
         {
             "author": "jags111",
-            "title": "NyaamZ/ComfyUI-Long-CLIP",
+            "title": "NyaamZ/efficiency-nodes-ED",
             "reference": "https://github.com/NyaamZ/efficiency-nodes-ED",
             "files": [
                 "https://github.com/NyaamZ/efficiency-nodes-ED"

node_db/legacy/custom-node-list.json

@@ -9,8 +9,163 @@
             "description": "If you see this message, your ComfyUI-Manager is outdated.\nLegacy channel provides only the list of the deprecated nodes. If you want to find the complete node list, please go to the Default channel."
         },
         
-        
 
+        {
+            "author": "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]",
@@ -187,16 +342,6 @@
             "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": "m-ai-studio",
-            "title": "mai-prompt-progress [REMOVED]",
-            "reference": "https://github.com/m-ai-studio/mai-prompt-progress",
-            "files": [
-                "https://github.com/m-ai-studio/mai-prompt-progress"
-            ],
-            "install_type": "git-clone",
-            "description": "mai-prompt-progress"
-        },
         {
             "author": "ZHO-ZHO-ZHO",
             "title": "ComfyUI-AnyText [NOT MAINTAINED]",

node_db/new/model-list.json

@@ -1,5 +1,166 @@
 {
   "models": [
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Blur",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Blur Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_blur.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_blur.safetensors",
+      "size": "8.65GB"
+    },
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Canny",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Canny Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_canny.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_canny.safetensors",
+      "size": "8.65GB"
+    },
+    {
+      "name": "stabilityai/SD3.5-Large-Controlnet-Depth",
+      "type": "controlnet",
+      "base": "SD3.5",
+      "save_path": "controlnet/SD3.5",
+      "description": "Depth Controlnet model for SD3.5 Large",
+      "reference": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets",
+      "filename": "sd3.5_large_controlnet_depth.safetensors",
+      "url": "https://huggingface.co/stabilityai/stable-diffusion-3.5-controlnets/resolve/main/sd3.5_large_controlnet_depth.safetensors",
+      "size": "8.65GB"
+    },
+
+    {
+      "name": "LTX-Video 2B v0.9 Checkpoint",
+      "type": "checkpoint",
+      "base": "LTX-Video",
+      "save_path": "checkpoints/LTXV",
+      "description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
+      "reference": "https://huggingface.co/Lightricks/LTX-Video",
+      "filename": "ltx-video-2b-v0.9.safetensors",
+      "url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.safetensors",
+      "size": "9.37GB"
+    },
+    {
+      "name": "InstantX/FLUX.1-dev-IP-Adapter",
+      "type": "IP-Adapter",
+      "base": "FLUX.1",
+      "save_path": "ipadapter-flux",
+      "description": "FLUX.1-dev-IP-Adapter",
+      "reference": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter",
+      "filename": "ip-adapter.bin",
+      "url": "https://huggingface.co/InstantX/FLUX.1-dev-IP-Adapter/resolve/main/ip-adapter.bin",
+      "size": "5.29GB"
+    },
+    
+    {
+      "name": "Comfy-Org/sigclip_vision_384 (patch14_384)",
+      "type": "clip_vision",
+      "base": "sigclip",
+      "save_path": "clip_vision",
+      "description": "This clip vision model is required for FLUX.1 Redux.",
+      "reference": "https://huggingface.co/Comfy-Org/sigclip_vision_384/tree/main",
+      "filename": "sigclip_vision_patch14_384.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
+      "size": "857MB"
+    },
+
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp16)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp16)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp16.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp16.safetensors",
+      "size": "9.79GB"
+    },
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp8_e4m3fn)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp8_e4m3fn.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn.safetensors",
+      "size": "4.89GB"
+    },
+    {
+      "name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn_scaled)",
+      "type": "clip",
+      "base": "t5",
+      "save_path": "text_encoders/t5",
+      "description": "Text Encoders for FLUX (fp16)",
+      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
+      "filename": "t5xxl_fp8_e4m3fn_scaled.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors",
+      "size": "5.16GB"
+    },
+
+    {
+      "name": "FLUX.1 [Dev] Diffusion model (scaled fp8)",
+      "type": "diffusion_model",
+      "base": "FLUX.1",
+      "save_path": "diffusion_models/FLUX1",
+      "description": "FLUX.1 [Dev] Diffusion model (scaled fp8)[w/Due to the large size of the model, it is recommended to download it through a browser if possible.]",
+      "reference": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test",
+      "filename": "flux_dev_fp8_scaled_diffusion_model.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test/resolve/main/flux_dev_fp8_scaled_diffusion_model.safetensors",
+      "size": "11.9GB"
+    },
+    
+    {
+      "name": "kijai/MoGe_ViT_L_fp16.safetensors",
+      "type": "MoGe",
+      "base": "MoGe",
+      "save_path": "MoGe",
+      "description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
+      "reference": "https://huggingface.co/Kijai/MoGe_safetensors",
+      "filename": "MoGe_ViT_L_fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
+      "size": "628MB"
+    },
+    {
+      "name": "kijai/MoGe_ViT_L_fp16.safetensors",
+      "type": "MoGe",
+      "base": "MoGe",
+      "save_path": "MoGe",
+      "description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
+      "reference": "https://huggingface.co/Kijai/MoGe_safetensors",
+      "filename": "MoGe_ViT_L_fp16.safetensors",
+      "url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
+      "size": "1.26GB"
+    },
+
+    {
+      "name": "pulid_flux_v0.9.1.safetensors",
+      "type": "PuLID",
+      "base": "FLUX",
+      "save_path": "pulid",
+      "description": "This is required for PuLID (FLUX)",
+      "reference": "https://huggingface.co/guozinan/PuLID",
+      "filename": "pulid_flux_v0.9.1.safetensors",
+      "url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_flux_v0.9.1.safetensors",
+      "size": "1.14GB"
+    },
+    {
+      "name": "pulid_v1.1.safetensors",
+      "type": "PuLID",
+      "base": "SDXL",
+      "save_path": "pulid",
+      "description": "This is required for PuLID (SDXL)",
+      "reference": "https://huggingface.co/guozinan/PuLID",
+      "filename": "pulid_v1.1.safetensors",
+      "url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_v1.1.safetensors",
+      "size": "984MB"
+    },
+
     {
       "name": "Kolors-IP-Adapter-Plus.bin (Kwai-Kolors/Kolors-IP-Adapter-Plus)",
       "type": "IP-Adapter",
@@ -519,172 +680,6 @@
       "filename": "flux1-dev-Q5_0.gguf",
       "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_0.gguf",
       "size": "8.27GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q5_1.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_1/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q5_1.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_1.gguf",
-      "size": "9.01GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q5_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q5_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q5_K_S.gguf",
-      "size": "8.29GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q6_K.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q6_K/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q6_K.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q6_K.gguf",
-      "size": "9.86GB"
-    },
-    {
-      "name": "city96/flux1-dev-Q8_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q8_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-dev-gguf",
-      "filename": "flux1-dev-Q8_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-dev-gguf/resolve/main/flux1-dev-Q8_0.gguf",
-      "size": "12.7GB"
-    },
-
-    {
-      "name": "city96/flux1-schnell-F16.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (f16/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-F16.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-F16.gguf",
-      "size": "23.8GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q2_K.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q2_K/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q2_K.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q2_K.gguf",
-      "size": "4.01GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q3_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q3_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q3_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q3_K_S.gguf",
-      "size": "5.21GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q4_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q4_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q4_0.gguf",
-      "size": "6.77GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q4_1.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_1/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q4_1.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q4_1.gguf",
-      "size": "7.51GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q4_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q4_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q4_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q4_K_S.gguf",
-      "size": "6.78GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q5_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q5_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q5_0.gguf",
-      "size": "8.25GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q5_1.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_1/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q5_1.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q5_1.gguf",
-      "size": "8.99GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q5_K_S.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q5_K_S/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q5_K_S.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q5_K_S.gguf",
-      "size": "8.26GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q6_K.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q6_K/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q6_K.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q6_K.gguf",
-      "size": "9.83GB"
-    },
-    {
-      "name": "city96/flux1-schnell-Q8_0.gguf",
-      "type": "diffusion_model",
-      "base": "FLUX.1",
-      "save_path": "diffusion_models/FLUX1",
-      "description": "FLUX.1 [Dev] Diffusion model (Q8_0/.gguf)",
-      "reference": "https://huggingface.co/city96/FLUX.1-schnell-gguf",
-      "filename": "flux1-schnell-Q8_0.gguf",
-      "url": "https://huggingface.co/city96/FLUX.1-schnell-gguf/resolve/main/flux1-schnell-Q8_0.gguf",
-      "size": "12.7GB"
     }
   ]
 }

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,26 +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": "OuticNZ",
             "title": "ComfyUI-Simple-Of-Complex",
@@ -250,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.51.8"
+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
@@ -5,4 +6,4 @@ transformers
 huggingface-hub>0.20
 typer
 rich
-typing-extensions
+typing-extensions

scan.sh

@@ -1,6 +1,6 @@
 #!/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"

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