wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2025-12-17 02:12:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

improved: restore_snapshot - better log message

Browse Source 
fixed: restore_snapshot - failing channel validation

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

https://github.com/ltdrdata/ComfyUI-Manager/issues/1664
This commit is contained in:
Dr.Lt.Data 2025-03-15 20:36:50 +09:00
parent 1f3274d3f5
commit 5393653ddc
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glob/manager_core.py
View File

@ -43,7 +43,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 31, 3] version_code = [3, 31, 4]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@ -768,6 +768,9 @@ class UnifiedManager:
@staticmethod @staticmethod
async def load_nightly(channel, mode): async def load_nightly(channel, mode):
if channel is None:
return {}
res = {} res = {}
channel_url = normalize_channel(channel) channel_url = normalize_channel(channel)
@ -798,9 +801,6 @@ class UnifiedManager:
return res return res
async def get_custom_nodes(self, channel, mode): async def get_custom_nodes(self, channel, mode):
# default_channel = normalize_channel('default')
# cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
channel = normalize_channel(channel) channel = normalize_channel(channel)
cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel. cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
@ -808,7 +808,6 @@ class UnifiedManager:
return cache return cache
channel = normalize_channel(channel) channel = normalize_channel(channel)
print(f"nightly_channel: {channel}/{mode}")
nodes = await self.load_nightly(channel, mode) nodes = await self.load_nightly(channel, mode)
res = {} res = {}
@ -3127,22 +3126,22 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
disabled_repos.append(x) disabled_repos.append(x)
for x in todo_enable: for x in todo_enable:
res = unified_manager.unified_enable(x, 'nightly') res = unified_manager.unified_enable(x[0], 'nightly')
is_switched = False is_switched = False
if res and res.target: if res and res.target:
is_switched = repo_switch_commit(res.target, x[1]) is_switched = repo_switch_commit(res.target, x[1])
if is_switched: if is_switched:
checkout_repos.append(x) checkout_repos.append(f"{x[0]}@{x[1]}")
else: else:
enabled_repos.append(x) enabled_repos.append(x[0])
for x in todo_checkout: for x in todo_checkout:
is_switched = repo_switch_commit(x[0], x[1]) is_switched = repo_switch_commit(x[0], x[1])
if is_switched: if is_switched:
checkout_repos.append(x) checkout_repos.append(f"{x[0]}@{x[1]}")
else: else:
skip_node_packs.append(x[0]) skip_node_packs.append(x[0])
@ -3205,15 +3204,15 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
is_switched = repo_switch_commit(res.target, x[1]) is_switched = repo_switch_commit(res.target, x[1])
if is_switched: if is_switched:
checkout_repos.append(x) checkout_repos.append(f"{x[0]}@{x[1]}")
else: else:
enabled_repos.append(x) enabled_repos.append(x[0])
for x in todo_checkout: for x in todo_checkout:
is_switched = repo_switch_commit(x[0], x[1]) is_switched = repo_switch_commit(x[0], x[1])
if is_switched: if is_switched:
checkout_repos.append(x) checkout_repos.append(f"{x[0]}@{x[1]}")
else: else:
skip_node_packs.append(x[0]) skip_node_packs.append(x[0])

2
pyproject.toml
View File

@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" 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." description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.31.3" version = "3.31.4"
license = { file = "LICENSE.txt" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"] dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]