comfy-cli 1.7.1__tar.gz → 1.7.3__tar.gz

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-cli
-Version: 1.7.1
+Version: 1.7.3
 Summary: A CLI tool for installing and using ComfyUI.
 Maintainer-email: Yoland Yan <yoland@drip.art>, James Kwon <hongilkwon316@gmail.com>, Robin Huang <robin@drip.art>, "Dr.Lt.Data" <dr.lt.data@gmail.com>
 License: GPL-3.0-only
@@ -111,6 +111,9 @@ will simply update the comfy.yaml file to reflect the local setup
   pip install comfyui-manager==4.1b8          # specific version
   ```
 - `comfy --workspace=<path> install`: Install ComfyUI into `<path>/ComfyUI`.
+- `comfy install --fast-deps`: Use `uv` instead of `pip` for faster dependency resolution
+  during initial ComfyUI installation. comfy-cli's built-in resolver compiles all requirements (core + custom nodes)
+  into a single lockfile and installs from it. Also handles GPU-specific PyTorch wheel selection automatically.
 - For `comfy install`, if no path specification like `--workspace, --recent, or --here` is provided, it will be implicitly installed in `<HOME>/comfy`.
 
 #### Python environment handling
@@ -257,8 +260,9 @@ comfy node [show|simple-show] [installed|enabled|not-installed|disabled|all|snap
 #### Unified Dependency Resolution (--uv-compile)
 
 Requires ComfyUI-Manager v4.1+. Instead of installing dependencies per-node with
-`pip install`, `--uv-compile` batch-resolves all custom node dependencies via
-`uv pip compile` to avoid version conflicts.
+`pip install`, `--uv-compile` delegates to ComfyUI-Manager's unified resolver which batch-resolves
+all custom node dependencies via `uv pip compile` with **cross-node conflict detection** —
+it can identify which node packs have incompatible dependencies and why.
 
 - Install with unified resolution:
 
@@ -280,6 +284,23 @@ Requires ComfyUI-Manager v4.1+. Instead of installing dependencies per-node with
 
   `comfy node install comfyui-impact-pack --no-uv-compile`
 
+#### --fast-deps vs --uv-compile
+
+Both flags use `uv` for faster dependency resolution, but they work differently:
+
+|                       | `--fast-deps`                                   | `--uv-compile`                                |
+|-----------------------|-------------------------------------------------|-----------------------------------------------|
+| **Resolver**          | comfy-cli built-in (`DependencyCompiler`)       | ComfyUI-Manager (`UnifiedDepResolver`)        |
+| **Scope**             | `comfy install`, `comfy node install/reinstall` | Custom node commands only                     |
+| **Conflict handling** | Interactive prompt to pick a version            | Automatic detection with node attribution     |
+| **Config default**    | No                                              | Yes (`comfy manager uv-compile-default true`) |
+| **Requires**          | Only `uv`                                       | ComfyUI-Manager v4.1+                         |
+
+**When to use which:**
+- For initial ComfyUI installation with uv: `comfy install --fast-deps`
+- For custom node management with Manager v4.1+: `--uv-compile` (recommended)
+- For custom node management with older Manager: `--fast-deps`
+
 #### Bisect custom nodes
 
 If you encounter bugs only with custom nodes enabled, and want to find out which custom node(s) causes the bug,

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/README.md

@@ -66,6 +66,9 @@ will simply update the comfy.yaml file to reflect the local setup
   pip install comfyui-manager==4.1b8          # specific version
   ```
 - `comfy --workspace=<path> install`: Install ComfyUI into `<path>/ComfyUI`.
+- `comfy install --fast-deps`: Use `uv` instead of `pip` for faster dependency resolution
+  during initial ComfyUI installation. comfy-cli's built-in resolver compiles all requirements (core + custom nodes)
+  into a single lockfile and installs from it. Also handles GPU-specific PyTorch wheel selection automatically.
 - For `comfy install`, if no path specification like `--workspace, --recent, or --here` is provided, it will be implicitly installed in `<HOME>/comfy`.
 
 #### Python environment handling
@@ -212,8 +215,9 @@ comfy node [show|simple-show] [installed|enabled|not-installed|disabled|all|snap
 #### Unified Dependency Resolution (--uv-compile)
 
 Requires ComfyUI-Manager v4.1+. Instead of installing dependencies per-node with
-`pip install`, `--uv-compile` batch-resolves all custom node dependencies via
-`uv pip compile` to avoid version conflicts.
+`pip install`, `--uv-compile` delegates to ComfyUI-Manager's unified resolver which batch-resolves
+all custom node dependencies via `uv pip compile` with **cross-node conflict detection** —
+it can identify which node packs have incompatible dependencies and why.
 
 - Install with unified resolution:
 
@@ -235,6 +239,23 @@ Requires ComfyUI-Manager v4.1+. Instead of installing dependencies per-node with
 
   `comfy node install comfyui-impact-pack --no-uv-compile`
 
+#### --fast-deps vs --uv-compile
+
+Both flags use `uv` for faster dependency resolution, but they work differently:
+
+|                       | `--fast-deps`                                   | `--uv-compile`                                |
+|-----------------------|-------------------------------------------------|-----------------------------------------------|
+| **Resolver**          | comfy-cli built-in (`DependencyCompiler`)       | ComfyUI-Manager (`UnifiedDepResolver`)        |
+| **Scope**             | `comfy install`, `comfy node install/reinstall` | Custom node commands only                     |
+| **Conflict handling** | Interactive prompt to pick a version            | Automatic detection with node attribution     |
+| **Config default**    | No                                              | Yes (`comfy manager uv-compile-default true`) |
+| **Requires**          | Only `uv`                                       | ComfyUI-Manager v4.1+                         |
+
+**When to use which:**
+- For initial ComfyUI installation with uv: `comfy install --fast-deps`
+- For custom node management with Manager v4.1+: `--uv-compile` (recommended)
+- For custom node management with older Manager: `--fast-deps`
+
 #### Bisect custom nodes
 
 If you encounter bugs only with custom nodes enabled, and want to find out which custom node(s) causes the bug,

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/comfy_cli/cmdline.py

@@ -267,7 +267,7 @@ def install(
         typer.Option(
             "--fast-deps",
             show_default=False,
-            help="Use new fast dependency installer",
+            help="Use uv instead of pip for dependency resolution (comfy-cli built-in resolver)",
         ),
     ] = False,
     pr: Annotated[
@@ -416,7 +416,10 @@ def update(
             check=True,
         )
 
-    custom_nodes.command.update_node_id_cache()
+    try:
+        custom_nodes.command.update_node_id_cache()
+    except (FileNotFoundError, subprocess.CalledProcessError) as e:
+        rprint(f"[yellow]Failed to update node id cache: {e}[/yellow]")
 
 
 @app.command(help="Run API workflow file using the ComfyUI launched by `comfy launch --background`")

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/comfy_cli/command/custom_nodes/command.py

@@ -18,6 +18,7 @@ from comfy_cli.command.custom_nodes.cm_cli_util import execute_cm_cli, find_cm_c
 from comfy_cli.config_manager import ConfigManager
 from comfy_cli.constants import NODE_ZIP_FILENAME
 from comfy_cli.file_utils import (
+    DownloadException,
     download_file,
     extract_package_as_zip,
     upload_file_to_signed_url,
@@ -170,13 +171,11 @@ def execute_install_script(repo_path):
     if os.path.exists(requirements_path):
         print("Install: pip packages")
         python = resolve_workspace_python(workspace_manager.workspace_path)
-        with open(requirements_path, encoding="utf-8") as requirements_file:
-            for line in requirements_file:
-                package_name = line.strip()
-                if package_name and not package_name.startswith("#"):
-                    install_cmd = [python, "-m", "pip", "install", package_name]
-                    if package_name.strip() != "":
-                        try_install_script(repo_path, install_cmd)
+        # Absolute path so pip doesn't re-resolve it against cwd=repo_path
+        # in try_install_script, which would double the path if repo_path
+        # is relative.
+        install_cmd = [python, "-m", "pip", "install", "-r", os.path.abspath(requirements_path)]
+        try_install_script(repo_path, install_cmd)
 
     if os.path.exists(install_script_path):
         print("Install: install script")
@@ -1168,7 +1167,12 @@ def registry_install(
 
     local_filename = node_specific_path / f"{node_id}-{node_version.version}.zip"
     logging.debug(f"Start downloading the node {node_id} version {node_version.version} to {local_filename}")
-    download_file(node_version.download_url, local_filename)
+    try:
+        download_file(node_version.download_url, local_filename)
+    except DownloadException as e:
+        logging.error(f"Failed to download node {node_id} version {node_version.version}: {e}")
+        ui.display_error_message(f"Failed to download the custom node {node_id}: {e}")
+        raise typer.Exit(code=1) from None
 
     # Extract the downloaded archive to the custom_node directory on the workspace.
     logging.debug(f"Start extracting the node {node_id} version {node_version.version} to {custom_nodes_path}")

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/comfy_cli/command/install.py

@@ -476,8 +476,16 @@ def get_latest_release(repo_owner: str, repo_name: str) -> GithubRelease | None:
     """
     url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/releases/latest"
 
+    headers = {}
+    if github_token := os.getenv("GITHUB_TOKEN"):
+        headers["Authorization"] = f"Bearer {github_token}"
+
     try:
-        response = requests.get(url, timeout=5)
+        response = requests.get(url, headers=headers, timeout=5)
+
+        if response.status_code in (403, 429):
+            handle_github_rate_limit(response)
+
         response.raise_for_status()
 
         data = response.json()

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/comfy_cli/command/models/models.py

@@ -1,12 +1,14 @@
 import contextlib
 import os
 import pathlib
+import time
 from typing import Annotated
 from urllib.parse import parse_qs, unquote, urlparse
 
 import requests
 import typer
 from rich import print
+from rich.markup import escape
 
 from comfy_cli import constants, tracking, ui
 from comfy_cli.config_manager import ConfigManager
@@ -19,6 +21,8 @@ app = typer.Typer()
 workspace_manager = WorkspaceManager()
 config_manager = ConfigManager()
 
+_CIVITAI_SUBDOMAIN_SUFFIXES = tuple(f".{h}" for h in constants.CIVITAI_ALLOWED_HOSTS)
+
 
 model_path_map = {
     "lora": "loras",
@@ -33,6 +37,18 @@ def get_workspace() -> pathlib.Path:
     return pathlib.Path(workspace_manager.workspace_path)
 
 
+def _format_elapsed(seconds: float) -> str:
+    """Format elapsed seconds into a human-readable string."""
+    rounded = round(seconds, 1)
+    if rounded < 60:
+        return f"{rounded:.1f}s"
+    minutes, secs = divmod(int(rounded), 60)
+    if minutes < 60:
+        return f"{minutes}m {secs}s"
+    hours, minutes = divmod(minutes, 60)
+    return f"{hours}h {minutes}m {secs}s"
+
+
 def potentially_strip_param_url(path_name: str) -> str:
     return path_name.split("?")[0]
 
@@ -85,7 +101,7 @@ def check_civitai_url(url: str) -> tuple[bool, bool, int | None, int | None]:
     try:
         parsed = urlparse(url)
         host = (parsed.hostname or "").lower()
-        if host != "civitai.com" and not host.endswith(".civitai.com"):
+        if host not in constants.CIVITAI_ALLOWED_HOSTS and not host.endswith(_CIVITAI_SUBDOMAIN_SUFFIXES):
             return False, False, None, None
         p_parts = [p for p in parsed.path.split("/") if p]
         query = parse_qs(parsed.query)
@@ -219,6 +235,14 @@ def download(
             show_default=False,
         ),
     ] = None,
+    downloader: Annotated[
+        str | None,
+        typer.Option(
+            "--downloader",
+            help="Download backend: 'httpx' (default) or 'aria2' (requires aria2 RPC server).",
+            show_default=False,
+        ),
+    ] = None,
 ):
     if relative_path is not None:
         relative_path = os.path.expanduser(relative_path)
@@ -233,6 +257,8 @@ def download(
         constants.HF_API_TOKEN_ENV_KEY, constants.HF_API_TOKEN_KEY, set_hf_api_token
     )
 
+    resolved_downloader = downloader or config_manager.get(constants.CONFIG_KEY_DEFAULT_DOWNLOADER) or "httpx"
+
     is_civitai_model_url, is_civitai_api_url, model_id, version_id = check_civitai_url(url)
     is_huggingface_url, repo_id, hf_filename, hf_folder_name, hf_branch_name = check_huggingface_url(url)
 
@@ -297,6 +323,8 @@ def download(
         print(f"[bold red]File already exists: {local_filepath}[/bold red]")
         return
 
+    start_time = time.monotonic()
+
     if is_huggingface_url and check_unauthorized(url, headers):
         if hf_api_token is None:
             print(
@@ -329,7 +357,16 @@ def download(
             print(f"Model downloaded successfully to: {output_path}")
     else:
         print(f"Start downloading URL: {url} into {local_filepath}")
-        download_file(url, local_filepath, headers)
+        try:
+            download_file(url, local_filepath, headers, downloader=resolved_downloader)
+        except DownloadException as e:
+            # escape() so a dynamic error message containing "[/]" or similar
+            # rich-markup syntax doesn't trigger MarkupError or get mis-rendered.
+            print(f"[bold red]{escape(str(e))}[/bold red]")
+            raise typer.Exit(code=1) from None
+
+    elapsed = time.monotonic() - start_time
+    print(f"Done in {_format_elapsed(elapsed)}")
 
 
 @app.command()

{comfy_cli-1.7.1 → comfy_cli-1.7.3}/comfy_cli/constants.py

@@ -47,9 +47,14 @@ CONFIG_KEY_UV_COMPILE_DEFAULT = "uv_compile_default"
 
 CIVITAI_API_TOKEN_KEY = "civitai_api_token"
 CIVITAI_API_TOKEN_ENV_KEY = "CIVITAI_API_TOKEN"
+CIVITAI_ALLOWED_HOSTS: tuple[str, ...] = ("civitai.com", "civitai.red")
 HF_API_TOKEN_KEY = "hf_api_token"
 HF_API_TOKEN_ENV_KEY = "HF_API_TOKEN"
 
+ARIA2_SERVER_ENV_KEY = "COMFYUI_MANAGER_ARIA2_SERVER"
+ARIA2_SECRET_ENV_KEY = "COMFYUI_MANAGER_ARIA2_SECRET"
+CONFIG_KEY_DEFAULT_DOWNLOADER = "default_downloader"
+
 DEFAULT_TRACKING_VALUE = True
 
 COMFY_LOCK_YAML_FILE = "comfy.lock.yaml"