feat: change default_inpaint_mask_sam_model to match sam model registry

This commit is contained in:
Manuel Schmid
2024-06-10 20:45:56 +02:00
parent ce1fb74270
commit 3873892b0a
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ class SAMOptions:
# SAM # SAM
max_num_boxes=2, max_num_boxes=2,
model_type="vit_l" model_type='vit_b'
): ):
self.dino_prompt = dino_prompt self.dino_prompt = dino_prompt
self.dino_box_threshold = dino_box_threshold self.dino_box_threshold = dino_box_threshold
+3 -3
View File
@@ -551,8 +551,8 @@ 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='sam_vit_b_01ec64', default_value='vit_b',
validator=lambda x: x in modules.flags.inpaint_mask_sam_model, validator=lambda x: x in [y[1] for y in modules.flags.inpaint_mask_sam_model if y[1] == x],
expected_type=str expected_type=str
) )
@@ -792,7 +792,7 @@ def downloading_safety_checker_model():
def download_sam_model(sam_model: str) -> str: def download_sam_model(sam_model: str) -> str:
match sam_model: match sam_model:
case 'default', 'vit_b': case 'vit_b':
return downloading_sam_vit_b() return downloading_sam_vit_b()
case 'vit_l': case 'vit_l':
return downloading_sam_vit_l() return downloading_sam_vit_l()
+1 -1
View File
@@ -76,7 +76,7 @@ output_formats = ['png', 'jpeg', 'webp']
inpaint_mask_models = ['u2net', 'u2netp', 'u2net_human_seg', 'u2net_cloth_seg', 'silueta', 'isnet-general-use', 'isnet-anime', 'sam'] inpaint_mask_models = ['u2net', 'u2netp', 'u2net_human_seg', 'u2net_cloth_seg', 'silueta', 'isnet-general-use', 'isnet-anime', 'sam']
inpaint_mask_cloth_category = ['full', 'upper', 'lower'] inpaint_mask_cloth_category = ['full', 'upper', 'lower']
inpaint_mask_sam_model = ['sam_vit_b_01ec64', 'sam_vit_l_0b3195', 'sam_vit_h_4b8939'] inpaint_mask_sam_model = [('base', 'vit_b'), ('large', 'vit_l'), ('huge', 'vit_h')]
inpaint_engine_versions = ['None', 'v1', 'v2.5', 'v2.6'] inpaint_engine_versions = ['None', 'v1', 'v2.5', 'v2.6']
inpaint_option_default = 'Inpaint or Outpaint (default)' inpaint_option_default = 'Inpaint or Outpaint (default)'