happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: revert adding translate feature

This commit is contained in:
Manuel Schmid 2024-07-14 20:28:55 +02:00
parent f2a21900c6
commit e1f4b65fc9
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/async_worker.py
View File

@ -29,7 +29,6 @@ class AsyncTask:
self.generate_image_grid = args.pop()
self.prompt = args.pop()
self.negative_prompt = args.pop()
self.translate_prompts = args.pop()
self.style_selections = args.pop()
self.performance_selection = Performance(args.pop())
@ -944,12 +943,10 @@ def worker():
modules.config.downloading_upscale_model()
return uov_input_image, skip_prompt_processing, steps
def prepare_enhance_prompt(prompt: str, fallback_prompt: str, translate: bool, prompt_type: str):
def prepare_enhance_prompt(prompt: str, fallback_prompt: str):
if safe_str(prompt) == '' or len(remove_empty_str([safe_str(p) for p in prompt.splitlines()], default='')) == 0:
prompt = fallback_prompt
else:
if translate:
prompt = translate2en(prompt, prompt_type)
return prompt
def stop_processing(async_task, processing_start_time):
@ -968,9 +965,8 @@ def worker():
inpaint_parameterized = inpaint_engine != 'None' # inpaint_engine = None, improve detail
initial_latent = None
prompt = prepare_enhance_prompt(prompt, async_task.prompt, async_task.translate_prompts, 'prompt')
negative_prompt = prepare_enhance_prompt(negative_prompt, async_task.negative_prompt,
async_task.translate_prompts, 'negative prompt')
prompt = prepare_enhance_prompt(prompt, async_task.prompt)
negative_prompt = prepare_enhance_prompt(negative_prompt, async_task.negative_prompt)
if 'vary' in goals:
img, denoising_strength, initial_latent, width, height, current_progress = apply_vary(
@ -1092,10 +1088,6 @@ def worker():
elif async_task.performance_selection == Performance.HYPER_SD:
set_hyper_sd_defaults(async_task, current_progress, advance_progress=True)
if async_task.translate_prompts:
async_task.prompt = translate2en(async_task.prompt, 'prompt')
async_task.negative_prompt = translate2en(async_task.negative_prompt, 'negative prompt')
print(f'[Parameters] Adaptive CFG = {async_task.adaptive_cfg}')
print(f'[Parameters] CLIP Skip = {async_task.clip_skip}')
print(f'[Parameters] Sharpness = {async_task.sharpness}')

5
webui.py
View File

@ -567,9 +567,6 @@ with shared.gradio_root:
info='Describing what you do not want to see.', lines=2,
elem_id='negative_prompt',
value=modules.config.default_prompt_negative)
translate_prompts = gr.Checkbox(label='Translate Prompts',
info='Uses the internet to translate prompts to English.',
value=False)
seed_random = gr.Checkbox(label='Random', value=True)
image_seed = gr.Textbox(label='Seed', value=0, max_lines=1, visible=False) # workaround for https://github.com/gradio-app/gradio/issues/5354
@ -972,7 +969,7 @@ with shared.gradio_root:
ctrls = [currentTask, generate_image_grid]
ctrls += [
prompt, negative_prompt, translate_prompts, style_selections,
prompt, negative_prompt, style_selections,
performance_selection, aspect_ratios_selection, image_number, output_format, image_seed,
read_wildcards_in_order, sharpness, guidance_scale
]