Browse Source

feat: cm-cli - ''--install-deps' command

pull/642/head
Dr.Lt.Data 7 months ago
parent
commit
52257b1f3c
  1. 31
      cm-cli.py
  2. 2
      glob/manager_core.py

31
cm-cli.py

@ -27,7 +27,8 @@ if not (len(sys.argv) == 2 and sys.argv[1] in ['save-snapshot', 'restore-depende
f" restore-snapshot <snapshot .json/.yaml>\n" f" restore-snapshot <snapshot .json/.yaml>\n"
f" cli-only-mode [enable|disable]\n" f" cli-only-mode [enable|disable]\n"
f" restore-dependencies\n" f" restore-dependencies\n"
f" deps-in-workflow --workflow <workflow .json/.png> --output <output name>\n" f" deps-in-workflow --workflow <workflow .json/.png> --output <output .json>\n"
f" install-deps <deps .json>\n"
f" clear\n") f" clear\n")
exit(-1) exit(-1)
@ -106,6 +107,23 @@ def restore_dependencies():
i += 1 i += 1
def install_deps():
if not os.path.exists(sys.argv[2]):
print(f"File not found: {sys.argv[2]}")
exit(-1)
else:
with open(sys.argv[2], 'r', encoding="UTF-8", errors="ignore") as json_file:
json_obj = json.load(json_file)
for k in json_obj['custom_nodes'].keys():
state = core.simple_check_custom_node(k)
if state == 'installed':
continue
elif state == 'not-installed':
core.gitclone_install([k], instant_execution=True)
else: # disabled
core.gitclone_set_active([k], False)
def restore_snapshot(snapshot_name): def restore_snapshot(snapshot_name):
global processed_install global processed_install
@ -528,7 +546,9 @@ def deps_in_workflow():
custom_nodes = {} custom_nodes = {}
for x in used_exts: for x in used_exts:
custom_nodes[x] = core.simple_check_custom_node(x) custom_nodes[x] = { 'state': core.simple_check_custom_node(x),
'hash': '-'
}
res = { res = {
'custom_nodes': custom_nodes, 'custom_nodes': custom_nodes,
@ -621,10 +641,6 @@ elif op == 'cli-only-mode':
print(f"\ninvalid value for cli-only-mode: {sys.argv[2]}\n") print(f"\ninvalid value for cli-only-mode: {sys.argv[2]}\n")
elif op == "deps-in-workflow": elif op == "deps-in-workflow":
if len(sys.argv) < 4:
print(f"missing arguments: python cm-cli.py --workflow <workflow file> --output <output path>")
exit(-1)
deps_in_workflow() deps_in_workflow()
elif op == 'save-snapshot': elif op == 'save-snapshot':
@ -637,6 +653,9 @@ elif op == 'restore-snapshot':
elif op == 'restore-dependencies': elif op == 'restore-dependencies':
restore_dependencies() restore_dependencies()
elif op == 'install-deps':
install_deps()
elif op == 'clear': elif op == 'clear':
cancel() cancel()

2
glob/manager_core.py

@ -22,7 +22,7 @@ sys.path.append(glob_path)
import cm_global import cm_global
from manager_util import * from manager_util import *
version = [2, 25, 1] version = [2, 26]
version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))

Loading…
Cancel
Save