From 559be00f87ae7cee416d73be2b0a1c4798767848 Mon Sep 17 00:00:00 2001 From: tazlin Date: Mon, 15 Jul 2024 21:46:08 -0400 Subject: [PATCH] style: fix style: fix types for pipline map --- hordelib/horde.py | 5 ++++- hordelib/nodes/facerestore_cf/README.md | 2 +- .../facelib/detection/yolov5face/models/yolov5l.yaml | 2 +- hordelib/nodes/node_model_loader.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hordelib/horde.py b/hordelib/horde.py index ddad5ae4..404dea7e 100644 --- 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_cf/README.md b/hordelib/nodes/facerestore_cf/README.md index 51dccd5d..abe522cb 100644 --- a/hordelib/nodes/facerestore_cf/README.md +++ b/hordelib/nodes/facerestore_cf/README.md @@ -1 +1 @@ -Packaged code in this directory (unless stated otherwise) licensed under GPL and sourced from https://github.com/mav-rik/facerestore_cf. See LICENSE for more information. \ No newline at end of file +Packaged code in this directory (unless stated otherwise) licensed under GPL and sourced from https://github.com/mav-rik/facerestore_cf. See LICENSE for more information. diff --git a/hordelib/nodes/facerestore_cf/facelib/detection/yolov5face/models/yolov5l.yaml b/hordelib/nodes/facerestore_cf/facelib/detection/yolov5face/models/yolov5l.yaml index 0532b0e2..5c830251 100644 --- a/hordelib/nodes/facerestore_cf/facelib/detection/yolov5face/models/yolov5l.yaml +++ b/hordelib/nodes/facerestore_cf/facelib/detection/yolov5face/models/yolov5l.yaml @@ -44,4 +44,4 @@ head: [-1, 3, C3, [1024, False]], # 22 (P5/32-large) [[16, 19, 22], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5) - ] \ No newline at end of file + ] diff --git a/hordelib/nodes/node_model_loader.py b/hordelib/nodes/node_model_loader.py index 4ca17900..0105d019 100644 --- a/hordelib/nodes/node_model_loader.py +++ b/hordelib/nodes/node_model_loader.py @@ -9,8 +9,8 @@ import torch from loguru import logger -from hordelib.shared_model_manager import SharedModelManager from hordelib.comfy_horde import log_free_ram +from hordelib.shared_model_manager import SharedModelManager # Don't let the name fool you, this class is trying to load all the files that will be necessary