fix: 废弃activeMode(wzpan#224); robot 加回ChatGPT的选项(wzpan#223)

connormai · Apr 1, 2023 · 670e364 · 670e364
1 parent 4c42f43
commit 670e364
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/robot/Conversation.py b/robot/Conversation.py
@@ -239,17 +239,12 @@ def appendHistory(self, t, text, UUID="", plugin=""):
             )
 
     def _onCompleted(self, msg):
-        if config.get("active_mode", False) and (
-            msg.endswith("?") or msg.endswith("？") or "告诉我" in msg or "请回答" in msg
-        ):
-            query = self.activeListen()
-            self.doResponse(query)
+        pass        
 
     def pardon(self):
         if not self.hasPardon:
             self.say(
-                "抱歉，刚刚没听清，能再说一遍吗？",
-                onCompleted=lambda: self.doResponse(self.activeListen()),
+                "抱歉，刚刚没听清，能再说一遍吗？", cache=True
             )
             self.hasPardon = True
         else:

diff --git a/static/default.yml b/static/default.yml
@@ -72,9 +72,6 @@ LED:
     enable: false
     type: aiy  # aiy: Google AIY Voice Kit; respeaker：respeaker 2Mics
 
-# 当机器人反问用户时，是否自动进入下一轮聆听
-active_mode: true
-
 # 勿扰模式，该时间段内自动进入睡眠，避免监听
 do_not_bother:
     enable: false # true: 开启; false: 关闭
@@ -186,6 +183,7 @@ nlu_engine: unit
 # openai    - OpenAI ChatGPT(要求 Python >= 3.7.1）
 # anyq      - AnyQ
 # tuling    - 图灵机器人
+# openai    - OpenAI ChatGPT
 robot: unit
 
 # 百度 UNIT