horde-engine 7.2.0__tar.gz → 7.2.2__tar.gz

{horde_engine-7.2.0 → horde_engine-7.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: horde-engine
-Version: 7.2.0
+Version: 7.2.2
 Summary: A wrapper around ComfyUI to allow use by AI Horde.
 Project-URL: Homepage, https://github.com/Haidra-Org/hordelib
 Project-URL: Bug Tracker, https://github.com/Haidra-Org/hordelib/issues
@@ -679,11 +679,11 @@ Requires-Dist: aiohttp>=3.11.8
 Requires-Dist: alembic
 Requires-Dist: av>=16.0.0
 Requires-Dist: blake3
-Requires-Dist: comfy-aimdo==0.4.9
-Requires-Dist: comfy-kitchen==0.2.10
-Requires-Dist: comfyui-embedded-docs==0.5.3
-Requires-Dist: comfyui-frontend-package==1.45.15
-Requires-Dist: comfyui-workflow-templates==0.9.98
+Requires-Dist: comfy-aimdo==0.4.13
+Requires-Dist: comfy-kitchen==0.2.26
+Requires-Dist: comfyui-embedded-docs==0.5.9
+Requires-Dist: comfyui-frontend-package==1.48.6
+Requires-Dist: comfyui-workflow-templates==0.11.31
 Requires-Dist: distro>=1.9.0
 Requires-Dist: einops
 Requires-Dist: filelock

{horde_engine-7.2.0 → horde_engine-7.2.2}/hordelib/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '7.2.0'
-__version_tuple__ = version_tuple = (7, 2, 0)
+__version__ = version = '7.2.2'
+__version_tuple__ = version_tuple = (7, 2, 2)
 
 __commit_id__ = commit_id = None

{horde_engine-7.2.0 → horde_engine-7.2.2}/hordelib/installation/installer.py

@@ -4,6 +4,8 @@ import enum
 import hashlib
 import json
 import os
+import shutil
+import stat
 import subprocess
 import time
 import uuid
@@ -92,11 +94,72 @@ def _head_commit(repo_path: Path) -> str | None:
         return None
 
 
+def _remove_tree_best_effort(path: Path) -> None:
+    """Recursively delete ``path``, clearing the read-only flag git sets on object files on Windows.
+
+    Failures are swallowed: every caller is discarding a staging directory whose survival is only
+    cosmetic, and must not turn a completed install into an error.
+    """
+
+    def _clear_readonly_and_retry(func: object, failed_path: str, _exc_info: object) -> None:
+        try:
+            os.chmod(failed_path, stat.S_IWRITE)
+            func(failed_path)  # type: ignore[operator]
+        except OSError:
+            pass
+
+    shutil.rmtree(path, onexc=_clear_readonly_and_retry)
+
+
 def _clone_at_ref(repo_url: str, ref: str, target: Path) -> None:
+    """Clone ``repo_url`` at ``ref`` so a finished checkout appears at ``target`` all at once.
+
+    The clone lands in a process-unique staging directory beside the target and is renamed into
+    place only once the checkout is complete. The install locks serialise installers where the
+    filesystem honours them, but they are advisory: on filesystems that ignore them (network and
+    FUSE-backed mounts among others) concurrent installers otherwise clone into one directory and
+    sweep each other's half-written trees aside mid-clone. With the rename, a partial tree is never
+    visible under the final name: a concurrent installer sees either nothing or a complete clone,
+    and if another installer finishes the same target first, its clone stands and the caller's HEAD
+    verification judges it.
+    """
     target.parent.mkdir(parents=True, exist_ok=True)
+    _remove_dead_staging_dirs(target)
+    staging = target.parent / f".{target.name}.staging-{os.getpid()}-{uuid.uuid4().hex[:8]}"
     logger.info("Cloning repository: url={}, target={}", repo_url, target)
-    _run_git(["clone", repo_url, target.name], target.parent)
-    _run_git(["checkout", "--force", ref], target)
+    try:
+        _run_git(["clone", repo_url, staging.name], target.parent)
+        _run_git(["checkout", "--force", ref], staging)
+        try:
+            staging.rename(target)
+        except OSError:
+            if not target.exists():
+                raise
+            logger.info(
+                "Target appeared while cloning (another installer finished it first); "
+                "keeping the existing checkout: target={}",
+                target,
+            )
+    finally:
+        if staging.exists():
+            _remove_tree_best_effort(staging)
+
+
+def _remove_dead_staging_dirs(target: Path) -> None:
+    """Delete staging directories for ``target`` whose owning installer is certainly gone.
+
+    A killed installer leaves its staging directory behind. Only directories untouched for longer
+    than the lock timeout are removed: a younger one may belong to a live installer this process
+    cannot see holding the lock (the same advisory-lock caveat that motivates staging in the first
+    place), and deleting it would recreate the mid-clone sweep the staging scheme exists to prevent.
+    """
+    cutoff = time.time() - LOCK_TIMEOUT_SECONDS
+    for stale in target.parent.glob(f".{target.name}.staging-*"):
+        try:
+            if stale.is_dir() and stale.stat().st_mtime < cutoff:
+                _remove_tree_best_effort(stale)
+        except OSError:
+            continue
 
 
 def _target_lock(target: Path) -> FileLock:

{horde_engine-7.2.0 → horde_engine-7.2.2}/pyproject.toml

@@ -41,11 +41,11 @@ dependencies = [
     "alembic",
     "av>=16.0.0",
     "blake3",
-    "comfy-aimdo==0.4.9",
-    "comfy-kitchen==0.2.10",
-    "comfyui-embedded-docs==0.5.3",
-    "comfyui-frontend-package==1.45.15",
-    "comfyui-workflow-templates==0.9.98",
+    "comfy-aimdo==0.4.13",
+    "comfy-kitchen==0.2.26",
+    "comfyui-embedded-docs==0.5.9",
+    "comfyui-frontend-package==1.48.6",
+    "comfyui-workflow-templates==0.11.31",
     "distro>=1.9.0",
     "einops",
     "filelock",