diff --git a/modules/async_worker.py b/modules/async_worker.py index b2af6712..104ac43d 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -125,6 +125,7 @@ def worker(): performance_selection = args.pop() aspect_ratios_selection = args.pop() image_number = args.pop() + image_extension = args.pop() image_seed = args.pop() sharpness = args.pop() guidance_scale = args.pop() @@ -376,6 +377,7 @@ def worker(): progressbar(async_task, 3, 'Processing prompts ...') tasks = [] + for i in range(image_number): task_seed = (seed + i) % (constants.MAX_SEED + 1) # randint is inclusive, % is not task_rng = random.Random(task_seed) # may bind to inpaint noise in the future @@ -511,7 +513,7 @@ def worker(): if direct_return: d = [('Upscale (Fast)', '2x')] - log(uov_input_image, d) + log(uov_input_image, d, image_extension) yield_result(async_task, uov_input_image, do_not_show_finished_images=True) return diff --git a/modules/config.py b/modules/config.py index 0dc9929e..35077cda 100644 --- a/modules/config.py +++ b/modules/config.py @@ -151,12 +151,6 @@ def get_config_item_or_set_default(key, default_value, validator, disable_empty_ return default_value -def update_image_extension(value): - '''Updating default image extension used for saving output image''' - modules.config.default_image_extension = value - print(f'[CONFIG] Updated image extension value: {modules.config.default_image_extension}') - - default_base_model_name = get_config_item_or_set_default( key='default_model', default_value='juggernautXL_version6Rundiffusion.safetensors', diff --git a/modules/private_logger.py b/modules/private_logger.py index 1417b0b6..5e42ebe0 100644 --- a/modules/private_logger.py +++ b/modules/private_logger.py @@ -11,18 +11,20 @@ from modules.util import generate_temp_filename log_cache = {} -def get_current_html_path(): +def get_current_html_path(image_extension=None): + _image_extension = image_extension if image_extension else modules.config.default_image_extension date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.config.path_outputs, - extension=modules.config.default_image_extension) + extension=_image_extension) html_name = os.path.join(os.path.dirname(local_temp_filename), 'log.html') return html_name -def log(img, dic): +def log(img, dic, image_extension=None): if args_manager.args.disable_image_log: return - date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.config.path_outputs, extension=modules.config.default_image_extension) + _image_extension = image_extension if image_extension else modules.config.default_image_extension + date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.config.path_outputs, extension=_image_extension) os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True) Image.fromarray(img).save(local_temp_filename) html_name = os.path.join(os.path.dirname(local_temp_filename), 'log.html') diff --git a/webui.py b/webui.py index 17c8a6ed..9f4df7fd 100644 --- a/webui.py +++ b/webui.py @@ -259,7 +259,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( @@ -485,9 +485,9 @@ with shared.gradio_root: scheduler_name, adaptive_cfg, refiner_swap_method, negative_prompt ], queue=False, show_progress=False) - image_extension.input(lambda x: modules.config.update_image_extension(x), + image_extension.input(lambda x: gr.update(image_extension=x), inputs=image_extension) - + advanced_checkbox.change(lambda x: gr.update(visible=x), advanced_checkbox, advanced_column, queue=False, show_progress=False) \ .then(fn=lambda: None, _js='refresh_grid_delayed', queue=False, show_progress=False) @@ -527,7 +527,7 @@ with shared.gradio_root: ctrls = [ prompt, negative_prompt, style_selections, - performance_selection, aspect_ratios_selection, image_number, image_seed, sharpness, guidance_scale + performance_selection, aspect_ratios_selection, image_number, image_extension, image_seed, sharpness, guidance_scale ] ctrls += [base_model, refiner_model, refiner_switch] + lora_ctrls