Merge branch 'main' of https://hf-mirror.com/spaces/P01yH3dr0n/client

app.py

@@ -134,7 +134,7 @@ def generate(prompt, quality_tags, neg_prompt, seed, scale, width, height, steps
 def preview_ui():
     with gr.Blocks(css='#preview_image { height: 100%;}'):
         image = gr.Image(format='png', elem_id='preview_image', interactive=False, type='filepath', show_share_button=False)
-        send_dtool = gr.Button(value="发送到引导工具", visible=False)
+        send_dtool = gr.Button(value="发送到定向修图", visible=False)
         image.change(lambda i: gr.Button(visible=False) if i is None else gr.Button(visible=True), inputs=image, outputs=send_dtool)
         info = gr.JSON(value={}, label="生成信息")
     return image, info, send_dtool
@@ -240,7 +240,7 @@ def ui():
         with gr.Tabs():
             with gr.TabItem("图片生成", elem_id="client_ui_main"):
                 image, paras, others, send_dtool = main_ui()
-            with gr.TabItem("引导工具", elem_id="client_ui_dtool"):
+            with gr.TabItem("定向修图", elem_id="client_ui_dtool"):
                 from_t2i, send_i2i, send_inp, send_vib, in_image, out_image, d_index = director_ui()
             with gr.TabItem("图片信息读取"):
                 png2main, png_items, info, read_image = util_ui()

director_tools.py

@@ -42,9 +42,9 @@ def director_ui():
             input_image = gr.Image(label="上传图片", value=None, sources=["upload", "clipboard", "webcam"], interactive=True, type="pil", show_share_button=False)
             with gr.Row():
                 from_t2i = gr.Button("使用文生图上一次生成的图片")
-                from_out = gr.Button("使用右侧生成的图片")
+                from_out = gr.Button("使用定向修图上一次生成的图片")
         with gr.Column():
-            output_image = gr.Gallery(format='png', interactive=False, preview=True, show_share_button=False)
+            output_image = gr.Gallery(label="输出图片", format='png', interactive=False, preview=True, show_share_button=False)
             selected_index = gr.Number(value=-1, visible=False)
             with gr.Row():
                 send_i2i = gr.Button("发送到图生图")
@@ -56,7 +56,7 @@ def director_ui():
         height = gr.Slider(label="调整高度", value=1024, minimum=1, maximum=2048, step=1)
         reset = gr.Button("重置")
     with gr.Tab("等比例缩放") as scale:
-        hint = gr.HTML('', show_label=False)
+        hint = gr.Textbox('', show_label=False, interactive=False, max_lines=1, container=False)
         factor = gr.Slider(label="缩放比例", minimum=0.1, maximum=2, step=0.1)
     defry = gr.State(0)
     prompt = gr.State('')
@@ -89,7 +89,7 @@ def director_ui():
     tool_btn = gr.Button(value="生成", variant="primary", visible=False)
     dtool_stop = gr.Button(value="取消", variant="stop", visible=False)
     input_image.change(lambda i: gr.Button(visible=False) if i is None else gr.Button(visible=True), inputs=input_image, outputs=tool_btn)
-    tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True), gr.Gallery(selected_index=None)), inputs=None, outputs=[tool_btn, dtool_stop, output_image])
+    tool_btn.click(lambda: (gr.Button(visible=False), gr.Button(visible=True), gr.Gallery(selected_index=None), -1), inputs=None, outputs=[tool_btn, dtool_stop, output_image, selected_index])
     dtool_gen = tool_btn.click(augment_image, inputs=[input_image, width, height, req_type, selection, factor, defry, prompt], outputs=output_image, concurrency_id="generate")
     dtool_stop.click(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop], cancels=[dtool_gen])
     output_image.change(lambda: (gr.Button(visible=True), gr.Button(visible=False)), inputs=None, outputs=[tool_btn, dtool_stop])
@@ -97,6 +97,6 @@ def director_ui():
     width.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     height.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     req_type.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
-    factor.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
+    hint.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     selection.change(update_btn_cost, inputs=[width, height, req_type, selection, hint], outputs=tool_btn)
     return from_t2i, send_i2i, send_inp, send_vib, input_image, output_image, selected_index

images_history.py

@@ -71,7 +71,7 @@ def img_history_ui(tab):
                 history2ref = gr.Button("图片发送到风格迁移", visible=False)
                 history2i2i = gr.Button("图片发送到图生图", visible=False)
                 history2inp = gr.Button("图片发送到局部重绘", visible=False)
-                history2dtl = gr.Button("图片发送到引导工具", visible=False)
+                history2dtl = gr.Button("图片发送到定向修图", visible=False)
                 del_btn = gr.Button('删除', visible=False)
     
     img_dir_path.change(lambda path: get_img_list(path, 1) + ('', None), inputs=img_dir_path, outputs=[history_gallery, page_index, info, items])