Merge pull request #2602 from xinnan-tech/remove_gc

update:将垃圾回收放置ws关闭处，避免频繁操作

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}")

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}")
 

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}")

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}")

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}")

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}")

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
 

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}")

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