feat: cm-cli

fix: snapshot related bugs
refactor

cm-cli.py

@@ -0,0 +1,465 @@
+
+import os
+import sys
+import traceback
+import json
+import asyncio
+import subprocess
+
+sys.path.append("./glob")
+import manager_core as core
+import cm_global
+import git
+
+
+print(f"\n-= ComfyUI-Manager CLI ({core.version_str}) =-\n")
+
+comfyui_manager_path = os.path.dirname(__file__)
+comfy_path = os.environ.get('COMFYUI_PATH')
+
+if comfy_path is None:
+    print(f"WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.\n", 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")
+custom_nodes_path = os.path.join(comfy_path, 'custom_nodes')
+
+script_path = os.path.join(startup_script_path, "install-scripts.txt")
+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_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
+cm_global.pip_overrides = {}
+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)
+
+
+processed_install = set()
+
+
+def post_install(url):
+    try:
+        repository_name = url.split("/")[-1].strip()
+        repo_path = os.path.join(custom_nodes_path, repository_name)
+        repo_path = os.path.abspath(repo_path)
+
+        requirements_path = os.path.join(repo_path, 'requirements.txt')
+        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):
+                for line in file:
+                    package_name = core.remap_pip_package(line.strip())
+                    if package_name and not core.is_installed(package_name):
+                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                        output = subprocess.check_output(install_cmd, cwd=repo_path, text=True)
+                        for msg_line in output.split('\n'):
+                            if 'Requirement already satisfied:' in msg_line:
+                                print('.', end='')
+                            else:
+                                print(msg_line)
+
+        if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
+            processed_install.add(f'{repo_path}/install.py')
+            install_cmd = [sys.executable, install_script_path]
+            output = subprocess.check_output(install_cmd, cwd=repo_path, text=True)
+            for msg_line in output.split('\n'):
+                if 'Requirement already satisfied:' in msg_line:
+                    print('.', end='')
+                else:
+                    print(msg_line)
+
+    except Exception:
+        print(f"ERROR: Restoring '{url}' is failed.")
+
+
+def restore_snapshot(snapshot_name):
+    global processed_install
+
+    snapshot_path = os.path.join(core.comfyui_manager_path, 'snapshots', snapshot_name)
+    if not os.path.exists(snapshot_path):
+        print(f"ERROR: `{snapshot_path}` is not exists.")
+        exit(-1)
+
+    try:
+        cloned_repos = []
+        checkout_repos = []
+        skipped_repos = []
+        enabled_repos = []
+        disabled_repos = []
+        is_failed = False
+
+        def extract_infos(msg_lines):
+            nonlocal is_failed
+
+            for x in msg_lines:
+                if x.startswith("CLONE: "):
+                    cloned_repos.append(x[7:])
+                elif x.startswith("CHECKOUT: "):
+                    checkout_repos.append(x[10:])
+                elif x.startswith("SKIPPED: "):
+                    skipped_repos.append(x[9:])
+                elif x.startswith("ENABLE: "):
+                    enabled_repos.append(x[8:])
+                elif x.startswith("DISABLE: "):
+                    disabled_repos.append(x[9:])
+                elif 'APPLY SNAPSHOT: False' in x:
+                    is_failed = True
+
+        print(f"Restore snapshot.")
+        cmd_str = [sys.executable, git_script_path, '--apply-snapshot', snapshot_path]
+        output = subprocess.check_output(cmd_str, cwd=custom_nodes_path, text=True)
+        msg_lines = output.split('\n')
+        extract_infos(msg_lines)
+
+        for url in cloned_repos:
+            post_install(url)
+
+        # print summary
+        for x in cloned_repos:
+            print(f"[ INSTALLED ] {x}")
+        for x in checkout_repos:
+            print(f"[  CHECKOUT ] {x}")
+        for x in enabled_repos:
+            print(f"[  ENABLED  ] {x}")
+        for x in disabled_repos:
+            print(f"[  DISABLED ] {x}")
+
+        if is_failed:
+            print("ERROR: Failed to restore snapshot.")
+
+    except Exception:
+        print("ERROR: Failed to restore snapshot.")
+        traceback.print_exc()
+        exit(-1)
+
+
+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
+
+
+check_comfyui_hash()
+
+
+def read_downgrade_blacklist():
+    try:
+        import configparser
+        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
+        config = configparser.ConfigParser()
+        config.read(config_path)
+        default_conf = config['default']
+
+        if 'downgrade_blacklist' in default_conf:
+            items = default_conf['downgrade_blacklist'].split(',')
+            items = [x.strip() for x in items if x != '']
+            cm_global.pip_downgrade_blacklist += items
+            cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
+    except:
+        pass
+
+
+read_downgrade_blacklist()
+
+
+if not (len(sys.argv) == 2 and sys.argv[1] == 'save-snapshot') and len(sys.argv) < 3:
+    print(f"\npython cm-cli.py [OPTIONS]\n\n"
+          f"OPTIONS:\n"
+          f"    [install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
+          f"    [update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
+          f"    [simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
+          f"    save-snapshot\n"
+          f"    restore-snapshot <snapshot>\n"
+          f"    cli-only-mode [enable|disable]\n"
+          f"    clear\n")
+    exit(-1)
+
+
+channel = 'default'
+mode = 'remote'
+nodes = set()
+
+
+def load_custom_nodes():
+    channel_dict = core.get_channel_dict()
+    if channel not in channel_dict:
+        print(f"ERROR: Invalid channel is specified `--channel {channel}`", file=sys.stderr)
+        exit(-1)
+
+    if mode not in ['remote', 'local', 'cache']:
+        print(f"ERROR: Invalid mode is specified `--mode {mode}`", file=sys.stderr)
+        exit(-1)
+
+    channel_url = channel_dict[channel]
+
+    res = {}
+    json_obj = asyncio.run(core.get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url))
+    for x in json_obj['custom_nodes']:
+        for y in x['files']:
+            if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
+                repo_name = y.split('/')[-1]
+                res[repo_name] = x
+
+    return res
+
+
+def process_args():
+    global channel
+    global mode
+
+    i = 2
+    while i < len(sys.argv):
+        if sys.argv[i] == '--channel':
+            if i+1 < len(sys.argv):
+                channel = sys.argv[i+1]
+                i += 1
+        elif sys.argv[i] == '--mode':
+            if i+1 < len(sys.argv):
+                mode = sys.argv[i+1]
+                i += 1
+        else:
+            nodes.add(sys.argv[i])
+
+        i += 1
+
+
+process_args()
+custom_node_map = load_custom_nodes()
+
+
+def lookup_node_path(node_name):
+    # Currently, the node_name is used directly as the node_path, but in the future, I plan to allow nicknames.
+    if node_name in custom_node_map:
+        node_path = os.path.join(custom_nodes_path, node_name)
+        return node_path, custom_node_map[node_name]
+
+    print(f"ERROR: invalid node name '{node_name}'")
+    exit(-1)
+
+
+def install_node(node_name, is_all=False):
+    node_path, node_item = lookup_node_path(node_name)
+
+    if os.path.exists(node_path):
+        if not is_all:
+            print(f"[ SKIPPED ] {node_name:50} => Already installed")
+    elif os.path.exists(node_path+'.disabled'):
+        enable_node(node_name)
+    else:
+        res = core.gitclone_install(node_item['files'], instant_execution=True)
+        if not res:
+            print(f"ERROR: An error occurred while installing '{node_name}'.")
+        else:
+            print(f"[INSTALLED] {node_name:50}")
+
+
+def fix_node(node_name, is_all=False):
+    node_path, node_item = lookup_node_path(node_name)
+    if os.path.exists(node_path):
+        res = core.gitclone_fix(node_item['files'], instant_execution=True)
+        if not res:
+            print(f"ERROR: An error occurred while fixing '{node_name}'.")
+    elif not is_all and os.path.exists(node_path+'.disabled'):
+        print(f"[  SKIPPED  ]: {node_name:50} => Disabled")
+    elif not is_all:
+        print(f"[  SKIPPED  ]: {node_name:50} => Not installed")
+
+
+def uninstall_node(node_name, is_all=False):
+    node_path, node_item = lookup_node_path(node_name)
+    if os.path.exists(node_path) or os.path.exists(node_path+'.disabled'):
+        res = core.gitclone_uninstall(node_item['files'])
+        if not res:
+            print(f"ERROR: An error occurred while uninstalling '{node_name}'.")
+        else:
+            print(f"[UNINSTALLED] {node_name:50}")
+    else:
+        print(f"[  SKIPPED  ]: {node_name:50} => Not installed")
+
+
+def update_node(node_name, is_all=False):
+    node_path, node_item = lookup_node_path(node_name)
+    res = core.gitclone_update(node_item['files'], skip_script=True)
+    post_install(node_path)
+    if not res:
+        print(f"ERROR: An error occurred while uninstalling '{node_name}'.")
+
+
+def enable_node(node_name, is_all=False):
+    if node_name == 'ComfyUI-Manager':
+        return
+
+    node_path, _ = lookup_node_path(node_name)
+
+    if os.path.exists(node_path+'.disabled'):
+        current_name = node_path+'.disabled'
+        os.rename(current_name, node_path)
+        print(f"[ENABLED] {node_name:50}")
+    elif os.path.exists(node_path):
+        print(f"[SKIPPED] {node_name:50} => Already enabled")
+    elif not is_all:
+        print(f"[SKIPPED] {node_name:50} => Not installed")
+
+
+def disable_node(node_name, is_all=False):
+    if node_name == 'ComfyUI-Manager':
+        return
+    
+    node_path, _ = lookup_node_path(node_name)
+
+    if os.path.exists(node_path):
+        current_name = node_path
+        new_name = node_path+'.disabled'
+        os.rename(current_name, new_name)
+        print(f"[DISABLED] {node_name:50}")
+    elif os.path.exists(node_path+'.disabled'):
+        print(f"[ SKIPPED] {node_name:50} => Already disabled")
+    elif not is_all:
+        print(f"[ SKIPPED] {node_name:50} => Not installed")
+
+
+def show_list(kind, simple=False):
+    for k, v in custom_node_map.items():
+        node_path = os.path.join(custom_nodes_path, k)
+
+        states = set()
+        if os.path.exists(node_path):
+            prefix = '[    ENABLED    ] '
+            states.add('installed')
+            states.add('enabled')
+            states.add('all')
+        elif os.path.exists(node_path+'.disabled'):
+            prefix = '[    DISABLED   ] '
+            states.add('installed')
+            states.add('disabled')
+            states.add('all')
+        else:
+            prefix = '[ NOT INSTALLED ] '
+            states.add('not-installed')
+            states.add('all')
+
+        if kind in states:
+            if simple:
+                print(f"{k:50}")
+            else:
+                print(f"{prefix} {k:50}(author: {v['author']})")
+
+
+def show_snapshot(simple_mode=False):
+    json_obj = core.get_current_snapshot()
+
+    if simple_mode:
+        print(f"[{json_obj['comfyui']}] comfyui")
+        for k, v in json_obj['git_custom_nodes'].items():
+            print(f"[{v['hash']}] {k}")
+        for v in json_obj['file_custom_nodes']:
+            print(f"[                   N/A                  ] {v['filename']}")
+
+    else:
+        formatted_json = json.dumps(json_obj, ensure_ascii=False, indent=4)
+        print(formatted_json)
+
+
+def show_snapshot_list(simple_mode=False):
+    path = os.path.join(comfyui_manager_path, 'snapshots')
+
+    files = os.listdir(path)
+    json_files = [x for x in files if x.endswith('.json')]
+    for x in sorted(json_files):
+        print(x)
+
+
+def cancel():
+    if os.path.exists(script_path):
+        os.remove(script_path)
+
+    if os.path.exists(restore_snapshot_path):
+        os.remove(restore_snapshot_path)
+
+
+def for_each_nodes(act, allow_all=True):
+    global nodes
+
+    is_all = False
+    if allow_all and 'all' in nodes:
+        is_all = True
+        nodes = [x for x in custom_node_map.keys() if os.path.exists(os.path.join(custom_nodes_path, x)) or os.path.exists(os.path.join(custom_nodes_path, x)+'.disabled')]
+
+    for x in nodes:
+        try:
+            act(x, is_all=is_all)
+        except Exception as e:
+            print(f"ERROR: {e}")
+            traceback.print_exc()
+
+
+op = sys.argv[1]
+
+
+if op == 'install':
+    for_each_nodes(install_node)
+
+elif op == 'uninstall':
+    for_each_nodes(uninstall_node)
+
+elif op == 'update':
+    for_each_nodes(update_node, allow_all=True)
+
+elif op == 'disable':
+    for_each_nodes(disable_node, allow_all=True)
+
+elif op == 'enable':
+    for_each_nodes(enable_node, allow_all=True)
+
+elif op == 'fix':
+    for_each_nodes(fix_node, allow_all=True)
+
+elif op == 'show':
+    if sys.argv[2] == 'snapshot':
+        show_snapshot()
+    elif sys.argv[2] == 'snapshot-list':
+        show_snapshot_list()
+    else:
+        show_list(sys.argv[2])
+
+elif op == 'simple-show':
+    if sys.argv[2] == 'snapshot':
+        show_snapshot(True)
+    elif sys.argv[2] == 'snapshot-list':
+        show_snapshot_list(True)
+    else:
+        show_list(sys.argv[2], True)
+
+elif op == 'cli-only-mode':
+    cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
+    if sys.argv[2] == 'enable':
+        with open(cli_mode_flag, 'w') as file:
+            pass
+        print(f"\ncli-only-mode: enabled\n")
+    elif sys.argv[2] == 'disable':
+        os.remove(cli_mode_flag)
+        print(f"\ncli-only-mode: disabled\n")
+    else:
+        print(f"\ninvalid value for cli-only-mode: {sys.argv[2]}\n")
+
+elif op == 'save-snapshot':
+    path = core.save_snapshot_with_postfix('snapshot')
+    print(f"Current snapshot is saved as `{path}`")
+
+elif op == 'restore-snapshot':
+    restore_snapshot(sys.argv[2])
+
+elif op == 'clear':
+    cancel()
+
+else:
+    print(f"\nInvalid command `{op}`")
+
+print(f"")

git_helper.py

@@ -176,24 +176,32 @@ def checkout_custom_node_hash(git_custom_node_infos):
                 if repo_name.endswith('.disabled'):
                     repo_name = repo_name[:-9]
 
-                item = git_custom_node_infos[repo_name_to_url[repo_name]]
-                if item['disabled'] and is_disabled:
-                    pass
-                elif item['disabled'] and not is_disabled:
-                    # disable
-                    print(f"DISABLE: {repo_name}")
-                    new_path = fullpath + ".disabled"
-                    os.rename(fullpath, new_path)
-                    pass
-                elif not item['disabled'] and is_disabled:
-                    # enable
-                    print(f"ENABLE: {repo_name}")
-                    new_path = fullpath[:-9]
-                    os.rename(fullpath, new_path)
-                    fullpath = new_path
-                    need_checkout = True
+                if repo_name not in repo_name_to_url:
+                    if not is_disabled:
+                        # should be disabled
+                        print(f"DISABLE: {repo_name}")
+                        new_path = fullpath + ".disabled"
+                        os.rename(fullpath, new_path)
+                        need_checkout = False
                 else:
-                    need_checkout = True
+                    item = git_custom_node_infos[repo_name_to_url[repo_name]]
+                    if item['disabled'] and is_disabled:
+                        pass
+                    elif item['disabled'] and not is_disabled:
+                        # disable
+                        print(f"DISABLE: {repo_name}")
+                        new_path = fullpath + ".disabled"
+                        os.rename(fullpath, new_path)
+
+                    elif not item['disabled'] and is_disabled:
+                        # enable
+                        print(f"ENABLE: {repo_name}")
+                        new_path = fullpath[:-9]
+                        os.rename(fullpath, new_path)
+                        fullpath = new_path
+                        need_checkout = True
+                    else:
+                        need_checkout = True
 
                 if need_checkout:
                     repo = git.Repo(fullpath)
@@ -202,6 +210,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
                     if commit_hash != item['hash']:
                         print(f"CHECKOUT: {repo_name} [{item['hash']}]")
                         repo.git.checkout(item['hash'])
+
             except Exception:
                 print(f"Failed to restore snapshots for the custom node '{path}'")
 

glob/manager_core.py

@@ -21,8 +21,12 @@ sys.path.append(glob_path)
 import cm_global
 from manager_util import *
 
+version = [2, 20]
+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, '..'))
+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")
 startup_script_path = os.path.join(comfyui_manager_path, "startup-scripts")
@@ -106,6 +110,33 @@ def is_blacklisted(name):
     return False
 
 
+def is_installed(name):
+    name = name.strip()
+
+    if name.startswith('#'):
+        return True
+
+    pattern = r'([^<>!=]+)([<>!=]=?)(.*)'
+    match = re.search(pattern, name)
+
+    if match:
+        name = match.group(1)
+
+    if name in cm_global.pip_downgrade_blacklist:
+        pips = get_installed_packages()
+
+        if match is None:
+            if name in pips:
+                return True
+        elif match.group(2) in ['<=', '==', '<']:
+            if name in pips:
+                if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
+                    print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
+                    return True
+
+    return name.lower() in get_installed_packages()
+
+
 def get_channel_dict():
     global channel_dict
 
@@ -337,7 +368,7 @@ def __win_check_git_pull(path):
     process.wait()
 
 
-def execute_install_script(url, repo_path, lazy_mode=False):
+def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=False):
     install_script_path = os.path.join(repo_path, "install.py")
     requirements_path = os.path.join(repo_path, "requirements.txt")
 
@@ -353,12 +384,12 @@ def execute_install_script(url, repo_path, lazy_mode=False):
                     if package_name:
                         install_cmd = [sys.executable, "-m", "pip", "install", package_name]
                         if package_name.strip() != "":
-                            try_install_script(url, repo_path, install_cmd)
+                            try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
         if os.path.exists(install_script_path):
             print(f"Install: install script")
             install_cmd = [sys.executable, "install.py"]
-            try_install_script(url, repo_path, install_cmd)
+            try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
     return True
 
@@ -466,8 +497,8 @@ def is_valid_url(url):
         return False
 
 
-def gitclone_install(files):
-    print(f"install: {files}")
+def gitclone_install(files, instant_execution=False):
+    print(f"Install: {files}")
     for url in files:
         if not is_valid_url(url):
             print(f"Invalid git url: '{url}'")
@@ -481,7 +512,7 @@ def gitclone_install(files):
             repo_path = os.path.join(custom_nodes_path, repo_name)
 
             # Clone the repository from the remote URL
-            if platform.system() == 'Windows':
+            if not instant_execution and platform.system() == 'Windows':
                 res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", custom_nodes_path, url])
                 if res != 0:
                     return False
@@ -490,7 +521,7 @@ def gitclone_install(files):
                 repo.git.clear_cache()
                 repo.close()
 
-            if not execute_install_script(url, repo_path):
+            if not execute_install_script(url, repo_path, instant_execution=instant_execution):
                 return False
 
         except Exception as e:
@@ -566,13 +597,17 @@ def is_file_created_within_one_day(file_path):
     return time_difference <= 86400
 
 
-async def get_data_by_mode(mode, filename):
+async def get_data_by_mode(mode, filename, channel_url=None):
     try:
         if mode == "local":
             uri = os.path.join(comfyui_manager_path, filename)
             json_obj = await get_data(uri)
         else:
-            uri = get_config()['channel_url'] + '/' + filename
+            if channel_url is None:
+                uri = get_config()['channel_url'] + '/' + filename
+            else:
+                uri = channel_url + '/' + filename
+
             cache_uri = str(simple_hash(uri))+'_'+filename
             cache_uri = os.path.join(cache_dir, cache_uri)
 
@@ -585,7 +620,6 @@ async def get_data_by_mode(mode, filename):
                         with open(cache_uri, "w", encoding='utf-8') as file:
                             json.dump(json_obj, file, indent=4, sort_keys=True)
             else:
-                uri = get_config()['channel_url'] + '/' + filename
                 json_obj = await get_data(uri)
                 with cache_lock:
                     with open(cache_uri, "w", encoding='utf-8') as file:
@@ -611,6 +645,9 @@ def gitclone_fix(files):
             repo_name = os.path.splitext(os.path.basename(url))[0]
             repo_path = os.path.join(custom_nodes_path, repo_name)
 
+            if os.path.exists(repo_path+'.disabled'):
+                repo_path = repo_path+'.disabled'
+
             if not execute_install_script(url, repo_path):
                 return False
 
@@ -653,7 +690,7 @@ def rmtree(path):
 def gitclone_uninstall(files):
     import os
 
-    print(f"uninstall: {files}")
+    print(f"Uninstall: {files}")
     for url in files:
         if url.endswith("/"):
             url = url[:-1]
@@ -708,7 +745,7 @@ def gitclone_set_active(files, is_disable):
             dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
             dir_path = os.path.join(custom_nodes_path, dir_name)
 
-            # safey check
+            # 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
@@ -739,7 +776,7 @@ def gitclone_set_active(files, is_disable):
     return True
 
 
-def gitclone_update(files):
+def gitclone_update(files, instant_execution=False, skip_script=False):
     import os
 
     print(f"Update: {files}")
@@ -749,16 +786,26 @@ def gitclone_update(files):
         try:
             repo_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
             repo_path = os.path.join(custom_nodes_path, repo_name)
+
+            if os.path.exists(repo_path+'.disabled'):
+                repo_path = repo_path+'.disabled'
+
             git_pull(repo_path)
 
-            if not execute_install_script(url, repo_path, lazy_mode=True):
-                return False
+            if not skip_script:
+                if instant_execution:
+                    if not execute_install_script(url, repo_path, lazy_mode=False, instant_execution=True):
+                        return False
+                else:
+                    if not execute_install_script(url, repo_path, lazy_mode=True):
+                        return False
 
         except Exception as e:
             print(f"Update(git-clone) error: {url} / {e}", file=sys.stderr)
             return False
 
-    print("Update was successful.")
+    if not skip_script:
+        print("Update was successful.")
     return True
 
 
@@ -832,3 +879,73 @@ def check_a_custom_node_installed(item, do_fetch=False, do_update_check=True, do
             item['installed'] = 'Disabled'
         else:
             item['installed'] = 'False'
+
+
+def get_current_snapshot():
+    # Get ComfyUI hash
+    repo_path = comfy_path
+
+    print(f"comfy_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.")
+        return {}
+
+    repo = git.Repo(repo_path)
+    comfyui_commit_hash = repo.head.commit.hexsha
+
+    git_custom_nodes = {}
+    file_custom_nodes = []
+
+    # Get custom nodes hash
+    for path in os.listdir(custom_nodes_path):
+        fullpath = os.path.join(custom_nodes_path, path)
+
+        if os.path.isdir(fullpath):
+            is_disabled = path.endswith(".disabled")
+
+            try:
+                git_dir = os.path.join(fullpath, '.git')
+
+                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,
+                    '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)
+
+    return {
+        'comfyui': comfyui_commit_hash,
+        'git_custom_nodes': git_custom_nodes,
+        'file_custom_nodes': file_custom_nodes,
+    }
+
+
+def save_snapshot_with_postfix(postfix):
+    now = datetime.now()
+
+    date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
+    file_name = f"{date_time_format}_{postfix}"
+
+    path = os.path.join(comfyui_manager_path, 'snapshots', f"{file_name}.json")
+    with open(path, "w") as json_file:
+        json.dump(get_current_snapshot(), json_file, indent=4)
+
+    return file_name+'.json'
+

prestartup_script.py

@@ -459,40 +459,39 @@ if os.path.exists(restore_snapshot_path):
         cmd_str = [sys.executable, git_script_path, '--apply-snapshot', restore_snapshot_path]
         exit_code = process_wrap(cmd_str, custom_nodes_path, handler=msg_capture)
 
-        with open(restore_snapshot_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
-            info = json.load(json_file)
-            for url in cloned_repos:
-                try:
-                    repository_name = url.split("/")[-1].strip()
-                    repo_path = os.path.join(custom_nodes_path, repository_name)
-                    repo_path = os.path.abspath(repo_path)
-
-                    requirements_path = os.path.join(repo_path, 'requirements.txt')
-                    install_script_path = os.path.join(repo_path, 'install.py')
-
-                    this_exit_code = 0
-
-                    if os.path.exists(requirements_path):
-                        with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
-                            for line in file:
-                                package_name = remap_pip_package(line.strip())
-                                if package_name and not is_installed(package_name):
-                                    install_cmd = [sys.executable, "-m", "pip", "install", package_name]
-                                    this_exit_code += process_wrap(install_cmd, repo_path)
-
-                    if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
-                        processed_install.add(f'{repo_path}/install.py')
-                        install_cmd = [sys.executable, install_script_path]
-                        print(f">>> {install_cmd} / {repo_path}")
-                        this_exit_code += process_wrap(install_cmd, repo_path)
-
-                    if this_exit_code != 0:
-                        print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
-
-                except Exception as e:
-                    print(e)
+        repository_name = ''
+        for url in cloned_repos:
+            try:
+                repository_name = url.split("/")[-1].strip()
+                repo_path = os.path.join(custom_nodes_path, repository_name)
+                repo_path = os.path.abspath(repo_path)
+
+                requirements_path = os.path.join(repo_path, 'requirements.txt')
+                install_script_path = os.path.join(repo_path, 'install.py')
+
+                this_exit_code = 0
+
+                if os.path.exists(requirements_path):
+                    with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
+                        for line in file:
+                            package_name = remap_pip_package(line.strip())
+                            if package_name and not is_installed(package_name):
+                                install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                                this_exit_code += process_wrap(install_cmd, repo_path)
+
+                if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
+                    processed_install.add(f'{repo_path}/install.py')
+                    install_cmd = [sys.executable, install_script_path]
+                    print(f">>> {install_cmd} / {repo_path}")
+                    this_exit_code += process_wrap(install_cmd, repo_path)
+
+                if this_exit_code != 0:
                     print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
 
+            except Exception as e:
+                print(e)
+                print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
+
         if exit_code != 0:
             print(f"[ComfyUI-Manager] Restore snapshot failed.")
         else: