move prompt translation to async_worker
This commit is contained in:
parent
eeb1013638
commit
25c3184ddc
|
|
@ -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}')
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
13
webui.py
13
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 ...')), \
|
||||
|
|
|
|||
Loading…
Reference in New Issue