Upload 4 files

mods/btn_rag.py

@@ -1,8 +1,49 @@
 def init(cfg):
-    # ========== 待实现 ==========
-    def btn_rag_(_rag, _msg):
-        retn = ''
-        return retn
+    # ========== 共同 ==========
+    model = cfg['model']
+    s_info = cfg['s_info']
+    lock = cfg['session_lock']
 
-    cfg['btn_rag'].click(fn=btn_rag_, outputs=cfg['rag'],
-                         inputs=[cfg['rag'], cfg['msg']])
+    # ========== 特殊 ==========
+    chat_template = cfg['chat_template']
+
+    # ========== 注入内容 ==========
+    def btn_rag(_n_keep, _n_discard,
+                _temperature, _repeat_penalty, _frequency_penalty,
+                _presence_penalty, _repeat_last_n, _top_k,
+                _top_p, _min_p, _typical_p,
+                _tfs_z, _mirostat_mode, _mirostat_eta,
+                _mirostat_tau, _usr, _char,
+                _rag, _max_tokens):
+        with lock:
+            if not cfg['session_active']:
+                raise RuntimeError
+            if cfg['btn_stop_status']:
+                yield model.venv_info
+                return
+            # ========== 清除之前注入的内容 ==========
+            model.venv_remove('rag')
+            # ========== 没有需要注入的内容 ==========
+            if not _rag:
+                yield model.venv_info
+                return
+            # ========== 需要临时注入的内容 ==========
+            model.venv_create('rag')
+            t_rag = chat_template('system', _rag)
+            model.eval_t(t_rag, _n_keep, _n_discard)
+            yield model.venv_info
+
+    cfg['btn_rag_fn'] = {
+        'fn': btn_rag,
+        'inputs': cfg['setting'],
+        'outputs': s_info
+    }
+    cfg['btn_rag_fn'].update(cfg['btn_concurrency'])
+
+    cfg['btn_rag'].click(
+        **cfg['btn_start']
+    ).success(
+        **cfg['btn_rag_fn']
+    ).success(
+        **cfg['btn_finish']
+    )

mods/btn_retry.py

@@ -24,11 +24,6 @@ def init(cfg):
             if not model.venv_revision('usr'):
                 yield history, model.venv_info
                 return
-            # ========== 需要临时注入的内容 ==========
-            if len(_rag) > 0:
-                model.venv_create('rag')  # 记录 venv_idx
-                t_rag = chat_template('system', _rag)
-                model.eval_t(t_rag, _n_keep, _n_discard)
             # ========== 模型输出 ==========
             model.venv_create('char')
             _tmp = btn_com(_n_keep, _n_discard,
@@ -43,17 +38,18 @@ def init(cfg):
             # ========== 输出完毕后格式化输出 ==========
             history[-1][1] = chat_display_format(history[-1][1])
             yield history, model.venv_info
-            # ========== 响应完毕后清除注入的内容 ==========
-            model.venv_remove('rag')  # 销毁对应的 venv
-            yield history, model.venv_info
+
+    cfg['btn_retry_fn'] = {
+        'fn': btn_retry,
+        'inputs': [chatbot]+cfg['setting'],
+        'outputs': [chatbot, s_info],
+    }
+    cfg['btn_retry_fn'].update(cfg['btn_concurrency'])
 
     cfg['btn_retry'].click(
         **cfg['btn_start']
     ).success(
-        fn=btn_retry,
-        inputs=[chatbot]+cfg['setting'],
-        outputs=[chatbot, s_info],
-        **cfg['btn_concurrency']
+        **cfg['btn_retry_fn']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_submit.py

@@ -29,11 +29,6 @@ def init(cfg):
         with lock:
             if not cfg['session_active']:
                 raise RuntimeError
-            # ========== 需要临时注入的内容 ==========
-            if len(_rag) > 0:
-                model.venv_create('rag')  # 记录 venv_idx
-                t_rag = chat_template('system', _rag)
-                model.eval_t(t_rag, _n_keep, _n_discard)
             # ========== 释放不再需要的环境 ==========
             model.venv_disband({'usr', 'char'})
             print('venv_disband char', model.venv_info)
@@ -59,9 +54,6 @@ def init(cfg):
             # ========== 输出完毕后格式化输出 ==========
             history[-1][1] = chat_display_format(history[-1][1])
             yield history, model.venv_info
-            # ========== 响应完毕后清除注入的内容 ==========
-            model.venv_remove('rag')  # 销毁对应的 venv
-            yield history, model.venv_info
 
     cfg['btn_submit_fn_usr'] = {
         'fn': btn_submit_usr,

mods/btn_submit_vo_suggest.py

@@ -3,6 +3,8 @@ def init(cfg):
         **cfg['btn_start']
     ).success(
         **cfg['btn_submit_fn_usr']
+    ).success(
+        **cfg['btn_rag_fn']
     ).success(
         **cfg['btn_submit_fn_bot']
     ).success(