自然进化

1. fay启动命令增加参数config_center;
2. 修复多个think标签处理逻辑问题;
3. 修复llm透传模式编码问题；

main.py

@@ -1,22 +1,33 @@
-#入口文件main
-import os
-os.environ['PATH'] += os.pathsep + os.path.join(os.getcwd(), "test", "ovr_lipsync", "ffmpeg", "bin")
-import sys
-import time
-import psutil
-import re
-import argparse
-import signal
-import atexit
-import threading
-from utils import config_util, util
-from asr import ali_nls
-from core import wsa_server
-from gui import flask_server
-from core import content_db
-import fay_booter
-from scheduler.thread_manager import MyThread
-from core.interact import Interact
+#入口文件main
+import os
+import sys
+
+os.environ['PATH'] += os.pathsep + os.path.join(os.getcwd(), "test", "ovr_lipsync", "ffmpeg", "bin")
+
+def _preload_config_center(argv):
+    for i, arg in enumerate(argv):
+        if arg in ("-config_center", "--config_center"):
+            if i + 1 < len(argv):
+                os.environ["FAY_CONFIG_CENTER_ID"] = argv[i + 1]
+            break
+
+_preload_config_center(sys.argv[1:])
+
+import time
+import psutil
+import re
+import argparse
+import signal
+import atexit
+import threading
+from utils import config_util, util
+from asr import ali_nls
+from core import wsa_server
+from gui import flask_server
+from core import content_db
+import fay_booter
+from scheduler.thread_manager import MyThread
+from core.interact import Interact
 
 # import sys, io, traceback
 # class StdoutInterceptor(io.TextIOBase):
@@ -247,12 +258,16 @@ if __name__ == '__main__':
     if config_util.start_mode == 'web':
         util.log(1, '请通过浏览器访问 http://127.0.0.1:5000/ 管理您的Fay')
 
-    parser = argparse.ArgumentParser(description="start自启动")
-    parser.add_argument('command', nargs='?', default='', help="start")
-
-    parsed_args = parser.parse_args()
-    if parsed_args.command.lower() == 'start':
-        MyThread(target=fay_booter.start).start()
+    parser = argparse.ArgumentParser(description="start自启动")
+    parser.add_argument('command', nargs='?', default='', help="start")
+    parser.add_argument('-config_center', '--config_center', dest='config_center', default=None, help="配置中心项目ID")
+
+    parsed_args = parser.parse_args()
+    if parsed_args.config_center:
+        os.environ["FAY_CONFIG_CENTER_ID"] = parsed_args.config_center
+        config_util.CONFIG_SERVER['PROJECT_ID'] = parsed_args.config_center
+    if parsed_args.command.lower() == 'start':
+        MyThread(target=fay_booter.start).start()
 
 
     #普通模式下启动窗口