Upload 6 files

mods/btn_com.py

@@ -4,6 +4,18 @@ def init(cfg):
     gr = cfg['gr']
     lock = cfg['session_lock']
 
+    with gr.Row():
+        cfg['btn_vo'] = gr.Button("旁白")
+        cfg['btn_rag'] = gr.Button("RAG")
+        cfg['btn_retry'] = gr.Button("Retry")
+        cfg['btn_stop'] = gr.Button("Stop")
+        cfg['btn_reset'] = gr.Button("Reset")
+        cfg['btn_debug'] = gr.Button("Debug")
+        cfg['btn_submit'] = gr.Button("Submit")
+        cfg['btn_suggest'] = gr.Button("建议")
+
+    cfg['btn_stop_status'] = True
+
     # ========== 流式输出函数 ==========
     def btn_com(_n_keep, _n_discard,
                 _temperature, _repeat_penalty, _frequency_penalty,
@@ -35,30 +47,36 @@ def init(cfg):
                 mirostat_tau=_mirostat_tau,
                 mirostat_eta=_mirostat_eta,
         ):
+            # ========== eos or nlnl 说明eos了 ==========
             if token in chat_template.eos or token == chat_template.nlnl:
                 t_bot.extend(completion_tokens)
                 print('token in eos', token)
                 break
+            # ========== 避免不完整的utf-8编码 ==========
             completion_tokens.append(token)
             all_text = model.str_detokenize(completion_tokens)
             if not all_text:
                 continue
             t_bot.extend(completion_tokens)
+            # ========== 流式输出 ==========
             history += all_text
             yield history
-            if token in chat_template.onenl:
-                # ========== 移除末尾的换行符 ==========
-                if t_bot[-2] in chat_template.onenl:
-                    model.venv_pop_token()
-                    break
-                if t_bot[-2] in chat_template.onerl and t_bot[-3] in chat_template.onenl:
-                    model.venv_pop_token()
-                    break
-            if history[-2:] == '\n\n':  # 各种 'x\n\n' 的token，比如'。\n\n'
-                print('t_bot[-4:]', t_bot[-4:], repr(model.str_detokenize(t_bot[-4:])),
-                      repr(model.str_detokenize(t_bot[-1:])))
+            # ========== \n role \n 结构说明eos了 ==========
+            tmp = chat_template.eos_in_role(history, t_bot)
+            if tmp:
+                tmp -= 1  # 最后一个token并未进入kv_cache
+                if tmp:
+                    model.venv_pop_token(tmp)
+                break
+            # ========== \n\n 结构说明eos了 ==========
+            tmp = chat_template.eos_in_nlnl(history, t_bot)
+            if tmp:
+                tmp -= 1  # 最后一个token并未进入kv_cache
+                if tmp:
+                    model.venv_pop_token(tmp)
                 break
-            if len(t_bot) > _max_tokens:
+            # ========== 过长 or 按下了stop按钮 ==========
+            if len(t_bot) > _max_tokens or cfg['btn_stop_status']:
                 break
             completion_tokens = []
         # ========== 查看末尾的换行符 ==========
@@ -75,15 +93,22 @@ def init(cfg):
         def _inner():
             with lock:
                 if cfg['session_active'] != finish:
-                    raise RuntimeError
+                    raise RuntimeError('任务中断！请稍等或Reset，如已Reset，请忽略。')
                 cfg['session_active'] = not cfg['session_active']
-            return tmp, tmp, tmp, tmp
+                cfg['btn_stop_status'] = finish
+                return tmp, tmp, tmp, 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',
+        'concurrency_limit': 1
+    }
+
     cfg['btn_start'] = {
         'fn': btn_start_or_finish(False),
         'outputs': btn_start_or_finish_outputs
@@ -94,6 +119,9 @@ def init(cfg):
         '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',
                                        'setting_temperature', 'setting_repeat_penalty', 'setting_frequency_penalty',
                                        'setting_presence_penalty', 'setting_repeat_last_n', 'setting_top_k',

mods/btn_reset.py

@@ -20,16 +20,26 @@ def init(cfg):
             with cfg['session_lock']:
                 _tmp = model.load_session(_cache_path)
                 print(f'load cache from {_cache_path} {_tmp}')
-                cfg['session_active'] = False
+                cfg['session_active'] = True
                 return model.venv_info
         except Exception as e:
             restart_space()
             raise e
 
+    def btn_stop():
+        cfg['btn_stop_status'] = True
+
+    cfg['btn_stop'].click(
+        fn=btn_stop
+    )
+
     cfg['btn_reset'].click(
+        fn=btn_stop
+    ).success(
         fn=btn_reset,
         inputs=cfg['setting_cache_path'],
-        outputs=s_info
+        outputs=s_info,
+        **cfg['btn_concurrency']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_retry.py

@@ -52,7 +52,8 @@ def init(cfg):
     ).success(
         fn=btn_retry,
         inputs=[chatbot]+cfg['setting'],
-        outputs=[chatbot, s_info]
+        outputs=[chatbot, s_info],
+        **cfg['btn_concurrency']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_submit.py

@@ -66,11 +66,13 @@ def init(cfg):
     ).success(
         fn=btn_submit_usr, api_name="submit",
         inputs=[msg, chatbot],
-        outputs=[msg, chatbot]
+        outputs=[msg, chatbot],
+        **cfg['btn_concurrency']
     ).success(
         fn=btn_submit_bot,
         inputs=[chatbot]+cfg['setting'],
-        outputs=[chatbot, s_info]
+        outputs=[chatbot, s_info],
+        **cfg['btn_concurrency']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_suggest.py

@@ -35,7 +35,8 @@ def init(cfg):
     ).success(
         fn=btn_suggest,
         inputs=cfg['setting'],
-        outputs=[cfg['msg'], s_info]
+        outputs=[cfg['msg'], s_info],
+        **cfg['btn_concurrency']
     ).success(
         **cfg['btn_finish']
     )

mods/btn_vo.py

@@ -35,7 +35,8 @@ def init(cfg):
     ).success(
         fn=btn_vo,
         inputs=cfg['setting'],
-        outputs=[cfg['vo'], s_info]
+        outputs=[cfg['vo'], s_info],
+        **cfg['btn_concurrency']
     ).success(
         **cfg['btn_finish']
     )