KenSchae
/
ComfyUI-Manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

improve: cm-cli message 

feat: cm-cli - reinstall
pull/592/head
Dr.Lt.Data 7 months ago
parent
0873ec9590
commit
39405508fc
4 changed files with 59 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      cm-cli.py
  2. 7
      docs/en/cm-cli.md
  3. 5
      docs/ko/cm-cli.md
  4. 12
      glob/manager_core.py

68
cm-cli.py
Unescape View File

@ -5,6 +5,7 @@ import traceback
import json import json
import asyncio import asyncio
import subprocess import subprocess
import shutil
sys.path.append(os.path.dirname(__file__)) sys.path.append(os.path.dirname(__file__))
sys.path.append(os.path.join(os.path.dirname(__file__), "glob")) sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
@ -19,7 +20,7 @@ print(f"\n-= ComfyUI-Manager CLI ({core.version_str}) =-\n")
if not (len(sys.argv) == 2 and sys.argv[1] in ['save-snapshot', 'restore-dependencies', 'clear']) and len(sys.argv) < 3: if not (len(sys.argv) == 2 and sys.argv[1] in ['save-snapshot', 'restore-dependencies', 'clear']) and len(sys.argv) < 3:
print(f"\npython cm-cli.py [OPTIONS]\n\n" print(f"\npython cm-cli.py [OPTIONS]\n\n"
f"OPTIONS:\n" f"OPTIONS:\n"
f" [install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n" f" [install|reinstall|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
f" [update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n" f" [update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
f" [simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n" f" [simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]]\n"
f" save-snapshot\n" f" save-snapshot\n"
@ -251,6 +252,11 @@ custom_node_map = load_custom_nodes()
def lookup_node_path(node_name): def lookup_node_path(node_name):
# Currently, the node_name is used directly as the node_path, but in the future, I plan to allow nicknames. # Currently, the node_name is used directly as the node_path, but in the future, I plan to allow nicknames.
if '..' in node_name:
print(f"ERROR: invalid node name '{node_name}'")
exit(-1)
if node_name in custom_node_map: if node_name in custom_node_map:
node_path = os.path.join(custom_nodes_path, node_name) node_path = os.path.join(custom_nodes_path, node_name)
return node_path, custom_node_map[node_name] return node_path, custom_node_map[node_name]
@ -259,55 +265,67 @@ def lookup_node_path(node_name):
exit(-1) exit(-1)
def install_node(node_name, is_all=False): def install_node(node_name, is_all=False, cnt_msg=''):
node_path, node_item = lookup_node_path(node_name) node_path, node_item = lookup_node_path(node_name)
if os.path.exists(node_path): if os.path.exists(node_path):
if not is_all: if not is_all:
print(f"[ SKIPPED ] {node_name:50} => Already installed") print(f"{cnt_msg} [ SKIPPED ] {node_name:50} => Already installed")
elif os.path.exists(node_path+'.disabled'): elif os.path.exists(node_path+'.disabled'):
enable_node(node_name) enable_node(node_name)
else: else:
res = core.gitclone_install(node_item['files'], instant_execution=True) res = core.gitclone_install(node_item['files'], instant_execution=True, msg_prefix=f"[{cnt_msg}] ")
if not res: if not res:
print(f"ERROR: An error occurred while installing '{node_name}'.") print(f"ERROR: An error occurred while installing '{node_name}'.")
else: else:
print(f"[INSTALLED] {node_name:50}") print(f"{cnt_msg} [INSTALLED] {node_name:50}")
def fix_node(node_name, is_all=False): def reinstall_node(node_name, is_all=False, cnt_msg=''):
node_path, node_item = lookup_node_path(node_name) node_path, node_item = lookup_node_path(node_name)
if os.path.exists(node_path): if os.path.exists(node_path):
shutil.rmtree(node_path)
if os.path.exists(node_path+'.disabled'):
shutil.rmtree(node_path+'.disabled')
install_node(node_name, is_all=is_all, cnt_msg=cnt_msg)
def fix_node(node_name, is_all=False, cnt_msg=''):
node_path, node_item = lookup_node_path(node_name)
if os.path.exists(node_path):
print(f"{cnt_msg} [ FIXING ]: {node_name:50} => Disabled")
res = core.gitclone_fix(node_item['files'], instant_execution=True) res = core.gitclone_fix(node_item['files'], instant_execution=True)
if not res: if not res:
print(f"ERROR: An error occurred while fixing '{node_name}'.") print(f"ERROR: An error occurred while fixing '{node_name}'.")
elif not is_all and os.path.exists(node_path+'.disabled'): elif not is_all and os.path.exists(node_path+'.disabled'):
print(f"[ SKIPPED ]: {node_name:50} => Disabled") print(f"{cnt_msg} [ SKIPPED ]: {node_name:50} => Disabled")
elif not is_all: elif not is_all:
print(f"[ SKIPPED ]: {node_name:50} => Not installed") print(f"{cnt_msg} [ SKIPPED ]: {node_name:50} => Not installed")
def uninstall_node(node_name, is_all=False): def uninstall_node(node_name, is_all=False, cnt_msg=''):
node_path, node_item = lookup_node_path(node_name) node_path, node_item = lookup_node_path(node_name)
if os.path.exists(node_path) or os.path.exists(node_path+'.disabled'): if os.path.exists(node_path) or os.path.exists(node_path+'.disabled'):
res = core.gitclone_uninstall(node_item['files']) res = core.gitclone_uninstall(node_item['files'])
if not res: if not res:
print(f"ERROR: An error occurred while uninstalling '{node_name}'.") print(f"ERROR: An error occurred while uninstalling '{node_name}'.")
else: else:
print(f"[UNINSTALLED] {node_name:50}") print(f"{cnt_msg} [UNINSTALLED] {node_name:50}")
else: else:
print(f"[ SKIPPED ]: {node_name:50} => Not installed") print(f"{cnt_msg} [ SKIPPED ]: {node_name:50} => Not installed")
def update_node(node_name, is_all=False): def update_node(node_name, is_all=False, cnt_msg=''):
node_path, node_item = lookup_node_path(node_name) node_path, node_item = lookup_node_path(node_name)
res = core.gitclone_update(node_item['files'], skip_script=True) res = core.gitclone_update(node_item['files'], skip_script=True, msg_prefix=f"[{cnt_msg}] ")
post_install(node_path) post_install(node_path)
if not res: if not res:
print(f"ERROR: An error occurred while uninstalling '{node_name}'.") print(f"ERROR: An error occurred while uninstalling '{node_name}'.")
def enable_node(node_name, is_all=False): def enable_node(node_name, is_all=False, cnt_msg=''):
if node_name == 'ComfyUI-Manager': if node_name == 'ComfyUI-Manager':
return return
@ -316,14 +334,14 @@ def enable_node(node_name, is_all=False):
if os.path.exists(node_path+'.disabled'): if os.path.exists(node_path+'.disabled'):
current_name = node_path+'.disabled' current_name = node_path+'.disabled'
os.rename(current_name, node_path) os.rename(current_name, node_path)
print(f"[ENABLED] {node_name:50}") print(f"{cnt_msg} [ENABLED] {node_name:50}")
elif os.path.exists(node_path): elif os.path.exists(node_path):
print(f"[SKIPPED] {node_name:50} => Already enabled") print(f"{cnt_msg} [SKIPPED] {node_name:50} => Already enabled")
elif not is_all: elif not is_all:
print(f"[SKIPPED] {node_name:50} => Not installed") print(f"{cnt_msg} [SKIPPED] {node_name:50} => Not installed")
def disable_node(node_name, is_all=False): def disable_node(node_name, is_all=False, cnt_msg=''):
if node_name == 'ComfyUI-Manager': if node_name == 'ComfyUI-Manager':
return return
@ -333,11 +351,11 @@ def disable_node(node_name, is_all=False):
current_name = node_path current_name = node_path
new_name = node_path+'.disabled' new_name = node_path+'.disabled'
os.rename(current_name, new_name) os.rename(current_name, new_name)
print(f"[DISABLED] {node_name:50}") print(f"{cnt_msg} [DISABLED] {node_name:50}")
elif os.path.exists(node_path+'.disabled'): elif os.path.exists(node_path+'.disabled'):
print(f"[ SKIPPED] {node_name:50} => Already disabled") print(f"{cnt_msg} [ SKIPPED] {node_name:50} => Already disabled")
elif not is_all: elif not is_all:
print(f"[ SKIPPED] {node_name:50} => Not installed") print(f"{cnt_msg} [ SKIPPED] {node_name:50} => Not installed")
def show_list(kind, simple=False): def show_list(kind, simple=False):
@ -407,12 +425,15 @@ def for_each_nodes(act, allow_all=True):
is_all = True is_all = True
nodes = [x for x in custom_node_map.keys() if os.path.exists(os.path.join(custom_nodes_path, x)) or os.path.exists(os.path.join(custom_nodes_path, x)+'.disabled')] nodes = [x for x in custom_node_map.keys() if os.path.exists(os.path.join(custom_nodes_path, x)) or os.path.exists(os.path.join(custom_nodes_path, x)+'.disabled')]
total = len(nodes)
i = 1
for x in nodes: for x in nodes:
try: try:
act(x, is_all=is_all) act(x, is_all=is_all, cnt_msg=f'{i}/{total}')
except Exception as e: except Exception as e:
print(f"ERROR: {e}") print(f"ERROR: {e}")
traceback.print_exc() traceback.print_exc()
i+=1
op = sys.argv[1] op = sys.argv[1]
@ -421,6 +442,9 @@ op = sys.argv[1]
if op == 'install': if op == 'install':
for_each_nodes(install_node) for_each_nodes(install_node)
elif op == 'reinstall':
for_each_nodes(reinstall_node)
elif op == 'uninstall': elif op == 'uninstall':
for_each_nodes(uninstall_node) for_each_nodes(uninstall_node)

7
docs/en/cm-cli.md
Unescape View File

@ -4,12 +4,12 @@
``` ```
-= ComfyUI-Manager CLI (V2.21.1) =- -= ComfyUI-Manager CLI (V2.22) =-
python cm-cli.py [OPTIONS] python cm-cli.py [OPTIONS]
OPTIONS: OPTIONS:
[install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]] [install|reinstall|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]
[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]] [update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]
[simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]] [simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]]
save-snapshot save-snapshot
@ -93,7 +93,7 @@ ComfyUI-Loopchain
### 3. Managing Custom Nodes ### 3. Managing Custom Nodes
`[install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]` `[install|reinstall|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]`
* You can apply management functions by listing the names of custom nodes, such as `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments`. * You can apply management functions by listing the names of custom nodes, such as `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments`.
* The names of the custom nodes are as shown by `show` and are the names of the git repositories. * The names of the custom nodes are as shown by `show` and are the names of the git repositories.
@ -105,6 +105,7 @@ ComfyUI-Loopchain
* Detailed Operations * Detailed Operations
* `install`: Installs the specified custom nodes. * `install`: Installs the specified custom nodes.
* `reinstall`: Removes and then reinstalls the specified custom nodes.
* `uninstall`: Uninstalls the specified custom nodes. * `uninstall`: Uninstalls the specified custom nodes.
* `update`: Updates the specified custom nodes. * `update`: Updates the specified custom nodes.
* `disable`: Disables the specified custom nodes. * `disable`: Disables the specified custom nodes.

5
docs/ko/cm-cli.md
Unescape View File

@ -9,7 +9,7 @@
python cm-cli.py [OPTIONS] python cm-cli.py [OPTIONS]
OPTIONS: OPTIONS:
[install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]] [install|reinstall|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]
[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]] [update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]
[simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]] [simple-show|show] [installed|enabled|not-installed|disabled|all|snapshot|snapshot-list] ?[--channel <channel name>] ?[--mode [remote|local|cache]]
save-snapshot save-snapshot
@ -94,7 +94,7 @@ ComfyUI-Loopchain
### 3. 커스텀 노드 관리 하기 ### 3. 커스텀 노드 관리 하기
`[install|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]` `[install|reinstall|uninstall|update|disable|enable|fix] node_name ... ?[--channel <channel name>] ?[--mode [remote|local|cache]]`
* `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다. * `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다.
* 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다. * 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다.
@ -106,6 +106,7 @@ ComfyUI-Loopchain
* 세부 동작 * 세부 동작
* `install`: 지정된 커스텀 노드들을 설치합니다 * `install`: 지정된 커스텀 노드들을 설치합니다
* `reinstall`: 지정된 커스텀 노드를 삭제하고 재설치 합니다.
* `uninstall`: 지정된 커스텀 노드들을 삭제합니다. * `uninstall`: 지정된 커스텀 노드들을 삭제합니다.
* `update`: 지정된 커스텀 노드들을 업데이트합니다. * `update`: 지정된 커스텀 노드들을 업데이트합니다.
* `disable`: 지정된 커스텀 노드들을 비활성화합니다. * `disable`: 지정된 커스텀 노드들을 비활성화합니다.

12
glob/manager_core.py
Unescape View File

@ -21,7 +21,7 @@ sys.path.append(glob_path)
import cm_global import cm_global
from manager_util import * from manager_util import *
version = [2, 21, 1] version = [2, 21, 2]
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__), '..'))
@ -381,7 +381,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
with open(requirements_path, "r") as requirements_file: with open(requirements_path, "r") as requirements_file:
for line in requirements_file: for line in requirements_file:
package_name = remap_pip_package(line.strip()) package_name = remap_pip_package(line.strip())
if package_name: if package_name and not package_name.startswith('#'):
install_cmd = [sys.executable, "-m", "pip", "install", package_name] install_cmd = [sys.executable, "-m", "pip", "install", package_name]
if package_name.strip() != "": if package_name.strip() != "":
try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution) try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
@ -497,8 +497,8 @@ def is_valid_url(url):
return False return False
def gitclone_install(files, instant_execution=False): def gitclone_install(files, instant_execution=False, msg_prefix=''):
print(f"Install: {files}") print(f"{msg_prefix}Install: {files}")
for url in files: for url in files:
if not is_valid_url(url): if not is_valid_url(url):
print(f"Invalid git url: '{url}'") print(f"Invalid git url: '{url}'")
@ -776,10 +776,10 @@ def gitclone_set_active(files, is_disable):
return True return True
def gitclone_update(files, instant_execution=False, skip_script=False): def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefix=""):
import os import os
print(f"Update: {files}") print(f"{msg_prefix}Update: {files}")
for url in files: for url in files:
if url.endswith("/"): if url.endswith("/"):
url = url[:-1] url = url[:-1]

Write Preview
Loading…
Cancel
Save