From 25c3184ddc803e42c64c568c681dc22ca4ce3892 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sat, 25 Nov 2023 23:26:29 +0100 Subject: [PATCH] move prompt translation to async_worker --- modules/async_worker.py | 6 ++++++ modules/translator.py | 4 ++-- webui.py | 13 +------------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index 70f00705..ce58584b 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -41,6 +41,7 @@ def worker(): from modules.util import remove_empty_str, HWC3, resize_image, \ get_image_shape_ceil, set_image_shape_ceil, get_shape_ceil, resample_image from modules.upscaler import perform_upscale + from modules.translator import translate2en try: async_gradio_app = shared.gradio_root @@ -120,6 +121,7 @@ def worker(): prompt = args.pop() negative_prompt = args.pop() + translate_prompts = args.pop() style_selections = args.pop() performance_selection = args.pop() aspect_ratios_selection = args.pop() @@ -195,6 +197,10 @@ def worker(): modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end = 0.0 steps = 8 + if translate_prompts: + prompt = translate2en(prompt, 'prompt') + negative_prompt = translate2en(negative_prompt, 'negative prompt') + modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg print(f'[Parameters] Adaptive CFG = {modules.patch.adaptive_cfg}') diff --git a/modules/translator.py b/modules/translator.py index 2680131c..e8f0ca0c 100644 --- a/modules/translator.py +++ b/modules/translator.py @@ -8,8 +8,8 @@ def translate2en(text, element): try: result = translators.translate_text(text,to_language='en') - print(f'Translated {element}: {result}') + print(f'[Parameters] Translated {element}: {result}') return result except Exception as e: - print(f'Error during translation of {element}: {e}') + print(f'[Parameters] Error during translation of {element}: {e}') return text \ No newline at end of file diff --git a/webui.py b/webui.py index 4873b6e5..2f23dfb0 100644 --- a/webui.py +++ b/webui.py @@ -19,7 +19,6 @@ from modules.sdxl_styles import legal_style_names from modules.private_logger import get_current_html_path from modules.ui_gradio_extensions import reload_javascript from modules.auth import auth_enabled, check_auth -from modules.translator import translate2en def generate_clicked(*args): import fcbh.model_management as model_management @@ -30,17 +29,7 @@ def generate_clicked(*args): # outputs=[progress_html, progress_window, progress_gallery, gallery] execution_start_time = time.perf_counter() - - args = list(args) - - # translate prompts - if args[2]: - args[0] = translate2en(args[0], 'prompt') - args[1] = translate2en(args[1], 'negative prompt') - # remove translate_prompts from args - args.pop(2) - - task = worker.AsyncTask(args=args) + task = worker.AsyncTask(args=list(args)) finished = False yield gr.update(visible=True, value=modules.html.make_progress_html(1, 'Waiting for task to start ...')), \