Merge branch 'main' into draft-v4

comfyui_manager/glob/manager_core.py

@@ -3026,6 +3026,11 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
             info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
             info = info['custom_nodes']
 
+        if 'pips' in info and info['pips']:
+            pips = info['pips']
+        else:
+            pips = {}
+
         # for cnr restore
         cnr_info = info.get('cnr_custom_nodes')
         if cnr_info is not None:
@@ -3232,6 +3237,8 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
         unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
         cloned_repos.append(repo_name)
 
+    manager_util.restore_pip_snapshot(pips, git_helper_extras)
+
     # print summary
     for x in cloned_repos:
         print(f"[ INSTALLED ] {x}")

comfyui_manager/glob/manager_server.py

@@ -47,7 +47,7 @@ from ..common import manager_util
 from ..common import cm_global
 from ..common import manager_downloader
 from ..common import context
-from ..common import manager_security
+
 
 
 from ..data_models import (