Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/ruff_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
- name: lint check and then format check with ruff
run: |
ruff check
ruff format --check
ruff format --diff
4 changes: 0 additions & 4 deletions comfy_cli/cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,13 +539,9 @@ def which():
@tracking.track_command()
def env():
check_for_updates()

env_data = EnvChecker().fill_print_table()

workspace_data = workspace_manager.fill_print_table()

all_data = env_data + workspace_data

ui.display_table(
data=all_data,
column_names=[":laptop_computer: Environment", "Value"],
Expand Down
41 changes: 24 additions & 17 deletions comfy_cli/config_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def load(self):
if not is_running(self.background[2]):
self.remove_background()


def get_env_data(self):
"""
Get environment data as a list of tuples for display.
Expand All @@ -96,10 +95,12 @@ def get_env_data(self):

launch_extras = ""
if self.config.has_option("DEFAULT", "default_workspace"):
data.append((
"Default ComfyUI workspace",
self.config["DEFAULT"][constants.CONFIG_KEY_DEFAULT_WORKSPACE],
))
data.append(
(
"Default ComfyUI workspace",
self.config["DEFAULT"][constants.CONFIG_KEY_DEFAULT_WORKSPACE],
)
)
launch_extras = self.config["DEFAULT"].get(constants.CONFIG_KEY_DEFAULT_LAUNCH_EXTRAS, "")
else:
data.append(("Default ComfyUI workspace", "No default ComfyUI workspace"))
Expand All @@ -110,26 +111,32 @@ def get_env_data(self):
data.append(("Default ComfyUI launch extra options", launch_extras))

if self.config.has_option("DEFAULT", constants.CONFIG_KEY_RECENT_WORKSPACE):
data.append((
"Recent ComfyUI workspace",
self.config["DEFAULT"][constants.CONFIG_KEY_RECENT_WORKSPACE],
))
data.append(
(
"Recent ComfyUI workspace",
self.config["DEFAULT"][constants.CONFIG_KEY_RECENT_WORKSPACE],
)
)
else:
data.append(("Recent ComfyUI workspace", "No recent run"))

if self.config.has_option("DEFAULT", "enable_tracking"):
data.append((
"Tracking Analytics",
("Enabled" if self.config["DEFAULT"]["enable_tracking"] == "True" else "Disabled"),
))
data.append(
(
"Tracking Analytics",
("Enabled" if self.config["DEFAULT"]["enable_tracking"] == "True" else "Disabled"),
)
)

if self.config.has_option("DEFAULT", constants.CONFIG_KEY_BACKGROUND):
bg_info = self.background
if bg_info:
data.append((
"Background ComfyUI",
f"http://{bg_info[0]}:{bg_info[1]} (pid={bg_info[2]})",
))
data.append(
(
"Background ComfyUI",
f"http://{bg_info[0]}:{bg_info[1]} (pid={bg_info[2]})",
)
)
else:
data.append(("Background ComfyUI", "[bold red]No[/bold red]"))

Expand Down
20 changes: 12 additions & 8 deletions comfy_cli/env_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,24 @@ def fill_print_table(self):
data = []
data.append(("Python Version", format_python_version(sys.version_info)))
data.append(("Python Executable", sys.executable))
data.append((
"Virtualenv Path",
self.virtualenv_path if self.virtualenv_path else "Not Used",
))
data.append(
(
"Virtualenv Path",
self.virtualenv_path if self.virtualenv_path else "Not Used",
)
)
data.append(("Conda Env", self.conda_env if self.conda_env else "Not Used"))

config_data = ConfigManager().get_env_data()
data.extend(config_data)

if check_comfy_server_running():
data.append((
"Comfy Server Running",
"[bold green]Yes[/bold green]\nhttp://localhost:8188",
))
data.append(
(
"Comfy Server Running",
"[bold green]Yes[/bold green]\nhttp://localhost:8188",
)
)
else:
data.append(("Comfy Server Running", "[bold red]No[/bold red]"))

Expand Down
Loading