From 510c3646078a508197bb1ce8907512580e1d5aa8 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sat, 1 Feb 2025 16:35:56 +0900 Subject: [PATCH] feat: stop feature feat: model-manager - support background tasking --- glob/manager_core.py | 2 +- glob/manager_server.py | 233 ++++++++++++++++++++----------------- js/custom-nodes-manager.js | 96 +++++++++++---- js/model-manager.js | 170 ++++++++++++++++++++++----- pyproject.toml | 2 +- 5 files changed, 345 insertions(+), 158 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index b99b9b7b..263bf06d 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -41,7 +41,7 @@ import manager_downloader from node_package import InstalledNodePackage -version_code = [3, 12, 2] +version_code = [3, 13] version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') diff --git a/glob/manager_server.py b/glob/manager_server.py index fbce5cbe..f0d78ec2 100644 --- a/glob/manager_server.py +++ b/glob/manager_server.py @@ -369,12 +369,14 @@ def nickname_filter(json_obj): return json_obj -install_queue = queue.Queue() -install_result = {} +task_queue = queue.Queue() +nodepack_result = {} +model_result = {} -async def install_worker(): - global install_result - global install_queue +async def task_worker(): + global task_queue + global nodepack_result + global model_result async def do_install(item): ui_id, node_spec_str, channel, mode, skip_post_install = item @@ -384,7 +386,7 @@ async def install_worker(): if node_spec is None: logging.error(f"Cannot resolve install target: '{node_spec_str}'") - install_result[ui_id] = f"Cannot resolve install target: '{node_spec_str}'" + nodepack_result[ui_id] = f"Cannot resolve install target: '{node_spec_str}'" return node_name, version_spec, is_specified = node_spec @@ -393,18 +395,18 @@ async def install_worker(): if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']: logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}") - install_result[ui_id] = res.msg + nodepack_result[ui_id] = res.msg return elif not res.result: logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}") - install_result[ui_id] = res.msg + nodepack_result[ui_id] = res.msg return - install_result[ui_id] = 'success' + nodepack_result[ui_id] = 'success' except Exception: traceback.print_exc() - install_result[ui_id] = f"Installation failed:\n{node_spec_str}" + nodepack_result[ui_id] = f"Installation failed:\n{node_spec_str}" async def do_update(item): ui_id, node_name, node_ver = item @@ -415,14 +417,14 @@ async def install_worker(): manager_util.clear_pip_cache() if res.result: - install_result[ui_id] = 'success' + nodepack_result[ui_id] = 'success' return logging.error(f"\nERROR: An error occurred while updating '{node_name}'.") - install_result[ui_id] = f"An error occurred while updating '{node_name}'." + nodepack_result[ui_id] = f"An error occurred while updating '{node_name}'." except Exception: traceback.print_exc() - install_result[ui_id] = f"An error occurred while updating '{node_name}'." + nodepack_result[ui_id] = f"An error occurred while updating '{node_name}'." async def do_fix(item): ui_id, node_name, node_ver = item @@ -431,16 +433,16 @@ async def install_worker(): res = core.unified_manager.unified_fix(node_name, node_ver) if res.result: - install_result[ui_id] = 'success' + nodepack_result[ui_id] = 'success' return else: logging.error(res.msg) logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.") - install_result[ui_id] = f"An error occurred while fixing '{node_name}@{node_ver}'." + nodepack_result[ui_id] = f"An error occurred while fixing '{node_name}@{node_ver}'." except Exception: traceback.print_exc() - install_result[ui_id] = f"An error occurred while fixing '{node_name}@{node_ver}'." + nodepack_result[ui_id] = f"An error occurred while fixing '{node_name}@{node_ver}'." async def do_uninstall(item): ui_id, node_name, is_unknown = item @@ -449,14 +451,14 @@ async def install_worker(): res = core.unified_manager.unified_uninstall(node_name, is_unknown) if res.result: - install_result[ui_id] = 'success' + nodepack_result[ui_id] = 'success' return logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.") - install_result[ui_id] = f"An error occurred while uninstalling '{node_name}'." + nodepack_result[ui_id] = f"An error occurred while uninstalling '{node_name}'." except Exception: traceback.print_exc() - install_result[ui_id] = f"An error occurred while uninstalling '{node_name}'." + nodepack_result[ui_id] = f"An error occurred while uninstalling '{node_name}'." async def do_disable(item): ui_id, node_name, is_unknown = item @@ -465,48 +467,96 @@ async def install_worker(): res = core.unified_manager.unified_disable(node_name, is_unknown) if res: - install_result[ui_id] = 'success' + nodepack_result[ui_id] = 'success' return - install_result[ui_id] = f"Failed to disable: '{node_name}'" + nodepack_result[ui_id] = f"Failed to disable: '{node_name}'" except Exception: traceback.print_exc() - install_result[ui_id] = f"Failed to disable: '{node_name}'" + nodepack_result[ui_id] = f"Failed to disable: '{node_name}'" + + async def do_install_model(item): + ui_id, json_data = item + + model_path = get_model_path(json_data) + model_url = json_data['url'] + + try: + if model_path is not None: + logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'") + if not core.get_config()['model_download_by_agent'] and ( + model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')): + model_dir = get_model_dir(json_data, True) + download_url(model_url, model_dir, filename=json_data['filename']) + if model_path.endswith('.zip'): + res = core.unzip(model_path) + else: + res = True + + if res: + model_result[ui_id] = 'success' + return + else: + res = download_url_with_agent(model_url, model_path) + if res and model_path.endswith('.zip'): + res = core.unzip(model_path) + else: + logging.error(f"Model installation error: invalid model type - {json_data['type']}") + return + + if res: + model_result[ui_id] = 'success' + return + + except Exception as e: + logging.error(f"[ERROR] {e}", file=sys.stderr) + + model_result[ui_id] = f"Model installation error: {model_url}" stats = {} while True: - done_count = len(install_result) - total_count = done_count + install_queue.qsize() + done_count = len(nodepack_result) + len(model_result) + total_count = done_count + task_queue.qsize() - if install_queue.empty(): + if task_queue.empty(): logging.info(f"\n[ComfyUI-Manager] Queued works are completed.\n{stats}") logging.info("\nAfter restarting ComfyUI, please refresh the browser.") - PromptServer.instance.send_sync("cm-install-status", - {'status': 'done', 'result': install_result, + PromptServer.instance.send_sync("cm-queue-status", + {'status': 'done', + 'nodepack_result': nodepack_result, 'model_result': model_result, 'total_count': total_count, 'done_count': done_count}) - install_result = {} - install_queue = queue.Queue() + nodepack_result = {} + task_queue = queue.Queue() return - kind, item = install_queue.get() + kind, item = task_queue.get() - if kind == 'install': - await do_install(item) - elif kind == 'update': - await do_update(item) - elif kind == 'fix': - await do_fix(item) - elif kind == 'uninstall': - await do_uninstall(item) - elif kind == 'disable': - await do_disable(item) + try: + if kind == 'install': + await do_install(item) + if kind == 'install-model': + await do_install_model(item) + elif kind == 'update': + await do_update(item) + elif kind == 'fix': + await do_fix(item) + elif kind == 'uninstall': + await do_uninstall(item) + elif kind == 'disable': + await do_disable(item) + except Exception: + traceback.print_exc() stats[kind] = stats.get(kind, 0) + 1 - PromptServer.instance.send_sync("cm-install-status", - {'status': 'in_progress', 'target': item[0], + ui_target = "model_manager" if kind == 'install-model' else 'nodepack_manager' + + print(f"kind: {kind} / ui_target: {ui_target}") + + PromptServer.instance.send_sync("cm-queue-status", + {'status': 'in_progress', 'target': item[0], 'ui_target': ui_target, 'total_count': total_count, 'done_count': done_count}) @@ -1006,30 +1056,31 @@ async def import_fail_info(request): return web.Response(status=400) -@routes.post("/customnode/reinstall") +@routes.post("/manager/queue/reinstall") async def reinstall_custom_node(request): await uninstall_custom_node(request) await install_custom_node(request) -@routes.get("/customnode/queue/reset") +@routes.get("/manager/queue/reset") async def reset_queue(request): - global install_queue - install_queue = queue.Queue() + global task_queue + task_queue = queue.Queue() return web.Response(status=200) -@routes.get("/customnode/queue/count") +@routes.get("/manager/queue/status") async def queue_count(request): - global install_queue + global task_queue - done_count = len(install_result) - total_count = done_count + install_queue.qsize() + done_count = len(nodepack_result) + len(model_result) + total_count = done_count + task_queue.qsize() + in_progress = task_worker_thread is not None and task_worker_thread.is_alive() - return web.json_response({'total_count': total_count, 'done_count': done_count}) + return web.json_response({'total_count': total_count, 'done_count': done_count, 'in_progress': in_progress}) -@routes.post("/customnode/queue/install") +@routes.post("/manager/queue/install") async def install_custom_node(request): if not is_allowed_security_level('middle'): logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) @@ -1073,22 +1124,32 @@ async def install_custom_node(request): return web.Response(status=404, text="A security error has occurred. Please check the terminal logs") install_item = json_data.get('ui_id'), node_spec_str, json_data['channel'], json_data['mode'], skip_post_install - install_queue.put(("install", install_item)) + task_queue.put(("install", install_item)) return web.Response(status=200) -@routes.get("/customnode/queue/start") +task_worker_thread = None + +@routes.get("/manager/queue/start") async def queue_start(request): - global install_result - install_result = {} + global nodepack_result + global model_result + global task_worker_thread - threading.Thread(target=lambda: asyncio.run(install_worker())).start() + if task_worker_thread is not None and task_worker_thread.is_alive(): + return web.Response(status=201) # already in-progress + + nodepack_result = {} + model_result = {} + + task_worker_thread = threading.Thread(target=lambda: asyncio.run(task_worker())) + task_worker_thread.start() return web.Response(status=200) -@routes.post("/customnode/queue/fix") +@routes.post("/manager/queue/fix") async def fix_custom_node(request): if not is_allowed_security_level('middle'): logging.error(SECURITY_MESSAGE_GENERAL) @@ -1105,7 +1166,7 @@ async def fix_custom_node(request): node_name = os.path.basename(json_data['files'][0]) update_item = json_data.get('ui_id'), node_name, json_data['version'] - install_queue.put(("fix", update_item)) + task_queue.put(("fix", update_item)) return web.Response(status=200) @@ -1142,7 +1203,7 @@ async def install_custom_node_pip(request): return web.Response(status=200) -@routes.post("/customnode/queue/uninstall") +@routes.post("/manager/queue/uninstall") async def uninstall_custom_node(request): if not is_allowed_security_level('middle'): logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) @@ -1160,12 +1221,12 @@ async def uninstall_custom_node(request): node_name = os.path.basename(json_data['files'][0]) uninstall_item = json_data.get('ui_id'), node_name, is_unknown - install_queue.put(("uninstall", uninstall_item)) + task_queue.put(("uninstall", uninstall_item)) return web.Response(status=200) -@routes.post("/customnode/queue/update") +@routes.post("/manager/queue/update") async def update_custom_node(request): if not is_allowed_security_level('middle'): logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) @@ -1181,7 +1242,7 @@ async def update_custom_node(request): node_name = os.path.basename(json_data['files'][0]) update_item = json_data.get('ui_id'), node_name, json_data['version'] - install_queue.put(("update", update_item)) + task_queue.put(("update", update_item)) return web.Response(status=200) @@ -1232,7 +1293,7 @@ async def comfyui_switch_version(request): return web.Response(status=400) -@routes.post("/customnode/queue/disable") +@routes.post("/manager/queue/disable") async def disable_node(request): json_data = await request.json() @@ -1246,7 +1307,7 @@ async def disable_node(request): node_name = os.path.basename(json_data['files'][0]) update_item = json_data.get('ui_id'), node_name, is_unknown - install_queue.put(("disable", update_item)) + task_queue.put(("disable", update_item)) return web.Response(status=200) @@ -1264,12 +1325,10 @@ async def need_to_migrate(request): return web.Response(text=str(core.need_to_migrate), status=200) -@routes.post("/model/install") +@routes.post("/manager/queue/install_model") async def install_model(request): json_data = await request.json() - model_path = get_model_path(json_data) - if not is_allowed_security_level('middle'): logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) return web.Response(status=403) @@ -1287,42 +1346,8 @@ async def install_model(request): logging.error(SECURITY_MESSAGE_NORMAL_MINUS) return web.Response(status=403) - def do_install(): - res = False - - try: - if model_path is not None: - - model_url = json_data['url'] - logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'") - if not core.get_config()['model_download_by_agent'] and ( - model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')): - model_dir = get_model_dir(json_data, True) - download_url(model_url, model_dir, filename=json_data['filename']) - if model_path.endswith('.zip'): - res = core.unzip(model_path) - else: - res = True - - if res: - return web.json_response({}, content_type='application/json') - else: - res = download_url_with_agent(model_url, model_path) - if res and model_path.endswith('.zip'): - res = core.unzip(model_path) - else: - logging.error(f"Model installation error: invalid model type - {json_data['type']}") - - if res: - return web.json_response({}, content_type='application/json') - except Exception as e: - logging.error(f"[ERROR] {e}", file=sys.stderr) - return web.Response(status=400) - - # Run the installation in a thread pool - with concurrent.futures.ThreadPoolExecutor() as executor: - - asyncio.get_event_loop().run_in_executor(executor, do_install) + install_item = json_data.get('ui_id'), json_data + task_queue.put(("install-model", install_item)) return web.Response(status=200) diff --git a/js/custom-nodes-manager.js b/js/custom-nodes-manager.js index f562878d..fdece3be 100644 --- a/js/custom-nodes-manager.js +++ b/js/custom-nodes-manager.js @@ -55,6 +55,12 @@ const pageCss = ` color: white; } +.cn-manager .cn-manager-stop { + display: none; + background-color: #500000; + color: white; +} + .cn-manager .cn-manager-back { align-items: center; justify-content: center; @@ -344,13 +350,14 @@ const pageHtml = `
- + +
@@ -392,7 +399,7 @@ export class CustomNodesManager { this.init(); - api.addEventListener("cm-install-status", this.onInstallStatus); + api.addEventListener("cm-queue-status", this.onQueueStatus); } init() { @@ -762,6 +769,13 @@ export class CustomNodesManager { } }, + ".cn-manager-stop": { + click: () => { + api.fetchApi('/manager/queue/reset'); + infoToast('Cancel', 'Remaining tasks will stop after completing the current task.'); + } + }, + ".cn-manager-check-update": { click: (e) => { e.target.classList.add("cn-btn-loading"); @@ -1271,9 +1285,9 @@ export class CustomNodesManager { } async installNodes(list, btn, title, selected_version) { - let stats = await api.fetchApi('/customnode/queue/count'); + let stats = await api.fetchApi('/manager/queue/status'); stats = await stats.json(); - if(stats.total_count > 0) { + if(stats.in_progress) { customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`); return; } @@ -1304,11 +1318,13 @@ export class CustomNodesManager { let needRestart = false; let errorMsg = ""; - await api.fetchApi('/customnode/queue/reset'); - this.install_context = btn; + await api.fetchApi('/manager/queue/reset'); + + let target_items = []; for (const hash of list) { const item = this.grid.getRowItemBy("hash", hash); + target_items.push(item); if (!item) { errorMsg = `Not found custom node: ${hash}`; @@ -1347,7 +1363,7 @@ export class CustomNodesManager { api_mode = 'reinstall'; } - const res = await api.fetchApi(`/customnode/queue/${api_mode}`, { + const res = await api.fetchApi(`/manager/queue/${api_mode}`, { method: 'POST', body: JSON.stringify(data) }); @@ -1367,18 +1383,32 @@ export class CustomNodesManager { } } + this.install_context = {btn: btn, targets: target_items}; + + for(let k in target_items) { + let item = this.install_context.targets[k]; + this.grid.updateCell(item, "action"); + } + if(errorMsg) { this.showError(errorMsg); show_message("Installation Error:\n"+errorMsg); + + // reset + for (const hash of list) { + const item = this.grid.getRowItemBy("hash", hash); + self.grid.updateCell(item, "action"); + } } else { - await api.fetchApi('/customnode/queue/start'); + await api.fetchApi('/manager/queue/start'); + this.showStop(); } } - async onInstallStatus(event) { + async onQueueStatus(event) { let self = CustomNodesManager.instance; - if(event.detail.status == 'in_progress') { + if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') { const hash = event.detail.target; const item = self.grid.getRowItemBy("hash", hash); @@ -1386,14 +1416,20 @@ export class CustomNodesManager { item.restart = true; self.restartMap[item.hash] = true; self.grid.updateCell(item, "action"); + self.grid.setRowSelected(item, false); } else if(event.detail.status == 'done') { - self.onInstallCompleted(event.detail); + self.hideStop(); + self.onQueueCompleted(event.detail); } } - async onInstallCompleted(info) { - let result = info.result; + async onQueueCompleted(info) { + let result = info.nodepack_result; + + if(result.length == 0) { + return; + } let self = CustomNodesManager.instance; @@ -1401,7 +1437,7 @@ export class CustomNodesManager { return; } - const { target, label, mode } = self.install_context; + const { target, label, mode } = self.install_context.btn; target.classList.remove("cn-btn-loading"); let errorMsg = ""; @@ -1409,13 +1445,15 @@ export class CustomNodesManager { for(let hash in result){ let v = result[hash]; - const item = self.grid.getRowItemBy("hash", hash); - self.grid.setRowSelected(item, false); - if(v != 'success') errorMsg += v; } + for(let k in self.install_context.targets) { + let item = self.install_context.targets[k]; + self.grid.updateCell(item, "action"); + } + if (errorMsg) { self.showError(errorMsg); show_message("Installation Error:\n"+errorMsg); @@ -1426,7 +1464,7 @@ export class CustomNodesManager { self.showRestart(); self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red"); - infoToast(`[ComfyUI-Manager] All tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`); + infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`); self.install_context = undefined; } @@ -1808,9 +1846,9 @@ export class CustomNodesManager { } setDisabled(disabled) { - const $close = this.element.querySelector(".cn-manager-close"); const $restart = this.element.querySelector(".cn-manager-restart"); + const $stop = this.element.querySelector(".cn-manager-stop"); const list = [ ".cn-manager-header input", @@ -1822,7 +1860,7 @@ export class CustomNodesManager { }) .flat() .filter(it => { - return it !== $close && it !== $restart; + return it !== $close && it !== $restart && it !== $stop; }); list.forEach($elem => { @@ -1843,6 +1881,14 @@ export class CustomNodesManager { this.element.querySelector(".cn-manager-restart").style.display = "block"; } + showStop() { + this.element.querySelector(".cn-manager-stop").style.display = "block"; + } + + hideStop() { + this.element.querySelector(".cn-manager-stop").style.display = "none"; + } + setFilter(filterValue) { let filter = ""; const filterItem = this.getFilterItem(filterValue); diff --git a/js/model-manager.js b/js/model-manager.js index ee5594cc..dfb990b4 100644 --- a/js/model-manager.js +++ b/js/model-manager.js @@ -1,8 +1,10 @@ +import { app } from "../../scripts/app.js"; import { $el } from "../../scripts/ui.js"; import { manager_instance, rebootAPI, - fetchData, md5, icons + fetchData, md5, icons, show_message, customAlert, infoToast } from "./common.js"; +import { api } from "../../scripts/api.js"; // https://cenfun.github.io/turbogrid/api.html import TG from "./turbogrid.esm.js"; @@ -46,6 +48,18 @@ const pageCss = ` background-color: var(--comfy-input-bg); } +.cmm-manager .cmm-manager-refresh { + display: none; + background-color: #000080; + color: white; +} + +.cmm-manager .cmm-manager-stop { + display: none; + background-color: #500000; + color: white; +} + .cmm-manager-header { display: flex; flex-wrap: wrap; @@ -235,7 +249,14 @@ const pageHtml = `
- + + +
`; @@ -254,6 +275,8 @@ export class ModelManager { this.keywords = ''; this.init(); + + api.addEventListener("cm-queue-status", this.onQueueStatus); } init() { @@ -365,12 +388,25 @@ export class ModelManager { } }, + ".cmm-manager-refresh": { + click: () => { + app.refreshComboInNodes(); + } + }, + + ".cmm-manager-stop": { + click: () => { + api.fetchApi('/manager/queue/reset'); + infoToast('Cancel', 'Remaining tasks will stop after completing the current task.'); + } + }, + ".cmm-manager-back": { click: (e) => { this.close() manager_instance.show(); } - }, + } }; Object.keys(eventsMap).forEach(selector => { const target = this.element.querySelector(selector); @@ -595,17 +631,28 @@ export class ModelManager { } async installModels(list, btn) { - + let stats = await api.fetchApi('/manager/queue/status'); + + stats = await stats.json(); + if(stats.in_progress) { + customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`); + return; + } + btn.classList.add("cmm-btn-loading"); this.showLoading(); this.showError(""); - let needRestart = false; + let needRefresh = false; let errorMsg = ""; + await api.fetchApi('/manager/queue/reset'); + + let target_items = []; + for (const item of list) { - this.grid.scrollRowIntoView(item); + target_items.push(item); if (!this.focusInstall(item)) { this.grid.onNextUpdated(() => { @@ -616,48 +663,104 @@ export class ModelManager { this.showStatus(`Install ${item.name} ...`); const data = item.originalData; - const res = await fetchData('/model/install', { + data.ui_id = item.hash; + + const res = await api.fetchApi(`/manager/queue/install_model`, { method: 'POST', - headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(data) }); - - if (res.error) { + if (res.status != 200) { errorMsg = `Install failed: ${item.name} ${res.error.message}`; - break;; + break; } + } - needRestart = true; + this.install_context = {btn: btn, targets: target_items}; - this.grid.setRowSelected(item, false); + if(errorMsg) { + this.showError(errorMsg); + show_message("Installation Error:\n"+errorMsg); + + // reset + for (const hash of list) { + const item = this.grid.getRowItemBy("hash", hash); + this.grid.updateCell(item, "installed"); + } + } + else { + await api.fetchApi('/manager/queue/start'); + this.showStop(); + } + } + + async onQueueStatus(event) { + let self = ModelManager.instance; + + if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') { + const hash = event.detail.target; + + const item = self.grid.getRowItemBy("hash", hash); item.refresh = true; + self.grid.setRowSelected(item, false); item.selectable = false; - this.grid.updateCell(item, "installed"); - this.grid.updateCell(item, "tg-column-select"); +// self.grid.updateCell(item, "tg-column-select"); + self.grid.updateRow(item); + } + else if(event.detail.status == 'done') { + self.hideStop(); + self.onQueueCompleted(event.detail); + } + } - this.showStatus(`Install ${item.name} successfully`); + async onQueueCompleted(info) { + let result = info.model_result; + if(result.length == 0) { + return; } - this.hideLoading(); + let self = ModelManager.instance; + + if(!self.install_context) { + return; + } + + let btn = self.install_context.btn; + + self.hideLoading(); btn.classList.remove("cmm-btn-loading"); + let errorMsg = ""; + + for(let hash in result){ + let v = result[hash]; + + if(v != 'success') + errorMsg += v; + } + + for(let k in self.install_context.targets) { + let item = self.install_context.targets[k]; + self.grid.updateCell(item, "installed"); + } + if (errorMsg) { - this.showError(errorMsg); + self.showError(errorMsg); + show_message("Installation Error:\n"+errorMsg); } else { - this.showStatus(`Install ${list.length} models successfully`); + self.showStatus(`Install ${result.length} models successfully`); } - if (needRestart) { - this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red") - } + self.showRefresh(); + self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red") + infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`); + self.install_context = undefined; } getModelList(models) { - const typeMap = new Map(); const baseMap = new Map(); @@ -826,7 +929,7 @@ export class ModelManager { } showLoading() { - this.setDisabled(true); +// this.setDisabled(true); if (this.grid) { this.grid.showLoading(); this.grid.showMask({ @@ -836,7 +939,7 @@ export class ModelManager { } hideLoading() { - this.setDisabled(false); +// this.setDisabled(false); if (this.grid) { this.grid.hideLoading(); this.grid.hideMask(); @@ -844,8 +947,9 @@ export class ModelManager { } setDisabled(disabled) { - const $close = this.element.querySelector(".cmm-manager-close"); + const $refresh = this.element.querySelector(".cmm-manager-refresh"); + const $stop = this.element.querySelector(".cmm-manager-stop"); const list = [ ".cmm-manager-header input", @@ -857,7 +961,7 @@ export class ModelManager { }) .flat() .filter(it => { - return it !== $close; + return it !== $close && it !== $refresh && it !== $stop; }); list.forEach($elem => { @@ -874,6 +978,18 @@ export class ModelManager { } + showRefresh() { + this.element.querySelector(".cmm-manager-refresh").style.display = "block"; + } + + showStop() { + this.element.querySelector(".cmm-manager-stop").style.display = "block"; + } + + hideStop() { + this.element.querySelector(".cmm-manager-stop").style.display = "none"; + } + setKeywords(keywords = "") { this.keywords = keywords; this.element.querySelector(".cmm-manager-keywords").value = keywords; diff --git a/pyproject.toml b/pyproject.toml index ff61359d..53c3b9e7 100644 --- a/pyproject.toml +++ b/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.12.2" +version = "3.13" license = { file = "LICENSE.txt" } dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]