From c2eb7ba586b4249014e114c7f511e71ec5042aa3 Mon Sep 17 00:00:00 2001 From: X-T-E-R Date: Tue, 3 Sep 2024 02:23:14 +0800 Subject: [PATCH] add option "keep" in prompt_concat --- civitaiNodes/prompt_concatenate.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/civitaiNodes/prompt_concatenate.py b/civitaiNodes/prompt_concatenate.py index 0f838e5..038d922 100644 --- a/civitaiNodes/prompt_concatenate.py +++ b/civitaiNodes/prompt_concatenate.py @@ -20,8 +20,8 @@ DEFAULT_PROMPT_INPUT_TYPES = { {"default": True}, ), "whitespace_style": ( - ["space", "underscore"], - {"default": "space"}, + ["keep", "space", "underscore"], + {"default": "keep"}, ) }, } @@ -46,10 +46,9 @@ def convert_prompt_to_string(prompt: Any) -> str: else: prompt = str(prompt) assert isinstance(prompt, str) - for char in ["_", "\t"]: - prompt = prompt.replace(char, " ") for char in ["\n", "\r", "\f", "\v"]: prompt = prompt.replace(char, ",") + prompt = prompt.replace("\t", " ") prompt = prompt.replace("，", ",") return prompt @@ -97,6 +96,8 @@ def clean_prompt( words = deduplicate_list(words) if whitespace_style == "underscore": words = [word.replace(" ", "_") for word in words] + elif whitespace_style == "space": + words = [word.replace("_", " ") for word in words] return ", ".join(words)