Bing-su/adetailer
1
0
Fork 0
mirror of https://github.com/Bing-su/adetailer.git synced 2026-05-05 21:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: function -> list

Browse Source
This commit is contained in:
Bingsu
2023-09-10 22:07:02 +09:00
parent 64ea03e571
commit 645c67e3ff
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adetailer/ui.py
View File

@@ -29,8 +29,8 @@ class WebuiInfo:
sampler_names: list[str] sampler_names: list[str]
t2i_button: gr.Button t2i_button: gr.Button
i2i_button: gr.Button i2i_button: gr.Button
checkpoints_list: Callable[..., list[str]] checkpoints_list: list[str]
vae_list: Callable[..., list[str]] vae_list: list[str]
def gr_interactive(value: bool = True): def gr_interactive(value: bool = True):
@@ -427,11 +427,7 @@ def inpainting(w: Widgets, n: int, is_img2img: bool, webui_info: WebuiInfo):
elem_id=eid("ad_use_checkpoint"), elem_id=eid("ad_use_checkpoint"),
) )
ckpts = ["Use same checkpoint"] ckpts = ["Use same checkpoint", *webui_info.checkpoints_list]
try:
ckpts.extend(webui_info.checkpoints_list(use_short=True))
except TypeError:
ckpts.extend(webui_info.checkpoints_list())
w.ad_checkpoint = gr.Dropdown( w.ad_checkpoint = gr.Dropdown(
label="ADetailer checkpoint" + suffix(n), label="ADetailer checkpoint" + suffix(n),
@@ -449,7 +445,7 @@ def inpainting(w: Widgets, n: int, is_img2img: bool, webui_info: WebuiInfo):
elem_id=eid("ad_use_vae"), elem_id=eid("ad_use_vae"),
) )
vaes = ["Use same VAE", *webui_info.vae_list()] vaes = ["Use same VAE", *webui_info.vae_list]
w.ad_vae = gr.Dropdown( w.ad_vae = gr.Dropdown(
label="ADetailer VAE" + suffix(n), label="ADetailer VAE" + suffix(n),

11
scripts/!adetailer.py
View File

@@ -120,13 +120,20 @@ class AfterDetailerScript(scripts.Script):
num_models = opts.data.get("ad_max_models", 2) num_models = opts.data.get("ad_max_models", 2)
ad_model_list = list(model_mapping.keys()) ad_model_list = list(model_mapping.keys())
sampler_names = [sampler.name for sampler in all_samplers] sampler_names = [sampler.name for sampler in all_samplers]
try:
checkpoint_list = modules.sd_models.checkpoint_tiles(use_shorts=True)
except TypeError:
checkpoint_list = modules.sd_models.checkpoint_tiles()
vae_list = modules.shared_items.sd_vae_items()
webui_info = WebuiInfo( webui_info = WebuiInfo(
ad_model_list=ad_model_list, ad_model_list=ad_model_list,
sampler_names=sampler_names, sampler_names=sampler_names,
t2i_button=txt2img_submit_button, t2i_button=txt2img_submit_button,
i2i_button=img2img_submit_button, i2i_button=img2img_submit_button,
checkpoints_list=modules.sd_models.checkpoint_tiles, checkpoints_list=checkpoint_list,
vae_list=modules.shared_items.sd_vae_items, vae_list=vae_list,
) )
components, infotext_fields = adui(num_models, is_img2img, webui_info) components, infotext_fields = adui(num_models, is_img2img, webui_info)