improved: Update All - Show link on the result board
fixed: Update All - Updates for unknown nodes were not being applied fixed: corner case crash whilte install/updating https://github.com/ltdrdata/ComfyUI-Manager/issues/1168
This commit is contained in:
@@ -42,7 +42,7 @@ import manager_downloader
|
||||
from node_package import InstalledNodePackage
|
||||
|
||||
|
||||
version_code = [3, 21, 5]
|
||||
version_code = [3, 22]
|
||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||
|
||||
|
||||
@@ -345,6 +345,7 @@ class ManagedResult:
|
||||
self.msg = None
|
||||
self.target = None
|
||||
self.postinstall = lambda: True
|
||||
self.ver = None
|
||||
|
||||
def append(self, item):
|
||||
self.items.append(item)
|
||||
@@ -366,6 +367,10 @@ class ManagedResult:
|
||||
self.postinstall = postinstall
|
||||
return self
|
||||
|
||||
def with_ver(self, ver):
|
||||
self.ver = ver
|
||||
return self
|
||||
|
||||
|
||||
class UnifiedManager:
|
||||
def __init__(self):
|
||||
@@ -789,6 +794,7 @@ class UnifiedManager:
|
||||
node_id = v['id']
|
||||
else:
|
||||
node_id = v['files'][0].split('/')[-1]
|
||||
v['repository'] = v['files'][0]
|
||||
res[node_id] = v
|
||||
elif len(v['files']) > 1:
|
||||
res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path
|
||||
@@ -1334,14 +1340,14 @@ class UnifiedManager:
|
||||
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
|
||||
|
||||
if version_spec is None:
|
||||
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
|
||||
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)
|
||||
|
||||
if version_spec == 'nightly':
|
||||
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
|
||||
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
|
||||
elif version_spec == 'unknown':
|
||||
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
|
||||
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
|
||||
else:
|
||||
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
||||
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
|
||||
|
||||
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
||||
"""
|
||||
|
||||
@@ -416,25 +416,41 @@ async def task_worker():
|
||||
traceback.print_exc()
|
||||
return f"Installation failed:\n{node_spec_str}"
|
||||
|
||||
async def do_update(item) -> str:
|
||||
async def do_update(item):
|
||||
ui_id, node_name, node_ver = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_update(node_name, node_ver)
|
||||
|
||||
if res.ver == 'unknown':
|
||||
url = core.unified_manager.unknown_active_nodes[node_name][0]
|
||||
title = os.path.basename(url)
|
||||
else:
|
||||
url = core.unified_manager.cnr_map[node_name].get('repository')
|
||||
title = core.unified_manager.cnr_map[node_name]['name']
|
||||
|
||||
manager_util.clear_pip_cache()
|
||||
|
||||
if url is not None:
|
||||
base_res = {'url': url, 'title': title}
|
||||
else:
|
||||
base_res = {'title': title}
|
||||
|
||||
if res.result:
|
||||
if res.action == 'skip':
|
||||
return 'skip'
|
||||
base_res['msg'] = 'skip'
|
||||
return base_res
|
||||
else:
|
||||
return 'success'
|
||||
base_res['msg'] = 'success'
|
||||
return base_res
|
||||
|
||||
base_res['msg'] = f"An error occurred while updating '{node_name}'."
|
||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
||||
return base_res
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"An error occurred while updating '{node_name}'."
|
||||
return {'msg':f"An error occurred while updating '{node_name}'."}
|
||||
|
||||
async def do_update_comfyui() -> str:
|
||||
try:
|
||||
@@ -607,6 +623,9 @@ async def task_worker():
|
||||
elif kind == 'update-comfyui':
|
||||
nodepack_result['comfyui'] = msg
|
||||
ui_target = "main"
|
||||
elif kind == 'update':
|
||||
nodepack_result[ui_id] = msg['msg']
|
||||
ui_target = "nodepack_manager"
|
||||
else:
|
||||
nodepack_result[ui_id] = msg
|
||||
ui_target = "nodepack_manager"
|
||||
@@ -711,6 +730,15 @@ async def update_all(request):
|
||||
update_item = k, k, v[0]
|
||||
task_queue.put(("update-main", update_item))
|
||||
|
||||
for k, v in core.unified_manager.unknown_active_nodes.items():
|
||||
if k == 'comfyui-manager':
|
||||
# skip updating comfyui-manager if desktop version
|
||||
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
|
||||
continue
|
||||
|
||||
update_item = k, k, 'unknown'
|
||||
task_queue.put(("update-main", update_item))
|
||||
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user