Upload 5 files

mods/btn_com.py

@@ -11,6 +11,7 @@ def init(cfg):
         cfg['btn_stop'] = gr.Button("Stop")
         cfg['btn_reset'] = gr.Button("Reset")
         cfg['btn_debug'] = gr.Button("Debug")
+        cfg['btn_submit_vo_suggest'] = gr.Button("Submit&旁白&建议", variant="primary")
         cfg['btn_submit'] = gr.Button("Submit")
         cfg['btn_suggest'] = gr.Button("建议")
 
@@ -87,8 +88,13 @@ def init(cfg):
 
     cfg['btn_com'] = btn_com
 
+    btn_start_or_finish_outputs = [cfg['btn_submit'], cfg['btn_vo'],
+                                   cfg['btn_suggest'], cfg['btn_retry'],
+                                   cfg['btn_submit_vo_suggest']]
+
     def btn_start_or_finish(finish):
         tmp = gr.update(interactive=finish)
+        tmp = (tmp,) * len(btn_start_or_finish_outputs)
 
         def _inner():
             with lock:
@@ -96,13 +102,10 @@ def init(cfg):
                     raise RuntimeError('任务中断！请稍等或Reset，如已Reset，请忽略。')
                 cfg['session_active'] = not cfg['session_active']
                 cfg['btn_stop_status'] = finish
-                return tmp, tmp, tmp, tmp
+                return tmp
 
         return _inner
 
-    btn_start_or_finish_outputs = [cfg['btn_submit'], cfg['btn_vo'],
-                                   cfg['btn_suggest'], cfg['btn_retry']]
-
     cfg['btn_concurrency'] = {
         'trigger_mode': 'once',
         'concurrency_id': 'btn_com',
@@ -113,13 +116,12 @@ def init(cfg):
         'fn': btn_start_or_finish(False),
         'outputs': btn_start_or_finish_outputs
     }
+    cfg['btn_start'].update(cfg['btn_concurrency'])
 
     cfg['btn_finish'] = {
         'fn': btn_start_or_finish(True),
         'outputs': btn_start_or_finish_outputs
     }
-
-    cfg['btn_start'].update(cfg['btn_concurrency'])
     cfg['btn_finish'].update(cfg['btn_concurrency'])
 
     cfg['setting'] = [cfg[x] for x in ('setting_n_keep', 'setting_n_discard',

mods/btn_submit.py

@@ -61,18 +61,26 @@ def init(cfg):
             model.venv_remove('rag')  # 销毁对应的 venv
             yield history, model.venv_info
 
+    cfg['btn_submit_fn_usr'] = {
+        'fn': btn_submit_usr,
+        'inputs': [msg, chatbot],
+        'outputs': [msg, chatbot]
+    }
+    cfg['btn_submit_fn_usr'].update(cfg['btn_concurrency'])
+
+    cfg['btn_submit_fn_bot'] = {
+        'fn': btn_submit_bot,
+        'inputs': [chatbot]+cfg['setting'],
+        'outputs': [chatbot, s_info],
+    }
+    cfg['btn_submit_fn_bot'].update(cfg['btn_concurrency'])
+
     cfg['btn_submit'].click(
         **cfg['btn_start']
     ).success(
-        fn=btn_submit_usr, api_name="submit",
-        inputs=[msg, chatbot],
-        outputs=[msg, chatbot],
-        **cfg['btn_concurrency']
+        **cfg['btn_submit_fn_usr']
     ).success(
-        fn=btn_submit_bot,
-        inputs=[chatbot]+cfg['setting'],
-        outputs=[chatbot, s_info],
-        **cfg['btn_concurrency']
+        **cfg['btn_submit_fn_bot']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_submit_vo_suggest.py

@@ -0,0 +1,14 @@
+def init(cfg):
+    cfg['btn_submit_vo_suggest'].click(
+        **cfg['btn_start']
+    ).success(
+        **cfg['btn_submit_fn_usr']
+    ).success(
+        **cfg['btn_submit_fn_bot']
+    ).success(
+        **cfg['btn_vo_fn']
+    ).success(
+        **cfg['btn_suggest_fn']
+    ).success(
+        **cfg['btn_finish']
+    )

mods/btn_suggest.py

@@ -30,13 +30,17 @@ def init(cfg):
             model.venv_remove('suggest')  # 销毁隔离环境
             yield _h, model.venv_info
 
+    cfg['btn_suggest_fn'] = {
+        'fn': btn_suggest,
+        'inputs': cfg['setting'],
+        'outputs': [cfg['msg'], s_info]
+    }
+    cfg['btn_suggest_fn'].update(cfg['btn_concurrency'])
+
     cfg['btn_suggest'].click(
         **cfg['btn_start']
     ).success(
-        fn=btn_suggest,
-        inputs=cfg['setting'],
-        outputs=[cfg['msg'], s_info],
-        **cfg['btn_concurrency']
+        **cfg['btn_suggest_fn']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_vo.py

@@ -30,13 +30,17 @@ def init(cfg):
             for _h in _tmp:
                 yield _h, model.venv_info
 
+    cfg['btn_vo_fn'] = {
+        'fn': btn_vo,
+        'inputs': cfg['setting'],
+        'outputs': [cfg['vo'], s_info]
+    }
+    cfg['btn_vo_fn'].update(cfg['btn_concurrency'])
+
     cfg['btn_vo'].click(
         **cfg['btn_start']
     ).success(
-        fn=btn_vo,
-        inputs=cfg['setting'],
-        outputs=[cfg['vo'], s_info],
-        **cfg['btn_concurrency']
+        **cfg['btn_vo_fn']
     ).success(
         **cfg['btn_finish']
     )