feat: update policy for updating ComfyUI
https://github.com/ltdrdata/ComfyUI-Manager/issues/1552 fixed: comfyui versions should be based on commit date https://github.com/ltdrdata/ComfyUI-Manager/issues/1566 fixed: invalid identifying of nightly node packs which has `git@github.com:...` url fixed: switch comfyui should be based on `master` branch instead of `main` branch fixed: switch_to_default_branch - more robust switching refactor: endpoints for policies
This commit is contained in:
@@ -187,6 +187,8 @@ set_preview_method(core.get_config()['preview_method'])
|
||||
def set_component_policy(mode):
|
||||
core.get_config()['component_policy'] = mode
|
||||
|
||||
def set_update_policy(mode):
|
||||
core.get_config()['update_policy'] = mode
|
||||
|
||||
def print_comfyui_version():
|
||||
global comfy_ui_hash
|
||||
@@ -452,20 +454,29 @@ async def task_worker():
|
||||
|
||||
return {'msg':f"An error occurred while updating '{node_name}'."}
|
||||
|
||||
async def do_update_comfyui() -> str:
|
||||
async def do_update_comfyui(is_stable) -> str:
|
||||
try:
|
||||
repo_path = os.path.dirname(folder_paths.__file__)
|
||||
res = core.update_path(repo_path)
|
||||
|
||||
latest_tag = None
|
||||
if is_stable:
|
||||
res, latest_tag = core.update_to_stable_comfyui(repo_path)
|
||||
else:
|
||||
res = core.update_path(repo_path)
|
||||
|
||||
if res == "fail":
|
||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
||||
return "The installed ComfyUI does not have a Git repository."
|
||||
elif res == "updated":
|
||||
logging.info("ComfyUI is updated.")
|
||||
return "success"
|
||||
if is_stable:
|
||||
logging.info("ComfyUI is updated to latest stable version.")
|
||||
return "success-stable-"+latest_tag
|
||||
else:
|
||||
logging.info("ComfyUI is updated to latest nightly version.")
|
||||
return "success-nightly"
|
||||
else: # skipped
|
||||
logging.info("ComfyUI is up-to-date.")
|
||||
return "skip"
|
||||
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
@@ -597,7 +608,7 @@ async def task_worker():
|
||||
elif kind == 'update-main':
|
||||
msg = await do_update(item)
|
||||
elif kind == 'update-comfyui':
|
||||
msg = await do_update_comfyui()
|
||||
msg = await do_update_comfyui(item[1])
|
||||
elif kind == 'fix':
|
||||
msg = await do_fix(item)
|
||||
elif kind == 'uninstall':
|
||||
@@ -1337,14 +1348,15 @@ async def update_custom_node(request):
|
||||
|
||||
@routes.get("/manager/queue/update_comfyui")
|
||||
async def update_comfyui(request):
|
||||
task_queue.put(("update-comfyui", ('comfyui',)))
|
||||
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
|
||||
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/comfyui_manager/comfyui_versions")
|
||||
async def comfyui_versions(request):
|
||||
try:
|
||||
res, current = core.get_comfyui_versions()
|
||||
res, current, latest = core.get_comfyui_versions()
|
||||
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
|
||||
except Exception as e:
|
||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
||||
@@ -1435,7 +1447,7 @@ async def preview_method(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/component/policy")
|
||||
@routes.get("/manager/policy/component")
|
||||
async def component_policy(request):
|
||||
if "value" in request.rel_url.query:
|
||||
set_component_policy(request.rel_url.query['value'])
|
||||
@@ -1446,6 +1458,17 @@ async def component_policy(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/policy/update")
|
||||
async def update_policy(request):
|
||||
if "value" in request.rel_url.query:
|
||||
set_update_policy(request.rel_url.query['value'])
|
||||
core.write_config()
|
||||
else:
|
||||
return web.Response(text=core.get_config()['update_policy'], status=200)
|
||||
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/channel_url_list")
|
||||
async def channel_url_list(request):
|
||||
channels = core.get_channel_dict()
|
||||
|
||||
Reference in New Issue
Block a user