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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: horde-engine
-Version: 3.2.4
+Version: 3.2.6
 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
@@ -695,6 +695,7 @@ Requires-Dist: horde-sdk>=0.20.1
 Requires-Dist: kornia>=0.7.1
 Requires-Dist: logfire[system-metrics]==4.14.2
 Requires-Dist: loguru>=0.7.3
+Requires-Dist: lpips
 Requires-Dist: matplotlib>=3.10.9
 Requires-Dist: numpy>=1.25.0
 Requires-Dist: omegaconf>=2.3.0

{horde_engine-3.2.4 → horde_engine-3.2.6}/hordelib/_version.py

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

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

@@ -53,6 +53,10 @@ from hordelib.metrics import (
     SamplingStats,
     get_metrics_collector,
 )
+from hordelib.pipeline.constants import (
+    CONTROLNET_ANNOTATOR_DOWNLOAD_BYTES,
+    controlnet_annotator_download_bytes,
+)
 from hordelib.pipeline.payload import ImageGenPayload
 from hordelib.pipeline.payload_pp import (
     FacefixPayload,
@@ -77,6 +81,7 @@ from hordelib.utils.torch_memory import (
 )
 
 __all__ = [
+    "CONTROLNET_ANNOTATOR_DOWNLOAD_BYTES",
     "FEATURE_KIND",
     "AcceleratorInfo",
     "AcceleratorKind",
@@ -114,6 +119,7 @@ __all__ = [
     "available_features",
     "classify_post_processor",
     "clear_accelerator_cache",
+    "controlnet_annotator_download_bytes",
     "enumerate_accelerators",
     "estimate_job_burden",
     "feature_available",

horde_engine-3.2.6/hordelib/pipeline/constants.py

@@ -0,0 +1,98 @@
+"""Vocabularies shared by the payload models and pipeline templates.
+
+These are the canonical copies; ``HordeLib``'s class attributes alias them for backwards
+compatibility until the legacy payload path is removed.
+"""
+
+from collections.abc import Iterable
+
+SAMPLERS_MAP = {
+    "k_euler": "euler",
+    "k_euler_a": "euler_ancestral",
+    "k_heun": "heun",
+    "k_dpm_2": "dpm_2",
+    "k_dpm_2_a": "dpm_2_ancestral",
+    "k_lms": "lms",
+    "k_dpm_fast": "dpm_fast",
+    "k_dpm_adaptive": "dpm_adaptive",
+    "k_dpmpp_2s_a": "dpmpp_2s_ancestral",
+    "k_dpmpp_sde": "dpmpp_sde",
+    "k_dpmpp_2m": "dpmpp_2m",
+    "ddim": "ddim",
+    "uni_pc": "uni_pc",
+    "uni_pc_bh2": "uni_pc_bh2",
+    "plms": "euler",
+    "lcm": "lcm",
+}
+"""Horde sampler names to ComfyUI sampler names."""
+
+# Horde control_type on the left, comfyui_controlnet_aux preprocessor on the right
+CONTROLNET_IMAGE_PREPROCESSOR_MAP = {
+    "canny": "CannyEdgePreprocessor",
+    "hed": "HEDPreprocessor",
+    "depth": "LeReS-DepthMapPreprocessor",
+    "normal": "MiDaS-NormalMapPreprocessor",
+    "openpose": "OpenposePreprocessor",
+    "seg": "SemSegPreprocessor",
+    "scribble": "ScribblePreprocessor",
+    "fakescribbles": "FakeScribblePreprocessor",
+    "hough": "M-LSDPreprocessor",  # horde backward compatibility
+    "mlsd": "M-LSDPreprocessor",
+}
+
+CONTROLNET_MODEL_MAP = {
+    "canny": "diff_control_sd15_canny_fp16.safetensors",
+    "hed": "diff_control_sd15_hed_fp16.safetensors",
+    "depth": "diff_control_sd15_depth_fp16.safetensors",
+    "normal": "control_normal_fp16.safetensors",
+    "openpose": "control_openpose_fp16.safetensors",
+    "seg": "control_seg_fp16.safetensors",
+    "scribble": "control_scribble_fp16.safetensors",
+    "fakescribble": "control_scribble_fp16.safetensors",
+    "fakescribbles": "control_scribble_fp16.safetensors",
+    "mlsd": "control_mlsd_fp16.safetensors",
+    "hough": "control_mlsd_fp16.safetensors",
+}
+"""Horde control_type to controlnet model filename."""
+
+# Rough order-of-magnitude of the checkpoint(s) each control_type's comfyui_controlnet_aux detector
+# downloads from the HuggingFace hub on first use, into AUX_ANNOTATOR_CKPTS_PATH (see hordelib.preload).
+# These are *annotator* (preprocessor) weights, distinct from the controlnet model weights in
+# CONTROLNET_MODEL_MAP. Used only for download/disk previews (e.g. the worker's benchmark planner), so a
+# ROM estimate is sufficient; the real fetch verifies actual sizes. canny/scribble/mlsd are pure-cv2 and
+# download nothing (0). Keep keys aligned with CONTROLNET_IMAGE_PREPROCESSOR_MAP.
+CONTROLNET_ANNOTATOR_DOWNLOAD_BYTES = {
+    "canny": 0,
+    "hed": 56 * 1024**2,  # ControlNetHED.pth
+    "depth": 800 * 1024**2,  # LeReS: res101.pth (~470MB) + latest_net_G.pth (~320MB)
+    "normal": 470 * 1024**2,  # Intel/dpt-hybrid-midas pytorch_model.bin
+    "openpose": 200 * 1024**2,  # body/hand/face pose models (needs the controlnet/onnxruntime extra)
+    "seg": 170 * 1024**2,  # UniFormer segmentation
+    "scribble": 0,
+    "fakescribbles": 56 * 1024**2,  # FakeScribble runs the HED detector underneath
+    "hough": 6 * 1024**2,  # M-LSD
+    "mlsd": 6 * 1024**2,
+}
+"""Horde control_type to an estimated annotator-checkpoint download size in bytes (ROM)."""
+
+
+def controlnet_annotator_download_bytes(control_types: Iterable[str | None]) -> int:
+    """Return the summed ROM annotator-download size for *control_types*.
+
+    Unknown or ``None`` control types contribute 0 (they may be pure-cv2 or not annotator-backed), so a
+    consumer can pass a level's raw control types without filtering. Duplicates are de-duplicated first:
+    an annotator is fetched once and shared on disk, so sweeping the same type twice costs it once.
+
+    Args:
+        control_types: Horde ``control_type`` values (``None`` entries allowed and ignored).
+
+    Returns:
+        The total estimated annotator download size in bytes (0 when none are annotator-backed).
+    """
+    distinct = {control_type for control_type in control_types if control_type}
+    return sum(CONTROLNET_ANNOTATOR_DOWNLOAD_BYTES.get(control_type, 0) for control_type in distinct)
+
+
+SOURCE_IMAGE_PROCESSING_OPTIONS = ["img2img", "inpainting", "outpainting", "remix"]
+
+SCHEDULERS = ["normal", "karras", "simple", "ddim_uniform", "sgm_uniform", "exponential"]

{horde_engine-3.2.4 → horde_engine-3.2.6}/pyproject.toml

@@ -57,6 +57,7 @@ dependencies = [
     "kornia>=0.7.1",
     "logfire[system-metrics]==4.14.2",
     "loguru>=0.7.3",
+    "lpips",
     "matplotlib>=3.10.9",  # comfyui_controlnet_aux node requirement (not a hordelib import)
     "numpy>=1.25.0",
     "omegaconf>=2.3.0",  # comfyui_controlnet_aux + facerestore_cf node requirement (not a hordelib import)
@@ -82,18 +83,13 @@ dependencies = [
     "sqlalchemy>=2.0.0",
     "strenum>=0.4.15",
     "tokenizers>=0.13.3",
+    "torchdiffeq>=0.2.5",
+    "torchsde",
     # Ranges, not exact pins, so a consumer (e.g. the worker) can select any supported torch line
     # (2.9.1 through 2.12.0). torchvision pins the exact matching torch in its own metadata, so whichever
     # torch the consumer installs resolves the right pair (torch 2.9.1 -> torchvision 0.24.1; 2.12.0 ->
     # 0.27.0). torchvision is routed per-build to the matching CUDA wheel index (see [tool.uv.sources])
     # so its compiled CUDA version can never drift from torch's.
-    #
-    # torchaudio is intentionally NOT a default dependency: it is the only piece of the trio with no
-    # +cu132 wheel, and audio is currently unsupported. ComfyUI's eager `import torchaudio` is satisfied
-    # at runtime by a lazy stub (hordelib.utils.torch_build) when it is absent; install a matching build
-    # ad-hoc if you actually need audio (see the PyTorch build selection notes below).
-    "torchdiffeq>=0.2.5",
-    "torchsde",
     "torchvision>=0.24.0,<0.28",
     "tqdm",
     "transformers>=4.50.3",
@@ -120,10 +116,12 @@ dependencies = [
 #   uv sync --extra cu126   NVIDIA, CUDA 12.6+ driver (the only CUDA-12 build of torch 2.12.0; also runs
 #                           on CUDA 13 drivers via NVIDIA driver backward-compatibility)
 #   uv sync --extra cpu     no GPU (~100x slower; testing only)
-# torchaudio is NOT installed by any of these: it has no +cu132 wheel and audio is unsupported, so it is
+#
+# torchaudio is currently NOT installed by any of these: it has no +cu132 wheel and audio is unsupported, so it is
 # omitted by default and stubbed at runtime (hordelib.utils.torch_build). If you need audio, install a
 # torchaudio build matching the active torch index ad-hoc, e.g.
 # `uv pip install torchaudio --index-url https://download.pytorch.org/whl/cu130` (cu126/cu130/cpu only).
+#
 # ROCm has no current lockable build (PyTorch has not published the pytorch-triton-rocm that torch
 # 2.10-2.12 rocm7.x wheels need); install it ad-hoc, e.g. `uv pip install torch==2.9.1 torchvision
 # pytorch-triton-rocm --extra-index-url https://download.pytorch.org/whl/rocm6.4`.
@@ -138,17 +136,21 @@ cu132 = ["torch", "torchvision"]
 cpu = ["torch", "torchvision"]
 
 # --- Feature extras ----------------------------------------------------------------------------
-# NOT torch builds: these gate heavy/optional features out of the lean base so a base install stays
-# close to ComfyUI's own dependency set. They are NOT in the [tool.uv] conflicts set, so any one
-# torch-build extra above may be combined with any of these. The worker installs a feature extra in
-# the dedicated capability process that offers that feature (off by default unless configured).
+# These gate heavy/optional features out of the lean base so a base install stays close to ComfyUI's 
+# own dependency set. They are NOT in the [tool.uv] conflicts set, so any one torch-build extra above 
+# may be combined with any of these. The worker installs a feature extra in the dedicated capability 
+# process that offers that feature (off by default unless configured).
+#
 # A call site that needs one of these guards its import via hordelib.utils.optional_deps so a missing
 # extra produces an actionable "pip install horde-engine[<extra>]" error instead of a bare ImportError.
+#
 layerdiffuse = ["diffusers>=0.25.0"]  # transparent/RGBA generation via the comfyui_layerdiffuse node
 upscale-extra = ["spandrel-extra-arches>=0.2.0"]  # extra (non-commercial) upscaler archs; comfy adds them if present
+
 # strip_background post-processor. rembg pulls onnxruntime, which has no XPU/MPS/Ascend wheels, so it is
 # opt-in; the call site (hordelib.utils.image_utils.strip_background) guards its import via optional_deps.
 rembg = ["rembg[cpu]>=2.0.67"]
+
 # Full comfyui_controlnet_aux annotator dep set, kept out of base because onnxruntime/mediapipe lack wheels
 # for some accelerators. Installing this enables the DWPose/openpose/mediapipe-face/etc. preprocessors; the
 # pure-torch detectors (e.g. canny, depth via MiDaS) work without it.

horde_engine-3.2.4/hordelib/pipeline/constants.py

@@ -1,58 +0,0 @@
-"""Vocabularies shared by the payload models and pipeline templates.
-
-These are the canonical copies; ``HordeLib``'s class attributes alias them for backwards
-compatibility until the legacy payload path is removed.
-"""
-
-SAMPLERS_MAP = {
-    "k_euler": "euler",
-    "k_euler_a": "euler_ancestral",
-    "k_heun": "heun",
-    "k_dpm_2": "dpm_2",
-    "k_dpm_2_a": "dpm_2_ancestral",
-    "k_lms": "lms",
-    "k_dpm_fast": "dpm_fast",
-    "k_dpm_adaptive": "dpm_adaptive",
-    "k_dpmpp_2s_a": "dpmpp_2s_ancestral",
-    "k_dpmpp_sde": "dpmpp_sde",
-    "k_dpmpp_2m": "dpmpp_2m",
-    "ddim": "ddim",
-    "uni_pc": "uni_pc",
-    "uni_pc_bh2": "uni_pc_bh2",
-    "plms": "euler",
-    "lcm": "lcm",
-}
-"""Horde sampler names to ComfyUI sampler names."""
-
-# Horde control_type on the left, comfyui_controlnet_aux preprocessor on the right
-CONTROLNET_IMAGE_PREPROCESSOR_MAP = {
-    "canny": "CannyEdgePreprocessor",
-    "hed": "HEDPreprocessor",
-    "depth": "LeReS-DepthMapPreprocessor",
-    "normal": "MiDaS-NormalMapPreprocessor",
-    "openpose": "OpenposePreprocessor",
-    "seg": "SemSegPreprocessor",
-    "scribble": "ScribblePreprocessor",
-    "fakescribbles": "FakeScribblePreprocessor",
-    "hough": "M-LSDPreprocessor",  # horde backward compatibility
-    "mlsd": "M-LSDPreprocessor",
-}
-
-CONTROLNET_MODEL_MAP = {
-    "canny": "diff_control_sd15_canny_fp16.safetensors",
-    "hed": "diff_control_sd15_hed_fp16.safetensors",
-    "depth": "diff_control_sd15_depth_fp16.safetensors",
-    "normal": "control_normal_fp16.safetensors",
-    "openpose": "control_openpose_fp16.safetensors",
-    "seg": "control_seg_fp16.safetensors",
-    "scribble": "control_scribble_fp16.safetensors",
-    "fakescribble": "control_scribble_fp16.safetensors",
-    "fakescribbles": "control_scribble_fp16.safetensors",
-    "mlsd": "control_mlsd_fp16.safetensors",
-    "hough": "control_mlsd_fp16.safetensors",
-}
-"""Horde control_type to controlnet model filename."""
-
-SOURCE_IMAGE_PROCESSING_OPTIONS = ["img2img", "inpainting", "outpainting", "remix"]
-
-SCHEDULERS = ["normal", "karras", "simple", "ddim_uniform", "sgm_uniform", "exponential"]