Update app.py

app.py

@@ -73,6 +73,8 @@ def control_ui():
                     use_inp = gr.Checkbox(label='启用', value=False)
                     overlay = gr.Checkbox(label='覆盖原图', value=True)
                 inp_img = gr.ImageEditor(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil", eraser=False, transforms=None, brush="imagemask")
+                inp_str = gr.Slider(label='重绘强度', value=0.7, minimum=0, maximum=0.99, step=0.01)
+                reuse_img_inp = gr.Button(value='使用上一次生成的图片')
         with gr.Column():
             gr.Textbox(value=get_count, label='Usage count', every=10)
             save = gr.Checkbox(value=False, label='Always save all generated images', visible=False)
@@ -81,17 +83,17 @@ def control_ui():
     rand_seed.click(fn=lambda: -1, inputs=None, outputs=seed)
     width.change(lambda w, h: h if w*h<=1024*1024 else (1024*1024//w//64)*64, [width, height], height)
     height.change(lambda w, h: w if w*h<=1024*1024 else (1024*1024//h//64)*64, [width, height], width)
-    return gen_btn,[prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_image, info_extract, ref_str, inp_img, overlay], [save, rand_seed, reuse_seed, reuse_img_vibe, use_inp]
+    return gen_btn,[prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_image, info_extract, ref_str, inp_img, overlay, inp_str], [save, rand_seed, reuse_seed, reuse_img_vibe, use_inp, reuse_img_inp]
 
 
-def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_image, info_extract, ref_str, inp_img, overlay, save, use_inp):
+def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps, sampler, scheduler, smea, dyn, dyn_threshold, cfg_rescale, ref_image, info_extract, ref_str, inp_img, overlay, inp_str, save, use_inp):
     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_image, info_extract, ref_str,
-        inp_img, overlay, use_inp
+        inp_img, overlay, use_inp, inp_str
     )
     if not isinstance(img_data, bytes):
         return None, payload
@@ -103,7 +105,7 @@ def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps
 
 def preview_ui():
     with gr.Blocks(css='#preview_image { height: 100%;}') as page:
-        image = gr.Image(elem_id='preview_image', interactive=False)
+        image = gr.Image(elem_id='preview_image', interactive=False, type='pil')
         info = gr.JSON(value={}, label="Submitted Payload")
     return image, info
 
@@ -118,6 +120,7 @@ def main_ui():
     gen_btn.click(generate, paras + [others[0], others[4]], [image, info])
     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[14])
+    others[5].click(lambda i: gr.ImageEditor(value=i), inputs=image, outputs=paras[17])
     return page, paras[:14]