diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12a4bc0..8bce286 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.0.284" + rev: "v0.0.285" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/CHANGELOG.md b/CHANGELOG.md index 8549eef..d6c70db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 2023-08-25 + +- v23.8.1 +- xyz grid에서 model을 `None`으로 설정한 이후에 adetailer가 비활성화 되는 문제 수정 +- skip을 눌렀을 때 진행을 멈춤 +- `--medvram-sdxl`을 설정했을 때에도 cpu를 사용하게 함 + ## 2023-08-14 - v23.8.0 diff --git a/adetailer/__version__.py b/adetailer/__version__.py index 636d72c..cf2cc65 100644 --- a/adetailer/__version__.py +++ b/adetailer/__version__.py @@ -1 +1 @@ -__version__ = "23.8.0" +__version__ = "23.8.1" diff --git a/install.py b/install.py index 551215e..c601a65 100644 --- a/install.py +++ b/install.py @@ -44,7 +44,7 @@ def run_pip(*args): def install(): deps = [ # requirements - ("ultralytics", "8.0.154", None), + ("ultralytics", "8.0.162", None), ("mediapipe", "0.10.3", None), ("rich", "13.0.0", None), # mediapipe diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index cf7016a..b90731f 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -189,7 +189,7 @@ class AfterDetailerScript(scripts.Script): raise ValueError(message) if hasattr(p, "adetailer_xyz"): - args[0].update(p.adetailer_xyz) + args[0] = {**args[0], **p.adetailer_xyz} all_inputs = [] @@ -226,7 +226,8 @@ class AfterDetailerScript(scripts.Script): if platform.system() == "Darwin": return "" - if any(getattr(cmd_opts, vram, False) for vram in ["lowvram", "medvram"]): + vram_args = ["lowvram", "medvram", "medvram_sdxl"] + if any(getattr(cmd_opts, vram, False) for vram in vram_args): return "cpu" return "" @@ -537,7 +538,7 @@ class AfterDetailerScript(scripts.Script): `True` if image was processed, `False` otherwise. """ - if state.interrupted: + if state.interrupted or state.skipped: return False i = p._ad_idx