8000 feat: add global --verbose flag for cm-cli output by drmbt · Pull Request #252 · Comfy-Org/comfy-cli · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

feat: add global --verbose flag for cm-cli output #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add global --verbose flag for cm-cli output #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions comfy_cli/cmdline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,23 @@ def entry(
help="Print version and exit",
is_flag=True,
),
verbose: Annotated[
bool,
typer.Option(
"--verbose",
help="Show detailed output during execution",
is_flag=True,
),
] = False,
):
if version:
rprint(ConfigManager().get_cli_version())
ctx.exit(0)

# Store verbose flag in context for subcommands
ctx.ensure_object(dict)
ctx.obj["verbose"] = verbose

workspace_manager.setup_workspace_manager(workspace, here, recent, skip_prompt)

tracking.prompt_tracking_consent(skip_prompt, default_value=enable_telemetry)
Expand Down
61 changes: 49 additions & 12 deletions comfy_cli/command/custom_nodes/cm_cli_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}


def execute_cm_cli(args, channel=None, fast_deps=False, mode=None) -> str | None:
def execute_cm_cli(args, channel=None, fast_deps=False, mode=None, verbose=False) -> str | None:
_config_manager = ConfigManager()

workspace_path = workspace_manager.workspace_path
Expand Down Expand Up @@ -57,24 +57,61 @@ def execute_cm_cli(args, channel=None, fast_deps=False, mode=None) -> str | None
print(f"Execute from: {workspace_path}")

try:
result = subprocess.run(cmd, env=new_env, check=True, capture_output=True, text=True)
print(result.stdout)
if verbose:
# Use Popen for real-time output when verbose
process = subprocess.Popen(
cmd,
env=new_env,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
bufsize=1,
universal_newlines=True
)

stdout_output = []
stderr_output = []

while True:
stdout_line = process.stdout.readline()
stderr_line = process.stderr.readline()

if stdout_line:
print(stdout_line.rstrip())
stdout_output.append(stdout_line)
if stderr_line:
print(stderr_line.rstrip(), file=sys.stderr)
stderr_output.append(stderr_line)

if process.poll() is not None and not stdout_line and not stderr_line:
break

return_code = process.wait()

if return_code != 0:
if return_code == 1:
print(f"\n[bold red]Execution error: {cmd}[/bold red]\n", file=sys.stderr)
return None
if return_code == 2:
return None
raise subprocess.CalledProcessError(return_code, cmd)

output = ''.join(stdout_output)
else:
# Original behavior when not verbose
result = subprocess.run(cmd, env=new_env, check=True, capture_output=True, text=True)
print(result.stdout)
output = result.stdout

if fast_deps and args[0] in _dependency_cmds:
# we're using the fast_deps behavior and just ran a command that invalidated the dependencies
depComp = DependencyCompiler(cwd=workspace_path)
depComp.compile_deps()
depComp.install_deps()

return result.stdout
except subprocess.CalledProcessError as e:
if e.returncode == 1:
print(f"\n[bold red]Execution error: {cmd}[/bold red]\n", file=sys.stderr)
return None

if e.returncode == 2:
return None

return output
except Exception as e:
print(f"\n[bold red]Error executing command: {str(e)}[/bold red]\n", file=sys.stderr)
raise e
finally:
workspace_manager.set_recent_workspace(workspace_path)
63 changes: 46 additions & 17 deletions comfy_cli/command/custom_nodes/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,15 @@ def execute_install_script(repo_path):
try_install_script(repo_path, install_cmd)


@app.callback()
def app_callback(ctx: typer.Context):
"""Global options for the CLI"""
if not hasattr(app_callback, "context"):
app_callback.context = {}
# Get verbose flag from parent context
app_callback.context["verbose"] = ctx.obj.get("verbose", False)


@app.command("save-snapshot", help="Save a snapshot of the current ComfyUI environment")
@tracking.track_command("node")
def save_snapshot(
Expand All @@ -175,11 +184,12 @@ def save_snapshot(
typer.Option(show_default=False, help="Specify the output file path. (.json/.yaml)"),
] = None,
):
verbose = app_callback.context.get("verbose", False)
if output is None:
execute_cm_cli(["save-snapshot"])
execute_cm_cli(["save-snapshot"], verbose=verbose)
else:
output = os.path.abspath(output) # to compensate chdir
execute_cm_cli(["save-snapshot", "--output", output])
execute_cm_cli(["save-snapshot", "--output", output], verbose=verbose)


@app.command("restore-snapshot", help="Restore snapshot from snapshot file")
Expand Down Expand Up @@ -216,32 +226,37 @@ def restore_snapshot(
if pip_local_url:
extras += ["--pip-local-url"]

verbose = app_callback.context.get("verbose", False)
path = os.path.abspath(path)
execute_cm_cli(["restore-snapshot", path] + extras)
execute_cm_cli(["restore-snapshot", path] + extras, verbose=verbose)


@app.command("restore-dependencies", help="Restore dependencies from installed custom nodes")
@tracking.track_command("node")
def restore_dependencies():
execute_cm_cli(["restore-dependencies"])
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["restore-dependencies"], verbose=verbose)


@manager_app.command("disable-gui", help="Disable GUI mode of ComfyUI-Manager")
@tracking.track_command("node")
def disable_gui():
execute_cm_cli(["cli-only-mode", "enable"])
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["cli-only-mode", "enable"], verbose=verbose)


@manager_app.command("enable-gui", help="Enable GUI mode of ComfyUI-Manager")
@tracking.track_command("node")
def enable_gui():
execute_cm_cli(["cli-only-mode", "disable"])
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["cli-only-mode", "disable"], verbose=verbose)


@manager_app.command(help="Clear reserved startup action in ComfyUI-Manager")
@tracking.track_command("node")
def clear():
execute_cm_cli(["clear"])
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["clear"], verbose=verbose)


# completers
Expand Down Expand Up @@ -338,7 +353,8 @@ def show(

validate_mode(mode)

execute_cm_cli(["show", arg], channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["show", arg], channel=channel, mode=mode, verbose=verbose)


@app.command("simple-show", help="Show node list (simple mode)")
Expand Down Expand Up @@ -377,7 +393,8 @@ def simple_show(

validate_mode(mode)

execute_cm_cli(["simple-show", arg], channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["simple-show", arg], channel=channel, mode=mode, verbose=verbose)


# install, reinstall, uninstall
Expand Down Expand Up @@ -413,7 +430,8 @@ def install(

validate_mode(mode)

execute_cm_cli(["install"] + nodes, channel=channel, fast_deps=fast_deps, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["install"] + nodes, channel=channel, fast_deps=fast_deps, mode=mode, verbose=verbose)


@app.command(help="Reinstall custom nodes")
Expand Down Expand Up @@ -448,7 +466,8 @@ def reinstall(

validate_mode(mode)

execute_cm_cli(["reinstall"] + nodes, channel=channel, fast_deps=fast_deps, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["reinstall"] + nodes, channel=channel, fast_deps=fast_deps, mode=mode, verbose=verbose)


@app.command(help="Uninstall custom nodes")
Expand All @@ -475,7 +494,8 @@ def uninstall(

validate_mode(mode)

execute_cm_cli(["uninstall"] + nodes, channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["uninstall"] + nodes, channel=channel, mode=mode, verbose=verbose)


def update_node_id_cache():
Expand Down Expand Up @@ -521,7 +541,8 @@ def update(
):
validate_mode(mode)

execute_cm_cli(["update"] + nodes, channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["update"] + nodes, channel=channel, mode=mode, verbose=verbose)

update_node_id_cache()

Expand Down Expand Up @@ -550,7 +571,8 @@ def disable(
):
validate_mode(mode)

execute_cm_cli(["disable"] + nodes, channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["disable"] + nodes, channel=channel, mode=mode, verbose=verbose)


@app.command(help="Enable custom nodes")
Expand All @@ -577,7 +599,8 @@ def enable(
):
validate_mode(mode)

execute_cm_cli(["enable"] + nodes, channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["enable"] + nodes, channel=channel, mode=mode, verbose=verbose)


@app.command(help="Fix dependencies of custom nodes")
Expand All @@ -604,7 +627,8 @@ def fix(
):
validate_mode(mode)

execute_cm_cli(["fix"] + nodes, channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["fix"] + nodes, channel=channel, mode=mode, verbose=verbose)


@app.command(
Expand Down Expand Up @@ -648,17 +672,20 @@ def install_deps(
os.makedirs(tmp_path)
tmp_path = os.path.join(tmp_path, str(uuid.uuid4())) + ".json"

verbose = app_callback.context.get("verbose", False)
execute_cm_cli(
["deps-in-workflow", "--workflow", workflow, "--output", tmp_path],
channel,
mode=mode,
verbose=verbose,
)

deps_file = tmp_path
else:
deps_file = os.path.abspath(os.path.expanduser(deps))

execute_cm_cli(["install-deps", deps_file], channel=channel, mode=mode)
verbose = app_callback.context.get("verbose", False)
execute_cm_cli(["install-deps", deps_file], channel=channel, mode=mode, verbose=verbose)

if tmp_path is not None and os.path.exists(tmp_path):
os.remove(tmp_path)
Expand Down Expand Up @@ -688,10 +715,12 @@ def deps_in_workflow(
workflow = os.path.abspath(os.path.expanduser(workflow))
output = os.path.abspath(os.path.expanduser(output))

verbose = app_callback.context.get("verbose", False)
execute_cm_cli(
["deps-in-workflow", "--workflow", workflow, "--output", output],
channel,
mode=mode,
verbose=verbose,
)


Expand Down
0