Upload 3 files

mods/btn_submit_vo_suggest.py

@@ -1,12 +1,6 @@
 def init(cfg):
     # ========== 自定义组合建的功能 ==========
-    combine = [
-        'btn_submit_fn_usr',
-        'btn_rag_fn',
-        'btn_submit_fn_bot',
-        'btn_vo_fn',
-        'btn_suggest_fn'
-    ]
+    combine = cfg['btn_submit_vo_suggest_combine']
     tmp = cfg['btn_submit_vo_suggest'].click(**cfg['btn_start'])
     for f in combine:
         tmp = tmp.success(**cfg[f])

mods/btn_vo.py

@@ -19,9 +19,6 @@ def init(cfg):
             if cfg['btn_stop_status']:
                 yield '', model.venv_info
                 return
-            # ========== 及时清理上一次生成的旁白 ==========
-            model.venv_remove('vo')
-            print('清理旁白', model.venv_info)
             # ========== 模型输出旁白 ==========
             model.venv_create('vo')  # 创建隔离环境
             _tmp = btn_com(_n_keep, _n_discard,
@@ -32,6 +29,10 @@ def init(cfg):
                            _mirostat_tau, '旁白', _max_tokens)
             for _h in _tmp:
                 yield _h, model.venv_info
+            # ========== 及时清理上一次生成的旁白 ==========
+            model.venv_remove('vo', keep_last=True)
+            yield _h, model.venv_info
+            print('清理旁白', model.venv_info)
 
     cfg['btn_vo_fn'] = {
         'fn': btn_vo,

mods/read_cfg.py

@@ -1,5 +1,16 @@
 import hashlib
 import json
+import os
+
+
+def get_all_files_in_directory(directory, ext=''):
+    all_files = []
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            if file.endswith(ext):
+                file_path = os.path.join(root, file)
+                all_files.append(file_path)
+    return all_files
 
 
 # ========== 哈希函数 ==========
@@ -10,7 +21,9 @@ def x_hash(x: str):
 # ========== 读取配置文件 ==========
 with open('rp_config.json', encoding='utf-8') as f:
     tmp = f.read()
-with open('rp_sample_config.json', encoding='utf-8') as f:
-    cfg = json.load(f)
+cfg = json.loads(tmp)
+for path in get_all_files_in_directory('config', ext='.json'):
+    with open(path, encoding='utf-8') as f:
+        cfg.update(json.load(f))
 cfg['setting_cache_path']['value'] += x_hash(tmp)
-cfg.update(json.loads(tmp))
+