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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: horde-engine
-Version: 7.2.2
+Version: 7.2.4
 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.2 → horde_engine-7.2.4}/hordelib/_version.py

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

{horde_engine-7.2.2 → horde_engine-7.2.4}/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)
@@ -789,13 +794,14 @@ class HordeLib:
                                     strength=payload.get("facefixer_strength", 1.0),
                                     image_index=img_idx,
                                 ):
-                                    # facefixer_strength is deliberately not forwarded: the
-                                    # legacy mapping never wired it to codeformer_fidelity, so
-                                    # honoring it would change existing job output.
+                                    # facefixer_strength blends the restored image back over the
+                                    # pre-fix one; absent, it is 1.0 (full restoration), which is
+                                    # what the graph produced before the knob was honored.
                                     image_ret = self.post_process(
                                         FacefixPayload(
                                             model=post_processing,
                                             source_image=final_image,
+                                            strength=payload.get("facefixer_strength", 1.0),
                                         ),
                                     )
                                     single_image_faults += image_ret.faults
@@ -1002,13 +1008,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)
 
@@ -1110,14 +1121,15 @@ class HordeLib:
     def image_facefix(self, payload: dict) -> ResultingImageReturn:
         """Fix faces in an image (legacy dict surface; prefer :meth:`post_process`).
 
-        ``facefixer_strength`` in the dict is ignored, as it always has been: the legacy
-        parameter mapping never wired it to the graph's ``codeformer_fidelity`` input. Typed
-        callers can set :attr:`FacefixPayload.fidelity` explicitly.
+        ``facefixer_strength`` blends the restored image back over the input (1.0, the default when
+        absent, is full restoration). CodeFormer's ``codeformer_fidelity`` is a separate knob with
+        different meaning; typed callers set it through :attr:`FacefixPayload.fidelity`.
         """
         logger.debug("image_facefix called")
         return self.post_process(
             FacefixPayload(
                 model=payload["model"],
                 source_image=payload["source_image"],
+                strength=payload.get("facefixer_strength", 1.0),
             ),
         )

{horde_engine-7.2.2 → horde_engine-7.2.4}/hordelib/pipeline/comfy_node_inputs.json

@@ -199,6 +199,15 @@
     ],
     "optional": []
   },
+  "ImageBlend": {
+    "required": [
+      "image1",
+      "image2",
+      "blend_factor",
+      "blend_mode"
+    ],
+    "optional": []
+  },
   "ImageBlur": {
     "required": [
       "image",

{horde_engine-7.2.2 → horde_engine-7.2.4}/hordelib/pipeline/families/post_processing.py

@@ -66,6 +66,11 @@ IMAGE_FACEFIX_DEFINITION: PostProcessingDefinition = PipelineDefinition(
     bindings=(
         *node("image_loader", "HordeImageLoader").bind(image="source_image"),
         *node("face_restore_with_model", "FaceRestoreCFWithModel").bind(codeformer_fidelity="fidelity"),
+        # The restorer replaces every detected face outright, so requested strength is honored as a
+        # blend of its output back over the untouched input: at 1.0 the blend returns the restored
+        # image bit-for-bit, at 0.0 the original. Doing it in the graph keeps one image encode and
+        # works for GFPGAN too, whose architecture takes no strength of its own.
+        *node("facefix_blend", "ImageBlend").bind(blend_factor="strength"),
     ),
     outputs=(OutputSpec(node="output_image"),),
     patch_steps=(_apply_model_file,),

{horde_engine-7.2.2 → horde_engine-7.2.4}/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.
 

{horde_engine-7.2.2 → horde_engine-7.2.4}/hordelib/pipeline/payload_pp.py

@@ -61,7 +61,15 @@ class FacefixPayload(_PostProcessingPayloadBase):
 
     model: str
     fidelity: float = 0.5
-    """CodeFormer fidelity weight (0 = strongest restoration, 1 = closest to input)."""
+    """CodeFormer fidelity weight (0 = strongest restoration, 1 = closest to input).
+
+    This is CodeFormer-specific and unrelated to :attr:`strength`: it steers the restoration
+    itself (identity versus quality) and GFPGAN's architecture ignores it entirely."""
+    strength: float = 1.0
+    """How much of the restored image is blended back over the input (1 = fully restored, 0 = untouched).
+
+    Fixer-agnostic by construction: the blend happens in image space after the restorer runs, so it
+    means the same thing for GFPGAN (which has no strength input of its own) and CodeFormers."""
 
     @field_validator("fidelity", mode="before")
     @classmethod
@@ -72,6 +80,15 @@ class FacefixPayload(_PostProcessingPayloadBase):
             return 0.5
         return min(max(value, 0.0), 1.0)
 
+    @field_validator("strength", mode="before")
+    @classmethod
+    def _clamp_strength(cls, value: Any) -> float:
+        try:
+            value = float(value)
+        except (TypeError, ValueError):
+            return 1.0
+        return min(max(value, 0.0), 1.0)
+
 
 class StripBackgroundPayload(_PostProcessingPayloadBase):
     """Remove the image background (pure-Python rembg; not a ComfyUI graph)."""
@@ -90,10 +107,10 @@ def post_processing_payload_from_horde_dict(data: dict[str, Any]) -> PostProcess
     ``model``, ``source_image``, and (for upscales) optional ``width``/``height`` meaning
     "shrink the result back to this size".
 
-    Note: ``facefixer_strength`` is deliberately *not* mapped onto ``FacefixPayload.fidelity``
-    — the legacy path silently ignored it (the graph's hardcoded 0.5 always applied), and
-    honoring it here would change output images for existing callers. Typed callers can set
-    ``fidelity`` explicitly.
+    ``facefixer_strength`` maps onto ``FacefixPayload.strength`` (the blend of the restored image
+    over the input), not onto ``fidelity``: fidelity is CodeFormer's identity/quality tradeoff and
+    means nothing to GFPGAN. Absent, strength defaults to 1.0, which is full restoration and leaves
+    output identical to a request that never named the knob.
     """
     model = data.get("model")
     if not isinstance(model, str):
@@ -113,7 +130,11 @@ def post_processing_payload_from_horde_dict(data: dict[str, Any]) -> PostProcess
                 rescale_height=data.get("height"),
             )
         case PostProcessorKind.facefixer:
-            return FacefixPayload(model=model, source_image=source_image)
+            return FacefixPayload(
+                model=model,
+                source_image=source_image,
+                strength=data.get("facefixer_strength", 1.0),
+            )
         case PostProcessorKind.strip_background:
             return StripBackgroundPayload(source_image=source_image)
         case _:

{horde_engine-7.2.2 → horde_engine-7.2.4}/hordelib/pipeline_designs/pipeline_image_facefix.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 11,
-  "last_link_id": 14,
+  "last_node_id": 12,
+  "last_link_id": 16,
   "nodes": [
     {
       "id": 6,
@@ -14,13 +14,13 @@
         "1": 416.33331298828125
       },
       "flags": {},
-      "order": 3,
+      "order": 4,
       "mode": 0,
       "inputs": [
         {
           "name": "images",
           "type": "IMAGE",
-          "link": 14
+          "link": 16
         }
       ],
       "title": "output_image",
@@ -81,7 +81,8 @@
           "name": "IMAGE",
           "type": "IMAGE",
           "links": [
-            13
+            13,
+            15
           ],
           "slot_index": 0
         },
@@ -145,6 +146,52 @@
         "retinaface_resnet50",
         0.5
       ]
+    },
+    {
+      "id": 12,
+      "type": "ImageBlend",
+      "pos": [
+        397,
+        331
+      ],
+      "size": {
+        "0": 315,
+        "1": 102
+      },
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image1",
+          "type": "IMAGE",
+          "link": 15
+        },
+        {
+          "name": "image2",
+          "type": "IMAGE",
+          "link": 14
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            16
+          ],
+          "shape": 3,
+          "slot_index": 0
+        }
+      ],
+      "title": "facefix_blend",
+      "properties": {
+        "Node name for S&R": "ImageBlend"
+      },
+      "widgets_values": [
+        1,
+        "normal"
+      ]
     }
   ],
   "links": [
@@ -168,6 +215,22 @@
       14,
       11,
       0,
+      12,
+      1,
+      "IMAGE"
+    ],
+    [
+      15,
+      1,
+      0,
+      12,
+      0,
+      "IMAGE"
+    ],
+    [
+      16,
+      12,
+      0,
       6,
       0,
       "IMAGE"

{horde_engine-7.2.2 → horde_engine-7.2.4}/hordelib/pipelines/pipeline_image_facefix.json

@@ -13,7 +13,7 @@
     "inputs": {
       "filename_prefix": "ComfyUI",
       "images": [
-        "11",
+        "12",
         0
       ]
     },
@@ -48,5 +48,23 @@
     "_meta": {
       "title": "face_restore_with_model"
     }
+  },
+  "12": {
+    "inputs": {
+      "blend_factor": 1,
+      "blend_mode": "normal",
+      "image1": [
+        "1",
+        0
+      ],
+      "image2": [
+        "11",
+        0
+      ]
+    },
+    "class_type": "ImageBlend",
+    "_meta": {
+      "title": "facefix_blend"
+    }
   }
 }