Skip to content

Commit fd74b57

Browse files
authored
Merge pull request lllyasviel#3472 from lllyasviel/develop
fix: adjust validation of config settings
2 parents 2c78cec + 8bd9ea1 commit fd74b57

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

modules/config.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,14 @@ def init_temp_path(path: str | None, default_path: str) -> str:
520520
image_count += 1
521521
default_ip_images[image_count] = get_config_item_or_set_default(
522522
key=f'default_ip_image_{image_count}',
523-
default_value=None,
524-
validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x),
523+
default_value='None',
524+
validator=lambda x: x == 'None' or isinstance(x, str) and os.path.exists(x),
525525
expected_type=str
526526
)
527+
528+
if default_ip_images[image_count] == 'None':
529+
default_ip_images[image_count] = None
530+
527531
default_ip_types[image_count] = get_config_item_or_set_default(
528532
key=f'default_ip_type_{image_count}',
529533
default_value=modules.flags.default_ip,
@@ -698,7 +702,7 @@ def init_temp_path(path: str | None, default_path: str) -> str:
698702
default_inpaint_mask_sam_model = get_config_item_or_set_default(
699703
key='default_inpaint_mask_sam_model',
700704
default_value='vit_b',
701-
validator=lambda x: x in [y[1] for y in modules.flags.inpaint_mask_sam_model if y[1] == x],
705+
validator=lambda x: x in modules.flags.inpaint_mask_sam_model,
702706
expected_type=str
703707
)
704708

0 commit comments

Comments
 (0)