comfygit 0.4.2__tar.gz → 0.6.0__tar.gz

{comfygit-0.4.2 → comfygit-0.6.0}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: comfygit
-Version: 0.4.2
+Version: 0.6.0
 Summary: ComfyGit - Git-based environment management for ComfyUI
 Project-URL: Documentation, https://docs.comfygit.org/
 Project-URL: Repository, https://github.com/comfygit-ai/comfygit
 Project-URL: Issues, https://github.com/comfygit-ai/comfygit/issues
 License-File: LICENSE.txt
 Requires-Python: >=3.10
-Requires-Dist: aiohttp>=3.13.4
 Requires-Dist: argcomplete>=3.5.0
-Requires-Dist: comfygit-core==0.4.2
-Requires-Dist: requests>=2.33.0
+Requires-Dist: comfygit-core==0.6.0
+Requires-Dist: comfygit-studio==0.6.0
+Requires-Dist: requests>=2.32.4
 Description-Content-Type: text/markdown
 
 # ComfyGit CLI

{comfygit-0.4.2 → comfygit-0.6.0}/comfygit_cli/cli.py

@@ -2,6 +2,7 @@
 # PYTHON_ARGCOMPLETE_OK
 
 import argparse
+import os
 import sys
 from collections.abc import Callable
 from importlib.metadata import PackageNotFoundError, version
@@ -75,8 +76,25 @@ def _check_for_old_docker_installation() -> None:
     warning_flag.touch()
 
 
+def _configure_stdio_encoding() -> None:
+    """Avoid Windows terminal encoding crashes for Unicode status output."""
+    if os.name != "nt":
+        return
+
+    for stream in (sys.stdout, sys.stderr):
+        reconfigure = getattr(stream, "reconfigure", None)
+        if reconfigure is None:
+            continue
+        try:
+            reconfigure(errors="replace")
+        except (OSError, ValueError):
+            continue
+
+
 def main() -> None:
     """Main entry point for ComfyGit CLI."""
+    _configure_stdio_encoding()
+
     # Enable readline for input() line editing (arrow keys, history)
     # Unix/Linux/macOS: provides full editing capability
     # Windows: gracefully falls back to native console editing
@@ -374,6 +392,7 @@ def _add_global_commands(subparsers: argparse._SubParsersAction) -> None:
 
     # 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("--huggingface-token", type=str, help="Set Hugging Face token for gated model downloads (use empty string to clear)")
     config_parser.add_argument("--github-token", type=str, help="Set GitHub token for private git repository access (use empty string to clear)")
     config_parser.add_argument("--uv-cache", type=str, help="Set external UV cache path (use empty string to clear)")
     config_parser.add_argument("--show", action="store_true", help="Show current configuration")

{comfygit-0.4.2 → comfygit-0.6.0}/comfygit_cli/cli_utils.py

@@ -1,21 +1,17 @@
 """Utility functions for ComfyGit CLI."""
 
 import sys
-from typing import TYPE_CHECKING
 
-from comfygit_core.factories.workspace_factory import WorkspaceFactory
-from comfygit_core.models.exceptions import CDWorkspaceNotFoundError
+from comfygit_core import Workspace
+from comfygit_core.models import CDWorkspaceNotFoundError
 
 from .logging.environment_logger import WorkspaceLogger
 
-if TYPE_CHECKING:
-    from comfygit_core.core.workspace import Workspace
 
-
-def get_workspace_or_exit() -> "Workspace":
+def get_workspace_or_exit() -> Workspace:
     """Get workspace or exit with error message."""
     try:
-        workspace = WorkspaceFactory.find()
+        workspace = Workspace.open()
         # Initialize workspace logging
         WorkspaceLogger.set_workspace_path(workspace.path)
         return workspace
@@ -23,10 +19,10 @@ def get_workspace_or_exit() -> "Workspace":
         print("✗ No workspace initialized. Run 'cg init' first.")
         sys.exit(1)
 
-def get_workspace_optional() -> "Workspace | None":
+def get_workspace_optional() -> Workspace | None:
     """Get workspace if it exists."""
     try:
-        workspace = WorkspaceFactory.find()
+        workspace = Workspace.open()
         # Initialize workspace logging
         WorkspaceLogger.set_workspace_path(workspace.path)
         return workspace

{comfygit-0.4.2 → comfygit-0.6.0}/comfygit_cli/completers.py

@@ -3,10 +3,8 @@ import argparse
 from typing import Any
 
 from argcomplete.io import warn
-from comfygit_core.core.environment import Environment
-from comfygit_core.core.workspace import Workspace
-from comfygit_core.factories.workspace_factory import WorkspaceFactory
-from comfygit_core.models.exceptions import CDWorkspaceNotFoundError
+from comfygit_core import Environment, Workspace
+from comfygit_core.models import CDWorkspaceNotFoundError
 
 # ============================================================================
 # Shared Utilities
@@ -15,7 +13,7 @@ from comfygit_core.models.exceptions import CDWorkspaceNotFoundError
 def get_workspace_safe() -> Workspace | None:
     """Get workspace or return None if not initialized."""
     try:
-        return WorkspaceFactory.find()
+        return Workspace.open()
     except CDWorkspaceNotFoundError:
         return None
     except Exception as e:
@@ -161,9 +159,8 @@ def branch_completer(prefix: str, parsed_args: argparse.Namespace, **kwargs: Any
         return []
 
     try:
-        # Get branches (returns list of (name, is_current) tuples)
         branches = env.list_branches()
-        names = [name for name, _ in branches]
+        names = [branch.name for branch in branches]
         return filter_by_prefix(names, prefix)
 
     except Exception as e:
@@ -193,7 +190,7 @@ def commit_hash_completer(prefix: str, parsed_args: argparse.Namespace, **kwargs
         history = env.get_commit_history(limit=50)
 
         # Return only hashes for clean completion
-        hashes = [commit['hash'] for commit in history]
+        hashes = [commit.hash for commit in history]
         return filter_by_prefix(hashes, prefix)
 
     except Exception as e:
@@ -224,11 +221,11 @@ def ref_completer(prefix: str, parsed_args: argparse.Namespace, **kwargs: Any) -
 
         # Priority 1: Branches (most common for checkout)
         branches = env.list_branches()
-        candidates.extend([name for name, _ in branches])
+        candidates.extend([branch.name for branch in branches])
 
         # Priority 2: Recent commits
         history = env.get_commit_history(limit=50)
-        candidates.extend([commit['hash'] for commit in history])
+        candidates.extend([commit.hash for commit in history])
 
         return filter_by_prefix(candidates, prefix)