comfygit 0.3.6__py3-none-any.whl → 0.3.10__py3-none-any.whl

comfygit_cli/cli.py

@@ -3,12 +3,12 @@
 
 import argparse
 import sys
-from importlib.metadata import version, PackageNotFoundError
+from collections.abc import Callable
+from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 
 import argcomplete
 
-from .completion_commands import CompletionCommands
 from .completers import (
     branch_completer,
     commit_hash_completer,
@@ -17,10 +17,19 @@ from .completers import (
     ref_completer,
     workflow_completer,
 )
+from .completion_commands import CompletionCommands
 from .env_commands import EnvironmentCommands
 from .global_commands import GlobalCommands
 from .logging.logging_config import setup_logging
 
+
+def _make_help_func(parser: argparse.ArgumentParser) -> Callable[[argparse.Namespace], None]:
+    """Create a function that prints parser help and exits."""
+    def show_help(args: argparse.Namespace) -> None:
+        parser.print_help()
+        sys.exit(1)
+    return show_help
+
 try:
     __version__ = version("comfygit")
 except PackageNotFoundError:
@@ -56,7 +65,7 @@ def _check_for_old_docker_installation() -> None:
     print("  • New version: UV packages, 'comfygit' command")
     print("\nBoth versions can coexist. Your old environments are unchanged.")
     print("\nTo use old version: pip install comfydock==0.1.6")
-    print("To use new version: comfygit init")
+    print("To use new version: cg init")
     print("\nMigration guide: https://github.com/comfyhub-org/comfygit/blob/main/MIGRATION.md")
     print("="*70 + "\n")
 
@@ -156,7 +165,6 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     init_parser.add_argument("path", type=Path, nargs="?", help="Workspace directory (default: ~/comfygit)")
     init_parser.add_argument("--models-dir", type=Path, help="Path to existing models directory to index")
     init_parser.add_argument("--yes", "-y", action="store_true", help="Use all defaults, no interactive prompts")
-    init_parser.add_argument("--bare", action="store_true", help="Create workspace without system nodes (comfygit-manager)")
     init_parser.set_defaults(func=global_cmds.init)
 
     # list - List all environments
@@ -197,16 +205,18 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     # export - Export ComfyGit environment
     export_parser = subparsers.add_parser("export", help="Export ComfyGit environment (include relevant files from .cec)")
     export_parser.add_argument("path", type=Path, nargs="?", help="Path to output file")
-    export_parser.add_argument("--allow-issues", action="store_true", help="Skip confirmation if models are missing source URLs")
+    export_parser.add_argument("--allow-issues", action="store_true", help="Export even with unresolved workflows or models without source URLs")
     export_parser.set_defaults(func=global_cmds.export_env)
 
     # Model management subcommands
     model_parser = subparsers.add_parser("model", help="Manage model index")
     model_subparsers = model_parser.add_subparsers(dest="model_command", help="Model commands")
+    model_parser.set_defaults(func=_make_help_func(model_parser))
 
     # model index subcommands
     model_index_parser = model_subparsers.add_parser("index", help="Model index operations")
     model_index_subparsers = model_index_parser.add_subparsers(dest="model_index_command", help="Model index commands")
+    model_index_parser.set_defaults(func=_make_help_func(model_index_parser))
 
     # model index find
     model_index_find_parser = model_index_subparsers.add_parser("find", help="Find models by hash or filename")
@@ -253,6 +263,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     # Registry management subcommands
     registry_parser = subparsers.add_parser("registry", help="Manage node registry cache")
     registry_subparsers = registry_parser.add_subparsers(dest="registry_command", help="Registry commands")
+    registry_parser.set_defaults(func=_make_help_func(registry_parser))
 
     # registry status
     registry_status_parser = registry_subparsers.add_parser("status", help="Show registry cache status")
@@ -262,8 +273,11 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     registry_update_parser = registry_subparsers.add_parser("update", help="Update registry data from GitHub")
     registry_update_parser.set_defaults(func=global_cmds.registry_update)
 
-    # Config management
+    # Config management - now with subcommands
     config_parser = subparsers.add_parser("config", help="Manage configuration settings")
+    config_subparsers = config_parser.add_subparsers(dest="config_command", help="Configuration commands")
+
+    # Legacy flags - still supported at root level for backward compatibility
     config_parser.add_argument("--civitai-key", type=str, help="Set Civitai API key (use empty string to clear)")
     config_parser.add_argument("--show", action="store_true", help="Show current configuration")
     config_parser.set_defaults(func=global_cmds.config)
@@ -280,6 +294,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     completion_cmds = CompletionCommands()
     completion_parser = subparsers.add_parser("completion", help="Manage shell tab completion")
     completion_subparsers = completion_parser.add_subparsers(dest="completion_command", help="Completion commands")
+    completion_parser.set_defaults(func=_make_help_func(completion_parser))
 
     # completion install
     completion_install_parser = completion_subparsers.add_parser("install", help="Install tab completion for your shell")
@@ -303,6 +318,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
         dest="orch_command",
         help="Orchestrator commands"
     )
+    orch_parser.set_defaults(func=_make_help_func(orch_parser))
 
     # orch status
     orch_status_parser = orch_subparsers.add_parser("status", help="Show orchestrator status")
@@ -332,6 +348,26 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
     orch_logs_parser.add_argument("-n", "--lines", type=int, default=50, help="Number of lines to show (default: 50)")
     orch_logs_parser.set_defaults(func=global_cmds.orch_logs)
 
+    # Workspace management subcommands
+    workspace_parser = subparsers.add_parser("workspace", help="Workspace operations")
+    workspace_subparsers = workspace_parser.add_subparsers(
+        dest="workspace_command",
+        help="Workspace commands"
+    )
+    workspace_parser.set_defaults(func=_make_help_func(workspace_parser))
+
+    # workspace cleanup
+    workspace_cleanup_parser = workspace_subparsers.add_parser(
+        "cleanup",
+        help="Remove legacy workspace artifacts"
+    )
+    workspace_cleanup_parser.add_argument(
+        "--force",
+        action="store_true",
+        help="Skip verification and force cleanup"
+    )
+    workspace_cleanup_parser.set_defaults(func=global_cmds.workspace_cleanup)
+
 
 def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     """Add environment-specific commands."""
@@ -372,9 +408,42 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
 
     # Environment Operation Commands (operate IN environments, require -e or active)
 
+    # env-config - Environment-scoped configuration (requires -e or active env)
+    env_config_parser = subparsers.add_parser("env-config", help="Manage environment-specific configuration")
+    env_config_subparsers = env_config_parser.add_subparsers(dest="env_config_command", help="Environment config commands")
+    env_config_parser.set_defaults(func=_make_help_func(env_config_parser))
+
+    # env-config torch-backend - Manage PyTorch backend for this environment
+    env_config_torch_parser = env_config_subparsers.add_parser("torch-backend", help="Manage PyTorch backend settings")
+    env_config_torch_subparsers = env_config_torch_parser.add_subparsers(dest="torch_command", help="PyTorch backend commands")
+    env_config_torch_parser.set_defaults(func=_make_help_func(env_config_torch_parser))
+
+    # env-config torch-backend show
+    env_config_torch_show_parser = env_config_torch_subparsers.add_parser("show", help="Show current PyTorch backend")
+    env_config_torch_show_parser.set_defaults(func=env_cmds.env_config_torch_show)
+
+    # env-config torch-backend set <backend>
+    env_config_torch_set_parser = env_config_torch_subparsers.add_parser("set", help="Set PyTorch backend")
+    env_config_torch_set_parser.add_argument("backend", help="Backend to set (e.g., cu128, cpu, rocm6.3, xpu)")
+    env_config_torch_set_parser.set_defaults(func=env_cmds.env_config_torch_set)
+
+    # env-config torch-backend detect
+    env_config_torch_detect_parser = env_config_torch_subparsers.add_parser("detect", help="Auto-detect and show recommended backend")
+    env_config_torch_detect_parser.set_defaults(func=env_cmds.env_config_torch_detect)
+
     # run - Run ComfyUI (special handling for ComfyUI args)
     run_parser = subparsers.add_parser("run", help="Run ComfyUI")
     run_parser.add_argument("--no-sync", action="store_true", help="Skip environment sync before running")
+    run_parser.add_argument(
+        "--torch-backend",
+        default=None,
+        metavar="BACKEND",
+        help=(
+            "PyTorch backend override (one-time, not saved). Examples: cpu, "
+            "cu128 (CUDA 12.8), cu126, cu124, rocm6.3 (AMD), xpu (Intel). "
+            "Reads from .pytorch-backend file if not specified."
+        ),
+    )
     run_parser.set_defaults(func=env_cmds.run, args=[])
 
     # status - Show environment status
@@ -400,6 +469,25 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     )
     repair_parser.set_defaults(func=env_cmds.repair)
 
+    # sync - Sync environment (packages, nodes, models)
+    sync_parser = subparsers.add_parser("sync", help="Sync environment packages and dependencies")
+    sync_parser.add_argument(
+        "--torch-backend",
+        default=None,
+        metavar="BACKEND",
+        help=(
+            "PyTorch backend override (one-time, not saved). Examples: cpu, "
+            "cu128 (CUDA 12.8), cu126, cu124, rocm6.3 (AMD), xpu (Intel). "
+            "Reads from .pytorch-backend file if not specified."
+        ),
+    )
+    sync_parser.add_argument(
+        "-v", "--verbose",
+        action="store_true",
+        help="Show full UV output during sync"
+    )
+    sync_parser.set_defaults(func=env_cmds.sync)
+
     # log - Show commit history
     log_parser = subparsers.add_parser("log", help="Show commit history")
     log_parser.add_argument("-n", "--limit", type=int, default=20, metavar="N", help="Number of commits to show (default: 20)")
@@ -475,6 +563,11 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         default="origin",
         help="Git remote name (default: origin)"
     )
+    pull_parser.add_argument(
+        "-b", "--branch",
+        default=None,
+        help="Remote branch to pull (default: current local branch). Use when remote has different default branch (e.g., master vs main)"
+    )
     pull_parser.add_argument(
         "--models",
         choices=["all", "required", "skip"],
@@ -496,6 +589,16 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         choices=["mine", "theirs"],
         help="Auto-resolve conflicts: 'mine' keeps local, 'theirs' takes incoming"
     )
+    pull_parser.add_argument(
+        "--torch-backend",
+        default=None,
+        metavar="BACKEND",
+        help=(
+            "PyTorch backend override (one-time, not saved). Examples: cpu, "
+            "cu128 (CUDA 12.8), cu126, cu124, rocm6.3 (AMD), xpu (Intel). "
+            "Reads from .pytorch-backend file if not specified."
+        ),
+    )
     pull_parser.set_defaults(func=env_cmds.pull)
 
     # push - Push commits to remote
@@ -522,8 +625,9 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     )
     remote_subparsers = remote_parser.add_subparsers(
         dest="remote_command",
-        required=True
+        help="Remote commands"
     )
+    remote_parser.set_defaults(func=_make_help_func(remote_parser))
 
     # remote add
     remote_add_parser = remote_subparsers.add_parser(
@@ -538,6 +642,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         "url",
         help="Remote URL"
     )
+    remote_add_parser.set_defaults(func=env_cmds.remote)
 
     # remote remove
     remote_remove_parser = remote_subparsers.add_parser(
@@ -548,18 +653,19 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         "name",
         help="Remote name to remove"
     )
+    remote_remove_parser.set_defaults(func=env_cmds.remote)
 
     # remote list
     remote_list_parser = remote_subparsers.add_parser(
         "list",
         help="List all git remotes"
     )
-
-    remote_parser.set_defaults(func=env_cmds.remote)
+    remote_list_parser.set_defaults(func=env_cmds.remote)
 
     # Node management subcommands
     node_parser = subparsers.add_parser("node", help="Manage custom nodes")
     node_subparsers = node_parser.add_subparsers(dest="node_command", help="Node commands")
+    node_parser.set_defaults(func=_make_help_func(node_parser))
 
     # node add
     node_add_parser = node_subparsers.add_parser("add", help="Add custom node(s)")
@@ -597,6 +703,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     # Workflow management subcommands
     workflow_parser = subparsers.add_parser("workflow", help="Manage workflows")
     workflow_subparsers = workflow_parser.add_subparsers(dest="workflow_command", help="Workflow commands")
+    workflow_parser.set_defaults(func=_make_help_func(workflow_parser))
 
     # workflow list
     workflow_list_parser = workflow_subparsers.add_parser("list", help="List all workflows with sync status")
@@ -619,6 +726,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
         dest="model_command",
         help="Model management commands"
     )
+    workflow_importance_parser.set_defaults(func=_make_help_func(workflow_importance_parser))
 
     importance_parser = workflow_model_subparsers.add_parser(
         "importance",
@@ -645,6 +753,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     # Constraint management subcommands
     constraint_parser = subparsers.add_parser("constraint", help="Manage UV constraint dependencies")
     constraint_subparsers = constraint_parser.add_subparsers(dest="constraint_command", help="Constraint commands")
+    constraint_parser.set_defaults(func=_make_help_func(constraint_parser))
 
     # constraint add
     constraint_add_parser = constraint_subparsers.add_parser("add", help="Add constraint dependencies")
@@ -663,6 +772,7 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     # Python dependency management subcommands
     py_parser = subparsers.add_parser("py", help="Manage Python dependencies")
     py_subparsers = py_parser.add_subparsers(dest="py_command", help="Python dependency commands")
+    py_parser.set_defaults(func=_make_help_func(py_parser))
 
     # py add
     py_add_parser = py_subparsers.add_parser("add", help="Add Python dependencies")
@@ -705,5 +815,21 @@ def _add_env_commands(subparsers: argparse._SubParsersAction) -> None:
     )
     py_uv_parser.set_defaults(func=env_cmds.py_uv)
 
+    # Manager subcommands (per-environment comfygit-manager)
+    manager_parser = subparsers.add_parser("manager", help="Manage comfygit-manager installation")
+    manager_subparsers = manager_parser.add_subparsers(dest="manager_command", help="Manager commands")
+    manager_parser.set_defaults(func=_make_help_func(manager_parser))
+
+    # manager status
+    manager_status_parser = manager_subparsers.add_parser("status", help="Show manager version and update availability")
+    manager_status_parser.set_defaults(func=env_cmds.manager_status)
+
+    # manager update
+    manager_update_parser = manager_subparsers.add_parser("update", help="Update or migrate comfygit-manager")
+    manager_update_parser.add_argument("--version", help="Target version (default: latest)")
+    manager_update_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+    manager_update_parser.set_defaults(func=env_cmds.manager_update)
+
+
 if __name__ == "__main__":
     main()

comfygit_cli/cli_utils.py

@@ -10,6 +10,7 @@ from .logging.environment_logger import WorkspaceLogger
 if TYPE_CHECKING:
     from comfygit_core.core.workspace import Workspace
 
+
 def get_workspace_or_exit() -> "Workspace":
     """Get workspace or exit with error message."""
     try:

comfygit_cli/completers.py

@@ -64,9 +64,9 @@ def environment_completer(prefix: str, parsed_args: argparse.Namespace, **kwargs
     """Complete environment names from workspace.
 
     Used for:
-    - comfygit use <TAB>
-    - comfygit delete <TAB>
-    - comfygit -e <TAB>
+    - cg use <TAB>
+    - cg delete <TAB>
+    - cg -e <TAB>
     """
     workspace = get_workspace_safe()
     if not workspace:
@@ -89,7 +89,7 @@ def workflow_completer(prefix: str, parsed_args: argparse.Namespace, **kwargs: A
     2. Synced workflows
 
     Used for:
-    - comfygit workflow resolve <TAB>
+    - cg workflow resolve <TAB>
     """
     workspace = get_workspace_safe()
     if not workspace:
@@ -125,8 +125,8 @@ def installed_node_completer(prefix: str, parsed_args: argparse.Namespace, **kwa
     """Complete installed node names.
 
     Used for:
-    - comfygit node remove <TAB>
-    - comfygit node update <TAB>
+    - cg node remove <TAB>
+    - cg node update <TAB>
     """
     workspace = get_workspace_safe()
     if not workspace: