diff --git a/adetailer/args.py b/adetailer/args.py index e6d0b4e..8ae74e0 100644 --- a/adetailer/args.py +++ b/adetailer/args.py @@ -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)) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index 696c605..7f8328d 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -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()) }