modified: use constants.DEFAULT_CONFIG instead of venv/comfy-cli

modified: __COMFY_CLI_SESSION__ is changed based on uuid.
restore: comfy recent_path feature
feat: comfy launch --recent
feat: comfy set-default <path>
fix: add `mixpanel` into pyproject.toml dependencies

Author: ltdrdata

README.md

@@ -41,20 +41,28 @@ Comfy provides commands that allow you to easily run the installed ComfyUI.
 
   `comfy launch --workspace <path>`
 
-- To run ComfyUI from the current directory, if you are inside the ComfyUI repository:
-  
-  `comfy launch`
-  
-- To execute the ComfyUI that was last run or last installed, if you are outside of the ComfyUI repository: [TODO: NEED TO DISCUSS]
+- To execute commands automatically, prioritize without specifying a path:
+    - 1st: To run ComfyUI from the current directory, if you are inside the ComfyUI repository
+    - 2nd: To run ComfyUI from the default workspace, if you are inside the ComfyUI repository and default workspace is set
+    - 3rd: To execute the ComfyUI that was last run or last installed, if you are outside of the ComfyUI repository
 
   `comfy launch`
 
+-  To execute the ComfyUI that was last run or last installed
+    - If the `--workspace` option is provided, the `--recent` option is ignored.):
+  
+   `comfy launch --recent`
+
 - To run with default ComfyUI options:
 
   `comfy launch -- <extra args...>`
 
   `comfy launch -- --cpu --listen 0.0.0.0`
 
+- To set default workspace:
+
+  `comfy set-default <workspace path>`
+
 
 ### Managing Packages [WIP]
 

comfy_cli/cmdline.py

@@ -17,6 +17,8 @@
 from comfy_cli import env_checker
 from rich.console import Console
 import time
+import uuid
+
 
 app = typer.Typer()
 
@@ -119,14 +121,8 @@ def validate_comfyui(_env_checker):
 
 
 def launch_comfyui(_env_checker, extra):
-    # TODO(yoland/data): Disabled config writing for now, checking with @data
-    # We need to find a viable place to write config file, e.g. standard place
-    # for macOS:   ~/Library/Application Support/
-    # for linx:    ~/.config/
-    # for windows: C:\Users\<username>\AppData\Local\
-    #_env_checker.config['DEFAULT']['recent_path'] = os.getcwd()
-    #_env_checker.write_config()
-
+    _env_checker.config['DEFAULT']['recent_path'] = os.getcwd()
+    _env_checker.write_config()
 
     validate_comfyui(_env_checker)
 
@@ -136,8 +132,11 @@ def launch_comfyui(_env_checker, extra):
     new_env = os.environ.copy()
 
     if env_path is not None:
-        new_env['__COMFY_CLI_SESSION__'] = os.path.join(env_path, 'comfy-cli')
-        reboot_path = os.path.join(env_path, 'comfy-cli', '.reboot')
+        session_path = os.path.join(_env_checker.get_config_path(), 'tmp', str(uuid.uuid4()))
+        new_env['__COMFY_CLI_SESSION__'] = session_path
+
+        # 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 []
 
@@ -150,15 +149,16 @@ def launch_comfyui(_env_checker, extra):
         os.remove(reboot_path)
 
 
-@app.command(help="Launch ComfyUI: ?[--workspace <path>] ?[-- <extra args ...>]")
+@app.command(help="Launch ComfyUI: ?[--workspace <path>] ?[--recent] ?[-- <extra args ...>]")
 @tracking.track_command()
 def launch(workspace: Annotated[str, typer.Option(show_default=False, help="Path to ComfyUI workspace")] = None,
+           recent: Annotated[bool, typer.Option(help="Launch from recent path (--workspace is higher)")] = False,
            extra: List[str] = typer.Argument(None)):
 
     _env_checker = EnvChecker()
 
     if workspace is not None:
-        comfyui_path = os.path.join(workspace, 'ComfyUI')
+        comfyui_path = os.path.join(os.path.expanduser(workspace), 'ComfyUI')
         if os.path.exists(comfyui_path):
             os.chdir(comfyui_path)
             _env_checker.check()  # update env
@@ -169,11 +169,20 @@ def launch(workspace: Annotated[str, typer.Option(show_default=False, help="Path
             print(f"\nInvalid ComfyUI not found in specified workspace: {workspace}\n", file=sys.stderr)
             raise typer.Exit(code=1)
 
-    elif _env_checker.comfy_repo is not None:
+    elif not recent and _env_checker.comfy_repo is not None:
         os.chdir(_env_checker.comfy_repo.working_dir)
         print(f"\nLaunch ComfyUI from current repo: {_env_checker.comfy_repo.working_dir}\n")
         launch_comfyui(_env_checker, extra)
 
+    elif not recent and _env_checker.config['DEFAULT'].get('default_workspace') is not None:
+        comfy_path = os.path.join(_env_checker.config['DEFAULT'].get('default_workspace'), 'ComfyUI')
+        print(f"\nLaunch ComfyUI from default workspace: {comfy_path}\n")
+
+        os.chdir(comfy_path)
+        _env_checker.check()  # update env
+
+        launch_comfyui(_env_checker, extra)
+
     elif _env_checker.config['DEFAULT'].get('recent_path') is not None:
         comfy_path = _env_checker.config['DEFAULT'].get('recent_path')
         print(f"\nLaunch ComfyUI from recent repo: {comfy_path}\n")
@@ -182,11 +191,26 @@ def launch(workspace: Annotated[str, typer.Option(show_default=False, help="Path
         _env_checker.check()  # update env
 
         launch_comfyui(_env_checker, extra)
+
     else:
         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)
 
 
+@app.command("set-default", help="Set default workspace")
+@tracking.track_command()
+def set_default(workspace_path: str):
+    workspace_path = os.path.expanduser(workspace_path)
+    comfy_path = os.path.join(workspace_path, 'ComfyUI')
+    if not os.path.exists(comfy_path):
+        print(f"Invalid workspace path: {workspace_path}\nThe workspace path must contain 'ComfyUI'.")
+        raise typer.Exit(code=1)
+
+    _env_checker = EnvChecker()
+    _env_checker.config['DEFAULT']['default_workspace'] = workspace_path
+    _env_checker.write_config()
+
+
 @app.command(help="Print out current environment variables.")
 @tracking.track_command()
 def env():

comfy_cli/command/custom_nodes/command.py

@@ -7,6 +7,7 @@
 import subprocess
 import sys
 from rich import print
+import uuid
 
 app = typer.Typer()
 manager_app = typer.Typer()
@@ -53,7 +54,8 @@ def execute_cm_cli(args, channel=None, mode=None, workspace=None):
     env_path = _env_checker.get_isolated_env()
     new_env = os.environ.copy()
     if env_path is not None:
-        new_env['__COMFY_CLI_SESSION__'] = os.path.join(env_path, 'comfy-cli')
+        session_path = os.path.join(_env_checker.get_config_path(), 'tmp', str(uuid.uuid4()))
+        new_env['__COMFY_CLI_SESSION__'] = session_path
         new_env['COMFYUI_PATH'] = comfyui_path
 
     subprocess.run(cmd, env=new_env)

comfy_cli/constants.py

@@ -1,11 +1,13 @@
 from enum import Enum
 import os
 
+
 class OS(Enum):
     WINDOWS = 'windows'
     MACOS = 'macos'
     LINUX = 'linux'
 
+
 COMFY_GITHUB_URL = 'https://github.com/comfyanonymous/ComfyUI'
 COMFY_MANAGER_GITHUB_URL = 'https://github.com/ltdrdata/ComfyUI-Manager'
 
@@ -15,6 +17,12 @@ class OS(Enum):
     OS.LINUX: os.path.join(os.path.expanduser('~'), 'ComfyUI'),
 }
 
+DEFAULT_CONFIG = {
+    OS.WINDOWS: os.path.join(os.path.expanduser('~'), 'AppData', 'Local', 'comfy-cli'),
+    OS.MACOS: os.path.join(os.path.expanduser('~'), 'Library', 'Application Support', 'comfy-cli'),
+    OS.LINUX:  os.path.join(os.path.expanduser('~'), '.config', "comfy-cli"),
+}
+
 # TODO: figure out a better way to check if this is a comfy repo
 COMFY_ORIGIN_URL_CHOICES = [
     "git@github.com:comfyanonymous/ComfyUI.git",

comfy_cli/env_checker.py

@@ -5,7 +5,6 @@
 import os
 import sys
 import git
-from rich import print
 from rich.console import Console
 from rich.table import Table
 import requests
@@ -122,19 +121,24 @@ def get_isolated_env(self):
 
         return None
 
+    def get_os(self):
+        if 'win' in sys.platform:
+            return constants.OS.WINDOWS
+        elif sys.platform == 'darwin':
+            return constants.OS.MACOS
+
+        return constants.OS.LINUX
+
     def get_config_path(self):
-        env_path = self.get_isolated_env()
-        if env_path:
-            return os.path.join(env_path, 'comfy-cli', 'config.json')
-        return None
+        return constants.DEFAULT_CONFIG[self.get_os()]
 
     def write_config(self):
-        env_path = self.get_isolated_env()
-        cli_path = os.path.join(env_path, 'comfy-cli')
-        if not os.path.exists(cli_path):
-            os.mkdir(cli_path)
+        config_file_path = os.path.join(self.get_config_path(), 'config.ini')
+        dir_path = os.path.dirname(config_file_path)
+        if not os.path.exists(dir_path):
+            os.mkdir(dir_path)
 
-        with open(self.get_config_path(), 'w') as configfile:
+        with open(config_file_path, 'w') as configfile:
             self.config.write(configfile)
 
     def check(self):
@@ -158,23 +162,36 @@ def check(self):
             self.currently_in_comfy_repo = False
             self.comfy_repo = None
 
-        config_path = self.get_config_path()
-        if os.path.exists(config_path):
+        config_file_path = os.path.join(self.get_config_path(), 'config.ini')
+        if os.path.exists(config_file_path):
             self.config = configparser.ConfigParser()
-            self.config.read(config_path)
+            self.config.read(config_file_path)
+
+        # TODO: We need a policy for clearing the tmp directory.
+        tmp_path = os.path.join(self.get_config_path(), 'tmp')
+        if not os.path.exists(tmp_path):
+            os.makedirs(tmp_path)
 
     def print(self):
         table = Table(":laptop_computer: Environment", "Value")
         table.add_row("Python Version", format_python_version(sys.version_info))
         table.add_row("Python Executable", sys.executable)
         table.add_row("Virtualenv Path", self.virtualenv_path if self.virtualenv_path else "Not Used")
         table.add_row("Conda Env", self.conda_env if self.conda_env else "Not Used")
-        if self.config.has_section('DEFAULT') and self.config.has_option('DEFAULT', 'recent_path'):
+
+        if self.config.has_option('DEFAULT', 'default_workspace'):
+            table.add_row("Default ComfyUI workspace", self.config['DEFAULT']['default_workspace'])
+        else:
+            table.add_row("Default ComfyUI workspace", "No default ComfyUI workspace")
+
+        if self.config.has_option('DEFAULT', 'recent_path'):
             table.add_row("Recent ComfyUI", self.config['DEFAULT']['recent_path'])
         else:
             table.add_row("Recent ComfyUI", "No recent run")
+
         if check_comfy_server_running():
             table.add_row("Comfy Server Running", "[bold green]Yes[/bold green]\nhttp://localhost:8188")
         else:
             table.add_row("Comfy Server Running", "[bold red]No[/bold red]")
+
         console.print(table)

pyproject.toml

@@ -25,6 +25,7 @@ dependencies = [
     "requests",
     "pyyaml",
     "typing-extensions",
+    "mixpanel",
 ]
 
 classifiers = [