Merge remote-tracking branch 'upstream/main' into feature/add-nsfw-filter

# Conflicts:
#	modules/async_worker.py
#	modules/config.py
This commit is contained in:
Manuel Schmid
2023-12-14 22:55:45 +01:00
210 changed files with 47720 additions and 2551 deletions
+11 -1
View File
@@ -303,6 +303,16 @@ default_overwrite_switch = get_config_item_or_set_default(
default_value=-1,
validator=lambda x: isinstance(x, int)
)
example_inpaint_prompts = get_config_item_or_set_default(
key='example_inpaint_prompts',
default_value=[
'highly detailed face', 'detailed girl face', 'detailed man face', 'detailed hand', 'beautiful eyes'
],
validator=lambda x: isinstance(x, list) and all(isinstance(v, str) for v in x)
)
example_inpaint_prompts = [[x] for x in example_inpaint_prompts]
default_black_out_nsfw = get_config_item_or_set_default(
key='default_black_out_nsfw',
default_value=False,
@@ -430,7 +440,7 @@ def downloading_sdxl_lcm_lora():
model_dir=path_loras,
file_name='sdxl_lcm_lora.safetensors'
)
return os.path.join(path_loras, 'sdxl_lcm_lora.safetensors')
return 'sdxl_lcm_lora.safetensors'
def downloading_controlnet_canny():