From 23dc6f1ea90e5b638e8ca9ea4c0c4d7f30d724f1 Mon Sep 17 00:00:00 2001 From: Chingfeng Li Date: Mon, 8 Sep 2025 16:26:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A3=B0=E7=BA=B9=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/config.yaml | 1 + main/xiaozhi-server/core/connection.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml index c0aa3f93..72365f62 100644 --- a/main/xiaozhi-server/config.yaml +++ b/main/xiaozhi-server/config.yaml @@ -141,6 +141,7 @@ plugins: # 声纹识别配置 voiceprint: + enable: false # 声纹接口地址 url: # 说话人配置：speaker_id,名称,描述 diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py index 4b3b9d1c..6bbfbda9 100644 --- a/main/xiaozhi-server/core/connection.py +++ b/main/xiaozhi-server/core/connection.py @@ -430,12 +430,16 @@ class ConnectionHandler: def _initialize_voiceprint(self): """为当前连接初始化声纹识别""" try: - voiceprint_config = self.config.get("voiceprint", {}) - if voiceprint_config: - self.voiceprint_provider = VoiceprintProvider(voiceprint_config) - self.logger.bind(tag=TAG).info("声纹识别功能已在连接时动态启用") + voiceprint_enable = self.config.get("voiceprint", {}).get("enable", False) + if voiceprint_enable: + voiceprint_provider = VoiceprintProvider(self.config.get("voiceprint", {})) + if voiceprint_provider is not None and voiceprint_provider.enabled: + self.voiceprint_provider = voiceprint_provider + self.logger.bind(tag=TAG).info("声纹识别功能已在连接时动态启用") + else: + self.logger.bind(tag=TAG).warning("声纹识别功能启用但配置不完整") else: - self.logger.bind(tag=TAG).info("声纹识别功能未启用或配置不完整") + self.logger.bind(tag=TAG).info("声纹识别功能未启用") except Exception as e: self.logger.bind(tag=TAG).warning(f"声纹识别初始化失败: {str(e)}") From 9262963f207ec3d907ab532d8400762021efa0d4 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 8 Sep 2025 17:55:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E9=85=8D=E7=BD=AE=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/core/connection.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py index 6bbfbda9..324237dd 100644 --- a/main/xiaozhi-server/core/connection.py +++ b/main/xiaozhi-server/core/connection.py @@ -430,9 +430,9 @@ class ConnectionHandler: def _initialize_voiceprint(self): """为当前连接初始化声纹识别""" try: - voiceprint_enable = self.config.get("voiceprint", {}).get("enable", False) - if voiceprint_enable: - voiceprint_provider = VoiceprintProvider(self.config.get("voiceprint", {})) + voiceprint_config = self.config.get("voiceprint", {}) + if voiceprint_config: + voiceprint_provider = VoiceprintProvider(voiceprint_config) if voiceprint_provider is not None and voiceprint_provider.enabled: self.voiceprint_provider = voiceprint_provider self.logger.bind(tag=TAG).info("声纹识别功能已在连接时动态启用") From aef6d5dc1db848499f2067afcef1446a08f0dc53 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 8 Sep 2025 17:55:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E9=85=8D=E7=BD=AE=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml index 5a78bea2..8c6897b5 100644 --- a/main/xiaozhi-server/config.yaml +++ b/main/xiaozhi-server/config.yaml @@ -144,7 +144,6 @@ plugins: # 声纹识别配置 voiceprint: - enable: false # 声纹接口地址 url: # 说话人配置：speaker_id,名称,描述 @@ -914,4 +913,4 @@ TTS: audio_format: "pcm" # 默认音色，如需其他音色可到项目assets文件夹下注册 voice: "jay_klee" - output_dir: tmp/ \ No newline at end of file + output_dir: tmp/