From a479f60f405481a37c98c1b08534610de9e9e05b Mon Sep 17 00:00:00 2001
From: Dowon <ks2515@naver.com>
Date: Sun, 2 Jun 2024 13:00:19 +0900
Subject: [PATCH] feat(ui): use InputAccodian

---
 aaaaaa/conditional.py    |  9 ++++++++-
 aaaaaa/ui.py             | 20 +++++++++-----------
 adetailer/__init__.py    |  4 ++--
 adetailer/__version__.py |  2 +-
 scripts/!adetailer.py    |  6 +++---
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/aaaaaa/conditional.py b/aaaaaa/conditional.py
index 8e228fc..22afb10 100644
--- a/aaaaaa/conditional.py
+++ b/aaaaaa/conditional.py
@@ -1,9 +1,16 @@
 from __future__ import annotations
 
+msg = "[-] ADetailer: WebUI versions below 1.6.0 are not supported."
+
 try:
     from modules.processing import create_binary_mask  # noqa: F401
 except ImportError as e:
-    msg = "[-] ADetailer: WebUI versions below 1.6.0 are not supported."
+    raise RuntimeError(msg) from e
+
+
+try:
+    from modules.ui_components import InputAccordion  # noqa: F401
+except ImportError as e:
     raise RuntimeError(msg) from e
 
 
diff --git a/aaaaaa/ui.py b/aaaaaa/ui.py
index 6ba6d00..a678d82 100644
--- a/aaaaaa/ui.py
+++ b/aaaaaa/ui.py
@@ -7,7 +7,8 @@ from typing import Any
 
 import gradio as gr
 
-from adetailer import AFTER_DETAILER, __version__
+from aaaaaa.conditional import InputAccordion
+from adetailer import ADETAILER, __version__
 from adetailer.args import ALL_ARGS, MASK_MERGE_INVERT
 from controlnet_ext import controlnet_exists, controlnet_type, get_cn_models
 
@@ -123,17 +124,14 @@ def adui(
     infotext_fields = []
     eid = partial(elem_id, n=0, is_img2img=is_img2img)
 
-    with gr.Accordion(AFTER_DETAILER, open=False, elem_id=eid("ad_main_accordion")):
+    with InputAccordion(
+        value=False,
+        elem_id=eid("ad_main_accordion"),
+        label=ADETAILER,
+        visible=True,
+    ) as ad_enable:
         with gr.Row():
-            with gr.Column(scale=6):
-                ad_enable = gr.Checkbox(
-                    label="Enable ADetailer",
-                    value=False,
-                    visible=True,
-                    elem_id=eid("ad_enable"),
-                )
-
-            with gr.Column(scale=6):
+            with gr.Column(scale=8):
                 ad_skip_img2img = gr.Checkbox(
                     label="Skip img2img",
                     value=False,
diff --git a/adetailer/__init__.py b/adetailer/__init__.py
index ce38959..6e6721e 100644
--- a/adetailer/__init__.py
+++ b/adetailer/__init__.py
@@ -4,12 +4,12 @@ from .common import PredictOutput, get_models
 from .mediapipe import mediapipe_predict
 from .ultralytics import ultralytics_predict
 
-AFTER_DETAILER = "ADetailer"
+ADETAILER = "ADetailer"
 
 __all__ = [
     "__version__",
     "ADetailerArgs",
-    "AFTER_DETAILER",
+    "ADETAILER",
     "ALL_ARGS",
     "PredictOutput",
     "get_models",
diff --git a/adetailer/__version__.py b/adetailer/__version__.py
index 7b84e1b..7042fe0 100644
--- a/adetailer/__version__.py
+++ b/adetailer/__version__.py
@@ -1 +1 @@
-__version__ = "24.5.2-dev.0"
+__version__ = "24.6.0-dev.0"
diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py
index d8bda32..d4bbfc6 100644
--- a/scripts/!adetailer.py
+++ b/scripts/!adetailer.py
@@ -33,7 +33,7 @@ from aaaaaa.p_method import (
 from aaaaaa.traceback import rich_traceback
 from aaaaaa.ui import WebuiInfo, adui, ordinal, suffix
 from adetailer import (
-    AFTER_DETAILER,
+    ADETAILER,
     __version__,
     get_models,
     mediapipe_predict,
@@ -110,7 +110,7 @@ class AfterDetailerScript(scripts.Script):
         return f"{self.__class__.__name__}(version={__version__})"
 
     def title(self):
-        return AFTER_DETAILER
+        return ADETAILER
 
     def show(self, is_img2img):
         return scripts.AlwaysVisible
@@ -846,7 +846,7 @@ def on_after_component(component, **_kwargs):
 
 
 def on_ui_settings():
-    section = ("ADetailer", AFTER_DETAILER)
+    section = ("ADetailer", ADETAILER)
     shared.opts.add_option(
         "ad_max_models",
         shared.OptionInfo(