Merge branch 'dev' into test-fp8

3 files changed, 9 insertions, 22 deletions

diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 3c85a74c..0c59fad4 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -6,7 +6,7 @@ from modules import shared, images, devices, scripts, scripts_postprocessing, ui
 from modules.shared import opts

 

 

-def run_postprocessing(id_task, extras_mode, image, image_folder, input_dir, output_dir, show_extras_results, *args, save_output: bool = True):

+def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir, show_extras_results, *args, save_output: bool = True):

     devices.torch_gc()

 

     shared.state.begin(job="extras")

@@ -128,6 +128,10 @@ def run_postprocessing(id_task, extras_mode, image, image_folder, input_dir, out
     return outputs, ui_common.plaintext_to_html(infotext), ''

 

 

+def run_postprocessing_webui(id_task, *args, **kwargs):

+    return run_postprocessing(*args, **kwargs)

+

+

 def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, gfpgan_visibility, codeformer_visibility, codeformer_weight, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, upscale_first: bool, save_output: bool = True):

     """old handler for API"""

 

diff --git a/modules/styles.py b/modules/styles.py
index 4d218cd7..7fb6c2e1 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -2,7 +2,6 @@ import csv
 import fnmatch

 import os

 import os.path

-import re

 import typing

 import shutil

 

@@ -14,22 +13,6 @@ class PromptStyle(typing.NamedTuple):
     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:

     if "{prompt}" in style_prompt:

         res = style_prompt.replace("{prompt}", prompt)

@@ -44,7 +27,7 @@ def apply_styles_to_prompt(prompt, styles):
     for style in styles:

         prompt = merge_prompts(style, prompt)

 

-    return clean_text(prompt)

+    return 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

     purposes here. It isn't returned; the original style text is not modified.

     """

-    stripped_prompt = clean_text(prompt)

-    stripped_style_text = clean_text(style_text)

+    stripped_prompt = prompt

+    stripped_style_text = style_text

     if "{prompt}" in stripped_style_text:

         # 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.

diff --git a/modules/ui_postprocessing.py b/modules/ui_postprocessing.py
index fbad0800..13d888e4 100644
--- a/modules/ui_postprocessing.py
+++ b/modules/ui_postprocessing.py
@@ -35,7 +35,7 @@ def create_ui():
     tab_batch_dir.select(fn=lambda: 2, inputs=[], outputs=[tab_index])

 

     submit.click(

-        fn=call_queue.wrap_gradio_gpu_call(postprocessing.run_postprocessing, extra_outputs=[None, '']),

+        fn=call_queue.wrap_gradio_gpu_call(postprocessing.run_postprocessing_webui, extra_outputs=[None, '']),

         _js="submit_extras",

         inputs=[

             dummy_component,