diff --git a/modules/async_worker.py b/modules/async_worker.py
index 94543a31..3e789e44 100644
--- a/modules/async_worker.py
+++ b/modules/async_worker.py
@@ -125,7 +125,7 @@ def worker():
performance_selection = args.pop()
aspect_ratios_selection = args.pop()
image_number = args.pop()
- image_extension = args.pop()
+ image_file_extension = args.pop()
image_seed = args.pop()
sharpness = args.pop()
guidance_scale = args.pop()
@@ -513,7 +513,7 @@ def worker():
if direct_return:
d = [('Upscale (Fast)', '2x')]
- uov_input_image_path = log(uov_input_image, d, image_extension)
+ uov_input_image_path = log(uov_input_image, d, image_file_extension)
yield_result(async_task, uov_input_image_path, do_not_show_finished_images=True)
return
@@ -802,7 +802,7 @@ def worker():
if n != 'None':
d.append((f'LoRA {li + 1}', f'{n} : {w}'))
d.append(('Version', 'v' + fooocus_version.version))
- img_paths.append(log(x, d, image_extension))
+ img_paths.append(log(x, d, image_file_extension))
yield_result(async_task, img_paths, do_not_show_finished_images=len(tasks) == 1)
except ldm_patched.modules.model_management.InterruptProcessingException as e:
diff --git a/modules/config.py b/modules/config.py
index 35077cda..8067993a 100644
--- a/modules/config.py
+++ b/modules/config.py
@@ -248,10 +248,10 @@ default_max_image_number = get_config_item_or_set_default(
default_value=32,
validator=lambda x: isinstance(x, int) and x >= 1
)
-default_image_extension = get_config_item_or_set_default(
- key='default_image_extension',
+default_image_file_extension = get_config_item_or_set_default(
+ key='default_image_file_extension',
default_value='png',
- validator=lambda x: x in modules.flags.image_extensions
+ validator=lambda x: x in modules.flags.image_file_extensions
)
default_image_number = get_config_item_or_set_default(
key='default_image_number',
@@ -335,7 +335,6 @@ possible_preset_keys = [
"default_sampler",
"default_scheduler",
"default_performance",
- "default_image_extension",
"default_prompt",
"default_prompt_negative",
"default_styles",
diff --git a/modules/flags.py b/modules/flags.py
index f3c7a35a..e9640371 100644
--- a/modules/flags.py
+++ b/modules/flags.py
@@ -34,7 +34,7 @@ default_parameters = {
inpaint_engine_versions = ['None', 'v1', 'v2.5', 'v2.6']
performance_selections = ['Speed', 'Quality', 'Extreme Speed']
-image_extensions = ['png', 'jpg', 'webp']
+image_file_extensions = ['png', 'jpg', 'webp']
inpaint_option_default = 'Inpaint or Outpaint (default)'
inpaint_option_detail = 'Improve Detail (face, hand, eyes, etc.)'
diff --git a/webui.py b/webui.py
index 467dc5cb..1e257383 100644
--- a/webui.py
+++ b/webui.py
@@ -236,9 +236,9 @@ with shared.gradio_root:
elem_classes='aspect_ratios')
image_number = gr.Slider(label='Image Number', minimum=1, maximum=modules.config.default_max_image_number, step=1, value=modules.config.default_image_number)
- image_extension = gr.Radio(label='Image Outputs Extension',
- choices=modules.flags.image_extensions,
- value=modules.config.default_image_extension)
+ image_file_extension = gr.Radio(label='Image File Extension',
+ choices=modules.flags.image_file_extensions,
+ value=modules.config.default_image_file_extension)
negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.",
info='Describing what you do not want to see.', lines=2,
@@ -266,7 +266,7 @@ with shared.gradio_root:
queue=False, show_progress=False)
if not args_manager.args.disable_image_log:
- gr.HTML(f'\U0001F4DA History Log')
+ gr.HTML(f'\U0001F4DA History Log')
with gr.Tab(label='Style'):
style_sorter.try_load_sorted_styles(
@@ -492,7 +492,7 @@ with shared.gradio_root:
scheduler_name, adaptive_cfg, refiner_swap_method, negative_prompt
], queue=False, show_progress=False)
- image_extension.input(lambda x: gr.update(image_extension=x), inputs=image_extension)
+ image_file_extension.input(lambda x: gr.update(image_file_extension=x), inputs=image_file_extension)
advanced_checkbox.change(lambda x: gr.update(visible=x), advanced_checkbox, advanced_column,
queue=False, show_progress=False) \
@@ -533,7 +533,7 @@ with shared.gradio_root:
ctrls = [
prompt, negative_prompt, style_selections,
- performance_selection, aspect_ratios_selection, image_number, image_extension, image_seed, sharpness, guidance_scale
+ performance_selection, aspect_ratios_selection, image_number, image_file_extension, image_seed, sharpness, guidance_scale
]
ctrls += [base_model, refiner_model, refiner_switch] + lora_ctrls