From 3ab5dc49ac779568d725e44216d613eb1104e29d Mon Sep 17 00:00:00 2001 From: Sakura-RanChen <1908198662@qq.com> Date: Mon, 2 Feb 2026 16:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8F=92=E5=85=A5=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5id=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/changelog/202601291552.sql | 1 - .../src/main/resources/db/changelog/202602021555.sql | 1 + .../src/main/resources/db/changelog/db.changelog-master.yaml | 4 ++-- main/xiaozhi-server/core/connection.py | 4 ---- main/xiaozhi-server/core/providers/llm/openai/openai.py | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 main/manager-api/src/main/resources/db/changelog/202601291552.sql create mode 100644 main/manager-api/src/main/resources/db/changelog/202602021555.sql diff --git a/main/manager-api/src/main/resources/db/changelog/202601291552.sql b/main/manager-api/src/main/resources/db/changelog/202601291552.sql deleted file mode 100644 index aa60c4a8..00000000 --- a/main/manager-api/src/main/resources/db/changelog/202601291552.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT INTO `sys_params` (param_code, param_value, value_type, param_type, remark) VALUES ('system_error_response', '主人，小智现在有点忙，我们稍后再试吧。', 'string', 1, '系统错误时的回复'); diff --git a/main/manager-api/src/main/resources/db/changelog/202602021555.sql b/main/manager-api/src/main/resources/db/changelog/202602021555.sql new file mode 100644 index 00000000..4f4602d9 --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202602021555.sql @@ -0,0 +1 @@ +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (502, 'system_error_response', '主人，小智现在有点忙，我们稍后再试吧。', 'string', 1, '系统错误时的回复'); diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml index f606af77..720e6af5 100755 --- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -509,9 +509,9 @@ databaseChangeLog: encoding: utf8 path: classpath:db/changelog/202601261730.sql - changeSet: - id: 202601291552 + id: 202602021555 author: shengzhou1216 changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202601291552.sql \ No newline at end of file + path: classpath:db/changelog/202602021555.sql diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py index d2856908..37b72248 100644 --- a/main/xiaozhi-server/core/connection.py +++ b/main/xiaozhi-server/core/connection.py @@ -137,7 +137,6 @@ class ConnectionHandler: self.current_language_tag = None # 存储当前ASR识别的语言标签 # llm相关变量 - self.llm_finish_task = True self.dialogue = Dialogue() # tts相关变量 @@ -801,7 +800,6 @@ class ConnectionHandler: # 为最顶层时新建会话ID和发送FIRST请求 if depth == 0: - self.llm_finish_task = False self.sentence_id = str(uuid.uuid4().hex) self.dialogue.put(Message(role="user", content=query)) self.tts.tts_text_queue.put( @@ -935,7 +933,6 @@ class ConnectionHandler: content_type=ContentType.ACTION, ) ) - self.llm_finish_task = True return # 处理function call if tool_call_flag: @@ -1017,7 +1014,6 @@ class ConnectionHandler: content_type=ContentType.ACTION, ) ) - self.llm_finish_task = True # 使用lambda延迟计算，只有在DEBUG级别时才执行get_llm_dialogue() self.logger.bind(tag=TAG).debug( lambda: json.dumps( diff --git a/main/xiaozhi-server/core/providers/llm/openai/openai.py b/main/xiaozhi-server/core/providers/llm/openai/openai.py index ccc9b329..58ec725c 100644 --- a/main/xiaozhi-server/core/providers/llm/openai/openai.py +++ b/main/xiaozhi-server/core/providers/llm/openai/openai.py @@ -76,7 +76,6 @@ class LLMProvider(LLMProviderBase): if value is not None: request_params[key] = value - # raise ValueError("model_name is required") responses = self.client.chat.completions.create(**request_params) is_active = True