fix: builtin scripts

This commit is contained in:
Dowon
2024-05-17 14:16:16 +09:00
parent f12f66c298
commit 9672046eeb
2 changed files with 13 additions and 4 deletions

View File

@@ -268,6 +268,8 @@ _script_default = (
"wildcards",
"lora_block_weight",
"negpip",
"soft_inpainting",
)
SCRIPT_DEFAULT = ",".join(sorted(_script_default))
_builtin_script = ("soft_inpainting", "hypertile_script")
BUILTIN_SCRIPT = ",".join(sorted(_builtin_script))

View File

@@ -39,7 +39,13 @@ from adetailer import (
mediapipe_predict,
ultralytics_predict,
)
from adetailer.args import BBOX_SORTBY, SCRIPT_DEFAULT, ADetailerArgs, SkipImg2ImgOrig
from adetailer.args import (
BBOX_SORTBY,
BUILTIN_SCRIPT,
SCRIPT_DEFAULT,
ADetailerArgs,
SkipImg2ImgOrig,
)
from adetailer.common import PredictOutput, ensure_pil_image, safe_mkdir
from adetailer.mask import (
filter_by_ratio,
@@ -442,10 +448,11 @@ class AfterDetailerScript(scripts.Script):
if not ad_only_seleted_scripts:
return script_runner, script_args
ad_script_names = opts.data.get("ad_script_names", SCRIPT_DEFAULT)
ad_script_names_string: str = opts.data.get("ad_script_names", SCRIPT_DEFAULT)
ad_script_names = ad_script_names_string.split(",") + BUILTIN_SCRIPT.split(",")
script_names_set = {
name
for script_name in ad_script_names.split(",")
for script_name in ad_script_names
for name in (script_name, script_name.strip())
}