comfygit-core 0.5.0__tar.gz → 0.7.0__tar.gz

comfygit_core-0.5.0/README.md → comfygit_core-0.7.0/PKG-INFO

@@ -1,3 +1,25 @@
+Metadata-Version: 2.5
+Name: comfygit-core
+Version: 0.7.0
+Summary: ComfyGit Core - Git-based ComfyUI environment manager
+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: blake3>=0.3.3
+Requires-Dist: huggingface-hub>=0.15.1
+Requires-Dist: packaging>=16.2
+Requires-Dist: requests>=2.32.4
+Requires-Dist: requirements-parser>=0.11.0
+Requires-Dist: tomli>=2.0.1; python_version < '3.11'
+Requires-Dist: tomlkit>=0.11.0
+Requires-Dist: uv>=0.11.15
+Requires-Dist: xxhash>=2.0.0
+Provides-Extra: keyring
+Requires-Dist: keyring>=25.7.0; extra == 'keyring'
+Description-Content-Type: text/markdown
+
 # ComfyGit Core
 
 Core library for programmatic ComfyUI environment and package management. Build custom tools, GUIs, web interfaces, or CI/CD integrations on top of ComfyGit's architecture.
@@ -466,3 +488,34 @@ dependencies = [
     "comfygit-core>=0.3.14,<0.4.0"  # Pin to minor version
 ]
 ```
+
+## Credentials in headless applications
+
+The base `comfygit-core` installation does not require `keyring`. Install
+`comfygit-core[keyring]` when OS-backed credential persistence is wanted; the
+normal `comfygit` CLI includes this extra. An unavailable package or OS backend
+produces a structured error when saving credentials, never plaintext fallback.
+
+`Workspace.open`, `create`, `from_path`, and `open_or_create` accept an optional
+`credential_overrides` mapping keyed by `CredentialProvider`. A nonempty token
+is process-local and takes priority over environment variables, workspace secure
+storage and provider-native login. An explicit `None` requests anonymous
+provider access; omitted providers follow the normal resolution chain. For
+Hugging Face downloads and lookup, anonymous access disables the SDK's saved
+login discovery too. External git helpers/SSH and URL-embedded authentication
+remain the embedding application's responsibility.
+
+```python
+from comfygit_core import Workspace
+from comfygit_core.models import CredentialProvider
+
+workspace = Workspace.open(
+    workspace_path,
+    credential_overrides={CredentialProvider.HUGGINGFACE: None},
+)
+```
+
+No login is required for local operations or public resources that allow
+anonymous access. For authenticated access without keyring, set the appropriate
+provider environment variable or use an existing Hugging Face login. Tokens
+are never exported in environment manifests.

comfygit_core-0.5.0/PKG-INFO → comfygit_core-0.7.0/README.md

@@ -1,22 +1,3 @@
-Metadata-Version: 2.4
-Name: comfygit-core
-Version: 0.5.0
-Summary: ComfyGit Core - Git-based ComfyUI environment manager
-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: blake3>=0.3.3
-Requires-Dist: huggingface-hub>=0.11.0
-Requires-Dist: packaging>=16.2
-Requires-Dist: requests>=2.33.0
-Requires-Dist: requirements-parser>=0.11.0
-Requires-Dist: tomlkit>=0.11.0
-Requires-Dist: uv>=0.11.8
-Requires-Dist: xxhash>=2.0.0
-Description-Content-Type: text/markdown
-
 # ComfyGit Core
 
 Core library for programmatic ComfyUI environment and package management. Build custom tools, GUIs, web interfaces, or CI/CD integrations on top of ComfyGit's architecture.
@@ -485,3 +466,34 @@ dependencies = [
     "comfygit-core>=0.3.14,<0.4.0"  # Pin to minor version
 ]
 ```
+
+## Credentials in headless applications
+
+The base `comfygit-core` installation does not require `keyring`. Install
+`comfygit-core[keyring]` when OS-backed credential persistence is wanted; the
+normal `comfygit` CLI includes this extra. An unavailable package or OS backend
+produces a structured error when saving credentials, never plaintext fallback.
+
+`Workspace.open`, `create`, `from_path`, and `open_or_create` accept an optional
+`credential_overrides` mapping keyed by `CredentialProvider`. A nonempty token
+is process-local and takes priority over environment variables, workspace secure
+storage and provider-native login. An explicit `None` requests anonymous
+provider access; omitted providers follow the normal resolution chain. For
+Hugging Face downloads and lookup, anonymous access disables the SDK's saved
+login discovery too. External git helpers/SSH and URL-embedded authentication
+remain the embedding application's responsibility.
+
+```python
+from comfygit_core import Workspace
+from comfygit_core.models import CredentialProvider
+
+workspace = Workspace.open(
+    workspace_path,
+    credential_overrides={CredentialProvider.HUGGINGFACE: None},
+)
+```
+
+No login is required for local operations or public resources that allow
+anonymous access. For authenticated access without keyring, set the appropriate
+provider environment variable or use an existing Hugging Face login. Tokens
+are never exported in environment manifests.

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/docs/architecture.md

@@ -41,7 +41,7 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 |--------|---------|--------------|
 | **core/** | Public API | Workspace (multi-env), Environment (single env) |
 | **models/** | Public typed contracts | Exported data classes, protocols, exceptions with context |
-| **readiness.py**, **workflow.py**, **runtime.py**, **assets.py**, **git.py** | Public facades | Reusable domain helpers promoted for adapters |
+| **readiness.py**, **workflow.py**, **runtime.py**, **assets.py**, **git.py**, **security.py** | Public facades | Reusable domain helpers promoted for adapters |
 | **managers/** | Orchestration | Environment orchestrators (Git, Model), Resource managers (Node, Workflow, Model symlinks), Config managers (PyProject, UV, PyTorch backend) |
 | **manifest/** | Internal manifest abstraction | Pyproject-backed store, section handlers, edit helpers, overlay materialization, migration cleanup |
 | **analyzers/** | Analysis | Parse workflows/git/status; classify nodes |
@@ -79,6 +79,10 @@ ComfyGit Core is a **library-first Python package** providing environment manage
 - `Workspace.create()` - Create new workspace with validation
 - `Workspace.open_or_create()` - Setup-friendly load-or-create entry point
 - `Workspace.list_environments()` / `get_environment()` - List/get environments
+- `Workspace.get_resource_inventory()` / `get_model_inventory()` - Typed model,
+  environment, source, and storage inventory for adapters
+- `Workspace.plan_model_deletion()` / `apply_model_deletion_plan()` - Dry-run-first,
+  location-specific model reclaim with conservative blockers
 - `Workspace.get_schema_version()` / `is_legacy_schema()` - Check workspace version
 - `Workspace.upgrade_schema_if_needed()` - Migrate to current schema
 

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/pyproject.toml

@@ -1,20 +1,24 @@
 [project]
 name = "comfygit-core"
-version = "0.5.0"
+version = "0.7.0"
 description = "ComfyGit Core - Git-based ComfyUI environment manager"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "blake3>=0.3.3",
-    "huggingface_hub>=0.11.0",
+    "huggingface-hub>=0.15.1",
     "packaging>=16.2",
-    "requests>=2.33.0",
+    "requests>=2.32.4",
     "requirements-parser>=0.11.0",
     "tomlkit>=0.11.0",
-    "uv>=0.11.8",
+    "tomli>=2.0.1; python_version < '3.11'",
+    "uv>=0.11.15",
     "xxhash>=2.0.0",
 ]
 
+[project.optional-dependencies]
+keyring = ["keyring>=25.7.0"]
+
 [project.urls]
 Documentation = "https://docs.comfygit.org/"
 Repository = "https://github.com/comfygit-ai/comfygit"

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/analyzers/model_scanner.py

@@ -208,7 +208,13 @@ class ModelScanner:
                 continue
 
             try:
-                if not file_path.is_file() or file_path.is_symlink():
+                # Model libraries commonly use file symlinks to share large
+                # weights between ComfyUI installations or expose a loader's
+                # expected filename as an alias. ``Path.stat()`` and the hash
+                # reader intentionally follow a valid file symlink, while the
+                # indexed location remains the alias path under ``models/``.
+                # Broken links and links to directories still fail is_file().
+                if not file_path.is_file():
                     skipped_not_file += 1
                     continue
 

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/analyzers/node_classifier.py

@@ -6,11 +6,10 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-import tomllib
-
 from ..configs.comfyui_builtin_nodes import COMFYUI_BUILTIN_NODES
 from ..logging.logging_config import get_logger
 from ..models.comfyui_builtin_versions import BuiltinVersionGateInfo
+from ..utils.toml_compat import tomllib
 
 if TYPE_CHECKING:
     from ..configs.model_config import ModelConfig

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/analyzers/node_git_analyzer.py

@@ -67,7 +67,7 @@ def get_node_git_info(node_path: Path) -> GitInfo | None:
                 git_info.github_repo = github_match.group(2).replace(".git", "")
 
         # Check if there are uncommitted changes
-        status_entries = git_status_porcelain(node_path)
+        status_entries = git_status_porcelain(node_path, check=False)
         git_info.is_dirty = bool(status_entries)
 
         return git_info

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/analyzers/status_scanner.py

@@ -41,6 +41,25 @@ def _versions_match(actual: str | None, expected: str | None) -> bool:
         return False
 
 
+_UV_DRY_RUN_CHANGE_PREFIXES = (
+    "Would update lockfile",
+    "Would download ",
+    "Would install ",
+    "Would uninstall ",
+    "Would upgrade ",
+    "Would downgrade ",
+    "Would remove ",
+)
+
+
+def _uv_dry_run_reports_changes(output: str) -> bool:
+    """Return True when uv dry-run output says sync would mutate the env."""
+    return any(
+        line.strip().startswith(_UV_DRY_RUN_CHANGE_PREFIXES)
+        for line in output.splitlines()
+    )
+
+
 class StatusScanner:
     """Scans environment to get current state."""
 
@@ -58,7 +77,12 @@ class StatusScanner:
         self._comfyui_path = comfyui_path
         self._pytorch_manager = pytorch_manager
 
-    def get_full_comparison(self) -> EnvironmentComparison:
+    def get_full_comparison(
+        self,
+        *,
+        check_package_sync: bool = False,
+        backend_override: str | None = None,
+    ) -> EnvironmentComparison:
         """Get complete environment comparison with all details.
 
         Args:
@@ -77,17 +101,19 @@ class StatusScanner:
         # Get basic comparison
         comparison = self.compare_states(current, expected)
 
-        # Skip package sync check for performance (100-500ms saved)
-        # Rationale:
-        #   - Users rarely manually modify .venv/
-        #   - Operations like 'run', 'repair', 'node add' auto-sync before executing
-        #   - Status is high-frequency with workflow caching - needs to be fast
-        #   - Package drift self-corrects on next sync operation
-        # If thorough check needed, use 'cg repair --dry-run' (future)
-        # TODO: Add package sync status
-        # package_status = self.check_packages_sync()
-        comparison.packages_in_sync = True #package_status.in_sync
-        comparison.package_sync_message = "" #package_status.message
+        if check_package_sync:
+            package_status = self.check_packages_sync(
+                backend_override=backend_override
+            )
+            comparison.packages_in_sync = package_status.in_sync
+            comparison.package_sync_message = package_status.message
+        else:
+            # Keep high-frequency status fast unless the manifest diff says uv
+            # materialization may be needed. Package drift self-corrects on the
+            # next explicit sync/run path, but dependency edits should guide the
+            # user to sync before committing.
+            comparison.packages_in_sync = True
+            comparison.package_sync_message = ""
 
         return comparison
 
@@ -400,7 +426,11 @@ class StatusScanner:
 
         return comparison
 
-    def check_packages_sync(self) -> PackageSyncStatus:
+    def check_packages_sync(
+        self,
+        *,
+        backend_override: str | None = None,
+    ) -> PackageSyncStatus:
         """Check if packages are in sync with pyproject.toml.
 
         Returns:
@@ -410,13 +440,20 @@ class StatusScanner:
             # Use UV's dry-run to check if sync would change anything
             # Disposable PyTorch overlay materialization ensures the check uses the correct backend.
             extras, all_extras = self._pyproject.resolve_sync_extras(None, False)
-            self._uv.sync_project(
+            dry_run_output = self._uv.sync_project(
                 dry_run=True,
                 all_groups=True,
                 pytorch_manager=self._pytorch_manager,
+                backend_override=backend_override,
                 extras=extras,
                 all_extras=all_extras,
             )
+            if _uv_dry_run_reports_changes(dry_run_output):
+                return PackageSyncStatus(
+                    in_sync=False,
+                    message="Packages out of sync (run 'cg sync' to update)",
+                    details=dry_run_output,
+                )
             return PackageSyncStatus(
                 in_sync=True, message="Packages match pyproject.toml"
             )

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/analyzers/unmanaged_comfyui_analyzer.py

@@ -77,6 +77,11 @@ def scan_unmanaged_comfyui(
         ignored_custom_node_names=ignored_custom_node_names,
     )
     version, commit = _detect_comfyui_version(comfyui_path)
+    repository = (
+        _git_output(comfyui_path, "remote", "get-url", "origin")
+        if _is_git_checkout(comfyui_path)
+        else None
+    )
 
     if not workflows:
         warnings.append("No saved workflow JSON files were found.")
@@ -88,6 +93,7 @@ def scan_unmanaged_comfyui(
         python_version=f"{sys.version_info.major}.{sys.version_info.minor}",
         comfyui_version=version,
         comfyui_commit=commit,
+        comfyui_repository=repository,
         workflows=workflows,
         model_references=model_references,
         models_scanned=models_scanned,

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/caching/comfyui_cache.py

@@ -4,9 +4,15 @@ Caches ComfyUI installations by version to avoid re-downloading and re-cloning.
 Supports releases, commits, and branches.
 """
 
+import hashlib
 from dataclasses import dataclass
 from pathlib import Path
 
+from ..constants import DEFAULT_COMFYUI_REPOSITORY
+from ..utils.comfyui_ops import (
+    comfyui_repository_identity,
+    normalize_comfyui_repository,
+)
 from .base import ContentCacheBase
 
 
@@ -16,6 +22,7 @@ class ComfyUISpec:
     version: str              # "v0.3.20", "abc123", "main"
     version_type: str         # "release", "commit", "branch"
     commit_sha: str | None = None  # Actual commit SHA (for branches)
+    repository: str = DEFAULT_COMFYUI_REPOSITORY
 
 
 class ComfyUICacheManager(ContentCacheBase):
@@ -60,12 +67,20 @@ class ComfyUICacheManager(ContentCacheBase):
             # Simple string version
             return f"version_{spec}"
 
-        # Use commit SHA for branches (they can change)
-        if spec.version_type == "branch" and spec.commit_sha:
-            return f"commit_{spec.commit_sha}"
+        repository = normalize_comfyui_repository(spec.repository)
+        repository_identity = comfyui_repository_identity(repository)
+        repository_key = hashlib.sha256(
+            repository_identity.encode("utf-8")
+        ).hexdigest()[:12]
 
-        # For releases and commits, use the version
-        return f"{spec.version_type}_{spec.version}"
+        # Any captured commit is the immutable cache authority, including
+        # snapshots originally described by a branch or release.
+        if spec.commit_sha:
+            revision_key = f"commit_{spec.commit_sha}"
+        else:
+            revision_key = f"{spec.version_type}_{spec.version}"
+
+        return f"source_{repository_key}_{revision_key}"
 
     def cache_comfyui(self, spec: ComfyUISpec, source_path: Path) -> Path:
         """Cache a ComfyUI installation.
@@ -82,7 +97,8 @@ class ComfyUICacheManager(ContentCacheBase):
         metadata = {
             "version": spec.version,
             "version_type": spec.version_type,
-            "commit_sha": spec.commit_sha
+            "commit_sha": spec.commit_sha,
+            "repository": normalize_comfyui_repository(spec.repository),
         }
 
         return self.cache_content(cache_key, source_path, metadata)
@@ -96,5 +112,11 @@ class ComfyUICacheManager(ContentCacheBase):
         Returns:
             Path to cached ComfyUI content, or None if not cached
         """
+        if (
+            isinstance(spec, ComfyUISpec)
+            and spec.version_type == "branch"
+            and not spec.commit_sha
+        ):
+            return None
         cache_key = self.generate_cache_key(spec)
         return self.get_cached_path(cache_key)

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/caching/custom_node_cache.py

@@ -127,9 +127,20 @@ class CustomNodeCacheManager(ContentCacheBase):
         cache_dir = self.store_dir / cache_key
         content_dir = cache_dir / "content"
 
+        if node_info.source == "git" and (content_dir / ".gitmodules").is_file():
+            from ..utils.git import _git
+
+            if not (content_dir / ".git").exists():
+                return False
+            try:
+                status = _git(["submodule", "status", "--recursive"], content_dir)
+                if any(line.startswith(("-", "+", "U")) for line in status.stdout.splitlines()):
+                    return False
+            except (OSError, ValueError):
+                return False
         return content_dir.exists() and any(content_dir.iterdir())
 
-    def get_cached_path(self, node_info: NodeInfo) -> Path | None:
+    def get_cached_node_path(self, node_info: NodeInfo) -> Path | None:
         """Get the path to cached node content if it exists.
 
         Returns:
@@ -225,7 +236,7 @@ class CustomNodeCacheManager(ContentCacheBase):
         Returns:
             True if successfully copied, False otherwise
         """
-        cached_path = self.get_cached_path(node_info)
+        cached_path = self.get_cached_node_path(node_info)
         if not cached_path:
             return False
 

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/caching/workflow_cache.py

@@ -246,7 +246,7 @@ class WorkflowCacheRepository:
         if from_version == to_version:
             return
 
-        logger.info(f"Migrating workflow cache schema v{from_version} → v{to_version}")
+        logger.info(f"Migrating workflow cache schema v{from_version} -> v{to_version}")
 
         # Drop and recreate (cache is ephemeral)
         self.sqlite.execute_write("DROP TABLE IF EXISTS workflow_cache")

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/clients/civitai_client.py

@@ -82,12 +82,13 @@ class CivitAIClient:
         self.cache_manager = cache_manager
         self.workspace_config = workspace_config
 
-        # Resolve API key: direct > environment > config
-        self._api_key = api_key
-        if not self._api_key:
-            self._api_key = os.environ.get("CIVITAI_API_TOKEN")
-        if not self._api_key and workspace_config:
+        # Workspace resolution owns overrides, environment and secure-store order.
+        if api_key is not None:
+            self._api_key = api_key
+        elif workspace_config is not None:
             self._api_key = workspace_config.get_civitai_token()
+        else:
+            self._api_key = os.environ.get("CIVITAI_API_TOKEN") or os.environ.get("CIVITAI_API_KEY")
 
         self.rate_limiter = RateLimitManager(min_interval=0.1)
         self.retry_config = RetryConfig(

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/configs/package_config.py

@@ -31,6 +31,7 @@ DEFAULT_PROBE_PROTECTED = [
     "torchvision",
     "torchaudio",
     "torchsde",
+    "uv",
 ]
 
 class PackageConfigManager:

{comfygit_core-0.5.0 → comfygit_core-0.7.0}/src/comfygit_core/constants.py

@@ -77,6 +77,12 @@ LEGACY_SYSTEM_NODES = {
 MANAGER_NODE_ID = 'comfygit-manager'
 MANAGER_GITHUB_URL = 'https://github.com/comfygit-ai/comfygit-manager'
 
+# Runtime-only PyTorch backend override used by `cg run --torch-backend`.
+# This is intentionally non-persistent: it tells child Manager/UI processes
+# which backend policy launched the current ComfyUI process without writing to
+# `.pytorch-backend`.
+ACTIVE_TORCH_BACKEND_OVERRIDE_ENV = "COMFYGIT_TORCH_BACKEND_OVERRIDE"
+
 # Schema version for environment pyproject.toml format.
 # Increment when making breaking changes to the pyproject.toml structure.
 # v1: Original format with inline PyTorch config (indexes, sources, constraints)
@@ -87,6 +93,7 @@ PYPROJECT_SCHEMA_VERSION = 2
 DEFAULT_REGISTRY_URL = "https://api.comfy.org"
 DEFAULT_GITHUB_URL = "https://github.com"
 GITHUB_API_BASE = "https://api.github.com"
+DEFAULT_COMFYUI_REPOSITORY = "https://github.com/Comfy-Org/ComfyUI.git"
 
 GITHUB_NODE_MAPPINGS_URL = "https://raw.githubusercontent.com/comfygit-ai/comfygit-registry-data/main/data/node_mappings.json"
 GITHUB_COMFYUI_BUILTINS_BY_VERSION_URL = "https://raw.githubusercontent.com/comfygit-ai/comfygit-registry-data/main/data/comfyui_builtins_by_version.json"