moved image extension to webui via async worker. Passing as parameter to log and get_current_html_path functions per feedback

This commit is contained in:
eddyizm
2024-01-12 22:49:07 -08:00
parent 9dfa1a99e3
commit ab3acb7817
4 changed files with 13 additions and 15 deletions
+3 -1
View File
@@ -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
-6
View File
@@ -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',
+6 -4
View File
@@ -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')