Bing-su/adetailer
1
0
Fork 0
mirror of https://github.com/Bing-su/adetailer.git synced 2026-04-29 18:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add elem_id

Browse Source
This commit is contained in:
Bingsu
2023-05-20 22:46:41 +09:00
parent b8b7daeca9
commit f2a460d6fd
1 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
adetailer/ui.py
View File

@@ -39,6 +39,12 @@ def on_generate_click(state: dict, *values: Any):
return state return state
def elem_id(item_id: str, n: int, is_img2img: bool) -> str:
tap = "img2img" if is_img2img else "txt2img"
suf = suffix(n, "_")
return f"script_{tap}_adetailer_{item_id}{suf}"
def adui( def adui(
num_models: int, num_models: int,
is_img2img: bool, is_img2img: bool,
@@ -48,13 +54,15 @@ def adui(
): ):
states = [] states = []
infotext_fields = [] infotext_fields = []
eid = partial(elem_id, n=0, is_img2img=is_img2img)
with gr.Accordion(AFTER_DETAILER, open=False, elem_id="AD_main_acc"): with gr.Accordion(AFTER_DETAILER, open=False, elem_id=eid("ad_main_accordion")):
with gr.Row(): with gr.Row():
ad_enable = gr.Checkbox( ad_enable = gr.Checkbox(
label="Enable ADetailer", label="Enable ADetailer",
value=False, value=False,
visible=True, visible=True,
elem_id=eid("ad_enable"),
) )
infotext_fields.append((ad_enable, AD_ENABLE.name)) infotext_fields.append((ad_enable, AD_ENABLE.name))
@@ -87,6 +95,7 @@ def one_ui_group(
): ):
w = Widgets() w = Widgets()
state = gr.State({}) state = gr.State({})
eid = partial(elem_id, n=n, is_img2img=is_img2img)
with gr.Row(): with gr.Row():
model_choices = model_list if n == 0 else ["None"] + model_list model_choices = model_list if n == 0 else ["None"] + model_list
@@ -97,34 +106,45 @@ def one_ui_group(
value=model_choices[0], value=model_choices[0],
visible=True, visible=True,
type="value", type="value",
elem_id=eid("ad_model"),
) )
with gr.Group(): with gr.Group():
with gr.Row(elem_id="AD_toprow_prompt" + suffix(n, "_")): with gr.Row(elem_id=eid("ad_toprow_prompt")):
w.ad_prompt = gr.Textbox( w.ad_prompt = gr.Textbox(
label="ad_prompt" + suffix(n), label="ad_prompt" + suffix(n),
show_label=False, show_label=False,
lines=3, lines=3,
placeholder="ADetailer prompt" + suffix(n), placeholder="ADetailer prompt" + suffix(n),
elem_id="AD_prompt" + suffix(n, "_"), elem_id=eid("ad_prompt"),
) )
with gr.Row(elem_id="AD_toprow_negative_prompt" + suffix(n, "_")): with gr.Row(elem_id=eid("ad_toprow_negative_prompt")):
w.ad_negative_prompt = gr.Textbox( w.ad_negative_prompt = gr.Textbox(
label="ad_negative_prompt" + suffix(n), label="ad_negative_prompt" + suffix(n),
show_label=False, show_label=False,
lines=2, lines=2,
placeholder="ADetailer negative prompt" + suffix(n), placeholder="ADetailer negative prompt" + suffix(n),
elem_id="AD_negative_prompt" + suffix(n, "_"), elem_id=eid("ad_negative_prompt"),
) )
with gr.Group(): with gr.Group():
with gr.Accordion("Detection", open=False): with gr.Accordion(
detection(w, n) "Detection", open=False, elem_id=eid("ad_detection_accordion")
with gr.Accordion("Mask Preprocessing", open=False): ):
mask_preprocessing(w, n) detection(w, n, is_img2img)
with gr.Accordion("Inpainting", open=False):
inpainting(w, n) with gr.Accordion(
"Mask Preprocessing",
open=False,
elem_id=eid("ad_mask_preprocessing_accordion"),
):
mask_preprocessing(w, n, is_img2img)
with gr.Accordion(
"Inpainting", open=False, elem_id=eid("ad_inpainting_accordion")
):
inpainting(w, n, is_img2img)
with gr.Group(), gr.Row(variant="panel"): with gr.Group(), gr.Row(variant="panel"):
cn_inpaint_models = ["None"] + get_cn_inpaint_models() cn_inpaint_models = ["None"] + get_cn_inpaint_models()
@@ -136,6 +156,7 @@ def one_ui_group(
visible=True, visible=True,
type="value", type="value",
interactive=controlnet_exists, interactive=controlnet_exists,
elem_id=eid("ad_controlnet_model"),
) )
w.ad_controlnet_weight = gr.Slider( w.ad_controlnet_weight = gr.Slider(
@@ -146,6 +167,7 @@ def one_ui_group(
value=1.0, value=1.0,
visible=True, visible=True,
interactive=controlnet_exists, interactive=controlnet_exists,
elem_id=eid("ad_controlnet_weight"),
) )
for attr in ALL_ARGS.attrs: for attr in ALL_ARGS.attrs:
@@ -166,7 +188,9 @@ def one_ui_group(
return state, infotext_fields return state, infotext_fields
def detection(w: Widgets, n: int): def detection(w: Widgets, n: int, is_img2img: bool):
eid = partial(elem_id, n=n, is_img2img=is_img2img)
with gr.Row(): with gr.Row():
with gr.Column(): with gr.Column():
w.ad_conf = gr.Slider( w.ad_conf = gr.Slider(
@@ -176,6 +200,7 @@ def detection(w: Widgets, n: int):
step=1, step=1,
value=30, value=30,
visible=True, visible=True,
elem_id=eid("ad_conf"),
) )
with gr.Column(variant="compact"): with gr.Column(variant="compact"):
@@ -186,6 +211,7 @@ def detection(w: Widgets, n: int):
step=0.001, step=0.001,
value=0.0, value=0.0,
visible=True, visible=True,
elem_id=eid("ad_mask_min_ratio"),
) )
w.ad_mask_max_ratio = gr.Slider( w.ad_mask_max_ratio = gr.Slider(
label="Mask max area ratio" + suffix(n), label="Mask max area ratio" + suffix(n),
@@ -194,10 +220,13 @@ def detection(w: Widgets, n: int):
step=0.001, step=0.001,
value=1.0, value=1.0,
visible=True, visible=True,
elem_id=eid("ad_mask_max_ratio"),
) )
def mask_preprocessing(w: Widgets, n: int): def mask_preprocessing(w: Widgets, n: int, is_img2img: bool):
eid = partial(elem_id, n=n, is_img2img=is_img2img)
with gr.Group(): with gr.Group():
with gr.Row(): with gr.Row():
with gr.Column(variant="compact"): with gr.Column(variant="compact"):
@@ -208,6 +237,7 @@ def mask_preprocessing(w: Widgets, n: int):
step=1, step=1,
value=0, value=0,
visible=True, visible=True,
elem_id=eid("ad_x_offset"),
) )
w.ad_y_offset = gr.Slider( w.ad_y_offset = gr.Slider(
label="Mask y(↑) offset" + suffix(n), label="Mask y(↑) offset" + suffix(n),
@@ -216,6 +246,7 @@ def mask_preprocessing(w: Widgets, n: int):
step=1, step=1,
value=0, value=0,
visible=True, visible=True,
elem_id=eid("ad_y_offset"),
) )
with gr.Column(variant="compact"): with gr.Column(variant="compact"):
@@ -226,6 +257,7 @@ def mask_preprocessing(w: Widgets, n: int):
step=4, step=4,
value=32, value=32,
visible=True, visible=True,
elem_id=eid("ad_dilate_erode"),
) )
with gr.Row(): with gr.Row():
@@ -233,10 +265,13 @@ def mask_preprocessing(w: Widgets, n: int):
label="Mask merge mode" + suffix(n), label="Mask merge mode" + suffix(n),
choices=MASK_MERGE_INVERT, choices=MASK_MERGE_INVERT,
value="None", value="None",
elem_id=eid("ad_mask_merge_invert"),
) )
def inpainting(w: Widgets, n: int): def inpainting(w: Widgets, n: int, is_img2img: bool):
eid = partial(elem_id, n=n, is_img2img=is_img2img)
with gr.Group(): with gr.Group():
with gr.Row(): with gr.Row():
w.ad_mask_blur = gr.Slider( w.ad_mask_blur = gr.Slider(
@@ -246,6 +281,7 @@ def inpainting(w: Widgets, n: int):
step=1, step=1,
value=4, value=4,
visible=True, visible=True,
elem_id=eid("ad_mask_blur"),
) )
w.ad_denoising_strength = gr.Slider( w.ad_denoising_strength = gr.Slider(
@@ -255,6 +291,7 @@ def inpainting(w: Widgets, n: int):
step=0.01, step=0.01,
value=0.4, value=0.4,
visible=True, visible=True,
elem_id=eid("ad_denoising_strength"),
) )
with gr.Row(): with gr.Row():
@@ -263,6 +300,7 @@ def inpainting(w: Widgets, n: int):
label="Inpaint at full resolution " + suffix(n), label="Inpaint at full resolution " + suffix(n),
value=True, value=True,
visible=True, visible=True,
elem_id=eid("ad_inpaint_full_res"),
) )
w.ad_inpaint_full_res_padding = gr.Slider( w.ad_inpaint_full_res_padding = gr.Slider(
label="Inpaint at full resolution padding, pixels " + suffix(n), label="Inpaint at full resolution padding, pixels " + suffix(n),
@@ -271,6 +309,7 @@ def inpainting(w: Widgets, n: int):
step=4, step=4,
value=0, value=0,
visible=True, visible=True,
elem_id=eid("ad_inpaint_full_res_padding"),
) )
w.ad_inpaint_full_res.change( w.ad_inpaint_full_res.change(
@@ -285,6 +324,7 @@ def inpainting(w: Widgets, n: int):
label="Use separate width/height" + suffix(n), label="Use separate width/height" + suffix(n),
value=False, value=False,
visible=True, visible=True,
elem_id=eid("ad_use_inpaint_width_height"),
) )
w.ad_inpaint_width = gr.Slider( w.ad_inpaint_width = gr.Slider(
@@ -294,6 +334,7 @@ def inpainting(w: Widgets, n: int):
step=4, step=4,
value=512, value=512,
visible=True, visible=True,
elem_id=eid("ad_inpaint_width"),
) )
w.ad_inpaint_height = gr.Slider( w.ad_inpaint_height = gr.Slider(
@@ -303,6 +344,7 @@ def inpainting(w: Widgets, n: int):
step=4, step=4,
value=512, value=512,
visible=True, visible=True,
elem_id=eid("ad_inpaint_height"),
) )
w.ad_use_inpaint_width_height.change( w.ad_use_inpaint_width_height.change(
@@ -318,6 +360,7 @@ def inpainting(w: Widgets, n: int):
label="Use separate steps" + suffix(n), label="Use separate steps" + suffix(n),
value=False, value=False,
visible=True, visible=True,
elem_id=eid("ad_use_steps"),
) )
w.ad_steps = gr.Slider( w.ad_steps = gr.Slider(
@@ -327,6 +370,7 @@ def inpainting(w: Widgets, n: int):
step=1, step=1,
value=28, value=28,
visible=True, visible=True,
elem_id=eid("ad_steps"),
) )
w.ad_use_steps.change( w.ad_use_steps.change(
@@ -341,6 +385,7 @@ def inpainting(w: Widgets, n: int):
label="Use separate CFG scale" + suffix(n), label="Use separate CFG scale" + suffix(n),
value=False, value=False,
visible=True, visible=True,
elem_id=eid("ad_use_cfg_scale"),
) )
w.ad_cfg_scale = gr.Slider( w.ad_cfg_scale = gr.Slider(
@@ -350,6 +395,7 @@ def inpainting(w: Widgets, n: int):
step=0.5, step=0.5,
value=7.0, value=7.0,
visible=True, visible=True,
elem_id=eid("ad_cfg_scale"),
) )
w.ad_use_cfg_scale.change( w.ad_use_cfg_scale.change(
@@ -363,4 +409,5 @@ def inpainting(w: Widgets, n: int):
w.ad_restore_face = gr.Checkbox( w.ad_restore_face = gr.Checkbox(
label="Restore faces after ADetailer" + suffix(n), label="Restore faces after ADetailer" + suffix(n),
value=False, value=False,
elem_id=eid("ad_restore_face"),
) )