Merge branch 'main' of https://github.com/xszyou/Fay

config.json

@@ -1,13 +1,16 @@
 {
     "attribute": {
+        "additional": "\u53d1\u5446",
         "age": "\u6210\u5e74",
         "birth": "Github",
         "constellation": "\u6c34\u74f6\u5ea7",
         "contact": "qq467665317",
         "gender": "\u5973",
+        "goal": "\u89e3\u51b3\u95ee\u9898",
         "hobby": "\u53d1\u5446",
         "job": "\u52a9\u7406",
         "name": "\u83f2\u83f2",
+        "position": "\u5ba2\u670d",
         "voice": "\u6653\u6653(edge)",
         "zodiac": "\u86c7"
     },

core/fay_core.py

@@ -31,7 +31,6 @@ from llm import nlp_ollama_api
 from llm import nlp_coze
 from llm.agent import fay_agent
 from llm import nlp_qingliu
-from llm import nlp_return
 from llm import nlp_gpt_stream
 from core import stream_manager
 
@@ -68,7 +67,6 @@ modules = {
     "nlp_coze": nlp_coze,
     "nlp_agent": fay_agent,
     "nlp_qingliu": nlp_qingliu,
-    "nlp_return": nlp_return,
     "nlp_gpt_stream": nlp_gpt_stream
 
 }

core/recorder.py

@@ -8,7 +8,6 @@ from queue import Queue
 
 from asr.ali_nls import ALiNls
 from asr.funasr import FunASR
-from asr.gemini_asr import GeminiASR
 from core import wsa_server
 from scheduler.thread_manager import MyThread
 from utils import util
@@ -60,8 +59,6 @@ class Recorder:
             asrcli = ALiNls(self.username)
         elif self.ASRMode == "funasr" or self.ASRMode == "sensevoice":
             asrcli = FunASR(self.username)
-        elif self.ASRMode == "gemini":
-            asrcli = GeminiASR(self.username)
         return asrcli
 
     def save_buffer_to_file(self, buffer):