From 9e3988327638f7d9c8526c9c780d212d26ea6e28 Mon Sep 17 00:00:00 2001 From: Chingfeng Li Date: Mon, 24 Nov 2025 16:29:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4OpenAI=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84=E5=8F=82=E6=95=B0top=5Fk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/core/providers/llm/openai/openai.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main/xiaozhi-server/core/providers/llm/openai/openai.py b/main/xiaozhi-server/core/providers/llm/openai/openai.py index 6e0cd66d..2863c420 100644 --- a/main/xiaozhi-server/core/providers/llm/openai/openai.py +++ b/main/xiaozhi-server/core/providers/llm/openai/openai.py @@ -24,7 +24,6 @@ class LLMProvider(LLMProviderBase): "max_tokens": int, "temperature": lambda x: round(float(x), 1), "top_p": lambda x: round(float(x), 1), - "top_k": int, "frequency_penalty": lambda x: round(float(x), 1), } @@ -40,7 +39,7 @@ class LLMProvider(LLMProviderBase): setattr(self, param, None) logger.debug( - f"意图识别参数初始化: {self.temperature}, {self.max_tokens}, {self.top_p}, {self.top_k}, {self.frequency_penalty}" + f"意图识别参数初始化: {self.temperature}, {self.max_tokens}, {self.top_p}, {self.frequency_penalty}" ) model_key_msg = check_model_key("LLM", self.api_key) @@ -71,7 +70,6 @@ class LLMProvider(LLMProviderBase): "max_tokens": kwargs.get("max_tokens", self.max_tokens), "temperature": kwargs.get("temperature", self.temperature), "top_p": kwargs.get("top_p", self.top_p), - "top_k": kwargs.get("top_k", self.top_k), "frequency_penalty": kwargs.get("frequency_penalty", self.frequency_penalty), } @@ -116,7 +114,6 @@ class LLMProvider(LLMProviderBase): "max_tokens": kwargs.get("max_tokens", self.max_tokens), "temperature": kwargs.get("temperature", self.temperature), "top_p": kwargs.get("top_p", self.top_p), - "top_k": kwargs.get("top_k", self.top_k), "frequency_penalty": kwargs.get("frequency_penalty", self.frequency_penalty), } From 4645c50f6d7cf410e1eaff8c97a865e8859b4619 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Tue, 25 Nov 2025 16:11:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=B0=86=E5=9E=83=E5=9C=BE=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E6=94=BE=E7=BD=AEws=E5=85=B3=E9=97=AD=E5=A4=84?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E9=A2=91=E7=B9=81=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/core/connection.py | 3 +++ main/xiaozhi-server/core/handle/reportHandle.py | 1 - main/xiaozhi-server/core/providers/asr/aliyun_stream.py | 1 - main/xiaozhi-server/core/providers/asr/base.py | 1 - main/xiaozhi-server/core/providers/asr/doubao_stream.py | 1 - main/xiaozhi-server/core/providers/asr/xunfei_stream.py | 1 - main/xiaozhi-server/core/providers/vad/silero.py | 1 - main/xiaozhi-server/core/utils/opus_encoder_utils.py | 1 - main/xiaozhi-server/core/utils/util.py | 1 - 9 files changed, 3 insertions(+), 8 deletions(-) diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py index d5b9ca4a..507f3942 100644 --- a/main/xiaozhi-server/core/connection.py +++ b/main/xiaozhi-server/core/connection.py @@ -1127,6 +1127,9 @@ class ConnectionHandler: ) self.executor = None + import gc + gc.collect() + self.logger.bind(tag=TAG).info("连接资源已释放") except Exception as e: self.logger.bind(tag=TAG).error(f"关闭连接时出错: {e}") diff --git a/main/xiaozhi-server/core/handle/reportHandle.py b/main/xiaozhi-server/core/handle/reportHandle.py index cc78a157..679f90e8 100644 --- a/main/xiaozhi-server/core/handle/reportHandle.py +++ b/main/xiaozhi-server/core/handle/reportHandle.py @@ -97,7 +97,6 @@ def opus_to_wav(conn, opus_data): if decoder is not None: try: del decoder - gc.collect() except Exception as e: conn.logger.bind(tag=TAG).debug(f"释放decoder资源时出错: {e}") diff --git a/main/xiaozhi-server/core/providers/asr/aliyun_stream.py b/main/xiaozhi-server/core/providers/asr/aliyun_stream.py index 23999fca..179685bd 100644 --- a/main/xiaozhi-server/core/providers/asr/aliyun_stream.py +++ b/main/xiaozhi-server/core/providers/asr/aliyun_stream.py @@ -353,7 +353,6 @@ class ASRProvider(ASRProviderBase): try: del self.decoder self.decoder = None - gc.collect() logger.bind(tag=TAG).debug("Aliyun decoder resources released") except Exception as e: logger.bind(tag=TAG).debug(f"释放Aliyun decoder资源时出错: {e}") diff --git a/main/xiaozhi-server/core/providers/asr/base.py b/main/xiaozhi-server/core/providers/asr/base.py index 2d88ff70..7e36de5c 100644 --- a/main/xiaozhi-server/core/providers/asr/base.py +++ b/main/xiaozhi-server/core/providers/asr/base.py @@ -271,6 +271,5 @@ class ASRProviderBase(ABC): if decoder is not None: try: del decoder - gc.collect() except Exception as e: logger.bind(tag=TAG).debug(f"释放decoder资源时出错: {e}") diff --git a/main/xiaozhi-server/core/providers/asr/doubao_stream.py b/main/xiaozhi-server/core/providers/asr/doubao_stream.py index 7d0871a6..2d179b86 100644 --- a/main/xiaozhi-server/core/providers/asr/doubao_stream.py +++ b/main/xiaozhi-server/core/providers/asr/doubao_stream.py @@ -377,7 +377,6 @@ class ASRProvider(ASRProviderBase): try: del self.decoder self.decoder = None - gc.collect() logger.bind(tag=TAG).debug("Doubao decoder resources released") except Exception as e: logger.bind(tag=TAG).debug(f"释放Doubao decoder资源时出错: {e}") diff --git a/main/xiaozhi-server/core/providers/asr/xunfei_stream.py b/main/xiaozhi-server/core/providers/asr/xunfei_stream.py index 7bd992a9..6a895ebc 100644 --- a/main/xiaozhi-server/core/providers/asr/xunfei_stream.py +++ b/main/xiaozhi-server/core/providers/asr/xunfei_stream.py @@ -519,7 +519,6 @@ class ASRProvider(ASRProviderBase): try: del self.decoder self.decoder = None - gc.collect() logger.bind(tag=TAG).debug("Xunfei decoder resources released") except Exception as e: logger.bind(tag=TAG).debug(f"释放Xunfei decoder资源时出错: {e}") diff --git a/main/xiaozhi-server/core/providers/vad/silero.py b/main/xiaozhi-server/core/providers/vad/silero.py index 6fc26291..ae51b88f 100644 --- a/main/xiaozhi-server/core/providers/vad/silero.py +++ b/main/xiaozhi-server/core/providers/vad/silero.py @@ -41,7 +41,6 @@ class VADProvider(VADProviderBase): if hasattr(self, 'decoder') and self.decoder is not None: try: del self.decoder - gc.collect() except Exception: pass diff --git a/main/xiaozhi-server/core/utils/opus_encoder_utils.py b/main/xiaozhi-server/core/utils/opus_encoder_utils.py index cf76dd6b..300b2422 100644 --- a/main/xiaozhi-server/core/utils/opus_encoder_utils.py +++ b/main/xiaozhi-server/core/utils/opus_encoder_utils.py @@ -133,6 +133,5 @@ class OpusEncoderUtils: try: del self.encoder self.encoder = None - gc.collect() except Exception as e: logging.error(f"Error releasing Opus encoder: {e}") \ No newline at end of file diff --git a/main/xiaozhi-server/core/utils/util.py b/main/xiaozhi-server/core/utils/util.py index 9586ace8..37388be8 100644 --- a/main/xiaozhi-server/core/utils/util.py +++ b/main/xiaozhi-server/core/utils/util.py @@ -398,7 +398,6 @@ def opus_datas_to_wav_bytes(opus_datas, sample_rate=16000, channels=1): if decoder is not None: try: del decoder - gc.collect() except Exception: pass