fix: customConfirm - invalid z-index

https://github.com/ltdrdata/ComfyUI-Manager/issues/1388

.github/workflows/publish.yml

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

.github/workflows/ruff.yml

@@ -0,0 +1,23 @@
+name: Python Linting
+
+on: [push, pull_request]
+
+jobs:
+  ruff:
+    name: Run Ruff
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Install Ruff
+      run: pip install ruff
+
+    - name: Run Ruff
+      run: ruff check .

.gitignore

@@ -12,4 +12,6 @@ matrix_auth
 channels.list
 comfyworkflows_sharekey
 github-stats-cache.json
-pip_overrides.json
+pip_overrides.json
+*.json
+check2.sh

README.md

@@ -168,7 +168,7 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
   ![menu](misc/share-setting.jpg)
   
-  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Ouput button on Context Menu.
+  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Output button on Context Menu.
     * `None`: hide from Main menu
     * `All`: Show a dialog where the user can select a title for sharing.
 
@@ -204,7 +204,6 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 * Please submit a pull request to update either the custom-node-list.json or model-list.json file.
 
 * The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
-  * Or you can provide manually `node_list.json` file.
 
 ```
 NODE_CLASS_MAPPINGS = {
@@ -218,6 +217,7 @@ NODE_CLASS_MAPPINGS.update({
     "SemSegPreprocessor": Uniformer_SemSegPreprocessor,
 })
 ```
+  * Or you can provide manually `node_list.json` file.
 
 * When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
   * Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
@@ -363,10 +363,10 @@ When you run the `scan.sh` script:
   * `high` level risky features
     * `Install via git url`, `pip install`
     * Installation of custom nodes registered not in the `default channel`.
-    * Display terminal log
+    * Fix custom nodes
   
   * `middle` level risky features
-    * Uninstall/Update/Fix custom nodes
+    * Uninstall/Update
     * Installation of custom nodes registered in the `default channel`.
     * Restore/Remove Snapshot
     * Restart
@@ -391,7 +391,6 @@ When you run the `scan.sh` script:
 * https://github.com/SimithWang/comfyui-renameImages
 * https://github.com/Tcheko243/ComfyUI-Photographer-Alpha7-Nodes
 * https://github.com/Limbicnation/ComfyUINodeToolbox
-* https://github.com/chenpipi0807/pip_longsize
 * https://github.com/APZmedia/ComfyUI-APZmedia-srtTools
 
 ## Roadmap

__init__.py

@@ -1,12 +1,15 @@
 import os
+import sys
 
 cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
 
 if not os.path.exists(cli_mode_flag):
-    from .glob import manager_server
+    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+    import manager_server  # noqa: F401
+    import share_3rdparty  # noqa: F401
     WEB_DIRECTORY = "js"
 else:
-    print(f"\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
+    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
 
 NODE_CLASS_MAPPINGS = {}
 __all__ = ['NODE_CLASS_MAPPINGS']

cm-cli.py

@@ -24,7 +24,7 @@ comfyui_manager_path = os.path.dirname(__file__)
 comfy_path = os.environ.get('COMFYUI_PATH')
 
 if comfy_path is None:
-    print(f"\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
+    print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
     comfy_path = os.path.abspath(os.path.join(comfyui_manager_path, '..', '..'))
 
 startup_script_path = os.path.join(comfyui_manager_path, "startup-scripts")
@@ -35,6 +35,7 @@ restore_snapshot_path = os.path.join(startup_script_path, "restore-snapshot.json
 pip_overrides_path = os.path.join(comfyui_manager_path, "pip_overrides.json")
 git_script_path = os.path.join(comfyui_manager_path, "git_helper.py")
 
+cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 cm_global.pip_overrides = {}
 if os.path.exists(pip_overrides_path):
@@ -47,7 +48,6 @@ def check_comfyui_hash():
     repo = git.Repo(comfy_path)
     core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
 
-    comfy_ui_hash = repo.head.commit.hexsha
     cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
 
     core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
@@ -108,7 +108,7 @@ class Ctx:
             install_script_path = os.path.join(repo_path, 'install.py')
 
             if os.path.exists(requirements_path):
-                with (open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file):
+                with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
                     for line in file:
                         package_name = core.remap_pip_package(line.strip())
                         if package_name and not core.is_installed(package_name):
@@ -140,7 +140,7 @@ class Ctx:
         total = len(node_paths)
         i = 1
         for x in node_paths:
-            print(f"----------------------------------------------------------------------------------------------------")
+            print("----------------------------------------------------------------------------------------------------")
             print(f"Restoring [{i}/{total}]: {x}")
             self.post_install(x)
             i += 1
@@ -753,13 +753,13 @@ def cli_only_mode(
         )):
     cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
     if mode.lower() == 'enable':
-        with open(cli_mode_flag, 'w') as file:
+        with open(cli_mode_flag, 'w'):
             pass
-        print(f"\nINFO: `cli-only-mode` is enabled\n")
+        print("\nINFO: `cli-only-mode` is enabled\n")
     elif mode.lower() == 'disable':
         if os.path.exists(cli_mode_flag):
             os.remove(cli_mode_flag)
-        print(f"\nINFO: `cli-only-mode` is disabled\n")
+        print("\nINFO: `cli-only-mode` is disabled\n")
     else:
         print(f"\n[bold red]Invalid value for cli-only-mode: {mode}[/bold red]\n")
         exit(1)
@@ -895,7 +895,7 @@ def restore_snapshot(
                 elif 'APPLY SNAPSHOT: False' in x:
                     is_failed = True
 
-        print(f"Restore snapshot.")
+        print("Restore snapshot.")
         cmd_str = [sys.executable, git_script_path, '--apply-snapshot', snapshot_path] + extras
         output = subprocess.check_output(cmd_str, cwd=custom_nodes_path, text=True)
         msg_lines = output.split('\n')
@@ -934,7 +934,7 @@ def restore_dependencies():
     total = len(node_paths)
     i = 1
     for x in node_paths:
-        print(f"----------------------------------------------------------------------------------------------------")
+        print("----------------------------------------------------------------------------------------------------")
         print(f"Restoring [{i}/{total}]: {x}")
         cm_ctx.post_install(x)
         i += 1
@@ -1027,4 +1027,4 @@ if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(app())
 
-print(f"")
+print("")

git_helper.py

@@ -41,7 +41,7 @@ nodelist_path = os.path.join(os.path.dirname(__file__), "custom-node-list.json")
 working_directory = os.getcwd()
 
 if os.path.basename(working_directory) != 'custom_nodes':
-    print(f"WARN: This script should be executed in custom_nodes dir")
+    print("WARN: This script should be executed in custom_nodes dir")
     print(f"DBG: INFO {working_directory}")
     print(f"DBG: INFO {sys.argv}")
     # exit(-1)

glob/manager_core.py

@@ -21,18 +21,52 @@ glob_path = os.path.join(os.path.dirname(__file__))  # ComfyUI-Manager/glob
 sys.path.append(glob_path)
 
 import cm_global
-from manager_util import *
+from manager_util import PIPFixer, StrictVersion
 
-version = [2, 48, 6]
+version = [2, 56, 2]
 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]
+
+
+def get_comfyui_tag():
+    repo = git.Repo(comfy_path)
+    try:
+        return repo.git.describe('--tags')
+    except:
+        return None
+
+
 comfy_path = os.environ.get('COMFYUI_PATH')
 if comfy_path is None:
-    comfy_path = os.path.abspath(os.path.join(custom_nodes_path, '..'))
+    try:
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+    except:
+        comfy_path = os.path.abspath(os.path.join(custom_nodes_path, '..'))
 
 channel_list_path = os.path.join(comfyui_manager_path, 'channels.list')
 config_path = os.path.join(comfyui_manager_path, "config.ini")
@@ -82,8 +116,8 @@ def get_installed_packages():
                         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.")
+        except subprocess.CalledProcessError:
+            print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
             return set()
 
     return pip_map
@@ -103,6 +137,9 @@ def is_blacklisted(name):
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
         pips = get_installed_packages()
 
@@ -123,12 +160,15 @@ def is_installed(name):
     if name.startswith('#'):
         return True
 
-    pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
+    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
     match = re.search(pattern, name)
 
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
         pips = get_installed_packages()
 
@@ -311,7 +351,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
                 if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
                     print("\n\n###################################################################")
                     print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
-                    print(f"[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
+                    print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
                     print("###################################################################\n\n")
             except:
                 pass
@@ -334,7 +374,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()
 
@@ -350,7 +390,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
             output, _ = process.communicate()
             output = output.decode('utf-8').strip()
         except Exception:
-            print(f'[ComfyUI-Manager] failed to fixing')
+            print('[ComfyUI-Manager] failed to fixing')
 
         if 'detected dubious' in output:
             print(f'\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n'
@@ -361,13 +401,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:
@@ -378,7 +418,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
@@ -388,7 +428,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()
 
 
@@ -402,8 +442,17 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
     else:
         if os.path.exists(requirements_path):
             print("Install: pip packages")
+            pip_fixer = PIPFixer(get_installed_packages())
             with open(requirements_path, "r") as requirements_file:
                 for line in requirements_file:
+                    #handle comments
+                    if '#' in line:
+                        if line.strip()[0] == '#':
+                            print("Line is comment...skipping")
+                            continue
+                        else:
+                            line = line.split('#')[0].strip()
+
                     package_name = remap_pip_package(line.strip())
 
                     if package_name and not package_name.startswith('#'):
@@ -416,8 +465,10 @@ 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")
+            print("Install: install script")
             install_cmd = [sys.executable, "install.py"]
             try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
@@ -545,11 +596,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:
@@ -603,7 +654,12 @@ async def get_data(uri, silent=False):
 
     if uri.startswith("http"):
         async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.get(uri) as resp:
+            headers = {
+                'Cache-Control': 'no-cache',
+                'Pragma': 'no-cache',
+                'Expires': '0'
+            }
+            async with session.get(uri, headers=headers) as resp:
                 json_text = await resp.text()
     else:
         with cache_lock:
@@ -612,7 +668,7 @@ async def get_data(uri, silent=False):
 
     json_obj = json.loads(json_text)
     if not silent:
-        print(f" [DONE]")
+        print(" [DONE]")
     return json_obj
 
 
@@ -673,6 +729,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:
@@ -684,13 +756,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'):
-                repo_path = repo_path+'.disabled'
+            if repo_path is not None:
+                repo_path = repo_path[1]
 
-            if not execute_install_script(url, repo_path, instant_execution=instant_execution):
-                return False
+                if not execute_install_script(url, repo_path, instant_execution=instant_execution):
+                    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)
@@ -737,12 +811,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 dir_path == '/' or dir_path[1:] == ":/" or dir_path == '':
-                print(f"Uninstall(git-clone) error: invalid path '{dir_path}' for '{url}'")
-                return False
+            if repo_path is None:
+                continue
+            
+            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")
@@ -758,10 +832,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)
-            elif os.path.exists(dir_path + ".disabled"):
-                rmtree(dir_path + ".disabled")
+            rmtree(dir_path)
         except Exception as e:
             print(f"Uninstall(git-clone) error: {url} / {e}", file=sys.stderr)
             return False
@@ -784,13 +855,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 dir_path == '/' or dir_path[1:] == ":/" or dir_path == '':
-                print(f"{action_name}(git-clone) error: invalid path '{dir_path}' for '{url}'")
-                return False
+            if repo_path is None:
+                continue
 
+            dir_path = repo_path[1]
+            
             if is_disable:
                 current_path = dir_path
                 new_path = dir_path + ".disabled"
@@ -826,11 +897,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'):
-                repo_path = repo_path+'.disabled'
+            if repo_path is None:
+                continue
 
+            repo_path = repo_path[1]
+            
             git_pull(repo_path)
 
             if not skip_script:
@@ -874,7 +947,7 @@ def update_path(repo_path, instant_execution=False):
         remote.fetch()
     except Exception as e:
         if 'detected dubious' in str(e):
-            print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
+            print("[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
             safedir_path = comfy_path.replace('\\', '/')
             subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
             try:
@@ -900,10 +973,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)
-            if os.path.exists(dir_path):
+            repo_path = lookup_installed_custom_nodes(dir_name)
+
+            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
 
@@ -912,13 +989,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)
-    if os.path.exists(dir_path):
-        return 'installed'
-    elif os.path.exists(dir_path+'.disabled'):
-        return 'disabled'
+    repo_path = lookup_installed_custom_nodes(dir_name)
 
-    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):
@@ -931,8 +1010,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)
-        if os.path.exists(dir_path):
+        repo_path = lookup_installed_custom_nodes(dir_name)
+
+        if repo_path is None:
+            item['installed'] = 'False'
+        elif repo_path[0]:
+            dir_path = repo_path[1]
             try:
                 item['installed'] = 'True'  # default
 
@@ -951,17 +1034,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:
@@ -973,8 +1062,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'
 
@@ -1002,7 +1089,7 @@ def get_current_snapshot():
     repo_path = comfy_path
 
     if not os.path.exists(os.path.join(repo_path, '.git')):
-        print(f"ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
+        print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
         return {}
 
     repo = git.Repo(repo_path)
@@ -1011,39 +1098,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):
-        fullpath = os.path.join(custom_nodes_path, path)
+    for base_path in base_paths:
+        for path in os.listdir(base_path):
+            fullpath = os.path.join(base_path, path)
 
-        if os.path.isdir(fullpath):
-            is_disabled = path.endswith(".disabled")
+            if os.path.isdir(fullpath):
+                is_disabled = path.endswith(".disabled")
 
-            try:
-                git_dir = os.path.join(fullpath, '.git')
+                try:
+                    git_dir = os.path.join(fullpath, '.git')
 
-                if not os.path.exists(git_dir):
-                    continue
+                    if not os.path.exists(git_dir):
+                        continue
 
-                repo = git.Repo(fullpath)
-                commit_hash = repo.head.commit.hexsha
-                url = repo.remotes.origin.url
-                git_custom_nodes[url] = {
-                    'hash': commit_hash,
+                    repo = git.Repo(fullpath)
+                    commit_hash = repo.head.commit.hexsha
+                    url = repo.remotes.origin.url
+                    git_custom_nodes[url] = {
+                        '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:
-                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)
+                file_custom_nodes.append(item)
 
     pip_packages = get_installed_pip_packages()
 
@@ -1121,7 +1215,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
             if node_name in ['Reroute', 'Note']:
                 continue
 
-            if node_name is not None and not node_name.startswith('workflow/'):
+            if node_name is not None and not (node_name.startswith('workflow/') or node_name.startswith('workflow>')):
                 used_nodes.add(node_name)
 
     if 'nodes' in workflow:

glob/manager_downloader.py

@@ -15,6 +15,8 @@ if aria2 is not None:
 
 
 def download_url(model_url: str, model_dir: str, filename: str):
+    if HF_ENDPOINT:
+        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
     if aria2:
         return aria2_download_url(model_url, model_dir, filename)
     else:
@@ -44,9 +46,6 @@ def aria2_download_url(model_url: str, model_dir: str, filename: str):
     if model_dir.startswith(core.comfy_path):
         model_dir = model_dir[len(core.comfy_path) :]
 
-    if HF_ENDPOINT:
-        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
-
     download_dir = model_dir if model_dir.startswith('/') else os.path.join('/models', model_dir)
 
     download = aria2_find_task(download_dir, filename)

glob/manager_server.py

@@ -1,4 +1,3 @@
-import mimetypes
 import traceback
 
 import folder_paths
@@ -6,13 +5,13 @@ import locale
 import subprocess  # don't remove this
 import concurrent
 import nodes
-import hashlib
 import os
 import sys
 import threading
 import re
 import shutil
 import git
+from datetime import datetime
 
 from server import PromptServer
 import manager_core as core
@@ -22,6 +21,9 @@ print(f"### Loading: ComfyUI-Manager ({core.version_str})")
 
 comfy_ui_hash = "-"
 
+SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
 
 def handle_stream(stream, prefix):
     stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
@@ -46,7 +48,9 @@ is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.
 
 
 def is_allowed_security_level(level):
-    if level == 'high':
+    if level == 'block':
+        return False
+    elif level == 'high':
         if is_local_mode:
             return core.get_config()['security_level'].lower() in ['weak', 'normal-']
         else:
@@ -57,9 +61,9 @@ def is_allowed_security_level(level):
         return True
 
 
-async def get_risky_level(files):
+async def get_risky_level(files, pip_packages):
     json_data1 = await core.get_data_by_mode('local', 'custom-node-list.json')
-    json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://github.com/ltdrdata/ComfyUI-Manager/raw/main')
+    json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main')
 
     all_urls = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
@@ -69,6 +73,15 @@ async def get_risky_level(files):
         if x not in all_urls:
             return "high"
 
+    all_pip_packages = set()
+    for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
+        if "pip" in x:
+            all_pip_packages.update(x['pip'])
+
+    for p in pip_packages:
+        if p not in all_pip_packages:
+            return "block"
+
     return "middle"
 
 
@@ -169,7 +182,7 @@ def print_comfyui_version():
 
         try:
             if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
-                print(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
+                print(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.get_comfyui_tag()})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
         except:
             pass
 
@@ -184,11 +197,15 @@ def print_comfyui_version():
 
             del cm_global.variables['cm.on_revision_detected_handler']
         else:
-            print(f"[ComfyUI-Manager] Some features are restricted due to your ComfyUI being outdated.")
+            print("[ComfyUI-Manager] Some features are restricted due to your ComfyUI being outdated.")
         # <--
 
         if current_branch == "master":
-            print(f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'")
+            version_tag = core.get_comfyui_tag()
+            if version_tag is None:
+                print(f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'")
+            else:
+                print(f"### ComfyUI Version: {core.get_comfyui_tag()} | Released on '{core.comfy_ui_commit_datetime.date()}'")
         else:
             print(f"### ComfyUI Revision: {core.comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'")
     except:
@@ -208,7 +225,7 @@ async def populate_github_stats(json_obj, json_obj_github):
             if url in json_obj_github:
                 json_obj['custom_nodes'][i]['stars'] = json_obj_github[url]['stars']
                 json_obj['custom_nodes'][i]['last_update'] = json_obj_github[url]['last_update']
-                json_obj['custom_nodes'][i]['trust'] = json_obj_github[url]['author_account_age_days'] > 180
+                json_obj['custom_nodes'][i]['trust'] = json_obj_github[url]['author_account_age_days'] > 600
             else:
                 json_obj['custom_nodes'][i]['stars'] = -1
                 json_obj['custom_nodes'][i]['last_update'] = -1
@@ -227,7 +244,6 @@ setup_environment()
 
 # Expand Server api
 
-import server
 from aiohttp import web
 import aiohttp
 import json
@@ -236,21 +252,45 @@ import urllib.request
 
 
 def get_model_dir(data):
+    if 'download_model_base' in folder_paths.folder_names_and_paths:
+        models_base = folder_paths.folder_names_and_paths['download_model_base'][0][0]
+    else:
+        models_base = folder_paths.models_dir
+
+    def resolve_custom_node(save_path):
+        save_path = save_path[13:] # remove 'custom_nodes/'
+        repo_name = save_path.replace('\\','/').split('/')[0] # get custom node repo name
+        repo_path = core.lookup_installed_custom_nodes(repo_name)
+        if repo_path is not None and repo_path[0]:
+            # Returns the retargeted path based on the actually installed repository
+            return os.path.join(os.path.dirname(repo_path[1]), save_path)
+        else:
+            return None
+
     if data['save_path'] != 'default':
         if '..' in data['save_path'] or data['save_path'].startswith('/'):
             print(f"[WARN] '{data['save_path']}' is not allowed path. So it will be saved into 'models/etc'.")
-            base_model = "etc"
+            base_model = os.path.join(models_base, "etc")
         else:
             if data['save_path'].startswith("custom_nodes"):
-                base_model = os.path.join(core.comfy_path, data['save_path'])
+                base_model = resolve_custom_node(data['save_path'])
+                if base_model is None:
+                    print(f"[ComfyUI-Manager] The target custom node for model download is not installed: {data['save_path']}")
+                    return None
             else:
-                base_model = os.path.join(folder_paths.models_dir, data['save_path'])
+                base_model = os.path.join(models_base, data['save_path'])
     else:
         model_type = data['type']
-        if model_type == "checkpoints":
+        if model_type == "checkpoints" or model_type == "checkpoint":
             base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
         elif model_type == "unclip":
             base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
+        elif model_type == "clip" or model_type == "text_encoders":
+            if folder_paths.folder_names_and_paths.get("text_encoders"):
+                base_model = folder_paths.folder_names_and_paths["text_encoders"][0][0]
+            else:
+                print("[ComfyUI-Manager] Your ComfyUI is outdated version.")
+                base_model = folder_paths.folder_names_and_paths["clip"][0][0]  # outdated version
         elif model_type == "VAE":
             base_model = folder_paths.folder_names_and_paths["vae"][0][0]
         elif model_type == "lora":
@@ -269,15 +309,24 @@ def get_model_dir(data):
             base_model = folder_paths.folder_names_and_paths["upscale_models"][0][0]
         elif model_type == "embeddings":
             base_model = folder_paths.folder_names_and_paths["embeddings"][0][0]
+        elif model_type == "unet" or model_type == "diffusion_model":
+            if folder_paths.folder_names_and_paths.get("diffusion_models"):
+                base_model = folder_paths.folder_names_and_paths["diffusion_models"][0][1]
+            else:
+                print("[ComfyUI-Manager] Your ComfyUI is outdated version.")
+                base_model = folder_paths.folder_names_and_paths["unet"][0][0]  # outdated version
         else:
-            base_model = "etc"
+            base_model = os.path.join(models_base, "etc")
 
     return base_model
 
 
 def get_model_path(data):
     base_model = get_model_dir(data)
-    return os.path.join(base_model, data['filename'])
+    if base_model is None:
+        return None
+    else:
+        return os.path.join(base_model, data['filename'])
 
 
 def check_custom_nodes_installed(json_obj, do_fetch=False, do_update_check=True, do_update=False):
@@ -296,15 +345,15 @@ def check_custom_nodes_installed(json_obj, do_fetch=False, do_update_check=True,
             executor.submit(process_custom_node, item)
 
     if do_fetch:
-        print(f"\x1b[2K\rFetching done.")
+        print("\x1b[2K\rFetching done.")
     elif do_update:
         update_exists = any(item['installed'] == 'Update' for item in json_obj['custom_nodes'])
         if update_exists:
-            print(f"\x1b[2K\rUpdate done.")
+            print("\x1b[2K\rUpdate done.")
         else:
-            print(f"\x1b[2K\rAll extensions are already up-to-date.")
+            print("\x1b[2K\rAll extensions are already up-to-date.")
     elif do_update_check:
-        print(f"\x1b[2K\rUpdate check done.")
+        print("\x1b[2K\rUpdate check done.")
 
 
 def nickname_filter(json_obj):
@@ -388,7 +437,7 @@ async def fetch_updates(request):
 @PromptServer.instance.routes.get("/customnode/update_all")
 async def update_all(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     try:
@@ -590,7 +639,7 @@ async def get_snapshot_list(request):
 @PromptServer.instance.routes.get("/snapshot/remove")
 async def remove_snapshot(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
     
     try:
@@ -606,9 +655,9 @@ async def remove_snapshot(request):
 
 
 @PromptServer.instance.routes.get("/snapshot/restore")
-async def remove_snapshot(request):
+async def restore_snapshot(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required.  Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
     
     try:
@@ -777,14 +826,14 @@ def copy_set_active(files, is_disable, js_path_name='.'):
 @PromptServer.instance.routes.post("/customnode/install")
 async def install_custom_node(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required.  Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     json_data = await request.json()
 
-    risky_level = await get_risky_level(json_data['files'])
+    risky_level = await get_risky_level(json_data['files'], json_data.get('pip', []))
     if not is_allowed_security_level(risky_level):
-        print(f"ERROR: This installation is not allowed in this security_level.  Please contact the administrator.")
+        print(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=404)
 
     install_type = json_data['install_type']
@@ -800,7 +849,14 @@ async def install_custom_node(request):
         res = unzip_install(json_data['files'])
 
     if install_type == "copy":
-        js_path_name = json_data['js_path'] if 'js_path' in json_data else '.'
+        if 'js_path' in json_data:
+            if '.' in json_data['js_path'] or ':' in json_data['js_path'] or json_data['js_path'].startswith('/'):
+                print(f"[ComfyUI Manager] An abnormal JS path has been transmitted. This could be the result of a security attack.\n{json_data['js_path']}")
+                return web.Response(status=400)
+            else:
+                js_path_name = json_data['js_path']
+        else:
+            js_path_name = '.'
         res = copy_install(json_data['files'], js_path_name)
 
     elif install_type == "git-clone":
@@ -815,7 +871,7 @@ async def install_custom_node(request):
     core.clear_pip_cache()
 
     if res:
-        print(f"After restarting ComfyUI, please refresh the browser.")
+        print("After restarting ComfyUI, please refresh the browser.")
         return web.json_response({}, content_type='application/json')
 
     return web.Response(status=400)
@@ -824,7 +880,7 @@ async def install_custom_node(request):
 @PromptServer.instance.routes.post("/customnode/fix")
 async def fix_custom_node(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.")
+        print(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=403)
 
     json_data = await request.json()
@@ -844,12 +900,20 @@ async def fix_custom_node(request):
         return web.Response(status=400)
 
     if 'pip' in json_data:
+        if not is_allowed_security_level('high'):
+            print(SECURITY_MESSAGE_GENERAL)
+            return web.Response(status=403)
+
         for pname in json_data['pip']:
             install_cmd = [sys.executable, "-m", "pip", "install", '-U', pname]
             core.try_install_script(json_data['files'][0], ".", install_cmd)
 
+    # HOTFIX: force downgrade to numpy<2
+    install_cmd = [sys.executable, "-m", "pip", "install", "numpy<2"]
+    core.try_install_script(json_data['files'][0], ".", install_cmd)
+
     if res:
-        print(f"After restarting ComfyUI, please refresh the browser.")
+        print("After restarting ComfyUI, please refresh the browser.")
         return web.json_response({}, content_type='application/json')
 
     return web.Response(status=400)
@@ -858,23 +922,23 @@ async def fix_custom_node(request):
 @PromptServer.instance.routes.post("/customnode/install/git_url")
 async def install_custom_node_git_url(request):
     if not is_allowed_security_level('high'):
-        print(f"ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.")
+        print(SECURITY_MESSAGE_NORMAL_MINUS)
         return web.Response(status=403)
 
     url = await request.text()
     res = core.gitclone_install([url])
 
     if res:
-        print(f"After restarting ComfyUI, please refresh the browser.")
+        print("After restarting ComfyUI, please refresh the browser.")
         return web.Response(status=200)
 
     return web.Response(status=400)
 
 
 @PromptServer.instance.routes.post("/customnode/install/pip")
-async def install_custom_node_git_url(request):
+async def install_custom_node_pip(request):
     if not is_allowed_security_level('high'):
-        print(f"ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.")
+        print(SECURITY_MESSAGE_NORMAL_MINUS)
         return web.Response(status=403)
 
     packages = await request.text()
@@ -886,7 +950,7 @@ async def install_custom_node_git_url(request):
 @PromptServer.instance.routes.post("/customnode/uninstall")
 async def uninstall_custom_node(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required.  Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     json_data = await request.json()
@@ -905,7 +969,7 @@ async def uninstall_custom_node(request):
         res = core.gitclone_uninstall(json_data['files'])
 
     if res:
-        print(f"After restarting ComfyUI, please refresh the browser.")
+        print("After restarting ComfyUI, please refresh the browser.")
         return web.json_response({}, content_type='application/json')
 
     return web.Response(status=400)
@@ -914,7 +978,7 @@ async def uninstall_custom_node(request):
 @PromptServer.instance.routes.post("/customnode/update")
 async def update_custom_node(request):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     json_data = await request.json()
@@ -931,7 +995,7 @@ async def update_custom_node(request):
     core.clear_pip_cache()
 
     if res:
-        print(f"After restarting ComfyUI, please refresh the browser.")
+        print("After restarting ComfyUI, please refresh the browser.")
         return web.json_response({}, content_type='application/json')
 
     return web.Response(status=400)
@@ -939,13 +1003,13 @@ async def update_custom_node(request):
 
 @PromptServer.instance.routes.get("/comfyui_manager/update_comfyui")
 async def update_comfyui(request):
-    print(f"Update ComfyUI")
+    print("Update ComfyUI")
 
     try:
         repo_path = os.path.dirname(folder_paths.__file__)
         res = core.update_path(repo_path)
         if res == "fail":
-            print(f"ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
+            print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
             return web.Response(status=400)
         elif res == "updated":
             return web.Response(status=201)
@@ -986,7 +1050,7 @@ async def install_model(request):
     model_path = get_model_path(json_data)
 
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
@@ -999,7 +1063,7 @@ async def install_model(request):
                 break
 
         if not is_belongs_to_whitelist:
-            print(f"ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.")
+            print(SECURITY_MESSAGE_NORMAL_MINUS)
             return web.Response(status=403)
 
     res = False
@@ -1035,32 +1099,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(f"ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.")
-        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:
@@ -1169,15 +1207,22 @@ async def get_notice(request):
 
                 if match:
                     markdown_content = match.group(1)
-                    markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
+                    version_tag = core.get_comfyui_tag()
+                    if version_tag is None:
+                        markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
+                    else:
+                        markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
+                                             f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
                     # markdown_content += f"<BR>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;()"
                     markdown_content += f"<BR>Manager: {core.version_str}"
 
                     markdown_content = add_target_blank(markdown_content)
 
                     try:
-                        if core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
-                            markdown_content = f'<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
+                        if core.comfy_ui_commit_datetime == datetime(1900, 1, 1, 0, 0, 0):
+                            markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI isn\'t git repo.</P>' + markdown_content
+                        elif core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
+                            markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
                     except:
                         pass
 
@@ -1191,22 +1236,27 @@ async def get_notice(request):
 @PromptServer.instance.routes.get("/manager/reboot")
 def restart(self):
     if not is_allowed_security_level('middle'):
-        print(f"ERROR: To use this action, a security_level of `middle or below` is required.  Please contact the administrator.")
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
     try:
         sys.stdout.close_log()
-    except Exception as e:
+    except Exception:
         pass
 
     if '__COMFY_CLI_SESSION__' in os.environ:
-        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w') as file:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
             pass
 
-        print(f"\nRestarting...\n\n")
+        print("\nRestarting...\n\n")
         exit(0)
 
-    print(f"\nRestarting... [Legacy Mode]\n\n")
+    print("\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:
@@ -1271,389 +1321,6 @@ async def load_components(request):
         return web.Response(status=400)
 
 
-@PromptServer.instance.routes.get("/manager/share_option")
-async def share_option(request):
-    if "value" in request.rel_url.query:
-        core.get_config()['share_option'] = request.rel_url.query['value']
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['share_option'], status=200)
-
-    return web.Response(status=200)
-
-
-def get_openart_auth():
-    if not os.path.exists(os.path.join(core.comfyui_manager_path, ".openart_key")):
-        return None
-    try:
-        with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "r") as f:
-            openart_key = f.read().strip()
-        return openart_key if openart_key else None
-    except:
-        return None
-
-
-def get_matrix_auth():
-    if not os.path.exists(os.path.join(core.comfyui_manager_path, "matrix_auth")):
-        return None
-    try:
-        with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "r") as f:
-            matrix_auth = f.read()
-            homeserver, username, password = matrix_auth.strip().split("\n")
-            if not homeserver or not username or not password:
-                return None
-        return {
-            "homeserver": homeserver,
-            "username": username,
-            "password": password,
-        }
-    except:
-        return None
-
-
-def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey")):
-        return None
-    try:
-        with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "r") as f:
-            share_key = f.read()
-            if not share_key.strip():
-                return None
-        return share_key
-    except:
-        return None
-
-
-def get_youml_settings():
-    if not os.path.exists(os.path.join(core.comfyui_manager_path, ".youml")):
-        return None
-    try:
-        with open(os.path.join(core.comfyui_manager_path, ".youml"), "r") as f:
-            youml_settings = f.read().strip()
-        return youml_settings if youml_settings else None
-    except:
-        return None
-
-
-def set_youml_settings(settings):
-    with open(os.path.join(core.comfyui_manager_path, ".youml"), "w") as f:
-        f.write(settings)
-
-
-@PromptServer.instance.routes.get("/manager/get_openart_auth")
-async def api_get_openart_auth(request):
-    # print("Getting stored Matrix credentials...")
-    openart_key = get_openart_auth()
-    if not openart_key:
-        return web.Response(status=404)
-    return web.json_response({"openart_key": openart_key})
-
-
-@PromptServer.instance.routes.post("/manager/set_openart_auth")
-async def api_set_openart_auth(request):
-    json_data = await request.json()
-    openart_key = json_data['openart_key']
-    with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "w") as f:
-        f.write(openart_key)
-    return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/manager/get_matrix_auth")
-async def api_get_matrix_auth(request):
-    # print("Getting stored Matrix credentials...")
-    matrix_auth = get_matrix_auth()
-    if not matrix_auth:
-        return web.Response(status=404)
-    return web.json_response(matrix_auth)
-
-
-@PromptServer.instance.routes.get("/manager/youml/settings")
-async def api_get_youml_settings(request):
-    youml_settings = get_youml_settings()
-    if not youml_settings:
-        return web.Response(status=404)
-    return web.json_response(json.loads(youml_settings))
-
-
-@PromptServer.instance.routes.post("/manager/youml/settings")
-async def api_set_youml_settings(request):
-    json_data = await request.json()
-    set_youml_settings(json.dumps(json_data))
-    return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
-async def api_get_comfyworkflows_auth(request):
-    # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
-    # in the same directory as the ComfyUI base folder
-    # print("Getting stored Comfyworkflows.com auth...")
-    comfyworkflows_auth = get_comfyworkflows_auth()
-    if not comfyworkflows_auth:
-        return web.Response(status=404)
-    return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
-
-
-args.enable_cors_header = "*"
-if hasattr(PromptServer.instance, "app"):
-    app = PromptServer.instance.app
-    cors_middleware = server.create_cors_middleware(args.enable_cors_header)
-    app.middlewares.append(cors_middleware)
-
-
-@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
-async def set_esheep_workflow_and_images(request):
-    json_data = await request.json()
-    current_workflow = json_data['workflow']
-    images = json_data['images']
-    with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
-        json.dump(json_data, file, indent=4)
-        return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
-async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
-        data = json.load(file)
-        return web.Response(status=200, text=json.dumps(data))
-
-
-def set_matrix_auth(json_data):
-    homeserver = json_data['homeserver']
-    username = json_data['username']
-    password = json_data['password']
-    with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "w") as f:
-        f.write("\n".join([homeserver, username, password]))
-
-
-def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "w") as f:
-        f.write(comfyworkflows_sharekey)
-
-
-def has_provided_matrix_auth(matrix_auth):
-    return matrix_auth['homeserver'].strip() and matrix_auth['username'].strip() and matrix_auth['password'].strip()
-
-
-def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
-    return comfyworkflows_sharekey.strip()
-
-
-def extract_model_file_names(json_data):
-    """Extract unique file names from the input JSON data."""
-    file_names = set()
-    model_filename_extensions = {'.safetensors', '.ckpt', '.pt', '.pth', '.bin'}
-
-    # Recursively search for file names in the JSON data
-    def recursive_search(data):
-        if isinstance(data, dict):
-            for value in data.values():
-                recursive_search(value)
-        elif isinstance(data, list):
-            for item in data:
-                recursive_search(item)
-        elif isinstance(data, str) and '.' in data:
-            file_names.add(os.path.basename(data))  # file_names.add(data)
-
-    recursive_search(json_data)
-    return [f for f in list(file_names) if os.path.splitext(f)[1] in model_filename_extensions]
-
-
-def find_file_paths(base_dir, file_names):
-    """Find the paths of the files in the base directory."""
-    file_paths = {}
-
-    for root, dirs, files in os.walk(base_dir):
-        # Exclude certain directories
-        dirs[:] = [d for d in dirs if d not in ['.git']]
-
-        for file in files:
-            if file in file_names:
-                file_paths[file] = os.path.join(root, file)
-    return file_paths
-
-
-def compute_sha256_checksum(filepath):
-    """Compute the SHA256 checksum of a file, in chunks"""
-    sha256 = hashlib.sha256()
-    with open(filepath, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b''):
-            sha256.update(chunk)
-    return sha256.hexdigest()
-
-
-@PromptServer.instance.routes.post("/manager/share")
-async def share_art(request):
-    # get json data
-    json_data = await request.json()
-
-    matrix_auth = json_data['matrix_auth']
-    comfyworkflows_sharekey = json_data['cw_auth']['cw_sharekey']
-
-    set_matrix_auth(matrix_auth)
-    set_comfyworkflows_auth(comfyworkflows_sharekey)
-
-    share_destinations = json_data['share_destinations']
-    credits = json_data['credits']
-    title = json_data['title']
-    description = json_data['description']
-    is_nsfw = json_data['is_nsfw']
-    prompt = json_data['prompt']
-    potential_outputs = json_data['potential_outputs']
-    selected_output_index = json_data['selected_output_index']
-
-    try:
-        output_to_share = potential_outputs[int(selected_output_index)]
-    except:
-        # for now, pick the first output
-        output_to_share = potential_outputs[0]
-
-    assert output_to_share['type'] in ('image', 'output')
-    output_dir = folder_paths.get_output_directory()
-
-    if output_to_share['type'] == 'image':
-        asset_filename = output_to_share['image']['filename']
-        asset_subfolder = output_to_share['image']['subfolder']
-
-        if output_to_share['image']['type'] == 'temp':
-            output_dir = folder_paths.get_temp_directory()
-    else:
-        asset_filename = output_to_share['output']['filename']
-        asset_subfolder = output_to_share['output']['subfolder']
-
-    if asset_subfolder:
-        asset_filepath = os.path.join(output_dir, asset_subfolder, asset_filename)
-    else:
-        asset_filepath = os.path.join(output_dir, asset_filename)
-
-    # get the mime type of the asset
-    assetFileType = mimetypes.guess_type(asset_filepath)[0]
-
-    share_website_host = "UNKNOWN"
-    if "comfyworkflows" in share_destinations:
-        share_website_host = "https://comfyworkflows.com"
-        share_endpoint = f"{share_website_host}/api"
-
-        # get presigned urls
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.post(
-                    f"{share_endpoint}/get_presigned_urls",
-                    json={
-                        "assetFileName": asset_filename,
-                        "assetFileType": assetFileType,
-                        "workflowJsonFileName": 'workflow.json',
-                        "workflowJsonFileType": 'application/json',
-                    },
-            ) as resp:
-                assert resp.status == 200
-                presigned_urls_json = await resp.json()
-                assetFilePresignedUrl = presigned_urls_json["assetFilePresignedUrl"]
-                assetFileKey = presigned_urls_json["assetFileKey"]
-                workflowJsonFilePresignedUrl = presigned_urls_json["workflowJsonFilePresignedUrl"]
-                workflowJsonFileKey = presigned_urls_json["workflowJsonFileKey"]
-
-        # upload asset
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(assetFilePresignedUrl, data=open(asset_filepath, "rb")) as resp:
-                assert resp.status == 200
-
-        # upload workflow json
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(workflowJsonFilePresignedUrl, data=json.dumps(prompt['workflow']).encode('utf-8')) as resp:
-                assert resp.status == 200
-
-        model_filenames = extract_model_file_names(prompt['workflow'])
-        model_file_paths = find_file_paths(folder_paths.base_path, model_filenames)
-
-        models_info = {}
-        for filename, filepath in model_file_paths.items():
-            models_info[filename] = {
-                "filename": filename,
-                "sha256_checksum": compute_sha256_checksum(filepath),
-                "relative_path": os.path.relpath(filepath, folder_paths.base_path),
-            }
-
-        # make a POST request to /api/upload_workflow with form data key values
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            form = aiohttp.FormData()
-            if comfyworkflows_sharekey:
-                form.add_field("shareKey", comfyworkflows_sharekey)
-            form.add_field("source", "comfyui_manager")
-            form.add_field("assetFileKey", assetFileKey)
-            form.add_field("assetFileType", assetFileType)
-            form.add_field("workflowJsonFileKey", workflowJsonFileKey)
-            form.add_field("sharedWorkflowWorkflowJsonString", json.dumps(prompt['workflow']))
-            form.add_field("sharedWorkflowPromptJsonString", json.dumps(prompt['output']))
-            form.add_field("shareWorkflowCredits", credits)
-            form.add_field("shareWorkflowTitle", title)
-            form.add_field("shareWorkflowDescription", description)
-            form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
-            form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
-            form.add_field("modelsInfo", json.dumps(models_info))
-
-            async with session.post(
-                    f"{share_endpoint}/upload_workflow",
-                    data=form,
-            ) as resp:
-                assert resp.status == 200
-                upload_workflow_json = await resp.json()
-                workflowId = upload_workflow_json["workflowId"]
-
-    # check if the user has provided Matrix credentials
-    if "matrix" in share_destinations:
-        comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
-        filename = os.path.basename(asset_filepath)
-        content_type = assetFileType
-
-        try:
-            from matrix_client.api import MatrixHttpApi
-            from matrix_client.client import MatrixClient
-
-            homeserver = 'matrix.org'
-            if matrix_auth:
-                homeserver = matrix_auth.get('homeserver', 'matrix.org')
-            homeserver = homeserver.replace("http://", "https://")
-            if not homeserver.startswith("https://"):
-                homeserver = "https://" + homeserver
-
-            client = MatrixClient(homeserver)
-            try:
-                token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
-                if not token:
-                    return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-            except:
-                return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-
-            matrix = MatrixHttpApi(homeserver, token=token)
-            with open(asset_filepath, 'rb') as f:
-                mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
-
-            workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
-
-            text_content = ""
-            if title:
-                text_content += f"{title}\n"
-            if description:
-                text_content += f"{description}\n"
-            if credits:
-                text_content += f"\ncredits: {credits}\n"
-            response = matrix.send_message(comfyui_share_room_id, text_content)
-            response = matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
-            response = matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
-        except:
-            import traceback
-            traceback.print_exc()
-            return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)
-
-    return web.json_response({
-        "comfyworkflows": {
-            "url": None if "comfyworkflows" not in share_destinations else f"{share_website_host}/workflows/{workflowId}",
-        },
-        "matrix": {
-            "success": None if "matrix" not in share_destinations else True
-        }
-    }, content_type='application/json', status=200)
-
-
 def sanitize(data):
     return data.replace("<", "&lt;").replace(">", "&gt;")
 
@@ -1713,6 +1380,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,63 +1,214 @@
-try:
-    from distutils.version import StrictVersion
-except:
-    print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
-    class StrictVersion:
-        def __init__(self, version_string):
-            self.version_string = version_string
-            self.major = 0
-            self.minor = 0
-            self.patch = 0
-            self.pre_release = None
-            self.parse_version_string()
+import subprocess
+import sys
 
-        def parse_version_string(self):
-            parts = self.version_string.split('.')
-            if not parts:
-                raise ValueError("Version string must not be empty")
+# DON'T USE StrictVersion - cannot handle pre_release version
+# try:
+#     from distutils.version import StrictVersion
+# except:
+#     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
+class StrictVersion:
+    def __init__(self, version_string):
+        self.version_string = version_string
+        self.major = 0
+        self.minor = 0
+        self.patch = 0
+        self.pre_release = None
+        self.parse_version_string()
 
-            self.major = int(parts[0])
-            self.minor = int(parts[1]) if len(parts) > 1 else 0
-            self.patch = int(parts[2]) if len(parts) > 2 else 0
+    def parse_version_string(self):
+        parts = self.version_string.split('.')
+        if not parts:
+            raise ValueError("Version string must not be empty")
 
-            # Handling pre-release versions if present
-            if len(parts) > 3:
-                self.pre_release = parts[3]
+        self.major = int(parts[0])
+        self.minor = int(parts[1]) if len(parts) > 1 else 0
+        self.patch = int(parts[2]) if len(parts) > 2 else 0
 
-        def __str__(self):
-            version = f"{self.major}.{self.minor}.{self.patch}"
-            if self.pre_release:
-                version += f"-{self.pre_release}"
-            return version
+        # Handling pre-release versions if present
+        if len(parts) > 3:
+            self.pre_release = parts[3]
 
-        def __eq__(self, other):
-            return (self.major, self.minor, self.patch, self.pre_release) == \
-                (other.major, other.minor, other.patch, other.pre_release)
+    def __str__(self):
+        version = f"{self.major}.{self.minor}.{self.patch}"
+        if self.pre_release:
+            version += f"-{self.pre_release}"
+        return version
 
-        def __lt__(self, other):
-            if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
-                return self.pre_release_compare(self.pre_release, other.pre_release) < 0
-            return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
+    def __eq__(self, other):
+        return (self.major, self.minor, self.patch, self.pre_release) == \
+            (other.major, other.minor, other.patch, other.pre_release)
 
-        @staticmethod
-        def pre_release_compare(pre1, pre2):
-            if pre1 == pre2:
-                return 0
-            if pre1 is None:
-                return 1
-            if pre2 is None:
-                return -1
-            return -1 if pre1 < pre2 else 1
+    def __lt__(self, other):
+        if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
+            return self.pre_release_compare(self.pre_release, other.pre_release) < 0
+        return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
 
-        def __le__(self, other):
-            return self == other or self < other
+    @staticmethod
+    def pre_release_compare(pre1, pre2):
+        if pre1 == pre2:
+            return 0
+        if pre1 is None:
+            return 1
+        if pre2 is None:
+            return -1
+        return -1 if pre1 < pre2 else 1
 
-        def __gt__(self, other):
-            return not self <= other
+    def __le__(self, other):
+        return self == other or self < other
 
-        def __ge__(self, other):
-            return not self < other
+    def __gt__(self, other):
+        return not self <= other
 
-        def __ne__(self, other):
-            return not self == other
+    def __ge__(self, other):
+        return not self < other
 
+    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:
+            print("[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("[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("[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("[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("[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', "numpy<2"], universal_newlines=True)
+        except Exception as e:
+            print("[manager-core] Failed to restore numpy")
+            print(e)

glob/security_check.py

@@ -29,12 +29,37 @@ Detailed information: https://old.reddit.com/r/comfyui/comments/1dbls5n/psa_if_y
 2. Remove files: lolMiner*, 4G_Ethash_Linux_Readme.txt, mine* in ComfyUI dir.
 
 (Reinstall ComfyUI is recommended.)
+    """,
+    "ultralytics==8.3.41": f"""
+Execute following commands:
+    {sys.executable} -m pip uninstall ultralytics
+    {sys.executable} -m pip install ultralytics==8.3.40
+    
+And kill and remove /tmp/ultralytics_runner
+
+
+The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
+https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
+    """,
+    "ultralytics==8.3.42": f"""
+Execute following commands:
+    {sys.executable} -m pip uninstall ultralytics
+    {sys.executable} -m pip install ultralytics==8.3.40
+
+And kill and remove /tmp/ultralytics_runner
+
+
+The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
+https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
     """
              }
 
     node_blacklist = {"ComfyUI_LLMVISION": "ComfyUI_LLMVISION"}
 
-    pip_blacklist = {"AppleBotzz": "ComfyUI_LLMVISION"}
+    pip_blacklist = {
+        "AppleBotzz": "ComfyUI_LLMVISION",
+        "ultralytics==8.3.41": "ultralytics==8.3.41"
+    }
 
     file_blacklist = {
         "ComfyUI_LLMVISION": ["%LocalAppData%\\rundll64.exe"],
@@ -84,7 +109,7 @@ Detailed information: https://old.reddit.com/r/comfyui/comments/1dbls5n/psa_if_y
 
         for x in detected:
             print(f"\n======== TARGET: {x} =========")
-            print(f"\nTODO:")
+            print("\nTODO:")
             print(guide.get(x))
 
         exit(-1)

glob/share_3rdparty.py

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

js/cm-api.js

@@ -1,6 +1,6 @@
 import { api } from "../../scripts/api.js";
 import { app } from "../../scripts/app.js";
-import { sleep } from "./common.js";
+import { sleep, customConfirm } from "./common.js";
 
 async function tryInstallCustomNode(event) {
 	let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
@@ -22,8 +22,7 @@ async function tryInstallCustomNode(event) {
 		alert(msg);
 		return;
 	}
-
-	let res = confirm(msg);
+	const res = await customConfirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
 			const response = await api.fetchApi(`/customnode/toggle_active`, {

js/comfyui-manager.js

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

js/comfyui-share-common.js

@@ -315,7 +315,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "comfyworkflows",
 				textContent: "ComfyWorkflows",
 				website: "https://comfyworkflows.com",
-				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:white;' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
+				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:var(--input-text);' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
 				onclick: () => {
 				  showShareDialog('comfyworkflows').then((suc) => {
 				    suc && this.close();
@@ -326,7 +326,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "esheep",
 				textContent: "eSheep",
 				website: "https://www.esheep.com",
-				description: "Share & download thousands of ComfyUI workflows on <a style='color:white;' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
+				description: "Share & download thousands of ComfyUI workflows on <a style='color:var(--input-text);' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
 				onclick: () => {
 					shareToEsheep();
 				  	this.close();
@@ -336,7 +336,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "Copus",
 				textContent: "Copus",
 				website: "https://www.copus.io",
-				description: "🔴 Permanently store and secure ownership of your workflow on the open-source platform: <a style='color:white;' href='https://copus.io' target='_blank'>Copus.io</a>",
+				description: "🔴 Earn simple. Get paid from your ComfyUI workflows—no revenue sharing. Ever.",
 				onclick: () => {
 					showCopusShareDialog();
 				  this.close();
@@ -356,7 +356,8 @@ export class ShareDialogChooser extends ComfyDialog {
 			});
 
 			buttons.forEach(b => {
-				const button = $el("button", {
+				const button = $el("button", 
+					{
 					type: "button",
 					textContent: b.textContent,
 					onclick: b.onclick,
@@ -369,8 +370,14 @@ export class ShareDialogChooser extends ComfyDialog {
 						'padding': '5px 5px',
 						'margin-bottom': '5px',
 						'transition': 'background-color 0.3s',
+						'position':'relative'
 					}
-				});
+				},
+				[
+					$el("span", { style: { 
+					 } }),
+				]
+			);
 				button.addEventListener('mouseover', () => {
 					button.style.backgroundColor = '#007BFF'; // Change color on hover
 				});
@@ -382,18 +389,40 @@ export class ShareDialogChooser extends ComfyDialog {
 					innerHTML: b.description,
 					style: {
 						'text-align': 'left',
-						color: 'white',
+						color: 'var(--input-text)',
 						'font-size': '14px',
 						'margin-bottom': '0',
 					},
 				});
 
+				const copus_ui =$el("div", { style: { 
+					'position': 'absolute',
+					'height': '100%',
+					'left': '-25px',
+					'top': '-26px',
+					'width': '100%',
+					'z-index':'-1',
+					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
+					'background-repeat': 'no-repeat',
+				} });
+				const copus_ui_bottom =$el("div", { style: { 
+					'position': 'absolute',
+					'height': '100%',
+					'left': '25px',
+					'bottom': '-26px',
+					'width': '100%',
+					'transform':'scale(-1, -1)',
+					'z-index':'-1',
+					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
+					'background-repeat': 'no-repeat',
+				} });
+
 				const websiteLink = $el("a", {
 					textContent: "🌐 Website",
 					href: b.website,
 					target: "_blank",
 					style: {
-						color: 'white',
+						color: 'var(--input-text)',
 						'margin-left': '10px',
 						'font-size': '12px',
 						'text-decoration': 'none',
@@ -417,7 +446,6 @@ export class ShareDialogChooser extends ComfyDialog {
 						'margin-bottom': '10px',
 					}
 				}, [button, websiteLink]);
-
 				const column = $el("div", {
 					style: {
 						'flex-basis': '100%',
@@ -426,8 +454,17 @@ export class ShareDialogChooser extends ComfyDialog {
 						'border': '1px solid #ddd',
 						'border-radius': '5px',
 						'box-shadow': '0 2px 4px rgba(0, 0, 0, 0.1)',
+						'position':'relative'
 					}
-				}, [buttonLinkContainer, description]);
+				}, [buttonLinkContainer, description
+					, 
+					b.key ==='Copus' ?
+					copus_ui
+					:'',
+					b.key ==='Copus' ?
+					copus_ui_bottom
+					:'',
+				]);
 
 				container.appendChild(column);
 			});
@@ -440,7 +477,7 @@ export class ShareDialogChooser extends ComfyDialog {
 		      textContent: 'Choose a platform to share your workflow',
 			    style: {
 				  'text-align': 'center',
-				  'color': 'white',
+				  'color': 'var(--input-text)',
 				  'font-size': '18px',
 				  'margin-bottom': '10px',
 				},
@@ -475,7 +512,7 @@ export class ShareDialogChooser extends ComfyDialog {
 	}
 	show() {
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1100;
 	}
 }
 export class ShareDialog extends ComfyDialog {
@@ -686,7 +723,7 @@ export class ShareDialog extends ComfyDialog {
 				$el("div", {}, [
 					$el("p", {
 						size: 3, color: "white", style: {
-							color: 'white'
+							color: 'var(--input-text)'
 						}
 					}, [`Select where to share your art:`]),
 					this.matrix_destination_checkbox,
@@ -701,7 +738,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.credits_input,
@@ -712,7 +749,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.title_input,
@@ -723,7 +760,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.description_input,
@@ -989,7 +1026,7 @@ export class ShareDialog extends ComfyDialog {
 			}
 			const radio_button_text = $el("label", {
 				// style: {
-				// 	color: 'white'
+				// 	color: 'var(--input-text)'
 				// }
 			}, [output.title])
 			radio_button.style.color = "var(--fg-color)";
@@ -1028,7 +1065,7 @@ export class ShareDialog extends ComfyDialog {
 			color: "white",
 			style: {
 				'text-align': 'center',
-				color: 'white',
+				color: 'var(--input-text)',
 				backgroundColor: 'black',
 				padding: '10px',
 				'margin-top': '0px',
@@ -1040,7 +1077,7 @@ export class ShareDialog extends ComfyDialog {
 				color: "white",
 				style: {
 					'text-align': 'center',
-					color: 'white',
+					color: 'var(--input-text)',
 					'margin-bottom': '5px',
 					'font-style': 'italic',
 					'font-size': '12px',

js/comfyui-share-copus.js

@@ -4,10 +4,10 @@ const env = "prod";
 
 let DEFAULT_HOMEPAGE_URL = "https://copus.io";
 
-let API_ENDPOINT = "https://api.client.prod.copus.io/copus-client";
+let API_ENDPOINT = "https://api.client.prod.copus.io";
 
 if (env !== "prod") {
-  API_ENDPOINT = "https://api.dev.copus.io/copus-client";
+  API_ENDPOINT = "https://api.test.copus.io";
   DEFAULT_HOMEPAGE_URL = "https://test.copus.io";
 }
 
@@ -61,6 +61,7 @@ export class CopusShareDialog extends ComfyDialog {
       [$el("div.comfy-modal-content", {}, [...this.createButtons()])]
     );
     this.selectedOutputIndex = 0;
+    this.selectedOutput_lock = 0;
     this.selectedNodeId = null;
     this.uploadedImages = [];
     this.allFilesImages = [];
@@ -190,10 +191,36 @@ export class CopusShareDialog extends ComfyDialog {
       type: "text",
       placeholder: "Subtitle (Optional)",
       style: inputStyle,
-      maxLength: "70",
+      maxLength: "350",
       oninput: () => {
         const titleNum = this.SubTitleInput.value.length;
-        subTitleNumDom.textContent = `${titleNum}/70`;
+        subTitleNumDom.textContent = `${titleNum}/350`;
+      },
+    });
+    this.LockInput = $el("input", {
+      type: "text",
+      placeholder: "",
+      style:  {
+        width: "100px",
+        padding: "7px",
+        borderRadius: "4px",
+        border: "1px solid #ddd",
+        boxSizing: "border-box",
+      },
+      oninput: (event) => {
+        let input = event.target.value;
+        // Use a regular expression to match a number with up to two decimal places
+        const regex = /^\d*\.?\d{0,2}$/;
+        if (!regex.test(input)) {
+          // If the input doesn't match, remove the last entered character
+          event.target.value = input.slice(0, -1);
+        }
+        const numericValue = parseFloat(input);
+        if (numericValue > 9999) {
+          input = "9999";
+        }
+        // Update the input field with the valid value
+        event.target.value = input;
       },
     });
     this.descriptionInput = $el("textarea", {
@@ -297,7 +324,7 @@ export class CopusShareDialog extends ComfyDialog {
           color: "#999",
         },
       },
-      ["0/70"]
+      ["0/350"]
     );
     const descriptionNumDom = $el(
       "label",
@@ -333,6 +360,59 @@ export class CopusShareDialog extends ComfyDialog {
       // descriptionNumDom,
     ]);
     // switch  between outputs section and additional inputs section
+    this.radioButtons_lock = [];
+
+    this.radioButtonsCheck_lock = $el("input", {
+      type: "radio",
+      name: "output_type_lock",
+      value: "0",
+      id: "blockchain1_lock",
+      checked: true,
+    });
+    this.radioButtonsCheckOff_lock = $el("input", {
+      type: "radio",
+      name: "output_type_lock",
+      value: "1",
+      id: "blockchain_lock",
+    });
+
+    const blockChainSection_lock = $el("div", { style: sectionStyle }, [
+      $el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
+      $el(
+        "label",
+        {
+          style: {
+            marginTop: "10px",
+            display: "flex",
+            alignItems: "center",
+            cursor: "pointer",
+          },
+        },
+        [
+          this.radioButtonsCheck_lock,
+          $el("div", { style: { marginLeft: "5px" ,display:'flex',alignItems:'center'} }, [
+            $el("span", { style: { marginLeft: "5px" } }, ["ON"]),
+            $el("span", { style: { marginLeft: "20px",marginRight:'10px' ,color:'#fff'} }, ["Price US$"]),
+            this.LockInput
+          ]),
+        ]
+      ),
+      $el(
+        "label",
+        { style: { display: "flex", alignItems: "center", cursor: "pointer" } },
+        [
+          this.radioButtonsCheckOff_lock,
+          $el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
+        ]
+      ),
+      
+      $el(
+        "p",
+        { style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
+        ["Get paid from your workflow. You can change the price and withdraw your earnings on Copus."]
+      ),
+    ]);
+
     this.radioButtons = [];
 
     this.radioButtonsCheck = $el("input", {
@@ -350,7 +430,7 @@ export class CopusShareDialog extends ComfyDialog {
     });
 
     const blockChainSection = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["6️⃣ Store on blockchain "]),
+      $el("label", { style: labelStyle }, ["7️⃣ Store on blockchain "]),
       $el(
         "label",
         {
@@ -380,6 +460,8 @@ export class CopusShareDialog extends ComfyDialog {
         ["Secure ownership with a permanent & decentralized storage"]
       ),
     ]);
+
+
     // Message Section
     this.message = $el(
       "div",
@@ -441,6 +523,7 @@ export class CopusShareDialog extends ComfyDialog {
       SubtitleSection,
       DescriptionSection,
       // contestSection,
+      blockChainSection_lock,
       blockChainSection,
       this.message,
       buttonsSection,
@@ -543,6 +626,8 @@ export class CopusShareDialog extends ComfyDialog {
       subTitle: this.SubTitleInput.value,
       content: this.descriptionInput.value,
       storeOnChain: this.radioButtonsCheck.checked ? true : false,
+      lockState:this.radioButtonsCheck_lock.checked ? 2 : 0,
+      unlockPrice:this.LockInput.value,
     };
 
     if (!this.keyInput.value) {
@@ -557,6 +642,12 @@ export class CopusShareDialog extends ComfyDialog {
       throw new Error("Title is required");
     }
 
+    if(this.radioButtonsCheck_lock.checked){
+      if (!this.LockInput.value){
+        throw new Error("Price is required");
+      }
+    }
+
     if (!this.uploadedImages.length) {
       if (this.selectedFile) {
         await this.uploadThumbnail(this.selectedFile);

js/comfyui-share-openart.js

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

js/common.js

@@ -2,25 +2,138 @@ import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
 
+
+function internalCustomConfirm(message, confirmMessage, cancelMessage) {
+	return new Promise((resolve) => {
+		// transparent bg
+		const modalOverlay = document.createElement('div');
+		modalOverlay.style.position = 'fixed';
+		modalOverlay.style.top = 0;
+		modalOverlay.style.left = 0;
+		modalOverlay.style.width = '100%';
+		modalOverlay.style.height = '100%';
+		modalOverlay.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+		modalOverlay.style.display = 'flex';
+		modalOverlay.style.alignItems = 'center';
+		modalOverlay.style.justifyContent = 'center';
+		modalOverlay.style.zIndex = '1101';
+
+		// Modal window container (dark bg)
+		const modalDialog = document.createElement('div');
+		modalDialog.style.backgroundColor = '#333';
+		modalDialog.style.padding = '20px';
+		modalDialog.style.borderRadius = '4px';
+		modalDialog.style.maxWidth = '400px';
+		modalDialog.style.width = '80%';
+		modalDialog.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.5)';
+		modalDialog.style.color = '#fff';
+
+		// Display message
+		const modalMessage = document.createElement('p');
+		modalMessage.textContent = message;
+		modalMessage.style.margin = '0';
+		modalMessage.style.padding = '0 0 20px';
+		modalMessage.style.wordBreak = 'keep-all';
+
+		// Button container
+		const modalButtons = document.createElement('div');
+		modalButtons.style.display = 'flex';
+		modalButtons.style.justifyContent = 'flex-end';
+
+		// Confirm button (green)
+		const confirmButton = document.createElement('button');
+		if(confirmMessage)
+			confirmButton.textContent = confirmMessage;
+		else
+			confirmButton.textContent = 'Confirm';
+		confirmButton.style.marginLeft = '10px';
+		confirmButton.style.backgroundColor = '#28a745'; // green
+		confirmButton.style.color = '#fff';
+		confirmButton.style.border = 'none';
+		confirmButton.style.padding = '6px 12px';
+		confirmButton.style.borderRadius = '4px';
+		confirmButton.style.cursor = 'pointer';
+		confirmButton.style.fontWeight = 'bold';
+
+		// Cancel button (red)
+		const cancelButton = document.createElement('button');
+		if(cancelMessage)
+			cancelButton.textContent = cancelMessage;
+		else
+			cancelButton.textContent = 'Cancel';
+
+		cancelButton.style.marginLeft = '10px';
+		cancelButton.style.backgroundColor = '#dc3545'; // red
+		cancelButton.style.color = '#fff';
+		cancelButton.style.border = 'none';
+		cancelButton.style.padding = '6px 12px';
+		cancelButton.style.borderRadius = '4px';
+		cancelButton.style.cursor = 'pointer';
+		cancelButton.style.fontWeight = 'bold';
+
+		const closeModal = () => {
+			document.body.removeChild(modalOverlay);
+		};
+
+		confirmButton.addEventListener('click', () => {
+			closeModal();
+			resolve(true);
+		});
+
+		cancelButton.addEventListener('click', () => {
+			closeModal();
+			resolve(false);
+		});
+
+		modalButtons.appendChild(confirmButton);
+		modalButtons.appendChild(cancelButton);
+		modalDialog.appendChild(modalMessage);
+		modalDialog.appendChild(modalButtons);
+		modalOverlay.appendChild(modalDialog);
+		document.body.appendChild(modalOverlay);
+	});
+}
+
 export function show_message(msg) {
 	app.ui.dialog.show(msg);
-	app.ui.dialog.element.style.zIndex = 10010;
+	app.ui.dialog.element.style.zIndex = 1100;
 }
 
 export async function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export function rebootAPI() {
-	if (confirm("Are you sure you'd like to reboot the server?")) {
-		try {
-			api.fetchApi("/manager/reboot");
-		}
-		catch(exception) {
+export async function customConfirm(message) {
+	try {
+		let res = await
+			window['app'].extensionManager.dialog
+			.confirm({
+				title: 'Confirm',
+				message: message
+			});
 
-		}
-		return true;
+		return res;
 	}
+	catch {
+		let res = await internalCustomConfirm(message);
+		return res;
+	}
+}
+
+export function rebootAPI() {
+	if ('electronAPI' in window) {
+			window.electronAPI.restartApp();
+			return true;
+	}
+
+	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
+		if (isConfirmed) {
+			try {
+				api.fetchApi("/manager/reboot");
+			}
+			catch(exception) {}
+		}
+	});
 
 	return false;
 }
@@ -237,4 +350,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/components-manager.js

@@ -1,9 +1,11 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js"
-import { sleep, show_message } from "./common.js";
+import { sleep, show_message, customConfirm } from "./common.js";
 import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 
+const SEPARATOR = ">"
+
 let pack_map = {};
 let rpack_map = {};
 
@@ -20,7 +22,7 @@ export function getPureName(node) {
 		let purename = node.comfyClass.substring(category.length+1);
 		return purename;
 	}
-	else if(node.comfyClass.startsWith('workflow/')) {
+	else if(node.comfyClass.startsWith('workflow/') || node.comfyClass.startsWith(`workflow${SEPARATOR}`)) {
 		return node.comfyClass.substring(9);
 	}
 	else {
@@ -76,7 +78,7 @@ export async function load_components() {
 
 				let category = data.packname;
 				if(data.category) {
-					category += "/" + data.category;
+					category += SEPARATOR + data.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -100,7 +102,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -139,7 +141,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -174,7 +176,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.workflow.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -234,7 +236,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
 
 		let category = body.workflow.packname;
 		if(body.workflow.category) {
-			category += "/" + body.workflow.category;
+			category += SEPARATOR + body.workflow.category;
 		}
 		if(category == '') {
 			category = 'components';
@@ -266,7 +268,7 @@ async function import_component(component_name, component, mode) {
 
 	let category = component.packname;
 	if(component.category) {
-		category += "/" + component.category;
+		category += SEPARATOR + component.category;
 	}
 	if(category == '') {
 		category = 'components';
@@ -363,7 +365,7 @@ function checkVersion(name, component) {
 	return msg;
 }
 
-function handle_import_components(components) {
+async function handle_import_components(components) {
 	let msg = 'Components:\n';
 	let cnt = 0;
 	for(let name in components) {
@@ -385,8 +387,9 @@ function handle_import_components(components) {
 
 	let last_name = null;
 	msg += '\nWill you load components?\n';
-	if(confirm(msg)) {
-		let mode = confirm('\nWill you save components?\n(cancel=load without save)');
+	const confirmed = await customConfirm(msg);
+	if(confirmed) {
+		const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
 
 		for(let name in components) {
 			let component = components[name];
@@ -403,13 +406,13 @@ function handle_import_components(components) {
 	}
 
 	if(cnt == 1 && last_name) {
-		const node = LiteGraph.createNode(`workflow/${last_name}`);
+		const node = LiteGraph.createNode(`workflow${SEPARATOR}${last_name}`);
 		node.pos = [app.canvas.graph_mouse[0], app.canvas.graph_mouse[1]];
 		app.canvas.graph.add(node, false);
 	}
 }
 
-function handlePaste(e) {
+async function handlePaste(e) {
 	let data = (e.clipboardData || window.clipboardData);
 	const items = data.items;
 	for(const item of items) {
@@ -419,7 +422,7 @@ function handlePaste(e) {
 				let json_data = JSON.parse(data);
 				if(json_data.kind == 'ComfyUI Components' && last_paste_timestamp != json_data.timestamp) {
 					last_paste_timestamp = json_data.timestamp;
-					handle_import_components(json_data.components);
+					await handle_import_components(json_data.components);
 
 					// disable paste node
 					localStorage.removeItem("litegrapheditor_clipboard", null);
@@ -453,7 +456,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 		this.invalidateControl();
 
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1100;
 		this.element.style.width = "500px";
 		this.element.style.height = "480px";
 	}
@@ -675,7 +678,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 
 let orig_handleFile = app.handleFile;
 
-function handleFile(file) {
+async function handleFile(file) {
 	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
 		const reader = new FileReader();
 		reader.onload = async () => {
@@ -688,7 +691,7 @@ function handleFile(file) {
 			}
 
 			if(is_component) {
-				handle_import_components(jsonContent);
+				await handle_import_components(jsonContent);
 			}
 			else {
 				orig_handleFile.call(app, file);
@@ -786,7 +789,7 @@ app.graphToPrompt = async function () {
 			// get used group nodes
 			let used_group_nodes = new Set();
 			for(let node of p.workflow.nodes) {
-				if(node.type.startsWith('workflow/')) {
+				if(node.type.startsWith(`workflow/`) || node.type.startsWith(`workflow${SEPARATOR}`)) {
 					used_group_nodes.add(node.type.substring(9));
 				}
 			}

js/custom-nodes-manager.js

@@ -2,7 +2,7 @@ import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, install_via_git_url, 
-	fetchData, md5, icons 
+	fetchData, md5, icons, customConfirm
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
@@ -919,7 +919,9 @@ export class CustomNodesManager {
 
 		if(mode === "uninstall") {
 			title = title || `${list.length} custom nodes`;
-			if (!confirm(`Are you sure uninstall ${title}?`)) {
+
+			const confirmed = await customConfirm(`Are you sure uninstall ${title}?`);
+			if (!confirmed) {
 				return;
 			}
 		}
@@ -1106,7 +1108,7 @@ export class CustomNodesManager {
 
 		for (let i in nodes) {
 			const node_type = nodes[i].type;
-			if(node_type.startsWith('workflow/'))
+			if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
 				continue;
 
 			if (!registered_nodes.has(node_type)) {
@@ -1125,17 +1127,6 @@ export class CustomNodesManager {
 			}
 		}
 
-		const resUnresolved = await fetchData(`/component/get_unresolved`);
-		const unresolved = resUnresolved.data;
-		if (unresolved && unresolved.nodes) {
-			unresolved.nodes.forEach(node_type => {
-				const url = name_to_urls[node_type];
-				if(url) {
-					missing_nodes.add(url);
-				}
-			});
-		}
-
 		const hashMap = {};
 		this.custom_nodes.forEach(item => {
 			if (item.files.some(file => missing_nodes.has(file))) {

js/model-manager.js

@@ -10,7 +10,7 @@ import TG from "./turbogrid.esm.js";
 const pageCss = `
 .cmm-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 10001;
+	z-index: 1100;
 	width: 80%;
 	height: 80%;
 	display: flex;

js/node_fixer.js

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

js/snapshot.js

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

js/terminal.js

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

json-checker.py

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

node_db/forked/custom-node-list.json

@@ -1,5 +1,65 @@
 {
     "custom_nodes": [
+        {
+            "author": "BlenderNeko",
+            "title": "ltdrdata/ComfyUI_TiledKSampler",
+            "reference": "https://github.com/ltdrdata/ComfyUI_TiledKSampler",
+            "files": [
+                "https://github.com/ltdrdata/ComfyUI_TiledKSampler"
+            ],
+            "install_type": "git-clone",
+            "description": "PR for [a/https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59](https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-Hamer",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-Hamer",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-Hamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/hamer](https://github.com/geopavlakos/hamer)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-GVHMR",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-GVHMR",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-GVHMR"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/GVHMR](https://github.com/zju3dv/GVHMR)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "RealisDance-ComfyUI",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-RealisDance",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-RealisDance"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice RealisDance-ComfyUI by leo\nNOTE:base on [a/RealisDance](https://github.com/damo-cv/RealisDance), modified on [a/RealisDanceComfyui](https://github.com/AIFSH/RealisDance-ComfyUI)"
+        },
+        {
+            "author": "jags111",
+            "title": "NyaamZ/efficiency-nodes-ED",
+            "reference": "https://github.com/NyaamZ/efficiency-nodes-ED",
+            "files": [
+                "https://github.com/NyaamZ/efficiency-nodes-ED"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports efficiency-nodes-comfyui. Additional features."
+        },
+        {
+            "author": "SeaArtLab",
+            "title": "zer0int/ComfyUI-Long-CLIP",
+            "reference": "https://github.com/zer0int/ComfyUI-Long-CLIP",
+            "files": [
+                "https://github.com/zer0int/ComfyUI-Long-CLIP"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports FLUX.1 not only SD1.5, SDXL."
+        },
         {
             "author": "meimeilook",
             "title": "ComfyUI_IPAdapter_plus.old [backward compatbility]",
@@ -49,6 +109,16 @@
             ],
             "install_type": "git-clone",
             "description": "This is a development respository for debugging migration of StableSR to ComfyUI\n\nNOTE:Forked from [https://github.com/gameltb/Comfyui-StableSR]\nPut the StableSR [a/webui_786v_139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/webui_768v_139.ckpt) model into Comyfui/models/stablesr/, Put the StableSR [a/stablesr_768v_000139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/stablesr_768v_000139.ckpt) model into Comyfui/models/checkpoints/"
+        },
+        {
+            "author": "city96",
+            "title": "Efficient-Large-Model/Extra Models for ComfyUI",
+            "reference": "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels",
+            "files": [
+                "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels"
+            ],
+            "install_type": "git-clone",
+            "description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
         }
     ]
 }

node_db/legacy/custom-node-list.json

@@ -9,7 +9,547 @@
             "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": "daqingliu",
+            "title": "ComfyUI-SaveImageOSS [REMOVED]",
+            "reference": "https://github.com/daqingliu/ComfyUI-SaveImageOSS",
+            "files": [
+                "https://github.com/daqingliu/ComfyUI-SaveImageOSS"
+            ],
+            "install_type": "git-clone",
+            "description": "Save images directly to URL, e.g., OSS. Just input the url in the text box!"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-textarea-keybindings [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-textarea-keybindings",
+            "files": [
+                "https://github.com/shinich39/comfyui-textarea-keybindings"
+            ],
+            "install_type": "git-clone",
+            "description": "Add keybindings to textarea."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-load-image-with-cmd [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-load-image-with-cmd",
+            "files": [
+                "https://github.com/shinich39/comfyui-load-image-with-cmd"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image and partially workflow with javascript."
+        },
+        {
+            "author": "neuratech-ai",
+            "title": "ComfyUI-MultiGPU [NOT MAINTAINED]",
+            "reference": "https://github.com/neuratech-ai/ComfyUI-MultiGPU",
+            "files": [
+                "https://github.com/neuratech-ai/ComfyUI-MultiGPU"
+            ],
+            "install_type": "git-clone",
+            "description": "Experimental nodes for using multiple GPUs in a single ComfyUI workflow.\nThis extension adds new nodes for model loading that allow you to specify the GPU to use for each model. It monkey patches the memory management of ComfyUI in a hacky way and is neither a comprehensive solution nor a well-tested one. Use at your own risk.\nNote that this does not add parallelism. The workflow steps are still executed sequentially just on different GPUs. Any potential speedup comes from not having to constantly load and unload models from VRAM."
+        },
+        {
+            "author": "jefferyharrell",
+            "title": "ComfyUI-JHXMP [REMOVED]",
+            "reference": "https://github.com/jefferyharrell/ComfyUI-JHXMP",
+            "files": [
+                "https://github.com/jefferyharrell/ComfyUI-JHXMP"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Save Image With XMP Metadata"
+        },
+        {
+            "author": "viperyl",
+            "title": "ComfyUI-BiRefNet [NOT MAINTAINED]",
+            "id": "comfyui-birefnet",
+            "reference": "https://github.com/viperyl/ComfyUI-BiRefNet",
+            "files": [
+                "https://github.com/viperyl/ComfyUI-BiRefNet"
+            ],
+            "install_type": "git-clone",
+            "description": "Bilateral Reference Network achieves SOTA result in multi Salient Object Segmentation dataset, this repo pack BiRefNet as ComfyUI nodes, and make this SOTA model easier use for everyone."
+        },
+        {
+            "author": "asagi4",
+            "title": "ComfyUI prompt control (LEGACY VERSION)",
+            "reference": "https://github.com/asagi4/comfyui-prompt-control-legacy",
+            "files": [
+                "https://github.com/asagi4/comfyui-prompt-control-legacy"
+            ],
+            "install_type": "git-clone",
+            "description": "WARNING: These nodes exist only to reproduce old workflows. They are unmaintained See https://github.com/asagi4/comfyui-prompt-control for the revised, current version of prompt control."
+        },
+        {
+            "author": "doomy23",
+            "title": "ComfyUI-D00MYsNodes [REMOVED]",
+            "reference": "https://github.com/doomy23/ComfyUI-D00MYsNodes",
+            "files": [
+                "https://github.com/doomy23/ComfyUI-D00MYsNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: Images_Converter, Show_Text, Strings_From_List, Save_Text, Random_Images, Load_Images_From_Paths, JSPaint."
+        },
+        {
+            "author": "kadirnar",
+            "title": "comfyui_hub [REMOVED]",
+            "reference": "https://github.com/kadirnar/comfyui_hub",
+            "files": [
+                "https://github.com/kadirnar/comfyui_hub"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of nodes randomly selected and gathered, related to noise. NOTE: SD-Advanced-Noise, noise_latent_perlinpinpin, comfy-plasma"
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI_AudioViz [REMOVED]",
+            "id": "saltai-audioviz",
+            "reference": "https://github.com/get-salt-AI/SaltAI_AudioViz",
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI_AudioViz"
+            ],
+            "install_type": "git-clone",
+            "description": "SaltAI AudioViz contains ComfyUI nodes for generating complex audio reactive visualizations"
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI-Open-Resources [REMOVED]",
+            "id": "saltai-open-resource",
+            "reference": "https://github.com/get-salt-AI/SaltAI",
+            "pip": ["numba"],
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository is a collection of open-source nodes and workflows for ComfyUI, a dev tool that allows users to create node-based workflows often powered by various AI models to do pretty much anything.\nOur mission is to seamlessly connect people and organizations with the world’s foremost AI innovations, anywhere, anytime. Our vision is to foster a flourishing AI ecosystem where the world’s best developers can build and share their work, thereby redefining how software is made, pushing innovation forward, and ensuring as many people as possible can benefit from the positive promise of AI technologies.\nWe believe that ComfyUI is a powerful tool that can help us achieve our mission and vision, by enabling anyone to explore the possibilities and limitations of AI models in a visual and interactive way, without coding if desired.\nWe hope that by sharing our nodes and workflows, we can inspire and empower more people to create amazing AI-powered content with ComfyUI."
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI_Language_Toolkit [REMOVED]",
+            "id": "saltai_language_toolkit",
+            "reference": "https://github.com/get-salt-AI/SaltAI_Language_Toolkit",
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI_Language_Toolkit"
+            ],
+            "install_type": "git-clone",
+            "description": "The project integrates the Retrieval Augmented Generation (RAG) tool [a/Llama-Index](https://www.llamaindex.ai/), [a/Microsoft's AutoGen](https://microsoft.github.io/autogen/), and [a/LlaVA-Next](https://github.com/LLaVA-VL/LLaVA-NeXT) with ComfyUI's adaptable node interface, enhancing the functionality and user experience of the platform."
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-Sana [DEPRECATED]",
+            "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": "ACE-innovate",
+            "title": "seg-node [REMOVED]",
+            "reference": "https://github.com/ACE-innovate/seg-node",
+            "files": [
+                "https://github.com/ACE-innovate/seg-node"
+            ],
+            "install_type": "git-clone",
+            "description": "hf cloth seg custom node for comfyui\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "zefu-lu",
+            "title": "ComfyUI_InstantX_SD35_Large_IPAdapter [REMOVED]",
+            "id": "comfyui-instantx-sd3-5-large-ipadapter",
+            "reference": "https://github.com/zefu-lu/ComfyUI-InstantX-SD3_5-Large-IPAdapter",
+            "files": [
+                "https://github.com/zefu-lu/ComfyUI-InstantX-SD3_5-Large-IPAdapter"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom ComfyUI node for using InstantX SD3.5-Large IPAdapter"
+        },
+        {
+            "author": "HentaiGirlfriendDotCom",
+            "title": "comfyui-highlight-connections [REMOVED]",
+            "reference": "https://github.com/HentaiGirlfriendDotCom/comfyui-highlight-connections",
+            "files": [
+                "https://github.com/HentaiGirlfriendDotCom/comfyui-highlight-connections"
+            ],
+            "install_type": "git-clone",
+            "description": "A node that can be dropped into a group. When a node is then clicked within that group, all nodes and connections in that group get greyed out and the connections from the clicked node go bright red."
+        },
+        {
+            "author": "huangyangke",
+            "title": "ComfyUI-Kolors-IpadapterFaceId [DEPRECATED]",
+            "reference": "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId",
+            "files": [
+                "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:kolors_ipadapter_faceid\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI_Ctrlora [DEPRECATED]",
+            "reference": "https://github.com/zmwv823/ComfyUI_Ctrlora",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI_Ctrlora"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial custom_node for [a/xyfJASON/ctrlora](https://github.com/xyfJASON/ctrlora)."
+        },
+        {
+            "author": "Fannovel16",
+            "title": "ComfyUI Loopchain [DEPRECATED]",
+            "id": "loopchain",
+            "reference": "https://github.com/Fannovel16/ComfyUI-Loopchain",
+            "files": [
+                "https://github.com/Fannovel16/ComfyUI-Loopchain"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of nodes which can be useful for animation in ComfyUI. The main focus of this extension is implementing a mechanism called loopchain. A loopchain in this case is the chain of nodes only executed repeatly in the workflow. If a node chain contains a loop node from this extension, it will become a loop chain."
+        },
+        {
+            "author": "DonBaronFactory",
+            "title": "ComfyUI-Cre8it-Nodes [DEPRECATED]",
+            "reference": "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes",
+            "files": [
+                "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:CRE8IT Serial Prompter, CRE8IT Apply Serial Prompter, CRE8IT Image Sizer. A few simple nodes to facilitate working wiht ComfyUI Workflows"
+        },
+        {
+            "author": "thecooltechguy",
+            "title": "ComfyUI-ComfyRun [DEPRECATED/UNSAFE]",
+            "reference": "https://github.com/thecooltechguy/ComfyUI-ComfyRun",
+            "files": [
+                "https://github.com/thecooltechguy/ComfyUI-ComfyRun"
+            ],
+            "install_type": "git-clone",
+            "description": "The easiest way to run & share any ComfyUI workflow [a/https://comfyrun.com](https://comfyrun.com)\nNOTE: Vulnerability discovered. Not being managed."
+        },
+        {
+            "author": "Cardoso-topdev",
+            "title": "comfyui_meshanything_v1 [REMOVED]",
+            "reference": "https://github.com/Cardoso-topdev/comfyui_meshanything_v1",
+            "files": [
+                "https://github.com/Cardoso-topdev/comfyui_meshanything_v1"
+            ],
+            "install_type": "git-clone",
+            "description": "MeshAnything V2: Artist-Created Mesh Generation With Adjacent Mesh Tokenization"
+        },
+        {
+            "author": "palant",
+            "title": "Extended Save Image for ComfyUI [DEPRECATED]",
+            "reference": "https://github.com/palant/extended-saveimage-comfyui",
+            "files": [
+                "https://github.com/palant/extended-saveimage-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node is largely identical to the usual Save Image but allows saving images also in JPEG and WEBP formats, the latter with both lossless and lossy compression. Metadata is embedded in the images as usual, and the resulting images can be used to load a workflow."
+        },
+        {
+            "author": "1038lab",
+            "title": "ComfyUI-GPT2P [REMOVED]",
+            "id": "gpt2p",
+            "reference": "https://github.com/1038lab/ComfyUI-GPT2P",
+            "files": [
+                "https://github.com/1038lab/ComfyUI-GPT2P"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Node - Hugging Face repositories GTP2 Prompt"
+        },
+        {
+            "author": "yushan777",
+            "title": "Y7 Nodes for ComfyUI [REMOVED]",
+            "id": "y7nodes",
+            "reference": "https://github.com/yushan777/ComfyUI-Y7Nodes",
+            "files": [
+                "https://github.com/yushan777/ComfyUI-Y7Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Count_Tokens_(Y7)"
+        },
+        {
+            "author": "city96",
+            "title": "SD-Advanced-Noise [DEPRECATED]",
+            "id": "adv-noise",
+            "reference": "https://github.com/city96/SD-Advanced-Noise",
+            "files": [
+                "https://github.com/city96/SD-Advanced-Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: LatentGaussianNoise, MathEncode. An experimental custom node that generates latent noise directly by utilizing the linear characteristics of the latent space."
+        },
+        {
+            "author": "shockz0rz",
+            "title": "InterpolateEverything [DEPRECATED]",
+            "id": "interpolate-everything",
+            "reference": "https://github.com/shockz0rz/ComfyUI_InterpolateEverything",
+            "files": [
+                "https://github.com/shockz0rz/ComfyUI_InterpolateEverything"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: Interpolate Poses, Interpolate Lineart, ... Custom nodes for interpolating between, well, everything in the Stable Diffusion ComfyUI."
+        },
+        {
+            "author": "svdC1",
+            "title": "LoRa Dataset Tools [REMOVED]",
+            "reference": "https://github.com/svdC1/comfy-ui-lora-dataset-tools",
+            "files": [
+                "https://github.com/svdC1/comfy-ui-lora-dataset-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Directory Loader, Filter Images Without Faces, Detect Faces and Draw Detection Box"
+        },
+        {
+            "author": "MiddleKD",
+            "title": "ComfyUI-default-workflow-setter [REMOVED]",
+            "reference": "https://github.com/MiddleKD/ComfyUI-default-workflow-setter",
+            "files": [
+                "https://github.com/MiddleKD/ComfyUI-default-workflow-setter"
+            ],
+            "install_type": "git-clone",
+            "description": "Default workflow setter"
+        },
+        {
+            "author": "Firetheft",
+            "title": "ComfyUI-Flux-Prompt-Tools [REMOVED]",
+            "reference": "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools",
+            "files": [
+                "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Flux Prompt Enhance, Flux Prompt Gemini Flash, Flux Prompt Generator, MiniCPM V2.6 Int4"
+        },
+        {
+            "author": "jtydhr88",
+            "title": "ComfyUI Unique3D [DEPRECATED]",
+            "id": "unique3d",
+            "reference": "https://github.com/jtydhr88/ComfyUI-Unique3D",
+            "files": [
+                "https://github.com/jtydhr88/ComfyUI-Unique3D"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Unique3D is custom nodes that running AiuniAI/Unique3D into ComfyUI[w/Please follow readme to install with ComfyUI embedded python.]"
+        },
+        {
+            "author": "mpiquero7164",
+            "title": "SaveImgPrompt [DEPRECATED]",
+            "id": "save-imgprompt",
+            "reference": "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt",
+            "files": [
+                "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt"
+            ],
+            "install_type": "git-clone",
+            "description": "Save a png or jpeg and option to save prompt/workflow in a text or json file for each image in Comfy + Workflow loading."
+        },
+        {
+            "author": "guoyk93",
+            "title": "y.k.'s ComfyUI node suite [DEPRECATED]",
+            "id": "yks",
+            "reference": "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui",
+            "files": [
+                "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: YKImagePadForOutpaint, YKMaskToImage"
+        },
+        {
+            "author": "adityathiru",
+            "title": "ComfyUI LLMs [REMOVED]",
+            "reference": "https://github.com/adityathiru/ComfyUI-LLMs",
+            "files": [
+                "https://github.com/adityathiru/ComfyUI-LLMs"
+            ],
+            "install_type": "git-clone",
+            "description": "Goal: To enable folks to rapidly build complex workflows with LLMs\nNOTE:☠️ This is experimental and not recommended to use in a production environment (yet!)"
+        },
+        {
+            "author": "DannyStone1999",
+            "title": "ComfyUI-Depth2Mask [REMOVED]",
+            "reference": "https://github.com/DannyStone1999/ComfyUI-Depth2Mask",
+            "files": [
+                "https://github.com/DannyStone1999/ComfyUI-Depth2Mask/raw/main/Depth2Mask.py"
+            ],
+            "install_type": "copy",
+            "description": "Nodes:Depth2Mask"
+        },
+        {
+            "author": "syaofox",
+            "title": "ComfyUI_FoxTools [REMOVED]",
+            "reference": "https://github.com/syaofox/ComfyUI_FoxTools",
+            "files": [
+                "https://github.com/syaofox/ComfyUI_FoxTools"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:BatchImageFromList, Load Face Occlusion Model, Create Face Mask, Simple FaceAlign, Cacul FaceAlign, Gen Blurbord, Face Align, Face Rotate, ImageAdd, LoadImageList, SaveImage Plus, RegTextFind"
+        },
+        {
+            "author": "AIFSH",
+            "title": "SeedVC-ComfyUI [REMOVED]",
+            "reference": "https://github.com/AIFSH/SeedVC-ComfyUI",
+            "files": [
+                "https://github.com/AIFSH/SeedVC-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "a custom node for [a/seed-vc](https://github.com/Plachtaa/seed-vc)"
+        },
+        {
+            "author": "jazhang00",
+            "title": "ComfyUI Node for Slicedit [REMOVED]",
+            "reference": "https://github.com/jazhang00/ComfyUI-Slicedit",
+            "files": [
+                "https://github.com/jazhang00/ComfyUI-Slicedit"
+            ],
+            "install_type": "git-clone",
+            "description": "Slicedit main page: [a/https://matankleiner.github.io/slicedit/](https://matankleiner.github.io/slicedit/). Use Slicedit with ComfyUI."
+        },
+        {
+            "author": "rklaffehn",
+            "title": "rk-comfy-nodes [REMOVED]",
+            "id": "rknodes",
+            "reference": "https://github.com/rklaffehn/rk-comfy-nodes",
+            "files": [
+                "https://github.com/rklaffehn/rk-comfy-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: RK_CivitAIMetaChecker, RK_CivitAIAddHashes."
+        },
+        {
+            "author": "Extraltodeus",
+            "title": "CLIP-Token-Injection [REMOVED]",
+            "reference": "https://github.com/Extraltodeus/CLIP-Token-Injection",
+            "files": [
+                "https://github.com/Extraltodeus/CLIP-Token-Injection"
+            ],
+            "install_type": "git-clone",
+            "description": "These nodes are to edit the text vectors of CLIP models, so to customize how the prompts will be interpreted. You could see it as either customisation, 'one token prompt' up to some limitation and a way to mess with how the text will be interpreted. The edited CLIP can then be saved, or as well the edited tokens themselves. The shared example weights does not contain any image-knowledge but the text vector of the words affected."
+        },
+        {
+            "author": "openart",
+            "title": "openart-comfyui-deploy [REMOVED]",
+            "id": "openart-comfyui-deploy",
+            "reference": "https://github.com/kulsisme/openart-comfyui-deploy",
+            "files": [
+                "https://github.com/kulsisme/openart-comfyui-deploy"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: External Boolean (ComfyUI Deploy), External Checkpoint (ComfyUI Deploy), External Image (ComfyUI Deploy), External Video (ComfyUI Deploy x VHS), OpenArt Text, Image Websocket Output (ComfyDeploy), ..."
+        },
+        {
+            "author": "mittimi",
+            "title": "ComfyUI_mittimiLoadPreset [DEPRECATED]",
+            "id": "comfyui-mittimi-load-preset",
+            "reference": "https://github.com/mittimi/ComfyUI_mittimiLoadPreset",
+            "files": [
+                "https://github.com/mittimi/ComfyUI_mittimiLoadPreset"
+            ],
+            "install_type": "git-clone",
+            "description": "The system selects and loads preset."
+        },
+        {
+            "author": "jinljin",
+            "title": "ComfyUI-Talking-Head [REMOVED]",
+            "reference": "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine",
+            "files": [
+                "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI-Talking-Head"
+        },
+        {
+            "author": "jh-leon-kim",
+            "title": "ComfyUI-JHK-utils [REMOVED]",
+            "id": "jhk",
+            "reference": "https://github.com/jh-leon-kim/ComfyUI-JHK-utils",
+            "files": [
+                "https://github.com/jh-leon-kim/ComfyUI-JHK-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:JHK_Utils_LoadEmbed, JHK_Utils_string_merge, JHK_Utils_ImageRemoveBackground"
+        },
+        {
+            "author": "ilovejohnwhite",
+            "title": "TatToolkit [REMOVED]",
+            "reference": "https://github.com/ilovejohnwhite/UncleBillyGoncho",
+            "files": [
+                "https://github.com/ilovejohnwhite/UncleBillyGoncho"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:UWU TTK Preprocessor, Pixel Perfect Resolution, Generation Resolution From Image, Generation Resolution From Latent, Enchance And Resize Hint Images, ..."
+        },
+        {
+            "author": "hzchet",
+            "title": "ComfyUI_QueueGeneration [REMOVED]",
+            "reference": "https://github.com/hzchet/ComfyUI_QueueGeneration",
+            "files": [
+                "https://github.com/hzchet/ComfyUI_QueueGeneration"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Queue Img2Vid Generation"
+        },
+        {
+            "author": "ader47",
+            "title": "ComfyUI-MeshHamer [REMOVED]",
+            "reference": "https://github.com/ader47/comfyui_meshhamer",
+            "files": [
+                "https://github.com/ader47/comfyui_meshhamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:MeshHamer Hand Refiner. See also: [a/HaMeR: Hand Mesh Recovery](https://github.com/geopavlakos/hamer/tree/main)"
+        },
+        {
+            "author": "SEkINVR",
+            "title": "ComfyUI-Animator",
+            "reference": "https://github.com/SEkINVR/ComfyUI-Animator [REMOVED]",
+            "files": [
+                "https://github.com/SEkINVR/ComfyUI-Animator"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI provides full-body animation capabilities, including facial rigging, various lighting styles, and green screen output."
+        },
+        {
+            "author": "ZHO-ZHO-ZHO",
+            "title": "ComfyUI-AnyText [NOT MAINTAINED]",
+            "reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-AnyText",
+            "files": [
+                "https://github.com/ZHO-ZHO-ZHO/ComfyUI-AnyText"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial implementation of [a/AnyText](https://github.com/tyxsspa/AnyText/tree/825bcc54687206b15bd7e28ba1a8b095989d58e3) for ComfyUI（EXP）"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-pkg39 [DEPRECATED]",
+            "reference": "https://github.com/shinich39/comfyui-pkg39",
+            "files": [
+                "https://github.com/shinich39/comfyui-pkg39"
+            ],
+            "install_type": "git-clone",
+            "description": "This package has created for generate image from generated image and embedded workflow."
+        },
+        {
+            "author": "dnl13",
+            "title": "ComfyUI-dnl13-seg [DEPRECATED]",
+            "reference": "https://github.com/dnl13/ComfyUI-dnl13-seg",
+            "files": [
+                "https://github.com/dnl13/ComfyUI-dnl13-seg"
+            ],
+            "install_type": "git-clone",
+            "description": "After discovering @storyicon implementation here of Segment Anything, I realized its potential as a powerful tool for ComfyUI if implemented correctly. I delved into the SAM and Dino models. The following is my own adaptation of sam_hq for ComfyUI."
+        },
+        {
+            "author": "1038lab",
+            "title": "ComfyUI-latentSizeSelector [REMOVED]",
+            "id": "ComfyUI-latentSizeSelector",
+            "reference": "https://github.com/1038lab/ComfyUI_LatentSizeSelector",
+            "files": [
+                "https://github.com/1038lab/ComfyUI_LatentSizeSelector"
+            ],
+            "install_type": "git-clone",
+            "description": "You'll get a new node Latent Size Selector, you can pick the x and y sizes from a list."
+        },
         {
             "author": "hy134300",
             "title": "ComfyUI-PhotoMaker-V2 [REMOVED]",
@@ -63,17 +603,6 @@
             "install_type": "git-clone",
             "description": "Some simple string tools to modify text and strings in ComfyUI."
         },
-        {
-            "author": "zmwv823",
-            "title": "ComfyUI-AnyText [DEPRECATED]",
-            "id": "anytext",
-            "reference": "https://github.com/zmwv823/ComfyUI-AnyText",
-            "files": [
-                "https://github.com/zmwv823/ComfyUI-AnyText"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial Simple And Rough Implementation Of [a/AnyText](https://github.com/tyxsspa/AnyText)"
-        },
         {
             "author": "Millyarde",
             "title": "Pomfy - Photoshop and ComfyUI 2-way sync [REMOVED]",

node_db/tutorial/custom-node-list.json

@@ -90,16 +90,6 @@
             "install_type": "git-clone",
             "description": "Nodes:WW_ImageResize"
         },
-        {
-            "author": "bmz55",
-            "title": "bmz nodes",
-            "reference": "https://github.com/bmz55/comfyui-bmz-nodes",
-            "files": [
-                "https://github.com/bmz55/comfyui-bmz-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Load Images From Dir With Name (Inspire - BMZ), Count Images In Dir (BMZ), Get Level Text (BMZ), Get Level Float (BMZ)"
-        },
         {
             "author": "azure-dragon-ai",
             "title": "ComfyUI-HPSv2-Nodes",
@@ -150,36 +140,6 @@
             "install_type": "git-clone",
             "description": "This module provides an annotation @ComfyFunc to streamline adding custom node types in ComfyUI. It processes your function's signature to create a wrapped function and custom node definition required for ComfyUI, eliminating all the boilerplate code. In most cases you can just add a @ComfyFunc(\"category\") annotation to your existing function."
         },
-        {
-            "author": "MokkaBoss1",
-            "title": "Woman_in_a_dress",
-            "reference": "https://github.com/MokkaBoss1/Woman_in_a_dress",
-            "files": [
-                "https://github.com/MokkaBoss1/Woman_in_a_dress/raw/main/Woman_In_A_Dress.py"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Woman_in_a_dress"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-concat-text-39",
-            "reference": "https://github.com/shinich39/comfyui-concat-text-39",
-            "files": [
-                "https://github.com/shinich39/comfyui-concat-text-39"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Concatenate multiple text nodes."
-        },
-        {
-            "author": "nilor-corp",
-            "title": "nilor-nodes",
-            "reference": "https://github.com/nilor-corp/nilor-nodes",
-            "files": [
-                "https://github.com/nilor-corp/nilor-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Nilor Floats, Nilor Int To List Of Bools, Nilor Bool From List Of Bools, Nilor Int From List Of Ints, Nilor List of Ints, Nilor Count Images In Directory"
-        },
         {
             "author": "OuticNZ",
             "title": "ComfyUI-Simple-Of-Complex",
@@ -260,6 +220,46 @@
             ],
             "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"
+        },
+        {
+            "author": "FelixTeutsch",
+            "title": "BachelorThesis",
+            "reference": "https://github.com/FelixTeutsch/BachelorThesis",
+            "files": [
+                "https://github.com/FelixTeutsch/BachelorThesis"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a ComfyUi custom node, that build a new UI on top of the already existing AI, to enable the use of custom controllers"
+        },
+        {
+            "author": "jhj0517",
+            "title": "ComfyUI-CustomNodes-Template",
+            "reference": "https://github.com/jhj0517/ComfyUI-CustomNodes-Template",
+            "files": [
+                "https://github.com/jhj0517/ComfyUI-CustomNodes-Template"
+            ],
+            "install_type": "git-clone",
+            "description": "This is the ComfyUI custom node template repository that anyone can use to create their own custom nodes."
         }
     ]
 }

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/*.py > /dev/null
-python ../../scanner.py
+rm ~/.tmp/dev/*.py > /dev/null 2>&1
+python ../../scanner.py ~/.tmp/tutorial

notebooks/comfyui_colab_with_manager.ipynb

@@ -1,372 +1,373 @@
 {
-  "cells": [
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "aaaaaaaaaa"
-      },
-      "source": [
-        "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "bbbbbbbbbb"
-      },
-      "outputs": [],
-      "source": [
-        "# #@title Environment Setup\n",
-        "\n",
-        "from pathlib import Path\n",
-        "\n",
-        "OPTIONS = {}\n",
-        "\n",
-        "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
-        "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
-        "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
-        "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
-        "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
-        "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
-        "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
-        "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
-        "\n",
-        "current_dir = !pwd\n",
-        "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
-        "\n",
-        "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
-        "    !echo \"Mounting Google Drive...\"\n",
-        "    %cd /\n",
-        "\n",
-        "    from google.colab import drive\n",
-        "    drive.mount('/content/drive')\n",
-        "\n",
-        "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
-        "    %cd /content/drive/MyDrive\n",
-        "\n",
-        "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
-        "%cd $WORKSPACE\n",
-        "\n",
-        "if OPTIONS['UPDATE_COMFY_UI']:\n",
-        "  !echo -= Updating ComfyUI =-\n",
-        "\n",
-        "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-        "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
-        "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
-        "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
-        "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
-        "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
-        "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
-        "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
-        "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
-        "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
-        "\n",
-        "  !git pull\n",
-        "\n",
-        "!echo -= Install dependencies =-\n",
-        "!pip3 install accelerate\n",
-        "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
-        "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
-        "!pip3 install torchsde\n",
-        "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
-        "\n",
-        "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
-        "  %cd custom_nodes\n",
-        "\n",
-        "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-        "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
-        "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
-        "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
-        "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
-        "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
-        "\n",
-        "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
-        "  %cd ComfyUI-Manager\n",
-        "  !git pull\n",
-        "\n",
-        "%cd $WORKSPACE\n",
-        "\n",
-        "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
-        "  !echo -= Install custom nodes dependencies =-\n",
-        "  !pip install GitPython\n",
-        "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cccccccccc"
-      },
-      "source": [
-        "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "dddddddddd"
-      },
-      "outputs": [],
-      "source": [
-        "# Checkpoints\n",
-        "\n",
-        "### SDXL\n",
-        "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
-        "\n",
-        "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
-        "\n",
-        "# SDXL ReVision\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
-        "\n",
-        "# SD1.5\n",
-        "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
-        "\n",
-        "# SD2\n",
-        "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
-        "\n",
-        "# Some SD1.5 anime style\n",
-        "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
-        "\n",
-        "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
-        "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
-        "\n",
-        "\n",
-        "# unCLIP models\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-        "\n",
-        "\n",
-        "# VAE\n",
-        "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
-        "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
-        "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
-        "\n",
-        "\n",
-        "# Loras\n",
-        "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
-        "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
-        "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
-        "\n",
-        "\n",
-        "# T2I-Adapter\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
-        "\n",
-        "# T2I Styles Model\n",
-        "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
-        "\n",
-        "# CLIPVision model (needed for styles model)\n",
-        "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
-        "\n",
-        "\n",
-        "# ControlNet\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
-        "\n",
-        "# ControlNet SDXL\n",
-        "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
-        "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
-        "\n",
-        "# Controlnet Preprocessor nodes by Fannovel16\n",
-        "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
-        "\n",
-        "\n",
-        "# GLIGEN\n",
-        "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
-        "\n",
-        "\n",
-        "# ESRGAN upscale model\n",
-        "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
-        "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
-        "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
-        "\n",
-        "\n"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "kkkkkkkkkkkkkkk"
-      },
-      "source": [
-        "### Run ComfyUI with cloudflared (Recommended Way)\n",
-        "\n",
-        "\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "jjjjjjjjjjjjjj"
-      },
-      "outputs": [],
-      "source": [
-        "!wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
-        "!dpkg -i cloudflared-linux-amd64.deb\n",
-        "\n",
-        "import subprocess\n",
-        "import threading\n",
-        "import time\n",
-        "import socket\n",
-        "import urllib.request\n",
-        "\n",
-        "def iframe_thread(port):\n",
-        "  while True:\n",
-        "      time.sleep(0.5)\n",
-        "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-        "      result = sock.connect_ex(('127.0.0.1', port))\n",
-        "      if result == 0:\n",
-        "        break\n",
-        "      sock.close()\n",
-        "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
-        "\n",
-        "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
-        "  for line in p.stderr:\n",
-        "    l = line.decode()\n",
-        "    if \"trycloudflare.com \" in l:\n",
-        "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
-        "    #print(l, end='')\n",
-        "\n",
-        "\n",
-        "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-        "\n",
-        "!python main.py --dont-print-server"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "kkkkkkkkkkkkkk"
-      },
-      "source": [
-        "### Run ComfyUI with localtunnel\n",
-        "\n",
-        "\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "jjjjjjjjjjjjj"
-      },
-      "outputs": [],
-      "source": [
-        "!npm install -g localtunnel\n",
-        "\n",
-        "import subprocess\n",
-        "import threading\n",
-        "import time\n",
-        "import socket\n",
-        "import urllib.request\n",
-        "\n",
-        "def iframe_thread(port):\n",
-        "  while True:\n",
-        "      time.sleep(0.5)\n",
-        "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-        "      result = sock.connect_ex(('127.0.0.1', port))\n",
-        "      if result == 0:\n",
-        "        break\n",
-        "      sock.close()\n",
-        "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
-        "\n",
-        "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
-        "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
-        "  for line in p.stdout:\n",
-        "    print(line.decode(), end='')\n",
-        "\n",
-        "\n",
-        "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-        "\n",
-        "!python main.py --dont-print-server"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "gggggggggg"
-      },
-      "source": [
-        "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
-        "\n",
-        "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
-        "\n",
-        "If you want to open it in another window use the link.\n",
-        "\n",
-        "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "hhhhhhhhhh"
-      },
-      "outputs": [],
-      "source": [
-        "import threading\n",
-        "import time\n",
-        "import socket\n",
-        "def iframe_thread(port):\n",
-        "  while True:\n",
-        "      time.sleep(0.5)\n",
-        "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-        "      result = sock.connect_ex(('127.0.0.1', port))\n",
-        "      if result == 0:\n",
-        "        break\n",
-        "      sock.close()\n",
-        "  from google.colab import output\n",
-        "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
-        "  print(\"to open it in a window you can open this link here:\")\n",
-        "  output.serve_kernel_port_as_window(port)\n",
-        "\n",
-        "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-        "\n",
-        "!python main.py --dont-print-server"
-      ]
-    }
-  ],
-  "metadata": {
-    "accelerator": "GPU",
-    "colab": {
-      "provenance": []
-    },
-    "gpuClass": "standard",
-    "kernelspec": {
-      "display_name": "Python 3",
-      "name": "python3"
-    },
-    "language_info": {
-      "name": "python"
-    }
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "aaaaaaaaaa"
+   },
+   "source": [
+    "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
+   ]
   },
-  "nbformat": 4,
-  "nbformat_minor": 0
-}
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "bbbbbbbbbb"
+   },
+   "outputs": [],
+   "source": [
+    "# #@title Environment Setup\n",
+    "\n",
+    "from pathlib import Path\n",
+    "\n",
+    "OPTIONS = {}\n",
+    "\n",
+    "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
+    "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
+    "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
+    "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
+    "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
+    "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
+    "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
+    "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
+    "\n",
+    "current_dir = !pwd\n",
+    "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
+    "\n",
+    "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
+    "    !echo \"Mounting Google Drive...\"\n",
+    "    %cd /\n",
+    "\n",
+    "    from google.colab import drive\n",
+    "    drive.mount('/content/drive')\n",
+    "\n",
+    "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
+    "    %cd /content/drive/MyDrive\n",
+    "\n",
+    "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['UPDATE_COMFY_UI']:\n",
+    "  !echo -= Updating ComfyUI =-\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
+    "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
+    "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
+    "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
+    "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
+    "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
+    "\n",
+    "  !git pull\n",
+    "\n",
+    "!echo -= Install dependencies =-\n",
+    "!pip3 install accelerate\n",
+    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
+    "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
+    "!pip3 install torchsde\n",
+    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
+    "\n",
+    "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
+    "  %cd custom_nodes\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
+    "\n",
+    "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
+    "  %cd ComfyUI-Manager\n",
+    "  !git pull\n",
+    "\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
+    "  !echo -= Install custom nodes dependencies =-\n",
+    "  !pip install GitPython\n",
+    "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "cccccccccc"
+   },
+   "source": [
+    "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "dddddddddd"
+   },
+   "outputs": [],
+   "source": [
+    "# Checkpoints\n",
+    "\n",
+    "### SDXL\n",
+    "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
+    "\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# SDXL ReVision\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
+    "\n",
+    "# SD1.5\n",
+    "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
+    "\n",
+    "# SD2\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Some SD1.5 anime style\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
+    "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# unCLIP models\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# VAE\n",
+    "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
+    "\n",
+    "\n",
+    "# Loras\n",
+    "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
+    "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
+    "\n",
+    "\n",
+    "# T2I-Adapter\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
+    "\n",
+    "# T2I Styles Model\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
+    "\n",
+    "# CLIPVision model (needed for styles model)\n",
+    "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
+    "\n",
+    "\n",
+    "# ControlNet\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# ControlNet SDXL\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# Controlnet Preprocessor nodes by Fannovel16\n",
+    "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
+    "\n",
+    "\n",
+    "# GLIGEN\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
+    "\n",
+    "\n",
+    "# ESRGAN upscale model\n",
+    "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with cloudflared (Recommended Way)\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
+    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
+    "\n",
+    "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
+    "  for line in p.stderr:\n",
+    "    l = line.decode()\n",
+    "    if \"trycloudflare.com \" in l:\n",
+    "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
+    "    #print(l, end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with localtunnel\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!npm install -g localtunnel\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
+    "\n",
+    "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
+    "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
+    "  for line in p.stdout:\n",
+    "    print(line.decode(), end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "gggggggggg"
+   },
+   "source": [
+    "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
+    "\n",
+    "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
+    "\n",
+    "If you want to open it in another window use the link.\n",
+    "\n",
+    "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "hhhhhhhhhh"
+   },
+   "outputs": [],
+   "source": [
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  from google.colab import output\n",
+    "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
+    "  print(\"to open it in a window you can open this link here:\")\n",
+    "  output.serve_kernel_port_as_window(port)\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  }
+ ],
+ "metadata": {
+  "accelerator": "GPU",
+  "colab": {
+   "provenance": []
+  },
+  "gpuClass": "standard",
+  "kernelspec": {
+   "display_name": "Python 3",
+   "name": "python3"
+  },
+  "language_info": {
+   "name": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}

prestartup_script.py

@@ -15,11 +15,12 @@ glob_path = os.path.join(os.path.dirname(__file__), "glob")
 sys.path.append(glob_path)
 
 import security_check
-from manager_util import *
+from manager_util import PIPFixer, StrictVersion, get_installed_packages, clear_pip_cache
 import cm_global
 
 security_check.security_check()
 
+cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 
 
@@ -83,6 +84,7 @@ if os.path.exists(pip_overrides_path):
     with open(pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
         cm_global.pip_overrides = json.load(json_file)
         cm_global.pip_overrides['numpy'] = 'numpy<2'
+        cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security
 
 
 def remap_pip_package(pkg):
@@ -97,36 +99,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:
@@ -256,7 +228,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:
@@ -269,11 +241,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()
@@ -339,27 +309,26 @@ except Exception as e:
 
 
 try:
-    import git
+    import git  # noqa: F401
 except ModuleNotFoundError:
     my_path = os.path.dirname(__file__)
     requirements_path = os.path.join(my_path, "requirements.txt")
 
-    print(f"## ComfyUI-Manager: installing dependencies. (GitPython)")
+    print("## ComfyUI-Manager: installing dependencies. (GitPython)")
     try:
         result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
-    except subprocess.CalledProcessError as e:
-        print(f"## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+    except subprocess.CalledProcessError:
+        print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
         try:
             result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
-        except subprocess.CalledProcessError as e:
-            print(f"## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+        except subprocess.CalledProcessError:
+            print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
 
 try:
-    import git
-    print(f"## ComfyUI-Manager: installing dependencies done.")
+    print("## ComfyUI-Manager: installing dependencies done.")
 except:
     # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
-    print(f"## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+    print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
 
 
 print("** ComfyUI startup time:", datetime.datetime.now())
@@ -404,7 +373,7 @@ def check_bypass_ssl():
         default_conf = config['default']
 
         if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
-            print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)")
+            print("[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)")
             ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
     except Exception:
         pass
@@ -416,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
-
-
-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
+pip_fixer = PIPFixer(get_installed_packages())
 
 
 def is_installed(name):
@@ -448,12 +394,15 @@ def is_installed(name):
     if name.startswith('#'):
         return True
 
-    pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
+    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
     match = re.search(pattern, name)
 
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
         pips = get_installed_packages()
 
@@ -507,7 +456,7 @@ if os.path.exists(restore_snapshot_path):
                     else:
                         print(prefix, msg, end="")
 
-        print(f"[ComfyUI-Manager] Restore snapshot.")
+        print("[ComfyUI-Manager] Restore snapshot.")
         cmd_str = [sys.executable, git_script_path, '--apply-snapshot', restore_snapshot_path]
 
         new_env = os.environ.copy()
@@ -557,13 +506,13 @@ if os.path.exists(restore_snapshot_path):
                 print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
 
         if exit_code != 0:
-            print(f"[ComfyUI-Manager] Restore snapshot failed.")
+            print("[ComfyUI-Manager] Restore snapshot failed.")
         else:
-            print(f"[ComfyUI-Manager] Restore snapshot done.")
+            print("[ComfyUI-Manager] Restore snapshot done.")
 
     except Exception as e:
         print(e)
-        print(f"[ComfyUI-Manager] Restore snapshot failed.")
+        print("[ComfyUI-Manager] Restore snapshot failed.")
 
     os.remove(restore_snapshot_path)
 
@@ -648,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():
@@ -665,7 +617,7 @@ def check_windows_event_loop_policy():
                 import asyncio
                 import asyncio.windows_events
                 asyncio.set_event_loop_policy(asyncio.windows_events.WindowsSelectorEventLoopPolicy())
-                print(f"[ComfyUI-Manager] Windows event loop policy mode enabled")
+                print("[ComfyUI-Manager] Windows event loop policy mode enabled")
             except Exception as e:
                 print(f"[ComfyUI-Manager] WARN: Windows initialization fail: {e}")
     except Exception:

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

ruff.toml

@@ -0,0 +1,12 @@
+# Disable all rules by default
+lint.ignore = ["ALL"]
+
+# Enable specific rules
+lint.select = [
+    "S307",  # suspicious-eval-usage
+    # The "F" series in Ruff stands for "Pyflakes" rules, which catch various Python syntax errors and undefined names.
+    # See all rules here: https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "F",
+]
+
+exclude = ["*.ipynb"]

scan.sh

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

scanner.py

@@ -69,7 +69,7 @@ def extract_nodes(code_text):
 
     try:
         if parse_cnt % 100 == 0:
-            print(f".", end="", flush=True)
+            print(".", end="", flush=True)
         parse_cnt += 1
 
         code_text = re.sub(r'\\[^"\']', '', code_text)
@@ -245,7 +245,10 @@ def get_py_urls_from_json(json_file):
 
 
 def clone_or_pull_git_repository(git_url):
-    repo_name = git_url.split("/")[-1].split(".")[0]
+    repo_name = git_url.split("/")[-1]
+    if repo_name.endswith(".git"):
+        repo_name = repo_name[:-4]
+        
     repo_dir = os.path.join(temp_dir, repo_name)
 
     if os.path.exists(repo_dir):
@@ -512,7 +515,7 @@ def gen_json(node_info):
             nodes.sort()
             data[git_url] = (nodes, metadata_in_url)
 
-    json_path = f"extension-node-map.json"
+    json_path = "extension-node-map.json"
     with open(json_path, "w", encoding='utf-8') as file:
         json.dump(data, file, indent=4, sort_keys=True)