Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main_upstream'

Browse Source 
# Conflicts:
#	fooocus_version.py
#	modules/config.py
#	modules/extra_utils.py
This commit is contained in:
Manuel Schmid
2024-06-06 19:50:15 +02:00
parent db36766f34 ba77e7f706
commit 9c352b6eb7
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/config.py
+8 -4
View File
@@ -530,24 +530,28 @@ 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,
validator=lambda x: isinstance(x, bool)
validator=lambda x: isinstance(x, bool),
expected_type=bool
)
default_inpaint_mask_model = get_config_item_or_set_default(
key='default_inpaint_mask_model',
default_value='isnet-general-use',
validator=lambda x: x in modules.flags.inpaint_mask_models
validator=lambda x: x in modules.flags.inpaint_mask_models,
expected_type=str
)
default_inpaint_mask_cloth_category = get_config_item_or_set_default(
key='default_inpaint_mask_cloth_category',
default_value='full',
validator=lambda x: x in modules.flags.inpaint_mask_cloth_category
validator=lambda x: x in modules.flags.inpaint_mask_cloth_category,
expected_type=str
)
default_inpaint_mask_sam_model = get_config_item_or_set_default(
key='default_inpaint_mask_sam_model',
default_value='sam_vit_b_01ec64',
validator=lambda x: x in modules.flags.inpaint_mask_sam_model
validator=lambda x: x in modules.flags.inpaint_mask_sam_model,
expected_type=str
)
config_dict["default_loras"] = default_loras = default_loras[:default_max_lora_number] + [[True, 'None', 1.0] for _ in range(default_max_lora_number - len(default_loras))]
modules/extra_utils.py
-1
View File
@@ -2,7 +2,6 @@ import os
from ast import literal_eval
def makedirs_with_log(path):
try:
os.makedirs(path, exist_ok=True)