Update app.py

app.py

@@ -19,7 +19,7 @@ def get_count():
     if now != today:
         today = now
         today_count = 0
-    return "今日已生成图片" + str(today_count) + "张"
+    return today_count
 
 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)
@@ -57,20 +57,17 @@ 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):
-                i2i_image = gr.Image(label="上传图片", value=None, sources=["upload", "clipboard", "webcam"], 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)
+            with gr.Accordion('附加输入', open=False):
+                with gr.Tab('图生图') as i2i:
+                    i2i_image = gr.Image(label="上传图片", value=None, sources=["upload", "clipboard", "webcam"], 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.Tab('局部重绘') as inp:
                     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='使用上一次生成的图片')
-            '''
+                    inp_img = gr.ImageMask(label="上传图片", value=None, sources=["upload", "clipboard", "webcam"], interactive=True, type="pil", eraser=False, transforms=None)
+                    reuse_img_inp = gr.Button(value='使用上一次生成的图片')
+                selection = gr.Radio(choices=['i2i', 'inp'], value='i2i', visible=False)
     with gr.Row():
         with gr.Column():
             with gr.Accordion('高级选项', open=False):
@@ -89,26 +86,27 @@ def control_ui():
                     dyn_threshold = gr.Checkbox(False, label="Dynamic Thresholding")
                     cfg_rescale = gr.Slider(0, 1, 0, step=0.01, label="CFG rescale")
         with gr.Column():
-            gr.Textbox(value=get_count, label='使用统计', every=10)
             save = gr.Checkbox(value=True, label='云端保存图片')
     gen_btn = gr.Button(value="生成", variant="primary")
     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, i2i_image, i2i_str, i2i_noise], [save, rand_seed, reuse_seed, reuse_img_vibe, reuse_img_i2i]
+    i2i.select(lambda: 'i2i', inputs=None, outputs=selection)
+    inp.select(lambda: 'inp', inputs=None, outputs=selection)
+    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, overlay, inp_img, selection], [save, rand_seed, reuse_seed, reuse_img_vibe, reuse_img_i2i, 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, i2i_image, i2i_str, i2i_noise, save):
+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, overlay, inp_img, selection, 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,
-        i2i_image, i2i_str, i2i_noise
+        i2i_image, i2i_str, i2i_noise, overlay, inp_img, selection
     )
     if not isinstance(img_data, bytes):
         return gr.Image(value=None), payload
-    today_count += 1
+    today_count = get_count() + 1
     img = image_from_bytes(img_data)
     if save:
         save_path = client_config['save_path']
@@ -139,6 +137,7 @@ def main_ui():
     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[4].click(lambda i: i, inputs=image, outputs=paras[17])
+    others[5].click(lambda i: i, inputs=image, outputs=paras[21])
     return page, paras[:14]
 
 def util_ui():
@@ -171,7 +170,7 @@ def ui():
     load_javascript()
     with gr.Blocks(title="NAI Client", theme=gr.themes.Base()) as website:
         with gr.Tabs():
-            with gr.TabItem("文生图", elem_id="client_ui_main"):
+            with gr.TabItem("图片生成", elem_id="client_ui_main"):
                 _, paras = main_ui()
             with gr.TabItem("图片信息读取"):
                 _, png2main, png_items, info, image = util_ui()