Update funpack.py

This commit is contained in:
aimfordeb
2026-04-03 15:30:14 +03:00
committed by GitHub
parent 9107447ec2
commit e39d80bfe4
+4 -7
View File
@@ -247,7 +247,6 @@ class FunPackPromptCombiner:
"prompt3": ("STRING", {"default": "", "multiline": True}),
"prompt4": ("STRING", {"default": "", "multiline": True}),
"prompt5": ("STRING", {"default": "", "multiline": True}),
"entry_delimiter": ("STRING", {"default": "", "multiline": True}),
}
}
@@ -258,7 +257,7 @@ class FunPackPromptCombiner:
OUTPUT_NODE = False
def combine(self, main_prompt,
prompt1="", prompt2="", prompt3="", prompt4="", prompt5="", entry_delimiter=""):
prompt1="", prompt2="", prompt3="", prompt4="", prompt5=""):
main = main_prompt.strip()
@@ -275,10 +274,7 @@ class FunPackPromptCombiner:
results = []
for p in (prompt1, prompt2, prompt3, prompt4, prompt5):
if entry_delimiter:
combined = merge(entry_delimiter, main, p)
else:
combined = merge(main, p)
combined = merge(main, p)
results.append(combined)
# Always return exactly 5 strings (even if some are just the main prompt)
@@ -304,6 +300,7 @@ class FunPackLorebookEnhancer:
"lorebook_2": ("STRING", {"default": "", "multiline": False}),
"lorebook_3": ("STRING", {"default": "", "multiline": False}),
"lorebook_4": ("STRING", {"default": "", "multiline": False}),
"entry_delimiter": ("STRING", {"default": "", "multiline": True}),
"context_history": ("STRING", {"multiline": True, "default": ""}),
"scan_depth": ("INT", {
"default": 4,
@@ -407,7 +404,7 @@ class FunPackLorebookEnhancer:
def enhance(self, prompt,
lorebook_1="", lorebook_2="", lorebook_3="", lorebook_4="",
context_history="", scan_depth=4):
context_history="", scan_depth=4, entry_delimiter=""):
full_text = (context_history + "\n" + prompt).lower()
lines = full_text.splitlines()