From c8231dd25ebe3e279fd06605ff75c13d4f5035ed Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Mon, 15 Jan 2024 15:09:48 +0900 Subject: [PATCH] fix: MakeBasicPipe - doesn't work after last commit --- inspire/prompt_support.py | 7 ++++--- js/prompt.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/inspire/prompt_support.py b/inspire/prompt_support.py index 6c5e2ed..4c34258 100644 --- a/inspire/prompt_support.py +++ b/inspire/prompt_support.py @@ -487,7 +487,8 @@ class MakeBasicPipe: CATEGORY = "InspirePack/Prompt" - RETURN_TYPES = ("BASIC_PIPE", ) + RETURN_TYPES = ("BASIC_PIPE", "STRING") + RETURN_NAMES = ("basic_pipe", "cache_key") FUNCTION = "doit" def doit(self, **kwargs): @@ -501,7 +502,7 @@ class MakeBasicPipe: "To use 'Make Basic Pipe (Inspire)' node, 'Impact Pack' extension is required.") raise Exception(f"[ERROR] To use 'Make Basic Pipe (Inspire)', you need to install 'Impact Pack'") - model, clip, vae = CheckpointLoaderSimpleShared().load_checkpoint(ckpt_name=kwargs['ckpt_name'], key_opt=kwargs['ckpt_key_opt']) + model, clip, vae, key = CheckpointLoaderSimpleShared().doit(ckpt_name=kwargs['ckpt_name'], key_opt=kwargs['ckpt_key_opt']) clip = nodes.CLIPSetLastLayer().set_last_layer(clip, kwargs['stop_at_clip_layer'])[0] model, clip, positive = nodes.NODE_CLASS_MAPPINGS['ImpactWildcardEncode'].process_with_loras(wildcard_opt=pos_populated, model=model, clip=clip, clip_encoder=clip_encoder) model, clip, negative = nodes.NODE_CLASS_MAPPINGS['ImpactWildcardEncode'].process_with_loras(wildcard_opt=neg_populated, model=model, clip=clip, clip_encoder=clip_encoder) @@ -511,7 +512,7 @@ class MakeBasicPipe: basic_pipe = model, clip, vae, positive, negative - return (basic_pipe, ) + return (basic_pipe, key) class PromptBuilder: diff --git a/js/prompt.js b/js/prompt.js index b607752..373d9f3 100644 --- a/js/prompt.js +++ b/js/prompt.js @@ -113,7 +113,7 @@ app.registerExtension({ const direction_widget = node.widgets.find((w) => w.name == 'Add selection to'); // lora selector, wildcard selector - let combo_id = 4; + let combo_id = 5; Object.defineProperty(node.widgets[combo_id], "value", { set: (value) => {