From 20b41b7be708a501fbc7e10dceebababfd48ffda Mon Sep 17 00:00:00 2001 From: Bernard Maltais Date: Tue, 27 Sep 2022 15:21:25 -0400 Subject: (feat): Rework Checkpoint Merger UI for better clarity - Rename variables to better align with field input - Improve merged checkpoint output file name --- modules/ui.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'modules/ui.py') diff --git a/modules/ui.py b/modules/ui.py index e96109c9..e7382ca8 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -859,10 +859,11 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger): with gr.Column(variant='panel'): gr.HTML(value="

A merger of the two checkpoints will be generated in your /models directory.

") - modelname_0 = gr.Textbox(elem_id="modelmerger_modelname_0", label="Model Name (to)") - modelname_1 = gr.Textbox(elem_id="modelmerger_modelname_1", label="Model Name (from)") - interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid"], value="Weighted Sum", label="Interpolation Method") + with gr.Row(): + from_model_name = gr.Textbox(elem_id="modelmerger_from_model_name", label="Model Name (from)") + to_model_name = gr.Textbox(elem_id="modelmerger_to_model_name", label="Model Name (to)") interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3) + interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid"], value="Weighted Sum", label="Interpolation Method") submit = gr.Button(elem_id="modelmerger_merge", label="Merge", variant='primary') with gr.Column(variant='panel'): @@ -871,8 +872,8 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger): submit.click( fn=run_modelmerger, inputs=[ - modelname_0, - modelname_1, + from_model_name, + to_model_name, interp_method, interp_amount ], -- cgit v1.2.1 From d641af6a7d6f1edb7dbc584f72f95e036d830c85 Mon Sep 17 00:00:00 2001 From: Bernard Maltais Date: Tue, 27 Sep 2022 21:09:28 -0400 Subject: - Add gradio dropdown list to select checkpoints - Update checkpoint model fields labels --- modules/ui.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/ui.py') diff --git a/modules/ui.py b/modules/ui.py index e7382ca8..4a5326f7 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -860,8 +860,9 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger): gr.HTML(value="

A merger of the two checkpoints will be generated in your /models directory.

") with gr.Row(): - from_model_name = gr.Textbox(elem_id="modelmerger_from_model_name", label="Model Name (from)") - to_model_name = gr.Textbox(elem_id="modelmerger_to_model_name", label="Model Name (to)") + ckpt_name_list = [x.model_name for x in modules.sd_models.checkpoints_list.values()] + primary_model_name = gr.Dropdown(ckpt_name_list, elem_id="modelmerger_primary_model_name", label="Primary Model Name") + secondary_model_name = gr.Dropdown(ckpt_name_list, elem_id="modelmerger_secondary_model_name", label="Secondary Model Name") interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3) interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid"], value="Weighted Sum", label="Interpolation Method") submit = gr.Button(elem_id="modelmerger_merge", label="Merge", variant='primary') @@ -872,8 +873,8 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger): submit.click( fn=run_modelmerger, inputs=[ - from_model_name, - to_model_name, + primary_model_name, + secondary_model_name, interp_method, interp_amount ], -- cgit v1.2.1 From 4c9c2a67028097dd41a46d6b6fa52d7831e359bf Mon Sep 17 00:00:00 2001 From: Bernard Maltais Date: Tue, 27 Sep 2022 22:16:25 -0400 Subject: -Fix interp_amount rounding in filename -Sort list of checkpoints in list --- modules/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/ui.py') diff --git a/modules/ui.py b/modules/ui.py index 4a5326f7..7db8edbd 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -860,7 +860,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger): gr.HTML(value="

A merger of the two checkpoints will be generated in your /models directory.

") with gr.Row(): - ckpt_name_list = [x.model_name for x in modules.sd_models.checkpoints_list.values()] + ckpt_name_list = sorted([x.model_name for x in modules.sd_models.checkpoints_list.values()]) primary_model_name = gr.Dropdown(ckpt_name_list, elem_id="modelmerger_primary_model_name", label="Primary Model Name") secondary_model_name = gr.Dropdown(ckpt_name_list, elem_id="modelmerger_secondary_model_name", label="Secondary Model Name") interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3) -- cgit v1.2.1