feat: Updates Facerestore node to latest version. (#284)

* facerestore_cf commit * Add missing nodes * feat: ensure helper models downloaded by model manager * fix: moved downloads to gfpgan manager * fix: Adds clean implementation of gfpgan loading * chore: license * chore: only gitignore `hordelib/models/` (and not other models/ dirs) * fix: add missing models/ files for facerestore * tests: more stringent histogram fail for post processor image checks * chore: clarify sourcing and licensing of facerestore_cf * style: fix style: fix types for pipline map --------- Co-authored-by: tazlin <[email protected]>
Haidra-Org · Jul 16, 2024 · dd829d7 · dd829d7
1 parent 6a238d0
commit dd829d7
Show file tree

Hide file tree

Showing 101 changed files with 14,322 additions and 4,079 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ parts/
 sdist/
 var/
 wheels/
-models/
+hordelib/models/
 pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/

diff --git a/hordelib/comfy_horde.py b/hordelib/comfy_horde.py
@@ -410,6 +410,14 @@ def _set_comfyui_paths(self) -> None:
             _comfy_supported_pt_extensions,
         )
 
+        _comfy_folder_names_and_paths["facerestore_models"] = (
+            [
+                str(UserSettings.get_model_directory() / "gfpgan"),
+                str(UserSettings.get_model_directory() / "codeformer"),
+            ],
+            _comfy_supported_pt_extensions,
+        )
+
         _comfy_folder_names_and_paths["controlnet"] = (
             [
                 _comfy_folder_names_and_paths["controlnet"][0][0],

diff --git a/hordelib/horde.py b/hordelib/horde.py
@@ -214,7 +214,7 @@ class HordeLib:
     }
 
     # pipeline parameter <- hordelib payload parameter mapping
-    PAYLOAD_TO_PIPELINE_PARAMETER_MAPPING = {  # FIXME
+    PAYLOAD_TO_PIPELINE_PARAMETER_MAPPING: dict[str, str | Callable] = {  # FIXME
         "sampler.sampler_name": "sampler_name",
         "sampler.cfg": "cfg_scale",
         "sampler.denoise": "denoising_strength",
@@ -820,6 +820,9 @@ def _final_pipeline_adjustments(self, payload, pipeline_data) -> tuple[dict, lis
             # values for steps on things like stable cascade
             if isinstance(key, FunctionType):
                 pipeline_params[newkey] = key(payload)
+            elif not isinstance(key, str):
+                logger.error(f"Invalid key {key}")
+                raise RuntimeError(f"Invalid key {key}")
             elif "*" in key:
                 key, multiplier = key.split("*", 1)
             elif key in payload:

diff --git a/hordelib/nodes/facerestore/__init__.py b/hordelib/nodes/facerestore/__init__.py
diff --git a/hordelib/nodes/facerestore/facelib/detection/yolov5face/utils/extract_ckpt.py b/hordelib/nodes/facerestore/facelib/detection/yolov5face/utils/extract_ckpt.py
diff --git a/hordelib/nodes/facerestore/facelib/utils/__init__.py b/hordelib/nodes/facerestore/facelib/utils/__init__.py