comfygit-core 0.6.0__tar.gz → 0.7.1__tar.gz

comfygit_core-0.7.1/PKG-INFO

@@ -0,0 +1,131 @@
+Metadata-Version: 2.5
+Name: comfygit-core
+Version: 0.7.1
+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
+
+`comfygit-core` is the UI-independent library behind ComfyGit's CLI and runtime
+adapters. It owns workspace discovery, environment manifests, custom nodes,
+model metadata, dependency resolution, sync, import/export and materialization.
+APIs are still evolving; integrations should pin a tested release.
+
+## Installation
+
+```bash
+uv add 'comfygit-core==0.7.0'
+```
+
+Core does not require desktop keyring. For OS-backed credential persistence,
+install the optional `comfygit-core[keyring]==0.7.0` extra. The CLI includes that
+extra; headless library users can use environment credentials or inject their
+own store instead.
+
+## Open a workspace
+
+```python
+from pathlib import Path
+from comfygit_core import Workspace
+
+workspace = Workspace.open(Path.home() / "comfygit")
+env = workspace.get_environment("my-project", auto_sync=False)
+status = env.status()
+```
+
+`Workspace.create(path)` creates a workspace; `Workspace.open_or_create(path)`
+handles either case. Opening with `auto_sync=False` above avoids reconciling the
+environment just to inspect it.
+
+## Create and reconcile an environment
+
+```python
+env = workspace.create_environment(
+    name="experiment",
+    python_version="3.12",
+    torch_backend="auto",
+    no_manager=True,
+)
+env.add_node("rgthree-comfy")
+result = env.sync(model_strategy="required")
+```
+
+Creation and sync can download code and packages. Resolve an existing saved
+workflow by its name, not an arbitrary JSON path:
+
+```python
+result = env.resolve_workflow("my-workflow")
+```
+
+For ambiguous resolution, supply implementations of the protocols in
+[`models/protocols.py`](src/comfygit_core/models/protocols.py). Do not put prompts,
+printing or CLI policy into Core. A successful dependency resolution is not proof
+that a ComfyUI inference job succeeds.
+
+## Credentials
+
+Workspace entry points accept process-local `credential_overrides`, keyed by
+`CredentialProvider`. A token overrides all discovery for that provider; `None`
+explicitly selects anonymous access. Omitted providers use normal discovery.
+
+```python
+from comfygit_core.models.credentials import CredentialProvider
+
+workspace = Workspace.open(
+    Path.home() / "comfygit",
+    credential_overrides={CredentialProvider.HUGGINGFACE: None},
+)
+```
+
+Normal resolution uses provider environment variables, workspace secure storage,
+provider-native credentials when available, then legacy workspace values during
+migration. An unavailable keyring backend does not prevent environment/native
+credentials from working. Saving a new credential requires a working secure store;
+there is no new plaintext fallback. Callers may inject a `CredentialStore` through
+the `credential_store` parameter.
+
+## Portable and local state
+
+The tracked `pyproject.toml`, `workflows/`, `workflow_api/`, shared overlays and
+source metadata form the portable environment. Model bytes stay in the shared
+model directory. ComfyUI/node checkouts, virtualenvs, `.cec/`, local overlays,
+credentials and backend choices are derived or machine-local state.
+
+Use ComfyGit operations to change the recipe; manual runtime edits may be
+replaced on sync. For a headless recreation, use the materialization API or
+[`cg materialize`](https://docs.comfygit.org/user-guide/collaboration/materialize/).
+
+## API and development references
+
+- [Workspace entry points](src/comfygit_core/core/workspace.py)
+- [Environment operations](src/comfygit_core/core/environment.py)
+- [Architecture](docs/architecture.md)
+- [Normative contracts](../../docs/contracts/) and [specifications](../../docs/specs/)
+- [Contributing](../../CONTRIBUTING.md)
+
+From the monorepo root:
+
+```bash
+uv sync --frozen --all-packages
+uv run pytest packages/core/tests -q
+make lint
+```
+
+Core, Studio runtime and CLI releases use matched versions. See the root
+[agent guide](../../AGENTS.md) for release ordering and package boundaries.

comfygit_core-0.7.1/README.md

@@ -0,0 +1,109 @@
+# ComfyGit Core
+
+`comfygit-core` is the UI-independent library behind ComfyGit's CLI and runtime
+adapters. It owns workspace discovery, environment manifests, custom nodes,
+model metadata, dependency resolution, sync, import/export and materialization.
+APIs are still evolving; integrations should pin a tested release.
+
+## Installation
+
+```bash
+uv add 'comfygit-core==0.7.0'
+```
+
+Core does not require desktop keyring. For OS-backed credential persistence,
+install the optional `comfygit-core[keyring]==0.7.0` extra. The CLI includes that
+extra; headless library users can use environment credentials or inject their
+own store instead.
+
+## Open a workspace
+
+```python
+from pathlib import Path
+from comfygit_core import Workspace
+
+workspace = Workspace.open(Path.home() / "comfygit")
+env = workspace.get_environment("my-project", auto_sync=False)
+status = env.status()
+```
+
+`Workspace.create(path)` creates a workspace; `Workspace.open_or_create(path)`
+handles either case. Opening with `auto_sync=False` above avoids reconciling the
+environment just to inspect it.
+
+## Create and reconcile an environment
+
+```python
+env = workspace.create_environment(
+    name="experiment",
+    python_version="3.12",
+    torch_backend="auto",
+    no_manager=True,
+)
+env.add_node("rgthree-comfy")
+result = env.sync(model_strategy="required")
+```
+
+Creation and sync can download code and packages. Resolve an existing saved
+workflow by its name, not an arbitrary JSON path:
+
+```python
+result = env.resolve_workflow("my-workflow")
+```
+
+For ambiguous resolution, supply implementations of the protocols in
+[`models/protocols.py`](src/comfygit_core/models/protocols.py). Do not put prompts,
+printing or CLI policy into Core. A successful dependency resolution is not proof
+that a ComfyUI inference job succeeds.
+
+## Credentials
+
+Workspace entry points accept process-local `credential_overrides`, keyed by
+`CredentialProvider`. A token overrides all discovery for that provider; `None`
+explicitly selects anonymous access. Omitted providers use normal discovery.
+
+```python
+from comfygit_core.models.credentials import CredentialProvider
+
+workspace = Workspace.open(
+    Path.home() / "comfygit",
+    credential_overrides={CredentialProvider.HUGGINGFACE: None},
+)
+```
+
+Normal resolution uses provider environment variables, workspace secure storage,
+provider-native credentials when available, then legacy workspace values during
+migration. An unavailable keyring backend does not prevent environment/native
+credentials from working. Saving a new credential requires a working secure store;
+there is no new plaintext fallback. Callers may inject a `CredentialStore` through
+the `credential_store` parameter.
+
+## Portable and local state
+
+The tracked `pyproject.toml`, `workflows/`, `workflow_api/`, shared overlays and
+source metadata form the portable environment. Model bytes stay in the shared
+model directory. ComfyUI/node checkouts, virtualenvs, `.cec/`, local overlays,
+credentials and backend choices are derived or machine-local state.
+
+Use ComfyGit operations to change the recipe; manual runtime edits may be
+replaced on sync. For a headless recreation, use the materialization API or
+[`cg materialize`](https://docs.comfygit.org/user-guide/collaboration/materialize/).
+
+## API and development references
+
+- [Workspace entry points](src/comfygit_core/core/workspace.py)
+- [Environment operations](src/comfygit_core/core/environment.py)
+- [Architecture](docs/architecture.md)
+- [Normative contracts](../../docs/contracts/) and [specifications](../../docs/specs/)
+- [Contributing](../../CONTRIBUTING.md)
+
+From the monorepo root:
+
+```bash
+uv sync --frozen --all-packages
+uv run pytest packages/core/tests -q
+make lint
+```
+
+Core, Studio runtime and CLI releases use matched versions. See the root
+[agent guide](../../AGENTS.md) for release ordering and package boundaries.

{comfygit_core-0.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/pyproject.toml

@@ -1,20 +1,24 @@
 [project]
 name = "comfygit-core"
-version = "0.6.0"
+version = "0.7.1"
 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.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.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/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.6.0 → comfygit_core-0.7.1}/src/comfygit_core/constants.py

@@ -93,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"