From d06bd99370ab9250fdb963a7ce764f19c5620d59 Mon Sep 17 00:00:00 2001 From: Dowon Date: Sun, 5 Nov 2023 13:19:46 +0900 Subject: [PATCH 1/6] feat: add `negpip` to default scripts --- scripts/!adetailer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index f587476..480c37d 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -58,7 +58,7 @@ model_mapping = get_models( adetailer_dir, extra_dir=extra_models_dir, huggingface=not no_huggingface ) txt2img_submit_button = img2img_submit_button = None -SCRIPT_DEFAULT = "dynamic_prompting,dynamic_thresholding,wildcard_recursive,wildcards,lora_block_weight" +SCRIPT_DEFAULT = "dynamic_prompting,dynamic_thresholding,wildcard_recursive,wildcards,lora_block_weight,negpip" if ( not adetailer_dir.exists() From 90a7ee4bda366628cb28e623ef199b563af84d78 Mon Sep 17 00:00:00 2001 From: Dowon Date: Tue, 14 Nov 2023 20:10:04 +0900 Subject: [PATCH 2/6] fix: skip i2i init image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2스텝 이상일 때 제대로 적용되지 않는 문제 --- scripts/!adetailer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index 480c37d..cfded5b 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -651,7 +651,6 @@ class AfterDetailerScript(scripts.Script): i = self.get_i(p) - pp.image = self.get_i2i_init_image(p, pp) i2i = self.get_i2i_p(p, args, pp.image) seed, subseed = self.get_seed(p) ad_prompts, ad_negatives = self.get_prompt(p, args) @@ -729,6 +728,7 @@ class AfterDetailerScript(scripts.Script): if getattr(p, "_ad_disabled", False) or not self.is_ad_enabled(*args_): return + pp.image = self.get_i2i_init_image(p, pp) init_image = copy(pp.image) arg_list = self.get_args(p, *args_) From a019c6f3a56dba05d1a81c1a70ffc5bb32e214f4 Mon Sep 17 00:00:00 2001 From: Dowon Date: Tue, 14 Nov 2023 20:20:58 +0900 Subject: [PATCH 3/6] chore: update deps --- .pre-commit-config.yaml | 4 ++-- install.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1b304b..9226215 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,12 +8,12 @@ repos: - id: mixed-line-ending - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.3" + rev: v0.1.5 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.10.1 + rev: 23.11.0 hooks: - id: black diff --git a/install.py b/install.py index e15f9d3..93433cf 100644 --- a/install.py +++ b/install.py @@ -44,8 +44,8 @@ def run_pip(*args): def install(): deps = [ # requirements - ("ultralytics", "8.0.198", None), - ("mediapipe", "0.10.7", None), + ("ultralytics", "8.0.209", None), + ("mediapipe", "0.10.8", None), ("rich", "13.0.0", None), # mediapipe ("protobuf", "3.20", "3.9999"), From cd0f8be86eb1fbb727a11250ccb5ddc40424e85a Mon Sep 17 00:00:00 2001 From: Dowon Date: Thu, 16 Nov 2023 00:39:08 +0900 Subject: [PATCH 4/6] fix: add controlnet path to sys.path --- controlnet_ext/controlnet_ext.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/controlnet_ext/controlnet_ext.py b/controlnet_ext/controlnet_ext.py index 524106f..37c5a71 100644 --- a/controlnet_ext/controlnet_ext.py +++ b/controlnet_ext/controlnet_ext.py @@ -2,6 +2,7 @@ from __future__ import annotations import importlib import re +import sys from functools import lru_cache from pathlib import Path from textwrap import dedent @@ -34,6 +35,13 @@ for extension in extensions.active(): cn_base_path = ".".join(controlnet_path.parts[-2:]) break +if controlnet_path is not None: + sd_webui_controlnet_path = controlnet_path.resolve().parent + if sd_webui_controlnet_path.stem in ("extensions", "extensions-builtin"): + target_path = str(sd_webui_controlnet_path.parent) + if target_path not in sys.path: + sys.path.append(target_path) + cn_model_module = { "inpaint": "inpaint_global_harmonious", "scribble": "t2ia_sketch_pidi", From fa68a4ce810b1f2948574c6558f125fa551c211e Mon Sep 17 00:00:00 2001 From: Dowon Date: Thu, 16 Nov 2023 00:58:03 +0900 Subject: [PATCH 5/6] fix: ensure pp.image is PIL RGB Image --- scripts/!adetailer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index cfded5b..fc0bc2c 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -14,7 +14,9 @@ from typing import Any, NamedTuple import gradio as gr import torch +from PIL import Image from rich import print +from torchvision.transforms.functional import to_pil_image import modules from adetailer import ( @@ -571,7 +573,9 @@ class AfterDetailerScript(scripts.Script): @staticmethod def ensure_rgb_image(image: Any): - if hasattr(image, "mode") and image.mode != "RGB": + if not isinstance(image, Image.Image): + image = to_pil_image(image) + if image.mode != "RGB": image = image.convert("RGB") return image @@ -729,6 +733,7 @@ class AfterDetailerScript(scripts.Script): return pp.image = self.get_i2i_init_image(p, pp) + pp.image = self.ensure_rgb_image(pp.image) init_image = copy(pp.image) arg_list = self.get_args(p, *args_) From 9b00b1ace08dfa99ab55b895bba6592b54dfbe77 Mon Sep 17 00:00:00 2001 From: Dowon Date: Sun, 19 Nov 2023 23:07:15 +0900 Subject: [PATCH 6/6] chore: v23.11.1 --- CHANGELOG.md | 9 +++++++++ adetailer/__version__.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9baf80..18e8bae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 2023-11-19 + +- v23.11.1 +- 기본 스크립트 목록에 negpip 추가 + - 기존에 설치한 사람에게 소급적용되지는 않음 +- skip img2img 옵션이 2스텝 이상일 때, 제대로 적용되지 않는 문제 수정 +- SD.Next에서 이미지가 np.ndarray로 입력되는 경우 수정 +- 컨트롤넷 경로를 sys.path에 추가하여 --data-dir등을 지정한 경우에도 임포트 에러가 일어나지 않게 함. + ## 2023-10-30 - v23.11.0 diff --git a/adetailer/__version__.py b/adetailer/__version__.py index 0f1f31a..660df99 100644 --- a/adetailer/__version__.py +++ b/adetailer/__version__.py @@ -1 +1 @@ -__version__ = "23.11.0" +__version__ = "23.11.1"