feat: update facerestore node to facerestore_cf

.github/workflows/maintests.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Install tox and any other packages
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade -r requirements.dev.txt
+          pip install --upgrade tox
       - name: Check build_helper.py horde-engine imports have no breaking dependency changes
         run: tox -e test-build-helper
       - name: Build unit test environment, confirm CUDA is available on host

.github/workflows/prtests.yml

@@ -19,6 +19,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Run pre-commit
         uses: pre-commit/[email protected]
         with:
@@ -45,7 +47,7 @@ jobs:
       - name: Install tox and any other packages
         run: |
           python -m pip install --upgrade pip
-          pip install --upgrade -r requirements.dev.txt
+          pip install --upgrade tox
       - name: Check build_helper.py horde-engine imports have no breaking dependency changes
         run: tox -e test-build-helper
       - name: Build unit test environment, confirm CUDA is available on host

.gitignore

@@ -20,7 +20,7 @@ parts/
 sdist/
 var/
 wheels/
-models/
+hordelib/models/
 pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/

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],

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: