支持更多界面布局的切换

config.py

@@ -24,6 +24,9 @@ else:
 # 对话窗的高度
 CHATBOT_HEIGHT = 1115
 
+# 窗口布局
+LAYOUT = "LEFT-RIGHT" # "LEFT-RIGHT"（左右布局） # "TOP-DOWN"（上下布局）
+
 # 发送请求到OpenAI后，等待多久判定为超时
 TIMEOUT_SECONDS = 25
 

main.py

@@ -1,11 +1,11 @@
 import os; os.environ['no_proxy'] = '*' # 避免代理网络产生意外污染
 import gradio as gr
 from predict import predict
-from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper
+from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper, DummyWith
 
 # 建议您复制一个config_private.py放自己的秘密, 如API和代理网址, 避免不小心传github被别人看到
-proxies, WEB_PORT, LLM_MODEL, CONCURRENT_COUNT, AUTHENTICATION, CHATBOT_HEIGHT = \
-    get_conf('proxies', 'WEB_PORT', 'LLM_MODEL', 'CONCURRENT_COUNT', 'AUTHENTICATION', 'CHATBOT_HEIGHT')
+proxies, WEB_PORT, LLM_MODEL, CONCURRENT_COUNT, AUTHENTICATION, CHATBOT_HEIGHT, LAYOUT = \
+    get_conf('proxies', 'WEB_PORT', 'LLM_MODEL', 'CONCURRENT_COUNT', 'AUTHENTICATION', 'CHATBOT_HEIGHT', 'LAYOUT')
 
 # 如果WEB_PORT是-1, 则随机选取WEB端口
 PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
@@ -41,25 +41,32 @@ set_theme = adjust_theme()
 from check_proxy import check_proxy, auto_update
 proxy_info = check_proxy(proxies)
 
+gr_L1 = lambda: gr.Row().style()
+gr_L2 = lambda scale: gr.Column(scale=scale)
+if LAYOUT == "TOP-DOWN": 
+    gr_L1 = lambda: DummyWith()
+    gr_L2 = lambda scale: gr.Row()
+    CHATBOT_HEIGHT /= 2
 
 cancel_handles = []
 with gr.Blocks(theme=set_theme, analytics_enabled=False, css=advanced_css) as demo:
     gr.HTML(title_html)
-    with gr.Row().style(equal_height=True):
-        with gr.Column(scale=2):
+    with gr_L1():
+        with gr_L2(scale=2):
             chatbot = gr.Chatbot()
             chatbot.style(height=CHATBOT_HEIGHT)
             history = gr.State([])
-        with gr.Column(scale=1):
-            with gr.Row():
-                txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False)
-            with gr.Row():
-                submitBtn = gr.Button("提交", variant="primary")
-            with gr.Row():
-                resetBtn = gr.Button("重置", variant="secondary"); resetBtn.style(size="sm")
-                stopBtn = gr.Button("停止", variant="secondary"); stopBtn.style(size="sm")
-            with gr.Row():
-                status = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行。当前模型: {LLM_MODEL} \n {proxy_info}")
+        with gr_L2(scale=1):
+            with gr.Accordion("输入区", open=True) as area_input_primary:
+                with gr.Row():
+                    txt = gr.Textbox(show_label=False, placeholder="Input question here.").style(container=False)
+                with gr.Row():
+                    submitBtn = gr.Button("提交", variant="primary")
+                with gr.Row():
+                    resetBtn = gr.Button("重置", variant="secondary"); resetBtn.style(size="sm")
+                    stopBtn = gr.Button("停止", variant="secondary"); stopBtn.style(size="sm")
+                with gr.Row():
+                    status = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行。当前模型: {LLM_MODEL} \n {proxy_info}")
             with gr.Accordion("基础功能区", open=True) as area_basic_fn:
                 with gr.Row():
                     for k in functional:
@@ -67,12 +74,13 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False, css=advanced_css) as de
                         functional[k]["Button"] = gr.Button(k, variant=variant)
             with gr.Accordion("函数插件区", open=True) as area_crazy_fn:
                 with gr.Row():
-                    gr.Markdown("注意：以下“红颜色”标识的函数插件需从input区读取路径作为参数.")
+                    gr.Markdown("注意：以下“红颜色”标识的函数插件需从输入区读取路径作为参数.")
                 with gr.Row():
                     for k in crazy_fns:
                         if not crazy_fns[k].get("AsButton", True): continue
                         variant = crazy_fns[k]["Color"] if "Color" in crazy_fns[k] else "secondary"
                         crazy_fns[k]["Button"] = gr.Button(k, variant=variant)
+                        crazy_fns[k]["Button"].style(size="sm")
                 with gr.Row():
                     with gr.Accordion("更多函数插件", open=True):
                         dropdown_fn_list = [k for k in crazy_fns.keys() if not crazy_fns[k].get("AsButton", True)]
@@ -83,31 +91,41 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False, css=advanced_css) as de
                 with gr.Row():
                     with gr.Accordion("点击展开“文件上传区”。上传本地文件可供红色函数插件调用。", open=False) as area_file_up:
                         file_upload = gr.Files(label="任何文件, 但推荐上传压缩文件(zip, tar)", file_count="multiple")
-            with gr.Accordion("展开SysPrompt & 交互界面布局 & Github地址", open=False):
+            with gr.Accordion("展开SysPrompt & 交互界面布�� & Github地址", open=(LAYOUT == "TOP-DOWN")):
                 system_prompt = gr.Textbox(show_label=True, placeholder=f"System Prompt", label="System prompt", value=initial_prompt)
                 top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",)
                 temperature = gr.Slider(minimum=-0, maximum=2.0, value=1.0, step=0.01, interactive=True, label="Temperature",)
-                checkboxes = gr.CheckboxGroup(["基础功能区", "函数插件区", "输入区2"], value=["基础功能区", "函数插件区"], label="显示/隐藏功能区")
+                checkboxes = gr.CheckboxGroup(["基础功能区", "函数插件区", "底部输入区"], value=["基础功能区", "函数插件区"], label="显示/隐藏功能区")
                 gr.Markdown(description)
-            with gr.Accordion("输入区", open=True, visible=False) as input_crazy_fn:
+            with gr.Accordion("备选输入区", open=True, visible=False) as area_input_secondary:
                 with gr.Row():
                     txt2 = gr.Textbox(show_label=False, placeholder="Input question here.", label="输入区2").style(container=False)
-
+                with gr.Row():
+                    submitBtn2 = gr.Button("提交", variant="primary")
+                with gr.Row():
+                    resetBtn2 = gr.Button("重置", variant="secondary"); resetBtn.style(size="sm")
+                    stopBtn2 = gr.Button("停止", variant="secondary"); stopBtn.style(size="sm")
     # 功能区显示开关与功能区的互动
     def fn_area_visibility(a):
         ret = {}
         ret.update({area_basic_fn: gr.update(visible=("基础功能区" in a))})
         ret.update({area_crazy_fn: gr.update(visible=("函数插件区" in a))})
+        ret.update({area_input_primary: gr.update(visible=("底部输入区" not in a))})
+        ret.update({area_input_secondary: gr.update(visible=("底部输入区" in a))})
+        if "底部输入区" in a: ret.update({txt: gr.update(value="")})
         return ret
-    checkboxes.select(fn_area_visibility, [checkboxes], [area_basic_fn, area_crazy_fn] )
+    checkboxes.select(fn_area_visibility, [checkboxes], [area_basic_fn, area_crazy_fn, area_input_primary, area_input_secondary, txt, txt2] )
     # 整理反复出现的控件句柄组合
     input_combo = [txt, txt2, top_p, temperature, chatbot, history, system_prompt]
     output_combo = [chatbot, history, status]
     predict_args = dict(fn=ArgsGeneralWrapper(predict), inputs=input_combo, outputs=output_combo)
     # 提交按钮、重置按钮
     cancel_handles.append(txt.submit(**predict_args))
+    cancel_handles.append(txt2.submit(**predict_args))
     cancel_handles.append(submitBtn.click(**predict_args))
+    cancel_handles.append(submitBtn2.click(**predict_args))
     resetBtn.click(lambda: ([], [], "已重置"), None, output_combo)
+    resetBtn2.click(lambda: ([], [], "已重置"), None, output_combo)
     # 基础功能区的回调函数注册
     for k in functional:
         click_handle = functional[k]["Button"].click(fn=ArgsGeneralWrapper(predict), inputs=[*input_combo, gr.State(True), gr.State(k)], outputs=output_combo)
@@ -137,7 +155,7 @@ with gr.Blocks(theme=set_theme, analytics_enabled=False, css=advanced_css) as de
     cancel_handles.append(click_handle)
     # 终止按钮的回调函数注册
     stopBtn.click(fn=None, inputs=None, outputs=None, cancels=cancel_handles)
-
+    stopBtn2.click(fn=None, inputs=None, outputs=None, cancels=cancel_handles)
 # gradio的inbrowser触发不太稳定，回滚代码到原始的浏览器打开函数
 def auto_opentab_delay():
     import threading, webbrowser, time

theme.py

@@ -26,7 +26,7 @@ import gradio as gr
 
 def adjust_theme():
     try: 
-        color_er = gr.themes.utils.colors.pink
+        color_er = gr.themes.utils.colors.fuchsia
         set_theme = gr.themes.Default( 
                         primary_hue=gr.themes.utils.colors.orange,
                         neutral_hue=gr.themes.utils.colors.gray,

toolbox.py

@@ -354,3 +354,9 @@ def clear_line_break(txt):
     txt = txt.replace('  ', ' ')
     txt = txt.replace('  ', ' ')
     return txt
+
+class DummyWith():
+    def __enter__(self):
+        return self
+    def __exit__(self, exc_type, exc_value, traceback):
+        return