fixed: cm-cli - provides pip dependency restoration using the options --pip-non-url, --pip-non-local-url, and --pip-local-url.

https://github.com/Comfy-Org/ComfyUI-Manager/issues/2008

extension-node-map.json

@@ -13265,7 +13265,8 @@
             "OllamaSimpleTextGeneratorTlant",
             "RandomImageLoaderTlant",
             "ReasoningLLMOutputCleaner",
-            "SaveImagePairForKontext"
+            "SaveImagePairForKontext",
+            "StringFormatterTlant"
         ],
         {
             "title_aux": "ComfyUI-OllamaPromptsGeneratorTlant"

glob/manager_core.py

@@ -43,7 +43,7 @@ import manager_downloader
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 34]
+version_code = [3, 34, 1]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -3111,6 +3111,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:
@@ -3317,6 +3322,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}")

glob/manager_util.py

@@ -326,16 +326,9 @@ torch_torchvision_torchaudio_version_map = {
 }
 
 
-
+def torch_rollback(prev):
-class PIPFixer:
+    spec = prev.split('+')
-    def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
+    if len(spec) > 1:
-        self.prev_pip_versions = { **prev_pip_versions }
-        self.comfyui_path = comfyui_path
-        self.manager_files_path = manager_files_path
-
-    def torch_rollback(self):
-        spec = self.prev_pip_versions['torch'].split('+')
-        if len(spec) > 0:
         platform = spec[1]
     else:
         cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
@@ -359,6 +352,13 @@ class PIPFixer:
 
     subprocess.check_output(cmd, universal_newlines=True)
 
+
+class PIPFixer:
+    def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
+        self.prev_pip_versions = { **prev_pip_versions }
+        self.comfyui_path = comfyui_path
+        self.manager_files_path = manager_files_path
+
     def fix_broken(self):
         new_pip_versions = get_installed_packages(True)
 
@@ -380,7 +380,7 @@ class PIPFixer:
             elif 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()
+                    torch_rollback(self.prev_pip_versions['torch'])
         except Exception as e:
             logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
             logging.error(e)
@@ -518,3 +518,69 @@ def robust_readlines(fullpath):
 
         print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
         return []
+
+
+def restore_pip_snapshot(pips, options):
+    non_url = []
+    local_url = []
+    non_local_url = []
+
+    for k, v in pips.items():
+        # NOTE: skip torch related packages
+        if k.startswith("torch==") or k.startswith("torchvision==") or k.startswith("torchaudio==") or k.startswith("nvidia-"):
+            continue
+
+        if v == "":
+            non_url.append(k)
+        else:
+            if v.startswith('file:'):
+                local_url.append(v)
+            else:
+                non_local_url.append(v)
+
+
+    # restore other pips
+    failed = []
+    if '--pip-non-url' in options:
+        # try all at once
+        res = 1
+        try:
+            res = subprocess.check_output(make_pip_cmd(['install'] + non_url))
+        except Exception:
+            pass
+
+        # fallback
+        if res != 0:
+            for x in non_url:
+                res = 1
+                try:
+                    res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
+                except Exception:
+                    pass
+
+                if res != 0:
+                    failed.append(x)
+
+    if '--pip-non-local-url' in options:
+        for x in non_local_url:
+            res = 1
+            try:
+                res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
+            except Exception:
+                pass
+
+            if res != 0:
+                failed.append(x)
+
+    if '--pip-local-url' in options:
+        for x in local_url:
+            res = 1
+            try:
+                res = subprocess.check_output(make_pip_cmd(['install', '--no-deps', x]))
+            except Exception:
+                pass
+
+            if res != 0:
+                failed.append(x)
+
+    print(f"Installation failed for pip packages: {failed}")

node_db/new/extension-node-map.json

@@ -13265,7 +13265,8 @@
             "OllamaSimpleTextGeneratorTlant",
             "RandomImageLoaderTlant",
             "ReasoningLLMOutputCleaner",
-            "SaveImagePairForKontext"
+            "SaveImagePairForKontext",
+            "StringFormatterTlant"
         ],
         {
             "title_aux": "ComfyUI-OllamaPromptsGeneratorTlant"

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