Mirrors
/
stable-diffusion-webui
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove clean_text()

This commit is contained in:
w-e-w 2023-12-05 04:40:12 +09:00
parent 22e23dbf29
commit 854f8c318c
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/styles.py
View File

@ -2,7 +2,6 @@ import csv
import fnmatch import fnmatch
import os import os
import os.path import os.path
import re
import typing import typing
import shutil import shutil
@ -14,22 +13,6 @@ class PromptStyle(typing.NamedTuple):
path: str = None path: str = None
def clean_text(text: str) -> str:
"""
Iterating through a list of regular expressions and replacement strings, we
clean up the prompt and style text to make it easier to match against each
other.
"""
re_list = [
("multiple commas", re.compile("(,+\s+)+,?"), ", "),
("multiple spaces", re.compile("\s{2,}"), " "),
]
for _, regex, replace in re_list:
text = regex.sub(replace, text)
return text.strip(", ")
def merge_prompts(style_prompt: str, prompt: str) -> str: def merge_prompts(style_prompt: str, prompt: str) -> str:
if "{prompt}" in style_prompt: if "{prompt}" in style_prompt:
res = style_prompt.replace("{prompt}", prompt) res = style_prompt.replace("{prompt}", prompt)
@ -44,7 +27,7 @@ def apply_styles_to_prompt(prompt, styles):
for style in styles: for style in styles:
prompt = merge_prompts(style, prompt) prompt = merge_prompts(style, prompt)
return clean_text(prompt) return prompt
def unwrap_style_text_from_prompt(style_text, prompt): def unwrap_style_text_from_prompt(style_text, prompt):
@ -56,8 +39,8 @@ def unwrap_style_text_from_prompt(style_text, prompt):
Note that the "cleaned" version of the style text is only used for matching Note that the "cleaned" version of the style text is only used for matching
purposes here. It isn't returned; the original style text is not modified. purposes here. It isn't returned; the original style text is not modified.
""" """
stripped_prompt = clean_text(prompt) stripped_prompt = prompt
stripped_style_text = clean_text(style_text) stripped_style_text = style_text
if "{prompt}" in stripped_style_text: if "{prompt}" in stripped_style_text:
# Work out whether the prompt is wrapped in the style text. If so, we # Work out whether the prompt is wrapped in the style text. If so, we
# return True and the "inner" prompt text that isn't part of the style. # return True and the "inner" prompt text that isn't part of the style.