mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
Merge pull request #3472 from lllyasviel/develop
fix: adjust validation of config settings
This commit is contained in:
+7
-3
@@ -520,10 +520,14 @@ for image_count in range(default_controlnet_image_count):
|
|||||||
image_count += 1
|
image_count += 1
|
||||||
default_ip_images[image_count] = get_config_item_or_set_default(
|
default_ip_images[image_count] = get_config_item_or_set_default(
|
||||||
key=f'default_ip_image_{image_count}',
|
key=f'default_ip_image_{image_count}',
|
||||||
default_value=None,
|
default_value='None',
|
||||||
validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x),
|
validator=lambda x: x == 'None' or isinstance(x, str) and os.path.exists(x),
|
||||||
expected_type=str
|
expected_type=str
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if default_ip_images[image_count] == 'None':
|
||||||
|
default_ip_images[image_count] = None
|
||||||
|
|
||||||
default_ip_types[image_count] = get_config_item_or_set_default(
|
default_ip_types[image_count] = get_config_item_or_set_default(
|
||||||
key=f'default_ip_type_{image_count}',
|
key=f'default_ip_type_{image_count}',
|
||||||
default_value=modules.flags.default_ip,
|
default_value=modules.flags.default_ip,
|
||||||
@@ -698,7 +702,7 @@ default_inpaint_mask_cloth_category = get_config_item_or_set_default(
|
|||||||
default_inpaint_mask_sam_model = get_config_item_or_set_default(
|
default_inpaint_mask_sam_model = get_config_item_or_set_default(
|
||||||
key='default_inpaint_mask_sam_model',
|
key='default_inpaint_mask_sam_model',
|
||||||
default_value='vit_b',
|
default_value='vit_b',
|
||||||
validator=lambda x: x in [y[1] for y in modules.flags.inpaint_mask_sam_model if y[1] == x],
|
validator=lambda x: x in modules.flags.inpaint_mask_sam_model,
|
||||||
expected_type=str
|
expected_type=str
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user