Update app.py

app.py

@@ -222,170 +222,157 @@ with gr.Blocks(title="RecurrentGPT", css="footer {visibility: hidden}", theme="d
         也可以手动选择剧情走向进行续写 
         """)
 
-    with gr.Tab("Auto-Generation"):
-        with gr.Row():
-            with gr.Column():
-                with gr.Box():
-                    with gr.Row():
-                        with gr.Column(scale=1, min_width=200):
-                            novel_type = gr.Textbox(
-                                label="Novel Type", placeholder="e.g. science fiction") if "en" == lang_opt else gr.Textbox(
-                                label="请输入文本", placeholder="可以自己填写或者从EXamples中选择一个填入")
-                        with gr.Column(scale=2, min_width=400):
-                            description = gr.Textbox(
-                                label="Description") if "en" == lang_opt else gr.Textbox(label="剧情简介（非必选项）")
-                btn_init = gr.Button(
-                    "Init Novel Generation", variant="primary") if "en" == lang_opt else gr.Button(
-                    "点击开始运行", variant="primary")
-                if "en" == lang_opt:
-                    gr.Examples(["Science Fiction", "Romance", "Mystery", "Fantasy",
-                                 "Historical", "Horror", "Thriller", "Western", "Young Adult", ], inputs=[novel_type])
-                elif lang_opt in ["zh1", "zh2"]:
-                    gr.Examples(["科幻故事", "青春伤痛文学", "爱到死去活来", "搞笑",
-                                 "幽默", "鬼故事", "喜剧", "童话", "魔法世界", ], inputs=[novel_type])
-                else:
-                    raise Exception(f"not supported language: {lang_opt}")
-
-                written_paras = gr.Textbox(
-                    label="Written Paragraphs (editable)", max_lines=21, lines=21) if "en" == lang_opt else gr.Textbox(
-                    label="文章内容", max_lines=21, lines=21)
-            with gr.Column():
-                with gr.Box():
-                    if "en" == lang_opt:
-                        gr.Markdown("### Memory Module\n")
-                    elif lang_opt in ["zh1", "zh2"]:
-                        gr.Markdown("### 剧情模型\n")
-
-                    short_memory = gr.Textbox(
-                        label="Short-Term Memory (editable)", max_lines=3, lines=3) if "en" == lang_opt else gr.Textbox(
-                        label="短期记忆 (可编辑)", max_lines=3, lines=3)
-                    long_memory = gr.Textbox(
-                        label="Long-Term Memory (editable)", max_lines=6, lines=6) if "en" == lang_opt else gr.Textbox(
-                        label="长期记忆 (可编辑)", max_lines=6, lines=6)
-                    # long_memory = gr.Dataframe(
-                    #     # label="Long-Term Memory (editable)",
-                    #     headers=["Long-Term Memory (editable)"],
-                    #     datatype=["str"],
-                    #     row_count=3,
-                    #     max_rows=3,
-                    #     col_count=(1, "fixed"),
-                    #     type="array",
-                    # )
-                with gr.Box():
-                    if "en" == lang_opt:
-                        gr.Markdown("### Instruction Module\n")
-                    elif lang_opt in ["zh1", "zh2"]:
-                        gr.Markdown("### 选项模型\n")
-
-                    with gr.Row():
-                        instruction1 = gr.Textbox(
-                            label="Instruction 1 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
-                            label="指令1(可编辑)", max_lines=4, lines=4)
-                        instruction2 = gr.Textbox(
-                            label="Instruction 2 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
-                            label="指令2(可编辑)", max_lines=4, lines=4)
-                        instruction3 = gr.Textbox(
-                            label="Instruction 3 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
-                            label="指令3(可编辑)", max_lines=4, lines=4)
-                    selected_plan = gr.Textbox(
-                        label="Revised Instruction (from last step)", max_lines=2, lines=2) if "en" == lang_opt else gr.Textbox(
-                        label="选项说明 (来自上一步)", max_lines=2, lines=2)
-
-                btn_step = gr.Button("Next Step", variant="primary") if "en" == lang_opt else gr.Button(
-                    "下一步", variant="primary")
-
-        btn_init.click(init, inputs=[novel_type, description], outputs=[
-            short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
-        btn_step.click(step, inputs=[short_memory, long_memory, instruction1, instruction2, instruction3, written_paras], outputs=[
-            short_memory, long_memory, written_paras, selected_plan, instruction1, instruction2, instruction3])
-
-    with gr.Tab("Human-in-the-Loop"):
-        with gr.Row():
-            with gr.Column():
-                with gr.Box():
-                    with gr.Row():
-                        with gr.Column(scale=1, min_width=200):
-                            novel_type = gr.Textbox(
-                                label="Novel Type", placeholder="e.g. science fiction") if "en" == lang_opt else gr.Textbox(
-                                label="请输入文本", placeholder="可以自己填写或者从EXamples中选择一个填入")
-                        with gr.Column(scale=2, min_width=400):
-                            description = gr.Textbox(
-                                label="Description") if "en" == lang_opt else gr.Textbox(label="剧情简介（非必选项）")
-                btn_init = gr.Button(
-                    "Init Novel Generation", variant="primary") if "en" == lang_opt else gr.Button(
-                    "点击开始运行", variant="primary")
-
-                if "en" == lang_opt:
-                    gr.Examples(["Science Fiction", "Romance", "Mystery", "Fantasy",
-                                 "Historical", "Horror", "Thriller", "Western", "Young Adult", ], inputs=[novel_type])
-                elif lang_opt in ["zh1", "zh2"]:
-                    gr.Examples(["科幻小说", "爱情小说", "推理小说", "奇幻小说",
-                                 "玄幻小说", "恐怖", "悬疑", "惊悚", "武侠小说", ], inputs=[novel_type])
-
-                written_paras = gr.Textbox(
-                    label="Written Paragraphs (editable)", max_lines=23, lines=23) if "en" == lang_opt else gr.Textbox(
-                    label="文章内容 (可编辑)", max_lines=23, lines=23)
-            with gr.Column():
-                with gr.Box():
-                    if "en" == lang_opt:
-                        gr.Markdown("### Memory Module\n")
-                    elif lang_opt in ["zh1", "zh2"]:
-                        gr.Markdown("### 剧情模型\n")
-
-                    short_memory = gr.Textbox(
-                        label="Short-Term Memory (editable)", max_lines=3, lines=3) if "en" == lang_opt else gr.Textbox(
-                        label="短期记忆 (可编辑)", max_lines=3, lines=3)
-                    long_memory = gr.Textbox(
-                        label="Long-Term Memory (editable)", max_lines=6, lines=6) if "en" == lang_opt else gr.Textbox(
-                        label="长期记忆 (可编辑)", max_lines=6, lines=6)
-                with gr.Box():
-                    if "en" == lang_opt:
-                        gr.Markdown("### Instruction Module\n")
-                    elif lang_opt in ["zh1", "zh2"]:
-                        gr.Markdown("### 选项模型\n")
-
-                    with gr.Row():
-                        instruction1 = gr.Textbox(
-                            label="Instruction 1", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
-                            label="指令1", max_lines=3, lines=3, interactive=False)
-                        instruction2 = gr.Textbox(
-                            label="Instruction 2", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
-                            label="指令2", max_lines=3, lines=3, interactive=False)
-                        instruction3 = gr.Textbox(
-                            label="Instruction 3", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
-                            label="指令3", max_lines=3, lines=3, interactive=False)
-                    with gr.Row():
-                        with gr.Column(scale=1, min_width=100):
-                            selected_plan = gr.Radio(
-                                ["Instruction 1", "Instruction 2", "Instruction 3"], label="Instruction Selection",) if "en" == lang_opt else gr.Radio(["指令 1", "指令 2", "指令 3"], label="指令 选择",)
-                            #  info="Select the instruction you want to revise and use for the next step generation.")
-                        with gr.Column(scale=3, min_width=300):
-                            selected_instruction = gr.Textbox(
-                                label="Selected Instruction (editable)", max_lines=5, lines=5) if "en" == lang_opt else gr.Textbox(
-                                label="在上一步骤中被选择的 (可编辑)", max_lines=5, lines=5)
-
-                btn_step = gr.Button("Next Step", variant="primary") if "en" == lang_opt else gr.Button(
-                    "下一步", variant="primary")
-
-        btn_init.click(init, inputs=[novel_type, description], outputs=[
-            short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
-        btn_step.click(controled_step, inputs=[short_memory, long_memory, selected_instruction, written_paras], outputs=[
-            short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
-        selected_plan.select(on_select, inputs=[
-                             instruction1, instruction2, instruction3], outputs=[selected_instruction])
-
-    with gr.Tab("Model-Config"):
-        model_opt_radio = gr.Radio(["OpenAI", "ChatGLM-6B", "Vicuna-7B"], value="OpenAI", label="model",
-                                   info="select language you preferred. Default is English.",
-                                   interactive=True
-                                   )
-
-        reload_button = gr.Button("Reload/重新加载")
-        reload_button.click(reload_model, show_progress=True,
-                            inputs=[model_opt_radio],
-                            outputs=[novel_type])
-
-    demo.queue(concurrency_count=1)
+with gr.Tab("Auto-Generation"):
+    with gr.Row():
+        with gr.Column():
+            with gr.Row():
+                with gr.Column(scale=1, min_width=200):
+                    novel_type = gr.Textbox(
+                        label="Novel Type", placeholder="e.g. science fiction") if "en" == lang_opt else gr.Textbox(
+                        label="请输入文本", placeholder="可以自己填写或者从EXamples中选择一个填入")
+                with gr.Column(scale=2, min_width=400):
+                    description = gr.Textbox(
+                        label="Description") if "en" == lang_opt else gr.Textbox(label="剧情简介（非必选项）")
+            btn_init = gr.Button(
+                "Init Novel Generation", variant="primary") if "en" == lang_opt else gr.Button(
+                "点击开始运行", variant="primary")
+            if "en" == lang_opt:
+                gr.Examples(["Science Fiction", "Romance", "Mystery", "Fantasy",
+                             "Historical", "Horror", "Thriller", "Western", "Young Adult", ], inputs=[novel_type])
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Examples(["科幻故事", "青春伤痛文学", "爱到死去活来", "搞笑",
+                             "幽默", "鬼故事", "喜剧", "童话", "魔法世界", ], inputs=[novel_type])
+
+            written_paras = gr.Textbox(
+                label="Written Paragraphs (editable)", max_lines=21, lines=21) if "en" == lang_opt else gr.Textbox(
+                label="文章内容", max_lines=21, lines=21)
+
+        with gr.Column():
+            if "en" == lang_opt:
+                gr.Markdown("### Memory Module\n")
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Markdown("### 剧情模型\n")
+
+            short_memory = gr.Textbox(
+                label="Short-Term Memory (editable)", max_lines=3, lines=3) if "en" == lang_opt else gr.Textbox(
+                label="短期记忆 (可编辑)", max_lines=3, lines=3)
+            long_memory = gr.Textbox(
+                label="Long-Term Memory (editable)", max_lines=6, lines=6) if "en" == lang_opt else gr.Textbox(
+                label="长期记忆 (可编辑)", max_lines=6, lines=6)
+
+            if "en" == lang_opt:
+                gr.Markdown("### Instruction Module\n")
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Markdown("### 选项模型\n")
+
+            with gr.Row():
+                instruction1 = gr.Textbox(
+                    label="Instruction 1 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
+                    label="指令1(可编辑)", max_lines=4, lines=4)
+                instruction2 = gr.Textbox(
+                    label="Instruction 2 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
+                    label="指令2(可编辑)", max_lines=4, lines=4)
+                instruction3 = gr.Textbox(
+                    label="Instruction 3 (editable)", max_lines=4, lines=4) if "en" == lang_opt else gr.Textbox(
+                    label="指令3(可编辑)", max_lines=4, lines=4)
+            selected_plan = gr.Textbox(
+                label="Revised Instruction (from last step)", max_lines=2, lines=2) if "en" == lang_opt else gr.Textbox(
+                label="选项说明 (来自上一步)", max_lines=2, lines=2)
+
+            btn_step = gr.Button("Next Step", variant="primary") if "en" == lang_opt else gr.Button(
+                "下一步", variant="primary")
+
+    btn_init.click(init, inputs=[novel_type, description], outputs=[
+        short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
+    btn_step.click(step, inputs=[short_memory, long_memory, instruction1, instruction2, instruction3, written_paras], outputs=[
+        short_memory, long_memory, written_paras, selected_plan, instruction1, instruction2, instruction3])
+
+with gr.Tab("Human-in-the-Loop"):
+    with gr.Row():
+        with gr.Column():
+            with gr.Row():
+                with gr.Column(scale=1, min_width=200):
+                    novel_type = gr.Textbox(
+                        label="Novel Type", placeholder="e.g. science fiction") if "en" == lang_opt else gr.Textbox(
+                        label="请输入文本", placeholder="可以自己填写或者从EXamples中选择一个填入")
+                with gr.Column(scale=2, min_width=400):
+                    description = gr.Textbox(
+                        label="Description") if "en" == lang_opt else gr.Textbox(label="剧情简介（非必选项）")
+            btn_init = gr.Button(
+                "Init Novel Generation", variant="primary") if "en" == lang_opt else gr.Button(
+                "点击开始运行", variant="primary")
+
+            if "en" == lang_opt:
+                gr.Examples(["Science Fiction", "Romance", "Mystery", "Fantasy",
+                             "Historical", "Horror", "Thriller", "Western", "Young Adult", ], inputs=[novel_type])
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Examples(["科幻小说", "爱情小说", "推理小说", "奇幻小说",
+                             "玄幻小说", "恐怖", "悬疑", "惊悚", "武侠小说", ], inputs=[novel_type])
+
+            written_paras = gr.Textbox(
+                label="Written Paragraphs (editable)", max_lines=23, lines=23) if "en" == lang_opt else gr.Textbox(
+                label="文章内容 (可编辑)", max_lines=23, lines=23)
+
+        with gr.Column():
+            if "en" == lang_opt:
+                gr.Markdown("### Memory Module\n")
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Markdown("### 剧情模型\n")
+
+            short_memory = gr.Textbox(
+                label="Short-Term Memory (editable)", max_lines=3, lines=3) if "en" == lang_opt else gr.Textbox(
+                label="短期记忆 (可编辑)", max_lines=3, lines=3)
+            long_memory = gr.Textbox(
+                label="Long-Term Memory (editable)", max_lines=6, lines=6) if "en" == lang_opt else gr.Textbox(
+                label="长期记忆 (可编辑)", max_lines=6, lines=6)
+
+            if "en" == lang_opt:
+                gr.Markdown("### Instruction Module\n")
+            elif lang_opt in ["zh1", "zh2"]:
+                gr.Markdown("### 选项模型\n")
+
+            with gr.Row():
+                instruction1 = gr.Textbox(
+                    label="Instruction 1", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
+                    label="指令1", max_lines=3, lines=3, interactive=False)
+                instruction2 = gr.Textbox(
+                    label="Instruction 2", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
+                    label="指令2", max_lines=3, lines=3, interactive=False)
+                instruction3 = gr.Textbox(
+                    label="Instruction 3", max_lines=3, lines=3, interactive=False) if "en" == lang_opt else gr.Textbox(
+                    label="指令3", max_lines=3, lines=3, interactive=False)
+            with gr.Row():
+                with gr.Column(scale=1, min_width=100):
+                    selected_plan = gr.Radio(
+                        ["Instruction 1", "Instruction 2", "Instruction 3"], label="Instruction Selection",) if "en" == lang_opt else gr.Radio(["指令 1", "指令 2", "指令 3"], label="指令 选择",)
+                with gr.Column(scale=3, min_width=300):
+                    selected_instruction = gr.Textbox(
+                        label="Selected Instruction (editable)", max_lines=5, lines=5) if "en" == lang_opt else gr.Textbox(
+                        label="在上一步骤中被选择的 (可编辑)", max_lines=5, lines=5)
+
+            btn_step = gr.Button("Next Step", variant="primary") if "en" == lang_opt else gr.Button(
+                "下一步", variant="primary")
+
+    btn_init.click(init, inputs=[novel_type, description], outputs=[
+        short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
+    btn_step.click(controled_step, inputs=[short_memory, long_memory, selected_instruction, written_paras], outputs=[
+        short_memory, long_memory, written_paras, instruction1, instruction2, instruction3])
+    selected_plan.select(on_select, inputs=[
+                         instruction1, instruction2, instruction3], outputs=[selected_instruction])
+
+with gr.Tab("Model-Config"):
+    model_opt_radio = gr.Radio(["OpenAI", "ChatGLM-6B", "Vicuna-7B"], value="OpenAI", label="model",
+                               info="select language you preferred. Default is English.",
+                               interactive=True
+                               )
+
+    reload_button = gr.Button("Reload/重新加载")
+    reload_button.click(reload_model, show_progress=True,
+                        inputs=[model_opt_radio],
+                        outputs=[novel_type])
+
+demo.queue(concurrency_count=1)
 
 if __name__ == "__main__":
-    demo.launch(show_error=True,show_api=False)
+    demo.launch(show_error=True, show_api=False)
+