Merge branch 'main_upstream' into feature/add-nsfw-filter

# Conflicts:
#	modules/advanced_parameters.py
This commit is contained in:
Manuel Schmid
2024-01-17 22:42:31 +01:00
321 changed files with 620 additions and 215 deletions
+6 -1
View File
@@ -244,10 +244,15 @@ default_advanced_checkbox = get_config_item_or_set_default(
default_value=False,
validator=lambda x: isinstance(x, bool)
)
default_max_image_number = get_config_item_or_set_default(
key='default_max_image_number',
default_value=32,
validator=lambda x: isinstance(x, int) and x >= 1
)
default_image_number = get_config_item_or_set_default(
key='default_image_number',
default_value=2,
validator=lambda x: isinstance(x, int) and 1 <= x <= 32
validator=lambda x: isinstance(x, int) and 1 <= x <= default_max_image_number
)
checkpoint_downloads = get_config_item_or_set_default(
key='checkpoint_downloads',