Update app.py

app.py

@@ -53,13 +53,20 @@ def control_ui():
                 info_extract = gr.Slider(label='参考信息提取', value=1, minimum=0, maximum=1, step=0.1)
                 ref_str = gr.Slider(label='参考强度', value=0.6, minimum=0, maximum=1, step=0.1)
                 reuse_img_vibe = gr.Button(value='使用上一次生成的图片')
-            with gr.Accordion('蒙版重绘', open=False):
+            with gr.Accordion('图生图', open=False):
+                i2i_image = gr.Image(label="上传图片", value=None, sources=["upload"], interactive=True, type="pil")
+                i2i_str = gr.Slider(label='去噪强度', value=0.7, minimum=0, maximum=0.99, step=0.01)
+                i2i_noise = gr.Slider(label='噪声', value=0, minimum=0, maximum=1, step=0.1)
+                reuse_img_i2i = gr.Button(value='使用上一次生成的图片')
+            '''
+            with gr.Accordion('局部重绘', open=False, visible=False):
                 with gr.Row():
                     use_inp = gr.Checkbox(label='启用', value=False)
                     overlay = gr.Checkbox(label='覆盖原图', value=True)
-                inp_img = gr.ImageEditor(label="上传图片", value=None, interactive=True, type="pil", eraser=False, transforms=None, brush='imagemask')
+                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.Row():
         with gr.Column():
             with gr.Accordion('Advanced Gen Setting', open=False):
@@ -84,17 +91,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, inp_str], [save, rand_seed, reuse_seed, reuse_img_vibe, use_inp, reuse_img_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, i2i_image, i2i_str, i2i_noise], [save, rand_seed, reuse_seed, reuse_img_vibe, reuse_img_i2i]
 
 
-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):
+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, i2i_image, i2i_str, i2i_noise, save):
     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_str
+        i2i_image, i2i_str, i2i_noise
     )
     if not isinstance(img_data, bytes):
         return None, payload
@@ -121,7 +128,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: i, inputs=image, outputs=paras[17])
+    others[4].click(lambda i: i, inputs=image, outputs=paras[17])
     return page, paras[:14]