refactor: rename image_file_extension to output_format

modules/async_worker.py

@@ -125,7 +125,7 @@ def worker():
         performance_selection = args.pop()
         aspect_ratios_selection = args.pop()
         image_number = args.pop()
-        image_file_extension = args.pop()
+        output_format = 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_file_extension)
+                uov_input_image_path = log(uov_input_image, d, output_format)
                 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_file_extension))
+                    img_paths.append(log(x, d, output_format))
 
                 yield_result(async_task, img_paths, do_not_show_finished_images=len(tasks) == 1)
             except ldm_patched.modules.model_management.InterruptProcessingException as e:

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_file_extension = get_config_item_or_set_default(
-    key='default_image_file_extension',
+default_output_format = get_config_item_or_set_default(
+    key='default_output_format',
     default_value='png',
-    validator=lambda x: x in modules.flags.image_file_extensions
+    validator=lambda x: x in modules.flags.output_formats
 )
 default_image_number = get_config_item_or_set_default(
     key='default_image_number',

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_file_extensions = ['png', 'jpg', 'webp']
+output_formats = ['png', 'jpg', 'webp']
 
 inpaint_option_default = 'Inpaint or Outpaint (default)'
 inpaint_option_detail = 'Improve Detail (face, hand, eyes, etc.)'

modules/private_logger.py

@@ -11,21 +11,21 @@ from tempfile import gettempdir
 log_cache = {}
 
 
-def get_current_html_path(image_extension=None):
-    _image_extension = image_extension if image_extension else modules.config.default_image_extension
+def get_current_html_path(output_format=None):
+    output_format = output_format if output_format else modules.config.default_output_format
     date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.config.path_outputs,
-                                                                         extension=_image_extension)
+                                                                         extension=output_format)
     html_name = os.path.join(os.path.dirname(local_temp_filename), 'log.html')
     return html_name
 
 
-def log(img, dic, image_extension=None) -> str:
+def log(img, dic, output_format=None) -> str:
     path_outputs = args_manager.args.temp_path if args_manager.args.disable_image_log else modules.config.path_outputs
-    _image_extension = image_extension if image_extension else modules.config.default_image_extension
-    date_string, local_temp_filename, only_name = generate_temp_filename(folder=path_outputs, extension=_image_extension)
+    output_format = output_format if output_format else modules.config.default_output_format
+    date_string, local_temp_filename, only_name = generate_temp_filename(folder=path_outputs, extension=output_format)
     os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True)
     
-    if _image_extension == 'jpg':
+    if output_format == 'jpg':
         Image.fromarray(img).save(local_temp_filename, quality=95, optimize=True, progressive=True)
     else:
         Image.fromarray(img).save(local_temp_filename)