From 10fd2906a3999fa8d7a70f992eac664fbce68497 Mon Sep 17 00:00:00 2001 From: Dowon Date: Tue, 24 Oct 2023 20:13:32 +0900 Subject: [PATCH] fix: minimum version 1.4.0 to 1.1.0 --- controlnet_ext/controlnet_ext.py | 12 +++++++++++- scripts/!adetailer.py | 11 ++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/controlnet_ext/controlnet_ext.py b/controlnet_ext/controlnet_ext.py index 6f70949..e5bf34f 100644 --- a/controlnet_ext/controlnet_ext.py +++ b/controlnet_ext/controlnet_ext.py @@ -4,9 +4,19 @@ import importlib import re from functools import lru_cache from pathlib import Path +from textwrap import dedent from modules import extensions, sd_models, shared -from modules.paths import extensions_builtin_dir, extensions_dir, models_path + +try: + from modules.paths import extensions_builtin_dir, extensions_dir, models_path +except ImportError as e: + msg = """ + [-] ADetailer: `stable-diffusion-webui < 1.1.0` is no longer supported. + Please upgrade to stable-diffusion-webui >= 1.1.0. + or you can use ADetailer v23.10.1 (https://github.com/Bing-su/adetailer/archive/refs/tags/v23.10.1.zip) + """ + raise RuntimeError(dedent(msg)) from e ext_path = Path(extensions_dir) ext_builtin_path = Path(extensions_builtin_dir) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index 3b3aac4..ffe7970 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -126,14 +126,6 @@ class AfterDetailerScript(scripts.Script): self.controlnet_ext = None - if not hasattr(self, "before_process"): - msg = """ - [-] ADetailer: `stable-diffusion-webui < 1.4.0` is no longer supported. - Please upgrade to stable-diffusion-webui >= 1.4.0. - or you can use ADetailer v23.10.1. - """ - raise RuntimeError(dedent(msg)) - def __repr__(self): return f"{self.__class__.__name__}(version={__version__})" @@ -755,7 +747,8 @@ class AfterDetailerScript(scripts.Script): if self.need_call_process(p): with preseve_prompts(p): copy_p = copy(p) - p.scripts.before_process(copy_p) + if hasattr(p.scripts, "before_process"): + p.scripts.before_process(copy_p) p.scripts.process(copy_p) self.write_params_txt(p)