feat: more verbosity

This commit is contained in:
Bingsu
2023-04-28 20:58:37 +09:00
parent 9f18368caf
commit 6cc6dbea89
2 changed files with 23 additions and 14 deletions

View File

@@ -1 +1 @@
__version__ = "23.4.1" __version__ = "23.4.2"

View File

@@ -23,6 +23,10 @@ AFTER_DETAILER = "After Detailer"
adetailer_dir = Path(models_path, "adetailer") adetailer_dir = Path(models_path, "adetailer")
model_mapping = get_models(adetailer_dir) model_mapping = get_models(adetailer_dir)
print(
f"[-] ADetailer initialized. version: {__version__}, num models: {len(model_mapping)}"
)
class ADetailerArgs: class ADetailerArgs:
""" """
@@ -274,12 +278,14 @@ class AfterDetailerScript(scripts.Script):
@staticmethod @staticmethod
def get_ultralytics_device(): def get_ultralytics_device():
'`device = ""` means autodetect'
device = "" device = ""
is_lowvram = any( if platform.system() == "Darwin":
getattr(cmd_opts, vram, False) for vram in ["lowvram", "medvram"] return device
)
if platform.system() != "Darwin" and is_lowvram: if any(getattr(cmd_opts, vram, False) for vram in ["lowvram", "medvram"]):
device = "cpu" device = "cpu"
return device return device
def get_prompt(self, p, args): def get_prompt(self, p, args):
@@ -414,7 +420,9 @@ class AfterDetailerScript(scripts.Script):
pred = predictor(ad_model, pp.image, args.ad_conf, **kwargs) pred = predictor(ad_model, pp.image, args.ad_conf, **kwargs)
if pred.masks is None: if pred.masks is None:
print("ADetailer: nothing detected with current settings") print(
f"[-] ADetailer: nothing detected on image {i + 1} with current settings."
)
return return
if opts.data.get("ad_save_previews", False): if opts.data.get("ad_save_previews", False):
@@ -434,23 +442,24 @@ class AfterDetailerScript(scripts.Script):
steps = len(masks) steps = len(masks)
processed = None processed = None
if args.ad_model.lower().startswith("mediapipe"):
print(f"mediapipe: {steps} detected.")
p2 = copy(i2i) p2 = copy(i2i)
for j in range(steps): for j in range(steps):
mask = masks[j] mask = masks[j]
mask = dilate_erode(mask, args.ad_dilate_erode) mask = dilate_erode(mask, args.ad_dilate_erode)
if is_all_black(mask):
continue
mask = offset(mask, args.ad_x_offset, args.ad_y_offset) if not is_all_black(mask):
p2.image_mask = mask mask = offset(mask, args.ad_x_offset, args.ad_y_offset)
p2.image_mask = mask
processed = process_images(p2)
processed = process_images(p2) p2 = copy(i2i)
p2.init_images = processed.images
p2 = copy(i2i)
p2.seed = seed + j + 1 p2.seed = seed + j + 1
p2.subseed = subseed + j + 1 p2.subseed = subseed + j + 1
p2.init_images = processed.images
if processed is not None: if processed is not None:
pp.image = processed.images[0] pp.image = processed.images[0]