comfy-cli 0.0.20__tar.gz → 0.0.20.dev1__tar.gz

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 0.0.20
+Version: 0.0.20.dev1
 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:                     GNU GENERAL PUBLIC LICENSE

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/cmdline.py

@@ -82,10 +82,13 @@ def entry(
         help="Execute from current path",
         callback=exclusivity_callback,
     ),
+    yes: bool = typer.Option(
+        False, "--yes", "-y", help="Enable without confirmation", is_flag=True
+    ),
 ):
     workspace_manager.setup_workspace_manager(workspace, here, recent)
 
-    tracking.prompt_tracking_consent()
+    tracking.prompt_tracking_consent(yes)
 
     if ctx.invoked_subcommand is None:
         print(
@@ -152,6 +155,14 @@ def install(
             callback=gpu_exclusivity_callback,
         ),
     ] = None,
+    cpu: Annotated[
+        bool,
+        typer.Option(
+            show_default=False,
+            help="Install for CPU",
+            callback=gpu_exclusivity_callback,
+        ),
+    ] = None,
     commit: Annotated[
         Optional[str], typer.Option(help="Specify commit hash for ComfyUI")
     ] = None,
@@ -203,6 +214,8 @@ def install(
         gpu = GPU_OPTION.AMD
     elif m_series:
         gpu = GPU_OPTION.M_SERIES
+    elif cpu:
+        gpu = None
     else:
         if platform == constants.OS.MACOS:
             gpu = ui.prompt_select_enum(

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/command/custom_nodes/command.py

@@ -46,7 +46,7 @@ def execute_cm_cli(args, channel=None, mode=None):
         cmd += ["--channel", channel]
 
     if mode is not None:
-        cmd += ["--mode", channel]
+        cmd += ["--mode", mode]
 
     new_env = os.environ.copy()
     session_path = os.path.join(
@@ -172,11 +172,10 @@ def show(
     ),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_commands = [
@@ -212,11 +211,10 @@ def simple_show(
     ),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_commands = [
@@ -277,11 +275,10 @@ def reinstall(
     args: List[str] = typer.Argument(..., help="reinstall custom nodes"),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     if "all" in args:
@@ -305,11 +302,10 @@ def uninstall(
     args: List[str] = typer.Argument(..., help="uninstall custom nodes"),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     if "all" in args:
@@ -336,11 +332,10 @@ def update(
     args: List[str] = typer.Argument(..., help="update custom nodes"),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_modes = ["remote", "local", "cache"]
@@ -360,11 +355,10 @@ def disable(
     args: List[str] = typer.Argument(..., help="disable custom nodes"),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_modes = ["remote", "local", "cache"]
@@ -384,11 +378,10 @@ def enable(
     args: List[str] = typer.Argument(..., help="enable custom nodes"),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_modes = ["remote", "local", "cache"]
@@ -410,11 +403,10 @@ def fix(
     ),
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[
-        str, "--mode", typer.Option(show_default=False, help="[remote|local|cache]")
+        str, typer.Option(show_default=False, help="[remote|local|cache]")
     ] = None,
 ):
     valid_modes = ["remote", "local", "cache"]
@@ -500,7 +492,6 @@ def deps_in_workflow(
     ],
     channel: Annotated[
         str,
-        "--channel",
         typer.Option(show_default=False, help="Specify the operation mode"),
     ] = None,
     mode: Annotated[

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/config_manager.py

@@ -1,11 +1,10 @@
 import configparser
 import os
 
-import tomlkit
-
 from comfy_cli.utils import singleton, get_os, is_running
 from comfy_cli import constants, logging
 from typing import Optional, Tuple
+from importlib.metadata import version
 
 
 @singleton
@@ -19,11 +18,6 @@ class ConfigManager(object):
     def get_config_path():
         return constants.DEFAULT_CONFIG[get_os()]
 
-    @staticmethod
-    def get_pyproject_path():
-        # TODO: check if this works for homebrew and pip installed comfy-cli as well.
-        return os.path.join(os.path.dirname(__file__), "../pyproject.toml")
-
     def get_config_file_path(self):
         return os.path.join(self.get_config_path(), "config.ini")
 
@@ -125,13 +119,13 @@ class ConfigManager(object):
         self.background = None
 
     def get_cli_version(self):
+        # Note: this approach should work for users installing the CLI via PyPi (e.g., pip install comfy-cli)
         try:
-            with open(self.get_pyproject_path(), "r") as f:
-                pyproject_toml_content = f.read()
-            parsed_toml = tomlkit.parse(pyproject_toml_content)
-            version = parsed_toml["project"]["version"]
-            return version
+            return version("comfy-cli")
         except Exception as e:
-            # Handle exceptions when parsing or retrieving the version
-            logging.error(f"Error occurred while retrieving CLI version: {e}")
-            return None
+            logging.debug(
+                f"Error occurred while retrieving CLI version using importlib.metadata: {e}"
+            )
+
+        # TODO: cover the users installing the CLI via homebrew
+        return "0.0.0"

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/constants.py

@@ -34,6 +34,8 @@ CONFIG_KEY_DEFAULT_WORKSPACE = "default_workspace"
 CONFIG_KEY_DEFAULT_LAUNCH_EXTRAS = "default_launch_extras"
 CONFIG_KEY_RECENT_WORKSPACE = "recent_workspace"
 CONFIG_KEY_ENABLE_TRACKING = "enable_tracking"
+CONFIG_KEY_USER_ID = "user_id"
+CONFIG_KEY_INSTALL_EVENT_TRIGGERED = "install_event_triggered"
 CONFIG_KEY_BACKGROUND = "background"
 
 COMFY_LOCK_YAML_FILE = "comfy.lock.yaml"

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/logging.py

@@ -19,7 +19,7 @@ def setup_logging():
         "ERROR": logging.ERROR,
         "CRITICAL": logging.CRITICAL,
     }
-    log_level_key = os.getenv("LOG_LEVEL", "WARN").upper()
+    log_level_key = os.getenv("LOG_LEVEL", "ERROR").upper()
     logging.basicConfig(
         level=log_levels.get(log_level_key, logging.WARNING),
         format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/registry/config_parser.py

@@ -72,7 +72,15 @@ def initialize_project_config():
             "Could not retrieve Git remote URL. Are you in a Git repository?"
         )
 
+    # Convert SSH URL to HTTPS if needed
+    if git_remote_url.startswith("git@github.com:"):
+        git_remote_url = git_remote_url.replace(
+            "git@github.com:", "https://github.com/"
+        )
+
+    # Ensure the URL ends with `.git` and remove it to obtain the plain URL
     repo_name = git_remote_url.split("/")[-1].replace(".git", "")
+    git_remote_url = git_remote_url.replace(".git", "")
 
     project = document.get("project", tomlkit.table())
     urls = project.get("urls", tomlkit.table())

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/tracking.py

@@ -1,10 +1,11 @@
 import functools
+import logging as logginglib
 import os
 import uuid
-import logging as logginglib
-from mixpanel import Mixpanel, MixpanelException
 
 import typer
+from mixpanel import Mixpanel
+
 from comfy_cli import logging, ui, constants
 from comfy_cli.config_manager import ConfigManager
 
@@ -13,12 +14,15 @@ logginglib.getLogger("urllib3").setLevel(logginglib.ERROR)
 
 MIXPANEL_TOKEN = "93aeab8962b622d431ac19800ccc9f67"
 DISABLE_TELEMETRY = os.getenv("DISABLE_TELEMETRY", False)
-PROJECT_CONFIG_PATH = os.path.join(os.path.dirname(__file__), "pyproject.toml")
 mp = Mixpanel(MIXPANEL_TOKEN) if MIXPANEL_TOKEN else None
 
 # Generate a unique tracing ID per command.
 config_manager = ConfigManager()
 cli_version = config_manager.get_cli_version()
+
+# tracking all events for a single user
+user_id = config_manager.get(constants.CONFIG_KEY_USER_ID)
+# tracking all events for a single command
 tracing_id = str(uuid.uuid4())
 
 app = typer.Typer()
@@ -28,6 +32,7 @@ app = typer.Typer()
 def enable():
     set_tracking_enabled(True)
     typer.echo(f"Tracking is now {'enabled' if enable else 'disabled'}.")
+    init_tracking(True)
 
 
 @app.command()
@@ -37,16 +42,19 @@ def disable():
 
 
 def track_event(event_name: str, properties: any = {}):
+    logging.debug(
+        f"tracking event called with event_name: {event_name} and properties: {properties}"
+    )
     enable_tracking = config_manager.get(constants.CONFIG_KEY_ENABLE_TRACKING)
-    if enable_tracking:
+    if not enable_tracking:
+        return
+
+    try:
         properties["cli_version"] = cli_version
-        try:
-            mp.track(distinct_id=tracing_id, event_name=event_name, properties=properties)
-        except MixpanelException as e:
-            # Ignore errors due to lack of internet.
-            return
-        except Exception as e:
-            logging.error(f"Failed to track event: {e}")
+        properties["tracing_id"] = tracing_id
+        mp.track(distinct_id=user_id, event_name=event_name, properties=properties)
+    except Exception as e:
+        logging.warning(f"Failed to track event: {e}")  # Log the error but do not raise
 
 
 def track_command(sub_command: str = None):
@@ -81,19 +89,45 @@ def track_command(sub_command: str = None):
     return decorator
 
 
-def prompt_tracking_consent():
+def prompt_tracking_consent(yes: bool = False):
     tracking_enabled = config_manager.get(constants.CONFIG_KEY_ENABLE_TRACKING)
     if tracking_enabled is not None:
         return
 
-    enable_tracking = ui.prompt_confirm_action(
-        "Do you agree to enable tracking to improve the application?"
-    )
+    if yes:
+        init_tracking(True)
+    else:
+        enable_tracking = ui.prompt_confirm_action(
+            "Do you agree to enable tracking to improve the application?"
+        )
+        init_tracking(enable_tracking)
+
+
+def init_tracking(enable_tracking: bool):
+    """
+    Initialize the tracking system by setting the user identifier and tracking enabled status.
+    """
+    logging.debug(f"Initializing tracking with enable_tracking: {enable_tracking}")
     config_manager.set(constants.CONFIG_KEY_ENABLE_TRACKING, str(enable_tracking))
+    if not enable_tracking:
+        return
+
+    user_id = config_manager.get(constants.CONFIG_KEY_USER_ID)
+    logging.debug(f'User identifier for tracking user_id found: {user_id}."')
+    if user_id is None:
+        user_id = str(uuid.uuid4())
+        config_manager.set(constants.CONFIG_KEY_USER_ID, user_id)
+        logging.debug(f'Setting user identifier for tracking user_id: {user_id}."')
 
     # Note: only called once when the user interacts with the CLI for the
     #  first time iff the permission is granted.
-    track_event("install")
+    install_event_triggered = config_manager.get(
+        constants.CONFIG_KEY_INSTALL_EVENT_TRIGGERED
+    )
+    if not install_event_triggered:
+        logging.debug("Tracking install event.")
+        config_manager.set(constants.CONFIG_KEY_INSTALL_EVENT_TRIGGERED, "True")
+        track_event("install")
 
 
 def set_tracking_enabled(enabled: bool):

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli/update.py

@@ -16,7 +16,7 @@ def check_for_newer_pypi_version(package_name, current_version):
         latest_version = response.json()["info"]["version"]
         return latest_version != current_version, latest_version
     except requests.RequestException as e:
-        #print(f"Error checking latest version: {e}")
+        # print(f"Error checking latest version: {e}")
         return False, current_version
 
 

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/comfy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: comfy-cli
-Version: 0.0.20
+Version: 0.0.20.dev1
 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:                     GNU GENERAL PUBLIC LICENSE

{comfy_cli-0.0.20 → comfy_cli-0.0.20.dev1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfy-cli"
 license = {file = "LICENSE"}
-version = "v0.0.20" # Will be filled in by the CI/CD pipeline. Check publish_package.py.
+version = "0.0.20.dev1" # Will be filled in by the CI/CD pipeline. Check publish_package.py.
 requires-python = ">= 3.9"
 description = "A CLI tool for installing and using ComfyUI."
 readme = "README.md"