Merge branch 'jpg_config_image_extension'

# Conflicts:
#	modules/async_worker.py
#	modules/config.py
#	modules/flags.py
#	webui.py
This commit is contained in:
Manuel Schmid
2024-01-14 23:22:03 +01:00
8 changed files with 51 additions and 21 deletions
+5 -1
View File
@@ -289,6 +289,11 @@ 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_value='png',
validator=lambda x: x in modules.flags.image_extensions
)
default_image_number = get_config_item_or_set_default(
key='default_image_number',
default_value=2,
@@ -388,7 +393,6 @@ possible_preset_keys = {
"lora_downloads": "lora_downloads"
}
REWRITE_PRESET = False
if REWRITE_PRESET and isinstance(args_manager.args.preset, str):