adaptive scheduler and new option

app.py

@@ -24,8 +24,18 @@ def get_count():
         today_count = 0
     return today_count
 
+def change_schedule(sampler):
+    if sampler == "ddim_v3":
+        return gr.Dropdown(value="native", interactive=False)
+    elif sampler == "k_euler_ancestral":
+        return gr.Dropdown(value="native", interactive=True)
+    elif sampler == "k_dpmpp_2m":
+        return gr.Dropdown(value="exponential", interactive=True)
+    else:
+        return gr.Dropdown(value="karras", interactive=True)
+    
 def control_ui():
-    prompt = gr.TextArea(value="{breast expansion},{gigantic breasts},[artist:ningen_mame],artist:ciloranko,[artist:sho_(sho_lwlw)],[artist:foifoi (marfoyfoyfoy)],1girl,skinny,narrow waist,loli,", elem_id='txt2img_prompt', label="提示词", lines=3)
+    prompt = gr.TextArea(value="{breast expansion},{gigantic breasts},[artist:ningen_mame],artist:ciloranko,[artist:sho_(sho_lwlw)],[artist:foifoi (marfoyfoyfoy)],1girl,skinny,narrow waist,loli,child,solo,", elem_id='txt2img_prompt', label="提示词", lines=3)
     quality_tags = gr.TextArea(
         elem_id='txt2img_qua_prompt', label="质量词", lines=1,
         value=client_config['default_quality'],
@@ -40,14 +50,14 @@ def control_ui():
     with gr.Row():
         sampler = gr.Dropdown(
             choices=[
-                "k_euler", "k_euler_ancestral", "k_dpmpp_2s_ancestral", 
+                "k_euler", "k_euler_ancestral", "k_dpmpp_2s_ancestral", "k_dpmpp_2m_sde",
                 "k_dpmpp_2m", "k_dpmpp_sde", "ddim_v3"
             ],
             value="k_euler",
             label="采样器",
             interactive=True
         )
-        scale = gr.Slider(label="CFG Scale", value=5.0, minimum=1, maximum=10, step=0.1)
+        scale = gr.Slider(label="CFG Scale", value=5.0, minimum=0, maximum=10, step=0.1)
         steps = gr.Slider(label="步数", value=28, minimum=1, maximum=50, step=1)
     with gr.Row():
         seed = gr.Number(label="种子", value=-1, step=1, maximum=2**32-1, minimum=-1, scale=3)
@@ -100,32 +110,34 @@ def control_ui():
                     choices=[
                         "native", "karras", "exponential", "polyexponential"
                     ],
-                    value="native",
+                    value="karras",
                     label="Scheduler",
                     interactive=True
                 )
                 with gr.Row():
                     smea = gr.Checkbox(False, label="SMEA")
                     dyn = gr.Checkbox(False, label="SMEA DYN")
+                    variety = gr.Checkbox(False, label="Variety+")
                 with gr.Row():
-                    dyn_threshold = gr.Checkbox(False, label="Dynamic Thresholding")
+                    dyn_threshold = gr.Checkbox(False, label="Decrisp")
                     cfg_rescale = gr.Slider(0, 1, 0, step=0.01, label="CFG rescale")
         with gr.Column():
             save = gr.Checkbox(value=True, label='云端保存图片')
     gen_btn = gr.Button(value="生成", variant="primary")
     stop_btn = gr.Button(value="取消", variant="stop", visible=False)
+    sampler.change(change_schedule, sampler, scheduler)
     rand_seed.click(fn=lambda: -1, inputs=None, outputs=seed)
     i2i.select(lambda: 'i2i', inputs=None, outputs=selection)
     inp.select(lambda: 'inp', inputs=None, outputs=selection)
-    return gen_btn, stop_btn, [prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_images, info_extracts, ref_strs, i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection], [save, rand_seed, reuse_seed, reuse_img_i2i, reuse_img_inp, vibe_tab, i2i_tab]
+    return gen_btn, stop_btn, [prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety, ref_images, info_extracts, ref_strs, i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection], [save, rand_seed, reuse_seed, reuse_img_i2i, reuse_img_inp, vibe_tab, i2i_tab]
 
-def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_images, info_extracts, ref_strs, i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection):
+def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety, ref_images, info_extracts, ref_strs, i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection):
     global today_count
     set_token(os.environ.get('token'))
     img_data, payload = generate_novelai_image(
         f"{prompt}, {quality_tags}", neg_prompt, seed, scale, 
         width, height, steps, sampler, scheduler, 
-        smea, dyn, dyn_threshold, cfg_rescale, ref_images, info_extracts, ref_strs,
+        smea, dyn, dyn_threshold, cfg_rescale, variety, ref_images, info_extracts, ref_strs,
         i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection
     )
     if not isinstance(img_data, bytes):
@@ -176,7 +188,7 @@ def main_ui():
                 gen_btn, stop_btn, paras, others = control_ui()
             with gr.Column():
                 image, info, send_dtool = preview_ui()
-    cost_list = paras[5:8] + paras[10:12] + paras[17:19] + paras[21:23]
+    cost_list = paras[5:8] + paras[10:12] + paras[18:20] + paras[22:24]
     for component in cost_list:
         component.change(update_btn_cost, inputs=cost_list, outputs=gen_btn)
     gen = gen_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True)), inputs=None, outputs=[gen_btn, stop_btn]).then(
@@ -184,8 +196,8 @@ def main_ui():
                         rename_save_img, inputs=[image, info, others[0]], outputs=image, trigger_mode="once").then(
                         lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn])
     others[2].click(lambda o, s: o if len(s) == 0 else s['parameters']['seed'], inputs=[paras[3], info], outputs=paras[3])
-    others[3].click(lambda i: i, inputs=image, outputs=paras[17])
-    others[4].click(lambda i: gr.ImageEditor(value=i), inputs=image, outputs=paras[21])
+    others[3].click(lambda i: i, inputs=image, outputs=paras[18])
+    others[4].click(lambda i: gr.ImageEditor(value=i), inputs=image, outputs=paras[22])
     stop_btn.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[gen_btn, stop_btn], cancels=[gen])
     return image, paras, others, send_dtool
 
@@ -255,16 +267,16 @@ def ui():
                 loadTagComplete.click(fn=None, js="() => {document.getElementById('client_ui_main-button').click();run();}")
                 clearTagCache = gr.Button(value="清除tag补全缓存")
                 clearTagCache.click(fn=None, js="() => {localStorage.clear();}")
-            send_and_jump(png2main, send_paras, [png_items] + paras[:14], paras[:14], "client_ui_main", read_image)
-            send_and_jump(gal2main, send_paras, [gal_items] + paras[:14], paras[:14], "client_ui_main", gal_items)
+            send_and_jump(png2main, send_paras, [png_items] + paras[:15], paras[:15], "client_ui_main", read_image)
+            send_and_jump(gal2main, send_paras, [gal_items] + paras[:15], paras[:15], "client_ui_main", gal_items)
             from_t2i.click(lambda x: x, inputs=image, outputs=in_image)
-            send_jump_select(send_i2i, send_outputs, [out_image, d_index], paras[17], "client_ui_main", others[6], out_image, "i2i_block")
-            send_jump_select(send_inp, send_outputs, [out_image, d_index], paras[21], "client_ui_main", others[6], out_image, "inp_block")
-            send_jump_select(send_vib, (lambda l, i: l if i == -1 else [l[i]]), [out_image, d_index], paras[14], "client_ui_main", others[5], out_image)
+            send_jump_select(send_i2i, send_outputs, [out_image, d_index], paras[18], "client_ui_main", others[6], out_image, "i2i_block")
+            send_jump_select(send_inp, send_outputs, [out_image, d_index], paras[22], "client_ui_main", others[6], out_image, "inp_block")
+            send_jump_select(send_vib, (lambda l, i: l if i == -1 else [l[i]]), [out_image, d_index], paras[15], "client_ui_main", others[5], out_image)
             send_and_jump(send_dtool, (lambda x: x), image, in_image, "client_ui_dtool", image)
-            send_jump_select(history2i2i, send_outputs, [gallery, h_index], paras[17], "client_ui_main", others[6], gal_items, "i2i_block")
-            send_jump_select(history2inp, send_outputs, [gallery, h_index], paras[21], "client_ui_main", others[6], gal_items, "inp_block")
-            send_jump_select(history2ref, (lambda l, i: None if i == -1 else [l[i]]), [gallery, h_index], paras[14], "client_ui_main", others[5], gal_items)
+            send_jump_select(history2i2i, send_outputs, [gallery, h_index], paras[18], "client_ui_main", others[6], gal_items, "i2i_block")
+            send_jump_select(history2inp, send_outputs, [gallery, h_index], paras[22], "client_ui_main", others[6], gal_items, "inp_block")
+            send_jump_select(history2ref, (lambda l, i: None if i == -1 else [l[i]]), [gallery, h_index], paras[15], "client_ui_main", others[5], gal_items)
             send_and_jump(history2dtl, send_outputs, [gallery, h_index], in_image, "client_ui_dtool", gal_items)
             read_image.change(read_info_from_image, inputs=read_image, outputs=[info, png_items])
     return website

pnginfo.py

@@ -103,13 +103,14 @@ Steps: {json_info["steps"]}, Sampler: {json_info['sampler']}, CFG scale: {json_i
 def send_paras(*args):
     if len(args[0]) == 0:
         return args[1:]
-    items, prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale = args
-    paras = [prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale]
-    for i, keys in enumerate([('prompt',), ('',), ('uc', 'negative prompt'), ('seed',), ('scale', 'cfg scale'), ('width', 'size-1'), ('height', 'size-2'), ('steps',), ('sampler',), ('noise_schedule',), ('sm',), ('sm_dyn',), ('dynamic_thresholding',), ('cfg_rescale',)]):
+    items, prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety = args
+    paras = [prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety]
+    for i, keys in enumerate([('prompt',), ('',), ('uc', 'negative prompt'), ('seed',), ('scale', 'cfg scale'), ('width', 'size-1'), ('height', 'size-2'), ('steps',), ('sampler',), ('noise_schedule',), ('sm',), ('sm_dyn',), ('dynamic_thresholding',), ('cfg_rescale',), ('skip_cfg_above_sigma',)]):
         for key in keys:
             if key in items:
                 paras[i] = items[key]
-    prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale = paras
+    prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety = paras
+    variety = (variety != None) if 'skip_cfg_above_sigma' in items else variety
     if prompt.endswith(', ' + quality_tags):
         prompt = prompt[:-(len(quality_tags) + 2)]
-    return prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale
+    return prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, variety

utils.py

@@ -57,6 +57,7 @@ def generate_novelai_image(
     dyn=False,
     dyn_threshold=False,
     cfg_rescale=0,
+    variety=None,
     ref_images=None,
     info_extracts=[],
     ref_strs=[],
@@ -98,6 +99,7 @@ def generate_novelai_image(
             "reference_information_extracted_multiple": info_extracts,
             "reference_strength_multiple": ref_strs,
             "seed": seed,
+            "skip_cfg_above_sigma": None if variety is None else 19,
             "sm": smea,
             "sm_dyn": dyn,
             "uncond_scale": 1,