8000 Add node bisect by huchenlei · Pull Request #126 · Comfy-Org/comfy-cli · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add node bisect #126

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

Merged
merged 7 commits into from
Jul 18, 2024
Merged

Add node bisect #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e763ea
Add node bisect
huchenlei Jul 17, 2024
78b76ae
Fix annotation
huchenlei Jul 17, 2024
052baba
Remove auto-generated testfile
huchenlei Jul 17, 2024
09bde2c
nit
huchenlei Jul 17, 2024
4508248
Auto launch
huchenlei Jul 17, 2024
a801541
Allow pin nodes
huchenlei Jul 17, 2024
d008675
nit
huchenlei Jul 17, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ share/python-wheels/
*.spec

venv/

bisect_state.json
11 changes: 10 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,16 @@ comfy node [show|simple-show] [installed|enabled|not-installed|disabled|all|snap

- Generate deps:

`comfy node deps-in-workflow --workflow=<workflow .json/.png file> --output=<output deps .json file>`
`comfy node deps-in-workflow --workflow=<workflow .json/.png file> --output=<output deps .json file>`

#### Bisect custom nodes

The bisect tool can help you pinpoint the custom node that causes the issue.

- `comfy node bisect start`: Start a new bisect session with optional ComfyUI launch args.
- `comfy node bisect good`: Mark the current active set as bad, indicating the problem is within the test set
- `comfy node bisect bad`: Mark the current active set as bad, indicating the problem is within the test set.
- `comfy node bisect reset`: Reset the current bisect session.

### Managing Models

Expand Down
253 changes: 4 additions & 249 deletions comfy_cli/cmdline.py
View file
Open in desktop
55F2
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
import asyncio
import os
import subprocess
import sys
import threading
import uuid
import webbrowser
from typing import Optional

import questionary
import typer
from rich import print
from rich.console import Console
from rich.panel import Panel
from typing_extensions import Annotated, List

from comfy_cli import constants, env_checker, logging, tracking, ui, utils
from comfy_cli.command import custom_nodes
from comfy_cli.command import install as install_inner
from comfy_cli.command import run as run_inner
from comfy_cli.command.launch import launch as launch_command
from comfy_cli.command.models import models as models_command
from comfy_cli.config_manager import ConfigManager
from comfy_cli.constants import GPU_OPTION, CUDAVersion
from comfy_cli.env_checker import EnvChecker, check_comfy_server_running
from comfy_cli.env_checker import EnvChecker
from comfy_cli.update import check_for_updates
from comfy_cli.workspace_manager import (
WorkspaceManager,
WorkspaceType,
check_comfy_repo,
)
from comfy_cli.workspace_manager import WorkspaceManager, check_comfy_repo

logging.setup_logging()
app = typer.Typer()
Expand Down Expand Up @@ -432,215 +425,6 @@ def validate_comfyui(_env_checker):
raise typer.Exit(code=1)


async def launch_and_monitor(cmd, listen, port):
"""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to launch.py

Monitor the process during the background launch.

If a success message is captured, exit;
otherwise, return the log in case of failure.
"""
logging_flag = False
log = []
logging_lock = threading.Lock()

# NOTE: To prevent encoding error on Windows platform
env = dict(os.environ, PYTHONIOENCODING="utf-8")
env["COMFY_CLI_BACKGROUND"] = "true"

if sys.platform == "win32":
process = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
env=env,
encoding="utf-8",
shell=True, # win32 only
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, # win32 only
)
else:
process = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
env=env,
encoding="utf-8",
)

def msg_hook(stream):
nonlocal log
nonlocal logging_flag

while True:
line = stream.readline()
if "Launching ComfyUI from:" in line:
logging_flag = True
elif "To see the GUI go to:" in line:
print(
f"[bold yellow]ComfyUI is successfully launched in the background.[/bold yellow]\nTo see the GUI go to: http://{listen}:{port}"
)
ConfigManager().config["DEFAULT"][
constants.CONFIG_KEY_BACKGROUND
] = f"{(listen, port, process.pid)}"
ConfigManager().write_config()

# NOTE: os.exit(0) doesn't work.
os._exit(0)

with logging_lock:
if logging_flag:
log.append(line)

stdout_thread = threading.Thread(target=msg_hook, args=(process.stdout,))
stderr_thread = threading.Thread(target=msg_hook, args=(process.stderr,))

stdout_thread.start()
stderr_thread.start()

process.wait()

return log


def background_launch(extra):
config_background = ConfigManager().background
if config_background is not None and utils.is_running(config_background[2]):
console.print(
"[bold red]ComfyUI is already running in background.\nYou cannot start more than one background service.[/bold red]\n"
)
raise typer.Exit(code=1)

port = 8188
listen = "127.0.0.1"

if extra is not None:
for i in range(len(extra) - 1):
if extra[i] == "--port":
port = extra[i + 1]
if listen[i] == "--listen":
listen = extra[i + 1]

if len(extra) > 0:
extra = ["--"] + extra
else:
extra = []

if check_comfy_server_running(port):
console.print(
f"[bold red]The {port} port is already in use. A new ComfyUI server cannot be launched.\n[bold red]\n"
)
raise typer.Exit(code=1)

cmd = [
"comfy",
f"--workspace={os.path.abspath(os.getcwd())}",
"launch",
] + extra

loop = asyncio.get_event_loop()
log = loop.run_until_complete(launch_and_monitor(cmd, listen, port))

if log is not None:
console.print(
Panel(
"".join(log),
title="[bold red]Error log during ComfyUI execution[/bold red]",
border_style="bright_red",
)
)

console.print("\n[bold red]Execution error: failed to launch ComfyUI[/bold red]\n")
# NOTE: os.exit(0) doesn't work
os._exit(1)


def launch_comfyui(extra):
reboot_path = None

new_env = os.environ.copy()

session_path = os.path.join(
ConfigManager().get_config_path(), "tmp", str(uuid.uuid4())
)
new_env["__COMFY_CLI_SESSION__"] = session_path
new_env["PYTHONENCODING"] = "utf-8"

# To minimize the possibility of leaving residue in the tmp directory, use files instead of directories.
reboot_path = os.path.join(session_path + ".reboot")

extra = extra if extra is not None else []

process = None

if "COMFY_CLI_BACKGROUND" not in os.environ:
# If not running in background mode, there's no need to use popen. This can prevent the issue of linefeeds occurring with tqdm.
while True:
res = subprocess.run(
[sys.executable, "main.py"] + extra, env=new_env, check=False
)

if reboot_path is None:
print("[bold red]ComfyUI is not installed.[/bold red]\n")
exit(res)

if not os.path.exists(reboot_path):
exit(res)

os.remove(reboot_path)
else:
# If running in background mode without using a popen, broken pipe errors may occur when flushing stdout/stderr.
def redirector_stderr():
while True:
if process is not None:
print(process.stderr.readline(), end="")

def redirector_stdout():
while True:
if process is not None:
print(process.stdout.readline(), end="")

threading.Thread(target=redirector_stderr).start()
threading.Thread(target=redirector_stdout).start()

try:
while True:
if sys.platform == "win32":
process = subprocess.Popen(
[sys.executable, "main.py"] + extra,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
env=new_env,
encoding="utf-8",
shell=True, # win32 only
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP, # win32 only
)
else:
process = subprocess.Popen(
[sys.executable, "main.py"] + extra,
text=True,
env=new_env,
encoding="utf-8",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)

process.wait()

if reboot_path is None:
print("[bold red]ComfyUI is not installed.[/bold red]\n")
os._exit(process.pid)

if not os.path.exists(reboot_path):
os._exit(process.pid)

os.remove(reboot_path)
except KeyboardInterrupt:
if process is not None:
os._exit(1)


@app.command(help="Stop background ComfyUI")
@tracking.track_command()
def stop():
Expand Down Expand Up @@ -672,36 +456,7 @@ def launch(
] = False,
extra: List[str] = typer.Argument(None),
):
check_for_updates()
resolved_workspace = workspace_manager.workspace_path

if not resolved_workspace:
print(
"\nComfyUI is not available.\nTo install ComfyUI, you can run:\n\n\tcomfy install\n\n",
file=sys.stderr,
)
raise typer.Exit(code=1)

if (
extra is None or len(extra) == 0
) and workspace_manager.workspace_type == WorkspaceType.DEFAULT:
launch_extras = workspace_manager.config_manager.config["DEFAULT"].get(
constants.CONFIG_KEY_DEFAULT_LAUNCH_EXTRAS, ""
)

if launch_extras != "":
extra = launch_extras.split(" ")

print(f"\nLaunching ComfyUI from: {resolved_workspace}\n")

# Update the recent workspace
workspace_manager.set_recent_workspace(resolved_workspace)

os.chdir(resolved_workspace)
if background:
background_launch(extra)
else:
launch_comfyui(extra)
launch_command(background, extra)


@app.command("set-default", help="Set default ComfyUI path")
Expand Down
Loading
Loading
0