horde-engine 3.2.6__tar.gz → 3.2.8__tar.gz

{horde_engine-3.2.6 → horde_engine-3.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: horde-engine
-Version: 3.2.6
+Version: 3.2.8
 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-3.2.6 → horde_engine-3.2.8}/hordelib/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.6'
-__version_tuple__ = version_tuple = (3, 2, 6)
+__version__ = version = '3.2.8'
+__version_tuple__ = version_tuple = (3, 2, 8)
 
 __commit_id__ = commit_id = None

{horde_engine-3.2.6 → horde_engine-3.2.8}/hordelib/api.py

@@ -66,6 +66,7 @@ from hordelib.pipeline.payload_pp import (
     UpscalePayload,
     classify_post_processor,
 )
+from hordelib.preload import controlnet_annotators_present
 from hordelib.shared_model_manager import SharedModelManager
 from hordelib.utils.ioredirect import ComfyUIProgress, ComfyUIProgressUnit
 from hordelib.utils.logger import HordeLog
@@ -120,6 +121,7 @@ __all__ = [
     "classify_post_processor",
     "clear_accelerator_cache",
     "controlnet_annotator_download_bytes",
+    "controlnet_annotators_present",
     "enumerate_accelerators",
     "estimate_job_burden",
     "feature_available",

{horde_engine-3.2.6 → horde_engine-3.2.8}/hordelib/initialisation.py

@@ -49,6 +49,14 @@ def initialise(
     """
     global _is_initialised
 
+    # Opt the CUDA/ROCm caching allocator into expandable segments before ComfyUI imports torch.
+    # Fragmentation (a large "reserved but unallocated" pool) is a common cause of an out-of-memory
+    # error even when the device still reports free memory; torch's own OOM message recommends this
+    # setting. setdefault leaves any operator-provided value untouched. Harmless on non-CUDA backends
+    # (the variable is ignored). On ROCm/HIP builds the equivalent variable is set too.
+    os.environ.setdefault("PYTORCH_CUDA_ALLOC_CONF", "expandable_segments:True")
+    os.environ.setdefault("PYTORCH_HIP_ALLOC_CONF", "expandable_segments:True")
+
     # Wipe existing logs if requested
     if clear_logs and os.path.exists("./logs"):
         shutil.rmtree("./logs")

{horde_engine-3.2.6 → horde_engine-3.2.8}/hordelib/preload.py

@@ -88,12 +88,32 @@ def _pinned_annotator_ref() -> str | None:
     return None
 
 
+def _annotator_ckpts_dir() -> Path | None:
+    """Return the directory annotator checkpoints live in, or None if it cannot be determined.
+
+    ``hordelib.initialise()`` exports ``AUX_ANNOTATOR_CKPTS_PATH`` and is the authority once a run is
+    underway. When it is unset (e.g. a no-boot caller that only wants to *check* presence) the same value
+    is derived from :class:`~hordelib.settings.UserSettings`, which needs neither ComfyUI nor a GPU, so
+    presence can be read before (or without) initialisation.
+    """
+    ckpts_dir = os.environ.get("AUX_ANNOTATOR_CKPTS_PATH")
+    if ckpts_dir:
+        return Path(ckpts_dir)
+    try:
+        from hordelib.settings import UserSettings
+
+        return UserSettings.get_model_directory() / "controlnet" / "annotators"
+    except Exception as e:
+        logger.debug("Could not derive the annotator checkpoint directory: error={}", e)
+        return None
+
+
 def _preload_marker_path() -> Path | None:
     """Return the on-disk marker path, or None if the annotator directory is unknown."""
-    ckpts_dir = os.environ.get("AUX_ANNOTATOR_CKPTS_PATH")
-    if not ckpts_dir:
+    ckpts_dir = _annotator_ckpts_dir()
+    if ckpts_dir is None:
         return None
-    return Path(ckpts_dir) / _PRELOAD_MARKER_NAME
+    return ckpts_dir / _PRELOAD_MARKER_NAME
 
 
 def _annotators_already_verified(ref: str) -> bool:
@@ -107,6 +127,32 @@ def _annotators_already_verified(ref: str) -> bool:
         return False
 
 
+def controlnet_annotators_present() -> bool | None:
+    """Whether the controlnet annotators are already downloaded and verified on this machine.
+
+    Reads the on-disk preload marker (keyed to the pinned ``comfyui_controlnet_aux`` commit) exactly the
+    way :func:`download_all_controlnet_annotators` reads it for its fast-path skip, so a caller can decide
+    whether a (slow, one-time) annotator download is still pending *before* paying for it. Import-safe:
+    needs neither :func:`hordelib.initialise` nor a GPU, because the directory is derived from
+    :class:`~hordelib.settings.UserSettings` when the runtime env var is unset.
+
+    Returns:
+        ``True`` when the marker matches the pinned ref (a full set was downloaded and verified),
+        ``False`` when it is absent or stale (a download is still pending), or ``None`` when presence
+        cannot be determined (the pinned ref or the annotator directory is unknown).
+    """
+    try:
+        ref = _pinned_annotator_ref()
+        if ref is None:
+            return None
+        if _preload_marker_path() is None:
+            return None
+        return _annotators_already_verified(ref)
+    except Exception as e:  # pragma: no cover - presence is best-effort; never raise into a caller
+        logger.debug("Could not determine controlnet annotator presence: error={}", e)
+        return None
+
+
 def _record_annotators_verified(ref: str) -> None:
     """Persist that annotators for ``ref`` are downloaded and verified on this machine.