horde-engine 7.2.1__tar.gz → 7.2.3__tar.gz

{horde_engine-7.2.1 → horde_engine-7.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: horde-engine
-Version: 7.2.1
+Version: 7.2.3
 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

{horde_engine-7.2.1 → horde_engine-7.2.3}/hordelib/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '7.2.1'
-__version_tuple__ = version_tuple = (7, 2, 1)
+__version__ = version = '7.2.3'
+__version_tuple__ = version_tuple = (7, 2, 3)
 
 __commit_id__ = commit_id = None

{horde_engine-7.2.1 → horde_engine-7.2.3}/hordelib/horde.py

@@ -263,9 +263,14 @@ class HordeLib:
         tuple[OutputSpec, ...],
     ]:
         """The shared typed tail of the pipeline flow: resize -> resolve -> select -> materialize."""
-        from hordelib.pipeline.horde_compat import enforce_schedule_constraints, resize_sources_to_request
+        from hordelib.pipeline.horde_compat import (
+            disable_hires_fix_for_masked_img2img,
+            enforce_schedule_constraints,
+            resize_sources_to_request,
+        )
         from hordelib.pipeline.resolution import resolve_image_generation
 
+        typed = disable_hires_fix_for_masked_img2img(typed)
         typed = resize_sources_to_request(typed)
         typed, context, resolution_faults = resolve_image_generation(typed, context)
         typed, schedule_faults = enforce_schedule_constraints(typed)
@@ -1002,13 +1007,18 @@ class HordeLib:
             RuntimeError: If the model cannot be resolved (unknown to the reference or
                 missing from disk).
         """
-        from hordelib.pipeline.horde_compat import apply_model_compat, resize_sources_to_request
+        from hordelib.pipeline.horde_compat import (
+            apply_model_compat,
+            disable_hires_fix_for_masked_img2img,
+            resize_sources_to_request,
+        )
         from hordelib.pipeline.resolution import resolve_image_generation, resolve_image_model
         from hordelib.pipeline.sdk_adapter import to_image_gen_payload
 
         typed, _conversion_faults = to_image_gen_payload(params)
         context = resolve_image_model(typed.model)
         typed, _compat_faults = apply_model_compat(typed, context)
+        typed = disable_hires_fix_for_masked_img2img(typed)
         typed = resize_sources_to_request(typed)
         typed, context, _resolution_faults = resolve_image_generation(typed, context)
 

{horde_engine-7.2.1 → horde_engine-7.2.3}/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.1 → horde_engine-7.2.3}/hordelib/pipeline/horde_compat.py

@@ -24,6 +24,7 @@ from hordelib.pipeline.constants import (
 )
 from hordelib.pipeline.context import ModelContext
 from hordelib.pipeline.families.image_gen.baselines import align_your_steps_model_type
+from hordelib.pipeline.families.image_gen.features import IMG2IMG_MASK
 from hordelib.pipeline.payload import ImageGenPayload
 from hordelib.utils.image_utils import ImageUtils
 
@@ -273,6 +274,21 @@ def apply_model_compat(
     return payload, faults
 
 
+def disable_hires_fix_for_masked_img2img(payload: ImageGenPayload) -> ImageGenPayload:
+    """Disable hires fix when img2img carries a mask (explicit, or an alpha channel acting as one).
+
+    The masked img2img graph is single-pass, so the hires-fix first-pass shrink would become the
+    final output size. Masked payloads with a controlnet keep hires fix: the controlnet hires
+    graph has a real second pass. Must run before :func:`resize_sources_to_request`, which merges
+    the mask into the source alpha channel and makes every masked payload look alpha-masked.
+    """
+    if not payload.hires_fix or payload.control_type or not IMG2IMG_MASK.is_set(payload):
+        return payload
+    payload = payload.model_copy(deep=False)
+    payload.hires_fix = False
+    return payload
+
+
 def resize_sources_to_request(payload: ImageGenPayload) -> ImageGenPayload:
     """Ensure the source image and mask match the requested generation size.