From d49ba9caa1353312e14ca71fcaea9ea8c5b68c63 Mon Sep 17 00:00:00 2001 From: asagi4 <130366179+asagi4@users.noreply.github.com> Date: Wed, 6 Dec 2023 18:48:40 +0200 Subject: [PATCH] Forgot to remove nodes from __init__.py --- README.md | 2 +- __init__.py | 11 +---------- prompt_control/node_clip.py | 20 -------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 852d21e..db5636e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Then restart ComfyUI afterwards. I try to avoid behavioural changes that break old prompts, but they may happen occasionally. -- 2023-12-06: Removed `JinjaRender`, `SimpleWildcard`, `ConditioningCutoff` and `StringConcat`. For the first two, see [this repository](https://github.com/asagi4/comfyui-utility-nodes) for mostly-compatible implementations. +- 2023-12-06: Removed `JinjaRender`, `SimpleWildcard`, `ConditioningCutoff`, `CondLinearInterpolate` and `StringConcat`. For the first two, see [this repository](https://github.com/asagi4/comfyui-utility-nodes) for mostly-compatible implementations. - 2023-10-04: `STYLE:...` syntax changed to `STYLE(...)` ## Note on how schedules work diff --git a/__init__.py b/__init__.py index fb12aa4..2f583f7 100644 --- a/__init__.py +++ b/__init__.py @@ -11,15 +11,11 @@ else: sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "comfy")) -from .prompt_control.node_clip import EditableCLIPEncode, ScheduleToCond, CondLinearInterpolate +from .prompt_control.node_clip import EditableCLIPEncode, ScheduleToCond from .prompt_control.node_lora import LoRAScheduler, ScheduleToModel, PCSplitSampling from .prompt_control.node_other import ( - ConditioningCutoff, - JinjaRender, PromptToSchedule, FilterSchedule, - StringConcat, - SimpleWildcard, ) from .prompt_control.node_aio import PromptControlSimple @@ -31,11 +27,6 @@ NODE_CLASS_MAPPINGS = { "FilterSchedule": FilterSchedule, "ScheduleToCond": ScheduleToCond, "ScheduleToModel": ScheduleToModel, - "JinjaRender": JinjaRender, - "StringConcat": StringConcat, - "SimpleWildcard": SimpleWildcard, "EditableCLIPEncode": EditableCLIPEncode, "LoRAScheduler": LoRAScheduler, - "ConditioningCutoff": ConditioningCutoff, - "CondLinearInterpolate": CondLinearInterpolate, } diff --git a/prompt_control/node_clip.py b/prompt_control/node_clip.py index 33b8634..0b74585 100644 --- a/prompt_control/node_clip.py +++ b/prompt_control/node_clip.py @@ -123,26 +123,6 @@ def linear_interpolator(control_points, step, start_pct, end_pct): return conds -class CondLinearInterpolate: - @classmethod - def INPUT_TYPES(s): - return { - "required": {"start": ("CONDITIONING",), "end": ("CONDITIONING",)}, - "optional": { - "until": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}), - "step": ("FLOAT", {"default": 0.1, "min": 0.0, "max": 1.0, "step": 0.01}), - }, - } - - RETURN_TYPES = ("CONDITIONING",) - FUNCTION = "apply" - CATEGORY = "promptcontrol/exp" - - def apply(self, start, end, until=1.0, step=0.1): - res = linear_interpolate_cond(start, end, 0.0, until, step) - return (res,) - - class ScheduleToCond: @classmethod def INPUT_TYPES(s):