Merge branch 'pip_version' into dependabot/pip/main/xiaozhi-server/openai-2.5.0

main/xiaozhi-server/app.py

@@ -46,12 +46,18 @@ async def main():
     check_ffmpeg_installed()
     config = load_config()
 
-    # 默认使用manager-api的secret作为auth_key
-    # 如果secret为空，则生成随机密钥
-    # auth_key用于jwt认证，比如视觉分析接口的jwt认证
-    auth_key = config.get("manager-api", {}).get("secret", "")
+    # auth_key优先级：配置文件server.auth_key > manager-api.secret > 自动生成
+    # auth_key用于jwt认证，比如视觉分析接口的jwt认证、ota接口的token生成与websocket认证
+    # 获取配置文件中的auth_key
+    auth_key = config["server"].get("auth_key", "")
+    
+    # 验证auth_key，无效则尝试使用manager-api.secret
     if not auth_key or len(auth_key) == 0 or "你" in auth_key:
-        auth_key = str(uuid.uuid4().hex)
+        auth_key = config.get("manager-api", {}).get("secret", "")
+        # 验证secret，无效则生成随机密钥
+        if not auth_key or len(auth_key) == 0 or "你" in auth_key:
+            auth_key = str(uuid.uuid4().hex)
+    
     config["server"]["auth_key"] = auth_key
 
     # 添加 stdin 监控任务

main/xiaozhi-server/requirements.txt

@@ -6,7 +6,7 @@ opuslib_next==1.1.2
 numpy==1.26.4
 pydub==0.25.1
 funasr==1.2.3
-torchaudio==2.2.2
+torchaudio==2.9.0
 openai==2.5.0
 google-generativeai==0.8.5
 edge_tts==7.0.0
@@ -18,7 +18,7 @@ ruamel.yaml==0.18.15
 loguru==0.7.3
 requests==2.32.5
 cozepy==0.19.0
-mem0ai==0.1.62
+mem0ai==1.0.0
 bs4==0.0.2
 modelscope==1.23.2
 sherpa_onnx==1.12.11