Compare commits

...
3317 Commits
Author SHA1 Message Date
FAN-yeB f7782b1f6e update:新增SLM唤醒词回复 2026-05-15 10:50:52 +08:00
wengzhandGitHub fb7e2e17a8 Merge pull request #3176 from xinnan-tech/perf-tool-add-online-search
Perf:新增联网搜索工具类、修复新闻描述配置获取源问题
2026-05-14 10:51:23 +08:00
欣南科技andGitHub bcce6a4ebe Merge pull request #3174 from xinnan-tech/faq-digital-human
add:faq增加数字人相关链接
2026-05-13 17:24:01 +08:00
hrz 7ef86eb3c6 add:faq增加数字人相关链接 2026-05-13 17:20:21 +08:00
wengzhandGitHub 789b207a94 Merge pull request #3173 from xinnan-tech/chore-move-multilingual-readmes-to-docs
chore:迁移多语言 README 到 docs/readme
2026-05-12 15:20:06 +08:00
DaGou12138 db14d08c7b perf:
1、新增联网搜索工具类(web_search)
2、修复新闻描述配置获取源问题,改为从连接配置获取
3、新增web_search所需配置项数据集
2026-05-12 15:16:31 +08:00
DaGou12138 46e7f8508d perf:
1、新增联网搜索工具类(web_search)
2、修复新闻描述配置获取源问题,改为从连接配置获取
3、新增web_search所需配置项数据集
2026-05-12 15:16:08 +08:00
3030332422 f3583742c7 chore:迁移多语言 README 到 docs/readme 2026-05-12 15:15:08 +08:00
wengzhandGitHub 27de4c40ea Merge pull request #3111 from xinnan-tech/py-test-wake
test测试页面唤醒功能
2026-05-12 11:00:58 +08:00
3030332422 98ba86d4a6 update:对文档的补充说明 2026-05-12 10:49:02 +08:00
3030332422 2aa1a8d590 update:补充 2026-05-12 10:24:19 +08:00
3030332422 a2c3da55cd update:关于对digital-human的markdown文档的修改 2026-05-12 09:45:43 +08:00
3030332422 41ad57ad4f update:test迁移重命名为digital-human 2026-05-12 09:27:39 +08:00
hrz 6e1ed9fa4d update:简化说明;默认开启唤醒词 2026-05-10 20:26:40 +08:00
wengzhandGitHub 1b5c00231a Merge pull request #3165 from xinnan-tech/fix-chat-total
fix: 修复聊天记录左侧会话数量统计
2026-05-09 15:56:05 +08:00
zhuoqinglian 95acba1126 fix: 修复聊天记录左侧会话数量统计 2026-05-09 15:54:53 +08:00
wengzhandGitHub 1e6f0fd1be Merge pull request #3162 from xinnan-tech/perf-tool-call-optimization
fix:修复音乐播放工具TTS上报记录问题
2026-05-08 16:40:37 +08:00
DaGou12138 eb571fae57 fix:修复音乐播放工具TTS上报记录问题 2026-05-08 16:38:23 +08:00
wengzhandGitHub 2946be7284 Merge pull request #3161 from xinnan-tech/perf-tool-call-optimization
fix:优化天气工具调用提示词
2026-05-08 14:23:11 +08:00
DaGou12138 425cb1d6bd fix:优化天气工具调用提示词,本地上下文存在当前所在地的天气信息无需再度查询工具 2026-05-08 14:20:52 +08:00
wengzhandGitHub cf9b0ec712 Merge pull request #3160 from xinnan-tech/fix-chat-title
fix: 修复聊天记录标题过长展示异常的问题
2026-05-08 11:08:23 +08:00
zhuoqinglian 1b053dc9c8 fix: 修复聊天记录标题过长展示异常的问题 2026-05-08 11:05:20 +08:00
wengzhandGitHub d7ad656bd0 Merge pull request #3159 from xinnan-tech/perf-tool-call-optimization
fix:优化对话过程中JSON闭合符号清理的问题
2026-05-08 10:48:58 +08:00
DaGou12138 7dae67a57b fix:优化对话过程中JSON闭合符号清理的问题 2026-05-08 10:46:37 +08:00
wengzhandGitHub 7b0f59a747 Merge pull request #3158 from xinnan-tech/chore/cleanup
chore: 暂时移除近期不可用或不稳定的TTS供应器及相关配置
2026-05-08 10:38:53 +08:00
DaGou12138 2eaa5bbb11 fix:优化对话过程中异常符号记录的问题 2026-05-08 10:29:50 +08:00
FAN-yeB c693ff1564 update:linkerai 近期多次测试,linkerai接口无法提供稳定服务,先暂时下架这个供应器 2026-05-08 10:18:26 +08:00
DaGou12138andGitHub e9bf006d9d Merge pull request #3154 from haixinke/Bug-get-user-prifile-null
fix:当打开用户画像开关时,修复获取用户画像为空的问题
2026-05-07 16:01:57 +08:00
wengzhandGitHub bef96f36e2 Merge pull request #3157 from xinnan-tech/fix-streaming-tts-original-text
Fix streaming tts original text
2026-05-07 15:36:56 +08:00
wengzhandGitHub bebb7eac69 Merge pull request #3156 from xinnan-tech/perf-tool-call-optimization
perf:优化新闻工具新闻源配置获取的逻辑
2026-05-07 11:43:17 +08:00
DaGou12138 a787130b74 perf:
1、优化新闻工具新闻源获取的逻辑
2、调整新闻工具描述内容
2026-05-07 11:41:17 +08:00
FAN-yeB 8b7f16b9c2 update:TTS_GizwitsTTS 近期机智云语音合成不成功,先暂时下架这个供应器 2026-05-07 11:27:32 +08:00
FAN-yeB 9ed66ec013 update:TTS_ACGNTTS 海豚配音截止5月7日未找到token入口,先暂时下架这个供应器 2026-05-07 10:54:03 +08:00
FAN-yeB 05c22cdf2a update:更新 .gitignore忽略.claude目录 2026-05-07 10:23:02 +08:00
FAN-yeB 4bc0b67cd7 update:去除无用的.claude目录 2026-05-07 10:20:48 +08:00
Sakura-RanChen 0a6f811448 fix: 修复流式情况下替换词失败 2026-05-07 10:20:10 +08:00
wengzhandGitHub 5aeb55fffd Merge pull request #3155 from xinnan-tech/perf-tool-call-optimization
perf:优化工具调用问题、调整后端智能体搜索条件逻辑
2026-05-06 17:01:15 +08:00
DaGou12138 c33ee9442e perf:
1、优化小智后端智能体搜索条件逻辑
2、优化工具调用准确率问题,修改工具提示词,去除非必要的few-shot逻辑
3、优化工具描述内容
2026-05-06 16:53:06 +08:00
minwang 4670ad2925 delete log 2026-05-01 16:03:02 +08:00
minwangandClaude Sonnet 4.6 b542388053 🐛 修复PowerMem用户画像查询返回空的问题
修复 get_user_profile() 方法在缓存未命中时主动从 SDK 获取用户画
像,支持 profile_content 和 topics 两种格式,解决新对话中用户画像无法显示的问题

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-01 14:57:36 +08:00
3030332422 ba68c3d423 update:修改文档示例密码 2026-04-30 19:54:09 +08:00
3030332422 c30cd5ca79 update:添加“一体机数字人”配置说明 2026-04-30 18:04:44 +08:00
rainv123 a71ce53a68 fix:修复使用替换词时,火山引擎双向流式tts的文本显示/上报问题 2026-04-30 17:33:40 +08:00
rainv123 dd88107131 Revert "fix: 修复流式TTS替换词显示/上报问题"
This reverts commit 8b847a3826.
2026-04-30 15:57:03 +08:00
rainv123 8b847a3826 fix: 修复流式TTS替换词显示/上报问题 2026-04-30 14:32:36 +08:00
wengzhandGitHub 036b89f24e Merge pull request #3151 from xinnan-tech/py-refactor-asr-tts
调整配置
2026-04-30 11:42:36 +08:00
Sakura-RanChen 354280d430 调整配置 2026-04-30 11:41:16 +08:00
hrzandGitHub e2d16ec8d4 Merge pull request #3150 from Mirrorium227/main
Closes #Issue3149 修复文档序号
2026-04-30 11:27:15 +08:00
Radar SongandGitHub 6a0192de27 Closes #Issue3149 修复文档序号 2026-04-29 20:18:17 +08:00
hrzandGitHub ac6eeb5c1f Merge pull request #3145 from haixinke/fix-bug_prompt_cache_key_wrong
Fix:【设备快速提示词缓存key错误】
2026-04-29 14:32:42 +08:00
minwang 23e213f6ea 修复设备快速提示词缓存key错误 2026-04-28 15:52:23 +08:00
wengzhandGitHub 382c948482 Merge pull request #3144 from xinnan-tech/fix-memory-config
fix:修复记忆模型配置保存字段未删除问题
2026-04-28 15:25:49 +08:00
DaGou12138 a67d938523 fix:修复记忆模型配置保存字段未删除问题 2026-04-28 15:23:57 +08:00
wengzhandGitHub 26aca54f4b Merge pull request #3141 from xinnan-tech/add-correct-word
fix修复 asyncio.gather 吞掉业务异常的问题
2026-04-27 17:31:47 +08:00
rainv123 4717b8beac fix修复 asyncio.gather 吞掉业务异常的问题 2026-04-27 17:29:41 +08:00
wengzhandGitHub cd580b6f81 Merge pull request #3139 from xinnan-tech/py-fix-mem0ai
fix: 修复Mem0AI记忆模式工具调用时保存记忆400错误
2026-04-27 16:57:26 +08:00
3030332422 70740af7a6 fix: 修复Mem0AI记忆模式工具调用时保存记忆400错误 2026-04-27 16:25:05 +08:00
wengzhandGitHub 7b30c25923 Merge pull request #3132 from xinnan-tech/replacement-word
feat: 新增替换词管理功能
2026-04-27 16:23:54 +08:00
wengzhandGitHub 7db13b8be2 Merge pull request #3130 from xinnan-tech/add-correct-word
add:替换词功能
2026-04-27 16:23:33 +08:00
wengzhandGitHub a0df41ac24 Merge pull request #3136 from xinnan-tech/performance_tester
update:解决base类修改后测速工具兼容性问题
2026-04-27 15:08:26 +08:00
FAN-yeB a432c295d3 update:解决base类修改后测速工具兼容性问题 2026-04-27 15:06:40 +08:00
wengzhandGitHub ab8a35e233 Merge pull request #3135 from xinnan-tech/perf-tool-call-optimization
Perf:优化工具调用准确性、禁用标题总结与记忆模型思考模式、拆分动态上下文
2026-04-27 14:54:16 +08:00
DaGou12138 160b67197f Merge branch 'refs/heads/main' into perf-tool-call-optimization 2026-04-27 14:23:28 +08:00
欣南科技andGitHub 3510282cd5 Merge pull request #3134 from xinnan-tech/0.9.3
Bump to 0.9.3
2026-04-27 12:46:10 +08:00
hrz bdf7c7facf Bump to 0.9.3 2026-04-27 12:44:02 +08:00
DaGou12138 151a0c1b99 perf:
1、优化工具调用相关提示词,拆分静态system-prompt和动态上下文。
2、新增few-shot示例,使用"调用→结果→回复"流程闭环,显著提高多次会话后工具调用准确性。
3、去除对话标题总结和记忆的模型思考模式。
2026-04-27 11:08:25 +08:00
zhuoqinglian 52af722463 update: 更新替换词数量限制 2026-04-24 14:54:37 +08:00
wengzhandGitHub fa91c97685 Merge pull request #3131 from xinnan-tech/fix-wifi-no-response
fix: 修复设备配网成功没有自动退出配网模式
2026-04-24 14:38:06 +08:00
zhuoqinglian a92d6ccdfb fix: 修复设备配网成功没有自动退出配网模式 2026-04-24 14:35:34 +08:00
zhuoqinglianandGitHub f5ce755fea Merge pull request #3116 from wujingquan/main
Add WiFi password translations for multiple languages
2026-04-24 14:15:27 +08:00
rainv123 606a42cfb2 update:替换词功能 2026-04-24 10:06:26 +08:00
zhuoqinglian f85e863144 feat: 新增替换词管理功能 2026-04-23 17:50:57 +08:00
wengzhandGitHub 550397de98 Merge pull request #3127 from xinnan-tech/py-fix-asr
Py fix asr
2026-04-23 10:46:09 +08:00
Sakura-RanChen ff66b815a5 fix: 在模型和工具调用期间进行打断后说完话错误退出问题 2026-04-23 10:17:43 +08:00
Sakura-RanChen 8c18e48b97 fix: 停止帧发送后与原先音频时序问题
回退退出工具打断处理(在大模型思考期间进行打断,然后大模型立马调用退出工具会造成死锁,因模型思考时间和是否调用工具不确定性,状态难管理)
2026-04-22 15:55:28 +08:00
3030332422 44587985dd fix: 优化唤醒词音频采集 2026-04-22 11:42:22 +08:00
wengzhandGitHub 4acd02e2b0 Merge pull request #3125 from xinnan-tech/py-fix-llm-chunk
fix: 修复频繁打断下生成器不会清理
2026-04-22 11:30:35 +08:00
wengzhandGitHub ddfbacc717 Merge pull request #3124 from xinnan-tech/py-add-ASRv2
使用双流优化版接口(速度提升),增加豆包流式语音识别模型2.0模型选择
2026-04-22 11:29:57 +08:00
Sakura-RanChen 2a4dbdb69b fix: 修复频繁打断下生成器不会清理 2026-04-22 11:24:43 +08:00
FAN-yeB e9a2489e48 update:测试工具更新豆包流式测试逻辑 2026-04-22 10:53:48 +08:00
3030332422 db73faeec4 fix: 优化唤醒词音频采集,使用队列解耦回调与推理处理 2026-04-22 10:35:48 +08:00
Sakura-RanChen ce13a7e3e6 使用双流优化版接口(速度提升),增加豆包流式语音识别模型2.0模型选择 2026-04-22 10:28:47 +08:00
wengzhandGitHub 8a156e99f4 Merge pull request #3122 from xinnan-tech/py-add-TTS2.0
增加豆包语音合成模型2.0专属供应器
2026-04-21 15:44:04 +08:00
Sakura-RanChen 4313216816 增加豆包语音合成模型2.0专属供应器 2026-04-21 15:33:37 +08:00
DaGou12138 8c0899415a Merge branch 'refs/heads/main' into perf-tool-call-optimization 2026-04-21 15:02:31 +08:00
DaGou12138 3736a5845a perf:
1、优化提示词context动态变化导致的缓存失效问题,拆分静态system-prompt和动态上下文
2026-04-21 15:01:57 +08:00
wengzhandGitHub dc7615c008 Merge pull request #3120 from xinnan-tech/update-theme-generator
update: 更新设备主题生成功能,添加新表情
2026-04-21 14:50:53 +08:00
wengzhandGitHub b03f9374ea Merge pull request #3119 from xinnan-tech/fix-config-slm
feat: agent-models接口返回SLM模型,LLM类型同步返回所选SLM
2026-04-21 14:18:07 +08:00
欣南科技andGitHub cacfc9bfee Merge pull request #3121 from xinnan-tech/enhanced-prompts
update:优化提示词
2026-04-21 14:01:49 +08:00
hrz ce3c8a2bd8 update:优化提示词 2026-04-21 14:00:25 +08:00
zhuoqinglian e1a7e50e1f update: 更新设备主题生成功能,添加新表情 2026-04-21 11:44:03 +08:00
DaGou12138 90888de0ba perf:
1、新增工具调用Action枚举RECORD,通过完整的三段式 assistant(tool_calls) → tool → assistant(response)让模型准确学习到工具调用的正确行为,优化play_music的工具调用枚举NONE变更为RECORD,优化解决音乐播放工具调用缺陷问题。
2、处理悬空 tool_calls问题。
3、去除工具提示词强化注入逻辑。
2026-04-21 11:36:06 +08:00
3030332422 96f0412f94 update:测试页面支持关闭情绪表情功能 2026-04-21 11:15:31 +08:00
rainv123 ad4d32a05d feat: agent-models接口返回SLM模型,LLM类型同步返回所选SLM 2026-04-21 11:12:18 +08:00
hrzandGitHub 08d6bb4056 Merge pull request #3118 from xinnan-tech/openai_nothinking
feat:默认禁用部分平台LLM思考模式
2026-04-20 17:39:20 +08:00
FAN-yeB 1f0db7dc47 feat:默认禁用部分平台LLM思考模式 2026-04-20 17:35:32 +08:00
wengzhandGitHub 6f52d004e8 Merge pull request #3115 from xinnan-tech/fix-knowledge-sync-ragflow-documents
fix: 实现知识库与RAGFlow双向同步(知识库名称/简介的修改、知识库删除、文档上传/删除)
2026-04-20 16:51:06 +08:00
rainv123 0681550bab fix: 实现知识库与RAGFlow双向同步(知识库名称/简介的修改、知识库删除、文档上传/删除),移除冷却机制确保实时生效,修复文档影子表UNIQUE约束冲突 2026-04-20 16:49:24 +08:00
wengzhandGitHub 97b9c95c2d Merge pull request #3117 from xinnan-tech/py-fix-ReportTime
fix: 修复聊天记录上报排序错乱的问题
2026-04-20 15:56:49 +08:00
wujingquan 6111c3b5a0 Add 'configuring' translation for multiple languages in device configuration 2026-04-20 15:24:53 +08:00
wujingquan 123c1e8880 Add WiFi password translations for multiple languages 2026-04-20 15:17:04 +08:00
rainv123 6ce4503b22 fix:实现知识库文档与RAGFlow双向同步,支持远端上传/删除自动对账 2026-04-20 14:49:01 +08:00
3030332422 b209de36f5 fix: 修复聊天记录上报排序错乱的问题 2026-04-20 11:00:04 +08:00
wengzhandGitHub fc3e0869fd Merge pull request #3112 from xinnan-tech/py-fix-repeated-text
Py fix repeated text
2026-04-20 10:43:09 +08:00
Sakura-RanChen 3436d50b43 只有文本内容一致的时候不进行合成 2026-04-20 10:40:08 +08:00
Sakura-RanChenandGitHub 7a58c04df3 Merge pull request #3077 from xuruiray/fix/duplicate-tts-on-tool-call
fix: LLM 流式输出文本后调用工具导致 TTS 重复播报
2026-04-20 10:08:06 +08:00
Sakura-RanChenandGitHub 150be65436 Merge branch 'py-fix-repeated-text' into fix/duplicate-tts-on-tool-call 2026-04-20 10:07:28 +08:00
3030332422 dc2094ea8b update:说明文档的补充 2026-04-17 17:30:18 +08:00
wengzhandGitHub bacf4cd5e8 Merge pull request #3110 from xinnan-tech/fix_rag_pagerank
fix: 修复更新知识库时 pagerank 为 null 导致 RAGFlow 校验失败的问题
2026-04-17 16:52:02 +08:00
rainv123 7049e8cce7 fix: 修复更新知识库时 pagerank 为 null 导致 RAGFlow 校验失败的问题 2026-04-17 16:41:42 +08:00
3030332422 b0e24732de update:更改说明文档 2026-04-17 16:12:02 +08:00
3030332422 fb469a3ee3 fix:唤醒词服务启动失败不阻塞测试页面 2026-04-17 15:09:57 +08:00
3030332422 725c562aa1 update:对齐测试页面唤醒流程与硬件设备 2026-04-17 11:33:28 +08:00
wengzhandGitHub 61f137ce4b Merge pull request #3108 from xinnan-tech/fix-role-plugin
fix: 修复智能体tooltip高度超长的问题
2026-04-17 11:25:14 +08:00
zhuoqinglian 35ea14b95b fix: 修复智能体tooltip高度超长的问题 2026-04-17 11:10:33 +08:00
wengzhandGitHub b7d07f92a2 Merge pull request #3107 from xinnan-tech/py-fix-tts-markdown
fix: 调整处理顺序保留英文空格的同时修复markdown被识别为纯ASCII 字符的错误返回
2026-04-17 11:02:53 +08:00
Sakura-RanChen d2cbec0981 fix: 调整处理顺序保留英文空格的同时修复markdown被识别为纯ASCII 字符的错误返回 2026-04-17 10:59:29 +08:00
wengzhandGitHub 6348f12d60 Merge pull request #3106 from xinnan-tech/fix-role-plugin
fix: 修复角色配置-功能管理列表没有滚动条的问题
2026-04-17 10:51:45 +08:00
zhuoqinglian 11caf6bc8a fix: 修复角色配置-功能管理列表没有滚动条的问题 2026-04-17 10:42:47 +08:00
wengzhandGitHub 3cae9e3c32 Merge pull request #3102 from xinnan-tech/fix-title-summary
fix:将标题总结从记忆流程中拆分为独立接口,支持异步执行
2026-04-16 17:24:56 +08:00
欣南科技andGitHub 0161e642d0 Merge pull request #3104 from xinnan-tech/update-default-model
Update default model
2026-04-16 17:01:34 +08:00
hrz d41938fe07 update:这些文件已经完成使命,可移除 2026-04-16 16:54:33 +08:00
hrz e20c59e3df update:移除阿里云即将下架的模型 2026-04-16 16:42:34 +08:00
rainv123 fbaf28de5c fix:移除多余try和总结标题的异步 2026-04-16 14:43:16 +08:00
rainv123 2daf492e00 fix:将标题总结从记忆流程中拆分为独立接口,支持异步执行 2026-04-16 10:36:48 +08:00
wengzhandGitHub ac9083cfc7 Merge pull request #3101 from xinnan-tech/fix-title-summary
fix:修复PowerMem和Mem0AI记忆模型不会总结会话标题的问题
2026-04-16 09:04:58 +08:00
3030332422 36ea5c5e13 fix:修复多个问题 2026-04-15 17:53:51 +08:00
rainv123 f36e605aed fix:修复PowerMem和Mem0AI记忆模型不会总结会话标题的问题 2026-04-15 15:26:52 +08:00
wengzhandGitHub c1b836aaed Merge pull request #3100 from xinnan-tech/update-checkbox-style
update: 修改checkbox背景颜色
2026-04-15 14:32:46 +08:00
zhuoqinglian 07170f09eb update: 修改checkbox背景颜色 2026-04-15 14:28:20 +08:00
hrzandGitHub 8211de242f Merge pull request #3098 from xinnan-tech/fix-title-summary
fix:修复mem_report_only记忆模型没有总结会话标题
2026-04-15 14:20:34 +08:00
欣南科技andGitHub eea6807355 Merge pull request #3099 from xinnan-tech/agent-base-prompt
update:优化提示词
2026-04-15 13:59:04 +08:00
hrz 0ba7e81438 update:优化提示词 2026-04-15 12:59:15 +08:00
rainv123 703c707b4c fix:修复mem_report_only记忆模型没有总结会话标题 2026-04-15 11:54:22 +08:00
hrzandGitHub 3ab14578c2 Merge pull request #3097 from xinnan-tech/py-fix-stream-asr
fix: 修复豆包流式asr热词层级错误
2026-04-15 10:33:24 +08:00
Sakura-RanChen a15efa3090 fix: 修复豆包流式asr热词层级错误 2026-04-15 10:31:16 +08:00
3030332422 4225f1525f fix: 移除 RuntimeInstanceLock 锁文件机制 2026-04-14 17:59:29 +08:00
3030332422 d5b883817c update:前端增加可配置的本地唤醒词运行时 2026-04-14 16:54:37 +08:00
wengzhandGitHub 8af8930997 Merge pull request #3094 from xinnan-tech/py-client-about
refactor:优化相关打断逻辑
2026-04-14 15:31:29 +08:00
Sakura-RanChen ad01b05940 打断判断优先级调整 2026-04-14 15:05:55 +08:00
Sakura-RanChen a0497fdc48 给复用型TTS增加相关过滤 2026-04-14 10:18:09 +08:00
Sakura-RanChen 9634f84a98 Merge remote-tracking branch 'origin/main' into py-client-about 2026-04-13 11:35:10 +08:00
Sakura-RanChen 27e5e1e9d7 refactor: 优化非流式音频过滤机制
fix: 修复等待中被打断队列被停止造成的死锁
2026-04-13 11:33:47 +08:00
wengzhandGitHub 8fd92729f2 Merge pull request #3090 from xinnan-tech/slm-and-title
update:添加SLM模型配置和会话标题功能
2026-04-13 09:08:11 +08:00
wengzhandGitHub 736ffd80bf Merge pull request #3086 from xinnan-tech/update-chat-history
角色配置表单标题添加Tooltip鼠标悬浮提示说明,调整小参数模型表单配置
2026-04-13 09:07:50 +08:00
wengzhandGitHub 3783351f5d Merge pull request #3085 from xinnan-tech/update-mobile-chat-history
mobile 角色配置添加小参数模型选项,历史记录标题优化,聊天详情参数记录折叠处理
2026-04-13 09:07:31 +08:00
zhuoqinglian 2cd9484c54 update: mobile 聊天记录获取最新数据 2026-04-10 16:11:04 +08:00
Sakura-RanChen 0f1e0d0d2e 音频会在队列积压等待发送,等待协程结果返回不设置超时时间 2026-04-10 14:22:36 +08:00
3030332422 705b5732a6 update:为 test 页面增加可配置的本地唤醒词运行时 2026-04-10 09:17:22 +08:00
Sakura-RanChen 0e23672be7 fix: 修复直接回复是字幕未记录 2026-04-09 17:58:19 +08:00
Sakura-RanChen a6904f6ebd refactor: vad独立时间戳,相关残余状态处理 2026-04-09 17:15:35 +08:00
zhuoqinglian 784ba359f2 update: mobile 历史记录标题优化,聊天详情参数记录折叠处理 2026-04-09 14:32:32 +08:00
Sakura-RanChen e08eb48d9a refactor: 优化相关打断处理 2026-04-09 10:46:46 +08:00
rainv123 b9a1b154b7 update:添加SLM模型配置和会话标题功能 2026-04-09 09:23:54 +08:00
zhuoqinglian 64630e1b4e feat: mobile 角色配置添加小参数模型选项 2026-04-08 16:26:48 +08:00
zhuoqinglian 7dcc014ce4 update: 调整小参数模型表单配置 2026-04-08 11:41:12 +08:00
Rui Xu 389e8559aa fix: prevent duplicate TTS when LLM streams text before tool call 2026-04-06 21:49:28 +08:00
wengzhandGitHub c5f82369e5 Merge pull request #3060 from xinnan-tech/py_test_end
Py test end
2026-04-03 17:31:56 +08:00
wengzhandGitHub 52e63706a4 Merge pull request #3058 from xinnan-tech/py_fix_powermem
fix: 优化配置读取
2026-04-03 14:37:14 +08:00
Sakura-RanChenandGitHub a42a8b2b4b Merge pull request #3069 from xinnan-tech/py_fix_wakeup
fix:停止音频发送循环(仅在流控器已初始化时调用)
2026-04-03 09:48:16 +08:00
baigao 11142104af fix:停止音频发送循环(仅在流控器已初始化时调用) 2026-04-03 09:46:55 +08:00
wengzhandGitHub a9f5f1ab81 Merge pull request #3067 from xinnan-tech/memory-model-rename
fix:从有总结记忆的模型切换至仅上报聊天记录时,只清空记忆总结内容
2026-04-02 11:56:33 +08:00
rainv123 a8f68c42fc fix:从有总结记忆的模型切换至仅上报聊天记录时,只清空记忆 2026-04-02 11:27:11 +08:00
zhuoqinglian 1d3afb3c9a feat: 角色配置表单标题添加Tooltip鼠标悬浮提示说明 2026-04-02 09:45:33 +08:00
wengzhandGitHub 943622969a Merge pull request #3063 from xinnan-tech/py-bug-fix
fix:修复intent_llm模式下工具不存在时未正确播放提示信息的问题
2026-04-01 17:46:23 +08:00
wengzhandGitHub 9d39168a35 Merge pull request #3061 from xinnan-tech/memory-model-rename
选择仅上报聊天记录时,清除历史记忆;前端优化记忆模型切换体验
2026-04-01 15:57:44 +08:00
Sakura-RanChenandGitHub 61ab7f25d7 Merge branch 'main' into py_test_end 2026-04-01 14:45:05 +08:00
Sakura-RanChen 140fcd5887 补充sql,增加错误详情上报 2026-04-01 14:32:47 +08:00
rainv123 3c2024d00d fix: 前端优化记忆模型切换体验 - 切换无记忆模型时暂存记忆、切换恢复、保存配置后才真正清除 2026-04-01 14:32:30 +08:00
rainv123 2aee1bf567 fix:选择仅上报聊天记录时,清除历史记忆 2026-04-01 11:35:26 +08:00
wengzhandGitHub d89a26889c Merge pull request #3059 from xinnan-tech/memory-model-rename
fix:重命名记忆模型名称
2026-04-01 10:23:38 +08:00
rainv123 d611b2db73 update:重命名记忆模型名称 2026-04-01 09:54:46 +08:00
Sakura-RanChenandGitHub b0e911b248 Merge pull request #2996 from lgy1027/fix-end
fix: 优化退出流程并添加超时保护
2026-04-01 09:35:34 +08:00
Sakura-RanChenandGitHub fb3b7830ee Merge branch 'py_test_end' into fix-end 2026-04-01 09:35:23 +08:00
3030332422 10eeffdf31 fix:修复intent_llm模式下工具不存在时未正确播放提示信息的问题 2026-04-01 09:23:05 +08:00
rainv123 17847188dd Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-04-01 09:12:39 +08:00
Sakura-RanChen 7b2bfc087d fix: 优化配置读取 2026-03-31 18:00:51 +08:00
wengzhandGitHub 24a8839753 Merge pull request #3044 from xinnan-tech/py-display
添加“工具调用日志记录”与“设备端工具调用信息显示”
2026-03-31 15:12:11 +08:00
CGDandGitHub 64d25533d9 Merge branch 'main' into py-display 2026-03-31 14:24:27 +08:00
3030332422 6f6c788cd5 update:修改ai_agent_chat_history表content字段类型为TEXT 2026-03-31 14:11:31 +08:00
欣南科技andGitHub 8aa12d0961 Merge pull request #3057 from xinnan-tech/weather-faq
update:补齐天气文档链接
2026-03-31 12:11:36 +08:00
hrz d770632152 udpate:补齐天气文档链接 2026-03-31 12:08:30 +08:00
wengzhandGitHub a30903b644 Merge pull request #3056 from xinnan-tech/update-manager-mobile
Update manager mobile
2026-03-31 11:02:40 +08:00
wengzhandGitHub 5469168d18 Merge pull request #3055 from xinnan-tech/fix-digital-human
fix: 修复数字人摄像头展示区域裁剪的问题
2026-03-31 11:02:21 +08:00
zhuoqinglian 3c31231781 fix: 修复数字人摄像头展示区域裁剪的问题 2026-03-31 10:34:38 +08:00
3030332422 cc2e30205f fix:修复play_music工具调用信息显示异常 2026-03-31 10:03:50 +08:00
3030332422 f01de027cd fix:修复 intent_llm 模式下工具调用不上报的问题 2026-03-30 16:36:30 +08:00
zhuoqinglian fb195fc57b update: mobile 切换记忆模式判断是否需要禁用历史记忆内容输入 2026-03-26 17:25:44 +08:00
zhuoqinglian cc504fe542 update: mobile 添加智能体限制调整 2026-03-26 14:21:03 +08:00
wengzhandGitHub fd93116d69 Merge pull request #3045 from xinnan-tech/fix_audioRateController
fix: 修复流式场景下的误判
2026-03-25 11:10:42 +08:00
Sakura-RanChen 5622a13735 fix: 修复流式场景下的误判 2026-03-25 11:07:43 +08:00
3030332422 079c8630d9 update:修改部分前端样式 2026-03-25 10:43:45 +08:00
wengzhandGitHub 11830b2f22 Merge pull request #3043 from xinnan-tech/update-manager-mobile
mobile 优化聊天记录音频播放功能
2026-03-25 09:34:29 +08:00
wengzhandGitHub 861b4dee4c Merge pull request #3042 from xinnan-tech/update-web-style
优化页面主体内容区域适配
2026-03-25 09:34:06 +08:00
zhuoqinglian 603fa67824 Merge branch 'main' into update-web-style 2026-03-25 09:27:30 +08:00
zhuoqinglian 4d8279d916 update: 优化页面主体内容区域适配 2026-03-25 09:26:33 +08:00
rainv123 f91c4acb8f Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-03-24 11:12:32 +08:00
rainv123andGitHub 1342eccf86 Merge pull request #3039 from xinnan-tech/revert-3038-agent-chat-history-audio-retention
Revert "fix:修复智能体记忆模型配置变更时错误删除历史聊天音频的问题"
2026-03-24 11:08:44 +08:00
wengzhandGitHub 87f9ab7bb4 Revert "fix:修复智能体记忆模型配置变更时错误删除历史聊天音频的问题" 2026-03-24 11:05:35 +08:00
wengzhandGitHub 94cc8564aa Merge pull request #3038 from xinnan-tech/agent-chat-history-audio-retention
fix:修复智能体记忆模型配置变更时错误删除历史聊天音频的问题
2026-03-24 10:53:51 +08:00
rainv123 8fc2d05c99 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-03-24 09:51:14 +08:00
rainv123 1a6d9d7490 fix: 修复智能体配置变更时错误删除历史音频的问题 2026-03-24 09:49:57 +08:00
wengzhandGitHub 6c19f1bd26 Merge pull request #3035 from xinnan-tech/mem_report_only
fix:新增仅上报聊天记录的记忆模型供应器Mem report only
2026-03-24 09:01:31 +08:00
rainv123 6d89ae1c66 fix:增加仅上报模型说明和记忆模型排序 2026-03-23 16:58:51 +08:00
rainv123 2a49f0804c feat:新增仅上报聊天记录(mem_report_only)记忆供应器 2026-03-23 16:17:38 +08:00
zhuoqinglian d64bb36606 update: mobile 优化聊天记录音频播放功能 2026-03-23 14:18:53 +08:00
zhuoqinglian 852e097e0d fix: mobile 修复声纹管理-编辑模式下声纹向量展示异常的问题 2026-03-20 16:57:02 +08:00
zhuoqinglian 3aecb99f70 fix: 修复聊天记录播放音频重叠播放的问题 2026-03-20 16:21:58 +08:00
wengzhandGitHub 6eecf5d0cb Merge pull request #3026 from xinnan-tech/fix_audioRateController_state
fix: 修复队列恢复时音频播放时间错乱问题
2026-03-20 14:49:42 +08:00
wengzhandGitHub a4d02ca2ab Merge pull request #3029 from xinnan-tech/update-web-style
解决登录失败验证码刷新两次的问题
2026-03-20 14:48:45 +08:00
wengzhandGitHub 7ef5a67119 Merge pull request #3028 from xinnan-tech/update-manager-mobile
mobile 智能体管理多语言调整、缓存用户信息
2026-03-20 14:48:26 +08:00
zhuoqinglian 1c5dacd2d5 Merge branch 'main' into update-web-style 2026-03-20 14:45:50 +08:00
zhuoqinglian 7732b7b1b9 update: mobile 缓存用户信息 2026-03-20 14:42:47 +08:00
zhuoqinglian 6e7b938f51 fix: 解决登录失败验证码刷新两次的问题 2026-03-20 10:42:35 +08:00
zhuoqinglian 52f5859b1f update: mobile 智能体管理多语言调整 2026-03-19 17:56:27 +08:00
Sakura-RanChen 73d174bc4a fix: 修复队列恢复时音频播放时间错乱问题 2026-03-19 16:18:30 +08:00
Sakura-RanChen 9512fe642c 恢复多工具 2026-03-19 16:04:14 +08:00
Sakura-RanChen 0ef3a60a4c 调整缩进 2026-03-19 11:57:40 +08:00
Sakura-RanChen f40dc4a658 修复双重回复问题 2026-03-19 11:56:29 +08:00
wengzhandGitHub 4747e54f6c Merge pull request #3023 from xinnan-tech/update-manager-mobile
mobile 播放声纹弹窗样式调整,切换角色模板更新表单状态
2026-03-18 16:53:54 +08:00
wengzhandGitHub 9278fdb016 Merge pull request #3024 from xinnan-tech/update-web-style
解决MCP接入点输入框没有显示报错信息的问题
2026-03-18 16:53:14 +08:00
zhuoqinglian 5b23804954 Merge branch 'main' into update-manager-mobile 2026-03-18 16:50:29 +08:00
zhuoqinglian b2ed5eb2c0 fix: 解决MCP接入点输入框没有显示报错信息的问题 2026-03-18 16:47:48 +08:00
zhuoqinglian 07113dc4d2 update: mobile 播放声纹弹窗样式调整,切换角色模板更新表单状态 2026-03-18 16:44:27 +08:00
Sakura-RanChen 1a5dd2d9d9 fix: 修复日志音频上报 2026-03-18 16:40:32 +08:00
wengzhandGitHub 8a01432e9d Merge pull request #3022 from xinnan-tech/perf-userLanguage-complete
perf:补充MCP接入点国际化信息
2026-03-18 15:48:57 +08:00
DaGou12138 7a39fd0152 补充MCP接入点国际化信息 2026-03-18 09:48:11 +08:00
Sakura-RanChen 0d2cb7b3c9 增加工具调用日志记录,暂时单工具状态 2026-03-17 16:13:35 +08:00
wengzhandGitHub 9123a174da Merge pull request #3020 from xinnan-tech/update-web-style
优化表格底部按钮边距统一调整,修复刷新页面菜单、页脚闪动的问题
2026-03-17 16:11:54 +08:00
zhuoqinglian 2e165747d6 update: 参数弹窗去掉多余代码 2026-03-17 16:08:36 +08:00
zhuoqinglian 3bdf634e37 Merge branch 'main' into update-web-style 2026-03-17 16:04:22 +08:00
zhuoqinglian 20ac6f3f96 fix: 修复刷新页面菜单、页脚闪动的问题 2026-03-17 16:01:10 +08:00
zhuoqinglian 818ac1eefb style: 表格底部按钮边距统一调整 2026-03-17 10:30:43 +08:00
3030332422 980930cd42 update:在设备端显示工具调用信息 2026-03-16 13:11:45 +08:00
wengzhandGitHub 956ae37e56 Merge pull request #3015 from xinnan-tech/fix/update-sherpa-onnx
update:更新sherpa_onnx依赖至1.12.29版本
2026-03-16 11:51:01 +08:00
rainv123 15731892ad update:更新sherpa_onnx依赖至1.12.29版本 2026-03-16 11:43:07 +08:00
zhuoqinglian d6d50e0432 fix: 修复语言切换接口请求异常的问题 2026-03-16 10:37:47 +08:00
zhuoqinglian 286079c93a feat: 添加声纹管理-声纹向量音频播放功能 2026-03-16 09:50:24 +08:00
zhuoqinglian 860cbc36fd fix: 处理智能体管理全局触发下拉刷新问题 2026-03-16 09:46:43 +08:00
欣南科技andGitHub 2ac7e5be9c Merge pull request #3013 from xinnan-tech/version-num
Bump to 0.9.2
2026-03-14 08:06:31 +08:00
hrz ebfcfe148d Bump to 0.9.2 2026-03-14 08:05:57 +08:00
wengzhandGitHub 435860d339 Merge pull request #3011 from xinnan-tech/perf-userLanguage-pt-br
perf:新增葡萄牙语国际化提示
2026-03-13 17:56:46 +08:00
DaGou12138 b7cb97a373 新增葡萄牙语国际化提示 2026-03-13 17:53:07 +08:00
wengzhandGitHub e7b1daf021 Merge pull request #3010 from xinnan-tech/perf-llm-lazy-optimization
perf:优化提示词与工具调用偷懒逻辑
2026-03-13 17:28:17 +08:00
DaGou12138 bbf2febd6d 修改标签国际化相关提示词 2026-03-13 17:13:22 +08:00
DaGou12138 586520f321 Merge branch 'refs/heads/main' into perf-llm-lazy-optimization 2026-03-13 17:03:28 +08:00
wengzhandGitHub 22262be7cd Merge pull request #3007 from xinnan-tech/update-manager-mobile
mobile 更新智能体功能,解决遗留bug
2026-03-12 17:43:14 +08:00
zhuoqinglian 9021eac54e Merge branch 'main' into update-manager-mobile 2026-03-12 17:37:30 +08:00
wengzhandGitHub b72967bcc3 Merge pull request #3006 from xinnan-tech/captcha-validation-error
fix: 优化验证码验证错误提示
2026-03-12 17:37:05 +08:00
zhuoqinglian 469f836a82 fix: 修复 mobile 短信验证码错误重复提示、智能体插件保存异常问题 2026-03-12 17:36:51 +08:00
zhuoqinglian 1e8960f37c feat: mobile 添加用户协议和隐私政策 2026-03-12 17:34:59 +08:00
rainv123 7aad8da6f6 fix: 优化验证码验证错误提示 2026-03-12 17:34:04 +08:00
wengzhandGitHub dd24dc0abc Merge pull request #2995 from xinnan-tech/py_fix_HuoShanTTS
Py fix huo shan tts
2026-03-12 16:25:47 +08:00
wengzhandGitHub 4f6cdc745f Merge pull request #3001 from xinnan-tech/py_fix_clone_languages
fix: 克隆音色未显示
2026-03-12 15:51:57 +08:00
lgy1027 bcf03a0378 refactor: 优化超时配置,响应社区反馈
- 工具调用超时改为可配置项 tool_call_timeout,默认30秒
- OpenAI 超时恢复可配置机制,支持细粒度配置和单一值
- TTS 超时保护统一添加到所有流式TTS实现
- 将 ActionResponse 导入移到文件顶部
- 修复超时配置边界情况处理
2026-03-11 18:13:05 +08:00
lgy1027 4f615b3807 Merge remote-tracking branch 'origin/main' into fix-end 2026-03-11 17:15:59 +08:00
zhuoqinglian 48087582c2 update: mobile 编辑源和语速音调页面样式调整 2026-03-11 17:10:18 +08:00
Sakura-RanChen fbb0e02fdd 去除空格,最下端留空行 2026-03-11 14:59:23 +08:00
wengzhandGitHub d7ef85f6d2 Merge branch 'main' into py_fix_clone_languages 2026-03-11 14:37:55 +08:00
wengzhandGitHub 2f2bd38f1e Merge pull request #3002 from xinnan-tech/perf-rag-linqui-update
perf:新增ragflow改动相关所需数据集、调整ragflow知识库相关文档
2026-03-11 11:55:09 +08:00
DaGou12138 bc48a169f4 新增ragflow改动相关所需数据集、调整ragflow知识库相关文档 2026-03-11 11:43:29 +08:00
DaGou12138andGitHub e777db6ef3 Merge pull request #2950 from gzh246/feature/api-knowledge-dora
整理ragflow外部接口api(包括会话,知识库,文档分块,文件管理,智能体)等,基于ragflow的最新稳定的大版本tag-0.23.0。
2026-03-11 11:27:02 +08:00
Sakura-RanChen 60498b24ae fix: 克隆音色未显示 2026-03-11 10:30:29 +08:00
DaGou12138 caae839b1d pref:优化大模型工具调用偷懒问题,调整基础提示词与新增临时工具记忆加深 2026-03-11 10:13:13 +08:00
zhuoqinglian 6a14d694b0 Merge branch 'main' into update-manager-mobile 2026-03-10 16:15:51 +08:00
zhuoqinglian d86387971a fix: 修复web、h5同时打开token失效问题 2026-03-10 16:15:09 +08:00
zhuoqinglian ff1076deac update: mobile 服务端接口地址提示语优化 2026-03-10 16:14:04 +08:00
wengzhandGitHub 5b986bf57f Merge pull request #2997 from xinnan-tech/web-privacy-terms
add:增加用户协议和隐私政策
2026-03-10 14:34:48 +08:00
rainv123 f1b2080d99 add:增加用户协议和隐私政策 2026-03-10 14:28:47 +08:00
lgy1027 c2b95ca896 fix: 优化退出流程并添加超时保护
- 添加 is_exiting 标志防止退出流程被中断
- 工具调用添加 30 秒超时保护,避免流程卡死
- TTS 相关操作添加超时保护
- 优化 OpenAI 客户端超时配置
2026-03-10 11:45:38 +08:00
zhuoqinglian ed41de7b8e feat: mobile 修改设备添加逻辑,新增手动添加设备 2026-03-10 11:37:51 +08:00
Sakura-RanChen 42a132f5cd 调整新增音色时的默认填充 2026-03-10 11:29:05 +08:00
Sakura-RanChen 7b2f6c2eee fix: 单一语音流上报音频不全 2026-03-10 10:53:24 +08:00
Sakura-RanChen ee5a53d67d fix: 修复选用seed-tts-2.0文本缺失
fix: 设备端说话状态与服务端同步
2026-03-09 17:55:54 +08:00
wengzhandGitHub f691e9f0c9 Merge pull request #2993 from xinnan-tech/tag_fix
fix: 修复智能体标签顺序错乱问题
2026-03-09 14:18:13 +08:00
rainv123 7a32c208fb fix: 修复智能体标签顺序错乱问题 2026-03-09 14:15:31 +08:00
DaGou12138andGitHub 6984763ddc Merge pull request #2988 from xinnan-tech/update-manager-mobile
web端功能同步更新到mobile端
2026-03-06 15:21:18 +08:00
DaGou12138andGitHub d6c3659d70 Merge pull request #2987 from xinnan-tech/update-agent-style
update: 智能体管理样式优化
2026-03-06 15:20:57 +08:00
zhuoqinglian d51c2a241c feat: mobile端同步更新上报模式、语言设置功能 2026-03-06 09:40:04 +08:00
zhuoqinglian a1d37b61e4 Merge branch 'main' into update-manager-mobile 2026-03-06 09:23:59 +08:00
zhuoqinglian 8b24151756 update: 智能体管理样式优化 2026-03-06 09:20:15 +08:00
GZH a9854756ec ```
refactor(knowledge): 移除未完成的BotController实现

- 删除了BotController类的所有代码
2026-03-04 21:25:26 +08:00
GZH f95bed4189 Merge remote-tracking branch 'origin/feature/api-knowledge-dora' into feature/api-knowledge-dora
# Conflicts:
#	main/manager-api/src/main/java/xiaozhi/common/config/RestTemplateConfig.java
#	main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java
#	main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java
#	main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java
#	main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/KnowledgeBaseAdapter.java
#	main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/RAGFlowClient.java
#	main/manager-api/src/main/java/xiaozhi/modules/knowledge/rag/impl/RAGFlowAdapter.java
#	main/manager-api/src/main/resources/i18n/messages.properties
#	main/manager-api/src/main/resources/i18n/messages_de_DE.properties
#	main/manager-api/src/main/resources/i18n/messages_en_US.properties
#	main/manager-api/src/main/resources/i18n/messages_vi_VN.properties
#	main/manager-api/src/main/resources/i18n/messages_zh_TW.properties
2026-03-04 17:47:42 +08:00
GZH f7bf29a5e4 fix: 修复PR审查意见 - 新增单文档删除接口、删除BotController、优化imports、修复i18n
# Conflicts:
#	main/manager-api/src/main/resources/i18n/messages_de_DE.properties
#	main/manager-api/src/main/resources/i18n/messages_en_US.properties
#	main/manager-api/src/main/resources/i18n/messages_vi_VN.properties
2026-03-04 17:45:58 +08:00
GZH 5913dbbb7b refactor(knowledge):重构知识库模块架构并优化DTO结构
- 将BotController暂时注释以重新设计Agent集成方案
- 在多个DTO类中添加@JsonIgnoreProperties注解提升JSON序列化兼容性- 修改ChunkDTO中positions字段类型为嵌套列表并添加token字段
-为DatasetDTO和DocumentDTO添加更多时间日期字段映射
-重构KnowledgeBaseAdapter接口参数结构使用统一的请求对象
- 实现DocumentStatusSyncTask定时任务同步文档处理状态
-优化KnowledgeBaseService统计信息更新机制
- 修复数据集删除时的级联删除逻辑防止孤儿数据
- 统一本地实体ID与RAGFlow ID避免前端调用错误
2026-03-04 17:39:55 +08:00
GZH f6bb55ae90 refactor(knowledge):重构知识库模块的数据传输对象和接口适配器
- 将 BotController 类注释掉,暂时移除机器人功能实现
- 在多个 DTO 类中添加 @JsonIgnoreProperties 注解以忽略未知属性- 修改 ChunkDTO 中的 positions 字段类型为嵌套列表,并添加 token 字段
- 更新 DatasetDTO 和 DocumentDTO 中的时间日期字段格式说明-重构 KnowledgeBaseAdapter 接口方法签名,使用强类型 DTO 替代 Map 参数
- 在 KnowledgeBaseController 中注入 KnowledgeManagerService 并修改删除逻辑
- 更新数据库统计信息更新方法名称和参数结构-优化 KnowledgeBaseServiceImpl 中的数据集创建和查找逻辑
2026-03-04 17:39:55 +08:00
GZH 33e712b5fb refactor(knowledge):重构知识库模块架构并优化DTO结构
- 将BotController暂时注释以重新设计Agent集成方案
- 在多个DTO类中添加@JsonIgnoreProperties注解提升JSON序列化兼容性- 修改ChunkDTO中positions字段类型为嵌套列表并添加token字段
-为DatasetDTO和DocumentDTO添加更多时间日期字段映射
-重构KnowledgeBaseAdapter接口参数结构使用统一的请求对象
- 实现DocumentStatusSyncTask定时任务同步文档处理状态
-优化KnowledgeBaseService统计信息更新机制
- 修复数据集删除时的级联删除逻辑防止孤儿数据
- 统一本地实体ID与RAGFlow ID避免前端调用错误
2026-03-04 17:39:07 +08:00
GZH 1c26faddc4 整理ragflow外部接口api(包括会话,知识库,文档分块,文件管理,智能体)等,基于ragflow的最新稳定的大版本tag-0.23.0。
Adapter 模式落地,引入了 RAGFlowAdapter,彻底隔离了业务逻辑和底层 API 调用。现在 Service 层只管“做什么”,Adapter 层只管“怎么调用 RAGFlow ”。
代码瘦身,移除了所有手写的 HTTP 请求,全部走 Adapter统一管理。
逻辑修正,修复了重复创建、ID 冲突等 Bug,确保了事务的一致性。
在数据库中留下了拓展字段如embedding_model,chunk_method,parser_config,document_count。保证可循迹。并新增ai_rag_knowledge_document表做到ragflow远端文档信息可在本地查看,管理。后续仍需追加双端同步增加/修改/删除。

- 新增AgentDTO包含Agent管理、Webhook调试、会话和对话等完整功能
- 新增BotDTO支持SearchBot和AgentBot的检索和对话功能
- 新增ChatDTO整合对话助手、会话和消息的全套数据传输对象
- 添加ai_rag_dataset表扩展字段支持租户、头像、权限等配置
- 创建ai_rag_knowledge_document表关联RAGFlow远程文档与本地元信息
- 扩展AgentService接口添加智能体配置验证功能
- 实现validateAgentConfig方法对RAGFlow模型配置进行软同步校验
- 更新AgentServiceImpl集成新的配置验证逻辑和注释清理
2026-03-04 17:32:44 +08:00
zhuoqinglian ac887139ce feat: 新增智能体标签、上下文源功能 2026-03-04 16:33:22 +08:00
wengzhandGitHub bc2c68e89f Merge pull request #2982 from xinnan-tech/web-supplement-language
优化相关判断,补充国际化
2026-03-03 11:27:12 +08:00
Sakura-RanChen cdc2363af1 优化相关判断,补充国际化 2026-03-03 11:25:37 +08:00
DaGou12138andGitHub ba07c623df Merge pull request #2980 from xinnan-tech/fix-roleConfig
fix: 解决角色配置合并冲突异常问题
2026-03-02 17:14:22 +08:00
zhuoqinglian 344a73b87b fix: 解决角色配置合并冲突异常问题 2026-03-02 17:11:56 +08:00
DaGou12138andGitHub 9a81b6c0ee Merge pull request #2979 from xinnan-tech/milieyo-patch-1
fix:Liquibase yaml
2026-03-02 17:02:35 +08:00
wengzhandGitHub 96f65e7c35 fix:Liquibase yaml 2026-03-02 16:55:08 +08:00
wengzhandGitHub ff2cdeb483 Merge pull request #2972 from xinnan-tech/update-tts-voice-data
Update tts voice data
2026-03-02 16:50:33 +08:00
wengzhandGitHub fe8b82fcda Merge branch 'main' into update-tts-voice-data 2026-03-02 16:50:19 +08:00
wengzhandGitHub f007e6614d Merge pull request #2978 from xinnan-tech/agent-tag
feat:智能体添加标签功能
2026-03-02 16:13:59 +08:00
rainv123 0eafd37bf6 feat:智能体添加标签功能 2026-03-02 15:51:25 +08:00
wengzhandGitHub af3bc09403 Merge pull request #2977 from xinnan-tech/role-tag
新增角色标签配置
2026-03-02 15:40:59 +08:00
zhuoqinglian 90ebb8d499 feat: 语音合成-音色管理,编辑模式下添加取消操作 2026-03-02 15:35:47 +08:00
zhuoqinglian f2c6cb8641 update: 优化文本溢出悬浮窗样式 2026-03-02 15:33:38 +08:00
Sakura-RanChenandGitHub 116a6973cf Merge branch 'main' into update-tts-voice-data 2026-03-02 09:19:46 +08:00
欣南科技andGitHub 769407a5b0 Merge pull request #2976 from xinnan-tech/fix-play-music-bug
fix:重写 audio_to_opus_data_stream 方法,让音频文件处理使用独立编码器,避免与 TTS 流编码器冲突。
2026-03-01 13:00:25 +08:00
hrz a4583e273a fix:重写 audio_to_opus_data_stream 方法,让音频文件处理使用独立编码器,避免与 TTS 流编码器冲突。 2026-03-01 12:59:45 +08:00
zhuoqinglian 645462abd0 feat: 新增角色标签配置 2026-02-28 17:51:46 +08:00
Sakura-RanChen b49c4520f9 部分TTS参数调整 2026-02-27 16:37:31 +08:00
wengzhandGitHub acf45ae8ad Merge pull request #2971 from xinnan-tech/fix-manager-api-device-tools-api
fix:#2939 修复getDeviceTools()中未考虑分页问题
2026-02-27 16:36:37 +08:00
Sakura-RanChen 0d1c18f5dd Merge branch 'main' into update-tts-voice-data 2026-02-27 11:21:18 +08:00
Sakura-RanChen 7b020ba55c update: 增加智能体独立音频设置 2026-02-27 11:17:08 +08:00
DaGou12138 cc081bc9eb #2939 修复getDeviceTools()中未考虑分页问题 2026-02-26 17:46:20 +08:00
hrzandGitHub 187c2ee977 Merge pull request #2970 from ephemetra/patch-1
docs: 修复文档中的错误内容
2026-02-26 16:21:20 +08:00
ephemetraandGitHub 00ab407b04 docs: 修复文档中的错误内容
1. 修正第三部分的错误标题。
2. 修正了server.mqtt_manager_api填入`PUBLIC_IP`+`:`+`UDP_PORT`的错误内容。
2026-02-25 10:19:22 +08:00
欣南科技andGitHub bda7a90551 Merge pull request #2969 from xinnan-tech/i18n-pt_BR
I18n pt br
2026-02-24 08:05:45 +08:00
hrz 71b72f5b51 update:修正英文版翻译遗漏的chatHistory.前缀 2026-02-24 08:04:53 +08:00
hrzandGitHub 61fd8b21e0 Merge pull request #2965 from Alif254317/claude/explore-repository-YzYCv
feat: adicionar suporte a Português Brasileiro (pt_BR) no projeto
2026-02-24 07:28:45 +08:00
欣南科技andGitHub 9a4610ab04 Merge pull request #2968 from xinnan-tech/fix-vad-decoder
fix:高并发下,共享vad里decoder变量扰动
2026-02-24 02:00:29 +08:00
hrz fd8296262e fix:高并发下,共享vad里decoder变量扰动 2026-02-24 01:59:44 +08:00
Claude 63dfcf6659 feat: adicionar suporte a Português Brasileiro (pt_BR) no projeto
- Adiciona arquivo de tradução pt_BR.js para manager-web (~1332 chaves)
- Adiciona arquivo de tradução pt_BR.ts para manager-mobile (~440 chaves)
- Cria README_pt_BR.md com documentação traduzida completa
- Registra pt_BR no sistema i18n de ambos os frontends (web e mobile)
- Adiciona pt_BR nos seletores de idioma (HeaderBar, login, retrievePassword)
- Adiciona badge "Português (Brasil)" em todos os READMEs existentes
- Adiciona detecção automática de idioma pt/pt-BR no navegador
- Adiciona chave language.ptBR em todos os arquivos de tradução existentes

https://claude.ai/code/session_01XJMVWKBjy7UwqskN9BbsYM
2026-02-19 17:44:25 +00:00
hrzandGitHub 8897b4f3c6 Merge pull request #2962 from xinnan-tech/test_live2d
fix: 调整切换摄像头位置
2026-02-18 08:30:47 +08:00
GZH 8d46585101 refactor(knowledge):重构知识库模块架构并优化DTO结构
- 将BotController暂时注释以重新设计Agent集成方案
- 在多个DTO类中添加@JsonIgnoreProperties注解提升JSON序列化兼容性- 修改ChunkDTO中positions字段类型为嵌套列表并添加token字段
-为DatasetDTO和DocumentDTO添加更多时间日期字段映射
-重构KnowledgeBaseAdapter接口参数结构使用统一的请求对象
- 实现DocumentStatusSyncTask定时任务同步文档处理状态
-优化KnowledgeBaseService统计信息更新机制
- 修复数据集删除时的级联删除逻辑防止孤儿数据
- 统一本地实体ID与RAGFlow ID避免前端调用错误
2026-02-14 12:55:56 +08:00
GZH 6967b2bce2 refactor(knowledge):重构知识库模块的数据传输对象和接口适配器
- 将 BotController 类注释掉,暂时移除机器人功能实现
- 在多个 DTO 类中添加 @JsonIgnoreProperties 注解以忽略未知属性- 修改 ChunkDTO 中的 positions 字段类型为嵌套列表,并添加 token 字段
- 更新 DatasetDTO 和 DocumentDTO 中的时间日期字段格式说明-重构 KnowledgeBaseAdapter 接口方法签名,使用强类型 DTO 替代 Map 参数
- 在 KnowledgeBaseController 中注入 KnowledgeManagerService 并修改删除逻辑
- 更新数据库统计信息更新方法名称和参数结构-优化 KnowledgeBaseServiceImpl 中的数据集创建和查找逻辑
2026-02-14 12:55:56 +08:00
GZH 16a38bbfc4 refactor(knowledge):重构知识库模块架构并优化DTO结构
- 将BotController暂时注释以重新设计Agent集成方案
- 在多个DTO类中添加@JsonIgnoreProperties注解提升JSON序列化兼容性- 修改ChunkDTO中positions字段类型为嵌套列表并添加token字段
-为DatasetDTO和DocumentDTO添加更多时间日期字段映射
-重构KnowledgeBaseAdapter接口参数结构使用统一的请求对象
- 实现DocumentStatusSyncTask定时任务同步文档处理状态
-优化KnowledgeBaseService统计信息更新机制
- 修复数据集删除时的级联删除逻辑防止孤儿数据
- 统一本地实体ID与RAGFlow ID避免前端调用错误
2026-02-14 12:55:56 +08:00
GZH 861df73eab 整理ragflow外部接口api(包括会话,知识库,文档分块,文件管理,智能体)等,基于ragflow的最新稳定的大版本tag-0.23.0。
Adapter 模式落地,引入了 RAGFlowAdapter,彻底隔离了业务逻辑和底层 API 调用。现在 Service 层只管“做什么”,Adapter 层只管“怎么调用 RAGFlow ”。
代码瘦身,移除了所有手写的 HTTP 请求,全部走 Adapter统一管理。
逻辑修正,修复了重复创建、ID 冲突等 Bug,确保了事务的一致性。
在数据库中留下了拓展字段如embedding_model,chunk_method,parser_config,document_count。保证可循迹。并新增ai_rag_knowledge_document表做到ragflow远端文档信息可在本地查看,管理。后续仍需追加双端同步增加/修改/删除。

- 新增AgentDTO包含Agent管理、Webhook调试、会话和对话等完整功能
- 新增BotDTO支持SearchBot和AgentBot的检索和对话功能
- 新增ChatDTO整合对话助手、会话和消息的全套数据传输对象
- 添加ai_rag_dataset表扩展字段支持租户、头像、权限等配置
- 创建ai_rag_knowledge_document表关联RAGFlow远程文档与本地元信息
- 扩展AgentService接口添加智能体配置验证功能
- 实现validateAgentConfig方法对RAGFlow模型配置进行软同步校验
- 更新AgentServiceImpl集成新的配置验证逻辑和注释清理
2026-02-14 12:55:56 +08:00
lww155 fa9809bee1 fix: 调整切换摄像头位置 2026-02-11 17:41:52 +08:00
欣南科技andGitHub 2a93745d01 Merge pull request #2957 from xinnan-tech/test_live2d
fix:手机前后摄像头切换,调整摄像头为竖屏显示
2026-02-11 11:32:53 +08:00
lww155 85fab64588 fix: 优化h5样式 2026-02-10 09:54:39 +08:00
rainv123 b22f430e98 fix:调整摄像头显示区域为竖屏 2026-02-09 17:22:28 +08:00
lww155 c3da3e937e add: 前后摄像头切换 2026-02-09 16:50:23 +08:00
Sakura-RanChen 4ea3bea85c update: 增加TTS音色语种选择 2026-02-09 15:28:31 +08:00
DaGou12138 520e24a54e 修改统一规范ai_tts_voice语言类型数据语句 2026-02-06 17:12:47 +08:00
DaGou12138 e82cc53bfb 统一规范ai_tts_voice语言类型数据 2026-02-06 16:54:21 +08:00
wengzhandGitHub 3bddc1c722 Merge pull request #2953 from xinnan-tech/fix-modal-flicker
Fix modal flicker
2026-02-06 16:40:56 +08:00
lww155 f68fc5c90d fix: 修复点击用户框无法关闭菜单问题 2026-02-06 16:37:20 +08:00
lww155 ea8001a9c8 fix: 模态框闪烁问题 2026-02-06 14:49:17 +08:00
hrzandGitHub ca10d7290d Merge pull request #2949 from xinnan-tech/test_live2d
update:优化
2026-02-05 18:05:26 +08:00
rainv123 7b3db72285 update:优化 2026-02-05 18:02:18 +08:00
wengzhandGitHub 3639871dd2 Merge pull request #2944 from xinnan-tech/py_test_Memory_powermem
Py test memory powermem
2026-02-05 17:45:23 +08:00
wengzhandGitHub 5fb7fbe08f Merge branch 'main' into py_test_Memory_powermem 2026-02-05 17:45:07 +08:00
wengzhandGitHub 73f8a0977c Merge pull request #2948 from xinnan-tech/py_test_typing
Py test typing
2026-02-05 17:34:26 +08:00
wengzhandGitHub 87b99e0353 Merge pull request #2946 from xinnan-tech/fix_asr_Initialize
增加asr初始化ID判断
2026-02-05 17:33:35 +08:00
Sakura-RanChenandGitHub 795dcec698 Merge pull request #2890 from shengzhou1216/feature/python-typing
feat: 为多个模块添加类型注解以增强代码可读性
2026-02-05 17:15:00 +08:00
Sakura-RanChenandGitHub 4f61d21d17 Merge branch 'py_test_typing' into feature/python-typing 2026-02-05 17:14:47 +08:00
wengzhandGitHub 8a84428724 Merge pull request #2938 from xinnan-tech/test_live2d
update:测试页面增加切换live2d模型、拍照识物功能
2026-02-05 17:00:11 +08:00
wengzhandGitHub 46f1dee20e Merge pull request #2947 from xinnan-tech/fix/model-config-enable-check
新增模型配置启用开关禁用判断
2026-02-05 16:51:51 +08:00
lww155 75e24af858 新增模型配置启用开关禁用判断 2026-02-05 16:46:10 +08:00
rainv123 fae6db2198 fix:移除拨号按钮防抖,点击拨号后禁用按钮3秒 2026-02-05 16:32:05 +08:00
rainv123 32aea32e2c fix:删除工具描述输入框的多余空格 2026-02-05 16:09:52 +08:00
Sakura-RanChen 63d9dae18b 增加asr初始化ID判断 2026-02-05 15:42:23 +08:00
rainv123 041c254ea4 fix:拨号按钮和摄像头按钮增加防抖机制 2026-02-05 15:06:04 +08:00
rainv123 378d68aba9 fix: 测试页面MCP工具参数编辑样式调整 2026-02-05 14:44:37 +08:00
wengzhandGitHub 4076136fe4 Merge pull request #2945 from xinnan-tech/perf-manager-api-delTable
perf:新增数据集,删除无用业务表ai_voiceprint
2026-02-05 13:53:38 +08:00
DaGou12138 1e6e250dac 新增数据集,删除无用业务表ai_voiceprint 2026-02-05 11:28:31 +08:00
Sakura-RanChen 42b495d556 补充sql文件 2026-02-05 10:37:48 +08:00
Sakura-RanChen c88d709d56 Merge branch 'main' into py_test_Memory_powermem 2026-02-04 16:02:50 +08:00
wengzhandGitHub fa523dc615 Merge pull request #2942 from xinnan-tech/perf-manager-api-modelConfig
perf:新增关闭模型配置相关逻辑判断
2026-02-04 11:42:38 +08:00
DaGou12138 8718a07c7e 新增关闭模型配置相关逻辑判断 2026-02-04 11:32:10 +08:00
wengzhandGitHub 39124d4930 Merge pull request #2940 from xinnan-tech/py_fix_stream_asr
fix: 讯飞自动设备适应,阿里云等待时机过短
2026-02-04 10:38:29 +08:00
rainv123 8dbc0b9689 fix: 修复绑定验证码后重新连接摄像头不自动打开的问题 2026-02-04 10:29:48 +08:00
Sakura-RanChen 9fd3501605 fix: 讯飞自动设备适应,阿里云等待时机过短 2026-02-04 10:28:27 +08:00
lww155 4f72a516d3 update: 录音按钮新增防抖 2026-02-04 09:54:56 +08:00
lww155 e4cfabeb7e update: 优化代码 2026-02-04 09:54:21 +08:00
rainv123 85a83727fd feat: 摄像头验证码绑定检查 && 视觉分析URL动态获取 2026-02-03 11:52:22 +08:00
wengzhandGitHub a31e16c1d9 Merge pull request #2931 from xinnan-tech/py_test_error_response
Py test error response
2026-02-03 10:01:08 +08:00
Sakura-RanChen 3ab5dc49ac 去除无用代码,修复插入语句id缺失 2026-02-02 16:07:09 +08:00
rainv123 005dc55db3 add:测试页面增加拍照识物功能 2026-02-02 15:08:24 +08:00
Sakura-RanChenandGitHub ba1cf14ed4 Merge pull request #2888 from shengzhou1216/fix/2075
feat: 统一LLM错误处理并添加系统错误回复配置
2026-02-02 14:49:42 +08:00
Sakura-RanChenandGitHub 6da32a60c0 Merge branch 'py_test_error_response' into fix/2075 2026-02-02 14:49:26 +08:00
wengzhandGitHub ea9778f422 Merge pull request #2930 from xinnan-tech/py_test_AudioArtifacts
Py test audio artifacts
2026-02-02 14:23:09 +08:00
wengzhandGitHub f0b176768d Merge branch 'main' into py_test_AudioArtifacts 2026-02-02 14:23:01 +08:00
wengzhandGitHub 5aa671d6ff Merge pull request #2929 from xinnan-tech/py_fix_asr
fix: 模式切换时音频残余,优化相关状态管理
2026-02-02 14:05:07 +08:00
Sakura-RanChenandGitHub d02d094219 Merge pull request #2924 from shengzhou1216/refactor/asr-delete_audio
refactor(asr): 重构speech_to_text方法以接收artifacts参数
2026-02-02 11:42:59 +08:00
Sakura-RanChen f5b4bae927 fix: 模式切换时音频残余,优化相关状态管理 2026-02-02 11:29:47 +08:00
rainv123 19fdf5d917 update:测试页面切换模型和切换背景的按钮样式调整 2026-02-02 10:47:01 +08:00
欣南科技andGitHub 9682f615cf Merge pull request #2927 from xinnan-tech/update-test-bg
update:优化图片
2026-02-01 01:24:39 +08:00
hrz 8162adeca1 update:优化图片 2026-02-01 01:23:45 +08:00
rainv123 ba2749430f add:live2d增加可切换的男性角色 2026-01-30 17:59:06 +08:00
rainv123 e3088f4410 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-01-30 17:21:22 +08:00
huozaimengli 614b662e3d refactor(asr): 重构speech_to_text方法以接收artifacts参数
移除各ASR提供者中重复的get_current_artifacts调用,改为通过参数传递artifacts
修改base类中process_audio方法,根据combined_pcm_data长度决定是否创建artifacts
更新所有speech_to_text方法签名,添加artifacts可选参数并更新文档字符串
2026-01-29 16:39:35 +08:00
huozaimengli f5b9995f89 feat: 添加系统错误时的默认回复配置SQL
在 sys_params 表中插入新记录,用于配置系统发生错误时返回给用户的默认回复消息。该配置允许管理员自定义错误提示文本,提升用户体验。
2026-01-29 15:58:00 +08:00
huozaimengli 0ddd9ba8ff fix: 修正系统错误响应的句子类型为MIDDLE 2026-01-29 15:57:31 +08:00
欣南科技andGitHub 9c8d614d78 Merge pull request #2918 from xinnan-tech/test-arm64-docker
fix:docker 缺失nginx文件
2026-01-28 19:02:21 +08:00
hrz 0075550229 fix:docker 缺失nginx文件 2026-01-28 19:01:37 +08:00
rainv123 4a547be882 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-01-28 15:24:02 +08:00
欣南科技andGitHub d721270bed Merge pull request #2915 from xinnan-tech/test-arm64-docker
update:兼容arm架构字体
2026-01-28 11:40:26 +08:00
hrz fe2e178b19 update:兼容arm架构字体 2026-01-28 11:39:50 +08:00
欣南科技andGitHub 21337e5046 Merge pull request #2914 from xinnan-tech/test-arm64-docker
update:兼容arm架构字体
2026-01-28 11:34:54 +08:00
hrz 1c8b271e20 update:兼容arm架构字体 2026-01-28 11:34:16 +08:00
欣南科技andGitHub 3d1160b6bb Merge pull request #2913 from xinnan-tech/test-arm64-docker
update:调试编译arm镜像
2026-01-28 11:13:40 +08:00
hrz 086c4a55e6 update:调试编译arm镜像 2026-01-28 11:12:58 +08:00
欣南科技andGitHub 889f2f9a75 Merge pull request #2912 from xinnan-tech/test-arm64-docker
update:兼容arm架构字体
2026-01-28 11:03:04 +08:00
hrz 07b686be14 update:兼容arm架构字体 2026-01-28 11:02:17 +08:00
欣南科技andGitHub 4d6b453485 Merge pull request #2910 from xinnan-tech/test-arm64-docker
add:增加linux/arm64docker镜像编译
2026-01-28 09:16:25 +08:00
hrz 9909045f9d add:增加linux/arm64docker镜像编译 2026-01-28 09:15:40 +08:00
hrzandGitHub b0dc4d88db Merge pull request #2908 from xinnan-tech/py_fix_text
fix: 保存音频数据文件时文本不记录
2026-01-27 17:53:51 +08:00
Sakura-RanChen bbf3858735 fix: 保存音频数据文件时文本不记录 2026-01-27 16:22:35 +08:00
欣南科技andGitHub 73573e2f12 Merge pull request #2907 from xinnan-tech/live2d-actions
update:增加版本号,解决html引用文件缓存问题
2026-01-27 16:13:31 +08:00
hrz 99e136786e update:增加版本号,解决html引用文件缓存问题 2026-01-27 16:12:55 +08:00
欣南科技andGitHub 205be0e4ec Merge pull request #2906 from xinnan-tech/live2d-actions
add:麦克风权限的判断
2026-01-27 16:03:49 +08:00
hrz 2e64f45a31 update:优化代码排版 2026-01-27 15:59:46 +08:00
hrz 818b4f2f6d update:增加版本号,解决html引用文件缓存问题 2026-01-27 15:52:34 +08:00
hrz 5d72f9f79d update:由于现在的模型本身动作有限,使用起来体验不佳,暂时移除动作控制的代码 2026-01-27 15:45:53 +08:00
Sakura-RanChenandGitHub 22d0dcdf58 Merge pull request #2887 from shengzhou1216/refactor/asr-delete_audio
refactor(asr): 统一音频预处理逻辑并引入AudioArtifacts
2026-01-27 15:41:46 +08:00
rainv123 122d1def1d Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-01-27 11:59:03 +08:00
hrzandGitHub 0ee349df2d Merge pull request #2905 from xinnan-tech/py_fix_minimaxLog
补充minimax接口错误信息
2026-01-27 11:28:17 +08:00
Sakura-RanChen 4dde66339b 补充minimax接口错误信息 2026-01-27 11:22:32 +08:00
hrzandGitHub 0064f975c2 Merge pull request #2903 from spider-yamet/feature/issue-2896-clean
feat: implement Issue 2896 - Live2D Actions and Microphone Detection
2026-01-27 11:17:31 +08:00
rainv123andGitHub 43234f4798 Merge pull request #2836 from xinnan-tech/py_audio_rate
update: 自定义配置输出音频采样率
2026-01-27 10:58:32 +08:00
spider-yamet 48034fc000 Translate log messages to Chinese in recorder.js 2026-01-26 15:03:23 -08:00
spider-yamet 3fc33e9095 Optimize code density: simplify changed files while keeping comments (reduce 364 lines) 2026-01-26 14:48:08 -08:00
spider-yamet da71dce860 Optimize code : minify test files 2026-01-26 14:37:07 -08:00
spider-yamet b7e4408a0f Add browser-based unit tests for xiaozhi test modules
- Add browser-compatible test files (no npm required)

  - recorder.test.browser.js: 8 tests for microphone and HTTP detection

  - tools.test.browser.js: 5 tests for Live2D actions and error handling

- Add test runner (test-runner.html) with built-in test framework

- Add null safety checks in tools.js for DOM element access

- Add documentation (English and Chinese versions)

  - README_TESTS.md / README_TESTS_CN.md: Complete test guide

  - QUICK_START_TEST.md / QUICK_START_TEST_CN.md: Quick start guides

- Total: 13 unit tests covering microphone detection, HTTP detection, Live2D actions, and error handling
2026-01-26 10:18:40 -08:00
spider-yamet 4f4f8ca54e docs: add testing guide and fix Chinese text in controller.js 2026-01-26 08:30:39 -08:00
spider-yamet 99c12a0fed fix: translate corrupted Chinese text to proper Chinese in controller.js 2026-01-26 08:05:02 -08:00
spider-yamet dcd0ef3f40 fix: translate corrupted Chinese text to proper Chinese in controller.js
- Fix corrupted Chinese characters in addMCPTool function
- Translate placeholder and button text to proper Chinese
2026-01-26 07:57:13 -08:00
spider-yamet 2f53b921fe feat: implement Issue 2896 - Live2D Actions and Microphone Detection
- Add Live2D action tools (smile, wave, generic actions) as MCP tools
- Implement microphone availability detection
- Handle HTTP non-localhost access scenarios
- Update UI to reflect microphone availability state
- Translate all comments and messages to proper Chinese/English
- Add test files for new functionality
2026-01-26 07:44:33 -08:00
rainv123 0f16a8d31f Merge branch 'py_audio_rate' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2026-01-26 17:39:29 +08:00
Sakura-RanChen 3051dc8327 更改默认输出采样率与设备端适配 2026-01-26 17:35:45 +08:00
Sakura-RanChen c313997a61 去除调试输出 2026-01-26 16:33:09 +08:00
欣南科技andGitHub 07c0c764d3 Merge pull request #2898 from xinnan-tech/fix-ChatHistoryConf-value
set ChatHistoryConf default value
2026-01-26 15:11:46 +08:00
hrz e339a501aa set ChatHistoryConf default value 2026-01-26 15:11:11 +08:00
hrzandGitHub f2c541b4ab Merge pull request #2897 from xinnan-tech/fix-path
fix: 修复项目访问地址
2026-01-26 15:07:47 +08:00
zhuoqinglian 206af1c074 fix: 修复项目访问地址 2026-01-26 15:06:05 +08:00
欣南科技andGitHub 344729c9a6 Merge pull request #2895 from xinnan-tech/fix-digital-human-initialize
add:响应mcp初始化请求
2026-01-26 12:51:09 +08:00
hrz 3b1c2d3b1b add:响应mcp初始化请求 2026-01-26 12:42:11 +08:00
wengzhandGitHub 3660af9619 Merge pull request #2881 from xinnan-tech/generator
feat: 添加语音盒子在线烧录功能
2026-01-26 09:41:42 +08:00
zhuoqinglian 4905ba836c fix: 修复语音盒子自定义主题表情无法跟随语气变化问题 2026-01-26 09:33:58 +08:00
huozaimengli 4b573fb4e2 feat: 为多个模块添加类型注解以增强代码可读性
为 ConnectionHandler 相关的函数参数添加类型注解,使用 TYPE_CHECKING 避免循环导入。主要修改包括:
- 在 abortHandle、textHandle 等处理模块中为 conn 参数添加 ConnectionHandler 类型注解
- 在 websocket_server、connection 等核心模块中为方法参数添加类型注解
- 在 plugins_func 下的多个功能模块中为函数参数添加类型注解
- 在 providers 相关模块中为工具执行器和方法添加类型注解
- 统一代码格式,如将单引号字符串改为双引号

Fixes #2034
2026-01-25 17:47:52 +08:00
huozaimengli 6ae0af278b feat: 统一LLM错误处理并添加系统错误回复配置
在多个LLM提供者中移除try-catch块,将错误处理统一到connection.py的流处理层
添加system_error_response配置项,支持自定义系统错误时的回复内容
在意图识别和流处理中捕获异常时返回配置的错误回复,避免硬编码错误信息

Fixes #2075
2026-01-25 16:48:01 +08:00
huozaimengli 15650e1a6c refactor(asr): 统一音频预处理逻辑并引入AudioArtifacts
重构所有ASR提供商的speech_to_text方法,将重复的音频解码、合并和文件保存逻辑提取到基类的speech_to_text_wrapper中。引入AudioArtifacts数据类封装PCM帧、字节数据、文件路径和临时路径,简化各提供商实现。移除各提供商中的冗余文件清理代码,由基类统一处理。

新增requires_file()和prefers_temp_file()方法允许提供商声明文件需求,优化内存和磁盘使用。保持接口兼容性的同时提高代码复用性和可维护性。
2026-01-25 11:27:34 +08:00
Sakura-RanChen ce00c862fe HuoshanDoubleStreamTTS增加自定义配置 2026-01-23 17:16:46 +08:00
zhuoqinglian a50229431b fix: 修复https协议导致无法上传表情的问题 2026-01-23 17:07:23 +08:00
wengzhandGitHub 275102f5b7 Merge pull request #2882 from xinnan-tech/fix-devices-loading
fix: 修复获取设备状态接口报错时, 没有执行失败回调导致loading一直存在
2026-01-23 15:36:46 +08:00
lww155 ff6286ffcc fix: 修复获取设备状态接口报错时, 没有执行失败回调导致loading一直存在 2026-01-23 15:33:44 +08:00
zhuoqinglian 974fe6c3b7 feat: 添加语音盒子在线烧录功能 2026-01-23 15:29:43 +08:00
wengzhandGitHub b78292b270 Merge pull request #2880 from xinnan-tech/perf-manager-api-business
pred:优化MCP工具名称列表顺序问题
2026-01-23 14:13:23 +08:00
DaGou12138 3559a7018c 优化MCP工具名称列表顺序问题 2026-01-23 14:03:00 +08:00
Sakura-RanChenandGitHub 9368885355 Merge pull request #2859 from wayyoungboy/add-powermem
chore: 更新 powermem 依赖至 0.3.1 版本, 增加角色过滤的能力
2026-01-23 10:24:21 +08:00
wengzhandGitHub 3222d6175d Merge pull request #2879 from xinnan-tech/fix-digital-human
update: 拨号成功后自动开启录音
2026-01-23 09:22:03 +08:00
lww155 28f9f23449 update: 拨号成功后自动开启录音 2026-01-23 09:13:19 +08:00
wengzhandGitHub 5e7d192ebc Merge pull request #2877 from xinnan-tech/fix-digital-human
update: 调整配置获取
2026-01-22 17:55:46 +08:00
lww155 d6a32416d7 update: 调整配置获取 2026-01-22 17:48:40 +08:00
wengzhandGitHub 6a2c01763e Merge pull request #2876 from xinnan-tech/fix-digital-human
Fix digital human
2026-01-22 17:27:36 +08:00
lww155 e1dd272708 update: 关闭设置框时保存配置, 阻止按钮事件冒泡, 调整配置获取方式 2026-01-22 17:23:27 +08:00
lww155 3e7bc0606a update: 优化背景加载代码 2026-01-22 16:16:09 +08:00
lww155 9d9ca1475d fix: 修复重复请求ota与重复建立连接问题 2026-01-22 15:54:26 +08:00
lww155 43ddc0135c update: 去除未使用代码 2026-01-22 15:39:40 +08:00
欣南科技andGitHub 98f907a97b Merge pull request #2874 from xinnan-tech/manager-mcp-api
update:增加mcp调用后数据类型的判断
2026-01-22 14:46:23 +08:00
hrz b2ddf060c9 update:增加mcp调用后数据类型的判断 2026-01-22 14:42:43 +08:00
欣南科技andGitHub 5e612276db Merge pull request #2873 from xinnan-tech/manager-mcp-api
自定义表情固件接口
2026-01-22 14:02:48 +08:00
hrz cbb293e7fa add:上传自定义表情固件接口 2026-01-22 13:27:10 +08:00
hrz fdb050f6ed add:获取设备的mcp工具列表 2026-01-21 22:58:58 +08:00
wengzhandGitHub f83ddf79fa Merge pull request #2868 from xinnan-tech/fix-digital-human
fix: 修复未绑定设备时状态处理
2026-01-20 17:48:35 +08:00
lww155 95b340a7a3 fix: 修复未绑定设备时状态处理 2026-01-20 17:39:06 +08:00
milieyoandGitHub d46ac89e58 Merge pull request #2867 from xinnan-tech/update-style
style: 优化部分样式,保持一致性
2026-01-20 15:45:00 +08:00
zhuoqinglian 80b0912f84 Merge branch 'main' into update-style 2026-01-20 15:36:22 +08:00
zhuoqinglian e0b4431064 style: 优化部分样式,保持一致性 2026-01-20 15:35:41 +08:00
milieyoandGitHub e3f16f91cf Merge pull request #2863 from xinnan-tech/fix-digital-human
update: 新增聊天输入框
2026-01-20 09:32:23 +08:00
milieyoandGitHub 5f39e5c308 Merge pull request #2860 from xinnan-tech/perf-manager-api-business
perf:优化字典接口、模型接口、音色资源部分业务逻辑
2026-01-20 09:17:24 +08:00
lww155 83304c9ff4 update: 新增聊天输入框 2026-01-20 09:16:45 +08:00
DaGou12138 863cfb575c 优化音色资源相关业务逻辑 2026-01-19 17:55:38 +08:00
DaGou12138 2944040648 优化音色资源相关业务逻辑 2026-01-19 17:19:45 +08:00
DaGou12138 5f19b9b0d0 优化字典接口、模型接口部分业务逻辑 2026-01-19 15:19:48 +08:00
milieyoandGitHub 2948ed091c Merge pull request #2858 from xinnan-tech/perf-manager-api-device
perf:优化知识库相关业务逻辑
2026-01-19 14:24:27 +08:00
渠磊 bfa638e17f chore: 更新 powermem 依赖至 0.3.1 版本, 增加角色过滤的能力 2026-01-19 14:16:12 +08:00
DaGou12138 97ee397b54 Merge branch 'refs/heads/main' into perf-manager-api-device 2026-01-19 12:00:07 +08:00
DaGou12138 f7fbe7efbe 优化修改知识库接口部分业务逻辑 2026-01-19 11:59:25 +08:00
hrzandGitHub ce6b0bd099 Merge pull request #2857 from xinnan-tech/build-generator
fix: 修复项目部署二级目录自定义语音盒子主题文件资源异常问题
2026-01-19 11:45:08 +08:00
zhuoqinglian 8643960104 Merge branch 'main' into build-generator 2026-01-19 11:33:11 +08:00
zhuoqinglian b4549ebc59 fix: 修复项目部署二级目录自定义语音盒子主题文件资源异常问题 2026-01-19 11:30:28 +08:00
hrzandGitHub a602cddd05 Merge pull request #2850 from xinnan-tech/build-generator
feat: 添加语音盒子自定义主题功能
2026-01-17 14:04:12 +08:00
hrzandGitHub c4278864d1 Merge pull request #2852 from xinnan-tech/fix_device-mcp
fix: 修复开机立刻唤醒导致客户端 MCP 工具列表为空的问题
2026-01-16 19:02:58 +08:00
3030332422 7094548ecf fix: 修复开机立刻唤醒导致客户端 MCP 工具列表为空的问题 2026-01-16 18:04:04 +08:00
milieyoandGitHub 363fffada8 Merge pull request #2849 from xinnan-tech/fix-multilingual-bug
fix: 语音合成-音色管理,克隆音频路径、克隆音频文本多语言异常处理
2026-01-16 17:14:28 +08:00
milieyoandGitHub c2c3eb7106 Merge pull request #2848 from xinnan-tech/perf-manager-api-device
perf:优化设备在线状态接口相关逻辑
2026-01-16 17:13:30 +08:00
zhuoqinglian 8e19a64f15 fix: 语音合成-音色管理,克隆音频路径、克隆音频文本多语言异常处理 2026-01-16 17:05:46 +08:00
linjiaqin 9042b7e6d7 优化智能体模块相关逻辑 2026-01-16 16:43:04 +08:00
linjiaqin ad1855cfb5 优化设备在线接口相关逻辑 2026-01-16 15:45:42 +08:00
zhuoqinglian efa0d1095d feat: 添加语音盒子自定义主题功能 2026-01-16 14:52:40 +08:00
hrzandGitHub a8c13d740b Merge pull request #2842 from hlleng/fix/model-remark
fix: 修复智控台模型配置中备注不能保存的问题
2026-01-15 20:49:50 +08:00
Honglin Leng 7475e9829f fix: persist model remark on update 2026-01-15 20:15:25 +08:00
milieyoandGitHub b7dde1dae2 Merge pull request #2839 from xinnan-tech/fix-digital-human
修复背景404、通话接通后自动录音、模型加载Loading
2026-01-15 14:26:50 +08:00
lww155 778c4560fd update: 新增模型加载 2026-01-15 09:20:22 +08:00
lww155 fa31096cd8 update: 拨号成功后开启自动录音 2026-01-15 09:19:25 +08:00
Sakura-RanChen fd1dd39463 update: 自定义配置输出音频采样率 2026-01-14 17:54:50 +08:00
lww9029 ecd3e12a41 fix: 切换背景404问题 2026-01-14 11:18:41 +08:00
欣南科技andGitHub 0a8121e849 Merge pull request #2831 from xinnan-tech/test_page_fix
update:修复live2d模型加在路径bug
2026-01-12 18:06:41 +08:00
hrz e93f9d7111 update:修复live2d模型加在路径bug 2026-01-12 18:05:39 +08:00
Sakura-RanChen 3bdccfea62 解析json字符串提取相关文本 2026-01-12 17:47:29 +08:00
hrzandGitHub fdf98985a1 Merge pull request #2826 from xinnan-tech/test_page_fix
update:增加live2d模型,修改测试页面样式
2026-01-12 17:44:30 +08:00
hrz 6c3609e79e update:优化图片大小 2026-01-12 17:43:30 +08:00
Sakura-RanChenandGitHub 5fa50339b4 Merge pull request #2824 from wayyoungboy/add-powermem
docs(config): 更新配置文件和集成文档
2026-01-12 15:07:08 +08:00
Sakura-RanChen f0c95bc987 为空时不做相关查询(工具调用function_call时没有相关query) 2026-01-12 15:06:38 +08:00
rainv123 a9aa709502 update:增加live2d模型,修改测试页面样式 2026-01-12 11:00:50 +08:00
渠磊 8edc23b888 docs(config): 更新配置文件和集成文档
- 添加embedding_dims配置项注释
- 同步配置文件修改到集成文档
2026-01-09 17:42:30 +08:00
Sakura-RanChen c4fc510a27 补充相关信息 2026-01-09 17:25:03 +08:00
Sakura-RanChen 134000996b query只传递相关的文本 2026-01-09 16:09:05 +08:00
Sakura-RanChen 111909c26d fix: 启用用户画像模式时,search为同步方法需包装 2026-01-09 15:46:08 +08:00
Sakura-RanChenandGitHub f66966d72f Merge pull request #2822 from wayyoungboy/add-powermem
fix: powermem sqlite支持用户画像以及修改配置模式
2026-01-09 14:46:31 +08:00
milieyoandGitHub 1f6a89ada5 Merge pull request #2823 from xinnan-tech/20260109
调整智能体管理list接口排序,根据创建时间倒序返回
2026-01-09 14:32:22 +08:00
LJH-rgsze 31a1180b79 还原 2026-01-09 14:30:27 +08:00
LJH-rgsze 77b4a416a9 调整智能体管理list接口排序,根据创建时间倒序返回 2026-01-09 14:28:01 +08:00
渠磊 06a2e6fbfa refactor(powermem): 移除未使用的内存提供者实例注册 2026-01-09 12:34:55 +08:00
渠磊 c8a28e98d6 Merge remote-tracking branch 'upstream/py_test_Memory_powermem' into add-powermem
# Conflicts:
#	main/xiaozhi-server/core/providers/memory/powermem/powermem.py
2026-01-09 12:32:59 +08:00
渠磊 564adbd851 feat(powermem): 升级配置结构并支持多数据库用户画像
- 重构配置结构为模块化设计(llm/embedder/vector_store)
- 用户画像功能支持oceanbase/seekdb/sqlite三种存储后端
- 更新文档说明和示例配置
2026-01-09 12:25:17 +08:00
Sakura-RanChen ad93f43145 去除默认初始化,补充函数签名缺失 2026-01-09 10:49:24 +08:00
wayyoungboy 2bf1123647 部分配置key修正 2026-01-08 23:52:19 +08:00
Sakura-RanChenandGitHub a6ff6426e9 Merge pull request #2819 from wayyoungboy/add-powermem
Add powermem
2026-01-08 17:54:57 +08:00
milieyoandGitHub da7a6933f5 Merge pull request #2818 from xinnan-tech/fix_wakeup_audioRate
修复设备播放音频时打断后使用唤醒词时流控器未重置造成的死锁
2026-01-08 17:27:53 +08:00
Sakura-RanChen 54cac0d2fd fix: 修复当手动设备上个会话正常结束后,使用唤醒词唤醒音频播放不完整 2026-01-08 16:17:48 +08:00
渠磊 de7aedab96 feat(memory): 添加用户画像功能支持
- 新增 `enable_user_profile` 配置项,支持用户画像模式
- 实现 `UserMemory` 类集成,自动提取用户信息
- 更新文档说明用户画像功能及配置要求
2026-01-08 14:43:48 +08:00
hrzandGitHub 7fe718c887 Merge pull request #2817 from xinnan-tech/py_TTS_text
TTS文本过滤
2026-01-08 14:21:17 +08:00
hrzandGitHub 36eaefb8b0 Merge pull request #2816 from xinnan-tech/20260105
修复音色播放按钮显示错误
2026-01-08 12:39:33 +08:00
hrzandGitHub 3a61ec84b3 移除console打印 2026-01-08 12:39:07 +08:00
渠磊 dadf05ab4e feat: 添加 PowerMem 智能记忆支持
- 新增 PowerMem 配置选项和集成文档
- 更新 README 和多语言文档
- 添加 powermem 依赖包
2026-01-08 12:02:03 +08:00
Sakura-RanChen c1bf92d243 修复设备播放音频时打断后使用唤醒词时流控器未重置造成的死锁 2026-01-08 11:39:04 +08:00
LJH-rgsze c1959e0795 优化代码逻辑 2026-01-08 10:10:39 +08:00
LJH-rgsze 40a6b7434b 调整判断逻辑 2026-01-07 18:08:43 +08:00
Sakura-RanChen 24519a2732 TTS文本过滤 2026-01-07 17:38:38 +08:00
LJH-rgsze c190abe4b1 用国际化重写硬编码提示 2026-01-07 17:03:56 +08:00
LJH-rgsze 07d5b3cd2a 补充-上个修改上传少了 2026-01-07 16:54:08 +08:00
LJH-rgsze 81e923b4f7 补充音色管理页面缺失的国际化 2026-01-07 16:52:36 +08:00
LJH-rgsze bcb51729a5 修复播放按钮的显示错误 2026-01-07 16:00:35 +08:00
hrzandGitHub a731c1d01f Merge pull request #2811 from xinnan-tech/py_fix_llm_text
修复独立LLM调用时文本未记录
2026-01-06 17:34:07 +08:00
Sakura-RanChen 0bb5a37ace 修复独立LLM调用时文本未记录 2026-01-06 10:29:56 +08:00
hrzandGitHub a711827996 Merge pull request #2810 from xinnan-tech/fix_report_connection
fix: 禁用httpx连接池并显式关闭响应防止连接泄漏,进程文件描述符耗尽
2026-01-05 18:00:41 +08:00
hrzandGitHub 8f854e6f74 Merge pull request #2809 from xinnan-tech/20260105
补充国际化
2026-01-05 17:59:12 +08:00
Sakura-RanChen f1b5afbf5c fix: 禁用httpx连接池并显式关闭响应防止连接泄漏 2026-01-05 17:50:23 +08:00
LJH-rgsze 84f6930389 补充国际化 2026-01-05 17:46:35 +08:00
hrzandGitHub f415dd4482 Merge pull request #2808 from xinnan-tech/20260105
修复音色克隆,ota管理,语音资源管理的分页错误
2026-01-05 17:30:46 +08:00
LJH-rgsze 927f65e106 修复参数名不匹配导致的翻页错误 2026-01-05 17:21:38 +08:00
hrzandGitHub 4b6b3082c7 Merge pull request #2794 from xinnan-tech/20260104SSL
拓展首页的搜索栏-支持同时搜索设备mac和智能体名字
2026-01-05 16:54:20 +08:00
LJH-rgsze 4c550245db 调整判断逻辑 2026-01-05 16:51:09 +08:00
LJH-rgsze 341ed22370 简化代码 2026-01-05 15:27:47 +08:00
LJH-rgsze 6851ccacf3 提取重复代码合并 2026-01-05 15:05:29 +08:00
hrzandGitHub 815af687ea Merge pull request #2798 from xinnan-tech/py_asr_emotion_language
Py asr emotion language
2026-01-05 15:03:50 +08:00
LJH-rgsze e9373b59c8 优化代码 2026-01-05 14:50:23 +08:00
Sakura-RanChen 3f3f3fcd57 更改Funserver使用模型 2026-01-05 14:46:34 +08:00
LJH-rgsze d003e66310 还原部分代码 2026-01-05 11:31:28 +08:00
Sakura-RanChen e6108ccbbd 增加ASR情绪和语种返回 2026-01-05 11:17:04 +08:00
LJH-rgsze a01f01198c 补全参数的返回 2026-01-05 11:13:01 +08:00
LJH-rgsze cc96eaeb8f 修复设备列表显示问题 2026-01-05 10:13:11 +08:00
LJH-rgsze e25ca3d1d3 调整搜索实现-从前端过滤改为后端查询 2026-01-05 10:10:17 +08:00
LJH-rgsze 9c111b2d5e 更新国际化提示 2026-01-04 18:04:26 +08:00
LJH-rgsze 436a01fb6e 删除依赖更新部分(还原) 2026-01-04 17:14:25 +08:00
LJH-rgsze 9b6620dd4a 搜索拓展 2026-01-04 16:53:38 +08:00
Sakura-RanChenandGitHub 85919e800e Merge pull request #2552 from Packeting1/multi_lang_tts
feat: 为阿里百炼流式TTS支持多语言音色
2026-01-04 15:02:24 +08:00
欣南科技andGitHub a2023a65c0 Merge pull request #2789 from xinnan-tech/test_page_token
Bump to 0.8.11
2026-01-02 22:46:55 +08:00
hrz 619370f36c Bump to 0.8.11 2026-01-02 22:45:53 +08:00
欣南科技andGitHub ea6c0e691f Merge pull request #2788 from xinnan-tech/test_page_token
update:删除认证令牌输入框,从ota接口获取令牌
2026-01-02 22:42:48 +08:00
hrz de0d82f1e8 update:删除认证令牌输入框,从ota接口获取令牌 2026-01-02 22:41:37 +08:00
hrzandGitHub c8a26d9c5e Merge pull request #2623 from xinnan-tech/dependabot/pip/main/xiaozhi-server/psutil-7.1.3
build(deps): bump psutil from 7.0.0 to 7.1.3 in /main/xiaozhi-server
2026-01-02 21:50:21 +08:00
hrz d89b842586 update:保留适配本项目python3.10的版本 2026-01-02 21:48:34 +08:00
hrzandGitHub 6dd3ceea7e Merge pull request #2627 from xinnan-tech/dependabot/pip/main/xiaozhi-server/mcp-1.22.0
build(deps): bump mcp from 1.20.0 to 1.22.0 in /main/xiaozhi-server
2026-01-02 21:39:03 +08:00
hrzandGitHub 5fe68030b0 Merge pull request #2626 from xinnan-tech/dependabot/pip/main/xiaozhi-server/torchaudio-2.9.1
build(deps): bump torchaudio from 2.2.2 to 2.9.1 in /main/xiaozhi-server
2026-01-02 21:38:45 +08:00
hrzandGitHub 5215105440 Merge pull request #2625 from xinnan-tech/dependabot/pip/main/xiaozhi-server/websockets-15.0.1
build(deps): bump websockets from 14.2 to 15.0.1 in /main/xiaozhi-server
2026-01-02 21:38:17 +08:00
hrzandGitHub fb69eb751a Merge pull request #2624 from xinnan-tech/dependabot/pip/main/xiaozhi-server/modelscope-1.32.0
build(deps): bump modelscope from 1.23.2 to 1.32.0 in /main/xiaozhi-server
2026-01-02 21:37:33 +08:00
hrzandGitHub b903d51592 Merge pull request #2777 from xinnan-tech/update_blasr_paraformer
Update blasr paraformer
2026-01-02 20:39:43 +08:00
Sakura-RanChen d1f6774e58 update: 增加火山流式情感字段支持 2025-12-30 16:46:04 +08:00
CGDandGitHub 9e55df4141 Merge pull request #2778 from xinnan-tech/fix_mcp_rag
fix:serch_from_ragflow调用失败返回详细错误信息
2025-12-30 11:06:50 +08:00
rainv123 b169e9413f fix:serch_from_ragflow调用失败返回详细错误信息 2025-12-30 11:02:56 +08:00
Sakura-RanChen c511766e9d update: 增加豆包流式多语种识别 2025-12-29 16:38:23 +08:00
hrzandGitHub e6f9ceb7fa Merge pull request #2767 from xinnan-tech/web_Hidden_state
update:仅在 MQTT 服务可用时显示设备在线状态列
2025-12-27 14:24:01 +08:00
3030332422 eab8b48c9c update:仅在 MQTT 服务可用时显示设备在线状态列 2025-12-26 17:39:08 +08:00
FAN-yeB 46abb1009a update:初始化阿里云百炼asr供应器 手动模式待更改 2025-12-26 16:13:14 +08:00
CGDandGitHub 2a42d86db0 Merge pull request #2581 from xinnan-tech/py_tts_huoshan
自主选择链接复用功能
2025-12-26 14:47:01 +08:00
CGDandGitHub 68b0d9654c Merge branch 'main' into py_tts_huoshan 2025-12-26 14:46:51 +08:00
hrzandGitHub 8f96cf13ac Merge pull request #2764 from xinnan-tech/fix_ServerSideManage_emit-action
fix:修复服务器管理页面WebSocket连接失败和消息丢弃问题
2025-12-26 09:04:23 +08:00
3030332422 dbd179e507 fix:修复服务器管理页面WebSocket连接失败和消息丢弃问题 2025-12-25 18:11:03 +08:00
rainv123andGitHub 9541e85600 Merge pull request #2743 from xinnan-tech/py_async_server-mcp
update:将服务端MCP的初始化MCP服务从串行改为并发执行,并添加超时机制
2025-12-23 16:50:26 +08:00
rainv123andGitHub 9ecd829bfa Merge pull request #2747 from xinnan-tech/py_asr_doubao_stream
豆包ASR流式自定义语句停止时长
2025-12-23 16:49:56 +08:00
hrzandGitHub fd4cff73ae Merge pull request #2742 from xinnan-tech/manager-web-logo-i18n
add:登录、注册、首页、忘记密码页的多语言logo显示判断
2025-12-23 15:35:20 +08:00
hrz 1d6c4751de update:股东记忆模型的token大小 2025-12-23 14:42:33 +08:00
3030332422 e066c1d6a1 update:超时时间更改为10秒,并且删去无用的模块导入 2025-12-22 16:38:28 +08:00
3030332422 85f5404b3b update:添加锁保护避免MCP并发初始化时的竞态条件 2025-12-22 15:56:40 +08:00
Sakura-RanChen 33c5893d32 豆包ASR流式自定义语句停止时长 2025-12-22 15:23:55 +08:00
hrz b597cb0686 update:移除无用代码 2025-12-20 00:30:20 +08:00
hrz c5e288ca9c Merge branch 'main' into manager-web-logo-i18n 2025-12-19 23:46:43 +08:00
欣南科技andGitHub 38d984f225 Merge pull request #2744 from xinnan-tech/fix-delete-audio-data
分批次删除音频数据,避免数据库超时
2025-12-19 23:29:40 +08:00
hrz 628c642040 分批次删除音频数据,避免数据库超时 2025-12-19 23:27:35 +08:00
hrz d217cc4dd0 update:移除无用代码 2025-12-19 22:31:20 +08:00
rainv123 4f0e54b390 调整 2025-12-19 14:51:32 +08:00
rainv123 d7f89be31c add:登录、注册、首页、忘记密码页的多语言logo显示判断 2025-12-19 14:33:35 +08:00
rainv123 53bcee7032 Merge branch 'manager-web-logo-i18n' of https://github.com/xinnan-tech/xiaozhi-esp32-server into new 2025-12-19 14:06:19 +08:00
hrz 96991ae5ef add:多语言logo 2025-12-19 13:29:06 +08:00
欣南科技andGitHub 068bcde451 Merge pull request #2741 from xinnan-tech/openrz-patch-1
Update huoshan-streamTTS-voice-cloning.md
2025-12-19 12:12:44 +08:00
hrzandGitHub 0dda4f5646 Update huoshan-streamTTS-voice-cloning.md 2025-12-19 12:12:10 +08:00
3030332422 6c57ce9dd2 update:将服务端MCP的初始化MCP服务从串行改为并发执行,并添加超时机制 2025-12-19 11:49:42 +08:00
rainv123 6ac67a7e41 fix:调整 2025-12-19 09:55:18 +08:00
hrzandGitHub a23a585ad8 Merge pull request #2737 from xinnan-tech/py_prompt_update
update:提示词上下文按模板按需获取(位置/天气/动态上下文)
2025-12-18 18:20:01 +08:00
欣南科技andGitHub eba9562e81 Merge pull request #2738 from xinnan-tech/xiaozhi-server_ota_bin
Xiaozhi server ota bin
2025-12-18 18:12:44 +08:00
hrz ce49b409ac update:优化说明 2025-12-18 18:11:53 +08:00
hrz 7222f68d4d update:添加重要说明 2025-12-18 17:57:05 +08:00
hrz f3f0d62f12 add:添加单模块部署时,使用ota接口自动升级固件的教程 2025-12-18 17:38:58 +08:00
hrz 6e7c86e159 update:从vision_url配置里读取域名和端口号 2025-12-18 17:37:20 +08:00
hrzandGitHub f5565f6700 Merge pull request #2730 from rxchen/main
add basic "real" OTA support for single server deployment.
2025-12-18 17:29:31 +08:00
3030332422 e8d0bb0c54 update:提示词上下文按模板按需获取(位置/天气/动态上下文) 2025-12-18 16:34:37 +08:00
rui chen 33d70ccc96 get OTA address from websocket address config, if failed find ota_addr, if failed again, use local address. 2025-12-18 15:48:25 +08:00
rxchenandGitHub 53313a26af Merge branch 'xinnan-tech:main' into main 2025-12-18 15:26:51 +08:00
欣南科技andGitHub 7ba180752a Merge pull request #2735 from xinnan-tech/fix-nointent-weather
fix:无意图识别时,无"plugins"配置报错的bug
2025-12-18 11:23:36 +08:00
hrz 19736e66ad fix:无意图识别时,无"plugins"配置报错的bug 2025-12-18 11:18:49 +08:00
1cccuxandGitHub a00f8e4b76 Merge pull request #2734 from xinnan-tech/py_fix_listenmessage
fix:修复唤醒状态
2025-12-18 10:12:02 +08:00
FAN-yeB 7d9895cf5b 修复唤醒状态 2025-12-18 10:11:13 +08:00
rui chen d5f804bbb3 add basic OTA support for single server deployment, remove debug 2025-12-17 16:44:54 +08:00
rui chen 33a385cfa8 add basic OTA support for single server deployment
Committer: rxchen <rchentl@hotmail.com>
2025-12-17 16:26:35 +08:00
欣南科技andGitHub 109d924591 Merge pull request #2728 from xinnan-tech/update_provider_name
Update provider name
2025-12-17 12:00:13 +08:00
hrz a825eb3d4c Merge branch 'py_websocket_activate' into update_provider_name 2025-12-17 11:59:22 +08:00
hrz 3fb40677a4 update:纠正显示名称 2025-12-17 11:58:40 +08:00
hrzandGitHub 833971cd28 Merge pull request #2722 from xinnan-tech/py_websocket_activate
update: 增加websocket心跳机制
2025-12-17 11:51:14 +08:00
hrzandGitHub d14b14bce9 Merge pull request #2709 from xinnan-tech/py_audio_change
优化
2025-12-16 22:04:02 +08:00
hrz 53e26821ad update:补回前5个包提前发送的时间,因为发送完不等于播放完 2025-12-16 22:03:12 +08:00
Sakura-RanChen 1a7c06eb81 update: 增加websocket心跳机制 2025-12-16 16:39:13 +08:00
Packeting1 6cdbe45313 feat: 为阿里百炼流式TTS添加多语言音色支持、相关 音色配置; 2025-12-16 11:35:58 +08:00
hrzandGitHub 42a5b4892d Merge pull request #2712 from xinnan-tech/fix_bind_event
fix: 等待初始化成功设置事件
2025-12-15 22:46:31 +08:00
欣南科技andGitHub 9f4508b0c7 Merge pull request #2714 from xinnan-tech/update-doc
update:优化文档说明
2025-12-15 18:16:23 +08:00
hrz b2123ff01a update:优化文档说明 2025-12-15 18:15:35 +08:00
Sakura-RanChen 43ead841a4 fix: 等待初始化成功设置事件 2025-12-15 17:31:13 +08:00
Sakura-RanChen 33b4794e83 优化 2025-12-15 16:34:50 +08:00
欣南科技andGitHub fb91e6b1dd Merge pull request #2703 from xinnan-tech/test_page_pre_buffer
update:mqtt部署更新
2025-12-14 15:29:59 +08:00
hrz 4a4dbf123e update:mqtt部署更新 2025-12-14 15:29:13 +08:00
欣南科技andGitHub 0decedd6a1 Merge pull request #2701 from xinnan-tech/test_page_pre_buffer
update:优化测试页面缓冲音频播放
2025-12-14 14:25:25 +08:00
hrz d2e3a63418 update:优化测试页面缓冲音频播放 2025-12-14 14:24:39 +08:00
hrzandGitHub 15b3f0a8f5 Merge pull request #2695 from xinnan-tech/py_device_bind
update: 未绑定设备策略优化
2025-12-13 23:30:44 +08:00
hrz 5c261528d0 update:常用音频增加缓存,抵御高并发未授权设备访问 2025-12-13 23:10:40 +08:00
hrz 8b2bbec0b9 update:audio_to_data改成异步方法 2025-12-13 22:29:10 +08:00
hrz 8b3a4ad163 update:优化丢弃消息逻辑 2025-12-13 21:45:31 +08:00
hrz b3e272281b Merge branch 'main' into py_device_bind 2025-12-13 20:27:40 +08:00
hrz 06a90d6266 update:恢复audioRateController旧版本 2025-12-13 20:27:11 +08:00
欣南科技andGitHub 6eb7acaf73 Merge pull request #2698 from xinnan-tech/ws_token_auth
Ws token auth
2025-12-13 15:42:21 +08:00
hrz 2e092a7880 update:默认开启server.auth.enabled 2025-12-13 15:34:11 +08:00
hrzandGitHub 515f669546 Merge pull request #2685 from aixiamomo/fix/ws_token_auth
fix: 为Java项目的OTA接口实现WebSocket认证token生成功能,兼容Python端
2025-12-13 14:44:12 +08:00
hrz 7699596597 update:优化 2025-12-13 14:35:55 +08:00
欣南科技andGitHub 34dd325a1d Merge pull request #2697 from xinnan-tech/test_page_fix_abort
fix:edge_tts bug
2025-12-13 00:26:32 +08:00
hrz d33cdd978d fix:edge_tts bug 2025-12-13 00:25:54 +08:00
欣南科技andGitHub 0da9b4a69c Merge pull request #2696 from xinnan-tech/test_page_fix_abort
update:发送语音消息时打断机器人说话
2025-12-13 00:20:39 +08:00
hrz 7fc2eeaaa5 update:发送语音消息时打断机器人说话 2025-12-13 00:19:38 +08:00
hrzandGitHub 508529f66e Merge pull request #2694 from qingshuiyuyu/bugfix
fix:初始化ASR时,判断ASR类型取值错误修复
2025-12-13 00:16:37 +08:00
Sakura-RanChen dc170edbc1 update: 未绑定设备策略优化
fix: 音频队列竞态问题
2025-12-12 18:58:24 +08:00
shiyin 85e65cf9e8 fix:初始化ASR时,判断ASR类型取值错误修复 2025-12-12 18:28:46 +08:00
hrzandGitHub 41887ef431 Merge pull request #2686 from xinnan-tech/py_audio_await
Py audio await
2025-12-12 16:35:10 +08:00
hrz 5dbf796fa9 update:更新版本号 2025-12-12 16:33:50 +08:00
Sakura-RanChen 20f601e607 fix: 同步方法使用线程池避免阻塞 2025-12-12 15:39:30 +08:00
Sakura-RanChen c8d2d2255d fix: 音频影响线程问题 2025-12-12 15:08:40 +08:00
rainv123 5eaaf9f01d Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into test 2025-12-12 12:55:02 +08:00
rainv123 d6697948c2 fix:使用java端做聊天记录总结 2025-12-12 12:53:59 +08:00
Sakura-RanChen f88abd7638 fix: 聆听设备误触发 2025-12-12 09:46:15 +08:00
Sakura-RanChen fbfc408e94 update: 长按设备ASR适配 2025-12-11 17:12:56 +08:00
panjingpeng 5ac1a1d6a5 fix: 为Java项目的OTA接口实现WebSocket认证token生成功能,确保与Python端完全兼容。 2025-12-11 16:08:45 +08:00
FAN-yeB 3a74b30a0e 更新 qwen3_asr_flash.py 2025-12-10 17:57:26 +08:00
hrzandGitHub fe0a6852e9 Merge pull request #2674 from xinnan-tech/web-context-i18n
update:上下文源功能的国际化
2025-12-10 16:20:03 +08:00
3030332422 bfa04743e2 update:上下文源功能的国际化 2025-12-10 10:26:27 +08:00
Sakura-RanChen 48094f7e37 update: 音频后台队列稳定发送 2025-12-09 18:06:56 +08:00
FAN-yeB 60521b0a7e update:长按说话不走VAD直接触发ASR识别 2025-12-09 14:42:50 +08:00
hrzandGitHub 401deff2c3 Merge pull request #2665 from xinnan-tech/update_performance_tester
update:统一流式测速工具统计时间区间,新增百炼平台流式TTS测速
2025-12-08 16:05:22 +08:00
FAN-yeB 6ffa325b73 update:统一流式测速工具统计时间区间,新增百炼平台流式TTS测速 2025-12-08 15:51:04 +08:00
hrzandGitHub eeedfc8ac9 Merge pull request #2660 from xinnan-tech/py_fix_device-id
fix:修改上下文源的device_id
2025-12-08 14:28:10 +08:00
3030332422 aba7172a03 update:修改上下文源的device_id 2025-12-08 14:25:11 +08:00
hrzandGitHub 192f6f198f Merge pull request #2653 from xinnan-tech/WebMenu
fix:样式调整以及翻译补充
2025-12-05 22:02:22 +08:00
rainv123 43c9d85b8f uptate:更新配置文档,增加在页面上开启功能的教程 2025-12-05 18:33:11 +08:00
rainv123 6d5935fb27 uptate:更新配置文档,增加在页面上开启功能的教程 2025-12-05 18:29:20 +08:00
rainv123 efbef4ff5b fix:样式调整以及翻译补充 2025-12-05 18:08:26 +08:00
欣南科技andGitHub e4c99b9351 Merge pull request #2652 from xinnan-tech/update-doc
Update doc
2025-12-05 17:40:12 +08:00
hrz 11e328ea6a update:优化描述 2025-12-05 17:39:34 +08:00
hrz 8879907e38 update:修改描述 2025-12-05 17:31:37 +08:00
hrzandGitHub 885d72c4f7 Merge pull request #2651 from xinnan-tech/WebMenu
fix:修改初始状态
2025-12-05 17:06:00 +08:00
hrzandGitHub 4538542c25 Merge branch 'main' into WebMenu 2025-12-05 17:05:51 +08:00
rainv123 3d509d75dc fix:修改初始状态 2025-12-05 17:01:40 +08:00
hrzandGitHub 0ef73d7c3e Merge pull request #2648 from xinnan-tech/py_add_protocol
添加数据上下文填充功能
2025-12-05 15:47:35 +08:00
hrzandGitHub 6da90c6a97 Merge branch 'main' into py_add_protocol 2025-12-05 15:47:26 +08:00
hrzandGitHub bacdb794da Merge pull request #2646 from xinnan-tech/WebMenu
uptate:增加功能管理菜单
2025-12-05 15:41:25 +08:00
rainv123 2ece3f399b fix:修改初始状态为false 2025-12-05 15:39:05 +08:00
rainv123 68b539db15 fix:修改 2025-12-05 15:29:28 +08:00
3030332422 7a7bfa26f6 update:修改日志 2025-12-05 14:50:26 +08:00
rainv123 5f229351c8 uptate:增加功能管理菜单 2025-12-05 14:35:53 +08:00
3030332422 82125c4933 update:说明文档添加测试用例 2025-12-05 14:22:07 +08:00
3030332422 33f75d26c1 update:优化前端页面样式 2025-12-05 14:02:50 +08:00
3030332422 3c4d702bc1 update:添加数据上下文填充前端页面 2025-12-05 11:24:57 +08:00
3030332422 db8d100edb update:添加数据库表,添加数据上下文填充功能后端部分,全模块实现数据上下文填充功能 2025-12-05 10:50:44 +08:00
3030332422 6f7e8978ca update:添加数据上下文填充功能的说明文档 2025-12-05 10:40:47 +08:00
hrzandGitHub 856bf2c574 Merge pull request #2641 from qingshuiyuyu/bugfix
修复注册设备接口,验证码死循环BUG
2025-12-04 18:54:33 +08:00
hrzandGitHub b10cfa6b24 Merge pull request #2642 from xinnan-tech/py_audio_fix
fix: 状态修正
2025-12-04 18:53:00 +08:00
Sakura-RanChen d3d329bd43 fix: 状态修正 2025-12-04 18:45:49 +08:00
shiyin f358011900 修复注册设备接口,验证码死循环BUG 2025-12-04 18:32:57 +08:00
3030332422 cd6c3e4f79 update:添加数据上下文填充功能,单模块实现数据上下文填充功能 2025-12-04 11:04:16 +08:00
欣南科技andGitHub ee7342de9d Merge pull request #2639 from xinnan-tech/fix-handshake
fix:过滤8000端口使用https访问时报错日志
2025-12-03 22:50:48 +08:00
hrz 6120d49a35 fix:过滤8000端口使用https访问时报错日志 2025-12-03 22:49:32 +08:00
欣南科技andGitHub 381f8ea578 Merge pull request #2628 from xinnan-tech/py_await
Py await
2025-12-01 18:51:43 +08:00
hrz a3e2073dc6 Bump to 0.8.9 2025-12-01 18:51:24 +08:00
hrz f7bd858fea update:优化绑定间隔 2025-12-01 18:46:42 +08:00
dependabot[bot]andGitHub 80d10cf4b5 build(deps): bump mcp from 1.20.0 to 1.22.0 in /main/xiaozhi-server
Bumps [mcp](https://github.com/modelcontextprotocol/python-sdk) from 1.20.0 to 1.22.0.
- [Release notes](https://github.com/modelcontextprotocol/python-sdk/releases)
- [Changelog](https://github.com/modelcontextprotocol/python-sdk/blob/main/RELEASE.md)
- [Commits](https://github.com/modelcontextprotocol/python-sdk/compare/v1.20.0...v1.22.0)

---
updated-dependencies:
- dependency-name: mcp
  dependency-version: 1.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:28:38 +00:00
dependabot[bot]andGitHub ba1fb16f2d build(deps): bump torchaudio from 2.2.2 to 2.9.1 in /main/xiaozhi-server
Bumps [torchaudio](https://github.com/pytorch/audio) from 2.2.2 to 2.9.1.
- [Release notes](https://github.com/pytorch/audio/releases)
- [Commits](https://github.com/pytorch/audio/compare/v2.2.2...v2.9.1)

---
updated-dependencies:
- dependency-name: torchaudio
  dependency-version: 2.9.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:28:33 +00:00
dependabot[bot]andGitHub 5f574667d3 build(deps): bump websockets from 14.2 to 15.0.1 in /main/xiaozhi-server
Bumps [websockets](https://github.com/python-websockets/websockets) from 14.2 to 15.0.1.
- [Release notes](https://github.com/python-websockets/websockets/releases)
- [Commits](https://github.com/python-websockets/websockets/compare/14.2...15.0.1)

---
updated-dependencies:
- dependency-name: websockets
  dependency-version: 15.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:28:26 +00:00
dependabot[bot]andGitHub c470bb1db1 build(deps): bump modelscope in /main/xiaozhi-server
Bumps [modelscope](https://github.com/modelscope/modelscope) from 1.23.2 to 1.32.0.
- [Release notes](https://github.com/modelscope/modelscope/releases)
- [Commits](https://github.com/modelscope/modelscope/compare/v1.23.2...v1.32.0)

---
updated-dependencies:
- dependency-name: modelscope
  dependency-version: 1.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:28:21 +00:00
dependabot[bot]andGitHub 26ed8ca33f build(deps): bump psutil from 7.0.0 to 7.1.3 in /main/xiaozhi-server
Bumps [psutil](https://github.com/giampaolo/psutil) from 7.0.0 to 7.1.3.
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](https://github.com/giampaolo/psutil/compare/release-7.0.0...release-7.1.3)

---
updated-dependencies:
- dependency-name: psutil
  dependency-version: 7.1.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-01 10:28:16 +00:00
hrz 313f5b1982 Merge branch 'main' into py_await 2025-12-01 16:55:19 +08:00
hrz f3f0c24e16 update:减少日志产生 2025-12-01 16:38:10 +08:00
hrzandGitHub fe2539ac97 Merge pull request #2621 from xinnan-tech/fix_color
添加模型的输入框颜色修改
2025-12-01 15:54:44 +08:00
rainv123 dd1a430c21 fix:添加模型组件的输入框颜色修改 2025-12-01 10:56:19 +08:00
rainv123 621634697e Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into test 2025-12-01 10:52:49 +08:00
Sakura-RanChen fb5c35e6c9 后台初始化组件,gc全局化避免每次回收触发GIL锁,音频定时发送 2025-11-28 16:12:19 +08:00
欣南科技andGitHub 228596dbe3 Merge pull request #2608 from xinnan-tech/openrz-patch-2
Update ragflow-integration.md
2025-11-26 12:21:52 +08:00
hrzandGitHub 74baa85340 Update ragflow-integration.md 2025-11-26 12:21:12 +08:00
hrzandGitHub 8f6e9ca54d Merge pull request #2604 from xinnan-tech/fix_
fix:允许ota,mcp,声纹地址为null
2025-11-26 11:31:54 +08:00
rainv123andGitHub 19420d0bb3 Merge pull request #2601 from xinnan-tech/main-upgrade
Main upgrade
2025-11-26 11:31:08 +08:00
rainv123 770c8c8a9f Merge branch 'main-upgrade' of https://github.com/xinnan-tech/xiaozhi-esp32-server into test 2025-11-26 10:38:56 +08:00
rainv123 252a34090a Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into test 2025-11-26 10:38:01 +08:00
hrzandGitHub bde5ef4594 Merge pull request #2602 from xinnan-tech/remove_gc
update:将垃圾回收放置ws关闭处,避免频繁操作
2025-11-25 17:49:48 +08:00
rainv123 6eddf081de fix:允许ota,mcp,声纹地址为null 2025-11-25 17:38:55 +08:00
hrz 4645c50f6d update:将垃圾回收放置ws关闭处,避免频繁操作 2025-11-25 16:11:48 +08:00
hrzandGitHub 3f6e66b1ce Merge pull request #2588 from xinnan-tech/fix_
调整
2025-11-25 15:00:49 +08:00
Chingfeng Li 106889b0dd 更新默认编码 2025-11-25 13:52:18 +08:00
myifengandGitHub 785b43464b Merge pull request #2593 from xinnan-tech/dependabot/pip/main/xiaozhi-server/dashscope-1.25.2
build(deps): bump dashscope from 1.24.6 to 1.25.2 in /main/xiaozhi-server
2025-11-25 13:36:19 +08:00
myifengandGitHub 03da60dd12 Merge pull request #2594 from xinnan-tech/dependabot/pip/main/xiaozhi-server/vosk-0.3.45
build(deps): bump vosk from 0.3.44 to 0.3.45 in /main/xiaozhi-server
2025-11-25 13:35:51 +08:00
myifengandGitHub ec372f65ec Merge pull request #2596 from xinnan-tech/dependabot/pip/main/xiaozhi-server/openai-2.8.1
build(deps): bump openai from 2.7.1 to 2.8.1 in /main/xiaozhi-server
2025-11-25 13:35:18 +08:00
myifengandGitHub cfba4c45b6 Merge pull request #2597 from xinnan-tech/dependabot/pip/main/xiaozhi-server/sherpa-onnx-1.12.17
build(deps): bump sherpa-onnx from 1.12.15 to 1.12.17 in /main/xiaozhi-server
2025-11-25 13:34:37 +08:00
dependabot[bot]andGitHub 657d03f49d build(deps): bump sherpa-onnx in /main/xiaozhi-server
Bumps [sherpa-onnx](https://github.com/k2-fsa/sherpa-onnx) from 1.12.15 to 1.12.17.
- [Release notes](https://github.com/k2-fsa/sherpa-onnx/releases)
- [Changelog](https://github.com/k2-fsa/sherpa-onnx/blob/master/CHANGELOG.md)
- [Commits](https://github.com/k2-fsa/sherpa-onnx/compare/v1.12.15...v1.12.17)

---
updated-dependencies:
- dependency-name: sherpa-onnx
  dependency-version: 1.12.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:10:36 +00:00
dependabot[bot]andGitHub b4dd78b2ed build(deps): bump openai from 2.7.1 to 2.8.1 in /main/xiaozhi-server
Bumps [openai](https://github.com/openai/openai-python) from 2.7.1 to 2.8.1.
- [Release notes](https://github.com/openai/openai-python/releases)
- [Changelog](https://github.com/openai/openai-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-python/compare/v2.7.1...v2.8.1)

---
updated-dependencies:
- dependency-name: openai
  dependency-version: 2.8.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:10:27 +00:00
dependabot[bot]andGitHub 1ebe7b8f71 build(deps): bump vosk from 0.3.44 to 0.3.45 in /main/xiaozhi-server
Bumps [vosk](https://github.com/alphacep/vosk-api) from 0.3.44 to 0.3.45.
- [Release notes](https://github.com/alphacep/vosk-api/releases)
- [Commits](https://github.com/alphacep/vosk-api/commits/v0.3.45)

---
updated-dependencies:
- dependency-name: vosk
  dependency-version: 0.3.45
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:10:17 +00:00
dependabot[bot]andGitHub 30e7a71497 build(deps): bump dashscope in /main/xiaozhi-server
Bumps [dashscope](https://dashscope.aliyun.com/) from 1.24.6 to 1.25.2.

---
updated-dependencies:
- dependency-name: dashscope
  dependency-version: 1.25.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 09:10:14 +00:00
Sakura-RanChenandGitHub ff1de6c7e3 Merge pull request #2592 from xinnan-tech/fix-remove-openai-topk
移除OpenAI不支持的参数top_k
2025-11-24 16:50:00 +08:00
Chingfeng Li 9e39883276 移除OpenAI不支持的参数top_k 2025-11-24 16:29:46 +08:00
rainv123 0f249ae1db fix:调整 2025-11-24 10:04:40 +08:00
rainv123 31ada101b0 fix:登录页面样式调整 2025-11-24 10:03:06 +08:00
欣南科技andGitHub 1b52a7168b Merge pull request #2584 from xinnan-tech/py_test_websocket
fix: decoder 引发的内存泄漏
2025-11-23 15:15:12 +08:00
hrz 83a3d0eabe update:优化代码 2025-11-23 15:11:35 +08:00
欣南科技andGitHub 080c6b4dfb Merge pull request #2583 from xinnan-tech/fix-audio-bug
update:未授权设备会话周期管理
2025-11-23 12:31:03 +08:00
hrz ea50288c5b update:未授权设备会话周期管理 2025-11-23 12:29:18 +08:00
3030332422 5d439a4168 update:内存泄漏 2025-11-23 11:55:38 +08:00
Sakura-RanChen 3c46e16494 自主选择链接复用功能 2025-11-22 16:19:13 +08:00
hrzandGitHub 39cd0fe1ac Merge pull request #2579 from xinnan-tech/rag_fix
fix:输入问题后按回车键执行测试
2025-11-22 16:16:57 +08:00
rainv123 16c0be74c9 fix:输入问题后按回车键执行测试 2025-11-22 15:28:00 +08:00
hrzandGitHub 732828612e Merge pull request #2574 from xinnan-tech/fix_chatHistoryConf
fix:设置默认记忆不是【无记忆】时,默认chatHistoryConf=2
2025-11-22 14:51:07 +08:00
rainv123 7344b81c98 fix:模型id不能为文字或者空格 2025-11-22 11:59:34 +08:00
rainv123 1e5b03edb5 fix:设置有记忆的模型为默认时,chatHistoryConf=2 2025-11-21 18:39:57 +08:00
rainv123 b15b5af349 fix:设置默认记忆不是【无记忆】时,默认chatHistoryConf=2 2025-11-21 18:31:01 +08:00
Sakura-RanChenandGitHub 5242430b6d Merge pull request #2568 from xinnan-tech/fix-allillm-topk
FIX: Completions.create() got an unexpected keyword argument 'top_k'
2025-11-21 16:01:44 +08:00
Sakura-RanChenandGitHub c39968a5bf Merge pull request #2571 from xinnan-tech/add-mcp-callback
Add ProgressFnT LoggingFnT...
2025-11-21 15:57:49 +08:00
Chingfeng Li 8b4f9ab20e Add ProgressFnT LoggingFnT... 2025-11-21 14:27:18 +08:00
hrzandGitHub 527e6050ce Merge pull request #2569 from xinnan-tech/remove-unused-active_connections
Remove unused code
2025-11-21 13:25:21 +08:00
Chingfeng Li 1d162cb874 Remove unused code 2025-11-21 11:46:32 +08:00
Chingfeng Li c197f5c942 FIX: Completions.create() got an unexpected keyword argument 'top_k' 2025-11-21 11:19:03 +08:00
hrzandGitHub 3a4c0bb888 Merge pull request #2567 from xinnan-tech/py_fix_audio
fix: 长按设备过于灵敏
2025-11-21 10:47:27 +08:00
Sakura-RanChen 38d50f4275 fix: 长按设备过于灵敏 2025-11-21 10:11:50 +08:00
hrzandGitHub 25a3b648fc Merge pull request #2562 from xinnan-tech/rag_fix
Rag fix
2025-11-20 15:06:39 +08:00
hrzandGitHub d3638164fe Merge pull request #2543 from xinnan-tech/py_fix_LLMChat
update: 增加工具并行调用(需大模型支持,如qwen-plus)增加递归深度限制,避免循环
2025-11-20 11:20:47 +08:00
hrzandGitHub 1c2a61fd34 Merge pull request #2551 from xinnan-tech/update-client-speaking
根据语音包发送更新client_is_speaking状态
2025-11-20 11:16:59 +08:00
rainv123 f81c4aa970 fix:错误码翻译补充 2025-11-20 09:40:50 +08:00
rainv123 3caa4ec6e8 fix:知识库增加适配器 2025-11-20 09:38:31 +08:00
hrzandGitHub 5e48a2274a Merge pull request #2558 from xinnan-tech/i8n_fix_1
角色配置页面翻译调整
2025-11-19 10:35:57 +08:00
hrzandGitHub 7f7c980522 Merge pull request #2550 from xinnan-tech/py_openai_fix
参数补充
2025-11-18 22:07:01 +08:00
Chingfeng Li bbab4ebc86 语音发送的开始和结尾仅与TTS相关,不关心LLM;LLM调用MCP时异步消息会引发问题 2025-11-18 15:00:55 +08:00
Sakura-RanChen 8bae0c8ac5 参数补充 2025-11-18 14:40:17 +08:00
Chingfeng Li a5e4aa1300 根据语音包发送更新client_is_speaking状态 2025-11-18 14:37:50 +08:00
Sakura-RanChen 48313bc302 fix: 多工具时协程不阻塞,仅需等待最慢那个 2025-11-18 11:10:18 +08:00
rainv123 f0261a8236 fix:角色配置页面翻译和样式调整 2025-11-18 10:21:53 +08:00
rainv123 84c194dd34 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-18 10:21:20 +08:00
hrzandGitHub 920e24b4ff Merge pull request #2547 from xinnan-tech/yinseyemian
补充图标调整
2025-11-17 19:06:59 +08:00
LiJinHui 43d82343a3 补充图标调整 2025-11-17 18:37:40 +08:00
rainv123 320d246a83 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-17 18:34:03 +08:00
hrzandGitHub faea50f99d Merge pull request #2545 from xinnan-tech/yinseyemian
调整试听按钮大小
2025-11-17 18:31:01 +08:00
hrzandGitHub ef59798d70 Merge pull request #2544 from xinnan-tech/i8n_fix_1
fix:修改错误简写和样式调整
2025-11-17 18:13:21 +08:00
rainv123 6781eca56a Merge branch 'yinseyemian' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-17 18:05:31 +08:00
LiJinHui c1f0853271 调整 2025-11-17 18:05:10 +08:00
rainv123 d4cda5c104 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-17 18:02:34 +08:00
rainv123 f9bd5bb995 fix:删除多余空格 2025-11-17 18:00:38 +08:00
rainv123 f1c2b5cb3f fix:重新修改简写 2025-11-17 17:41:12 +08:00
rainv123 579af29a73 fix:修改错误简写和样式调整 2025-11-17 17:30:27 +08:00
Sakura-RanChen 0b0fd142a3 update: 增加工具并行调用(需大模型支持,如qwen-plus)增加递归深度限制,避免循环 2025-11-17 17:14:56 +08:00
hrzandGitHub 9e20a53ca0 Merge pull request #2530 from xinnan-tech/yinseyemian
完善音色试听页面
2025-11-17 17:10:09 +08:00
hrzandGitHub 8768240efe Merge branch 'main' into yinseyemian 2025-11-17 17:09:53 +08:00
LJH-rgszeandGitHub b429760bd5 Merge pull request #2542 from xinnan-tech/i8n_fix_1
fix:翻译及样式优化
2025-11-17 17:01:41 +08:00
rainv123 218cd35c3d fix:修改 2025-11-17 16:57:45 +08:00
rainv123 146a039c19 fix:翻译及样式优化 2025-11-17 11:53:30 +08:00
LiJinHui 9a3e1fa9c8 补充 2025-11-17 11:39:11 +08:00
LiJinHui fa194af9bb 调整 2025-11-17 10:15:53 +08:00
欣南科技andGitHub 7bdb2efd8b Merge pull request #2539 from xinnan-tech/hot-fix
fix:网页测试工具和manager-web关键缓存冲突
2025-11-16 17:42:26 +08:00
hrz 6c325f68ac fix:网页测试工具和manager-web关键缓存冲突 2025-11-16 17:40:39 +08:00
欣南科技andGitHub 3113c5cf62 Merge pull request #2538 from xinnan-tech/i18n_fix_new
I18n fix new
2025-11-16 17:20:37 +08:00
hrz c6527d7df9 update:优化翻译 2025-11-16 17:18:49 +08:00
欣南科技andGitHub e86974b7b2 Merge pull request #2537 from xinnan-tech/test-page-css
update:优化测试页面音波样式
2025-11-16 14:41:12 +08:00
hrz e37618423d update:优化测试页面音波样式 2025-11-16 14:39:53 +08:00
欣南科技andGitHub c640662663 Merge pull request #2536 from xinnan-tech/test-page-css
Test page css
2025-11-16 14:09:26 +08:00
hrz 3fe1acd153 update:优化样式代码顺序 2025-11-16 14:08:43 +08:00
hrz 9eaaec75a5 update:音频测试页面增加打断功能 2025-11-16 13:59:27 +08:00
欣南科技andGitHub 1ad86153c7 Merge pull request #2535 from xinnan-tech/fix-test-page
update:去除无用样式
2025-11-16 01:51:10 +08:00
hrz 09a58ba5bf update:去除无用样式 2025-11-16 01:50:29 +08:00
欣南科技andGitHub 867ab7aca2 Merge pull request #2534 from xinnan-tech/fix-test-page
update:统一js文件名称格式
2025-11-16 01:36:56 +08:00
hrz 5dda2f731a update:统一js文件名称格式 2025-11-16 01:34:23 +08:00
欣南科技andGitHub 71c6f04f99 Merge pull request #2533 from xinnan-tech/fix-test-page
update:优化音频测试页面的样式
2025-11-16 01:27:18 +08:00
hrz 80c7295784 update:优化音频测试页面的样式 2025-11-16 01:26:10 +08:00
欣南科技andGitHub e2869f1f50 Merge pull request #2532 from xinnan-tech/fix-test-page
update:修复测试工具页面声音卡顿问题
2025-11-15 17:54:33 +08:00
hrz dc55f8d7ab update:修复测试工具页面声音卡顿问题 2025-11-15 17:53:36 +08:00
rainv123 925ed1ec0c uptete:移动端智控台添加德语、越南语 2025-11-15 17:52:40 +08:00
rainv123 8064cdf1a2 uptate:智控台增加德语、越南语 2025-11-15 17:24:47 +08:00
LiJinHui 46b3757c13 补充 2025-11-15 16:36:59 +08:00
LiJinHui 5050ea7ac1 修复添加克隆音色后试听按钮不显示的bug 2025-11-15 16:06:58 +08:00
rainv123 bdd0ec41d5 fix:manager-api国际化优化 2025-11-15 14:55:43 +08:00
LiJinHui d121b4d0e1 删除多余代码 2025-11-15 10:48:52 +08:00
LiJinHui d45bf5f60a 补充 2025-11-15 10:45:22 +08:00
LiJinHui 94a43432fc 调整音色的前端页面,提供更方便的试听 2025-11-15 09:51:58 +08:00
欣南科技andGitHub b55e5870db Merge pull request #2528 from xinnan-tech/translation
Translation
2025-11-15 00:17:57 +08:00
hrz 2afd90f2d4 update:多语言项目自述文件 2025-11-15 00:17:11 +08:00
hrzandGitHub 4001378904 Merge pull request #2473 from Kris-YIN/claude/translate-readme-german-011CUpaqWR8pn9EPKofKGwpx
Add German translation of README
2025-11-14 23:52:53 +08:00
欣南科技andGitHub 6c313e60eb Merge pull request #2527 from xinnan-tech/update-version
Bump to 0.8.8
2025-11-14 23:18:12 +08:00
hrz 3f6fd3144b Bump to 0.8.8 2025-11-14 23:17:21 +08:00
欣南科技andGitHub e5e4aa4836 Merge pull request #2526 from xinnan-tech/KnowledgeBase_fix
uptate:根据知识库id获取rag配置,删除获取默认rag配置方法
2025-11-14 19:18:48 +08:00
rainv123 18e84a90c9 uptate:根据知识库id获取rag配置,删除获取默认rag配置方法 2025-11-14 16:56:06 +08:00
hrzandGitHub b37f87d231 Merge pull request #2523 from xinnan-tech/fix_openai_LLM
fix: 去除默认值配置
2025-11-13 21:54:43 +08:00
欣南科技andGitHub 7c592e33fe Merge pull request #2522 from xinnan-tech/KnowledgeBase_fix
Knowledge base fix
2025-11-13 17:56:01 +08:00
hrz 471749f6ff update:优化模型名称及排列顺序 2025-11-13 17:51:16 +08:00
Sakura-RanChen 637b528aad fix: 去除默认值配置 2025-11-13 17:08:21 +08:00
hrzandGitHub 502ef997d4 Merge branch 'main' into KnowledgeBase_fix 2025-11-13 16:51:01 +08:00
hrz b76e354b86 update:删除多余代码 2025-11-13 16:40:50 +08:00
hrzandGitHub 988bb90528 Merge pull request #2521 from qingshuiyuyu/bugfix
火山双流式TTS日志bug修复
2025-11-13 16:20:40 +08:00
shiyin 578ed62d18 火山双流式TTS日志bug修复 2025-11-13 14:28:21 +08:00
rainv123 0d6d44bed9 fix:还原误删的“}” 2025-11-13 14:27:58 +08:00
rainv123 918c47669c fix:删除无用方法 2025-11-13 14:08:39 +08:00
rainv123 8ad22dc082 fix:移除触发器,在DAO层添加了删除方法 2025-11-13 12:35:07 +08:00
欣南科技andGitHub c3d94a5c21 Merge pull request #2519 from xinnan-tech/openrz-patch-1
Update ragflow-integration.md
2025-11-13 12:16:48 +08:00
hrzandGitHub 48d72e373e Update ragflow-integration.md 2025-11-13 12:15:54 +08:00
hrzandGitHub c667c8ee79 Merge pull request #2514 from Harold-Guo/fix/web_audio
fix(web-audio): Fix AudioWorklet recording and AudioContext state issues
2025-11-13 11:33:56 +08:00
欣南科技andGitHub aebc1c1597 Merge pull request #2518 from xinnan-tech/update-doc
Update doc
2025-11-13 11:06:29 +08:00
hrz cd113a5351 update:插件名称前,不同颜色的点易让人产生误解 2025-11-13 11:01:28 +08:00
rainv123 b7ca7cbdb5 fix:知识库描述字数增加到300字 2025-11-13 10:54:55 +08:00
rainv123 b3b270e999 Merge branch 'KnowledgeBase_fix' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-13 10:50:29 +08:00
rainv123 ad3c420191 fix:当删除知识库记录时,自动删除相关的插件映射记录 2025-11-13 10:49:15 +08:00
hrz 8a4f786c0b update:ragflow教程升级到0.22.0 2025-11-13 10:44:00 +08:00
欣南科技andGitHub d99d122416 Merge pull request #2517 from xinnan-tech/knowledge-base-fix
Knowledge base fix
2025-11-12 19:14:05 +08:00
hrzandGitHub 5a5f670272 Merge pull request #2476 from xinnan-tech/py-bump-test
Py bump test
2025-11-12 18:45:46 +08:00
hrz be533b7814 update:调整numpy回到1.x版本 2025-11-12 18:45:15 +08:00
hrzandGitHub 9a6e5c9f33 Merge pull request #2459 from xinnan-tech/dependabot/pip/main/xiaozhi-server/numpy-2.3.4
build(deps): bump numpy from 1.26.4 to 2.3.4 in /main/xiaozhi-server
2025-11-12 17:48:26 +08:00
hrzandGitHub 9d420b4304 Merge branch 'py-bump-test' into dependabot/pip/main/xiaozhi-server/numpy-2.3.4 2025-11-12 17:48:16 +08:00
hrzandGitHub acb1fdc51d Merge pull request #2425 from xinnan-tech/dependabot/pip/main/xiaozhi-server/websockets-15.0.1
build(deps): bump websockets from 14.2 to 15.0.1 in /main/xiaozhi-server
2025-11-12 17:46:44 +08:00
hrzandGitHub c6f1fa96bb Merge branch 'py-bump-test' into dependabot/pip/main/xiaozhi-server/websockets-15.0.1 2025-11-12 17:41:35 +08:00
hrzandGitHub 7315e2e5d2 Merge pull request #2497 from xinnan-tech/dependabot/pip/main/xiaozhi-server/cozepy-0.20.0
build(deps): bump cozepy from 0.19.0 to 0.20.0 in /main/xiaozhi-server
2025-11-12 17:39:33 +08:00
hrzandGitHub 429fa0032a Merge pull request #2496 from xinnan-tech/dependabot/pip/main/xiaozhi-server/aiohttp-cors-0.8.1
build(deps): bump aiohttp-cors from 0.7.0 to 0.8.1 in /main/xiaozhi-server
2025-11-12 17:38:35 +08:00
hrzandGitHub f2a7016119 Merge branch 'py-bump-test' into dependabot/pip/main/xiaozhi-server/aiohttp-cors-0.8.1 2025-11-12 17:38:27 +08:00
hrzandGitHub 47e199a59e Merge pull request #2495 from xinnan-tech/dependabot/pip/main/xiaozhi-server/httpx-0.28.1
build(deps): bump httpx from 0.27.2 to 0.28.1 in /main/xiaozhi-server
2025-11-12 17:37:28 +08:00
hrzandGitHub 172b097a11 Merge branch 'py-bump-test' into dependabot/pip/main/xiaozhi-server/httpx-0.28.1 2025-11-12 17:37:15 +08:00
hrz 4f2693505b update:标注不升级的组件 2025-11-12 17:35:42 +08:00
rainv123 ae321b26af fix:知识库页面文本修改 2025-11-12 17:02:53 +08:00
rainv123 6de4a29dbf Merge branch 'knowledge-base-fix' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-12 16:46:57 +08:00
rainv123 37f0d2398e fix:删除空行 2025-11-12 16:46:20 +08:00
hrz 5c68be6636 update:优化引用答复 2025-11-12 16:46:04 +08:00
rainv123 ee2ac5f46f fix:优化rag配置的验证和报错 2025-11-12 16:45:26 +08:00
rainv123 99bc55f256 Merge branch 'knowledge-base-fix' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-12 15:57:51 +08:00
rainv123 5d860e5b45 fix:增加知识库操作时系统异常报错 2025-11-12 15:55:36 +08:00
hrz a2069456b2 Merge branch 'main' into knowledge-base-fix 2025-11-12 15:10:57 +08:00
rainv123 2dc0c101c6 fix:错误信息日志补充 2025-11-12 15:04:05 +08:00
Harold 4fc306bccf fix(web-audio): Fix AudioWorklet recording and AudioContext state issues 2025-11-12 15:00:39 +08:00
rainv123 4966a42ed8 fix:还原误删的提示词 2025-11-12 14:41:27 +08:00
rainv123 c3ffa9d393 uptate:增加对字符串的解析以及格式调整 2025-11-12 12:32:16 +08:00
rainv123 f16906ad9d uptate:增加知识库相关提示词 2025-11-12 12:28:08 +08:00
rainv123 1b28e8ddcb uptate:ragflow配置教程补充 2025-11-12 12:25:53 +08:00
hrzandGitHub ff3e308ce8 Merge pull request #2500 from xinnan-tech/py-test-mem0.ai
fix:修复 Mem0 搜索缺少 filters 导致的报错
2025-11-11 22:53:47 +08:00
hrzandGitHub f6219bd58e Merge pull request #2506 from xinnan-tech/main-logs-level
优化日志级别,生产环境中INFO避免打印过多日志
2025-11-11 22:53:15 +08:00
欣南科技andGitHub 92bd207ae5 Merge pull request #2505 from xinnan-tech/hot-fix
fix:mqtt配置中的websocket连接
2025-11-11 18:53:23 +08:00
hrz bbca561dd0 fix:mqtt配置中的websocket连接 2025-11-11 18:52:41 +08:00
Chingfeng Li 833f379aa1 优化日志级别,生产环境中INFO避免打印过多日志 2025-11-11 18:52:14 +08:00
hrz de0eda1b6c update:增加ragflow部署教程 2025-11-11 18:47:25 +08:00
rainv123 96da84dad4 fix:错误处理优化 2025-11-11 16:02:46 +08:00
3030332422 59f55a4187 fix:修复 Mem0 搜索缺少 filters 导致的报错 2025-11-11 09:23:39 +08:00
rainv123 ab5e91c07b fix:优化知识库页面错误信息 2025-11-10 18:41:03 +08:00
dependabot[bot]andGitHub dca5f2c837 build(deps): bump cozepy from 0.19.0 to 0.20.0 in /main/xiaozhi-server
Bumps cozepy from 0.19.0 to 0.20.0.

---
updated-dependencies:
- dependency-name: cozepy
  dependency-version: 0.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-10 08:52:49 +00:00
dependabot[bot]andGitHub 33c60ba320 build(deps): bump aiohttp-cors in /main/xiaozhi-server
Bumps [aiohttp-cors](https://github.com/aio-libs/aiohttp-cors) from 0.7.0 to 0.8.1.
- [Release notes](https://github.com/aio-libs/aiohttp-cors/releases)
- [Changelog](https://github.com/aio-libs/aiohttp-cors/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp-cors/compare/v0.7.0...v0.8.1)

---
updated-dependencies:
- dependency-name: aiohttp-cors
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-10 08:52:47 +00:00
dependabot[bot]andGitHub a4fad9e796 build(deps): bump httpx from 0.27.2 to 0.28.1 in /main/xiaozhi-server
Bumps [httpx](https://github.com/encode/httpx) from 0.27.2 to 0.28.1.
- [Release notes](https://github.com/encode/httpx/releases)
- [Changelog](https://github.com/encode/httpx/blob/master/CHANGELOG.md)
- [Commits](https://github.com/encode/httpx/compare/0.27.2...0.28.1)

---
updated-dependencies:
- dependency-name: httpx
  dependency-version: 0.28.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-10 08:52:44 +00:00
rainv123 ee0d89d8d2 fix:知识库【编辑】【删除】操作逻辑修改 2025-11-10 15:14:32 +08:00
rainv123 5bead86fd5 fix:知识库描述增加校验 2025-11-10 15:11:48 +08:00
rainv123 79eefb651f update:角色配置页面mcp图标显示优化 2025-11-10 15:10:59 +08:00
欣南科技andGitHub cbb74170ea Merge pull request #2493 from xinnan-tech/hot-fix
fix:删除知识库时,需要删除缓存数据
2025-11-10 12:25:10 +08:00
hrz c6835ddd11 fix:删除知识库时,需要删除缓存数据 2025-11-10 12:24:32 +08:00
欣南科技andGitHub c57427efbc Merge pull request #2470 from xinnan-tech/Knowledge-Base
Add:Knowledge base
2025-11-09 00:36:07 +08:00
hrz 466eae4c76 update:优化知识库输入提示 2025-11-09 00:25:12 +08:00
hrz 4b7b80aa2d update:同名知识库错误提示 2025-11-09 00:13:24 +08:00
hrz dc5ff21002 update:优化rag模型列表接口 2025-11-08 23:44:40 +08:00
hrz 75807c5845 Merge branch 'main' into Knowledge-Base 2025-11-08 16:25:32 +08:00
hrz ce1bdea54d Bump to 0.8.7 2025-11-08 16:24:16 +08:00
hrz 25801bf1d4 Merge branch 'main' into Knowledge-Base 2025-11-08 16:07:21 +08:00
hrz c02f2105d7 update:优化代码 2025-11-08 16:00:37 +08:00
欣南科技andGitHub b0ceb0b06d Merge pull request #2486 from xinnan-tech/hot-fix
fix:旧版本智控台配置文件,没有包含"prompt_template"配置会导致self.config.get("prompt_temp…
2025-11-08 10:09:41 +08:00
hrz b6ba06ec97 fix:旧版本智控台配置文件,没有包含"prompt_template"配置会导致self.config.get("prompt_template", "agent-base-prompt.txt")一直为None 2025-11-08 10:08:02 +08:00
hrz d09fa0c1f6 update:知识库自动创建function方法 2025-11-07 12:20:50 +08:00
hrz ff02c11558 Merge branch 'Knowledge-Base' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-06 22:01:06 +08:00
hrz e8f5025e4d update:意图识别插件增加知识库 2025-11-06 22:00:38 +08:00
rainv123 90980652ce update:增加文档解析状态 2025-11-06 18:20:01 +08:00
rainv123andGitHub 2527c16e18 Merge pull request #2478 from xinnan-tech/fix-mcp
fix:修复部分LLM在工具调用时数据被空字符串覆盖的问题
2025-11-06 16:57:44 +08:00
3030332422 09dee65239 fix:修复部分LLM在工具调用时数据被空字符串覆盖的问题 2025-11-06 16:42:28 +08:00
hrz eaf4f4b08e update:优化接口错误信息 2025-11-06 14:29:56 +08:00
Chingfeng Li d2b05c614c Update pip 2025-11-06 13:24:41 +08:00
Chingfeng Li 9383a44106 Merge branch 'py-bump-test' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-11-06 13:21:33 +08:00
myifengandGitHub 3ec5ed9d22 Merge pull request #2456 from xinnan-tech/dependabot/pip/main/xiaozhi-server/torchaudio-2.9.0
build(deps): bump torchaudio from 2.2.2 to 2.9.0 in /main/xiaozhi-server
2025-11-06 13:17:34 +08:00
myifengandGitHub 482aaf453c Merge branch 'py-bump-test' into dependabot/pip/main/xiaozhi-server/torchaudio-2.9.0 2025-11-06 13:17:26 +08:00
myifengandGitHub bf9277671e Merge pull request #2457 from xinnan-tech/dependabot/pip/main/xiaozhi-server/funasr-1.2.7
build(deps): bump funasr from 1.2.3 to 1.2.7 in /main/xiaozhi-server
2025-11-06 13:15:34 +08:00
myifengandGitHub 588a391d90 Merge pull request #2458 from xinnan-tech/dependabot/pip/main/xiaozhi-server/sherpa-onnx-1.12.15
build(deps): bump sherpa-onnx from 1.12.11 to 1.12.15 in /main/xiaozhi-server
2025-11-06 13:15:11 +08:00
hrz 65f7e794bc Merge branch 'Knowledge-Base' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-06 12:28:31 +08:00
hrz 987a72a3aa update:优化样式 2025-11-06 12:27:45 +08:00
rainv123 1aab88e8df Merge branch 'Knowledge-Base' of https://github.com/xinnan-tech/xiaozhi-esp32-server into Knowledge-Base 2025-11-06 11:56:07 +08:00
rainv123 a30ef520fb fix:删除无用代码 2025-11-06 11:55:41 +08:00
hrz ea15ed39f5 update:更换更小规格的知识库图标 2025-11-06 11:10:00 +08:00
Claude 9b214279ba Add German translation of README
- Created README_de.md with German translation
- Maintains same structure and links as original
- Provides German-speaking users access to project documentation
2025-11-05 10:31:20 +00:00
rainv123 873daf093d uptate:增加知识库权限判断 2025-11-05 17:02:27 +08:00
rainv123 289f2ad199 fix:修改知识库相关错误码 2025-11-05 16:42:32 +08:00
rainv123 7e15301d2b fix:增加RAG配置验证 2025-11-05 16:06:57 +08:00
rainv123 1792bf299b fix:增加RAG配置验证 2025-11-05 16:03:19 +08:00
rainv123 4cde66e7de fix:知识库接口调整 2025-11-05 15:05:53 +08:00
rainv123 3eeace5d5f fix:修改分页传递参数 2025-11-05 14:50:52 +08:00
rainv123 7215ded7e8 fix:删除无用代码 2025-11-05 14:29:52 +08:00
rainv123 1c6ee46d61 update:删除知识库文档上传无用接口 2025-11-05 10:00:27 +08:00
rainv123 ca87b23d15 upatate:删除知识库无用接口和方法 2025-11-05 09:47:43 +08:00
rainv123 fd47ce8e69 fix:删除错误图标 2025-11-05 09:17:05 +08:00
rainv123 a82cf6e300 update:格式调整 2025-11-05 09:13:44 +08:00
rainv123 0008ca6335 uptate:删除知识库无用接口和方法 2025-11-04 18:12:19 +08:00
rainv123 f127f38cbc fix:修改知识库图标 2025-11-04 17:44:44 +08:00
rainv123 f29f4086b3 update:修改知识库图标 2025-11-04 17:19:10 +08:00
rainv123 b65ae6dc55 add:RAG 2025-11-04 16:48:19 +08:00
rainv123 11b4b06c92 Merge commit '98011272ffb66c1a4e314e496bc301e0a975bd1e' into Knowledge-Base 2025-11-04 16:22:09 +08:00
rainv123 98011272ff add:RAG 2025-11-04 16:21:01 +08:00
Chingfeng Li 222f3f1c93 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-11-04 09:27:04 +08:00
dependabot[bot]andGitHub a2fbc07a78 build(deps): bump numpy from 1.26.4 to 2.3.4 in /main/xiaozhi-server
Bumps [numpy](https://github.com/numpy/numpy) from 1.26.4 to 2.3.4.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](https://github.com/numpy/numpy/compare/v1.26.4...v2.3.4)

---
updated-dependencies:
- dependency-name: numpy
  dependency-version: 2.3.4
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-03 08:54:46 +00:00
dependabot[bot]andGitHub 4d728663a6 build(deps): bump sherpa-onnx in /main/xiaozhi-server
Bumps [sherpa-onnx](https://github.com/k2-fsa/sherpa-onnx) from 1.12.11 to 1.12.15.
- [Release notes](https://github.com/k2-fsa/sherpa-onnx/releases)
- [Changelog](https://github.com/k2-fsa/sherpa-onnx/blob/master/CHANGELOG.md)
- [Commits](https://github.com/k2-fsa/sherpa-onnx/compare/v1.12.11...v1.12.15)

---
updated-dependencies:
- dependency-name: sherpa-onnx
  dependency-version: 1.12.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-03 08:54:40 +00:00
dependabot[bot]andGitHub 8b1fe1dbcf build(deps): bump funasr from 1.2.3 to 1.2.7 in /main/xiaozhi-server
Bumps [funasr](https://github.com/alibaba-damo-academy/FunASR) from 1.2.3 to 1.2.7.
- [Release notes](https://github.com/alibaba-damo-academy/FunASR/releases)
- [Commits](https://github.com/alibaba-damo-academy/FunASR/commits)

---
updated-dependencies:
- dependency-name: funasr
  dependency-version: 1.2.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-03 08:54:30 +00:00
dependabot[bot]andGitHub 1c836fff39 build(deps): bump torchaudio from 2.2.2 to 2.9.0 in /main/xiaozhi-server
Bumps [torchaudio](https://github.com/pytorch/audio) from 2.2.2 to 2.9.0.
- [Release notes](https://github.com/pytorch/audio/releases)
- [Commits](https://github.com/pytorch/audio/compare/v2.2.2...v2.9.0)

---
updated-dependencies:
- dependency-name: torchaudio
  dependency-version: 2.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-03 08:54:28 +00:00
hrzandGitHub 53ee24f828 Merge pull request #2455 from xinnan-tech/py_fix_packet
fix: 等待音频过长时需修正包状态
2025-11-03 15:54:40 +08:00
Sakura-RanChen e1056f72e1 fix: 等待音频过长时需修正包状态 2025-11-03 15:17:52 +08:00
Chingfeng Li 67b89b5527 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-11-03 14:25:39 +08:00
hrzandGitHub 06c3a8d761 Merge pull request #2441 from xinnan-tech/py_bump_test
Py bump test
2025-11-03 14:09:40 +08:00
Chingfeng Li e93f95254a Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-11-03 10:47:09 +08:00
hrzandGitHub e38609e9b8 Merge pull request #2449 from xinnan-tech/py_fix_packet
fix: 流控状态未重置
2025-11-03 09:17:33 +08:00
欣南科技andGitHub 4d631cbfe4 Merge pull request #2451 from xinnan-tech/manager-model-id
Manager model
2025-11-02 17:16:29 +08:00
hrz 838d9a3927 update:优化模型id输入框位置 2025-11-02 17:14:11 +08:00
hrzandGitHub 8e12e75b2f Merge pull request #2445 from KurobaKaitou/main
feat[Improvement]: add support for customizing model id when adding model provider configurations.
2025-11-02 15:52:04 +08:00
欣南科技andGitHub 0698a6d8ac Merge pull request #2450 from xinnan-tech/fix-longcatllm
Fix longcatllm
2025-11-02 15:50:22 +08:00
hrzandGitHub 57c2af413e Merge pull request #2433 from lsp199308/main
修复 chat chunk 缺失 'content' 导致 BadRequestError
2025-11-02 15:31:59 +08:00
Sakura-RanChen ec07088c13 fix: 流控状态未重置
update: 增加流式预缓冲
2025-11-01 17:59:16 +08:00
HanabiandGitHub 121318dc37 Merge branch 'xinnan-tech:main' into main 2025-11-01 11:55:19 +08:00
欣南科技andGitHub b1e1a29145 Merge pull request #2446 from xinnan-tech/update_version
Bump to 0.8.6
2025-11-01 11:16:33 +08:00
hrz e59df53c99 Bump to 0.8.6 2025-11-01 11:15:58 +08:00
zhilin e19fb24009 fix: checkout incorrect remove package-lock.json file 2025-11-01 10:09:11 +08:00
小雨 419e7f6dcc fix: fix incorrect remove application-dev.yml file of manager-api 2025-11-01 01:25:46 +08:00
小雨 b3f13e274f feat: Solve the problem of #2198 custom model ID 2025-11-01 01:22:21 +08:00
hrzandGitHub cdf0f91251 Merge pull request #2443 from xinnan-tech/py_fix_prompt_template
fix:修复全模块时缺少prompt_template配置的问题
2025-10-31 21:23:50 +08:00
3030332422 32ecbe55fc fix:修复全模块时缺少prompt_template配置的问题 2025-10-31 20:36:55 +08:00
Chingfeng Li 58b71f5039 更新其他依赖 2025-10-31 15:11:38 +08:00
myifengandGitHub b17a265378 Merge pull request #2424 from xinnan-tech/dependabot/pip/main/xiaozhi-server/edge-tts-7.2.3
build(deps): bump edge-tts from 7.0.0 to 7.2.3 in /main/xiaozhi-server
2025-10-31 13:22:06 +08:00
myifengandGitHub ba446d2374 Merge pull request #2426 from xinnan-tech/dependabot/pip/main/xiaozhi-server/aioconsole-0.8.2
build(deps): bump aioconsole from 0.8.1 to 0.8.2 in /main/xiaozhi-server
2025-10-31 13:21:38 +08:00
myifengandGitHub 18d66270d6 Merge pull request #2423 from xinnan-tech/dependabot/pip/main/xiaozhi-server/mcp-proxy-0.10.0
build(deps): bump mcp-proxy from 0.8.2 to 0.10.0 in /main/xiaozhi-server
2025-10-31 13:21:11 +08:00
myifengandGitHub 2d02349c55 Merge pull request #2422 from xinnan-tech/dependabot/pip/main/xiaozhi-server/ruamel-yaml-0.18.16
build(deps): bump ruamel-yaml from 0.18.15 to 0.18.16 in /main/xiaozhi-server
2025-10-31 13:20:15 +08:00
hrzandGitHub cc9d5306e6 Merge pull request #2437 from xinnan-tech/py_mcp_server_fix
update:服务端MCP新增支持Streamable HTTP传输协议
2025-10-31 10:09:02 +08:00
3030332422 5149a8049a update:服务端MCP新增支持Streamable HTTP传输协议 2025-10-29 23:14:42 +08:00
lsp199308andGitHub cf3c955b73 Update openai.py 2025-10-28 23:15:28 +08:00
欣南科技andGitHub cde093dd20 Merge pull request #2430 from xinnan-tech/mac_safe
update:默认版本不提供设备ID敏感信息,按需开启
2025-10-28 15:03:19 +08:00
hrz 455b3df5ae update:默认版本不提供设备ID敏感信息,按需开启 2025-10-28 15:02:01 +08:00
dependabot[bot]andGitHub 85741137a5 build(deps): bump aioconsole from 0.8.1 to 0.8.2 in /main/xiaozhi-server
Bumps [aioconsole](https://github.com/vxgmichel/aioconsole) from 0.8.1 to 0.8.2.
- [Release notes](https://github.com/vxgmichel/aioconsole/releases)
- [Commits](https://github.com/vxgmichel/aioconsole/compare/v0.8.1...v0.8.2)

---
updated-dependencies:
- dependency-name: aioconsole
  dependency-version: 0.8.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 09:28:05 +00:00
dependabot[bot]andGitHub cc2fdf1b9b build(deps): bump websockets from 14.2 to 15.0.1 in /main/xiaozhi-server
Bumps [websockets](https://github.com/python-websockets/websockets) from 14.2 to 15.0.1.
- [Release notes](https://github.com/python-websockets/websockets/releases)
- [Commits](https://github.com/python-websockets/websockets/compare/14.2...15.0.1)

---
updated-dependencies:
- dependency-name: websockets
  dependency-version: 15.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 09:05:28 +00:00
dependabot[bot]andGitHub a70542265a build(deps): bump edge-tts from 7.0.0 to 7.2.3 in /main/xiaozhi-server
Bumps [edge-tts](https://github.com/rany2/edge-tts) from 7.0.0 to 7.2.3.
- [Release notes](https://github.com/rany2/edge-tts/releases)
- [Commits](https://github.com/rany2/edge-tts/compare/7.0.0...7.2.3)

---
updated-dependencies:
- dependency-name: edge-tts
  dependency-version: 7.2.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 09:04:42 +00:00
dependabot[bot]andGitHub 5a9cc89b64 build(deps): bump mcp-proxy from 0.8.2 to 0.10.0 in /main/xiaozhi-server
Bumps [mcp-proxy](https://github.com/sparfenyuk/mcp-proxy) from 0.8.2 to 0.10.0.
- [Release notes](https://github.com/sparfenyuk/mcp-proxy/releases)
- [Commits](https://github.com/sparfenyuk/mcp-proxy/compare/v0.8.2...v0.10.0)

---
updated-dependencies:
- dependency-name: mcp-proxy
  dependency-version: 0.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 09:04:25 +00:00
dependabot[bot]andGitHub 5586515327 build(deps): bump ruamel-yaml in /main/xiaozhi-server
Bumps ruamel-yaml from 0.18.15 to 0.18.16.

---
updated-dependencies:
- dependency-name: ruamel-yaml
  dependency-version: 0.18.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-27 08:59:38 +00:00
hrzandGitHub 4d14caf0d4 Merge pull request #2416 from xinnan-tech/test-page-add-mcp
添加MCP工具测试页面
2025-10-25 09:25:16 +08:00
Chingfeng Li 47b44bb124 修复未定义的方法 2025-10-24 16:01:12 +08:00
Chingfeng Li eb743ab577 从json中加载默认工具,方便自定义tools 2025-10-24 15:58:01 +08:00
Chingfeng Li d6344bde5e 添加MCP测试功能,支持自定义添加编辑MCP Tools 2025-10-24 10:17:32 +08:00
Chingfeng Li 7ce1672d98 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-10-24 09:02:09 +08:00
欣南科技andGitHub 4e3701e62c Merge pull request #2410 from xinnan-tech/fix-xunfei-asr
修复:讯飞asr最后一个字丢失的bug
2025-10-23 17:05:06 +08:00
hrz a035ed525a 修复:讯飞asr最后一个字丢失的bug 2025-10-23 17:04:33 +08:00
hrzandGitHub dbea7ae11e Merge pull request #2403 from xinnan-tech/main-aliyun-nls-taskid
阿里云NLS协议中message_id每次发送都必须唯一;task_id是会话id,整个请求中需要保持一致。
2025-10-23 15:12:19 +08:00
hrzandGitHub 26127e9b4a Merge pull request #2401 from xinnan-tech/py_fix_huoshan
fix: 未等待服务端残留状态问题
2025-10-23 14:32:17 +08:00
Chingfeng Li 7035a57cf1 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-10-23 13:05:10 +08:00
hrzandGitHub aee9bdc514 Merge pull request #2399 from xinnan-tech/main-agent-base-prompt
常量可配置:允许自定义agent-base-prompt.txt文件
2025-10-23 12:26:08 +08:00
欣南科技andGitHub 9018422ecb Merge pull request #2405 from xinnan-tech/hot-fix
update:优化文档
2025-10-23 12:24:52 +08:00
hrz da8d8c53c0 update:优化文档 2025-10-23 12:24:16 +08:00
欣南科技andGitHub 2c428a380e Merge pull request #2404 from xinnan-tech/hot-fix
update:该功能易被坏人滥用,违背开发者初心
2025-10-23 11:47:22 +08:00
hrz bde50e661d update:改功能易引发坏人滥用,违背开发者初心 2025-10-23 11:43:49 +08:00
Chingfeng Li 2beeb825cf 阿里云NLS协议中message_id每次发送都必须唯一;task_id是会话id,整个请求中需要保持一致。 2025-10-22 18:21:34 +08:00
Sakura-RanChen 371dab1282 fix: 未等待服务端残留状态问题 2025-10-22 17:26:36 +08:00
Chingfeng Li 3ba437c937 常量可配置:允许自定义agent-base-prompt.txt文件 2025-10-22 14:53:05 +08:00
hrzandGitHub 4b2d7da4e5 Merge pull request #2357 from kkroid/feature_tts-audio-send-delay
feat: 添加可配置的TTS音频发送延迟功能
2025-10-22 11:48:34 +08:00
hrzandGitHub d00592020e Update config.yaml 2025-10-22 11:47:54 +08:00
hrzandGitHub e0b24f4e59 Merge pull request #2383 from xinnan-tech/docker-server-base
构建base镜像,只有当依赖发生变化时再进行重新构建,否则只使用之前的base镜像进行构建,能够使本地使用缓存的镜像
2025-10-22 11:41:35 +08:00
欣南科技andGitHub 4b7be99837 Merge pull request #2378 from xinnan-tech/py_update_vad
update: 优化vad判断逻辑
2025-10-22 11:19:33 +08:00
hrz 99db948b96 update:恢复vad判断 2025-10-22 10:46:57 +08:00
欣南科技andGitHub 2b3e205cda Merge pull request #2397 from xinnan-tech/pip_version
Pip version
2025-10-22 09:17:29 +08:00
hrz c9b7d77094 updte:python3.10最高只支持torch==2.2.2、torchaudio==2.2.2 2025-10-22 09:16:33 +08:00
hrzandGitHub f3818167f3 Merge pull request #2380 from KurobaKaitou/main
chore: 补充在 Linux 环境下进行源码部署时出现缺失动态库的解决方案以及保留检测 ffmpeg 环境时的原有报错信息
2025-10-21 17:42:52 +08:00
hrzandGitHub 55d6c2a193 Merge pull request #2387 from xinnan-tech/dependabot/pip/main/xiaozhi-server/ormsgpack-1.11.0
build(deps): bump ormsgpack from 1.7.0 to 1.11.0 in /main/xiaozhi-server
2025-10-21 17:42:09 +08:00
hrzandGitHub 6cfb6a8f43 Merge pull request #2386 from xinnan-tech/dependabot/pip/main/xiaozhi-server/dashscope-1.24.6
build(deps): bump dashscope from 1.23.1 to 1.24.6 in /main/xiaozhi-server
2025-10-21 17:41:38 +08:00
hrzandGitHub 396c3eb18b Merge pull request #2388 from xinnan-tech/dependabot/pip/main/xiaozhi-server/openai-2.5.0
build(deps): bump openai from 1.107.0 to 2.5.0 in /main/xiaozhi-server
2025-10-21 17:41:06 +08:00
hrzandGitHub d8c4c1f207 Merge branch 'pip_version' into dependabot/pip/main/xiaozhi-server/openai-2.5.0 2025-10-21 17:40:47 +08:00
hrzandGitHub 268ce9fff3 Merge pull request #2389 from xinnan-tech/dependabot/pip/main/xiaozhi-server/torchaudio-2.9.0
build(deps): bump torchaudio from 2.2.2 to 2.9.0 in /main/xiaozhi-server
2025-10-21 17:39:12 +08:00
hrzandGitHub bbc3b44336 Merge pull request #2390 from xinnan-tech/dependabot/pip/main/xiaozhi-server/mem0ai-1.0.0
build(deps): bump mem0ai from 0.1.62 to 1.0.0 in /main/xiaozhi-server
2025-10-21 17:38:48 +08:00
HanabiandGitHub fb223984d3 Merge branch 'xinnan-tech:main' into main 2025-10-21 00:52:25 +08:00
欣南科技andGitHub 9f21711cae Merge pull request #2392 from xinnan-tech/hot-fix
update:修复manager-api错误码重复问题
2025-10-20 23:39:43 +08:00
hrz c139701468 update:修复manager-api错误码重复问题 2025-10-20 23:38:59 +08:00
欣南科技andGitHub 66d3bcfa13 Merge pull request #2379 from xinnan-tech/main-fix-auth_key
如果已经配置了auth_key,则不使用uuid生成; 适配单模块启动,防止每次服务重启设备都无法连接问题
2025-10-20 22:19:10 +08:00
hrzandGitHub ff048797a1 auth_key优先级:配置文件server.auth_key > manager-api.secret > 自动生成 2025-10-20 21:25:37 +08:00
dependabot[bot]andGitHub ad6607b7f5 build(deps): bump mem0ai from 0.1.62 to 1.0.0 in /main/xiaozhi-server
Bumps [mem0ai](https://github.com/mem0ai/mem0) from 0.1.62 to 1.0.0.
- [Release notes](https://github.com/mem0ai/mem0/releases)
- [Changelog](https://github.com/mem0ai/mem0/blob/main/docs/changelog.mdx)
- [Commits](https://github.com/mem0ai/mem0/compare/0.1.62...v1.0.0)

---
updated-dependencies:
- dependency-name: mem0ai
  dependency-version: 1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 13:19:42 +00:00
dependabot[bot]andGitHub c992ed48da build(deps): bump torchaudio from 2.2.2 to 2.9.0 in /main/xiaozhi-server
Bumps [torchaudio](https://github.com/pytorch/audio) from 2.2.2 to 2.9.0.
- [Release notes](https://github.com/pytorch/audio/releases)
- [Commits](https://github.com/pytorch/audio/compare/v2.2.2...v2.9.0)

---
updated-dependencies:
- dependency-name: torchaudio
  dependency-version: 2.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 13:19:35 +00:00
HanabiandGitHub bdf9cda4c5 Merge branch 'xinnan-tech:main' into main 2025-10-20 20:23:54 +08:00
dependabot[bot]andGitHub c85ffcc181 build(deps): bump openai from 1.107.0 to 2.5.0 in /main/xiaozhi-server
Bumps [openai](https://github.com/openai/openai-python) from 1.107.0 to 2.5.0.
- [Release notes](https://github.com/openai/openai-python/releases)
- [Changelog](https://github.com/openai/openai-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/openai/openai-python/compare/v1.107.0...v2.5.0)

---
updated-dependencies:
- dependency-name: openai
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 11:56:58 +00:00
dependabot[bot]andGitHub c53e3ed965 build(deps): bump ormsgpack from 1.7.0 to 1.11.0 in /main/xiaozhi-server
Bumps [ormsgpack](https://github.com/aviramha/ormsgpack) from 1.7.0 to 1.11.0.
- [Release notes](https://github.com/aviramha/ormsgpack/releases)
- [Changelog](https://github.com/aviramha/ormsgpack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aviramha/ormsgpack/compare/1.7.0...1.11.0)

---
updated-dependencies:
- dependency-name: ormsgpack
  dependency-version: 1.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 11:51:52 +00:00
dependabot[bot]andGitHub d374b77baa build(deps): bump dashscope in /main/xiaozhi-server
Bumps [dashscope](https://dashscope.aliyun.com/) from 1.23.1 to 1.24.6.

---
updated-dependencies:
- dependency-name: dashscope
  dependency-version: 1.24.6
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-20 11:51:47 +00:00
hrzandGitHub f3b2339803 Merge pull request #2384 from xinnan-tech/fix-dependabot
修正检测周期
2025-10-20 18:47:30 +08:00
hrzandGitHub 27ed540113 Merge pull request #2385 from xinnan-tech/fixmqtt
fix:修复单模块mqtt下发错误
2025-10-20 18:47:05 +08:00
FAN-yeB 434fba55f7 fix:修复单模块下发逻辑 2025-10-20 18:21:12 +08:00
Chingfeng Li 280c04e753 修正检测周期 2025-10-20 15:54:50 +08:00
Chingfeng Li 24832822a5 默认main分支 2025-10-20 15:11:23 +08:00
Chingfeng Li a357f0818d 依赖baseAction 2025-10-20 15:10:19 +08:00
Chingfeng Li e4bf5d2d21 构建base镜像,只有当依赖发生变化时再进行重新构建,否则只使用之前的base镜像进行构建,能够使本地使用缓存的镜像 2025-10-20 15:07:02 +08:00
HanabiandGitHub 8b261d473a fix: 补充README文档 334行的 ffmpeg 单词缺失
补充README文档 334行的 ffmpeg 单词缺失
2025-10-20 12:53:40 +08:00
HanabiandGitHub bba84382ec docs: 补充源码部署时安装 ffmpeg 环境可能会出现缺失动态库的解决方案
补充说明
2025-10-20 12:32:09 +08:00
HanabiandGitHub d081803434 chore(util): 优化项目启动时检测ffmpeg环境时在某些场景下的提示
此次变动主要针对 Linux (Ubuntu 22.04) 环境下根据官方提供的README文档以及conda安装 ffmpeg 环境后出现缺失动态库libiconv.so.2的问题 报错完整信息如下:
`ffmpeg: error while loading shared libraries: libiconv.so.2: cannot open shared object file: No such file or directory` 基于以上报错信息 优化了util.py中的check_ffmpeg_installed函数
- 保留了原有命令行的提示信息 [定位问题更加友好]
- 抓取报错中的 libiconv.so.2 文本内容 进行提示用户通过conda安装 libiconv 动态库
2025-10-20 12:28:22 +08:00
Chingfeng Li 9194ffa6b7 如果已经配置了auth_key,则不使用uuid生成; 适配单模块启动,防止每次服务重启设备都无法连接问题 2025-10-20 11:57:18 +08:00
Sakura-RanChen c06a7b1db6 update: 优化vad判断逻辑 2025-10-20 11:45:50 +08:00
欣南科技andGitHub 1736e10189 Merge pull request #2374 from xinnan-tech/myifeng-patch-1
更新 dependabot.yml
2025-10-20 11:37:55 +08:00
hrzandGitHub 43b79c50a0 每个月更新组件版本 2025-10-20 11:35:31 +08:00
欣南科技andGitHub 2e6aced1bd Merge pull request #2377 from xinnan-tech/update-doc
fix:克隆教程文字错误
2025-10-20 10:17:55 +08:00
hrz 2dc80c8432 fix:克隆教程文字错误 2025-10-20 10:16:10 +08:00
myifengandGitHub 01e7a7d3b8 更新 dependabot.yml 2025-10-19 16:06:44 +08:00
欣南科技andGitHub e5e9f2bdea Merge pull request #2373 from xinnan-tech/update-doc
update:立即复刻增加loading效果
2025-10-19 14:34:53 +08:00
hrz 06eff425f1 update:立即复刻增加loading效果 2025-10-19 14:34:05 +08:00
欣南科技andGitHub d2aae057f6 Merge pull request #2372 from xinnan-tech/update-doc
update:常见问题增加音色克隆链接
2025-10-19 13:18:39 +08:00
hrz b7b39de445 update:常见问题增加音色克隆链接 2025-10-19 13:18:07 +08:00
欣南科技andGitHub 4aedcb8419 Merge pull request #2371 from xinnan-tech/voice-clone
update:升级版本号
2025-10-19 13:14:20 +08:00
hrz 6c5bd395cb update:升级版本号 2025-10-19 13:13:44 +08:00
欣南科技andGitHub 6ad9ae8d1b Merge pull request #2353 from xinnan-tech/voice-clone
uptate:音色复刻功能完善
2025-10-19 13:11:23 +08:00
hrz 48e2369964 update:修改音色克隆教程 2025-10-19 13:10:07 +08:00
hrz e753c242ad update:将本人的克隆音色自动添加模型配置中的音色选择列表 2025-10-19 11:53:15 +08:00
hrz c1e0b5181e update:优化克隆失败显示 2025-10-19 01:45:08 +08:00
欣南科技andGitHub d3371c2875 Merge pull request #2370 from xinnan-tech/ota-test
fix:修复【启用】模型和【默认】模型时,密钥变*bug
2025-10-19 00:37:08 +08:00
hrz 2488678f34 fix:修复【启用】模型和【默认】模型时,密钥变*bug 2025-10-19 00:36:24 +08:00
3030332422 958d50c119 fix:修改音色克隆详细内容 2025-10-18 21:47:14 +08:00
欣南科技andGitHub 19c16cfcd8 Merge pull request #2369 from xinnan-tech/ota-test
Ota test
2025-10-18 21:25:27 +08:00
hrz c66c92be73 update:智控台版本ota增加token返回字段 2025-10-18 21:24:19 +08:00
hrzandGitHub 4f9ea49f8e Merge pull request #2368 from myifeng/mian-ota-test
更新test页面,适配OTA认证
2025-10-18 14:28:39 +08:00
3030332422 b776c545e3 fix:声音复刻后自动刷新页面状态和错误详情 2025-10-17 23:31:36 +08:00
3030332422 d65969a2b2 fix: 声音复刻成功后自动刷新页面状态 2025-10-17 22:29:30 +08:00
3030332422 d3eb8df7f0 update:声音复刻功能的部分修改 2025-10-17 18:22:38 +08:00
Chingfeng Li 89e299764d 调整测试认证 2025-10-17 18:06:22 +08:00
rainv123 66fb7933b7 update:增加音色克隆页面详情按钮 2025-10-17 17:55:56 +08:00
Chingfeng Li 49e1bbbf15 更新test测试页面,使用ota返回的连接信息和认证信息 2025-10-17 17:51:56 +08:00
3030332422 af02d53718 update:修复复刻失败问题 2025-10-17 17:08:41 +08:00
3030332422 f8b1e8199c fix:修复复刻失败的问题 2025-10-17 15:56:33 +08:00
rainv123 008456d7cd update:新增音色资源时判断声音id是否已经存在 2025-10-17 11:31:13 +08:00
hrzandGitHub aa7c07167c Merge pull request #2346 from xinnan-tech/mcp_add_macaddress_test
update:通过JSON-RPC参数传递设备MAC地址
2025-10-17 09:42:01 +08:00
rainv123 d451fe7a0b uptate:修改训练状态 2025-10-17 09:22:08 +08:00
will.zhang 3b8bbb5c5f feat: 添加可配置的TTS音频发送延迟功能
- 修改 sendAudio() 函数,新增 tts_audio_send_delay 配置参数(毫秒)
- 0: 使用原有逻辑
- 大于0: 使用固定延迟发送(降低首包延迟,提升响应速度)
2025-10-14 18:30:17 +08:00
hrzandGitHub 29cd69415a Merge pull request #2355 from xinnan-tech/py_fix_uuid
update:暂时恢复先前的随机生成uuid
2025-10-14 18:19:33 +08:00
欣南科技andGitHub bc99da5b28 Merge pull request #2356 from xinnan-tech/update-doc
update:优化demo
2025-10-14 18:13:39 +08:00
hrz 5b38d92cc6 update:优化demo 2025-10-14 18:12:58 +08:00
3030332422 0e1392de35 update:暂时恢复先前的随机生成uuid 2025-10-14 18:06:57 +08:00
rainv123andGitHub a033b56b8d Update:修正翻译 2025-10-14 15:51:34 +08:00
rainv123andGitHub c449d29de0 Update:更新火山双流式语音合成+音色克隆配置文档 2025-10-14 15:23:48 +08:00
rainv123 afc142b397 update:更新火山双流式语音合成+音色克隆配置文档 2025-10-14 15:16:51 +08:00
rainv123 55348ffe65 updata:更新火山双向流式TTS+声音克隆配置文档 2025-10-14 15:13:22 +08:00
rainv123 174b9f5898 updata:更新火山双向流式TTS+声音克隆配置教程 2025-10-14 15:05:02 +08:00
rainv123 3b69629a61 fix:补充键的翻译 2025-10-14 11:04:49 +08:00
rainv123 56eb25f8e2 fix:更正翻译 2025-10-14 10:59:54 +08:00
rainv123 1400e48fc7 Merge branch 'voice-clone' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-10-14 10:27:02 +08:00
rainv123 bccda3e7b2 fix:补充音色克隆界面弹窗按钮翻译 2025-10-14 10:21:50 +08:00
rainv123 dfb0a2b213 update:修改音色编码排序逻辑 2025-10-14 10:19:44 +08:00
3030332422 f94b376f31 update:通过JSON-RPC参数传递设备MAC地址 2025-10-13 18:00:58 +08:00
hrzandGitHub 13ce67e4c7 Merge pull request #2342 from xinnan-tech/py_fix_wakeup
fix: 相关状态未重置
2025-10-13 17:57:49 +08:00
欣南科技andGitHub eece86ab71 Merge pull request #2345 from xinnan-tech/ota-auth
Ota auth
2025-10-13 17:57:18 +08:00
hrz 4fd294dc80 update:
1、把ota_auth内容合并到auth.py
2、精简auth密钥,简化部署
2025-10-13 17:52:28 +08:00
Sakura-RanChen 4952ccfbf7 fix: 相关状态未重置 2025-10-13 16:47:05 +08:00
hrz 471ad864b6 update:优化 2025-10-13 15:31:49 +08:00
hrz bec32bd085 update:把传递name改成传递speaker_id 2025-10-13 15:26:26 +08:00
rainv123 087fd5d547 update:音色克隆 2025-10-13 14:17:53 +08:00
hrzandGitHub 99f178274d Merge pull request #2339 from xinnan-tech/cc
fix:修复长按聆听设备松开没有声音的问题
2025-10-13 13:23:47 +08:00
1cccux 450560f92a fix:修复长按聆听设备松开没有声音的问题 2025-10-13 10:57:48 +08:00
hrzandGitHub 691a0529b0 Merge pull request #2330 from myifeng/ota-auth
OTA接口授权与认证
2025-10-13 10:51:34 +08:00
欣南科技andGitHub 38e63eb665 Merge pull request #2338 from xinnan-tech/uuid
UUID
2025-10-13 10:49:44 +08:00
hrzandGitHub ad8390301e Merge pull request #2337 from Yuerchu/main
使用uuid包来生成uuidv4
2025-10-13 10:35:19 +08:00
于小丘 acee7e27c6 在管理网页也修改uuid生成方法 2025-10-13 09:49:56 +08:00
于小丘 e790b668ef 删除原uuid库的导入 2025-10-13 09:42:59 +08:00
于小丘 432a5d01f8 改成 crypto.randomUUID(); 生成uuid 2025-10-13 09:35:39 +08:00
于小丘 374f2a92aa 使用uuid包来生成uuidv4 2025-10-13 09:26:16 +08:00
欣南科技andGitHub a22ad985dc Merge pull request #2336 from xinnan-tech/hot-fix
fix:回复词太短
2025-10-12 23:25:25 +08:00
hrz 44f41ebd11 fix:回复词太短 2025-10-12 23:24:43 +08:00
Chingfeng Li a10e94bef6 先认证,后创建连接,防止无效连接建立 2025-10-11 17:52:15 +08:00
hrzandGitHub e7cb67f846 Merge pull request #2331 from xinnan-tech/py_wave_fix
update:修改唤醒词
2025-10-11 15:57:11 +08:00
3030332422 b5a3cc1c78 update:修改唤醒词 2025-10-11 15:48:27 +08:00
FAN-yeBandGitHub 1d107fb39b Merge pull request #2326 from xinnan-tech/css
修复修改密码无法重复点击和恢复样式
2025-10-11 15:45:29 +08:00
LiJinHui 1ec8f639cb 补充修改 2025-10-11 15:28:53 +08:00
Chingfeng Li c15069a9b6 OTA接口授权与认证 2025-10-11 15:27:18 +08:00
LiJinHui 13ae5e3ade 补充样式 2025-10-11 15:02:01 +08:00
LiJinHui 9cffc8b0ec 修复交互bug 2025-10-11 09:26:08 +08:00
hrzandGitHub c8c5b1095b Merge pull request #2323 from xinnan-tech/py_update_document
update: 更新说明文档
2025-10-10 15:09:46 +08:00
Sakura-RanChen 9803b3c690 update: 更新说明文档 2025-10-10 14:45:30 +08:00
hrzandGitHub 341c0087b7 Merge pull request #2322 from xinnan-tech/web-i18n-updata
update:调整翻译文本顺序,删除重复翻译键
2025-10-10 14:39:56 +08:00
rainv123 0cd752be05 update:调整翻译文本顺序,删除重复翻译键 2025-10-10 14:35:35 +08:00
rainv123andGitHub 2e39b1c6f5 Merge pull request #2313 from xinnan-tech/mobile_forgot_password
添加移动端忘记密码页面
2025-10-10 11:28:02 +08:00
LiJinHui c4026ef9ac 样式的恢复和调整 2025-10-10 10:02:11 +08:00
欣南科技andGitHub 271a2e3e96 Merge pull request #2317 from xinnan-tech/hot-fix
fix:python config api no need maskSensitive
2025-10-08 22:45:22 +08:00
hrz bc3e10f09b fix:python config api no need maskSensitive 2025-10-08 22:43:45 +08:00
3030332422 fed3501bf6 update:补充 2025-10-08 10:49:02 +08:00
欣南科技andGitHub 877cb0d645 Merge pull request #2312 from xinnan-tech/voice-clone
优化:用户管理密码生成策略
2025-10-08 00:17:16 +08:00
hrz e930935202 优化:用户管理密码生成策略 2025-10-08 00:16:24 +08:00
欣南科技andGitHub 0af81fa366 Merge pull request #2311 from xinnan-tech/voice-clone
update:智控台音色克隆
2025-10-07 23:57:56 +08:00
hrz 3249970b7b update:智控台音色克隆 2025-10-07 23:54:42 +08:00
3030332422 1466806339 update:移动端忘记密码页面的前后端对接 2025-10-06 20:01:06 +08:00
3030332422 05389b1368 update:移动端忘记密码前端页面添加地区区号选择和SM2加密 2025-10-03 11:35:44 +08:00
欣南科技andGitHub bef7f79f40 Merge pull request #2307 from xinnan-tech/update_doc
update:更新docker安装提示
2025-10-02 02:28:21 +08:00
hrz 8d7394cd46 update:更新docker安装提示 2025-10-02 02:25:58 +08:00
欣南科技andGitHub 65053e98e2 Merge pull request #2306 from xinnan-tech/openrz-patch-1
Update docker-image.yml
2025-10-02 02:14:31 +08:00
hrzandGitHub c1bea43598 Update docker-image.yml 2025-10-02 02:13:45 +08:00
欣南科技andGitHub 31aeb63f89 Merge pull request #2305 from xinnan-tech/his_download
add:首页智能体添加搜索记录
2025-10-01 02:53:09 +08:00
hrz 0175a7a1d4 add:首页智能体添加搜索记录 2025-10-01 02:52:32 +08:00
欣南科技andGitHub 1417ee017e Merge pull request #2304 from xinnan-tech/his_download
update:下载智能体的聊天记录
2025-10-01 01:33:01 +08:00
hrz 5b4d79902f update:下载智能体的聊天记录 2025-10-01 01:24:13 +08:00
3030332422 f10fddc59a update:新增移动端忘记密码前端页面 2025-09-30 17:52:38 +08:00
hrzandGitHub ed07793c47 Merge pull request #2288 from xinnan-tech/sm2_test
登录、注册页面添加非对称加密
2025-09-30 11:12:50 +08:00
hrz 2ed2e9c391 update:优化移动端按钮 2025-09-30 11:10:48 +08:00
3030332422 2b9fed2609 update:新增SM2解密工具类,优化登录注册密码找回功能 2025-09-30 09:07:06 +08:00
3030332422 848ce65d13 update:web端重置密码页面加密 2025-09-29 17:57:53 +08:00
hrzandGitHub f0512ce1cc Merge pull request #2302 from xinnan-tech/CSS_update
调整底框位置
2025-09-29 17:57:24 +08:00
LiJinHui 313fad1f81 样式调整 2025-09-29 17:56:19 +08:00
3030332422 ff26a84988 fix:完善重置密码页面多语言支持 2025-09-29 16:51:23 +08:00
3030332422 f7ee54598e fix:修复移动端创建智能体时显示问题 2025-09-29 16:09:28 +08:00
LiJinHui 7a62462c1b 调整底框位置 2025-09-29 15:18:46 +08:00
3030332422 a4433ebe68 fix:修复移动端注册页面的一些bug 2025-09-29 14:21:41 +08:00
3030332422 48feea55fe update:移动端注册页面加密 2025-09-29 10:29:28 +08:00
3030332422 6e5f708f5a update:移动端登录页面加密 2025-09-28 22:40:05 +08:00
hrzandGitHub f2ed645f9c Merge pull request #2290 from xinnan-tech/jia_mi_miyao
模型秘钥加密
2025-09-28 18:32:53 +08:00
hrz d47664e670 update:优化输入框提示 2025-09-28 18:25:29 +08:00
LiJinHui 8f3229ddda 调整 input onfocus 判断 2025-09-28 17:37:06 +08:00
LiJinHui 4f2b7524aa 改用精准匹配生成提示词 2025-09-28 17:20:09 +08:00
LiJinHui 4e99e176e9 删除多余样式 2025-09-28 17:05:17 +08:00
LiJinHui cfc7047967 页面优化 2025-09-28 16:52:28 +08:00
LiJinHui 776b5fb3b4 修复加密的bug 2025-09-28 15:27:46 +08:00
3030332422 f16d42d2b5 Merge branch 'sm2_test' of https://github.com/xinnan-tech/xiaozhi-esp32-server into sm2_test 2025-09-28 14:18:44 +08:00
3030332422 344d183b6f fix:修复web端手机号码注册时遇到的问题 2025-09-28 14:06:13 +08:00
LiJinHui feb668c96c 还原Python的端口 2025-09-28 10:28:01 +08:00
LiJinHui f345568675 修复秘钥污染的bug 2025-09-28 09:32:54 +08:00
hrz 11207f793d update:登录类型按钮居中显示 2025-09-26 23:56:40 +08:00
hrz ce09eb48c4 update:共钥信息从旧接口获取,去除getServerPublicKey方法 2025-09-26 23:39:27 +08:00
hrzandGitHub 6925732f72 Merge pull request #2285 from myifeng/prompt-template-args
提示词模板支持更多参数
2025-09-26 19:07:41 +08:00
hrzandGitHub dd9d08c8c3 Merge pull request #2291 from xinnan-tech/performance
update:更新测试工具以测试讯飞流式ASR、TTS首词响应时间
2025-09-26 19:06:28 +08:00
hrzandGitHub 1443c883f1 Merge pull request #2292 from xinnan-tech/mobile-i18n
updata:移动端添加语言切换功能
2025-09-26 19:05:21 +08:00
hrzandGitHub 30676e2170 Merge branch 'main' into sm2_test 2025-09-26 19:03:23 +08:00
rainv123 e41e6d4284 updata:删除无用功能 2025-09-26 17:10:47 +08:00
rainv123 1a7b1d24fa updata:移动端添加语言切换功能 2025-09-26 17:03:17 +08:00
rainv123 99443d1c9f updata:移动端添加语言切换功能 2025-09-26 14:54:56 +08:00
rainv123 a84b8d818e updata:移动端添加语言切换功能 2025-09-26 14:53:16 +08:00
LiJinHui ef4abf08f0 格式调整 2025-09-26 14:44:20 +08:00
rainv123 dfcac51312 updata:移动端添加语言切换功能 2025-09-26 14:33:06 +08:00
3030332422 c963a2de18 fix:修复验证图形验证码 2025-09-26 12:58:28 +08:00
3030332422 9ec8ecf7f4 update:SM2非对称加密的优化 2025-09-26 11:10:42 +08:00
FAN-yeB 5d77c96d76 update:更新测试工具以测试讯飞流式ASR、TTS首词响应时间 2025-09-26 11:05:00 +08:00
LiJinHui a8932f3743 秘钥加密 2025-09-26 10:04:43 +08:00
欣南科技andGitHub d022dd385a Merge pull request #2286 from xinnan-tech/Data_display_update
Data display update
2025-09-25 16:12:42 +08:00
hrz b2dfbb7973 update:优化判断 2025-09-25 16:12:02 +08:00
LiJinHui 7fee922796 更新设备数量显示(实时) 2025-09-25 15:56:51 +08:00
3030332422 9b6acf1ffc fix:修复SM2非对称加密的各种问题 2025-09-25 15:50:32 +08:00
hrzandGitHub a0e7cb56dc Merge pull request #2284 from xinnan-tech/mqtt_doc
update:更新mqtt网关集成文档
2025-09-25 14:54:51 +08:00
hrz f8447033b9 update:优化 2025-09-25 14:54:05 +08:00
hrz bb07015feb update:抽离公共教程到最前面 2025-09-25 14:51:34 +08:00
Chingfeng Li 111d945a9a 提示词模板支持更多参数 2025-09-25 14:35:01 +08:00
FAN-yeB d1587cc645 update:更新mqtt网关集成文档 2025-09-25 14:31:23 +08:00
欣南科技andGitHub e50e21c240 Merge pull request #2279 from xinnan-tech/update_doc
update:更新文档
2025-09-25 12:26:14 +08:00
hrz 9bbcf7f31a update:更新文档 2025-09-25 12:25:36 +08:00
hrzandGitHub 4f29e375c3 Merge pull request #2277 from xinnan-tech/py_fix_tts
fix: Markdown调整
2025-09-25 11:05:12 +08:00
Sakura-RanChen e15c784bdb fix: 文档链接 2025-09-25 10:57:12 +08:00
Sakura-RanChen e77a3b79cd fix: Markdown调整 2025-09-25 10:17:56 +08:00
3030332422 7ac5113fef update:非对称加密注册功能 2025-09-25 09:15:41 +08:00
hrzandGitHub ae58537979 Merge pull request #2275 from xinnan-tech/py_indexTTS
update: 更新文档
2025-09-24 17:01:02 +08:00
Sakura-RanChen ebf10828f0 update: 更新文档 2025-09-24 16:35:26 +08:00
3030332422 33bad7ed40 update:前端SM2非对称加密登录功能 2025-09-23 20:22:12 +08:00
hrzandGitHub af9ed0cd86 Merge pull request #2266 from xinnan-tech/py_mqtt
update:增加单模块mqtt-gateway支持
2025-09-23 11:51:41 +08:00
FAN-yeB 14a0829190 更新ota下发mqtt协议逻辑 2025-09-23 11:37:28 +08:00
FAN-yeB ca400d8ea7 Revert "更改下发配置"
This reverts commit 8891a96731.
2025-09-23 11:29:05 +08:00
hrzandGitHub d28750dae0 Merge pull request #2264 from xinnan-tech/py_xunfei_tts
update:添加讯飞语音识别、大模型、语音合成供应器
2025-09-23 11:06:00 +08:00
hrzandGitHub ef81a17311 Merge pull request #2273 from xinnan-tech/i18n-fix
fix:修改用户管理界面用户的密码重置、禁用、删除的逻辑
2025-09-23 11:05:17 +08:00
FAN-yeB 8891a96731 更改下发配置 2025-09-23 10:45:25 +08:00
rainv123 49e69ecad4 fix:修改用户管理界面用户的密码重置、禁用、删除的逻辑 2025-09-23 10:16:17 +08:00
rainv123 1db2483557 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-23 10:08:55 +08:00
rainv123 7067050006 Revert "fix:修改用户管理界面的用户密码重置、禁用、删除的逻辑"
This reverts commit 9f303d840a.
2025-09-23 10:03:43 +08:00
FAN-yeBandGitHub 55b455216c Merge pull request #2267 from xinnan-tech/i18n-fix
i18n-fix
2025-09-23 09:58:36 +08:00
3030332422 ffba2f4fa3 update:添加SM2国密加密的登录接口 2025-09-23 09:58:27 +08:00
rainv123 9f303d840a fix:修改用户管理界面的用户密码重置、禁用、删除的逻辑 2025-09-23 09:49:13 +08:00
FAN-yeB 86b4e61c1c 添加讯飞星火大模型的配置示例 2025-09-23 09:06:27 +08:00
欣南科技andGitHub 3232b36e15 Merge pull request #2271 from xinnan-tech/fix-docker-web
update:优化编译
2025-09-22 21:35:04 +08:00
hrz 83329cf9db update:优化编译 2025-09-22 21:34:09 +08:00
rainv123 4608c81ea6 updata:补充国际化键名 2025-09-22 15:04:49 +08:00
rainv123 41679f4e1d updata:调整文本顺序 2025-09-22 14:55:22 +08:00
FAN-yeB 559699ec19 update:增加单模块mqtt-gateway支持 2025-09-22 14:18:03 +08:00
hrzandGitHub f785219a43 Merge pull request #2265 from xinnan-tech/LJH
update:修改排序
2025-09-22 11:24:41 +08:00
FAN-yeB bf2b6d7554 还原错误更改 2025-09-22 10:10:46 +08:00
FAN-yeB 9a6348c71a 更新 202509220958.sql 2025-09-22 10:01:30 +08:00
FAN-yeB 646f4cbfe9 更新讯飞星火认知大模型配置的说明文档 2025-09-22 10:00:29 +08:00
LiJinHui d4c6b6840e 增加排序更新逻辑 2025-09-22 09:52:21 +08:00
LiJinHui 758aa1c78c 修改排序的逻辑 2025-09-22 09:41:18 +08:00
FAN-yeB ec2b52ccac 优化讯飞asr参数 2025-09-22 09:34:05 +08:00
FAN-yeB 38e1eb0c18 更新 202509191732.sql 2025-09-22 09:25:43 +08:00
hrzandGitHub 00e8478f61 Merge pull request #2251 from xinnan-tech/LJH
update:新增调整角色模版的功能,添加新功能的国际化
2025-09-21 18:10:05 +08:00
hrzandGitHub 0c556b1424 Merge branch 'main' into LJH 2025-09-21 18:09:48 +08:00
hrz 9987555a72 Bump to v0.8.3 2025-09-21 18:07:48 +08:00
hrz ebb4ba5595 update:调整功能顺序 2025-09-21 18:04:56 +08:00
LiJinHui 7e338b28df 删除多余定义 2025-09-21 16:44:18 +08:00
LiJinHui c4b3e30c5d 删除多的定义 2025-09-21 16:41:53 +08:00
LiJinHui 4d283c3504 去掉调试代码 2025-09-21 01:51:35 +08:00
LiJinHui ffc1541343 删除多余代码 2025-09-21 00:25:23 +08:00
LiJinHui 588d75763c 删除多余样式 2025-09-20 23:43:58 +08:00
LiJinHui 9e218281da 调整代码 2025-09-20 17:30:00 +08:00
欣南科技andGitHub 6fa58c7948 Merge pull request #2257 from xinnan-tech/update_doc
update:优化图片
2025-09-20 08:13:51 +08:00
hrz 7fe40579b9 update:优化图片 2025-09-20 08:13:04 +08:00
欣南科技andGitHub 7e2782ce22 Merge pull request #2256 from xinnan-tech/update_doc
update:架构图增加mqtt
2025-09-20 08:04:30 +08:00
hrz 1fbe8dab77 update:架构图增加mqtt 2025-09-20 08:04:00 +08:00
欣南科技andGitHub 89ef36711a Merge pull request #2255 from xinnan-tech/update-version
update:推出0.8.2
2025-09-20 01:32:28 +08:00
hrz 0ba3e2c964 update:推出0.8.2 2025-09-20 01:31:48 +08:00
LiJinHui 0aec742bd3 格式统一 2025-09-19 18:33:54 +08:00
LiJinHui a6f5d868dd 格式调整 2025-09-19 18:18:18 +08:00
FAN-yeB 966d8a8a84 update:xunfei asr 2025-09-19 17:54:52 +08:00
LiJinHui 611d1a65e7 Update index.js
权限调整
2025-09-19 17:53:43 +08:00
LiJinHui b23e31bb4b Delete DefaultRoleDialog.vue
删除多余文件
2025-09-19 17:41:11 +08:00
Sakura-RanChen bec1c7b88f update: 增加讯飞双流式TTS 2025-09-19 17:29:09 +08:00
LiJinHui 5d407b9227 调整模版排序的漏洞 2025-09-19 17:18:24 +08:00
CGDandGitHub e5bc029d87 Merge pull request #2252 from xinnan-tech/manager-web-fix
updata:删除多余的isEnglish方法
2025-09-19 16:06:39 +08:00
LiJinHui 608abb7dc3 调整页面 2025-09-19 15:41:28 +08:00
LiJinHui 5fcc7592c9 优化代码,调整权限设置( 非管理员打开提示拒绝访问并自动跳转到首页),修复bug; 2025-09-19 15:34:43 +08:00
rainv123 3fb925f13d updata:删除多余的getServerList方法,删除重复定义的computed块 2025-09-19 11:37:24 +08:00
rainv123 4e958ce57c updata:删除多余的isEnglish方法 2025-09-19 11:15:11 +08:00
rainv123 7f6ce89e39 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-19 09:33:47 +08:00
欣南科技andGitHub 71274cf0a3 Merge pull request #2249 from xinnan-tech/hot-fix
update:优化未配置mqtt网关时的显示
2025-09-18 19:08:56 +08:00
hrz 58127cdfdc update:优化未配置mqtt网关时的显示 2025-09-18 19:08:24 +08:00
LiJinHui 09d5d37867 完善导航栏的语言切换 2025-09-18 16:54:00 +08:00
LiJinHui 6a8c4ccbf8 添加国际化的功能,调整页面 2025-09-18 16:43:52 +08:00
hrzandGitHub 6d7bbfca95 Merge pull request #2247 from xinnan-tech/mqtt-call
Mqtt 远程工具调用
2025-09-18 15:02:45 +08:00
hrzandGitHub 3de39c8cdc Merge branch 'main' into mqtt-call 2025-09-18 15:02:32 +08:00
3030332422 387398a069 update:添加多语言支持并增强搜索功能 2025-09-18 14:42:03 +08:00
3030332422 f17011939c update:优化设备工具调用界面与执行结果展示体验 2025-09-18 10:56:41 +08:00
rainv123 9b6f564d30 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-18 10:54:30 +08:00
rainv123andGitHub e23989add0 Merge pull request #2239 from xinnan-tech/py_AliBL_TTS
update: 阿里百炼流式TTS 减少调试日志显示
2025-09-18 10:22:42 +08:00
LiJinHui a199e47701 页面布局调整 2025-09-18 09:35:03 +08:00
3030332422 4f64316144 update: 实现设备工具动态调用和执行功能 2025-09-17 17:40:20 +08:00
rainv123 68e10f42f8 Merge branch 'py_AliBL_TTS' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-17 17:02:47 +08:00
FAN-yeBandGitHub 3d1cae4692 Merge pull request #2242 from xinnan-tech/manager-api-msg-i18n
updata:实现后端msg的国际化处理,修改用户注册页面和添加模型页面的硬编码为国际化键名
2025-09-17 16:46:45 +08:00
3030332422 31e84dadd1 update:动态获取设备工具列表并优化显示逻辑 2025-09-17 16:25:46 +08:00
LiJinHui c331b8322c 新增调整角色模版的功能 2025-09-17 15:38:23 +08:00
rainv123 ba4423684b Merge branch 'manager-api-msg-i18n' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-17 15:36:31 +08:00
rainv123 62eaf46f34 updata:实现后端msg的国际化处理,修改用户注册页面和添加模型页面的硬编码为国际化键名 2025-09-17 15:35:21 +08:00
FAN-yeB 3767bf8c81 更新 messages.properties 2025-09-17 15:31:54 +08:00
rainv123 300a33ddc2 fix:智能体添加设备页面的按钮文字修正 2025-09-17 14:10:07 +08:00
rainv123 34d7bd92ca updata:实现后端msg的国际化处理,修改用户注册页面和添加模型页面的硬编码为国际化键名 2025-09-17 11:36:25 +08:00
3030332422 44e7380c6b update: 添加设备管理页面实时在线状态显示功能 2025-09-17 11:36:20 +08:00
FAN-yeB 15ca08ce14 update:接口 2025-09-17 10:04:19 +08:00
hrzandGitHub 83b88eeaa0 Merge pull request #2240 from myifeng/prompt-device-id
添加设备ID信息到提示词
2025-09-16 18:21:02 +08:00
Chingfeng Li 290c92ee39 添加设备ID信息到提示词 2025-09-16 17:42:15 +08:00
Sakura-RanChen c2985c0db3 update: 阿里百炼流式TTS 减少调试日志显示
fix: 音频发送误差修正
2025-09-16 17:07:00 +08:00
Sakura-RanChenandGitHub 334dfc7917 Merge pull request #2231 from qingshuiyuyu/bugfix
修复-火山双流式语音合成-additions参数配置
2025-09-16 10:43:45 +08:00
hrz 03b51f73e7 update:远程工具调用面板 2025-09-16 00:06:57 +08:00
欣南科技andGitHub af079d6c18 Merge pull request #2236 from xinnan-tech/mqtt-sign-key
update:mqtt密钥禁止包含弱密码
2025-09-15 21:32:05 +08:00
hrz 99008cf813 update:mqtt密钥禁止包含弱密码 2025-09-15 21:31:22 +08:00
CGDandGitHub 5fcb670821 Merge pull request #2233 from xinnan-tech/manage-web-i18n-fix
fix:优化智控台页面的多语言支持
2025-09-15 14:49:38 +08:00
hrzandGitHub 3bdf8e20c7 Merge pull request #2232 from xinnan-tech/py_fix_index
fix: 参数修正
2025-09-15 13:20:16 +08:00
rainv123 e8d44b13cf fix:优化智控台页面的多语言支持 2025-09-15 11:32:57 +08:00
Sakura-RanChen c6a7871e5b fix: 参数修正 2025-09-15 10:33:56 +08:00
shiyin 4c9824b16f 修复-火山双流式语音合成-additions参数配置 2025-09-15 09:46:07 +08:00
CGDandGitHub 3e54a3272a Merge pull request #2229 from kerenskiy/patch-1
Update requirements.txt
2025-09-15 09:04:57 +08:00
kerenskiyandGitHub 8851406f84 Update requirements.txt
Fix VoskASR dependencies
2025-09-14 20:18:40 +03:00
欣南科技andGitHub fe85ea049a Merge pull request #2224 from xinnan-tech/hot-fix
update:mqtt密钥复杂度校验
2025-09-13 10:19:37 +08:00
hrz 221c01e642 update:mqtt密钥复杂度校验 2025-09-13 10:18:41 +08:00
欣南科技andGitHub 753aa280f6 Merge pull request #2223 from xinnan-tech/hot-fix
fix:保存完参数后,按钮还在saving状态的bug
2025-09-13 09:22:41 +08:00
hrz 64f3062eb2 fix:保存完参数后,按钮还在saving状态的bug 2025-09-13 09:22:11 +08:00
欣南科技andGitHub f5143d60b7 Merge pull request #2221 from xinnan-tech/i18n-update
update:优化英文显示
2025-09-13 00:49:12 +08:00
hrz e9fb36bf8f update:优化英文显示 2025-09-13 00:47:48 +08:00
欣南科技andGitHub 11e8736e66 Merge pull request #2219 from xinnan-tech/i18n-update
Bump to v0.8.1
2025-09-12 20:52:52 +08:00
hrz 30ce36b169 Bump to v0.8.1 2025-09-12 20:52:20 +08:00
欣南科技andGitHub 1541128e03 Merge pull request #2218 from xinnan-tech/i18n-update
update:优化英文显示
2025-09-12 18:44:32 +08:00
hrz 9d808ec733 update:优化英文显示 2025-09-12 18:43:40 +08:00
欣南科技andGitHub 8f526820a8 Merge pull request #2217 from xinnan-tech/i18n-update
update:优化英文显示
2025-09-12 18:33:45 +08:00
hrz c0689c6916 update:优化英文显示 2025-09-12 18:33:14 +08:00
欣南科技andGitHub 893872e509 Merge pull request #2216 from xinnan-tech/manager-web-i18n
Manager web i18n
2025-09-12 18:11:15 +08:00
hrz 2c4b92f941 Merge branch 'main' into manager-web-i18n 2025-09-12 18:09:58 +08:00
hrz 21cc1153b0 update:优化显示 2025-09-12 18:09:09 +08:00
CGDandGitHub 3c35380e9d Merge pull request #2215 from xinnan-tech/manager-web-i18n
fix:修复用户管理页面多语言支持的问题
2025-09-12 17:56:06 +08:00
rainv123 2b65cfd369 fix:修复用户管理页面多语言支持的问题 2025-09-12 17:43:22 +08:00
CGDandGitHub 8a44aaa7f9 Merge pull request #2211 from xinnan-tech/manager-web-i18n
updata:智控台页面添加语言切换,支持中英繁
2025-09-12 16:55:53 +08:00
rainv123 4e0bf5542c updata:智控台页面添加语言切换,支持中英繁 2025-09-12 16:14:44 +08:00
rainv123 f788e45bc1 updata:智控台页面添加语言切换,支持中英繁 2025-09-12 15:11:56 +08:00
rainv123 5b4381c257 updata:智控台页面添加语言切换,支持中英繁 2025-09-12 11:41:31 +08:00
rainv123 7396605844 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-09-12 11:36:24 +08:00
hrzandGitHub b0308af05d Merge pull request #2210 from xinnan-tech/pertext
update:更新流式ASR首词延迟测试工具
2025-09-11 18:01:32 +08:00
rainv123 98a1483032 updata:智控台页面添加语言切换,支持中英繁。 2025-09-11 17:10:50 +08:00
FAN-yeB 07242dbfc0 update:更新流式ASR首词延迟测试工具 2025-09-11 16:32:07 +08:00
hrzandGitHub a9b0775469 Merge pull request #2195 from myifeng/upgrade-requirements
更新一些常用依赖库
2025-09-11 15:06:17 +08:00
hrzandGitHub 26a49ba34c numpy1.26.4和tourch2.2.2兼容,其他版本与兼容性问题 2025-09-11 14:56:53 +08:00
hrzandGitHub f3431ea977 Merge pull request #2203 from xinnan-tech/py_fix_intentllm
fix:修复LLM意图识别的若干问题
2025-09-11 14:46:10 +08:00
3030332422 f0a7ee1c0c fix:修复LLM意图识别 2025-09-11 14:38:27 +08:00
欣南科技andGitHub ad5f085c1f Merge pull request #2208 from xinnan-tech/update_doc
fix:补充文档链接
2025-09-11 13:50:18 +08:00
hrz e7f5f5da34 fix:补充文档链接 2025-09-11 13:49:42 +08:00
欣南科技andGitHub d10b632875 Merge pull request #2207 from xinnan-tech/update_doc
update:添加mqtt网关架设教程
2025-09-11 13:47:38 +08:00
hrz 8dd39c5a5b update:添加mqtt网关架设教程 2025-09-11 13:46:35 +08:00
hrzandGitHub cdd1345c19 Merge pull request #1759 from xinnan-tech/mqtt
Mqtt gateway function
2025-09-10 22:32:37 +08:00
hrzandGitHub 84067a1f57 Merge branch 'main' into mqtt 2025-09-10 22:30:25 +08:00
hrz 26fd3110b4 update:优化代码 2025-09-10 22:20:43 +08:00
hrz 5bd78cac1a update:优化代码 2025-09-10 21:40:25 +08:00
3030332422 0738c52d14 fix:修复LLM意图识别的若干问题 2025-09-10 18:00:39 +08:00
FAN-yeB c93cb3bb52 Reapply "Merge branch 'mqtt' of https://github.com/xinnan-tech/xiaozhi-esp32-server into mqtt"
This reverts commit eea7689c3d.
2025-09-10 17:51:45 +08:00
FAN-yeB eea7689c3d Revert "Merge branch 'mqtt' of https://github.com/xinnan-tech/xiaozhi-esp32-server into mqtt"
This reverts commit 7b9e34c3e5, reversing
changes made to f81be33539.
2025-09-10 17:48:31 +08:00
FAN-yeB 7b9e34c3e5 Merge branch 'mqtt' of https://github.com/xinnan-tech/xiaozhi-esp32-server into mqtt 2025-09-10 17:47:13 +08:00
FAN-yeB f81be33539 优化mqtt启用 2025-09-10 17:46:55 +08:00
hrzandGitHub 21a1cb65fc Merge pull request #2202 from xinnan-tech/mqtt2
update:优化智控台参数名称
2025-09-10 17:39:24 +08:00
hrz ef02a01439 update:优化智控台参数名称 2025-09-10 17:38:29 +08:00
hrz 0b22f4bbd2 Merge branch 'mqtt2' into mqtt
# Conflicts:
#	main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
#	main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java
#	main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java
#	main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java
#	main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
2025-09-10 12:30:52 +08:00
hrzandGitHub 9f8ae62ebb Merge pull request #2197 from ifnofi/tts_aliyun_cosyvoice
添加阿里云CosyVoice 和 修复文件编码
2025-09-10 11:54:00 +08:00
hrzandGitHub cec71a28eb 已有阿里云cosyvoice流式接口
已有阿里云cosyvoice流式接口,位于main/xiaozhi-server/core/providers/tts/aliyun_stream.py
2025-09-10 11:52:09 +08:00
hrzandGitHub 7d060e9994 Merge pull request #2194 from xinnan-tech/Qwen3_asr
update:更新Qwen-asr-flash语音识别
2025-09-10 11:42:51 +08:00
hrzandGitHub a3a6e889ee Merge branch 'main' into Qwen3_asr 2025-09-10 11:42:42 +08:00
ifnofi 80283db9bd 添加阿里云CosyVoice 和 修复文件编码
添加阿里云的CosyVoice功能
更新wakeup_word.py,在读写配置文件时指定UTF-8编码,以确保正确处理非ascii字符。
2025-09-10 11:17:56 +08:00
FAN-yeB 906a322675 更新Qwen3-ASR-Flash模型配置的说明文档 2025-09-10 11:10:34 +08:00
hrzandGitHub bc829d9ef0 Merge pull request #2170 from xinnan-tech/fix
fix:增加检测到手机浏览器跳转h5页面,修改h5页面图标
2025-09-09 22:52:03 +08:00
myifengandGitHub c5e6a46450 Update requirements.txt 2025-09-09 19:35:32 +08:00
FAN-yeB 77f0bdc4ca update:更新Qwen-asr-flash语音识别 2025-09-09 17:56:05 +08:00
CGDandGitHub 8b9f13283b Merge pull request #2186 from xinnan-tech/py_MinmaxStreamTTS_test
Py minmax stream tts test
2025-09-09 13:17:55 +08:00
CGDandGitHub c3c65708e0 Merge branch 'main' into py_MinmaxStreamTTS_test 2025-09-09 13:17:09 +08:00
3030332422 6bc64aa4aa update:删除非流式MiniMax TTS配置,保留流式版本 2025-09-09 11:38:55 +08:00
FAN-yeB eee907b1a2 兼容udp和websocket协议传输音频 2025-09-09 09:37:31 +08:00
hrzandGitHub ddd63f4136 Merge pull request #2190 from xinnan-tech/py_fix_voiceprint
update:声纹识别添加相似度阈值检查机制
2025-09-09 09:15:29 +08:00
CGDandGitHub b12c1efc90 Merge branch 'main' into py_fix_voiceprint 2025-09-08 18:13:51 +08:00
hrzandGitHub 01838f598c Merge pull request #2189 from myifeng/fix-voiceprint-enable
修正声纹识别开启校验
2025-09-08 17:57:07 +08:00
hrzandGitHub aef6d5dc1d 在不增加额外配置的情况下进行优化 2025-09-08 17:55:48 +08:00
hrzandGitHub 9262963f20 在不增加额外配置的情况下进行优化 2025-09-08 17:55:41 +08:00
Sakura-RanChenandGitHub d3e2aaacb9 Merge pull request #2126 from xinnan-tech/py_test
添加vosk
2025-09-08 17:47:04 +08:00
3030332422 755c81286c update:修改vosk 2025-09-08 17:35:18 +08:00
hrzandGitHub 9dd2d998e2 Merge branch 'main' into fix 2025-09-08 16:59:54 +08:00
Chingfeng Li abbb13161e Merge branch 'fix-voiceprint-enable' of https://github.com/myifeng/xiaozhi-esp32-server into fix-voiceprint-enable 2025-09-08 16:27:38 +08:00
Chingfeng Li 23dc6f1ea9 声纹识别功能开关 2025-09-08 16:26:39 +08:00
3030332422 8aed23f21a update:智控台添加相似度阈值配置 2025-09-08 16:25:08 +08:00
hrzandGitHub ae117e3579 Merge pull request #2188 from myifeng/weather-config
优化天气配置
2025-09-08 15:49:37 +08:00
Chingfeng Li 0d19c693a9 优化天气配置 2025-09-08 14:24:50 +08:00
hrzandGitHub 283e57ff71 Merge pull request #2165 from myifeng/sse-mcp-fix
优化SSE Client连接;增加SSE MCP示例
2025-09-08 13:28:25 +08:00
FAN-yeB eed9503391 mqtt 2025-09-08 11:04:42 +08:00
3030332422 d66db60177 update:修改声纹日志 2025-09-08 09:32:10 +08:00
3030332422 25d9e6c8cf update: 声纹识别添加相似度阈值检查机制 2025-09-07 15:30:04 +08:00
Sakura-RanChen a81f433228 update: 增加相关配置 2025-09-05 17:52:30 +08:00
3030332422 257e365299 Merge remote-tracking branch 'origin/main' into py_test 2025-09-05 14:56:08 +08:00
Sakura-RanChen 554afa3f46 Merge branch 'main' into py_MinmaxStreamTTS_test 2025-09-05 14:53:02 +08:00
欣南科技andGitHub d04ec9d510 Merge pull request #2181 from xinnan-tech/update_version
update:升级版本号
2025-09-05 13:59:14 +08:00
hrz 4a802e00e4 update:升级版本号 2025-09-05 13:58:26 +08:00
CGDandGitHub a7007f5ae2 Merge pull request #2178 from xinnan-tech/future
fix: 方法修正
2025-09-05 10:37:21 +08:00
Sakura-RanChen 2b3cacd5b0 fix: 方法修正 2025-09-05 10:31:47 +08:00
CGDandGitHub 49565b4b3c Merge pull request #2158 from xinnan-tech/future
Future
2025-09-05 10:16:39 +08:00
CGDandGitHub bd8ae27f92 Merge branch 'main' into future 2025-09-05 10:14:52 +08:00
rainv123andruoyemuzimi 3fe0b8b669 fix:修改手机浏览器访问web后台跳转至h5页面的逻辑 2025-09-05 10:09:32 +08:00
Sakura-RanChenandGitHub f0e0b97217 Merge pull request #2166 from xinnan-tech/py_test_texthandle
textHandle.py 消息解耦
2025-09-05 09:14:32 +08:00
rainv123andruoyemuzimi 67e07c916e docs:添加火山双向流式TTS+声音克隆配置教程 2025-09-04 16:37:28 +08:00
rainv123andruoyemuzimi b3a6ae2441 fix:增加检测到手机浏览器跳转h5页面,修改h5页面图标 2025-09-04 09:32:53 +08:00
Chingfeng Li 74f321a0fd 补充兼容方法和过期警告 2025-09-03 17:53:02 +08:00
hrzandGitHub 64c841d00a Merge pull request #2156 from xinnan-tech/py_fix_FishTTS
fix: 变量名冲突
2025-09-03 17:49:23 +08:00
Sakura-RanChen 5afa2fdc98 fix: 降低误判 2025-09-03 17:29:21 +08:00
Chingfeng Li 74bc5dbb7d 优化SSE Client连接;增加SSE MCP示例 2025-09-03 15:41:35 +08:00
CGDandGitHub 5c67f2ecfd Merge pull request #2162 from myifeng/main
textHandle.py 消息解耦
2025-09-03 14:02:40 +08:00
Sakura-RanChen 66f382039c fix: 打断时状态未回正,提示无法正确播报 2025-09-03 10:46:24 +08:00
Chingfeng Li 3cfc1cf97a textHandle.py 消息解耦 2025-09-03 09:43:34 +08:00
Sakura-RanChen b88b102d38 修改注解 2025-09-02 17:08:56 +08:00
Sakura-RanChen fa3ddc2e2b 去除无用变量 2025-09-02 17:06:19 +08:00
Sakura-RanChen f45bc5d9c9 优化音频 2025-09-02 15:24:51 +08:00
Sakura-RanChen 79956ade97 fix: 变量名冲突 2025-09-02 14:36:13 +08:00
Sakura-RanChen b9df6d4ad2 fix: 优化 2025-09-02 14:34:26 +08:00
hrzandGitHub fa79e2b379 Merge pull request #2153 from xinnan-tech/py_test_if
docs: 添加天气插件使用指南
2025-09-02 14:05:36 +08:00
hrzandGitHub 5db638c075 Update weather-integration.md 2025-09-02 14:04:42 +08:00
3030332422 0f0a0814b7 fix:补充 2025-09-02 12:45:51 +08:00
3030332422 a842f0688f fix:优化天气插件指南 2025-09-02 12:36:04 +08:00
Sakura-RanChen c3c2e7c28e fix: 提示尾音播放和单模块第一次唤醒时等待tts初始化 2025-09-02 12:00:04 +08:00
3030332422 0364d1199b docs: 添加天气插件使用指南 2025-09-02 11:23:46 +08:00
Sakura-RanChen c428a9ddee fix: 唤醒机制 2025-09-02 11:18:04 +08:00
hrzandGitHub dba571727a Merge pull request #2149 from xinnan-tech/py_fix_news
fix:添加user-agent修复新闻403错误
2025-09-01 17:01:02 +08:00
3030332422 d31761e78a fix:添加user-agent修复新闻403错误 2025-09-01 16:08:51 +08:00
欣南科技andGitHub 63dfcde4c8 Merge pull request #2143 from xinnan-tech/update-doc
update:添加编译源
2025-08-31 08:07:23 +08:00
hrz 32e6ecf00d update:添加编译源 2025-08-31 08:06:41 +08:00
欣南科技andGitHub 2481509dc5 Merge pull request #2142 from xinnan-tech/update-doc
update:优化编译
2025-08-31 07:25:53 +08:00
hrz 44dd7fc58c update:优化编译 2025-08-31 07:25:14 +08:00
hrz 87f50e5253 update:更新支持的组件 2025-08-31 02:56:22 +08:00
欣南科技andGitHub bffed8bb8a Merge pull request #2141 from xinnan-tech/fix-tool-input-bg
update:修复mcp input样式污染其他input的bug
2025-08-31 00:00:30 +08:00
hrz ff3c0ab7ca update:修复mcp input样式污染其他input的bug 2025-08-30 23:58:11 +08:00
欣南科技andGitHub 6d0addf005 Merge pull request #2140 from xinnan-tech/rollback
update:流式优化暂不稳定,先回滚到早期代码
2025-08-30 23:03:18 +08:00
hrz 1520874432 update:升级版本号 2025-08-30 23:02:50 +08:00
hrz eaade698fb update:流式优化暂不稳定,先回滚到早期代码 2025-08-30 22:59:21 +08:00
欣南科技andGitHub b4f4995ff9 Merge pull request #2139 from xinnan-tech/py_wakeup_audio
Py wakeup audio
2025-08-30 18:15:40 +08:00
hrzandGitHub 76a7ac04c9 Merge branch 'main' into py_wakeup_audio 2025-08-30 18:15:09 +08:00
欣南科技andGitHub 3e1765a26d Merge pull request #2138 from xinnan-tech/update-doc
update:更换Demo视频连接
2025-08-29 13:48:42 +08:00
hrz 95b80f6bb1 update:更换Demo视频连接 2025-08-29 13:47:40 +08:00
hrzandGitHub caf5f3f04c Merge pull request #2134 from xinnan-tech/py_test_tts
update:AliAppLLM流式接口改造
2025-08-28 19:19:39 +08:00
Sakura-RanChen 41b8fac3aa update: 增加唤醒时声纹处理 ,1秒内发送至大模型 【需优化唤醒锁机制,中途会遭受打断(偶发),考虑忽略检测】 2025-08-28 17:58:23 +08:00
3030332422 f6f240bc4b update:AliAppLLM流式接口改造 2025-08-28 16:32:00 +08:00
欣南科技andGitHub a79d8d61e3 Merge pull request #2128 from xinnan-tech/ha-timeout
update:优化ha插件超时方法
2025-08-28 00:40:19 +08:00
hrz a5e748f775 update:优化ha插件超时方法 2025-08-28 00:39:43 +08:00
hrzandGitHub 0fc4edc431 Merge pull request #2114 from xinnan-tech/paddlespeech
update:更新paddlespeechtts供应器
2025-08-27 23:22:04 +08:00
3030332422 c82cf670de update:删去默认模型配置 2025-08-27 16:42:17 +08:00
3030332422 a3827aed6e fix:修改使用说明 2025-08-27 15:54:25 +08:00
3030332422 cc7ba0872c update:添加vosk 2025-08-27 14:39:05 +08:00
gitjianyuandGitHub 3378d2cd8f Merge pull request #2102 from Minamiyama/refactor/extract-streaming-context
refactor(audio): 将流式音频处理逻辑提取为独立类
2025-08-27 10:33:07 +08:00
hrzandGitHub e004a85f53 Merge pull request #2115 from xinnan-tech/py_fix_mcp
fix:修复“服务端mcp 未添加到 function 列表中”问题
2025-08-27 10:16:59 +08:00
Sakura-RanChen 91cd843cfe update: 恢复唤醒播放机制,待优化和改造(目前只有linkerai拥有正常保存唤醒音频to_tts) 2025-08-27 10:04:27 +08:00
FAN-yeB 880b669877 还原配置文件 2025-08-26 11:49:08 +08:00
FAN-yeB e53ba28c65 更新paddlespeechtts供应器 2025-08-26 11:47:52 +08:00
3030332422 bdb6d3c093 fix:修复“服务端mcp 未添加到 function 列表中” 2025-08-26 11:45:52 +08:00
FAN-yeB 9af77d0f47 更新paddlespeechtts供应器 2025-08-26 11:24:58 +08:00
FAN-yeB 15291bfcf2 更新paddlespeechtts供应器 2025-08-26 11:02:57 +08:00
FAN-yeB ae228f3b86 update:更新paddlespeechtts供应器 2025-08-26 10:33:38 +08:00
欣南科技andGitHub b8803f92e7 Merge pull request #2111 from xinnan-tech/duplicate-model
Duplicate model
2025-08-25 22:28:36 +08:00
hrzandGitHub 1515784700 Merge pull request #2104 from Minamiyama/feat/model-management/duplicate-model
feat(模型管理): 添加模型副本创建功能
2025-08-25 22:23:34 +08:00
hrzandGitHub 06e2909fda Merge pull request #2110 from myifeng/main
移除未使用的变量
2025-08-25 22:15:06 +08:00
hrzandGitHub 9012deeae7 Update connection.py 2025-08-25 22:14:41 +08:00
Chingfeng Li 31657e1dc0 移除未使用的变量 2025-08-25 18:26:55 +08:00
欣南科技andGitHub 5a08a41cc8 Merge pull request #2105 from xinnan-tech/update_doc
update:增加移动端贡献者信息
2025-08-25 09:22:20 +08:00
hrz 3e48d7e331 update:增加移动端贡献者信息 2025-08-25 09:21:48 +08:00
Minamiyama 5993470d3f feat(模型管理): 添加模型副本创建功能
在模型编辑对话框中增加副本创建功能,当选择创建副本时自动在原模型名称和代码后添加'_副本'后缀,并通过新增API接口保存为新模型
2025-08-24 23:40:54 +08:00
Minamiyama 18acec1a81 refactor(audio): 将流式音频处理逻辑提取为独立类
将原本内联在test_page.html中的流式音频处理逻辑重构为独立的StreamingContext类,提高代码可维护性和复用性
2025-08-24 11:31:30 +08:00
欣南科技andGitHub 701936326d Merge pull request #2100 from xinnan-tech/py_fix_audio
update:显示天气接口错误信息
2025-08-23 23:25:52 +08:00
hrz 5b7d613a35 update:显示天气接口错误信息 2025-08-23 23:25:19 +08:00
hrzandGitHub 0ce55ff7a4 Merge pull request #2099 from Minamiyama/refactor/audio-context-singleton
refactor(音频处理): 提取音频上下文创建逻辑到独立函数
2025-08-23 22:25:11 +08:00
欣南科技andGitHub 595edb6f80 Merge pull request #2094 from xinnan-tech/py_fix_audio
fix: 优化流控音频播放 wechat聊天模式错误STT消息发送
2025-08-23 22:23:59 +08:00
Minamiyama d4b75c5d99 refactor(音频处理): 提取音频上下文创建逻辑到独立函数
将重复的音频上下文创建逻辑提取到独立的getAudioContextInstance函数中,减少代码重复并统一音频上下文配置
2025-08-23 07:47:40 +08:00
Sakura-RanChen 1988bced60 fix: 优化流控音频播放 wechat聊天模式错误STT消息发送 2025-08-22 17:10:36 +08:00
hrzandGitHub 60f8dbf418 Merge pull request #2086 from xinnan-tech/ASRPerformanceTester
update:更新流式ASR首词等待时间测试工具
2025-08-21 11:58:31 +08:00
FAN-yeB a708382cfd update:更新流式ASR首词等待时间测试工具 2025-08-21 11:54:06 +08:00
hrzandGitHub 1d95e1420a Merge pull request #2080 from VanillaNahida/main
fix: 修复脚本获取不到ws和视觉分析接口地址的bug,更新README
2025-08-20 22:50:18 +08:00
hrzandGitHub e1bcff82e2 Merge pull request #2084 from xinnan-tech/py_fix_audio
Py fix audio
2025-08-20 16:28:54 +08:00
hrzandGitHub 216f1b701f Merge pull request #2082 from xinnan-tech/fix_mobile
fix:修复mcp地址显示慢,增加服务端地址校验
2025-08-20 16:27:06 +08:00
Sakura-RanChen 0ea18d87a3 fix: asr识别缺字现象,去除无用的变量 2025-08-20 16:22:32 +08:00
hrzandGitHub 6a79d57a93 Update docker-setup.sh 2025-08-20 14:42:46 +08:00
hrzandGitHub 31f596f96c Update docker-setup.sh
全模块部署,OTA地址是在8002端口
2025-08-20 14:41:22 +08:00
hrzandGitHub 7f99895116 Update Deployment_all.md 2025-08-20 14:38:51 +08:00
rainv123 789d756ce1 fix:修复mcp地址显示慢,增加服务端地址校验 2025-08-20 14:36:42 +08:00
hrzandGitHub 570fb29d3c Merge pull request #2081 from xinnan-tech/performance_tester
update:更新流式TTS首词耗时测试工具
2025-08-20 14:36:36 +08:00
FAN-yeB d7dc636d3f update:更新流式TTS测试工具 2025-08-20 14:30:47 +08:00
香草味的纳西妲喵andGitHub 67d3a8f94f Update Deployment_all.md 2025-08-20 14:07:46 +08:00
VanillaNahida 7d7b8ddfb1 fix: 修复脚本获取不到ws和视觉分析接口地址的bug
docs: 更新README说明
2025-08-20 14:00:53 +08:00
Sakura-RanChen 74826c1c59 fix 2025-08-20 09:30:43 +08:00
Sakura-RanChen 0676b87832 update: 增加MinMaxStreamTTS 2025-08-20 09:17:04 +08:00
hrzandGitHub d138e1dcef Merge pull request #2073 from xinnan-tech/web_fix_DeviceManagement
fix:修复设备管理页面全选功能失效问题
2025-08-19 17:24:43 +08:00
3030332422 372dc8ecb0 fix:修复设备管理页面全选功能失效问题 2025-08-19 14:45:14 +08:00
欣南科技andGitHub e8bfe9850e Merge pull request #2071 from xinnan-tech/fix-ota
fix: #2067 #2070 OTA和流控的音频bug
2025-08-19 00:20:46 +08:00
hrz ad50fbe3c9 fix: #2067 #2070 OTA和流控的音频bug 2025-08-19 00:19:41 +08:00
hrzandGitHub 61636dd085 Merge pull request #2068 from rainv123/fix-mobile-server
update:修复切换服务端地址无法生效,登陆界面右上角添加可跳转至设置页的按钮
2025-08-18 16:38:39 +08:00
rainv123andGitHub 5ea669be5a Update 删除无用代码行 2025-08-18 15:56:31 +08:00
rainv123 5260b62287 update:修复切换服务端地址无法生效,登陆界面右上角添加可跳转至设置页的按钮 2025-08-18 14:54:54 +08:00
欣南科技andGitHub 984a84edc1 Merge pull request #2061 from xinnan-tech/llm-tester
update:纠正教程错误描述
2025-08-17 14:15:31 +08:00
hrz 32548878e4 update:纠正教程错误描述 2025-08-17 14:14:25 +08:00
欣南科技andGitHub 093db56c98 Merge pull request #2058 from xinnan-tech/llm-tester
Llm tester
2025-08-17 11:13:47 +08:00
hrz a17f8518d6 update:优化推荐配置 2025-08-17 11:13:04 +08:00
hrz e9e9c5355d update:增加性能测试报告链接 2025-08-17 10:44:13 +08:00
hrz 61ee21d627 update:给LLM性能测试工具增加系统提示词,更符合本项目的实际效果 2025-08-17 09:35:06 +08:00
欣南科技andGitHub a86707f1ff Merge pull request #2056 from xinnan-tech/build-apk
update:回滚取消自动编译apk
2025-08-16 19:58:06 +08:00
hrz be42d80061 update:回滚取消自动编译apk 2025-08-16 19:57:34 +08:00
欣南科技andGitHub 16da6f9696 Merge pull request #2054 from xinnan-tech/dev-ops
update:优化自动部署脚本
2025-08-16 16:36:26 +08:00
hrz 427b0aa197 update:优化自动部署脚本 2025-08-16 16:35:26 +08:00
欣南科技andGitHub a2432d45cc Merge pull request #2052 from xinnan-tech/hot-fix
Hot fix
2025-08-16 15:07:53 +08:00
hrz f62b5d4f22 update:优化常见问题链接 2025-08-16 15:07:13 +08:00
hrz 001225c27b update:优化常见问题 2025-08-16 15:03:02 +08:00
欣南科技andGitHub 3e68f188fa Merge pull request #2051 from xinnan-tech/hot-fix
update:引导测试页面启动
2025-08-16 14:37:04 +08:00
hrz 2d75eb76f1 update:引导测试页面启动 2025-08-16 14:36:23 +08:00
欣南科技andGitHub bcc3ebb6bb Merge pull request #2050 from xinnan-tech/hot-fix
update:增加移动版智控台的说明
2025-08-16 11:39:04 +08:00
hrz 52c4e65686 update:增加移动版智控台的说明 2025-08-16 11:37:23 +08:00
欣南科技andGitHub 44a5afb8a2 Merge pull request #2049 from xinnan-tech/hot-fix
update:优化常见问题,梳理链接教程
2025-08-16 10:34:26 +08:00
hrz 3057d35111 update:优化常见问题,梳理链接教程 2025-08-16 10:33:28 +08:00
欣南科技andGitHub bdf99bc554 Merge pull request #2048 from xinnan-tech/hot-fix
update:优化测试工具目录结构
2025-08-16 10:10:17 +08:00
hrz e70415690c update:优化测试工具目录结构 2025-08-16 10:09:36 +08:00
hrzandGitHub 9b5e4eb9b7 Merge pull request #2039 from xinnan-tech/py_voiceprint_add_health
update:优化声纹识别,添加服务器健康检查机制避免运行时超时等待
2025-08-15 18:27:44 +08:00
hrzandGitHub e2324d3c37 Merge pull request #2044 from xinnan-tech/py_test_audio
Py test audio
2025-08-15 17:59:21 +08:00
hrzandGitHub c395c31e46 Merge pull request #2046 from xinnan-tech/xiaozhi-sercer-testPage
修复测试页面 打断对话多次可能导致无法发出声音的bug
2025-08-15 17:58:48 +08:00
JianYu Zheng 94662e17ba 优化:设置播放最短是0.3秒 2025-08-15 17:33:02 +08:00
3030332422 0bfa5cf723 update:feat: 为声纹识别添加缓存机制 2025-08-15 16:58:56 +08:00
Sakura-RanChen d2f29f335e update: 音频流式优化 2025-08-15 16:33:46 +08:00
JianYu Zheng 4423cb85c2 优化:优化播放逻辑去除多个方法共享属性导致的逻辑错误 2025-08-15 11:26:14 +08:00
CGDandGitHub 46fb997b52 Merge pull request #2035 from xinnan-tech/performance_text
update:更新各组件性能测试功能
2025-08-14 17:58:37 +08:00
3030332422 dcf8c134a2 update:优化声纹识别,添加服务器健康检查机制避免运行时超时等待 2025-08-14 17:57:46 +08:00
JianYu Zheng 7c0df908e9 优化:添加阻塞队列,优化缓存禁止 2025-08-14 14:44:52 +08:00
FAN-yeB 7bb76d7ced 更新 performance_test_tool.py 2025-08-14 10:39:53 +08:00
FAN-yeB 1cfb8de3a0 up:修改性能测试工具读取配置的目录 2025-08-14 10:31:31 +08:00
FAN-yeB 768d2b82d6 update:更新性能测试工具 2025-08-14 10:01:43 +08:00
rainv123andGitHub 7a4431d80c Merge pull request #2031 from xinnan-tech/update-paddlespeech
Update: paddlespeech配置
2025-08-13 16:02:44 +08:00
FAN-yeB 7e63e1d607 update:更新paddlespeech.py 2025-08-13 16:00:33 +08:00
FAN-yeB bda6c1e3ed update:paddlespeech配置 2025-08-13 15:59:48 +08:00
JianYu Zheng a9d116df2f 优化:拆分test_page.html一部分代码 2025-08-13 14:25:04 +08:00
欣南科技andGitHub e7c6c32d40 Merge pull request #2025 from xinnan-tech/openrz-patch-1
Update build-apk.yml
2025-08-12 13:55:04 +08:00
hrzandGitHub cdfe24fcdb Update build-apk.yml 2025-08-12 13:54:47 +08:00
欣南科技andGitHub a9199171df Merge pull request #2024 from xinnan-tech/openrz-patch-1
update:修改版本号
2025-08-12 13:41:17 +08:00
hrz 76b9542507 update:修改版本号 2025-08-12 13:40:40 +08:00
欣南科技andGitHub d30b6a8dcf Merge pull request #2023 from xinnan-tech/openrz-patch-1
Update build-apk.yml
2025-08-12 13:35:45 +08:00
hrzandGitHub 76b5ad1c99 Update build-apk.yml 2025-08-12 13:35:26 +08:00
欣南科技andGitHub 7840e83ada Merge pull request #2022 from xinnan-tech/build-apk
update:优化编译
2025-08-12 13:33:17 +08:00
hrz c4ac9da3e5 update:优化编译 2025-08-12 13:32:27 +08:00
Sakura-RanChenandGitHub 311e5d5cfd Merge pull request #1988 from myifeng/async-handler
调整OPUS函数式处理,不再以数组方式收集再遍历
2025-08-12 10:14:43 +08:00
JianYu Zheng a1f6795d44 优化:删除test_page.html无用的代码 2025-08-12 10:06:41 +08:00
欣南科技andGitHub f8a30ce261 Merge pull request #2021 from xinnan-tech/build-apk
update:测试自动编译apk
2025-08-12 08:52:41 +08:00
hrz ccfd15bda0 update:测试自动编译apk 2025-08-12 08:50:31 +08:00
hrzandGitHub a9610e6ee7 Merge pull request #2016 from xinnan-tech/py_huoshanTTS_AddConfig
update: huoshanTTS add config
2025-08-11 21:46:18 +08:00
hrz 733b36b869 update:补充参数说明 2025-08-11 21:45:32 +08:00
欣南科技andGitHub 70c3f9f929 Merge pull request #2020 from xinnan-tech/hot-fix
fix: #2014  Invalid bound statement (not found)
2025-08-11 21:27:07 +08:00
hrz 210bda15b8 update:更新版本号 2025-08-11 21:24:43 +08:00
hrz 93be1b3443 fix: #2014 Invalid bound statement (not found) 2025-08-11 21:23:00 +08:00
欣南科技andGitHub 533a001aeb Merge pull request #2018 from xinnan-tech/feature/mobile-app
Feature/mobile app
2025-08-11 20:49:04 +08:00
hrz 0b57d78732 update:增加h5的启动方法 2025-08-11 20:47:39 +08:00
hrzandGitHub dce9d1a1e2 Merge pull request #2015 from huangjunsen0406/feature/mobile-app
fix: 修复移动端app json文件丢失
2025-08-11 20:39:35 +08:00
JianYu Zheng 1cff39cec4 优化:拆分test_page.html,把一部分opus和document操作的代码提取出来,减少单个文件大小 2025-08-11 18:04:01 +08:00
JianYu Zheng c7392dcf5a 优化:拆分test_page.html,把一部分document操作的代码提取出来,减少单个文件大小,且把logger.js和xiaoZhiConnect.js也提取出来 2025-08-11 17:44:01 +08:00
Sakura-RanChen 3eb39ebef2 update: huoshanTTS add config 2025-08-11 17:38:17 +08:00
Junsen 041d8d5643 feat: 更新README文档,删除不再使用的请求配置文件,添加TypeScript配置文件,优化设置页面逻辑 2025-08-11 17:26:52 +08:00
JianYu Zheng 1c19046442 优化:拆分test_page.html,把一部分小智连接的代码提取出来,减少单个文件大小 2025-08-11 17:14:00 +08:00
Junsen 3d696aaa64 chore: 更新.gitignore以允许跟踪manager-mobile中的env和json文件;修改LICENSE版权信息;添加环境配置文件;新增manifest.json和pages.json以支持移动应用结构 2025-08-11 16:39:53 +08:00
JianYu Zheng 76516336af 优化:拆分test_page.html,把日志函数提取出来,减少单个文件大小 2025-08-11 16:20:46 +08:00
Junsen fc18677409 chore(gitignore): 允许跟踪 package.json 文件 2025-08-11 16:09:13 +08:00
Junsen 029d3730a8 chore(gitignore): allow tracking of package.json; add manager-mobile/package.json 2025-08-11 16:06:54 +08:00
hrz 8509e62114 update:调整文件夹 2025-08-11 15:48:28 +08:00
hrzandGitHub 6e8f9ca22e Merge pull request #2005 from huangjunsen0406/feature/mobile-app
feat: add complete mobile app project initial commit
2025-08-11 15:42:08 +08:00
Junsen dbc1a515d2 feat: 添加自定义标签组件,更新聊天记录和设备管理页面,优化请求配置 2025-08-11 15:14:23 +08:00
hrzandJunsen 70221e7f62 fix:保存记忆时出错 2025-08-11 15:14:23 +08:00
Sakura-RanChenandJunsen 28f921c38d update: 文档示例补充 2025-08-11 15:14:23 +08:00
hrzandJunsen 30a773601f 升级版本 2025-08-11 15:14:23 +08:00
Sakura-RanChenandJunsen 6cddd5c704 update: 补充安装文档 2025-08-11 15:14:23 +08:00
JianYu Zheng 709bc12b1c 优化:拆分test_page.html,css提取出来,减少单个文件大小 2025-08-11 14:24:06 +08:00
欣南科技andGitHub 171892a894 Merge pull request #2012 from xinnan-tech/py_fix_memory
fix:保存记忆时出错
2025-08-11 14:16:12 +08:00
hrz 535ab315d9 fix:保存记忆时出错 2025-08-11 14:15:34 +08:00
hrzandGitHub de28247b7e Merge pull request #2009 from xinnan-tech/py_IndexStreamTTS
update: 文档示例补充
2025-08-10 17:23:46 +08:00
Sakura-RanChen 6186eb753a update: 文档示例补充 2025-08-09 14:59:02 +08:00
欣南科技andGitHub a18bc85a9b Merge pull request #2008 from xinnan-tech/openrz-patch-1
升级版本
2025-08-09 11:44:03 +08:00
hrzandGitHub 806e4c398d 升级版本 2025-08-09 11:43:33 +08:00
hrzandGitHub a4f1abfa42 Merge pull request #2007 from xinnan-tech/py_IndexStreamTTS
update: 补充安装文档
2025-08-08 22:44:35 +08:00
Sakura-RanChen f2efd9718e update: 补充安装文档 2025-08-08 18:09:56 +08:00
Junsen 031c56e30b feat: 将配置中的名称更改为动态获取的环境变量VITE_APP_TITLE 2025-08-08 17:35:35 +08:00
Junsen 994715d9eb style: 优化移动端页面样式,调整组件布局,增强用户体验 2025-08-08 17:35:35 +08:00
Junsen 90f7af7afa feat: 初始化移动端项目 2025-08-08 17:35:35 +08:00
欣南科技andGitHub 2f3c466833 Merge pull request #2004 from xinnan-tech/py_IndexStreamTTS
Py index stream tts
2025-08-08 17:33:14 +08:00
hrz d742bca205 update:添加indextts 流式语音合成 2025-08-08 17:32:41 +08:00
Sakura-RanChen 8e51d52155 update: 增加单模块IndexTTS 2025-08-08 16:55:17 +08:00
hrzandGitHub a1c4f72470 Merge pull request #2002 from xinnan-tech/manager-api-springdoc
修复api接口文档页面,接口文档和点击按钮的说明不一致,串标题的bug
2025-08-08 14:46:30 +08:00
欣南科技andGitHub 2c11bba25e Merge pull request #2003 from xinnan-tech/update-doc
update:添加新场景
2025-08-08 13:08:26 +08:00
hrz 42a5b4fae7 update:添加新场景 2025-08-08 13:07:21 +08:00
JianYu Zheng a61aedc906 修复api接口文档页面,接口文档和点击按钮的说明不一致,串标题的bug
--pom.xml
1.升级了springdoc 2.8.8, knife4j4.6 与 doc2.7.7版本存在兼容问题,按照官方建议升级到2.8.8 解决了此bug
2.升级了 commons-lang3 3.18.0,springdoc 2.8.8 依赖commons-lang低版本存在CVE-2025-48924漏洞,升级版本解决
2025-08-08 11:55:08 +08:00
FAN-yeBandGitHub 7b72d517ab Merge pull request #1997 from xinnan-tech/rainv123-patch-1
feat:paddlespeech tts服务实现
2025-08-08 11:08:22 +08:00
FAN-yeB 1c43295fbc Merge branch 'rainv123-patch-1' of https://github.com/xinnan-tech/xiaozhi-esp32-server into rainv123-patch-1 2025-08-08 11:05:39 +08:00
FAN-yeB 747c432ea3 update:paddlespeech tts服务配置教程文档 2025-08-08 11:00:31 +08:00
rainv123andGitHub 235bdba42a paddlespeech-deploy.md
PaddleSpeechTTS服务集成xiaozhi服务
2025-08-08 10:59:07 +08:00
hrzandGitHub b3f603732e Merge pull request #1915 from YourKnight1/main
调整PaddleSpeechTTS流式传输
2025-08-07 23:42:16 +08:00
rainv123andGitHub 6091eae7fc paddlespeech-deploy.md
本地部署xiaozhi调用paddlespeechTTS服务
2025-08-07 17:07:52 +08:00
rainv123andGitHub ef36ad1ec1 paddlespeech-deploy.md 2025-08-07 16:50:10 +08:00
rainv123andGitHub f832611d41 Create paddlespeech-deploy.md
PaddleSpeechTTS流式传输集成到xiaozhi服务
2025-08-07 16:19:06 +08:00
Chingfeng Li 4d50eeb830 修正self错误 2025-08-06 14:53:59 +08:00
Chingfeng Li abf1fa0ef4 调整子类 2025-08-06 11:34:57 +08:00
Chingfeng Li 903c0e51ee 修正剩余文本 2025-08-06 10:13:42 +08:00
Chingfeng Li ce6a711c8e 调整流控参数优化 2025-08-06 10:09:28 +08:00
Chingfeng Li 095fe72db0 待完善流控方式 2025-08-05 18:35:37 +08:00
Chingfeng Li 1b6cd01eaf 增加流式处理方法 2025-08-05 14:53:52 +08:00
Chingfeng Li ac1e19f621 调整流式处理opus 2025-08-05 14:10:55 +08:00
Chingfeng Li faf2890695 增加流式处理 2025-08-04 17:04:46 +08:00
Chingfeng Li 75f0773247 增加流式处理Opus 2025-08-04 14:00:41 +08:00
Chingfeng Li 8b81b918cc 移除未使用的total_duration返回值 2025-08-04 13:49:12 +08:00
欣南科技andGitHub 5fe91a80fa Merge pull request #1976 from xinnan-tech/docker-install
Docker install
2025-08-03 16:20:49 +08:00
hrz 6f3dee74be update:优化自动docker全模块懒人脚本说明 2025-08-03 16:09:32 +08:00
hrzandGitHub 9391e8cc1a Merge pull request #1949 from VanillaNahida/main
refact: 重写了Docker全量部署的脚本的实现,支持一键安装一键配置一键更新镜像
2025-08-02 08:56:19 +08:00
hrzandGitHub 8aa5537029 Merge pull request #1963 from myifeng/fix-tts-message
移除无用的TTS消息
2025-08-02 08:55:12 +08:00
Chingfeng Li f40c3ec0f6 恢复sentence_start判断 2025-07-31 16:59:52 +08:00
hrzandGitHub 408143e55e Merge pull request #1962 from zebbingo/main
fix: bug state.type -> state['type']
2025-07-31 16:30:13 +08:00
Chingfeng Li 71eef4693d 仅在首句发送TTS消息 2025-07-31 14:15:39 +08:00
Han WuandGitHub 0b7814882d Merge pull request #1 from zebbingo/codex/find-and-fix-important-codebase-bug
Fix bug in hass_set_state plugin
2025-07-31 13:50:14 +08:00
Han Wu 99cf26ee9e Fix Home Assistant state handler 2025-07-31 13:38:46 +08:00
hrzandGitHub 775f754ff3 Merge pull request #1953 from yaotutu/feature/sherpa-paraformer-support
feat: 添加 Sherpa-ONNX Paraformer 模型支持
2025-07-31 13:35:03 +08:00
hrzandGitHub b6ee2dee68 Delete docs/sherpa-paraformer-guide.md 2025-07-31 13:34:17 +08:00
Chingfeng Li ef25e82544 移除无用的tts消息sentence_end 2025-07-31 13:21:29 +08:00
hrzandGitHub 14b7631dd6 Merge pull request #1958 from pursue-wind/fix_qwen_functioncall_err
fix: 修复qwen模型返回toolcall的arguments为None时导致后续请求400
2025-07-30 20:31:36 +08:00
hrzandGitHub ef0099b3c9 Update connection.py 2025-07-30 20:31:17 +08:00
VanillaNahida 38d60affce Docker安装镜像改为国内镜像源 2025-07-30 18:55:54 +08:00
chan c8a2c9bbd4 fix: 修复qwen模型返回toolcall的arguments为None时导致后续请求400 2025-07-30 18:53:48 +08:00
hrzandGitHub 9c2084b62e Merge pull request #1955 from xinnan-tech/py_fix_time
fix: 时间被固定
2025-07-30 17:33:01 +08:00
yaotutu 9edd083411 feat: 添加 Sherpa-ONNX Paraformer 模型支持
- 在 sherpa_onnx_local.py 中添加 model_type 参数,支持 paraformer 和 sense_voice 两种模型类型
- 在 config.yaml 中添加 SherpaParaformerASR 配置示例
- 添加详细的 Paraformer 使用文档 (docs/sherpa-paraformer-guide.md)
- 保持向后兼容,默认使用 sense_voice 模型

这个改动允许用户在低性能设备(如 RK3566)上使用更轻量的 Paraformer 模型,
相比 SenseVoice (894MB),Paraformer-small (78MB) 可以提供 4-6 倍的识别速度提升。
2025-07-30 10:41:27 +08:00
VanillaNahida 80e8ecc4f4 refact: 重写了Docker全量部署的脚本的实现,支持一键安装一键配置一键更新镜像 2025-07-30 03:00:37 +08:00
Sakura-RanChen e5d3048fb2 fix: 时间被固定 2025-07-29 09:55:32 +08:00
hrzandGitHub 67c4622ca7 Merge pull request #1935 from myifeng/aliyun-internal
如果配置的是ECS内网地址,则使用ws协议,默认是wss协议
2025-07-29 08:59:34 +08:00
欣南科技andGitHub 121f1c4698 Merge pull request #1936 from xinnan-tech/hot-fix
update:优化最后活动时间
2025-07-28 22:40:21 +08:00
hrz ff9fb9eb1b update:优化最后活动时间 2025-07-28 22:38:48 +08:00
Chingfeng Li b07a8796ff 阿里云ECS内网访问协议设置 2025-07-28 17:06:53 +08:00
hrzandGitHub 8ad5ff457e Merge pull request #1932 from xingxinonline/fix/manager-api-voice-print
fix: 增加时间排序,修复增加声纹注册获取对话记录不是最新对话的问题
2025-07-28 15:14:04 +08:00
gitjianyuandGitHub 99f6209c57 Update AgentChatHistoryServiceImpl.java
添加降序排序,
1.改用id的原因:数据形式,id越大的创建时间就越晚,所以使用id的结果和创建时间降序排列结果一样
 2.id作为降序排列的优势,性能高,有主键索引,不用在排序的时候重新进行排除扫描比较
2025-07-28 14:12:42 +08:00
gitjianyuandGitHub 1b3a55b105 Update VoicePrintDialog.vue
删除监听智能体id的,从原先的打开声纹页面获取一次对话,改为每次打开增加修改页面,从新获取一次新的对话信息
2025-07-28 13:58:06 +08:00
醒心onlineandGitHub 8b59a94324 Merge branch 'xinnan-tech:main' into fix/manager-api-voice-print 2025-07-28 12:01:41 +08:00
xingxinonline b17f20eece feat: 在对话框可见性变化时获取最近的50条记录 2025-07-28 11:51:45 +08:00
xingxinonline d9062a0bb0 fix: 增加时间排序,修复增加声纹注册获取对话记录不是最新对话的问题
https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/1922
2025-07-28 11:20:39 +08:00
欣南科技andGitHub 6066c20676 Merge pull request #1923 from xinnan-tech/update-version
update:升级版本号
2025-07-26 11:47:15 +08:00
hrz 1c7ba50def update:升级版本号 2025-07-26 11:46:11 +08:00
hrzandGitHub e53b24ef47 Merge pull request #1901 from xinnan-tech/py_test_tts
Py test tts
2025-07-25 22:17:59 +08:00
hrz 1a978abcc1 update: MinimaxTTSHTTPStream和MinimaxTTSWebSocketStream还在测试,测试完再开放 2025-07-25 22:11:30 +08:00
hrzandGitHub b91f4e4281 Merge pull request #1911 from xinnan-tech/manager-api-agent-optimize
优化
2025-07-25 21:47:54 +08:00
hrz 86978329eb update:优化逻辑 2025-07-25 21:47:21 +08:00
欣南科技andGitHub 337ecf0efe Merge pull request #1918 from xinnan-tech/update-doc
update:调整位置
2025-07-25 11:38:06 +08:00
hrz 4c3eb90bfc update:调整位置 2025-07-25 11:37:29 +08:00
欣南科技andGitHub 018a0422b7 Merge pull request #1916 from xinnan-tech/update-doc
update:更新全模块关系图
2025-07-25 11:29:56 +08:00
hrz f18ac169fa update:更新全模块关系图 2025-07-25 11:29:23 +08:00
root 04746961f2 调整PaddleSpeechTTS流式传输 2025-07-25 10:09:04 +08:00
JianYu Zheng 3939c81044 添加:删除模型的验证
--ModelConfigServiceImpl.java 删除视觉模型时,如果引用了,就不能删除
2025-07-24 17:13:05 +08:00
JianYu Zheng fdbe5fa556 添加了修改模型配置验证
--ModelConfigServiceImpl.java 修改模型,jsonConfig 里包括llm,校验一下llm是否时在LLM模型里,并且这个模型的供应器类型只能是openai和ollama类型
2025-07-24 17:01:43 +08:00
hrz dff8b8ccec Merge branch 'main' into py_test_tts 2025-07-24 16:18:39 +08:00
JianYu Zheng 8d11b47241 添加了新请求接口,大语言模型和意图参数关系的选择判断
--model.js 添加新接口方法
--roleConfig.vue 添加智能体配置,当选择的LLM不是openai、ollama类型时,意图模型不能选择“无意图识别“
2025-07-24 16:17:27 +08:00
hrz 78e5c52932 Merge branch 'main' into py_test_tts 2025-07-24 15:15:44 +08:00
CGDandGitHub 46c7759718 Merge pull request #1909 from xinnan-tech/py_fix_emoji
fix: 补充None值判断
2025-07-24 15:09:14 +08:00
Sakura-RanChen 2f5e8c2019 fix: 补充None值判断 2025-07-24 15:07:35 +08:00
hrz 2508d3f965 update:获取nginx转发的ip地址 2025-07-24 14:38:56 +08:00
hrzandGitHub 3699d28dd0 Merge pull request #1893 from Hmmrrr/main
feat:添加minimax单向双向流式
2025-07-24 14:18:19 +08:00
JianYu Zheng be7146fa89 添加新接口,获取llm模型基础模型信息
--LlmModelBasicInfoDTO.java 新的llm模型基础模型信息返回对象
--ModelConfigService.java
--ModelConfigServiceImpl.java
--ModelController.java
定义,实现,添加了接口。一个获取获取LLM模型信息的:信息内容包括id,名称,type
2025-07-24 11:50:15 +08:00
CGDandGitHub 66f4ea0a84 Merge pull request #1905 from xinnan-tech/py_fix_emoji
fix: LLM携带空文本时错误判断
2025-07-24 09:33:19 +08:00
Sakura-RanChen 84ff897b46 fix: LLM携带空文本时错误判断 2025-07-24 09:31:44 +08:00
JianYu Zheng 29c7b2a920 修改:保存智能体配置方法
--AgentServiceImpl.java 保存智能体配置方法,添加`大语言模型和意图识别是否符合匹配`的参数验证
2025-07-23 15:59:22 +08:00
Sakura-RanChen 83ded8458a Merge branch 'py_test_tts' of https://github.com/xinnan-tech/xiaozhi-esp32-server into py_test_tts 2025-07-23 14:40:14 +08:00
Sakura-RanChen e93053d412 fix: 文本重复发送 2025-07-23 14:35:59 +08:00
欣南科技andGitHub 2370936dfd Merge pull request #1899 from xinnan-tech/manager-api-mcp
优化获取请求mcp工具方法
2025-07-23 14:15:44 +08:00
JianYu Zheng 06bd7aed36 优化获取请求mcp工具方法
--JsonRpcTwo.java 添加JSON-RPC2.0 格式规范对象
--XiaoZhiMcpJsonRpcJson.java 添加小智mcp JSON-RPC 2.0 请求内容json 常量
--McpJsonRpcRequest.java 删除之前的mcp JSON-RPC2.0 构造对象
--AgentMcpAccessPointServiceImpl.java
优化思路,每次发送请求都要构造2次对象和转换2次json请求内容,且每次内容都一样,现在把最终转成的json请求内容存储为常量,所有请求共用这些常量,减少每次请求构造和转换
2025-07-23 11:56:36 +08:00
欣南科技andGitHub ff560a317c Merge pull request #1894 from xinnan-tech/update-doc
update:添加阿里云流式推荐
2025-07-22 18:22:05 +08:00
hrz 6892befa15 update:添加阿里云流式推荐 2025-07-22 18:21:09 +08:00
Hmmrrr fadf18b7fc feat:添加minimax单向双向流式 2025-07-22 18:13:05 +08:00
hrzandGitHub d9b632c031 Merge pull request #1892 from xinnan-tech/py_fix_mcp
update:添加Home Assistant插件超时处理和错误日志
2025-07-22 17:43:33 +08:00
hrzandGitHub 35fd4d2770 Merge pull request #1890 from xinnan-tech/manager-api-mcp
修复mcp工具太多会获取不到内容的bug
2025-07-22 16:45:05 +08:00
3030332422 1b8963f311 update:添加Home Assistant插件超时处理和错误日志 2025-07-22 16:28:12 +08:00
欣南科技andGitHub 710218b5b5 Merge pull request #1716 from xinnan-tech/py_test_tts
update:添加阿里云流式asr
2025-07-22 13:27:41 +08:00
hrz 60cbe1571c update:修复cosyvoice非流式合成方法 2025-07-22 13:25:54 +08:00
hrzandGitHub 6740d6a723 Merge pull request #1885 from xinnan-tech/py_prompt_emoji
Py prompt emoji
2025-07-21 23:18:30 +08:00
hrzandGitHub eb14e50941 Merge pull request #1882 from pupa880/main
添加最简化配置时配置声纹的教程
2025-07-21 23:14:08 +08:00
hrzandGitHub 37ac778ff4 Update voiceprint-integration.md 2025-07-21 23:13:45 +08:00
Sakura-RanChen bc5586a077 update: HuoshanTTS服务器资源释放 2025-07-21 17:46:22 +08:00
JianYu Zheng eb7ac93e72 修复mcp工具太多会获取不到内容的bug
--WebSocketClientManager.java
1.构建websocket对象的时候,添加可以设置缓冲区大小
2.断开连接的日志添加断开原因的内容
--AgentMcpAccessPointServiceImpl.java
1.设置每个websocket的缓冲区为1m,bug原因:缓存区太小,数据量太大,导致直接断开连接
2025-07-21 16:07:56 +08:00
pupa bf8a8bddf1 添加最简化配置时配置声纹的教程 2025-07-21 14:13:54 +08:00
hrz d1badcb28c update:修改版本号 2025-07-21 13:29:17 +08:00
hrz f6e79e17b7 update:更正cosyvoice大模型节点 2025-07-21 12:03:53 +08:00
Sakura-RanChen eead126f7a update: 表情由llm发送,长文本进行约束 2025-07-21 09:30:23 +08:00
hrzandGitHub e5ef61dfd3 Merge pull request #1873 from xinnan-tech/py_test
修复声纹识别场景下的意图识别问题、日志文件的补充
2025-07-20 20:23:29 +08:00
hrz eb130aa57f Merge branch 'py_test_tts' of https://github.com/xinnan-tech/xiaozhi-esp32-server into py_test_tts 2025-07-20 00:29:25 +08:00
hrz c9b10494d8 update:优化配置文件 2025-07-20 00:29:00 +08:00
3030332422 b8136ac1dc fix:修复阿里云流式ASR音频传递问题 2025-07-19 18:17:21 +08:00
3030332422 6d5b53fcd5 fix: 修复阿里云流式ASR终止协议缺失问题 2025-07-19 12:16:12 +08:00
hrz 5cf8eb5e71 update:优化OpenaiASR、GroqASR配置 2025-07-19 01:03:36 +08:00
3030332422 f037f4c7de fix: 修复声纹识别场景下的意图识别问题 2025-07-18 11:34:14 +08:00
3030332422 618be6d108 update:日志文件的补充 2025-07-17 16:08:13 +08:00
hrz 7fb028205f Merge branch 'main' into py_test_tts
# Conflicts:
#	main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
2025-07-17 14:32:50 +08:00
Sakura-RanChen a09e56bbfd Merge branch 'py_test_tts' of https://github.com/xinnan-tech/xiaozhi-esp32-server into py_test_tts 2025-07-17 11:43:49 +08:00
Sakura-RanChen c0c01a0285 数据集回滚 2025-07-17 11:42:51 +08:00
hrzandGitHub af0854a840 Merge pull request #1812 from xinnan-tech/openai-asr
OpenAI asr
2025-07-17 11:31:54 +08:00
hrzandGitHub f70652f165 Merge branch 'py_test_tts' into openai-asr 2025-07-17 11:31:44 +08:00
hrzandGitHub 7c440f47b6 Merge pull request #1852 from xinnan-tech/py_fix_DoubaoStreamASR
修复关于声纹识别的若干问题
2025-07-17 11:22:59 +08:00
hrzandGitHub 6967cc2293 Merge pull request #1855 from pursue-wind/fix_mcp_proxy_err
fix: 修复mcp-proxy命令不存在
2025-07-17 11:22:28 +08:00
hrzandGitHub 97ad1f6f22 Merge pull request #1856 from xinnan-tech/manager-api-mcp
修改智控台删除声纹,声纹服务不在线,无法删除的业务逻辑错误
2025-07-17 11:07:49 +08:00
JianYu Zheng f62f530f97 优化
--AgentVoicePrintServiceImpl.java
 1.重写了构造器引入系统配置线程池对象
 2.删除的时候异步处理删除声纹数据的方法,加快删除接口的返回
2025-07-17 10:49:51 +08:00
JianYu Zheng 815647ae02 补充日志
--AgentVoicePrintServiceImpl.java
2025-07-17 09:49:05 +08:00
JianYu Zheng ce1e3fb04d 修改业务逻辑
--AgentVoicePrintServiceImpl.java 删除声纹的时间,声纹服务不在线或者删除失败,都允许删除
2025-07-17 09:45:27 +08:00
chan 1a86828ae6 fix: 修复mcp-proxy命令不存在 2025-07-17 09:23:41 +08:00
3030332422 8831ea22b7 update:删去一些重复、不用的代码 2025-07-16 16:43:49 +08:00
3030332422 1a411da133 fix:修复FunASR多设备连接时声纹识别配置相互覆盖的问题 2025-07-16 15:42:21 +08:00
Sakura-RanChen e2a7534aa5 update: 优化相关处理 2025-07-16 15:03:53 +08:00
欣南科技andGitHub f8a92e1710 Merge pull request #1845 from xinnan-tech/manager-api-mcp
优化mcp错误提示
2025-07-15 18:36:45 +08:00
3030332422 953a232654 fix: 修复使用豆包流式ASR时,不能使用声纹识别功能的问题。 2025-07-15 18:13:01 +08:00
JianYu Zheng 4afa29554f 优化map错误提示
--AgentMcpAccessPointServiceImpl.java 优化提示
2025-07-15 15:44:43 +08:00
3030332422 dc78057823 fix:修复多模块部署时远程ASR声纹识别功能未初始化的问题 2025-07-15 14:52:56 +08:00
欣南科技andGitHub 53ca586847 Merge pull request #1826 from xinnan-tech/py_fix_log
fix:日志优化的补充
2025-07-15 14:40:54 +08:00
欣南科技andGitHub 4f7e96ed7d Merge pull request #1838 from xinnan-tech/update-doc
update:更新文档
2025-07-15 14:39:47 +08:00
hrz 0397ef3fad update:更新文档 2025-07-15 13:09:04 +08:00
欣南科技andGitHub aa38591d90 Merge pull request #1837 from xinnan-tech/update-doc
update:增加开发团队信息
2025-07-15 12:00:10 +08:00
hrz b87b82bec9 update:增加开发团队信息 2025-07-15 11:59:13 +08:00
hrzandGitHub 2e719e2ccc Merge pull request #1830 from hsycc/main
fix: 修复配置声纹识别地址为域名不带端口, 请求url错误的问题
2025-07-14 23:16:54 +08:00
hsycc 909b41174b fix: 修复配置声纹识别地址为域名不带端口, 请求url错误的问题 2025-07-14 20:13:48 +08:00
Sakura-RanChen 2c33ee5b32 update: 优化文本处理 2025-07-14 17:34:42 +08:00
3030332422 82beae0e59 fix:日志优化的补充 2025-07-14 07:28:05 +08:00
欣南科技andGitHub 7f979e2f52 Merge pull request #1820 from xinnan-tech/update-doc
update:补充声纹识别部署细节
2025-07-12 17:43:59 +08:00
hrz e94eb302a8 update:补充声纹识别部署细节 2025-07-12 17:43:27 +08:00
欣南科技andGitHub 8ffbb614f7 Merge pull request #1819 from xinnan-tech/update-doc
update:补充声纹服务启动的细节
2025-07-12 16:50:10 +08:00
hrz 7a589f4a7b update:补充声纹服务启动的细节 2025-07-12 16:49:32 +08:00
Sakura-RanChen 04ed5ed980 update: 同步非流式处理 10秒超时链接不复用 2025-07-11 18:04:00 +08:00
欣南科技andGitHub e37b094d1e Merge pull request #1813 from xinnan-tech/py_fix_log
Py fix log
2025-07-11 17:29:49 +08:00
欣南科技andGitHub a491ce96cb Merge branch 'main' into py_fix_log 2025-07-11 17:29:37 +08:00
hrz 7be79519b1 update:增加声纹识别演示视频 2025-07-11 17:23:13 +08:00
3030332422 47e4c0f190 fix:日志文件的优化 2025-07-11 16:44:50 +08:00
Sakura-RanChen 8e5d933745 update: 优化音频播放 文本发送 2025-07-11 16:36:47 +08:00
欣南科技andGitHub 6b24844172 Merge pull request #1810 from xinnan-tech/hot-fix
update:优化总结
2025-07-11 15:43:39 +08:00
hrz c6225f3ab8 update:优化总结 2025-07-11 15:42:46 +08:00
欣南科技andGitHub 60c4aa943b Merge pull request #1807 from xinnan-tech/hot-fix
add:声纹识别开启教程
2025-07-11 14:14:32 +08:00
hrz 81d0adf73c add:声纹识别开启教程 2025-07-11 14:13:39 +08:00
欣南科技andGitHub 7dc3929f0e Merge pull request #1806 from xinnan-tech/hot-fix
update:优化声纹识别有结果时内容的展示
2025-07-11 12:15:05 +08:00
hrz 09be3a4de3 update:优化声纹识别有结果时内容的展示 2025-07-11 12:14:25 +08:00
欣南科技andGitHub f7407e46c5 Merge pull request #1805 from xinnan-tech/hot-fix
update:修复二次声纹注册bug
2025-07-11 11:57:25 +08:00
hrz 8f685967d3 update:修复二次声纹注册bug 2025-07-11 11:49:53 +08:00
Sakura-RanChen 23cd453af8 update: aliyun双流改造 待优化长连接机制和文本生成反馈为空 2025-07-11 11:36:58 +08:00
欣南科技andGitHub 8f6dd22a6d Merge pull request #1804 from xinnan-tech/mangger-api-voice-print
声纹识别
2025-07-11 10:19:15 +08:00
hrz 108c87f395 update:优化提示词 2025-07-11 10:15:14 +08:00
hrz cd58b3a39a update:发行新版本 2025-07-11 09:14:34 +08:00
Sakura-RanChen 26a3b51162 fix: 补充文档 2025-07-10 16:07:06 +08:00
3030332422 2fbee33185 update:python对接声纹识别优化 2025-07-10 15:03:49 +08:00
hrz 6da3138814 Merge branch 'main' into py_test_tts 2025-07-10 13:47:53 +08:00
luruxian b2e6156bbb chore(db): 添加新的数据库变更集202507101201
添加新的数据库变更脚本202507101201.sql到变更日志中
2025-07-10 11:44:49 +08:00
luruxian fbd4a22e3e feat(asr): 添加OpenAI和Groq语音识别支持
新增GPT语音识别模型供应器和配置,实现语音转文本功能
更新相关文档说明,包含API申请步骤和使用注意事项
2025-07-10 11:41:20 +08:00
Sakura-RanChen dede73e9a5 fix: id一致 方法流程 2025-07-10 11:34:31 +08:00
JianYu Zheng f499040955 Merge remote-tracking branch 'origin/mangger-api-voice-print' into mangger-api-voice-print 2025-07-10 11:33:28 +08:00
JianYu Zheng 008c446966 添加判断
--AgentVoicePrintServiceImpl.java
 1.声纹音频保存,增加了保存前识别一下声纹是否有相似的声音,有则不保存
 2.声纹音频修改,增加了保存前识别一下声纹是否有相似的声音且相似声纹id和本次修改id不一样的,则不修改
 3.添加了识别声纹http的请求的方法
 --IdentifyVoicePrintResponse.java 识别声纹响应类型
2025-07-10 11:20:32 +08:00
Sakura-RanChen ce358dcd65 fix: 音频播放方法跟随主分支 2025-07-10 10:17:07 +08:00
hrz 01158e67e0 add:智控台返回声纹接口信息 2025-07-10 09:54:16 +08:00
Sakura-RanChen d533fb83eb fix: 插入报错修复,跟随主分支新增列 2025-07-10 09:52:54 +08:00
f4cfa04954 update: TTS复用链接,VAD双阈值判断 (#1742)
* update: TTS复用链接,VAD双阈值判断

* fix: 播放音乐时,引导词卡顿

* update:优化引导词

* update: 优化chat函数流程 优化huoshan处理 会话保持一致性

* fix: 等待时可能已经完成(设置为None),后续对None错误访问

* update:增加书名号

* fix: 打断状态未重置 监听未完成时服务端可能还在发送数据 此时复用链接会接收上个语音的残余 需要两者一同关闭

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-07-09 18:34:04 +08:00
JianYu Zheng ae4387ce3f Merge remote-tracking branch 'origin/mangger-api-voice-print' into mangger-api-voice-print 2025-07-09 18:12:27 +08:00
JianYu Zheng a64b495083 增加判断
--AgentVoicePrintServiceImpl.java 添加,修改声纹音频的是增加了验证这个音频是否属于这个智能体
2025-07-09 17:31:34 +08:00
JianYu Zheng 81cdd0a211 添加新接口和2个新方法
--AgentChatHistoryService.java 添加‘根据音频数据ID获取聊天内容’和‘查询此音频id是否属于此智能体’的方法定义
--AgentChatHistoryServiceImpl.java 实现2个新方法
--AgentController.java 增加一个获取音频内容的接口
2025-07-09 17:29:36 +08:00
Sakura-RanChen 6bfb5f1340 Merge branch 'py_link_huoshan' of https://github.com/xinnan-tech/xiaozhi-esp32-server into py_link_huoshan 2025-07-09 17:05:02 +08:00
Sakura-RanChen 2625133f40 fix: 打断状态未重置 监听未完成时服务端可能还在发送数据 此时复用链接会接收上个语音的残余 需要两者一同关闭 2025-07-09 17:04:42 +08:00
hrzandGitHub 38409b4200 Merge pull request #1755 from xinnan-tech/py_test
update:python单模块部署声纹识别对接
2025-07-09 16:51:26 +08:00
hrzandGitHub 29b4d0daeb Merge branch 'mangger-api-voice-print' into py_test 2025-07-09 16:51:10 +08:00
hrz 8f4f9fe19a update:优化提示词 2025-07-09 16:30:10 +08:00
hrz 7f67459c6e update:增加书名号 2025-07-09 16:26:26 +08:00
JianYu Zheng f47a7b4dbc 修复添加和修改声纹选择的时候,编辑的声纹不在里面,导致无法显示内容的问题
--agent.js 增加查询音频内容的接口
--VoicePrintDialog.vue 修复添加和修改声纹选择的时候,编辑的声纹不在里面,导致无法显示内容的问题
2025-07-09 15:56:07 +08:00
hrz 0bf6926506 update:优化提示词 2025-07-09 15:35:25 +08:00
3030332422 d13fb73c67 update:优化 2025-07-09 14:23:47 +08:00
JianYu Zheng 5e18a46e3f 添加新功能,声纹选择的时候可以听取音频文件
--VoicePrintDialog.vue 添加听取音频的功能
2025-07-09 11:48:02 +08:00
Sakura-RanChen 62e39dd0e2 fix: 等待时可能已经完成(设置为None),后续对None错误访问 2025-07-09 11:18:26 +08:00
hrzandGitHub 203ea89c6d Merge pull request #1788 from xinnan-tech/py_intent_fix
fix: delete未定义的方法报错
2025-07-08 17:54:17 +08:00
Sakura-RanChen 9ddd967776 fix: delete未定义的方法报错 2025-07-08 17:52:51 +08:00
Sakura-RanChen 44593ff3f3 update: 优化chat函数流程 优化huoshan处理 会话保持一致性 2025-07-08 17:48:50 +08:00
JianYu Zheng 3ed13b3ff5 修复漏洞
--AgentChatHistoryServiceImpl.java 用户聊天记录不一定都带有音频,查询时要排除不带音频的最近50条聊天记录
--AgentChatHistoryService.java 修改方法描述
2025-07-08 17:32:44 +08:00
JianYu Zheng 53cfdcc240 Merge remote-tracking branch 'origin/mangger-api-voice-print' into mangger-api-voice-print 2025-07-08 17:15:10 +08:00
JianYu Zheng 0636b95b87 声纹表添加音频字段
--202507081646.sql 添加字段sql
--AgentVoicePrintEntity.java 对应实体更新
--db.changelog-master.yaml 执行添加字段sql的配置
2025-07-08 17:10:57 +08:00
hrzandGitHub cf449a9b60 Merge pull request #1787 from xinnan-tech/system-prompt
强化小智提示词
2025-07-08 17:00:46 +08:00
hrz ab890ada37 update:强化小智提示词 2025-07-08 16:59:38 +08:00
JianYu Zheng b9c136c6ae 修复错误
--VoicePrint.vue
 1.方法调用错误,修改方法名
 2.删除无用的多选框
2025-07-08 16:55:02 +08:00
JianYu Zheng f81a7e8273 智能体设置卡片添加设置声纹的按钮
--DeviceItem.vue
 1.添加声纹设置按钮
 2.添加跳转到声纹页面方法
--home.vue 修复因为添加新按钮导致卡片按钮文字换行样式问题
2025-07-08 16:18:29 +08:00
JianYu Zheng d40d4a08b0 添加声纹管理页面
--VoicePrint.vue 声纹展示页面
--VoicePrintDialog.vue 声纹增改组件
--index.js 注册声纹页面路径
2025-07-08 16:15:52 +08:00
JianYu Zheng 61907d2270 添加新接口方法
--agent.js 添加关于声纹和获取用户列表的接口
 1.添加智能体的声纹
 2.获取指定智能体声纹列表
 3.删除智能体声纹
 4.更新智能体声纹
 5.获取指定智能体用户类型聊天记录
2025-07-08 16:13:13 +08:00
JianYu Zheng 601a90981e 修复错误
--AgentVoicePrintServiceImpl.java
 1.修复事务处理过程出错,返回错误无法被前端页面处理
 2.修复更新声纹方法,更正错误sql
2025-07-08 15:48:20 +08:00
JianYu Zheng 10b7259b13 添加新接口:查看指定智能体最近50条用户聊天记录
--AgentChatHistoryService.java 指定智能体最近50条用户聊天记录定义
--AgentChatHistoryServiceImpl.javaAgentChatHistoryService.java 实现指定智能体最近50条用户聊天记录方法
--AgentChatHistoryType.java 添加智能体聊天记录类型枚举
--AgentChatHistoryUserVO.java 展示用户聊天记录vo
--AgentController.java 添加新接口
2025-07-08 15:44:43 +08:00
CGD 5c83d63fe2 update:声纹识别对接的优化 2025-07-08 11:25:54 +08:00
hrzandGitHub beb7a191c1 Merge pull request #1777 from jlau-ice/feat/add-password-visibility
feat: 登录注册等页面密码输入框添加可见属性
2025-07-07 21:29:10 +08:00
ganbin ee72a328ca feat: 登录注册等页面密码输入框添加可见属性 2025-07-07 18:50:03 +08:00
JianYu Zheng c85419bf06 添加添加声纹增删改查接口
--AgentVoicePrintController.java 添加接口
2025-07-07 15:33:16 +08:00
CGD 155ba92ba6 update:增加了智控台的sql语句,优化了部分配置 2025-07-07 15:29:13 +08:00
JianYu Zheng b201c3cca8 添加数据认证,需要登录用户是此数据所有者才有权限修改,查询,删除
--AgentVoicePrintService.java 修改方法定义
--AgentVoicePrintServiceImpl.java
 1.需要登录用户是此数据所有者才有权限修改,查询,删除
 2.修改发送注册声纹http请求和发送注销声纹的请求的错误说明和添加日志记录
2025-07-07 15:11:37 +08:00
hrzandGitHub c45f47faa0 Update:优化mcp工具读取顺序 (#1775)
* update:发布0.6.3版本

* update:升级sherpa_onnx版本

* update:补充自动更新教程

* update:优化mcp工具读取顺序

* update:优化
2025-07-07 15:04:32 +08:00
JianYu Zheng ee7ea7fca6 添加编程事务,保证数据的统一,提取公共方法
--AgentVoicePrintServiceImpl.java
 1.为保存,修复,删除声纹添加事务
 2.提取发送注销声纹的请求为公共方法
2025-07-07 14:12:28 +08:00
hrzandGitHub 5ee7830f1b Merge pull request #1770 from jlau-ice/fix/vllm-reply-in-English
fix: 修正VLLM本地调用,question参数为空会用英文回复的问题
2025-07-07 11:58:58 +08:00
hrz 8da9dc8a3f update:优化引导词 2025-07-07 11:45:37 +08:00
JianYu Zheng 61ecfd2d92 实现智能体声纹服务层定义的‘获取指定智能体的所有声纹数据’和‘更新智能体的指的声纹数据’定义(未测试)
--AgentVoicePrintServiceImpl.java 实现方法
 1.获取指定智能体的所有声纹数据
 2.更新智能体的指的声纹数据
 3.提取共用方法(获取声纹音频资源数据,发送注册声纹http请求)
2025-07-07 10:58:35 +08:00
ganbin 2535ff6c90 fix: 修正VLLM本地调用,question参数为空会用英文回复的问题 2025-07-07 09:02:59 +08:00
hrzandGitHub 880bc6326a update:补充自动更新教程 (#1766)
* update:发布0.6.3版本

* update:升级sherpa_onnx版本

* update:补充自动更新教程
2025-07-06 15:40:02 +08:00
hrzandGitHub d892212583 Update version (#1765)
* update:发布0.6.3版本

* update:升级sherpa_onnx版本
2025-07-05 23:58:47 +08:00
hrzandGitHub 089acd357d update:发布0.6.3版本 (#1764) 2025-07-05 23:50:26 +08:00
hrzandGitHub d14f6937fa Merge pull request #1753 from myifeng/main
客户端连接成功时不主动发送hello
2025-07-05 20:05:51 +08:00
hrzandGitHub d74813ec80 Update connection.py 2025-07-05 20:05:36 +08:00
hrzandGitHub 1cfba1aa52 update: 单模块部署也能使用mcp接入点 (#1763)
* 优化:OTA接口需要适应最小示例参数 #1757

* update:修复智能体选择的模型不存在导致的500错误 #1752

* update: 单模块部署也能使用mcp接入点
2025-07-05 19:46:04 +08:00
marlonz 5f96f56574 remove gitignore 2025-07-05 13:50:47 +09:30
marlonz 076aaae944 mqtt gateway project 2025-07-05 13:47:49 +09:30
marlonz aed54bb3a6 tech review change 2025-07-05 13:30:14 +09:30
marlonz 7c03677295 update change log 2025-07-05 13:25:42 +09:30
marlonz 3d3875f14f update lq base sql 2025-07-05 12:34:57 +09:30
grincoolandGitHub f6dd493997 Merge pull request #1758 from grincool/xiaozhi-mqtt-dev
提交mqtt后端修改
2025-07-05 12:27:35 +09:30
grincoolandGitHub d5e3989ed1 Merge branch 'mqtt' into xiaozhi-mqtt-dev 2025-07-05 12:24:59 +09:30
JianYu Zheng 77527d8823 实现智能体声纹服务层定义的‘添加智能体新的声纹’和‘删除智能体的指的声纹’定义
--AgentVoicePrintServiceImpl.java 实现方法
 1.添加智能体新的声纹
 2.删除智能体的指的声纹
 3.共用方法(获取生纹接口URI对象,获取声纹地址基础路径,获取验证Authorization)
2025-07-04 18:04:39 +08:00
JianYu Zheng 5e5ec98995 添加智能体声纹实体,vo,dto,dao,service类
--AgentVoicePrintVO.java 智能体声纹展示vo
--AgentVoicePrintService.java 智能体声纹服务层定义
 1.添加智能体新的声纹
 2.删除智能体的指的声纹
 3.获取指定智能体的所有声纹数据
 4.更新智能体的指的声纹数据
--AgentVoicePrintSaveDTO.java 智能体声纹保存dto
--AgentVoicePrintUpdateDTO.java 智能体声纹修改dto
--AgentVoicePrintEntity.java 智能体声纹实体
--AgentVoicePrintDao.java 智能体声纹持久层
2025-07-04 18:02:19 +08:00
JianYu Zheng 1c2d4f9045 添加新表:智能体声纹表
--202507041018.sql 建表sql语句
--db.changelog-master.yaml 配置文件里添加执行新sql的配置
2025-07-04 17:54:41 +08:00
CGD 3d64152dba update:python单模块部署声纹识别对接 2025-07-04 17:11:44 +08:00
hrzandGitHub 37ecd3da1e 增加docker部署时url地址的说明 (#1754)
* update:优化mcp工具较多时的现实

* update:修改版本号

* update:docker部署manager-api,填写备注
2025-07-04 17:02:19 +08:00
myifeng 22e9e4c352 客户端连接成功时不主动发送hello 2025-07-04 15:27:38 +08:00
Sakura-RanChen 7e5a2b4549 fix: 播放音乐时,引导词卡顿 2025-07-04 11:27:49 +08:00
JianYu Zheng 036dde5bb0 添加新的参数:声纹接口地址
--202507031602.sql 添加声纹接口地址参数sql
--Constant.java 对应新参数的常量
--SysParamsController.java 验证声纹接口地址参数是否符合规则
--db.changelog-master.yaml 添加执行新的sql文件
2025-07-03 16:34:50 +08:00
Sakura-RanChen 69cac9d40a update: TTS复用链接,VAD双阈值判断 2025-07-03 09:16:06 +08:00
hrzandGitHub 04b132816c update:修改版本号
* update:优化mcp工具较多时的现实

* update:修改版本号
2025-07-01 18:16:21 +08:00
CGD 039badd265 update:添加了阿里云CosyVoice流式TTS 2025-07-01 18:14:36 +08:00
hrzandGitHub f08ed1bbb7 Merge pull request #1729 from xinnan-tech/fix-vllm
update:优化mcp工具较多时的显示
2025-07-01 17:31:58 +08:00
欣南科技andGitHub d59a769084 Merge pull request #1728 from xinnan-tech/redis-password
update:允许在docker-compose文件里设置redis密码
2025-07-01 16:35:20 +08:00
hrz 7a8fe1074c update:允许在docker-compose文件里设置redis密码 2025-07-01 16:34:37 +08:00
欣南科技andGitHub 3fc256ed9a Merge pull request #1727 from xinnan-tech/mcp-update
update:支持中文名称的mcp工具
2025-07-01 16:16:03 +08:00
hrz 18eed4417c update:支持中文名称的mcp工具 2025-07-01 16:07:35 +08:00
欣南科技andGitHub 20adbadc02 Merge pull request #1718 from xinnan-tech/newsnow
可配置新闻来源
2025-06-30 17:13:13 +08:00
hrz c68384be69 update:区分本地化部署和非本地化部署tts的配置字段 2025-06-30 16:56:56 +08:00
CGD 90a9631450 update:添加阿里云流式asr 2025-06-30 14:41:53 +08:00
hrz 7619979046 update:简化新闻源配置 2025-06-30 14:24:46 +08:00
hrzandGitHub 54ccae8665 Merge pull request #1518 from shane04111/add_local_tts_change_voice
update: 添加本地tts支援面板的"角色音色"
2025-06-30 10:48:15 +08:00
hrzandGitHub 3015b01740 Merge branch 'newsnow' into add_local_tts_change_voice 2025-06-30 10:48:06 +08:00
hrzandGitHub 43d47a4f09 Merge pull request #1552 from liammazy/main
增加timeout配置项,单位为秒
2025-06-30 10:46:50 +08:00
hrzandGitHub 96abc34a92 Merge branch 'newsnow' into main 2025-06-30 10:44:39 +08:00
hrzandGitHub 26553b8875 Update openai.py 2025-06-30 10:41:15 +08:00
hrzandGitHub 5e3187e36b Merge pull request #1673 from goxofy/main
update: newsnow 插件支持前端配置新闻源  && fix issues/1658
2025-06-30 10:10:28 +08:00
hrzandGitHub eba8c3122f Merge branch 'newsnow' into main 2025-06-30 10:10:19 +08:00
hrzandGitHub f1a3f39782 Merge pull request #1712 from ifhaveif/main
🐞 fix: 只清空当前数据库,不清空整个数据库
2025-06-30 10:04:01 +08:00
xiongyonghui 0880f78002 🐞 fix: 只清空当前数据库,不清空整个数据库
-- emptyAll.lua
1、当redis被多个项目使用时,清空了其它项目的库(影响其它项目)
2025-06-30 00:17:39 +08:00
欣南科技andGitHub 1c16d497f9 Merge pull request #1706 from xinnan-tech/update-doc
update:增加MCP接入点的视频demo
2025-06-28 20:36:44 +08:00
hrz faaae95197 update:增加MCP接入点的视频demo 2025-06-28 20:36:05 +08:00
欣南科技andGitHub d5e0e8ab40 Merge pull request #1704 from xinnan-tech/py_websoket_link
update:优化超时资源优化
2025-06-27 23:50:25 +08:00
hrz 500b0ebde3 update:去除无关日志 2025-06-27 23:47:17 +08:00
hrz 6f6c39da23 update:优化超时资源优化 2025-06-27 23:38:05 +08:00
CGDandGitHub f8ccc7a92f Merge pull request #1703 from xinnan-tech/py_websoket_link
fix: 退出过快问题
2025-06-27 17:26:38 +08:00
Sakura-RanChen 95a678bb18 fix: 退出过快问题 2025-06-27 16:39:53 +08:00
欣南科技andGitHub e43ce6ba3c Merge pull request #1700 from xinnan-tech/manager-api-mcp
update:优化接入点连接跳转方式
2025-06-27 15:31:09 +08:00
hrz 7663b0b969 update:优化接入点连接跳转方式 2025-06-27 15:30:18 +08:00
欣南科技andGitHub ba898b0874 Merge pull request #1699 from xinnan-tech/manager-api-mcp
update:优化mcp地址的校验
2025-06-27 15:16:58 +08:00
hrz 04843010bc update:优化mcp地址的校验 2025-06-27 15:14:41 +08:00
欣南科技andGitHub 41c06efeee Merge pull request #1698 from xinnan-tech/manager-api-mcp
Manager api mcp
2025-06-27 14:59:27 +08:00
hrz d0425fa31a update:优化设备端读取mcp接入点工具 2025-06-27 14:57:49 +08:00
hrz 08753b97df update:页面显示接入点功能 2025-06-27 11:33:12 +08:00
hrz a86fef5f28 update:智能体获取mcp接入点工具列表 2025-06-27 10:06:40 +08:00
hrzandGitHub c5c2f59b31 Merge pull request #1688 from xinnan-tech/opt_tools
fix: 处理config_functions的类型转换,避免初始化错误
2025-06-26 18:32:00 +08:00
hrz 69ee8ab438 添加mcp工具列表接口 2025-06-26 18:29:07 +08:00
CGD 4a24bc8c21 fix: 处理config_functions的类型转换,避免初始化错误 2025-06-26 17:37:51 +08:00
hrz 1d293244d3 update:智控台增加mcp接入点的配置 2025-06-26 16:54:26 +08:00
hrz 6812c5ac40 update:更改版本号 2025-06-26 16:34:30 +08:00
TinKandGitHub eeb5ed920a Merge pull request #10 from goxofy/manual-add-device
fix
2025-06-26 16:29:29 +08:00
hrzandGitHub 90ad3e019f Merge pull request #1680 from xinnan-tech/opt_tools
MCP接入点完成
2025-06-26 16:27:42 +08:00
Tink 3af453c2df fix 2025-06-26 16:26:45 +08:00
hrz 3071d2bdfa update:完成mcp接入点对接 2025-06-26 16:25:39 +08:00
TinKandGitHub 90aad4f131 Merge pull request #9 from goxofy/manual-add-device
fix
2025-06-26 16:24:55 +08:00
Tink f69b1b34f1 fix 2025-06-26 16:22:21 +08:00
TinKandGitHub ece2c4b49f Merge pull request #8 from goxofy/manual-add-device
fix
2025-06-26 16:07:57 +08:00
Tink 033c8f9bee fix 2025-06-26 16:06:36 +08:00
TinKandGitHub 1b9ca95a0e Merge pull request #7 from goxofy/manual-add-device
UpdateWrapper
2025-06-26 16:00:31 +08:00
Tink 7e86a9f8a9 UpdateWrapper 2025-06-26 15:54:26 +08:00
TinKandGitHub 9dee744498 Merge pull request #6 from goxofy/manual-add-device
fix last_connected_at
2025-06-26 15:35:51 +08:00
Tink 32fa71e8f1 fix last_connected_at 2025-06-26 15:24:57 +08:00
hrz ec4694f859 update:优化服务端mcp 2025-06-26 14:35:12 +08:00
TinKandGitHub 717386f10a Merge pull request #5 from goxofy/manual-add-device
fix id in ai_device
2025-06-26 14:14:07 +08:00
Tink fe071fe41a fix id in ai_device 2025-06-26 14:13:29 +08:00
TinKandGitHub 560a7d083b Merge pull request #4 from goxofy/manual-add-device
manualAddDevice
2025-06-26 13:41:46 +08:00
Tink 4428c1a298 manualAddDevice 2025-06-26 13:40:01 +08:00
TinKandGitHub 760fd2fdc5 Merge pull request #3 from goxofy/manual-add-device
手动添加设备增加后端接口
2025-06-26 13:37:06 +08:00
Tink 84c11a281a 手动添加设备增加后端接口 2025-06-26 13:36:11 +08:00
TinKandGitHub ad682ca0c4 Merge pull request #2 from goxofy/manual-add-device
fix RequestService
2025-06-26 12:27:46 +08:00
Tink 2a349ca9ef fix RequestService 2025-06-26 12:25:19 +08:00
hrz da8435cfea update:视觉结果优化 2025-06-26 11:42:13 +08:00
hrz 0f36daf1fd update:优化工具回复 2025-06-26 11:27:23 +08:00
TinKandGitHub 1f3c90e9e5 Merge pull request #1 from goxofy/manual-add-device
manual-add-device
2025-06-26 11:16:23 +08:00
Tink 6ec7a1fe09 manual-add-device 2025-06-26 11:09:17 +08:00
hrz 2f78acaf4d update:优化iot操作 2025-06-26 09:34:00 +08:00
hrz 9412a26bfc update:优化工具目录结构 2025-06-26 09:28:29 +08:00
hrz 2348d9ceb3 update:统一工具注册及调用 2025-06-25 18:27:08 +08:00
JianYu Zheng 61b4b6617b 优化:提取共用方法,实现部分getAgentMcpToolsList内容
--AgentMcpAccessPointServiceImpl.java
1.获取URI对象,统一2个方法获取URI对象的异常处理
2.实现getAgentMcpToolsList部分内容
2025-06-25 17:39:01 +08:00
JianYu Zheng a8620f21a0 优化:方法分割提取
--AgentMcpAccessPointServiceImpl.java 方法分割提取共用
1.获取密钥方法
2.获取智能体mcp接入点url部分
3.获取对智能体id加密的token
2025-06-25 17:17:26 +08:00
Tink 78dc266eee change newsnow plugin doc 2025-06-25 16:49:54 +08:00
JianYu Zheng 0631fe37ea 添加新接口:获取智能体的Mcp接入点地址(/agent/mcp/address/{audioId})
--AgentMcpAccessPointServiceImpl.java 实现获取智能体的mcp接入点地址定义
--AgentMcpAccessPointController.java 添加获取智能体的Mcp接入点地址接口
2025-06-25 16:37:04 +08:00
Tink 8828f8401d newsnow 插件支持前端配置新闻源 2025-06-25 16:32:49 +08:00
JianYu Zheng 21339aba42 添加智能体mcp接入点接口方法定义
--AgentMcpAccessPointService.java
1.获取智能体的mcp接入点地址定义
2.获取智能体的mcp接入点已有的工具列表定义
2025-06-25 16:16:39 +08:00
JianYu Zheng 660231978f 添加一个哈希加密的工具类
--HashEncryptionUtil.java
1.指定哈希算法进行加密方法
2.使用md5进行加密
2025-06-25 16:15:06 +08:00
JianYu Zheng dde203b158 添加了一个新的系统参数,mcp接入点参数
--Constant.java mcp接入点参数的key常量
--SysParamsServiceImpl.java 添加了mcp参数验证方法,修改是进行验证
2025-06-25 11:21:41 +08:00
JianYu Zheng 0ee69fa2b2 添加了http发送工具类
--HttpSendUtils.java
添加了发送get请求,获取返回的body转换成字符串 方法
发送post请求,参数为json格式。取返回的body转换成字符串 方法
2025-06-25 11:06:36 +08:00
hrzandGitHub 8c1a8f7d55 Merge pull request #1663 from xinnan-tech/py_iot_fix
update:iot设备多指令适配
2025-06-24 16:52:10 +08:00
欣南科技andGitHub ef03b665c9 Merge pull request #1666 from xinnan-tech/aes_utils
update:新增AES加密方法,和python端AES一致
2025-06-24 16:48:56 +08:00
hrz b87906234d update:新增AES加密方法,和python端AES一致 2025-06-24 16:26:14 +08:00
CGD 896b318c49 update:iot设备多指令适配 2025-06-24 14:55:34 +08:00
CGDandGitHub b3d441c385 Merge pull request #1661 from xinnan-tech/web_fuction_MCP
update: mcp接入点页面实现
2025-06-24 14:41:12 +08:00
Sakura-RanChen 96de670bfe update: mcp接入点页面实现 2025-06-24 14:39:18 +08:00
欣南科技andGitHub bc2fc35cc9 Merge pull request #1642 from xinnan-tech/py_tts_listen
update:更新版本号
2025-06-20 17:42:53 +08:00
hrz 993d5395b2 update:更新版本号 2025-06-20 17:42:14 +08:00
欣南科技andGitHub 67f0b828ea Merge pull request #1641 from xinnan-tech/py_tts_listen
update:修复部分doubaoasr出现400错误的问题
2025-06-20 17:20:51 +08:00
hrz 879c1267b6 update:修复部分doubaoasr出现400错误的问题 2025-06-20 17:20:08 +08:00
hrzandGitHub 46c53e36a6 Merge pull request #1640 from xinnan-tech/py_tts_listen
fix: 反复打断任务没有被清除,vad四帧语音识别
2025-06-20 17:17:19 +08:00
hrz 09f6605cfe update:更新版本号 2025-06-20 17:17:09 +08:00
Sakura-RanChen 12cee4027a fix: 反复打断任务没有被清除,vad四帧语音识别 2025-06-20 16:25:08 +08:00
欣南科技andGitHub 979fea0d60 Merge pull request #1627 from xinnan-tech/update-remark
更新智控台两款意图识别的说明
2025-06-19 16:56:38 +08:00
hrz 94553c54bd 更新智控台两款意图识别的说明 2025-06-19 16:53:39 +08:00
hrzandGitHub 248db31c8b Merge pull request #1618 from xinnan-tech/py_bug_fix
update:添加MCP重连机制
2025-06-18 22:40:25 +08:00
hrzandGitHub 24bfa1ca15 Merge pull request #1615 from xinnan-tech/py_fix_type
fix: 豆包流式decode错误
2025-06-18 17:46:47 +08:00
欣南科技andGitHub 1e97a8febc Merge pull request #1620 from xinnan-tech/hot-fix
update:修复mcp返回json的bug
2025-06-18 17:28:51 +08:00
hrz 2742f2e1ff update:修复mcp返回json的bug 2025-06-18 17:28:21 +08:00
Sakura-RanChen 0a5ae70a7c 二次错误提醒 2025-06-18 16:32:58 +08:00
CGD 22d53bd36e update:添加MCP重连机制 2025-06-18 16:29:28 +08:00
Sakura-RanChen ebf68929ce update: 错误信息读取 2025-06-18 14:03:18 +08:00
Sakura-RanChen ef3b373211 fix: 豆包流式decode错误 2025-06-18 11:06:11 +08:00
hrzandGitHub 5012a51e1d Merge pull request #1609 from xinnan-tech/py_fix_type
Py fix type
2025-06-18 09:39:38 +08:00
Sakura-RanChen fb1f476a3c fix: 智控台切换默认视觉模型报错 2025-06-18 09:24:52 +08:00
Sakura-RanChen 1a31c8cd1d update: 视觉模块直接识别输出,不经过二次LLM 2025-06-17 16:13:24 +08:00
marlonz b7c0201ca3 提交mqtt后端修改 2025-06-17 16:40:17 +09:30
欣南科技andGitHub 3e491c7d79 Merge pull request #1602 from xinnan-tech/py_fix_bug
update:更新版本号
2025-06-17 00:11:52 +08:00
hrz 33345817d2 update:更新版本号 2025-06-17 00:10:55 +08:00
hrzandGitHub 82973a685a Merge pull request #1601 from xinnan-tech/py_fix_bug
fix:修复“设备使用iot协议,意图识别无法正确调用”的问题
2025-06-16 23:49:58 +08:00
hrz e1d245068c update:优化权限 2025-06-16 23:47:26 +08:00
hrzandGitHub b74517ffb0 Merge pull request #1591 from CaixyPromise/fix/comment-invalid
fix: 智控台备注功能无效
2025-06-16 23:34:24 +08:00
hrz 231ae8dfa6 update:修复iot不更新的bug 2025-06-16 23:16:40 +08:00
CGD 4ee9a47d41 fix:修复“设备使用iot协议,意图识别无法正确调用”的问题 2025-06-16 18:09:13 +08:00
Sakura-RanChen d8bf5cdedf fix: openAi schema不支持list 2025-06-16 16:26:49 +08:00
Sakura-RanChenandGitHub 755e0edd44 Merge pull request #1596 from xinnan-tech/py_fix_bug
fix:修复意图识别因缺少 home_assistant 配置导致部分功能错误将意图识别成“home_assistant ”的bug
2025-06-16 14:52:53 +08:00
CGD 178df82693 fix:修复意图识别因缺少 home_assistant 配置导致功能全部失效的 bug 2025-06-16 14:48:52 +08:00
Sakura-RanChenandGitHub a88c3b2032 Merge pull request #1594 from xinnan-tech/py_fix_bug
fix:修复数据库中两个字符串的排序规则(collation)不一致问题
2025-06-16 11:10:18 +08:00
CGD 513396b905 fix:修复数据库中两个字符串的排序规则(collation)不一致问题 2025-06-16 11:09:01 +08:00
caixypromise 9885d4758b fix: 修复设备管理无法提交备注信息的问题。
chore: 将设备自动更新状态接口重构为设备信息更新接口,以此实现备注、自动更新合并在一个接口内
2025-06-16 03:27:12 +08:00
欣南科技andGitHub f5583717d5 Merge pull request #1573 from xinnan-tech/update-doc
update:优化智控台配置HomeAssistant操作手册
2025-06-13 14:36:46 +08:00
hrz da3076e5f7 update:优化智控台配置HomeAssistant操作手册 2025-06-13 14:29:08 +08:00
欣南科技andGitHub 3b77e1ddf1 Merge pull request #1572 from xinnan-tech/hot-fix
update:优化报错信息
2025-06-13 13:48:45 +08:00
hrz 3763a615f0 update:优化报错信息 2025-06-13 13:22:17 +08:00
欣南科技andGitHub f90e07976e Merge pull request #1570 from xinnan-tech/hot-fix
update:优化视觉接口认证校验
2025-06-13 12:55:37 +08:00
hrz 45b7658634 update:优化视觉接口认证校验 2025-06-13 12:53:58 +08:00
欣南科技andGitHub 70323936e9 Merge pull request #1569 from xinnan-tech/update-doc
Update doc
2025-06-13 11:23:05 +08:00
hrz 44f64fa336 update:修改版本号 2025-06-13 11:21:53 +08:00
hrz 2bd8afcc89 update:优化文档内容 2025-06-13 11:21:00 +08:00
欣南科技andGitHub 5fdab2522c Merge pull request #1567 from xinnan-tech/agent-plugin
update:优化插件代码
2025-06-13 10:50:19 +08:00
hrzandGitHub ef7bd8bd19 Merge pull request #1559 from xinnan-tech/py_fix_mcp-type
修复MCP工具调用参数类型错误问题;"logger中vad和asr动态变化"的补充
2025-06-13 10:49:41 +08:00
hrzandGitHub 9aa76cad69 Merge pull request #1566 from xinnan-tech/py_bug_fix
fix:通过“当会话ID为None时,自动生成新的会话ID”,解决“首次从智控台连接后,无法播放音乐”的问题
2025-06-13 10:48:49 +08:00
hrz f51477bf18 update:优化插件代码 2025-06-13 10:47:47 +08:00
CGD 2a8ec27ba6 update:通过“当会话ID为None时,自动生成新的会话ID”,解决“首次从智控台连接后,无法播放音乐”的问题 2025-06-13 10:34:36 +08:00
欣南科技andGitHub 2ff7fbbe6f Merge pull request #1564 from xinnan-tech/agent-plugin
Agent plugin
2025-06-13 09:48:38 +08:00
hrz 8a2fe7c20e update:设备列表优化 2025-06-13 09:24:13 +08:00
hrz 0fc8f02c6e update:优化空密钥的提示提示方式 2025-06-12 23:11:42 +08:00
hrz 3e8246ac41 update:优化表单样式 2025-06-12 23:07:42 +08:00
hrz 1adb2fe0f6 清除无效变量 2025-06-12 22:00:23 +08:00
hrz 9c3e1a6ff6 update:优化ha工具获取密钥的方式 2025-06-12 21:43:30 +08:00
hrz e943b07344 update:创建智能体设置默认的插件 2025-06-12 16:52:56 +08:00
shane0411 0ca1a6286c Merge remote-tracking branch 'upstream/main' into add_local_tts_change_voice 2025-06-12 12:36:13 +08:00
hrz 535c088404 Merge branch 'agent-plugin' of https://github.com/xinnan-tech/xiaozhi-esp32-server into agent-plugin 2025-06-12 11:12:12 +08:00
hrz f615621ffe update:不限时默认配置 2025-06-12 11:11:43 +08:00
hrzandGitHub f3d0df6772 Merge pull request #1556 from jlau-ice/fix/prevent-dialog-close-on-outside-click
fix: 防止在单击外部未保存的更改时关闭对话框
2025-06-12 11:03:24 +08:00
CGD 3b34d687a6 "fix: 修复MCP工具调用参数类型错误问题,无参调用时提供默认空字典" 2025-06-12 10:52:07 +08:00
CGD d3ba8d4385 uodate:"logger中vad和asr动态变化"的补充 2025-06-12 10:41:14 +08:00
CGDandGitHub 25ccf7fed3 Merge pull request #1557 from xinnan-tech/py_fix_logger
fix:  logger中vad和asr动态变化
2025-06-12 10:16:06 +08:00
Sakura-RanChen 6139c51b60 fix: logger中vad和asr动态变化 2025-06-12 09:54:07 +08:00
ganbin 77ded65157 fix: 防止在单击外部未保存的更改时关闭对话框 2025-06-12 09:03:48 +08:00
hrz 1836284223 Merge branch 'main' into agent-plugin 2025-06-11 23:07:33 +08:00
hrz c43afc6b39 update:优化页面显示 2025-06-11 23:05:38 +08:00
hrzandGitHub 4b0902017b Merge pull request #1554 from xinnan-tech/py_fix_mcp
fix:MCP 工具的支持能力,并优化意图识
2025-06-11 22:42:34 +08:00
hrz b2d26b9481 update:优化插件显示 2025-06-11 22:09:21 +08:00
CGD 68dbc91d54 fix:MCP 工具的支持能力,并优化意图识 2025-06-11 22:02:57 +08:00
shane0411 a4aea694d4 Merge remote-tracking branch 'upstream/main' into add_local_tts_change_voice 2025-06-11 14:29:35 +08:00
Liam Mazy 0f31bfc78f 增加timeout配置项,单位为秒 2025-06-11 14:05:54 +08:00
hrz 80554ecff4 Merge branch 'main' into agent-plugin 2025-06-11 09:32:56 +08:00
欣南科技andGitHub 0e57aad12d Merge pull request #1546 from xinnan-tech/hot-fix
修复创建智能体的默认视觉模型
2025-06-10 23:03:22 +08:00
hrz 742db377f6 修复创建智能体的默认视觉模型 2025-06-10 23:01:31 +08:00
欣南科技andGitHub a0250c8191 Merge pull request #1543 from xinnan-tech/hot-fix
fix:#1538
2025-06-10 22:20:27 +08:00
hrz 65b2656112 fix: #1538 2025-06-10 22:15:46 +08:00
hrz 1c4e5f0eed 修复 #1538 2025-06-10 22:12:39 +08:00
欣南科技andGitHub 224a06803f Merge pull request #1540 from xinnan-tech/py_wakeup_Unicode
update:优化“更新唤醒词回复配置”中的过滤表情字符
2025-06-10 17:24:05 +08:00
欣南科技andGitHub 8534a6d509 Merge pull request #1537 from bigbencat/fix-vllm-update
Fix vllm update:修复更新智能体时无法保存视觉模型的问题
2025-06-10 17:20:32 +08:00
hrzandGitHub f3dbb1f930 Merge branch 'main' into fix-vllm-update 2025-06-10 17:19:55 +08:00
CGD fedb6f2da2 update:优化“更新唤醒词回复配置”中的过滤表情字符 2025-06-10 16:38:21 +08:00
brucelee aa7303c707 fix(agent): 修复更新智能体时无法保存视觉模型的问题 2025-06-10 16:09:27 +08:00
Sakura-RanChenandGitHub 4b99ca5c5a Merge pull request #1534 from xinnan-tech/py_wakeup_Unicode_fix
解决GBK编码保存问题;音频格式修改
2025-06-10 14:55:34 +08:00
CGD d49462152b update:音频格式修改 2025-06-10 14:36:31 +08:00
CGD 33faeee75d update:通过过滤“更新唤醒词响应配置”时文本中的表情符号,解决GBK编码保存问题 2025-06-10 14:14:02 +08:00
欣南科技andGitHub 8cb15dcc7e Merge pull request #1530 from xinnan-tech/update-doc
update:纠正最简化部署的端口号是8003
2025-06-10 11:20:10 +08:00
hrz cef5813318 update:纠正最简化部署的端口号是8003 2025-06-10 11:19:30 +08:00
CGDandGitHub c43ee8025e Merge pull request #1529 from xinnan-tech/py_wakeup_text
Py wakeup text
2025-06-10 11:16:18 +08:00
shane0411 052d8c8962 feat: 添加音频路径音频文本的提示 2025-06-09 19:36:57 +08:00
shane0411 2eb5539c9b feat: 新增音频路径音频文本欄位,提供給本地tts選取音色
https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/1503#issuecomment-2954952028
2025-06-09 19:18:58 +08:00
shane0411 be6fba5963 feat: 添加本地tts支援面板的"角色音色" 2025-06-09 15:20:27 +08:00
Sakura-RanChen b273181ba6 隐藏滑动条 2025-06-09 15:17:37 +08:00
欣南科技andGitHub f5c3c51fe2 Merge pull request #1515 from xinnan-tech/hot-fix
update:优化带有方括号的字符语音转换
2025-06-09 12:36:24 +08:00
hrz 3e7c200a0b update:优化带有方括号的字符语音转换 2025-06-09 12:35:25 +08:00
hrz 152dbe9dec update:字段管理添加VLLM和Plugin选项 2025-06-09 11:39:24 +08:00
hrz 24b744b27e Merge branch 'main' into agent-plugin
# Conflicts:
#	main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
2025-06-09 10:33:46 +08:00
欣南科技andGitHub 250afc0a5c Merge pull request #1511 from xinnan-tech/update-doc
Update doc
2025-06-08 19:33:29 +08:00
hrz c22a3ed092 迁移技术文档到main目录下 2025-06-08 19:32:50 +08:00
hrz 7a23ae4b84 update:更新技术文档 2025-06-08 19:31:47 +08:00
hrzandGitHub 201462d743 Merge pull request #1510 from xinnan-tech/py_HuoshanDoubleStreamTTS_markdown_fix
fix:使用“clear_markdown”方法修复“使用火山流式TTS中markdown 语法被 TTS 读出”的问题
2025-06-08 17:06:13 +08:00
CGD 3d1768100f fix:使用“clear_markdown”方法修复“使用火山流式TTS中markdown 语法被 TTS 读出”的问题 2025-06-08 15:40:18 +08:00
欣南科技andGitHub 3fbfbeaf0f Merge pull request #1508 from xinnan-tech/hot-fix
update:修复windows平台无法使用fcntl模块的问题
2025-06-08 00:21:27 +08:00
hrz 7163abbbe3 update:修复windows平台无法使用fcntl模块的问题 2025-06-09 00:20:49 +08:00
欣南科技andGitHub 423626a6bf Merge pull request #1504 from xinnan-tech/fix-mcp-name
Fix mcp name
2025-06-07 16:00:49 +08:00
hrz 182acc0787 update:替换描述里涉及到的原始方法名称 2025-06-08 15:51:57 +08:00
hrzandGitHub 705aef462c Merge pull request #1502 from whats2000/main
update: 修正 MCP tool naming 問題 (OpenAI SDK 命名規範)
2025-06-07 14:40:08 +08:00
whats2000andGitHub 1f092dd80e update: 修正 MCP tool naming 問題 (OpenAI SDK 命名規範)
Fix MCP tool naming for OpenAI
2025-06-07 13:48:10 +08:00
whats2000 4d0ddd7ff3 fix: sanitize MCP tool names for OpenAI 2025-06-07 13:46:35 +08:00
欣南科技andGitHub 2a212ae759 Merge pull request #1500 from xinnan-tech/fix-stream-mem
Fix stream mem
2025-06-07 11:59:45 +08:00
hrz 1d57e75d28 update:单流式tts聊天记录上报优化 2025-06-08 11:59:06 +08:00
hrz ac1e254eed update:智控台开启唤醒词加速 2025-06-08 11:50:09 +08:00
欣南科技andGitHub 6074431364 Merge pull request #1499 from xinnan-tech/py_Text
update:优化流式前帧发送
2025-06-07 02:34:18 +08:00
hrz d5fc4d48b4 update:优化流失前帧发送 2025-06-08 02:33:07 +08:00
hrz 61232e7dda update:优化空asr语音 2025-06-08 01:09:32 +08:00
hrz 594b4f1d75 add:增加psutil依赖 2025-06-08 00:21:30 +08:00
hrz 98174bcc16 update:【流式tts】增加【非流式】方法,用于测试及生成文件的场景 2025-06-08 00:06:40 +08:00
hrz 29d90df9ea Merge branch 'main' into py_Text
# Conflicts:
#	main/xiaozhi-server/core/handle/helloHandle.py
#	main/xiaozhi-server/core/providers/tts/base.py
2025-06-07 22:48:23 +08:00
hrz 50e6e4817b update:优化唤醒词答复 2025-06-07 22:08:22 +08:00
欣南科技andGitHub c6a88e41e1 Merge pull request #1498 from xinnan-tech/py_Text
update:优化空asr语音
2025-06-07 01:10:13 +08:00
欣南科技andGitHub ae1c41ba82 Merge pull request #1497 from xinnan-tech/py_Text
add:增加psutil依赖
2025-06-07 00:22:11 +08:00
欣南科技andGitHub 837bb74576 Merge pull request #1496 from xinnan-tech/py_Text
优化唤醒词答复速度
2025-06-07 00:12:21 +08:00
Sakura-RanChen a8f559b22c update: tts_one_sentence单句文本分段 2025-06-06 16:29:57 +08:00
brucelee 992eb89d1a 新增依赖文件 requirements_bruce.txt,包含多个库的版本信息以支持项目运行。 2025-06-06 15:39:25 +08:00
hrzandGitHub 1284418c18 Merge pull request #1481 from xinnan-tech/py_AEC_test
funasr添加内存检测判断;修改日志模块,日志轮转(单个文件10MB限制)
2025-06-06 15:02:46 +08:00
hrzandGitHub 3eb3a4502f Update fun_local.py 2025-06-06 14:08:38 +08:00
欣南科技andGitHub 6023af2f21 Merge pull request #1488 from xinnan-tech/fix-wakeup-bug
update:修复被唤醒词打断bug
2025-06-05 20:55:28 +08:00
hrz 2cd90d8066 update:修复被唤醒词打断bug 2025-06-05 20:54:53 +08:00
hrzandGitHub c1dfb540a3 Merge pull request #1486 from pursue-wind/main
fix: 使用deepseek r1-0528模型时,tools_call为空list,tools_call[0]报错
2025-06-05 17:07:59 +08:00
hrzandGitHub bc44ea8757 Update connection.py 2025-06-05 17:07:29 +08:00
Pursue WindandGitHub 77743ef8ba Merge branch 'xinnan-tech:main' into main 2025-06-05 16:34:39 +08:00
chan f8de052d54 fix: 使用deepseek r1-0528模型时,tools_call为空list,tools_call[0]报错 2025-06-05 16:33:47 +08:00
欣南科技andGitHub cb4eb21551 Merge pull request #1485 from xinnan-tech/py_linkerai_single
update:添加免费流式tts(灵犀流式)
2025-06-05 16:26:23 +08:00
hrz 8357d7abc3 update:添加免费流式tts(灵犀流式) 2025-06-05 16:25:40 +08:00
欣南科技andGitHub 5a01bfcdbf Merge pull request #1484 from xinnan-tech/py_linkerai_single
Py linkerai single
2025-06-05 16:13:21 +08:00
hrz 01eb416a03 update:智控台添加免费流式TTS(linkerai) 2025-06-05 16:02:16 +08:00
Sakura-RanChen dca02c1f4b update: 唤醒音频兼容 2025-06-05 14:11:50 +08:00
hrz 2654802bb0 update:流式播放 2025-06-05 11:09:09 +08:00
hrz d7eecfdcea update:优化代码 2025-06-05 10:49:25 +08:00
CGD 8df9846ad7 update:改为采用日志轮转机制,同时添加自动清理 2025-06-05 09:46:54 +08:00
hrz e43c0135a7 Merge branch 'main' into py_linkerai_single 2025-06-05 09:26:00 +08:00
hrz adf1a47945 update:优化配置说明 2025-06-05 09:25:30 +08:00
hrz 492e0b952e update:删除无效引用 2025-06-05 09:03:17 +08:00
hrzandGitHub ecc9d154d8 Merge pull request #1404 from CaixyPromise/main
feat: 智控台智能体级插件/工具调用改造-#1358
2025-06-04 23:52:54 +08:00
hrzandGitHub e776966ef9 Merge branch 'agent-plugin' into main 2025-06-04 23:52:33 +08:00
hrzandGitHub 98df2e5486 Update AgentServiceImpl.java 2025-06-04 23:50:02 +08:00
hrzandGitHub ca1beb956a Merge pull request #1458 from nodexiaoyu/add-technical-overview-doc
It sounds like you're looking for a detailed technical overview of th…
2025-06-04 23:38:37 +08:00
欣南科技andGitHub c694d3d6f1 Merge pull request #1478 from xinnan-tech/hot-fix
update:优化文档
2025-06-04 22:04:07 +08:00
hrz a314d03870 update:优化文档 2025-06-04 22:03:34 +08:00
欣南科技andGitHub f2fd3a0b7e Merge pull request #1476 from xinnan-tech/fix-manager-agent-vllm
修复智控台保存时保存不了视觉模型的bug
2025-06-04 21:49:53 +08:00
hrz 7b693527d9 update:优化文档 2025-06-04 21:49:31 +08:00
hrz 93e0d57783 修复智控台保存时保存不了视觉模型的bug 2025-06-04 21:22:43 +08:00
欣南科技andGitHub 18027d5d5c Merge pull request #1474 from xinnan-tech/asr-stream
update:更新sherpa_onnx版本
2025-06-04 21:04:16 +08:00
hrz 0ef514a68f update:更新sherpa_onnx版本 2025-06-04 21:03:31 +08:00
欣南科技andGitHub 4780f5e972 Merge pull request #1471 from xinnan-tech/asr-stream
update:豆包tts流式ASR空字符串问题
2025-06-04 18:34:37 +08:00
hrz 5b8a567f26 update:豆包tts流式ASR空字符串问题 2025-06-04 18:33:29 +08:00
Sakura-RanChen 23cb7616d9 update: 更改to_tts保存临时文件判断 2025-06-04 16:46:49 +08:00
欣南科技andGitHub 488522de6e Merge pull request #1469 from xinnan-tech/asr-stream
update:优化豆包流式ASR接口
2025-06-04 16:45:21 +08:00
hrz 03bcf5d2c7 update:优化豆包流式ASR接口 2025-06-04 16:43:15 +08:00
CGD fba758ea36 update:恢复最初的日志模块 2025-06-04 15:42:52 +08:00
CGD 0268f90e9c update:修改日志模块,使其按日期和大小分割的日志文件名 2025-06-04 14:46:52 +08:00
CGD 4cc7247c37 update:funasr实例之前添加内存检测判断 2025-06-04 14:35:21 +08:00
欣南科技andGitHub 5d94ed853d Merge pull request #1464 from xinnan-tech/asr-stream
update:ASR加入队列
2025-06-04 11:42:08 +08:00
hrz d06e297c2d update:ASR加入队列 2025-06-04 11:41:04 +08:00
欣南科技andGitHub 6304467d3a Merge pull request #1461 from xinnan-tech/vllm-qwen
add:增加千问收费视觉模型,速度更稳定一点
2025-06-03 23:30:14 +08:00
hrz e52601a584 添加视觉模型响应测试工具 2025-06-03 23:29:39 +08:00
hrz 74226581b7 add:增加千问收费视觉模型,速度更稳定一点 2025-06-03 23:09:27 +08:00
欣南科技andGitHub bc28504b3e Merge pull request #1459 from xinnan-tech/fix-doubao-asr
update:区分豆包ASR按次收费和按时收费接口
2025-06-03 17:33:10 +08:00
hrz 109811199d 更新:智控台区分豆包ASR按次收费和按时收费接口 2025-06-03 17:32:18 +08:00
hrz 610fa4d101 update:区分豆包ASR按次收费和按时收费接口 2025-06-03 17:30:35 +08:00
google-labs-jules[bot] 0269620e66 Sure, here is the rewritten message:
Add detailed technical overview documentation (Chinese)

This document provides a comprehensive technical overview of the xiaozhi-esp32-server project in Chinese, including:
- Overall architecture
- In-depth analysis of xiaozhi-server, manager-api, and manager-web components, covering their purpose, core technologies, and key implementation aspects.
- Data flow and interaction mechanisms.
- Summary of key features.
- Deployment and configuration overview.
2025-06-03 08:50:30 +00:00
google-labs-jules[bot] 10ebe975cf It sounds like you're looking for a detailed technical overview of the xiaozhi-esp32-server project. I can help you put together documentation that includes:
-   The overall architecture.
-   Deep dives into the xiaozhi-server, manager-api, and manager-web components, covering their purpose, core technologies, and key implementation aspects.
-   How data flows and how different parts of the system interact.
-   A summary of the key features.
-   An overview of how to deploy and configure it.

Let me know if this is what you had in mind!
2025-06-03 08:45:40 +00:00
Sakura-RanChen 0bc609cac4 优化实时编码 2025-06-03 11:20:54 +08:00
欣南科技andGitHub 3657f6ce75 Merge pull request #1453 from xinnan-tech/update_doc
update:补充剩余文档
2025-06-03 10:49:32 +08:00
hrz e62f72810c update:补充剩余文档 2025-06-03 10:48:36 +08:00
欣南科技andGitHub 21553410f9 Merge pull request #1452 from xinnan-tech/update_doc
udpate:更新文档
2025-06-03 10:28:13 +08:00
hrz a6bc910b0f udpate:更新文档 2025-06-03 10:27:13 +08:00
欣南科技andGitHub 3e68667323 Merge pull request #1450 from xinnan-tech/tts-huoshan-fix
Tts huoshan fix
2025-06-02 21:26:05 +08:00
hrz c0d4bbcecf 修复分布式部署时jwt密钥同步问题 2025-06-02 21:24:26 +08:00
hrz 6bf6159e6c update:更新hamcp文档 2025-06-02 21:15:07 +08:00
hrz fd4193daab fix:local variable 'response' referenced before assignment 2025-06-02 21:06:51 +08:00
欣南科技andGitHub da2077f3dd Merge pull request #1446 from xinnan-tech/tts-huoshan-fix
update:优化火山引擎双流TTS连接方式
2025-06-02 17:05:07 +08:00
hrz ee65032f7d update:优化火山引擎双流TTS连接方式 2025-06-02 17:03:53 +08:00
欣南科技andGitHub 2d7d75c290 Merge pull request #1438 from xinnan-tech/vllm
udpate:添加拍照识物教程
2025-06-01 16:29:27 +08:00
hrz 237e88ba89 udpate:添加拍照识物教程 2025-06-01 16:18:00 +08:00
欣南科技andGitHub 48223e4f39 Merge pull request #1435 from xinnan-tech/vllm
update:智控台,完成mcp拍照识图
2025-06-01 13:35:33 +08:00
hrz ce776f210c update:智控台,完成mcp拍照识图 2025-06-01 13:34:32 +08:00
欣南科技andGitHub fb5e25ec16 Merge pull request #1433 from xinnan-tech/vllm
update:单模块部署xiaozhi-server,支持mcp调用摄像头识图
2025-06-01 02:31:13 +08:00
hrz c4f2411fee update:单模块部署xiaozhi-server,支持mcp调用摄像头识图 2025-06-01 02:26:19 +08:00
欣南科技andGitHub 3c3be950e9 Merge pull request #1428 from xinnan-tech/hot-fix
update:修复参数错误
2025-05-31 10:14:50 +08:00
hrz b24ee0b9a6 update:修复参数错误 2025-05-31 10:14:23 +08:00
hrzandGitHub e1d5caa0fd Merge pull request #1426 from bitailab/main
SSEClient支持认证
2025-05-30 23:45:26 +08:00
lihaolong 35ba9b0e6b SSEClient支持认证 2025-05-30 11:08:32 +00:00
欣南科技andGitHub 66de07823d Merge pull request #1424 from xinnan-tech/update-doc
update:更新文档
2025-05-30 18:16:14 +08:00
hrz fd96e71d04 update:更新文档 2025-05-30 18:15:25 +08:00
欣南科技andGitHub 3c85242efc Merge pull request #1421 from xinnan-tech/test-mcp
Test mcp
2025-05-30 17:14:44 +08:00
hrz 3c288e1e59 update:优化客户端MCP服务 2025-05-30 17:13:54 +08:00
hrzandGitHub 4bf2f927b0 Merge pull request #1420 from xinnan-tech/py_test_mcp
Py test mcp
2025-05-30 16:09:06 +08:00
hrzandGitHub ad30030a1f Merge branch 'test-mcp' into py_test_mcp 2025-05-30 16:08:14 +08:00
hrzandGitHub 02d66e8093 Merge pull request #1414 from myifeng/dev
修复 has_tool错误;优化检索复杂度
2025-05-30 16:03:36 +08:00
欣南科技andGitHub 49eab95be9 Merge pull request #1419 from xinnan-tech/fix-server
update:双麦实时打断
2025-05-30 15:48:27 +08:00
hrz b1bfaf5a5c update:双麦实时打断 2025-05-30 15:47:32 +08:00
Sakura-RanChen 92affd6e13 待优化 2025-05-30 15:22:41 +08:00
myifeng 843e605352 handle_speaker_volume_or_screen_brightness 属于IOT功能函数,不作为必要函数自动注册 2025-05-30 14:33:29 +08:00
myifeng 6a7fa6060b 增加MCP协议测试功能 2025-05-30 14:26:52 +08:00
myifeng 43ce1df0ed 修复 has_tool错误;优化检索复杂度 2025-05-30 11:35:12 +08:00
myifengandGitHub a6deb3af8b Merge branch 'xinnan-tech:main' into dev 2025-05-30 10:27:23 +08:00
CGDandGitHub 9c01f5f0b0 Merge pull request #1411 from myifeng/dev
修正错误提交
2025-05-30 09:47:50 +08:00
欣南科技andGitHub 80b89a85ee Merge pull request #1412 from xinnan-tech/update-doc
update:优化文档
2025-05-30 09:39:05 +08:00
hrz 2fd0bb4912 update:优化文档 2025-05-30 09:37:13 +08:00
欣南科技andGitHub c0329618fe Merge pull request #1410 from xinnan-tech/update-doc
update:添加配置说明
2025-05-30 09:33:08 +08:00
hrz c4a240cb04 update:添加配置说明 2025-05-30 09:32:11 +08:00
myifeng 33d5761194 FIX 错误提交 2025-05-30 09:30:15 +08:00
myifeng a58ddd5880 为空判断处理; 2025-05-30 09:20:40 +08:00
CGDandGitHub 3bbb5f9b83 Merge pull request #1396 from myifeng/dev
监听MCP类型消息,等待后续适配
2025-05-30 09:11:57 +08:00
欣南科技andGitHub 3d6bf800f3 Merge pull request #1409 from xinnan-tech/asr_stream
豆包流式ASR
2025-05-30 02:17:36 +08:00
hrz a0b0a0e1e8 update:优化日志打印 2025-05-30 02:16:39 +08:00
hrz 8f48e9ac0c update:调通流式ASR 2025-05-30 02:05:34 +08:00
hrz bb42095ca0 update:兼容豆包流式ASR 2025-05-29 23:56:34 +08:00
myifeng c487f69676 FIX 为空判断 2025-05-29 17:55:01 +08:00
myifengandGitHub 3db46a84b2 Merge branch 'xinnan-tech:main' into dev 2025-05-29 16:13:13 +08:00
myifeng 69520391f2 参数为JSON 2025-05-29 15:41:18 +08:00
myifeng 4b212753fb 对接小智MCP协议控制 2025-05-29 13:42:31 +08:00
hrz d86a2cf9de update:抽离公共方法save_audio_to_file到父类 2025-05-29 10:38:01 +08:00
Sakura-RanChen 3130044909 test 2025-05-29 09:05:08 +08:00
caixypromise fac1c4db7b chore: deleted debug logs. 2025-05-29 01:46:37 +08:00
caixypromise ae1b90dfd7 chore: deleted debug logs. 2025-05-29 01:28:07 +08:00
caixypromise ec55de429c fix: fix the changeSet.id to commit datetime 2025-05-29 01:05:38 +08:00
caixypromise d62b957189 chore: commit to resolve commit conflict 2025-05-29 01:03:26 +08:00
caixypromise 599ce19ace feat: 智控台智能体级插件/工具调用改造。
新增支持从控制台控制大模型插件工具与配置插件工具的管理能力。
关联issue: issue(#1358)
2025-05-29 00:58:20 +08:00
欣南科技andGitHub 625d079168 Merge pull request #1403 from xinnan-tech/hot-fix
update:修复退出卡壳问题
2025-05-28 21:35:33 +08:00
hrz 2586843654 update:修复退出卡壳问题 2025-05-28 21:34:21 +08:00
myifeng 8ea48f9875 独立处理MCP Message 2025-05-28 19:28:36 +08:00
myifeng d7f3b3caf5 接收并打印MCP数据 2025-05-28 18:32:15 +08:00
欣南科技andGitHub b37d8abf62 Merge pull request #1400 from xinnan-tech/hot-fix
update:优化资源释放判断
2025-05-28 18:23:15 +08:00
hrz cd930edd06 update:优化资源释放判断 2025-05-28 18:22:31 +08:00
欣南科技andGitHub 4956aa6d70 Merge pull request #1399 from xinnan-tech/hot-fix
update:增强TTS流会话关闭和开启逻辑
2025-05-28 18:14:19 +08:00
hrz fd17465d94 update:增强TTS流会话关闭和开启逻辑 2025-05-28 18:07:58 +08:00
欣南科技andGitHub 87a9425241 Merge pull request #1398 from xinnan-tech/huoshan_double_stream
update:优化第一句话
2025-05-28 16:20:47 +08:00
hrz b225e8afd5 update:优化第一句话 2025-05-28 16:19:21 +08:00
hrzandGitHub 297b6e69d5 Merge pull request #1397 from xinnan-tech/huoshan_double_stream
火山双向流式tts优化
2025-05-28 15:52:58 +08:00
王华侨 d7f0e88801 火山双向流式tts优化 2025-05-28 15:47:49 +08:00
myifeng d62b27814c 打印cmp类型消息,后期适配 2025-05-28 14:09:13 +08:00
myifeng 19526878b3 接收hello消息中的features信息 2025-05-28 11:49:18 +08:00
欣南科技andGitHub 14ecad720f update:修复web测试工具Maximum call stack size exceeded 的bug (#1394) 2025-05-28 11:35:32 +08:00
hrzandGitHub 81689c04a5 Merge pull request #1393 from wenbindu/main
修改注释
2025-05-28 11:30:06 +08:00
hrzandGitHub de6b9de341 Update silero.py 2025-05-28 11:29:48 +08:00
hrz 7f864eb84d update:修复web测试工具Maximum call stack size exceeded 的bug 2025-05-28 11:23:39 +08:00
wenbindu 4af0c1e2ce 修改注释 2025-05-28 10:59:59 +08:00
欣南科技andGitHub 6a4ed78812 Merge pull request #1386 from xinnan-tech/py_server_log
update:日志配置动态获取
2025-05-28 01:14:40 +08:00
hrzandGitHub 23b881f364 Merge branch 'main' into py_server_log 2025-05-28 01:13:25 +08:00
hrz 22054cf8bc update:更新日志标识位置 2025-05-28 01:00:48 +08:00
欣南科技andGitHub fc236b1d96 Merge pull request #1383 from xinnan-tech/tts-response
TTS流式框架改造:支持豆包语音双流式+支持传统非流式
2025-05-27 23:34:11 +08:00
hrz 4f81454f93 update:更新sql脚本 2025-05-27 23:30:07 +08:00
hrz b3d6f173f1 update:智控台支持火山双流式配置 2025-05-27 23:29:11 +08:00
hrz 8d2ba39ab8 优化双流式TTS时的声音 2025-05-27 18:51:08 +08:00
hrz 4260e5a1a7 update:优化音频播放 2025-05-27 18:06:44 +08:00
Sakura-RanChen 17585c8294 update:日志配置动态获取 2025-05-27 16:17:13 +08:00
hrzandGitHub d242a9e5c0 Merge branch 'main' into tts-response 2025-05-27 15:36:42 +08:00
欣南科技andGitHub 9ca98f6391 Merge pull request #1351 from xinnan-tech/py_memory_llm
update: 记忆模块使用独立LLM openai增加超参
2025-05-27 15:29:22 +08:00
hrz be7ef08f40 update:智控台添加独立记忆模型配置 2025-05-27 15:28:17 +08:00
hrz 626692df29 update:优化阿里云tts数字参数读取方式 2025-05-27 13:47:07 +08:00
hrz 631787a4f1 update:这几天tts流式改造合并后,self.executor的主要任务将是用来上报聊天记录,因此这里其实可以合并在self.executor 2025-05-27 13:41:53 +08:00
hrzandGitHub 09cf6cdc2d Merge pull request #1372 from tiamohummer/main
增加阿里云TTS private_voice 判断
2025-05-27 13:14:41 +08:00
hrzandGitHub baf174b059 Merge pull request #1223 from GOODDAYDAY/feature/muti_upload
feat: 增加上报线程池
2025-05-27 13:06:55 +08:00
tiamohummerandGitHub 49eb3178a9 Merge branch 'xinnan-tech:main' into main 2025-05-27 09:08:34 +08:00
hrzandGitHub 6a6aceff1d Tts respone update (#1382)
* update:优化

* update:添加编码解码

* update:优化流式tts

* update:优化

* update:优化

* update:旧非流失兼容改造

* update:优化线程

* update:优化

* update:优化公共方法

* update:优化火山双流式tts

* update:优化代码

* update:修改版本号

* update:合并双流式
2025-05-26 22:31:39 +08:00
hrz b8349af3da update:合并双流式 2025-05-26 22:30:45 +08:00
goodyhao 258d783f8e Merge remote-tracking branch 'origin/main' into feature/muti_upload 2025-05-26 20:28:41 +08:00
goodyhao 761fc05331 feat: 增加上报时间 2025-05-26 20:27:22 +08:00
hrz 0c8e943d1b update:修改版本号 2025-05-26 16:18:35 +08:00
hrz 9787ca60da update:优化代码 2025-05-26 16:12:38 +08:00
Sakura-RanChenandGitHub b8e57aeff4 Merge pull request #1377 from xinnan-tech/py_test_page.html_fix
Py test page.html fix
2025-05-26 15:43:12 +08:00
CGD 9a0240ef3e update:优化了页面样式 2025-05-26 15:34:21 +08:00
tiamohummerandGitHub cf5ccafe7e Merge branch 'xinnan-tech:main' into main 2025-05-26 13:42:37 +08:00
hrz ae64233986 update:优化火山双流式tts 2025-05-26 12:48:43 +08:00
hrz 6dda79ee10 update:优化公共方法 2025-05-26 11:57:55 +08:00
CGD 335a855968 Merge branch 'py_test_page.html_fix' of https://github.com/xinnan-tech/xiaozhi-esp32-server into py_test_page.html_fix 2025-05-26 11:26:44 +08:00
CGD 94c92c5f38 fix:修复测试页面音频重复播放问题 2025-05-26 11:23:42 +08:00
CGDandGitHub 35fa1493b3 Merge pull request #1373 from Minamiyama/ENH/test-page-localstorage
refactor(test_page.html): 优化UI布局和输入提示,增加本地存储功能
2025-05-26 11:13:36 +08:00
hrz f78f6fc529 update:优化 2025-05-26 11:04:13 +08:00
hrz 5be65216e2 update:优化线程 2025-05-26 10:44:35 +08:00
hrz 24526ad206 update:旧非流失兼容改造 2025-05-26 02:20:38 +08:00
Minamiyama d7564a65f7 refactor(test_page.html): 优化UI布局和输入提示,增加本地存储功能
- 在OTA和WebSocket服务器地址输入框中添加更详细的占位符提示
- 增加本地存储功能,保存并恢复OTA和WebSocket服务器地址
2025-05-25 15:24:06 +08:00
goodyhao 866d61cfaf Merge branch 'refs/heads/main' into feature/muti_upload
# Conflicts:
#	main/xiaozhi-server/core/connection.py
2025-05-25 13:22:51 +08:00
欣南科技andGitHub 3f3f3fdaa6 Merge pull request #1371 from xinnan-tech/hot-fix
修复测试页面音频重复播放
2025-05-25 09:10:47 +08:00
hrz e0da59096a 修复测试页面音频重复播放 2025-05-25 09:10:11 +08:00
hrz 40632019ac update:优化 2025-05-25 08:56:58 +08:00
hrzandGitHub 3c5563b62f Merge pull request #1369 from xinnan-tech/py_test
fix:修复“小智服务器测试页面播放语音问题”
2025-05-25 08:46:57 +08:00
CGD 562424b74d fix:修复“小智服务器测试页面播放语音问题” 2025-05-25 00:09:36 +08:00
hrz 7a598d5839 update:优化 2025-05-24 23:43:16 +08:00
hrz 574d34bc2c update:优化流式tts 2025-05-24 17:50:03 +08:00
hrz 16a4ccdb12 update:添加编码解码 2025-05-24 14:52:27 +08:00
hrz 920cf4f897 update:优化 2025-05-24 12:11:13 +08:00
欣南科技andGitHub 76ee2c5365 Merge pull request #1366 from xinnan-tech/update-fix
合并chat和chat_with_function_calling
2025-05-24 09:40:28 +08:00
hrz 472106390d update:优化音频播放方法 2025-05-24 09:39:10 +08:00
hrz d97f8b2e9a update:供应器管理更名为字段管理,防止混淆模型管理 2025-05-24 02:17:49 +08:00
hrz 98e2526f8a update:合并chat和chat_with_function_calling 2025-05-24 02:15:06 +08:00
tiamohummer c30c4649a4 增加阿里云TTS private_voice 判断 2025-05-23 17:41:22 +08:00
欣南科技andGitHub ede8676979 Merge pull request #1363 from xinnan-tech/hot-fix
update:修复iotbug
2025-05-23 16:10:21 +08:00
hrz 17fb60b7ae update:修复iotbug 2025-05-23 16:03:15 +08:00
hrz 8119897818 Merge branch 'main' into tts-response
# Conflicts:
#	main/xiaozhi-server/core/handle/intentHandler.py
2025-05-23 09:15:15 +08:00
欣南科技andGitHub 0a9e5d2cea Merge pull request #1357 from xinnan-tech/update-docs
update:更新视频教程
2025-05-22 22:23:21 +08:00
hrz a5f74d7767 update:更新视频教程 2025-05-22 22:22:43 +08:00
Sakura-RanChen 02cb9c35b3 update: 记忆模块使用独立LLM openai增加超参 2025-05-22 17:14:58 +08:00
欣南科技andGitHub d934e0a69d Merge pull request #1348 from xinnan-tech/custom_tts_api
Custom tts api
2025-05-22 11:26:26 +08:00
hrz 2ecce6485c update:增加自定义的TTS接口服务的使用说明 2025-05-22 11:26:00 +08:00
hrz 1ad8aeeaa7 add:CustomTTS提供一个示例 2025-05-22 11:22:16 +08:00
hrz 46a15082d6 update:优化按钮 2025-05-22 10:41:56 +08:00
hrzandGitHub 153ecf0b41 Merge pull request #1253 from hsoftxl/custom_tts_api
自定义tts接口增加POST请求支持
2025-05-22 09:58:47 +08:00
hrzandGitHub f0f7304ae2 Merge branch 'custom_tts_api' into custom_tts_api 2025-05-22 09:58:38 +08:00
欣南科技andGitHub 997e171118 Merge pull request #1327 from xinnan-tech/web-pages-modifiy
增加fastgpt字段处理,搜索图标下移
2025-05-22 09:44:11 +08:00
欣南科技andGitHub 04a8fe8af2 Merge pull request #1342 from xinnan-tech/fix-global-iot
fix:修复全局变量all_function_registry导致iot描述无法更新bug
2025-05-22 09:43:13 +08:00
hrzandGitHub a0822a356c Merge pull request #1345 from CaixyPromise/chore/server-manager
chore: 服务端管理接口代码健壮性调整,补充注释与删除署名注释。
2025-05-22 09:01:28 +08:00
caixypromise b78d337fd0 chore: 服务端管理接口代码健壮性优化,补充注释与删除署名配置。 2025-05-22 00:49:56 +08:00
hrzandGitHub 13c5cb3f1d Merge pull request #1340 from xinnan-tech/py_symbol_fix
解决符号误识别问题,添加与退出相关的提示词
2025-05-21 22:12:52 +08:00
hrzandGitHub 197c0532fa Merge pull request #1341 from xinnan-tech/py_Recognizing-Intent_fix
update:修复intent_llm识别意图不精准问题,handle_device改名
2025-05-21 22:09:56 +08:00
hrz 76342b09ff fix:修复全局变量all_function_registry导致iot描述无法更新bug 2025-05-21 18:35:34 +08:00
CGD 241d96f6ac update:修复intent_llm识别意图不精准问题,handle_device改名 2025-05-21 18:17:08 +08:00
hrz fdc6dcb26e update:去掉无用代码 2025-05-21 16:25:22 +08:00
hrz 9fd010e91e update:调试 2025-05-21 15:59:24 +08:00
hrz c900498ce8 update:合并main分支 2025-05-21 15:55:40 +08:00
hrz c4c84e44e1 update:合并main分支 2025-05-21 14:52:24 +08:00
hrz 191ac47353 合并main分支 2025-05-21 14:13:52 +08:00
hrz 851365fb58 update:合并非tts代码 2025-05-21 13:18:12 +08:00
hrz ede2bc6a4e update:更新manager-api模块 2025-05-21 11:55:56 +08:00
hrz 38780b6daa update:忽略本地文件 2025-05-21 11:46:26 +08:00
欣南科技andGitHub 0dc267c109 Merge pull request #1337 from xinnan-tech/connect-server-and-api
智控台控制xiaozhi-server重启和更新配置
2025-05-21 11:01:43 +08:00
hrz bc6c85c6c6 update:增加ws连接时长,避免ws时间过短到只conn对象销毁丢失无法使用 2025-05-21 10:43:48 +08:00
Sakura-RanChen 915f4cac5e 对通用dict类型的字段进行处理 2025-05-21 09:55:15 +08:00
hrz b8da0714c2 update:优化无用组件 2025-05-20 22:58:42 +08:00
hrzandGitHub f1105e6822 Merge pull request #1331 from CaixyPromise/feature/connect-server-and-api
feat: 新增智控台管理websocket服务器端【配置拉取】和【重启】
2025-05-20 22:09:29 +08:00
hrzandGitHub 20296148eb Merge pull request #1332 from CaixyPromise/fix/dockerfile-arm
fix: 修复docker镜像不兼容arm64架构。
2025-05-20 22:01:52 +08:00
caixypromise 2138c0fb4f fix: 修复docker镜像不兼容arm开发板架构。
更新第三阶段运行状态的运行jdk镜像,切换包管理器为apk。
2025-05-20 20:13:41 +08:00
caixypromise 34d9857089 feat: 新增智控台管理websocket服务器端【配置拉取】和【重启】 2025-05-20 20:02:16 +08:00
欣南科技andGitHub 888b71a196 Merge pull request #1330 from xinnan-tech/hot-fix
update:优化ai_model_provider的fields字段
2025-05-20 18:05:10 +08:00
hrz 5f16c871dc update:优化ai_model_provider的fields字段 2025-05-20 18:04:33 +08:00
Sakura-RanChen 595a338de7 增加fastgpt字段处理,搜索图标下移 2025-05-20 16:57:48 +08:00
欣南科技andGitHub fe47fd1910 Merge pull request #1323 from xinnan-tech/hot-fix
fix:参数名称变更
2025-05-20 11:31:28 +08:00
hrz ac9abf8ede fix:参数名称变更 2025-05-20 11:30:57 +08:00
欣南科技andGitHub 282706dbc8 Merge pull request #1320 from xinnan-tech/manager-icp-num
可自定义智控台底部的系统名称、ICP备案号、公安备案号
2025-05-20 11:15:38 +08:00
hrz 5360cbf19c update:优化asr测速源:从已有的几个文件中测速度 2025-05-20 11:14:20 +08:00
hrz 84ac1b6686 update:可自定义智控台底部系统名称 2025-05-20 10:59:22 +08:00
CGD ebc16207f4 update:intent_llm添加与退出相关的提示词 2025-05-20 10:54:48 +08:00
欣南科技andGitHub 7611e98156 Merge pull request #1312 from xinnan-tech/manager-api-aly-message
修复短信并发漏洞
2025-05-19 21:23:49 +08:00
hrz 848f73715f update:完成密码找回功能 2025-05-19 21:19:24 +08:00
hrzandGitHub 6f30dfb963 Merge pull request #1315 from qjh9527/add-asr-performance
fix: stt中 test_count 计算逻辑错误
2025-05-19 20:32:03 +08:00
QJH c8aa903e3e fix: stt中 test_count 计算逻辑错误 2025-05-19 18:43:34 +08:00
剑雨 f0e55037de 剔除已经删除的类的引用和使用 2025-05-19 18:33:02 +08:00
hrzandGitHub 1335b368d1 Merge pull request #1314 from xinnan-tech/web-forget-password
增加找回密码的功能
2025-05-19 17:57:55 +08:00
CGD a647f3c105 fix:解决符号误识别问题 2025-05-19 15:18:01 +08:00
剑雨 c936372105 优化发送短信失败的情况,回退发送次数
--ALiYunSmsService.java 使用redis加1原子操作
--CaptchaServiceImpl.java 使用redis减1原子操作
2025-05-19 14:41:53 +08:00
Sakura-RanChen f242d43f73 增加找回密码的功能 2025-05-19 14:15:28 +08:00
hrzandGitHub c216012304 Merge pull request #1296 from qjh9527/add-asr-performance
Add ASR performance
2025-05-19 14:04:45 +08:00
hrzandGitHub 87c2f0e38e Merge pull request #1304 from 2331892928/main
ICP备案号添加
2025-05-19 13:51:15 +08:00
欣南科技andGitHub d9cc75edc0 Merge pull request #1307 from xinnan-tech/ali-msm-doc
增加阿里云短信集成使用说明
2025-05-19 11:44:27 +08:00
hrz 1f91ec32da update:优化说明 2025-05-19 11:43:28 +08:00
hrz 92b60b7f25 update:优化阿里云短信管理文档 2025-05-19 11:36:59 +08:00
hrz 8104d02a3a add:阿里云短信集群指南 2025-05-19 11:31:53 +08:00
剑雨 83c4add375 优化清空redis的key方法。添加加1,减1方法
--RedisUtils.java 新的方法
--emptyAll.lua 清空redis的key的lua脚本
2025-05-19 11:20:57 +08:00
剑雨 c19084b7b4 修复并发漏洞,获取和设置短信发送间隔时间,不是原子性的,并发请求过来会导致验证有漏洞被通过
--CaptchaServiceImpl.java 设置获取和设置发现间隔的方法为原子性
2025-05-19 10:51:39 +08:00
剑雨 2761e97c6a 新增获取在redis指定key的值,如果值为空,着设置key的默认值的方法
--RedisUtils.java 添加新方法
--getKeyOrCreate.lua 此方法的lua脚本
2025-05-19 10:46:59 +08:00
剑雨 0cdfd1d114 新建资源读取工具类
--ResourcesUtils.java 读取资源获取到字符串的方法
2025-05-19 10:41:02 +08:00
AMEN 8566e048b6 Merge remote-tracking branch 'origin/main' 2025-05-18 23:34:53 +08:00
AMEN 31fc731af6 前端
修改参数查询的input提示
增加公安备案号和网站备案号显示
2025-05-18 23:33:28 +08:00
AMEN ff95764824 后端
参数管理新增参数:
server.beian_icp_num
server.beian_ga_num
修改:
参数查询支持备注查询
2025-05-18 23:00:01 +08:00
欣南科技andGitHub 737c4a6b5d Merge pull request #1303 from xinnan-tech/hot-fix
修复:测试用例参数错误
2025-05-18 22:25:46 +08:00
hrz db68871646 修复:测试用例参数错误 2025-05-18 22:25:09 +08:00
剑雨 748f17b777 开启手机注册,验证相关参数不可以为空
--SysParamsServiceImpl.java 开启手机注册参数添加验证
2025-05-18 18:44:11 +08:00
欣南科技andGitHub bbba24c7bc Merge pull request #1301 from xinnan-tech/hot-fix
fix:登录失败错误信息显示
2025-05-18 17:59:37 +08:00
hrz 5bba864faa fix:登录失败错误信息显示 2025-05-18 17:59:08 +08:00
欣南科技andGitHub 33b7fe6072 Merge pull request #1300 from xinnan-tech/hot-fix
update:补充缺失参数
2025-05-18 17:55:53 +08:00
hrz 4d0bef62ed update:补充缺失参数 2025-05-18 17:55:18 +08:00
欣南科技andGitHub e09ba81cfa Merge pull request #1290 from xinnan-tech/manager-api-aly-message
阿里云短信发送功能,手机注册和找回密码接口
2025-05-18 17:42:30 +08:00
hrzandGitHub baf15450a3 Merge branch 'main' into manager-api-aly-message 2025-05-18 17:42:09 +08:00
hrz d24419cfb7 update:发送手机验证码 2025-05-18 17:39:12 +08:00
hrz fe88db2094 add:登录页面和注册页面增加手机号码选项 2025-05-18 17:38:20 +08:00
hrz 91d2ab7d1d update:优化 2025-05-18 11:09:58 +08:00
QJH 9a405a756f fix: "ASR", "LLM", "TTS"为空时的情况 2025-05-18 05:56:16 +08:00
QJH 86f5be23fe add: ASR测试任务 2025-05-18 05:48:31 +08:00
欣南科技andGitHub 9f4ca1aa6b Merge pull request #1294 from xinnan-tech/model-provider-service
Model provider service
2025-05-17 23:56:47 +08:00
hrz 624b1cce74 update:优化已存在的Group注解 2025-05-17 23:54:25 +08:00
hrz 29216768e1 update:优化模型供应器查询 2025-05-17 23:18:19 +08:00
hrz 59e18dc1c1 Merge branch 'main' into model-provider-service 2025-05-17 22:41:25 +08:00
欣南科技andGitHub 858a85f952 Merge pull request #1293 from xinnan-tech/hit-fix
update:修复fishspeech seed参数类型转换
2025-05-17 17:08:01 +08:00
hrz 1cbd68f1e3 update:修复fishspeech seed参数类型转换 2025-05-17 17:07:19 +08:00
欣南科技andGitHub 324bf62bb8 Merge pull request #1291 from xinnan-tech/hot-fix
update:恢复旧文件,解决已部署用户sql出错问题
2025-05-17 16:00:35 +08:00
hrz dd1d7d5dc1 update:回复旧文件,解决已部署用户sql出错问题 2025-05-17 15:58:53 +08:00
hrzandGitHub e6ad9e23cc Merge pull request #1288 from ljwwd2/main
供应器管理
2025-05-17 15:47:42 +08:00
hrzandGitHub a557322dc6 Merge pull request #1277 from 2331892928/main
用户管理页面的搜索功能增加模糊搜索
2025-05-17 15:36:20 +08:00
剑雨 7d7324ddbc 测试短信发送
--loginControllerTest.java 短信测试的测试类
2025-05-17 11:00:02 +08:00
剑雨 680ed4596f 测试,修复业务流程bug,添加新的错误代码和说明
--ErrorCode.java 新的错误代码
--LoginController.java 修复业务流程bug
--messages.properties 添加新的业务说明
2025-05-17 10:59:00 +08:00
剑雨 e66ab647e1 优化短信发送的异常处理
--ALiYunSmsService.java 优化异常处理
2025-05-17 10:57:02 +08:00
ljwwd2andGitHub 253f4c59a3 Merge branch 'xinnan-tech:main' into main 2025-05-17 01:19:12 +08:00
ljwwd2 38a97d6b5a 供应器管理-前端页面 2025-05-17 01:18:19 +08:00
ljwwd2 ae8f11d5a8 供应器管理-增删改查api 2025-05-17 01:18:03 +08:00
CGDandGitHub dcfd82f84e Merge pull request #1283 from xinnan-tech/py_text_audio
样式修改
2025-05-16 17:48:00 +08:00
TOM88812andGitHub 25a531341a Merge pull request #1281 from jwhna1/main
fix:修复智控台fish-speech无法按声音播放bug
2025-05-16 17:23:22 +08:00
曾能混andGitHub f421f6dee8 Merge branch 'xinnan-tech:main' into main 2025-05-16 17:16:44 +08:00
曾能混andGitHub a5332ccc7d Update 202504112044.sql
fix:修复智控台fish-speech无法按声音播放bug
2025-05-16 17:10:55 +08:00
Sakura-RanChen 76c3f401ea 样式修改 2025-05-16 14:55:53 +08:00
Sakura-RanChenandGitHub 5173dded2a Merge pull request #1280 from xinnan-tech/py_test_fix
update:在识别到continue_chat意图时,清理对话历史中的工具调用相关消息
2025-05-16 14:47:04 +08:00
CGD bdd8597f69 update:在识别到continue_chat意图时,清理对话历史中的工具调用相关消息 2025-05-16 14:33:37 +08:00
lvjinfa 46bba64a94 用户管理页面的搜索功能增加模糊搜索 2025-05-16 12:28:32 +08:00
XL d0694a0e70 兼容yaml配置和管理端配置 2025-05-16 11:56:54 +08:00
hsoftxlandGitHub bd12b0e81f Merge branch 'xinnan-tech:main' into custom_tts_api 2025-05-16 10:51:49 +08:00
TOM88812andGitHub 2f4fb0fc52 Merge pull request #1250 from jwhna1/main
Update ollama.py 为本地ollama部署qwen3大语言模型添加适配!
2025-05-16 10:51:17 +08:00
ljwwd2 cbabf01902 供应器管理-增删改查api 2025-05-16 03:04:52 +08:00
ljwwd2 c51c8b4af0 供应器管理-增删改查api 2025-05-16 01:42:19 +08:00
剑雨 2741e11078 新增发送短信验证码接口,找回密码接口,修改注册接口,如果开启手机注册模式,开启短信验证模式
--LoginController.java 添加和修改方法
--RetrievePasswordDTO.java 添加找回密码dto
2025-05-16 00:16:20 +08:00
剑雨 aa251aa011 添加校验单参数是否是正确的手机号的方法
--ValidatorUtils.java 添加新方法
2025-05-15 22:47:57 +08:00
剑雨 0509ddb129 验证模块添加发送短信验证码和验证短信验证码
--CaptchaService.java 新增发送短信验证码和验证短信验证码方法定义
--CaptchaServiceImpl.java 实现新定义定义的方法
--RedisKeys.java 添加短信验证码key
2025-05-15 21:45:33 +08:00
欣南科技andGitHub 5a180836b7 Merge pull request #1273 from xinnan-tech/fix-firmware-default-url
修复:固件要求firmware的url不能为空
2025-05-15 21:42:23 +08:00
hrz 9c7c6b9ea7 修复:固件要求firmware的url不能为空 2025-05-15 21:41:40 +08:00
欣南科技andGitHub d64eb0b087 Merge pull request #1268 from xinnan-tech/openrz-patch-2
docker-compose设置redis开机自启动
2025-05-15 17:41:54 +08:00
hrzandGitHub 28e4318f8a Update docker-compose_all.yml 2025-05-15 17:41:16 +08:00
欣南科技andGitHub 36f0821ea0 Merge pull request #1267 from xinnan-tech/openrz-patch-1
Update requirements.txt
2025-05-15 17:22:11 +08:00
hrzandGitHub 293a690ccd Update requirements.txt 2025-05-15 17:21:46 +08:00
欣南科技andGitHub 1c96ff7d3b Merge pull request #1266 from xinnan-tech/web-headerbar-modify
update:优化文档
2025-05-15 17:07:17 +08:00
hrz db8a2bb872 update:优化文档 2025-05-15 17:06:06 +08:00
hrz dfbe4fc7ee update:增加mcp-proxy依赖 2025-05-15 16:30:57 +08:00
欣南科技andGitHub 3cccc4ec64 Merge pull request #1265 from xinnan-tech/web-headerbar-modify
update:优化文档
2025-05-15 16:23:26 +08:00
hrz e29684e672 update:优化文档 2025-05-15 16:22:41 +08:00
欣南科技andGitHub 30796c6f81 Merge pull request #1262 from xinnan-tech/web-headerbar-modify
update:修复init_memorybug
2025-05-15 16:14:27 +08:00
hrz 86b5eb1818 update:修复init_memorybug 2025-05-15 16:13:32 +08:00
hrzandGitHub 696405a8bf Merge pull request #1256 from xinnan-tech/web-headerbar-modify
优化headerbar遮挡问题
2025-05-15 15:47:55 +08:00
Sakura-RanChen a2c2eab6b3 no message 2025-05-15 15:46:53 +08:00
XL eadb69bdc0 修改使用说明 2025-05-15 15:46:41 +08:00
XL e73223ca8a Merge remote-tracking branch 'origin/custom_tts_api' into custom_tts_api
# Conflicts:
#	main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
2025-05-15 15:39:47 +08:00
XL 6dd66dbae9 自定义tts接口参数转dict
支持post请求
2025-05-15 15:39:06 +08:00
Sakura-RanChen ead9ee81fb fix:summaryMemory key错误 2025-05-15 15:39:05 +08:00
XL 073b69f94a 自定义tts接口参数转dict 2025-05-15 15:38:34 +08:00
XL 1a0a0777a3 自定义tts接口参数转dict
支持post请求
2025-05-15 15:35:45 +08:00
XL a971ae2168 自定义tts接口参数转dict 2025-05-15 10:23:40 +08:00
Sakura-RanChen bd140af714 优化headerbar遮挡问题 2025-05-15 09:54:59 +08:00
曾能混andGitHub 6b8d2502b7 Update ollama.py
为本地ollama部署qwen3大语言模型添加适配!在识别到启用为qwen3大模型的时候自动添加no_think停用推理模式,并过滤<think></think>标签转入给TTS(因为qwen3虽然用no_think停用推理后还是会输出<think></think>转入到TTS)
2025-05-15 06:32:47 +08:00
欣南科技andGitHub 96008fa78f Merge pull request #1249 from xinnan-tech/manager-local-mem
fix:short_momery可能为空的bug
2025-05-14 23:01:03 +08:00
hrz da4d0f515c fix:short_momery可能为空的bug 2025-05-14 22:59:55 +08:00
欣南科技andGitHub 67e6a22da9 Merge pull request #1248 from xinnan-tech/manager-local-mem
增加智控台管理【本地记忆】功能
2025-05-14 22:29:59 +08:00
hrz b791fb1494 update:优化总结内容 2025-05-14 22:28:36 +08:00
hrzandGitHub 9e329bf19f Merge pull request #1245 from CaixyPromise/chore/setting-ota-firmware-in-old-version
chore: 支持在老版本激活设备时,OTA返回有效的硬件信息。
2025-05-14 20:32:16 +08:00
hrzandGitHub 3906e8a942 Delete main/manager-web/pnpm-lock.yaml 2025-05-14 20:31:55 +08:00
hrzandGitHub f74faea065 Merge pull request #1243 from xinnan-tech/py_weather_fix
Py weather fix
2025-05-14 20:30:56 +08:00
hrzandGitHub 7d3759acce 统一无意义域名 2025-05-14 20:28:40 +08:00
caixypromise 172962f711 chore: 支持在老版本激活设备时,OTA返回有效的硬件信息。
如果设备未激活,当前OTA会返回一个空的的firmware响应体。但老版本(如1.4.7)会因为缺少firmware响应体无法走通OTA版本检查流程。老版本相关代码如下
```CPP
// ota.cc - version 1.4.7 -line 131
cJSON *firmware = cJSON_GetObjectItem(root, "firmware");
    if (firmware == NULL) { // firmware为空
        ESP_LOGE(TAG, "Failed to get firmware object");
        cJSON_Delete(root);
        return false;
    }
```
因此,在老版本激活设备时,OTA将直接返回的当前激活设备上传硬件的信息,以便老版本设备能够走通OTA版本检查流程。后续用户可以再通过智控台更新OTA版本。
2025-05-14 19:55:20 +08:00
Sakura-RanChen 36109e3b88 增加获取默认值,配置文件提示 2025-05-14 17:17:03 +08:00
Sakura-RanChen 7c63b7c062 no message 2025-05-14 16:50:15 +08:00
Sakura-RanChen 1efaf048f5 优化供应器编辑 2025-05-14 16:48:35 +08:00
Sakura-RanChen ac52714498 weather-fix 2025-05-14 16:30:53 +08:00
Sakura-RanChenandGitHub c3de89f504 Merge pull request #1233 from xinnan-tech/py_test
修复“A客户端断开连接执行"保存记忆并关闭连接"过程中,B客户端创建连接会被阻塞”问题
2025-05-14 14:57:41 +08:00
CGDandGitHub 6f6a645d0a Merge pull request #1238 from xinnan-tech/web-Supplier-Page
增加供应器管理页面,优化页面样式和数据校验
2025-05-14 14:54:33 +08:00
CGDandGitHub 5605352144 Merge branch 'main' into py_test 2025-05-14 14:52:57 +08:00
Sakura-RanChen ef433f446d 增加供应器管理页面,优化页面样式和数据校验 2025-05-14 14:43:36 +08:00
hrz fe8f200364 update:连接ota接口时,异步更新最新连接时间 2025-05-14 14:42:59 +08:00
剑雨 e4194cdf4d 添加使用阿里云平台发送验证码短信的方法
--pom.xml 添加短信发送sdk
--Constant.java 添加发送短信的参数枚举
--ALiYunSmsService.java 阿里云实现短信方法
--SmsService.java 短信方法定义
2025-05-14 14:18:01 +08:00
剑雨 c8392c9b47 添加发送短信参数,添加到数据库里
--202505141129.sql
--db.changelog-master.yaml
2025-05-14 12:22:13 +08:00
hrz be3a030302 update:优化记忆体布局 2025-05-14 12:09:29 +08:00
CGD cd6d4488d1 update:"使用线程池异步保存记忆" 2025-05-14 11:22:09 +08:00
hrzandGitHub da3a5df5c3 Merge pull request #1230 from ljwwd2/main
增加智控台管理【本地记忆】功能
2025-05-14 10:52:57 +08:00
欣南科技andGitHub 4864407d61 Merge pull request #1232 from xinnan-tech/test-exit
fix:修正warn为warning
2025-05-14 10:41:31 +08:00
hrz f6f7879d6e fix:修正warn为warning 2025-05-14 10:40:40 +08:00
hrzandGitHub dab1f14a59 Merge pull request #1228 from CaixyPromise/feature/custom-end-prompt
feature: 新增结束词prompt自定义能力。
2025-05-14 10:05:31 +08:00
hrzandGitHub 51ca914206 end_prompt默认为开启 2025-05-14 10:04:30 +08:00
ljwwd2 933ffb8ca2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
2025-05-14 03:31:31 +08:00
ljwwd2 2f5f20a257 增加智控台管理【本地记忆】功能 2025-05-14 03:27:32 +08:00
caixypromise 92544f89f3 feature: 新增结束词prompt自定义能力。
新增在python服务端在config配置内自定义结束词提示词(end_prompt),仅在enable为True时触发结束聊天,否则自动默认清理资源退出。

close(#963)
2025-05-14 00:12:31 +08:00
欣南科技andGitHub f1cf1acbfa Merge pull request #1226 from xinnan-tech/fix-fun-server
fix:修复智控台fish-speech无法按声音播放bug
2025-05-13 18:29:16 +08:00
hrz f22008389c fix:修复智控台fish-speech无法按声音播放bug 2025-05-13 18:28:27 +08:00
goodyhao 885b7a0b05 feat: 增加上报线程池 2025-05-13 15:54:00 +08:00
欣南科技andGitHub 91de372cbc Merge pull request #1222 from xinnan-tech/fix-fun-server
update:优化ASR_FunASRServer文档
2025-05-13 15:19:02 +08:00
hrz 811bd94934 update:优化ASR_FunASRServer文档 2025-05-13 15:18:23 +08:00
hrzandGitHub 5987488b3d Merge pull request #1199 from whosmyqueen/feature/add-fun-asr-auth
[feature] 添加FunServerAsr认证
2025-05-13 14:21:16 +08:00
hrzandGitHub 966c9e972d Merge branch 'main' into feature/add-fun-asr-auth 2025-05-13 14:21:06 +08:00
欣南科技andGitHub 464261a1b7 Merge pull request #1218 from xinnan-tech/hot-fix
update:优化未开启记忆的聊天记录按钮样式
2025-05-13 11:21:13 +08:00
hrz 363dcef81a update:优化未开启记忆的聊天记录按钮样式 2025-05-13 11:18:03 +08:00
GoodyHaoandGitHub 4439617c50 Merge pull request #1204 from GOODDAYDAY/main
feat: 优化上报命名含义,增加不同上报开关
2025-05-13 10:58:33 +08:00
欣南科技andGitHub 5d2fa3d65d Merge pull request #1215 from xinnan-tech/hot-fix
update:修复fishspeech的normalize获取值转换bug
2025-05-13 10:14:51 +08:00
hrz 8930ab0af6 update:修复fishspeech的normalize获取值转换bug 2025-05-13 10:14:15 +08:00
欣南科技andGitHub 6af6fe22fc Merge pull request #1211 from xinnan-tech/enhance-gemini-with-proxy
Enhance gemini with proxy
2025-05-13 08:50:31 +08:00
hrzandGitHub dd577a7843 Merge pull request #1208 from CaixyPromise/update/enhance-gemini-with-proxy
Update: 提升Gemini代理配置能力,支持function_call调用与stream流式对话能力
2025-05-12 21:54:24 +08:00
caixypromise f772155674 chore: 删除无用的包引入。 2025-05-12 21:39:13 +08:00
caixypromise 3ce204338a chore: 删除无用的包引入。 2025-05-12 21:38:23 +08:00
caixypromise 168bc9ef45 update: 改进gemini连通代理能力,自动测试与装配合适的代理配置信息。 2025-05-12 21:33:43 +08:00
caixypromise bfc3d4888b Merge remote-tracking branch 'upstream/main' into update/enhance-gemini-with-proxy 2025-05-12 21:29:42 +08:00
goodyhao 0148b115db Merge branch 'feature/upload-optimise'
# Conflicts:
#	main/xiaozhi-server/core/connection.py
#	main/xiaozhi-server/core/handle/reportHandle.py
2025-05-12 19:16:29 +08:00
goodyhao 0b11953f6f feat: 优化上报命名含义,增加不同上报开关 2025-05-12 19:14:04 +08:00
欣南科技andGitHub 6e210faacf Merge pull request #1206 from xinnan-tech/manager-plugin-api
聊天记录支持配置
2025-05-12 18:30:12 +08:00
hrz 4ef755e10b update:优化插件显示 2025-05-12 18:28:52 +08:00
hrz 62b7cc5509 update:更新版本号 2025-05-12 18:10:34 +08:00
hrz 0e1ec05110 Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/xiaozhi-esp32-server into manager-plugin-api 2025-05-12 18:07:28 +08:00
hrz dd38fc74db update:右智控台下发聊天记录上报策略 2025-05-12 18:06:58 +08:00
GoodyHao d619d7ac76 feat: 优化上报命名含义,增加不同上报开关 2025-05-12 17:55:54 +08:00
Sakura-RanChen 37f7511ba0 Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/xiaozhi-esp32-server into manager-plugin-api 2025-05-12 16:49:46 +08:00
Sakura-RanChen afd03ba1b5 完善插件管理页面 2025-05-12 16:48:34 +08:00
hrz ac7b02d28a update:保存智能体配置时,删除对应的历史记录 2025-05-12 16:31:06 +08:00
hrz 4a0bdbf779 update:聊天记录上报模式和记忆模式绑定 2025-05-12 15:49:44 +08:00
whosmyqueen 164dada46a feat(core): 为 FunASR 服务添加 API 密钥支持并优化结果处理
- 在 FunASRWebSocket 类中添加 API密钥配置
- 在 WebSocket连接时添加认证头信息- 使用正则表达式处理返回结果,提取有用信息
2025-05-12 14:38:58 +08:00
hrz fd1c4ec792 Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/xiaozhi-esp32-server into manager-plugin-api 2025-05-12 14:16:35 +08:00
hrz add000d221 update:数据库增加聊天上报策略字段 2025-05-12 14:16:08 +08:00
hrzandGitHub def598f728 Merge pull request #1198 from xinnan-tech/web-Plug
增加插件管理的页面
2025-05-12 14:13:05 +08:00
hrzandGitHub 0294885fbf Merge branch 'manager-plugin-api' into web-Plug 2025-05-12 14:12:54 +08:00
Sakura-RanChen c0ec4338f8 增加插件管理的页面 2025-05-12 14:10:05 +08:00
whosmyqueen fb7f6f73bd Merge branch 'main' into feature/add-fun-asr-auth 2025-05-12 13:10:27 +08:00
caixypromise e04c38e557 Merge branch 'refs/heads/feature/gemini-llm' into update/enhance-gemini-with-proxy 2025-05-12 04:38:09 +08:00
hrz bfb5420733 update:修改记录类型为0、1、2 2025-05-11 19:23:01 +08:00
hrzandGitHub 9e6fc32903 Merge pull request #1175 from ljwwd2/main
聊天记录支持配置
2025-05-11 19:06:27 +08:00
hrz 217ceb1c7a update:优化新增固件框宽度显示 2025-05-11 19:04:39 +08:00
hrz 846f89664e update:优化非LLM使用functioncall意图识别的提示 2025-05-11 16:11:44 +08:00
hrz 0e30f69e96 update:优化小图显示 2025-05-11 16:10:37 +08:00
ljwwd2 af9eb538f4 Merge remote-tracking branch 'origin/main' 2025-05-11 03:25:23 +08:00
ljwwd2 66a0beea33 前端-根据agentId获取智能体配置 2025-05-11 03:25:04 +08:00
ljwwd2andGitHub 411e73bb35 Merge branch 'xinnan-tech:main' into main 2025-05-11 03:23:26 +08:00
ljwwd2 852e222f5d 前端-聊天记录支持配置 2025-05-11 03:19:40 +08:00
hrz 054ceab4f4 update:优化非LLM使用functioncall的提示 2025-05-10 22:22:27 +08:00
欣南科技andGitHub d9149ff572 Merge pull request #1180 from xinnan-tech/feature/ha-llm
恢复HomeAssistant作为LLM使用
2025-05-10 21:55:08 +08:00
hrz 7f331690a0 update:增加误用function_call的提示 2025-05-10 21:52:31 +08:00
ljwwd2 a5698dfff0 聊天记录支持配置 2025-05-10 02:24:55 +08:00
ljwwd2 1e5866da06 聊天记录支持配置 2025-05-10 02:18:28 +08:00
欣南科技andGitHub 3f7b7da184 Merge pull request #1173 from xinnan-tech/hot-fix
update:修复立创1.6.2固件一直聆听中bug
2025-05-10 01:15:38 +08:00
hrz c0020c8769 update:修复立创1.6.2固件一直聆听中bug 2025-05-10 01:14:51 +08:00
hrzandGitHub 1c5e678cef Merge pull request #1130 from xinnan-tech/py-test
Py test
2025-05-09 18:09:31 +08:00
hrzandGitHub 3ab1b8ebc9 Merge branch 'main' into py-test 2025-05-09 18:08:48 +08:00
hrz 7635c68ccd update:增加aioconsole依赖 2025-05-09 18:01:36 +08:00
hrzandGitHub a3b562b895 Merge pull request #1113 from hsoftxl/tts-bug
tts 失败重试bug修复
2025-05-09 17:32:47 +08:00
欣南科技andGitHub 94d1493195 Merge pull request #1165 from xinnan-tech/hot-fix
fix:intent_llm的functions也需要返回成数组
2025-05-09 16:39:32 +08:00
hrz 3a5bbe32b9 fix:intent_llm的functions也需要返回成数组 2025-05-09 16:15:26 +08:00
whosmyqueen 7e712c5003 build(db): 更新模型供应器和配置
- 更新 ai_model_provider表中的字段配置
- 更新 ai_model_config 表中的配置 JSON- 添加新的数据库变更脚本202505091552.sql
- 在 db.changelog-master.yaml 中引用新脚本
2025-05-09 16:01:09 +08:00
欣南科技andGitHub 31328e092e Merge pull request #1164 from xinnan-tech/add_news
整合新的新闻插件
2025-05-09 15:26:58 +08:00
hrzandGitHub 29671f48a8 Merge branch 'main' into add_news 2025-05-09 15:25:15 +08:00
hrz 61c2782491 update:智控台,intent_llmM供应器增加functions输入框 2025-05-09 15:23:12 +08:00
hrz 15263b5223 update:更新英文版说明 2025-05-09 14:26:49 +08:00
hrz 557d1ee5b0 update:取消设备一连接就强制升级,改成绑定后再根据升级策略升级 2025-05-09 14:07:46 +08:00
hrz 777265c730 fix:参数管理保存json类型出错bug 2025-05-09 14:00:42 +08:00
hrz e76a8d547b update:使用intent_llm中的LLM进行工具内容回复 2025-05-09 13:45:01 +08:00
hrz ff98f84f18 update:intent_llm加载动态插件 2025-05-09 11:39:32 +08:00
hrzandGitHub d0b4fa5b28 Merge branch 'main' into py-test 2025-05-09 09:52:26 +08:00
hrzandGitHub 91b80f7c49 Merge pull request #1155 from xinnan-tech/web-pages-modifiy
页面优化
2025-05-09 09:51:27 +08:00
hrz 47f409246d update:intent_llm暂时不引用新闻插件,下一个版本改造intent_llm,让它能动态获取functioncall 2025-05-08 18:25:02 +08:00
hrz be1ff83297 update:通过pip来安装markitdown依赖 2025-05-08 18:23:37 +08:00
hrz 297c9e0085 update:重命名新闻插件,以平台来源来命名 2025-05-08 18:23:06 +08:00
Sakura-RanChen ec95917b4d 页面优化 2025-05-08 17:57:11 +08:00
hrzandGitHub 98bfe863fe 修复test_page.html没有hello消息,导致缺失audio_format的bug (#1151) 2025-05-08 15:08:11 +08:00
hrzandGitHub af3d00662e Merge pull request #1147 from xinnan-tech/fix-web-doubaoasr
update:更新版本号
2025-05-08 12:10:39 +08:00
欣南科技andGitHub 39803fb0df Merge pull request #1146 from xinnan-tech/fix-web-doubaoasr
修复:智控台豆包ASR缺少热词引发的bug
2025-05-08 12:09:11 +08:00
hrz 4dad5ea6c1 update:智控台添加百度ASR
修复:智控台豆包ASR缺少热词引发的bug
2025-05-08 12:07:50 +08:00
hrzandGitHub ba8cb8c6f8 Merge pull request #1125 from xinnan-tech/pcm
客户端上传编码为PCM时,服务端下发PCM格式的音频
2025-05-08 11:31:49 +08:00
hrz 64f10b28e7 update:合并main分支 2025-05-08 11:31:12 +08:00
hrzandGitHub 7f34447ace Merge branch 'main' into pcm 2025-05-08 11:18:12 +08:00
hrz c2e000f937 add:asr赋值audio_format 2025-05-08 11:11:28 +08:00
hrzandGitHub 831ab6d99b Merge pull request #1005 from JavaZeroo/add_news
feat: 添加多个新闻源,并修复大模型意图识别没有处理ActionResponse的问题
2025-05-08 10:01:33 +08:00
hrzandGitHub b246d9e567 fix:selected_module可能为空的bug (#1144)
* update:优化时间显示

* update:优化时间显示

* fix:selected_module可能为空的bug
2025-05-08 09:35:46 +08:00
hrzandGitHub 919c2ffd46 update:优化时间显示 (#1143)
* update:优化时间显示

* update:优化时间显示
2025-05-07 23:37:38 +08:00
hrzandGitHub e6d63a811e update:优化时间显示 (#1139) 2025-05-07 23:21:47 +08:00
hrzandGitHub 92227098b7 Merge pull request #1066 from xinnan-tech/manager-api-lastConnectedAtIsNull-BUG
修复了"获取用户智能体列表"中lastConnectedAt为null的bug
2025-05-07 22:57:08 +08:00
hrz 571080c1d6 update:优化最近对话时间 2025-05-07 22:56:51 +08:00
hrzandGitHub d07feb837d Merge branch 'main' into manager-api-lastConnectedAtIsNull-BUG 2025-05-07 22:45:51 +08:00
JavaZeroo 1c823c4255 feat: add news retrieval functionality and register new function 2025-05-07 21:15:06 +08:00
欣南科技andGitHub 63e378524b Merge pull request #1133 from xinnan-tech/hot-fix
update:优化日志对象
2025-05-07 18:06:57 +08:00
hrz ea5f54e421 update:优化日志对象 2025-05-07 18:06:13 +08:00
CGD ee18fbebae fix:修复“服务器运行时未处理标准输入(stdin),导致输入被缓冲,直到程序终止后才释放”的问题 2025-05-07 16:20:43 +08:00
CGD fa56d06e0c update:优化重启服务器功能 2025-05-07 16:17:50 +08:00
CGDandGitHub 72f7514114 Merge pull request #1129 from xinnan-tech/py-timeout-fix
Py timeout fix
2025-05-07 15:26:24 +08:00
Sakura-RanChen 44e1f00ffc fix:增加日志,方便意图识别 2025-05-07 15:17:34 +08:00
CGD e7054ea13f update:重启服务器功能功能 2025-05-07 14:36:08 +08:00
Sakura-RanChen 4a3ac2cfcd no message 2025-05-07 14:35:41 +08:00
Sakura-RanChen bbc31e01c4 fix:tts队列统一元组 2025-05-07 14:31:59 +08:00
玄凤科技 ba86b34a8c pcm模式,同步其他asr 2025-05-07 11:34:29 +08:00
剑雨 770a198772 获取设备最大的最近连接时间。改为在数据库里排序好后返回给系统,缓存时间修改为2分钟
--DeviceDao.java 修改方法返回值
--DeviceDao.xml 修改sql,在数据库里排序返回
--DeviceServiceImpl.java 修改缓存时间为2分钟
2025-05-07 11:04:14 +08:00
欣南科技andGitHub a26bee3696 Py update config (#1120)
* update:优化获取默认配置

* update:优化未绑定用户的连接

* update:修复智控台模式下,所选模块的日志名称

* update:优化参数配置敏感密钥的显示方式

* update:更新服务器配置并重新初始化组件
2025-05-07 09:15:52 +08:00
hrzandGitHub abb8f4f963 Merge pull request #1115 from xinnan-tech/py_tts_timeout
update: tts超时导致的文本索引混乱
2025-05-07 09:12:35 +08:00
hrz 43d2adff70 update:更新服务器配置并重新初始化组件 2025-05-07 09:11:59 +08:00
Junsen HuangandGitHub 474eeb9e68 Merge pull request #1102 from CaixyPromise/feature/ha-llm
feature: 恢复HA的LLM能力。补充关于HA的LLM大模型和MCP集成方法文档
2025-05-07 01:18:24 +08:00
Junsen HuangandGitHub e2dffea423 Merge pull request #1104 from CaixyPromise/feature/wait-exit-fix
fix(app): 修复app.py内的wait_for_exit(),以此解决Windows环境下手动退出时,进程阻塞卡死的问题。
2025-05-07 00:48:27 +08:00
Junsen HuangandGitHub 3d5eaba46f Merge pull request #1105 from CaixyPromise/feature/mcp-exit-fix
fix(MCP): 重构MCPClient为后台协程 + AsyncExitStack管理,解决进程退出时“Attempted to exit cancel scope in a different task”错误
2025-05-07 00:47:37 +08:00
caixypromise 1bb8fbd56f resolve: merge upstream/main into feature/mcp-exit-fix and fix conflicts 2025-05-07 00:39:21 +08:00
hrz b699886953 update:优化参数配置敏感密钥的显示方式 2025-05-06 17:30:39 +08:00
hrz 12c957d48b update:修复智控台模式下,所选模块的日志名称 2025-05-06 17:14:58 +08:00
玄凤科技andGitHub 48e890c1b1 Merge pull request #1106 from kevin1sMe/feat-mcp
feat: MCP server支持使用sse模式
2025-05-06 15:38:11 +08:00
Sakura-RanChen 05331f001a update: tts超时导致的文本索引混乱 2025-05-06 15:15:27 +08:00
玄凤科技 bde260b330 PCM音频模式 2025-05-06 14:57:29 +08:00
XL 59ef51ea20 tts 失败重试bug修复 2025-05-06 14:19:05 +08:00
hrz aa77bfdfc4 update:优化未绑定用户的连接 2025-05-06 13:10:26 +08:00
hrz a2baef8911 update:优化获取默认配置 2025-05-06 13:09:43 +08:00
kevin1sMe 3fcfb65d45 update: example 2025-05-04 23:37:17 +08:00
kevin1sMe 8f266bea0d feat: MCP server支持使用sse模式 2025-05-04 23:33:07 +08:00
caixypromise 0a765f4aac fix(MCP): 重构MCPClient为后台协程 + AsyncExitStack管理,解决进程退出时的“Attempted to exit cancel scope in a different task”错误
# 变更
----
- 将所有stdio_client与ClientSession的创建/销毁都放到同一个后台 task 中
- 使用AsyncExitStack托管异步资源,cleanup时在同一task内执行exit_stack.aclose()
- 外部只通过事件通知后台task退出,避免跨协程调用cancel-scope异常
2025-05-04 23:27:47 +08:00
caixypromise ee3f0555d1 fix(app): 重写app.py内的wait_for_exit(),以此解决Windows环境下手动退出时,进程阻塞卡死的问题。
影响
----
- Ctrl‑C/kill退出时不再卡住,资源完全释放,
- Windows 与 Unix 行为一致,改动不影响正常业务逻辑。
2025-05-04 23:26:39 +08:00
caixypromise 0c0386f4ba feature: 新增Gemini模型支持function_call功能,支持在代理模式下使用流式stream对话模式。 2025-05-04 23:24:33 +08:00
caixypromise 6c2b1cb589 feature: 恢复HA的LLM支持能力。
docs: 更新Home Assistant-integration.md内容,补充提交关于HA集成的说法,介绍LLM大模型和MCP集成方法。

issue #616
2025-05-04 23:22:33 +08:00
hrzandGitHub 9fc1285c09 Merge pull request #1101 from xinnan-tech/hot-fix
update:删除智能体时删除聊天记录
2025-05-04 20:34:49 +08:00
欣南科技andGitHub e6e8ccee50 Merge pull request #1100 from xinnan-tech/hot-fix
Hot fix
2025-05-04 20:15:07 +08:00
hrz f9632af016 创建智能体返回智能体id 2025-05-04 20:13:32 +08:00
hrz 81359bf419 修复智控台音频播放权限bug 2025-05-04 20:03:13 +08:00
欣南科技andGitHub a144570ed7 Merge pull request #1097 from xinnan-tech/chat-history-ui
Chat history UI
2025-05-04 15:45:11 +08:00
hrz 0732b72e8f update:聊天记录音频播放 2025-05-04 15:43:28 +08:00
欣南科技andGitHub 8332445a52 Merge pull request #1096 from xinnan-tech/chat-history-ui
Chat history UI
2025-05-04 13:16:58 +08:00
hrz c9111d1bfc update:优化websocket地址验证 2025-05-04 13:15:49 +08:00
hrz e7d999278d update:优化显示 2025-05-04 13:00:56 +08:00
hrz 4043d20ea6 update:聊天记录展现 2025-05-04 12:53:36 +08:00
hrzandGitHub afe88ccfd6 Merge pull request #1091 from xinnan-tech/asr_code_clear
规范asr部分的代码,添加百度asr支持
2025-05-04 01:21:00 +08:00
hrz 56c3a04809 update:优化百度ASR文档链接 2025-05-04 01:19:54 +08:00
hrz 4530345a1f fix:设置有效的时区 2025-05-04 00:51:51 +08:00
hrzandGitHub 4a89ec8515 Merge pull request #1092 from kevin1sMe/fix-doubao-tts
fix: doubao tts token
2025-05-04 00:46:53 +08:00
欣南科技andGitHub cb5f1c6485 Merge pull request #1093 from xinnan-tech/hot-fix
add:获取聊天记录API
2025-05-03 23:49:02 +08:00
kevin1sMe 15c0677a4b fix: doubao tts token 2025-05-03 23:33:32 +08:00
hrz dc68b8148a add:获取聊天记录API 2025-05-03 23:30:39 +08:00
王华侨 1976034f12 添加百度asr支持 2025-05-03 22:21:22 +08:00
王华侨 727621fdac 规范asr部分的代码 2025-05-03 22:20:50 +08:00
欣南科技andGitHub 0f3806d358 Merge pull request #1086 from xinnan-tech/hot-fix
update:上报聊天音频
2025-05-02 16:29:48 +08:00
hrz dfb2bf3923 update:上报聊天音频 2025-05-02 16:17:18 +08:00
欣南科技andGitHub bf08a91191 Merge pull request #1085 from xinnan-tech/upload-history
add: 增加聊天记录上报
2025-05-02 00:09:13 +08:00
hrz f0e353cc1a update:优化对话数据上传 2025-05-02 00:07:36 +08:00
hrzandGitHub 456b1eddcc Merge pull request #1071 from MakerZorky/main
feat:增加DoubaoASR热词、替换词选项
2025-05-01 18:08:43 +08:00
hrzandGitHub 5e08f05437 Merge pull request #1077 from GOODDAYDAY/feature/upload-history
feat: 增加asr,tts聊天记录和文件上报功能
2025-05-01 18:05:55 +08:00
欣南科技andGitHub 9f9227bae4 Merge pull request #1083 from xinnan-tech/manager-dict
update:字典前端增删改查
2025-05-01 16:59:38 +08:00
hrz 76f47bce37 update:字典前端增删改查 2025-05-01 16:57:58 +08:00
hrzandGitHub e1f54b30dc Merge pull request #1080 from xinnan-tech/manager-api-dict
数据字典接口开发
2025-05-01 00:18:22 +08:00
hrzandGitHub fc4e7e6c05 Merge pull request #1078 from xinnan-tech/py_update-restart
update:修改python部分的“动态配置更新”的验证逻辑
2025-04-30 23:38:21 +08:00
欣南科技andGitHub 7aaa79b644 Merge pull request #1081 from xinnan-tech/test-aliyun-asr
update:增加阿里云ASR
2025-04-30 23:34:16 +08:00
hrz 9b6f894be2 update:智控体增加阿里云ASR 2025-04-30 23:33:17 +08:00
zccaif 48f7ef2023 数字字典接口开发 2025-04-30 22:46:55 +08:00
MakerZorkyandGitHub 54692859fd Update:config.yaml热词注释 2025-04-30 19:23:44 +08:00
CGD 1719244015 update:修改python部分的“动态配置更新”的验证逻辑 2025-04-30 18:11:46 +08:00
goodyhao 48f8c6c5b7 feat: 增加asr,tts文件上报功能 2025-04-30 17:56:52 +08:00
hrzandGitHub f0815e595b Merge pull request #711 from LFNL-scholar/main
新增阿里云ASR
2025-04-30 17:55:37 +08:00
欣南科技andGitHub 4f829017ed Merge pull request #1074 from xinnan-tech/test-pr
增加server通用secret过滤器
2025-04-30 15:11:09 +08:00
hrz d2f8f05acb update:优化配置及文档 2025-04-30 15:05:42 +08:00
MakerZorky e8b1156bfd feat:增加DoubaoASR热词、替换词选项 2025-04-30 13:34:00 +08:00
CGDandGitHub bf748773c8 Merge pull request #1059 from xinnan-tech/server_tts_test
update:优化吞音问题,解决播放长音频时的错误退出
2025-04-30 11:58:03 +08:00
Sakura-RanChenandGitHub a05b25ae90 Merge pull request #1068 from xinnan-tech/py-update-config
update:python部分"动态更新配置"的优化
2025-04-30 11:57:09 +08:00
CGD 3ceb3feccf update:python部分"动态更新配置"的优化 2025-04-30 11:55:19 +08:00
剑雨 b4944f23ef 添加了一个新的redis:key
--RedisKeys.java 获取设备最近最久时间的key
2025-04-30 11:08:59 +08:00
剑雨 09c17b2dc5 优化方法,把获取最近最后时间获取,放在获取设备数量前面前,可以减少一次sql查询,因为在获取时间的时候,已经顺便缓存的设备数量了
--AgentServiceImpl.java 优化:减少sql查询
2025-04-30 11:07:53 +08:00
剑雨 6f7ff9f858 优化获取这个智能体设备理的最近的最后连接时间方法,缓存时间和设备数量
--DeviceServiceImpl.java 优化方法
2025-04-30 11:05:58 +08:00
hrz 9e9af2a031 update:优化文档 2025-04-30 10:53:29 +08:00
剑雨 7d74e853ae 修复智能体最近的最后连接时间为空的bug
--AgentServiceImpl.java 修复bug
2025-04-30 10:46:34 +08:00
剑雨 1d627d570d 添加获取这个智能体设备理的最近的最后连接时间定义和实现
--DeviceService.java 方法定义
--DeviceServiceImpl.java 方法实现
2025-04-30 10:45:49 +08:00
剑雨 9b0088f4f0 添加获取获取此智能体全部设备的最后连接时间,方法定义和sql,不使用mysql-plus的方法,是为了减少数据库数据传输,因为只需要最后连接时间字段
--DeviceDao.java 方法定义
--DeviceDao.xml sql
2025-04-30 10:44:54 +08:00
hrz b50c7dbed4 update:修正docker上传目录uploadfile映射 2025-04-30 10:38:18 +08:00
剑雨 f92c0313a6 添加保存用户测试方法和模拟设备连连接过来的方法,方便新开发者调试
--DeviceTest.java
2025-04-30 09:41:38 +08:00
hrzandGitHub 233e1ee0a6 Merge pull request #1052 from myifeng/main
采用约定大于配置的原则,减少用户冗余设置,用户仅调整自定义设置
2025-04-29 22:50:36 +08:00
hrzandGitHub 805b40ec76 Merge pull request #1033 from GOODDAYDAY/feature/doubao-tts
feat: 增加对豆包tts对话速率等控制
2025-04-29 22:47:26 +08:00
hrzandGitHub 86ca3e5be0 Merge pull request #1060 from GOODDAYDAY/feature/config-token
feat: 增加server通用secret过滤器
2025-04-29 22:45:33 +08:00
欣南科技andGitHub bb2143d9a0 Merge pull request #1062 from xinnan-tech/test-pr
合并多个提交
2025-04-29 18:06:24 +08:00
hrz ef662e0ccf add:增加智控台模型配置各个模型的使用说明 2025-04-29 18:04:31 +08:00
goodyhao 30708a59f1 feat: 增加server通用secret过滤器 2025-04-29 17:37:25 +08:00
Sakura-RanChen b0262cfe72 update:优化吞音问题,解决播放长音频时的错误退出 2025-04-29 17:14:53 +08:00
Sakura-RanChenandGitHub 259886c1a8 Merge pull request #1057 from xinnan-tech/py_restart
update:更新python部分“动态更新配置”
2025-04-29 15:28:30 +08:00
CGD f1b4b33727 update:更新python部分“动态更新配置” 2025-04-29 15:25:03 +08:00
GoodyHaoandGitHub 38e8b690bd Merge branch 'xinnan-tech:main' into feature/doubao-tts 2025-04-29 15:10:42 +08:00
goodyhao 9a52b43e09 修改SQL及入参转换 2025-04-29 14:31:01 +08:00
myifeng 5e35cfc44a 定义config.yaml为默认配置; data/.config.yaml 为自定义配置; 使用者通过设置自定义配置即可完成启动,无需关心默认配置项,减少用户冗余配置 2025-04-29 13:55:34 +08:00
Sakura-RanChenandGitHub ac0ec6dfe6 Merge pull request #1049 from xinnan-tech/py_update
update:完成Python部分的“动态更新web端的配置”
2025-04-29 10:39:21 +08:00
CGD 361defc348 update:完成Python部分的“动态更新web端的配置” 2025-04-29 10:36:20 +08:00
剑雨 b9fc0da215 Merge remote-tracking branch 'origin/main' 2025-04-29 10:32:22 +08:00
hrz 6ac8947168 update:更新issue模版 2025-04-29 10:14:43 +08:00
hrzandGitHub 5655930d12 Merge pull request #1017 from weinaike/main
[Feature]新增funASR服务调用适配
2025-04-29 09:02:22 +08:00
hrzandGitHub 18acc37324 Merge pull request #1046 from MakerZorky/main
update:所有ASR均改为PCM直接识别,通过delete_audio参数判断要不要储存wav,优化了识别效率
2025-04-29 08:54:52 +08:00
MakerZorky e9155d719e Merge branch 'main' of https://github.com/MakerZorky/xiaozhi-esp32-server 2025-04-29 01:30:46 +08:00
MakerZorky 16e77b02c2 update:所有ASR均改为PCM直接识别,通过delete_audio参数判断要不要储存wav 2025-04-29 01:28:06 +08:00
欣南科技andGitHub adc1902649 Merge pull request #1038 from xinnan-tech/hot-fix
update:更新文档
2025-04-28 18:08:35 +08:00
hrz 1cc470bc5a update:更新文档 2025-04-28 18:07:58 +08:00
hrz b3f6efc7d0 update:更新文档 2025-04-28 17:11:08 +08:00
欣南科技andGitHub d91fbf3ff4 Merge pull request #1037 from xinnan-tech/hot-fix
update:获取差异化配置时,不输出敏感信息
2025-04-28 16:53:56 +08:00
hrz e552593474 update:取消对严格mac地址的校验 2025-04-28 16:44:36 +08:00
hrz 1f5a78f458 update:获取差异化配置时,不输出敏感信息 2025-04-28 16:30:31 +08:00
hrzandGitHub f490c15282 update:修复websocket接口被浏览器访问出错的bug (#1034)
* update:修复websocket接口被浏览器访问出错的bug

* update:修改版本号
2025-04-28 12:01:50 +08:00
hrz 90a31debd1 update:修改版本号 2025-04-28 11:56:17 +08:00
hrz 416145a90e update:修复websocket接口被浏览器访问出错的bug 2025-04-28 11:53:16 +08:00
goodyhao 6285786282 feat: 增加对豆包tts对话速率等控制 2025-04-28 11:31:10 +08:00
Sakura-RanChenandGitHub f9f6a69c89 Merge pull request #1030 from xinnan-tech/py_test
update:删除初始化组件角色prompt
2025-04-28 09:24:47 +08:00
CGD 61da60bdf1 update:删除初始化组件角色prompt 2025-04-28 09:22:49 +08:00
欣南科技andGitHub 2d5ef3011a Merge pull request #1028 from xinnan-tech/manager-api-model-delete
update:单Server部署时,docker-compose开放8002端口
2025-04-27 22:50:39 +08:00
hrz 63dab6d224 update:单Server部署时,docker-compose开放8002端口 2025-04-27 22:49:14 +08:00
CGDandGitHub 38dd76dfb3 Merge pull request #1026 from xinnan-tech/emote_switching
Emote switching
2025-04-27 22:20:04 +08:00
fe642de526 update:删除模型前检查是否有引用 (#1027)
* fix:DoubaoASR去掉转wav环节

* update:删除模型前检查是否有引用

* update:去除print

---------

Co-authored-by: MakerZorky <1053714527zhq@gmail.com>
2025-04-27 22:08:30 +08:00
hrz f4b7eefc38 update:去除print 2025-04-27 22:07:36 +08:00
hrz 5bbbad02b4 update:删除模型前检查是否有引用 2025-04-27 21:02:58 +08:00
Sakura-RanChen bd85dd5faf 增加“表情切换”英文适配,优化输出文本切割逻辑 2025-04-27 17:57:58 +08:00
hrzandGitHub d91ba3d219 Merge pull request #1020 from MakerZorky/main
fix:DoubaoASR去掉pcm转wav环节,优化响应速度
2025-04-27 16:49:38 +08:00
MakerZorky 7992c40815 fix:DoubaoASR去掉转wav环节 2025-04-27 15:11:50 +08:00
hrzandGitHub 574b01db97 Merge pull request #1011 from xinnan-tech/simple_ota_server
为最简化安装环境提供OTA基础信息接口
2025-04-27 13:55:51 +08:00
hrz 2d6049b7bd update:优化说明文档 2025-04-27 13:55:04 +08:00
hrz 96d0f2e6f9 update:更新教程 2025-04-27 13:34:17 +08:00
hrz b46bd4d0dd update:兼容全模块部署,不启动自带的OTA 服务 2025-04-27 13:07:14 +08:00
wnk 244c76793c 当前funASR仅支持本地模型
新增FunASR服务API调用(服务可根据官方说明自行另外部署), 增加配置与API调用实现
2025-04-27 11:55:10 +08:00
hrzandGitHub 411fc46189 Merge pull request #1006 from weinaike/main
fix:修复tts多次尝试逻辑
2025-04-27 11:16:10 +08:00
Sakura-RanChen 48427e330f 根据文本情绪权重进行表情切换处理,积极情绪优先 2025-04-27 11:15:58 +08:00
王华侨 5ddc2451c1 更新部署信息 2025-04-26 22:08:52 +08:00
王华侨 e357cad2bb 为最简化安装环境提供OTA基础信息接口 2025-04-26 21:56:41 +08:00
hrzandGitHub 80be8b2eaa Hot fix (#1007)
* update:优化代码

* fix:补回server.websocket配置

* update:修正版本号
2025-04-26 09:12:23 +08:00
wnk 9a5aaea8ca fix:
tts未及时响应,多次尝试逻辑修复。(删除空文件,达成While的条件)
2025-04-26 07:04:07 +08:00
hrzandGitHub 7d585615a9 update:细化版本对比 (#1004) 2025-04-25 23:58:43 +08:00
hrzandGitHub 3f3375dcac Auto ota update (#1001)
* update:修改ai_ota表编码

* update:更新教程

* add:增加OTA地址的配置

* update:将设备默认设置成自动升级

* update:设备管理可以设置某个设备是否自动升级

* update:判断客户端是否启动了自动升级

* update:校验OTA地址
2025-04-25 18:23:43 +08:00
hrzandGitHub f555eae653 Merge pull request #999 from xinnan-tech/auto-ota-update
Auto ota update
2025-04-25 17:56:47 +08:00
CGDandGitHub e805a6e037 Merge pull request #981 from xinnan-tech/aboutHandle-modify
打断时增加tts和音频任务清理
2025-04-25 09:58:15 +08:00
欣南科技andGitHub 3ed82ed7bb Merge pull request #982 from xinnan-tech/auto-ota-update
update:设置同类型OTA固件,只保留一个
2025-04-25 09:51:00 +08:00
hrz d638e512c9 update:设置同类型OTA固件,只保留一个 2025-04-25 09:48:25 +08:00
Sakura-RanChen 204b966935 打断时增加tts和音频任务清理 2025-04-25 09:34:22 +08:00
欣南科技andGitHub 8318ba5e55 Merge pull request #978 from xinnan-tech/auto-ota-update
update:OTA自动升级
2025-04-24 18:37:37 +08:00
hrz d39c595828 update:优化获取新固件方法 2025-04-24 18:36:04 +08:00
hrz 04154162c6 update:OTA自动升级 2025-04-24 18:27:38 +08:00
hrz 47f8e0f04c update:检验LLM密钥 2025-04-24 15:32:28 +08:00
hrz 7e4ada5f4b update:检验LLM密钥 2025-04-24 15:22:28 +08:00
hrz b0b4f87848 update:天气插件优化 2025-04-24 14:58:35 +08:00
欣南科技andGitHub d9085b82bf Merge pull request #967 from xinnan-tech/model-config-ui
update:优化模型配置左侧栏显示
2025-04-24 12:17:01 +08:00
hrz 8e5770ff59 修复tts名字过长 2025-04-24 12:13:42 +08:00
Sakura-RanChenandGitHub beb420c69d Merge pull request #968 from xinnan-tech/web-vue-ota-modify
Web vue ota modify
2025-04-24 11:54:08 +08:00
Junsen HuangandGitHub 1d8b898924 fix: index.js
修复router没有设置base
2025-04-24 11:46:29 +08:00
Junsen HuangandGitHub b5b4c5ced7 fix: vue.config.js
修复publicPath空串问题、默认是"/"
2025-04-24 11:45:24 +08:00
CGD b4e9d77895 update:修改了表格样式,增加了滑动条等,使其与其他页面基本对齐一致 2025-04-24 11:21:09 +08:00
hrzandGitHub 21a08b3c7a Merge pull request #933 from laride/feat/volces-ai-gateway
添加火山引擎边缘大模型网关 LLM/TTS
2025-04-24 11:19:28 +08:00
hrzandGitHub 6977d6bf73 Merge branch 'model-config-ui' into feat/volces-ai-gateway 2025-04-24 11:19:19 +08:00
hrzandGitHub 39f81dd0c0 Merge pull request #944 from laride/feat/add-public-path-env
添加前端部署路径环境变量
2025-04-24 11:16:20 +08:00
hrz b3191f5e0b update:优化tts异常捕获 2025-04-24 10:58:42 +08:00
hrzandGitHub 78f2f21142 Merge pull request #934 from taiping520/main
fix: 修复tts失败不重试问题
2025-04-24 10:43:32 +08:00
hrz 497fc1d1ae update:优化模型配置左侧栏显示 2025-04-24 10:41:14 +08:00
taiping520andGitHub d83e1c6fb2 Merge branch 'xinnan-tech:main' into main 2025-04-24 09:50:24 +08:00
CGD c5218d485a update:添加"加载中"样式,修改分页器样式 2025-04-24 09:33:46 +08:00
Sakura-RanChenandGitHub 19cbd3b8da Merge pull request #965 from xinnan-tech/py_test
Py test
2025-04-24 09:20:16 +08:00
CGD c0c5630bfb update:修改"获取天气"的逻辑顺序 2025-04-24 09:12:56 +08:00
CGD 969b5fcfbb update:"默认提示词"取消用户位置 2025-04-24 09:11:58 +08:00
欣南科技andGitHub 0739fa2195 Merge pull request #964 from xinnan-tech/update-fix
fix:取消docker版上传ota固件时默认的文件大小限制
2025-04-23 23:24:21 +08:00
hrz 3c62adab3c fix:取消docker版上传ota固件时默认的文件大小限制 2025-04-23 23:23:25 +08:00
欣南科技andGitHub edc601c35e Merge pull request #962 from xinnan-tech/update-fix
update:让alibl、等非原生llm使用functional时不卡顿
2025-04-23 21:30:40 +08:00
hrz 951370eee7 update:让alibl、等非原生llm使用function时不卡顿 2025-04-23 21:29:42 +08:00
hrzandGitHub fa81f4a150 Merge pull request #959 from TinsFox/main
update: 修改智控台登录地址为8002
2025-04-23 21:10:21 +08:00
TinsFox e6a90c40fb update: 修改智控台登录地址为8002 2025-04-23 20:25:04 +08:00
欣南科技andGitHub 2e0a1c00fa Merge pull request #955 from xinnan-tech/update-readme
update:增加HomeAssistant教程
2025-04-23 18:18:45 +08:00
hrz 109754fac9 update:增加HomeAssistant教程 2025-04-23 18:17:56 +08:00
taiping520andGitHub c3fbff3d7a Merge branch 'xinnan-tech:main' into main 2025-04-23 16:44:27 +08:00
欣南科技andGitHub 6dd967fe24 udpate:更新编译文档 (#948) 2025-04-23 11:49:24 +08:00
hrz f0bfdba944 udpate:更新编译文档 2025-04-23 11:48:20 +08:00
Liu Ruichao 7f76b5f4ee add PUBLIC_PATH env 2025-04-23 10:49:50 +08:00
taiping520andGitHub 35f4d8f15a Merge branch 'xinnan-tech:main' into main 2025-04-23 09:45:05 +08:00
hrzandGitHub 783f17e9e8 update:补充修改 OTA 固件信息接口 (#940)
* update:修复server.websocket配置占用bug

* update:补充修改 OTA 固件信息接口
2025-04-23 00:24:19 +08:00
hrzandGitHub 9e305c2840 update:修复server.websocket配置占用bug (#939) 2025-04-23 00:04:21 +08:00
78fa5d3110 add:ota管理与固件上传与下载 (#931)
* 新增ota管理与固件上传于下载

* feat: 支持通过OTA更新websocket地址

* update:合并最新代码

* update:优化OTA增删改查

* update:一个临时下载链接最多只能下载3次,防止盗链和流量攻击

* update:OTA固件增删改查

---------

Co-authored-by: kevin1sMe <linjiang1205@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-04-22 23:36:23 +08:00
Liu Ruichao d57482d966 feat: add Volces AI Gateway LLM/TTS 2025-04-22 17:04:29 +08:00
sczx-win10 3d7c2aff4b Merge remote-tracking branch 'origin/main' 2025-04-22 16:58:29 +08:00
sczx-win10 3757c5dde7 fix: 修复tts失败不重试问题 2025-04-22 16:44:45 +08:00
Sakura-RanChenandGitHub 13c0a966ec Merge pull request #928 from xinnan-tech/web-vue-device-fixed
update:设备管理页面样式调整
2025-04-22 11:34:52 +08:00
CGD d987619946 update:设备管理页面样式调整 2025-04-22 11:33:17 +08:00
Sakura-RanChenandGitHub 8fb9498fe6 Merge pull request #927 from xinnan-tech/web-vue-height-fixed
Web vue height fixed
2025-04-22 10:18:19 +08:00
CGD b8f64a6693 update:更换设备管理页面的表格“选择”样式 2025-04-22 10:05:06 +08:00
CGD e31bb047bf update:将参数管理页面和用户管理页面的高度调整为固定 2025-04-22 09:27:14 +08:00
Sakura-RanChenandGitHub 6897b813a6 Merge pull request #919 from xinnan-tech/web-vue-loading
Web vue loading
2025-04-22 09:02:24 +08:00
hrzandGitHub 83f86406b5 update:更新固件下载源码路径 (#923) 2025-04-21 21:08:15 +08:00
dde237ff0d update:增加dashscope依赖 (#920)
* update:增加腾讯TTS、腾讯ASR供应器

* update:增加dashscope依赖

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-04-21 17:55:27 +08:00
hrzandGitHub 6a4887e252 Merge pull request #916 from laride/fix/empty-chunk
处理 OpenAI 格式响应中 `choices` 为空的 chunk
2025-04-21 17:41:04 +08:00
d945b94910 update:增加腾讯TTS、腾讯ASR供应器 (#918)
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-04-21 17:35:10 +08:00
CGD bc7dcf791d update:获取"设备管理"数据时添加loading状态,修改“添加智能体”的错误字眼 2025-04-21 16:24:53 +08:00
CGD 66c71fe3b7 update:音色管理页面加载音色配置时添加loading状态 2025-04-21 15:23:27 +08:00
larideandGitHub 16a7aeec3b fix: handle empty choices in some chunk of OpenAI streaming response 2025-04-21 14:24:47 +08:00
Sakura-RanChenandGitHub 94605345e5 Merge pull request #914 from xinnan-tech/web-table-loading
Web table loading
2025-04-21 11:40:47 +08:00
CGD ec9fa32c81 update:添加多个组件"保存"时的loading状态 2025-04-21 11:36:10 +08:00
CGDandGitHub 264aa15281 Merge pull request #913 from xinnan-tech/web-role-exit
增加“角色配置”页面返回按钮,智能体管理骨架屏加载显示
2025-04-21 11:26:39 +08:00
Ran_Chen 180a6ff824 增加“角色配置”页面返回按钮,智能体管理骨架屏加载显示 2025-04-21 10:24:04 +08:00
CGD 5904ee1571 update:添加“模型配置”、“用户管理”、“参数管理”页面“获取列表”时的加载状态 2025-04-21 10:02:50 +08:00
hrzandGitHub bc99341f85 Merge pull request #909 from xinnan-tech/ota-activate
update:输入验证码后设备端快速刷新结果
2025-04-20 21:15:00 +08:00
hrzandGitHub 8b9174b67e update:绑定设备时,板子类型优先获取品牌商版名称 (#903)
* update:Server端兼容老设备缺失"client-id"请求头

* update:优化iot日志

* update:绑定设备时,板子类型优先获取品牌商版名称

* update:更新版本号
2025-04-20 01:40:21 +08:00
hrzandGitHub 6c04a6cf69 update:Server端兼容老设备缺失"client-id"请求头 (#902)
* update:Server端兼容老设备缺失"client-id"请求头

* update:优化iot日志

* update:绑定设备时,板子类型优先获取品牌商版名称
2025-04-20 01:28:01 +08:00
hrzandGitHub 14a63c4b97 update:补齐ddos攻击提示音 (#896) 2025-04-19 13:24:03 +08:00
hrzandGitHub 098d13a34b update:更新0.3.7 (#892) 2025-04-19 00:11:12 +08:00
488f247744 update:增加单台设备每天最多聊天字数,防止被ddos
* 添加清空redis所有库的接口
--AdminController.java 添加了清除所有的接口
--RedisUtils.java 添加了清除redis所有key的方法,redisTemplate提供的清空方法已经被标记为弃用了,所有选择用执行lua脚本方式

* fix:修复使用本地配置时忘记附带提示词

* fix:修复意图识别插件名称格式bug

* update:版本升级后强制刷新redis

* update:增加单台设备每天最多聊天字数,防止被ddos

---------

Co-authored-by: 剑雨 <2375294554@qq.com>
2025-04-18 23:39:56 +08:00
hrzandGitHub c74dbf03cd fix:修复意图识别插件名称格式bug (#885)
* fix:修复使用本地配置时忘记附带提示词

* fix:修复意图识别插件名称格式bug
2025-04-18 16:39:18 +08:00
hrzandGitHub 1f836c3235 fix:修复使用本地配置时忘记附带提示词 (#880) 2025-04-18 11:38:31 +08:00
hrzandGitHub bd2e2e77d5 update:更新版本号 (#874) 2025-04-18 00:51:09 +08:00
6282ef14e8 fix:修复第一句话是默认配置的bug (#873)
* update: 增加对httpClient的统一管理

* update: 增加retry机制

* update: 增加retry机制

* fix:websocket连接后不说话的备用关闭方法

* fix:修复第一句话是默认配置的bug

---------

Co-authored-by: haotian <haotian@codemao.cn>
Co-authored-by: GoodyHao <865700600@qq.com>
2025-04-18 00:37:40 +08:00
558f23688f fix:websocket连接后不说话的备用关闭方法 (#872)
* update: 增加对httpClient的统一管理

* update: 增加retry机制

* update: 增加retry机制

* fix:websocket连接后不说话的备用关闭方法

---------

Co-authored-by: haotian <haotian@codemao.cn>
Co-authored-by: GoodyHao <865700600@qq.com>
2025-04-17 23:57:04 +08:00
剑雨 39fe057f9f Merge remote-tracking branch 'origin/main' 2025-04-17 15:56:40 +08:00
CGDandGitHub 541f2de599 Merge pull request #856 from xinnan-tech/web-page-check
解决切换页面样式变化的问题
2025-04-17 13:26:26 +08:00
hrzandGitHub 68116254cd dify、coze对话模式支持functioncall
Function call v2
2025-04-17 11:54:04 +08:00
hrzandGitHub 77ff4599ea Merge branch 'main' into function-call-v2 2025-04-17 11:53:25 +08:00
玄凤科技 652f5a3247 Merge branch 'function-call-v2' of https://github.com/xinnan-tech/xiaozhi-esp32-server into function-call-v2 2025-04-17 10:00:23 +08:00
玄凤科技 9b6e57b143 修改提示词,增强tool调用约束 2025-04-17 10:00:13 +08:00
Ran_Chen bdc19256bf 解决切换页面样式变化的问题 2025-04-17 09:34:42 +08:00
hrzandGitHub de5eaf4467 更新版本号0.3.5 (#852)
* update:测试页面增加OTA地址

* update:兼容旧设备,无Client-Id的情况

* update:修复智控台下发配置布尔类型转换出错bug

* update:修复智控台下发配置字符类型转换出错bug

* udpate:增加iot消息properties和methods可能为空的情况

* update:发布0.3.5版本
2025-04-16 23:47:37 +08:00
hrzandGitHub ca884833d1 udpate:增加iot消息properties和methods可能为空的情况 (#851)
* update:测试页面增加OTA地址

* update:兼容旧设备,无Client-Id的情况

* update:修复智控台下发配置布尔类型转换出错bug

* update:修复智控台下发配置字符类型转换出错bug

* udpate:增加iot消息properties和methods可能为空的情况
2025-04-16 23:34:23 +08:00
hrz 9fc164a69d udpate:增加iot消息properties和methods可能为空的情况 2025-04-16 23:30:46 +08:00
hrzandGitHub 0da2da83a5 update:修复智控台下发配置布尔类型转换出错bug (#850)
* update:测试页面增加OTA地址

* update:兼容旧设备,无Client-Id的情况

* update:修复智控台下发配置布尔类型转换出错bug

* update:修复智控台下发配置字符类型转换出错bug
2025-04-16 22:55:13 +08:00
hrzandGitHub bfdfa44edd Merge pull request #844 from xinnan-tech/web-page-modify
“角色配置”行内样式调整
2025-04-16 18:43:07 +08:00
hrzandGitHub ed1cfe5eb6 update:兼容旧设备,无Client-Id的情况 (#847)
* update:测试页面增加OTA地址

* update:兼容旧设备,无Client-Id的情况
2025-04-16 18:03:30 +08:00
Ran_Chen b696f3f5db “角色配置”行内样式调整 2025-04-16 17:18:11 +08:00
hrzandGitHub 7a0cf5ef9a update:测试页面增加OTA地址 (#842) 2025-04-16 16:44:44 +08:00
CGDandGitHub d1b7cb6a36 Merge pull request #837 from xinnan-tech/web-modify
“角色配置”页面间距调整
2025-04-16 14:47:58 +08:00
Ran_Chen b21d699472 “角色配置”页面间距调整 2025-04-16 14:25:46 +08:00
CGDandGitHub 029fadd778 Merge pull request #836 from xinnan-tech/web-modify
Web modify
2025-04-16 14:04:19 +08:00
Sakura-RanChenandGitHub 215d50235b Merge pull request #835 from xinnan-tech/web-vue-agent-modify
修改了部分components的样式
2025-04-16 14:03:24 +08:00
CGD 000e676397 修改了部分components的样式 2025-04-16 12:55:07 +08:00
玄凤科技 208c045d3d 触发function call后,清空回复队列 2025-04-16 11:48:40 +08:00
Ran_Chen ee20f59a8e 增加“回车”事件 2025-04-16 11:42:05 +08:00
Ran_Chen 925cf3dabb 新增智能体按钮绑定问题 2025-04-16 11:34:30 +08:00
CGDandGitHub 0049d0e926 Merge pull request #831 from xinnan-tech/web-pages-modify
Web pages modify
2025-04-16 11:23:42 +08:00
Ran_Chen 56959808a9 解决新增设备按钮绑定问题,优化“角色配置”页面 2025-04-16 11:17:02 +08:00
Ran_Chen 8667a9680e 增加时间戳转换,修改各页面的布局 2025-04-16 10:15:58 +08:00
玄凤科技 8c7d129089 同步coze llm 2025-04-16 08:58:55 +08:00
玄凤科技 a3a9b98a1d 增加系统提示词,支持dify使用function call 2025-04-16 08:56:23 +08:00
欣南科技andGitHub f2f66579cb 合并网友提交优化
合并网友提交优化
2025-04-15 22:48:03 +08:00
hrz 1354cf2a87 合并网友提交优化 2025-04-15 22:46:54 +08:00
hrzandGitHub 15f5592429 Merge pull request #814 from funshine/bug_fix_funshine
Bug fix test_page.html, 以及TTS_CosyVoiceSiliconflow
2025-04-15 22:02:19 +08:00
hrzandGitHub dc69094f00 Merge pull request #817 from GOODDAYDAY/main
update: 增加prompt个性化配置 & 增加vad,asr个性初始化 & 优化日志若干
2025-04-15 22:01:51 +08:00
hrzandGitHub 8ad3783a36 Merge pull request #812 from bohell/main
Update Deployment_all.md
2025-04-15 21:52:09 +08:00
hrzandGitHub 15d5dd8e92 Merge pull request #823 from xinnan-tech/web-vue-select-modify
修改了各个页面的“选择”表头样式
2025-04-15 21:50:46 +08:00
CGD b07edb977b 修改了各个页面的“选择”表头样式 2025-04-15 20:33:09 +08:00
hrzandGitHub 1509fc2039 update:播报音频文件
* update:websocket播报6位验证码

* update:播报音频文件
2025-04-15 18:55:23 +08:00
欣南科技andGitHub 2877bb8faa Web device modify (#818)
* “设备管理”分页响应调整

* 样式调整
2025-04-15 18:30:41 +08:00
hrzandGitHub a83410cb49 update:websocket播报6位验证码 (#821) 2025-04-15 18:30:12 +08:00
Ran_Chen 4ff9f2235b 样式调整 2025-04-15 18:02:04 +08:00
Ran_Chen 1bc611f097 “设备管理”分页响应调整 2025-04-15 17:59:29 +08:00
haotian 4e0a3941ff update: 增加prompt个性化配置 & 增加vad,asr个性初始化 & 优化日志若干 2025-04-15 17:21:44 +08:00
CGDandGitHub 4e885dac3e Merge pull request #815 from xinnan-tech/web-page-modify
Web page modify
2025-04-15 16:27:51 +08:00
Ran_Chen eafd131a22 “模型配置”响应适配,修改下拉图标样式,调整bottom高度差 2025-04-15 16:25:56 +08:00
Guijie HongandGitHub 289ce3716b Merge branch 'xinnan-tech:main' into bug_fix_funshine 2025-04-15 16:11:18 +08:00
Sakura-RanChenandGitHub 2242070bdc Merge pull request #813 from xinnan-tech/fix/manager-web-cdn
Fix/manager web cdn
2025-04-15 16:06:02 +08:00
funshine ee83cea11c 修正CosyVoiceSiliconflow音色 2025-04-15 15:51:36 +08:00
ZhilongandGitHub 6e571a43d8 Update Deployment_all.md
增加管理api的端口号
2025-04-15 15:44:21 +08:00
funshine 466a0245a9 add default value for siliconflow tts speed 2025-04-15 15:28:02 +08:00
funshine d9ce5e4ce7 fix audio test page websocket disconn 2025-04-15 15:22:47 +08:00
Sakura-RanChenandGitHub 6b0dd291c2 Merge pull request #811 from xinnan-tech/web-vue-tts
修复了“音色管理”样式
2025-04-15 14:09:50 +08:00
hrzandGitHub 4ff77d0d7e update:更新烧录时ota地址 (#810)
* update:修复默认模型没有修改到模版配置的bug

* update:智控台可设置允许用户自由注册

* update:更新烧录时ota地址
2025-04-15 13:18:23 +08:00
hrzandGitHub e00da5d8d2 update:智控台可设置允许用户自由注册 (#809)
* update:修复默认模型没有修改到模版配置的bug

* update:智控台可设置允许用户自由注册
2025-04-15 13:03:29 +08:00
CGD 1a525a59ab 修复了“音色管理”样式 2025-04-15 12:20:33 +08:00
Ran_Chen d5581c4236 “用户管理”页面,响应式调整 2025-04-15 11:27:35 +08:00
Sakura-RanChenandGitHub 4bf950574c Merge pull request #803 from xinnan-tech/web-vue-modify
修改了分页器样式
2025-04-15 10:33:34 +08:00
CGDandGitHub 0b9e434c4b Merge pull request #802 from xinnan-tech/web-pages-modify
参数页面响应调整
2025-04-15 10:33:26 +08:00
CGD c4b1466643 修改了分页器样式 2025-04-15 10:30:52 +08:00
Ran_Chen 488842029b 参数页面响应调整 2025-04-15 10:28:37 +08:00
Junsen HuangandGitHub 1b0ce59371 Merge pull request #800 from huangjunsen0406/fix/manager-web-cdn
Fix/manager web cdn
2025-04-15 10:00:36 +08:00
huangjunsen0406 97bea89204 Merge branch 'main' into fix/manager-web-cdn 2025-04-15 09:56:22 +08:00
huangjunsen0406 0892dfc601 Merge remote-tracking branch 'upstream/main' 2025-04-15 09:54:05 +08:00
huangjunsen0406 20d66ff401 fix(service_worker): 根据标志位在app.vue开启缓存检测工具 2025-04-15 09:53:06 +08:00
Sakura-RanChenandGitHub e2fda532d1 Merge pull request #796 from xinnan-tech/web-vue-modify-device
Web vue modify device
2025-04-15 09:06:01 +08:00
Junsen HuangandGitHub 68035af7b3 Merge pull request #794 from huangjunsen0406/fix/manager-web-cdn
Fix/manager web cdn
2025-04-15 09:01:35 +08:00
CGDandGitHub ee25555f0e Merge branch 'main' into web-vue-modify-device 2025-04-15 08:31:28 +08:00
CGD e528510f5c 修改了参数管理的页面高度 2025-04-15 08:24:06 +08:00
huangjunsen0406 afa0527b4c Merge remote-tracking branch 'upstream/main' 2025-04-15 04:07:27 +08:00
huangjunsen0406 dd7d23498f build(cdn): 📦 更换cdn为unpkg、新增service_worker缓存资源文件
closed #772
2025-04-15 04:03:28 +08:00
hrzandGitHub eaaea2b24c update:智控台添加版本号 (#793) 2025-04-15 01:46:36 +08:00
58d0aefae1 fix:修复manager下发配置的bug (#792)
* update: 优化系统prompt

* Update Deployment_all.md

更新部分的安装配置文档,后续需要修改 docker-compose.yaml

* Update docker-compose_all.yml

- 直接提供全量的部署配置,包括 mysql 与 Redis 实现真正意义上的一键配置。
- 将 MySQL 的数据内容本地挂载存储,需要备份迁移的时候,直接打包复制文件夹即可。MySQL 容器删除的时候也不会出现数据丢失的问题。

* Update Deployment_all.md

- 使用 docker compose 部署的时候,不应该每次更新的时候都把原来的 docker-compose 文件删除,再重新配置。
- 如果没有自己部署数据库需求的话,目前可以直接开箱即用,同步更新了 server 中的 Redis 与 MySQL 的镜像服务配置。

* Update Deployment_all.md

- MySQL 与 Redis 的安装是可选的

* 现在新版本的 docker 直接集成了 compose 命令,不需要手动安装与执行 docker-compose 命令了,提高兼容性

* fix:manager下发配置字符转数字bug

* update: 优化三方模块打印日志报错问题

* update: 修复Dify对接未过滤全量数据问题

* update:通过代理转发接口api

* fix:number熟知去掉小数点后的00

* update:优化docker启动

* update:优化参数读取

---------

Co-authored-by: haotian <haotian@codemao.cn>
Co-authored-by: expoli <31023767+expoli@users.noreply.github.com>
Co-authored-by: GoodyHao <865700600@qq.com>
2025-04-15 00:46:37 +08:00
hrz 11c9915a70 update:优化参数读取 2025-04-15 00:44:34 +08:00
hrz 6cf6b0d645 update:优化docker启动 2025-04-15 00:22:53 +08:00
hrzandGitHub 1980a39b73 Merge pull request #763 from GOODDAYDAY/main
update: 优化系统prompt & 优化三方模块打印日志报错问题 & 修复Dify未过滤全量数据问题
2025-04-14 23:09:43 +08:00
hrzandGitHub 8d3fbeeb22 Merge pull request #782 from expoli/main
[docker] 更新了 docker-compose
2025-04-14 22:50:50 +08:00
hrzandGitHub 2678644c2c Merge branch 'hot-fix' into main 2025-04-14 22:50:42 +08:00
hrz 25da9fe119 fix:number熟知去掉小数点后的00 2025-04-14 22:09:18 +08:00
hrz 03d89d22ec update:通过代理转发接口api 2025-04-14 21:53:52 +08:00
haotian 100cd25ffc Merge remote-tracking branch 'origin/main' 2025-04-14 21:44:06 +08:00
haotian 6284a74a6e update: 修复Dify对接未过滤全量数据问题 2025-04-14 21:43:55 +08:00
GoodyHaoandGitHub 978cd8ba8e Merge branch 'xinnan-tech:main' into main 2025-04-14 18:51:15 +08:00
haotian c76f28824c update: 优化三方模块打印日志报错问题 2025-04-14 18:49:24 +08:00
hrz 703ecfae40 fix:manager下发配置字符转数字bug 2025-04-14 18:30:58 +08:00
CGD b15c59aa48 fix:修复了分页器颜色不一致的问题 2025-04-14 17:23:07 +08:00
CGD 98a4ce701c fix:修复"设备管理"页面解绑设备时出现的异常,添加批量解绑功能,完善搜索功能 2025-04-14 16:10:46 +08:00
CGD 2fc0de8f4e fix:部分页面删去底部的©2025 xiaozhi-esp32-server 2025-04-14 14:38:04 +08:00
CGD 66fd551d68 完成“参数管理”的设置每页大小 2025-04-14 14:20:33 +08:00
expoliandGitHub 6e4e9a002b 现在新版本的 docker 直接集成了 compose 命令,不需要手动安装与执行 docker-compose 命令了,提高兼容性 2025-04-14 14:18:07 +08:00
expoliandGitHub 91278b0b3d Update Deployment_all.md
- MySQL 与 Redis 的安装是可选的
2025-04-14 14:16:25 +08:00
expoliandGitHub ff9b3ed1a2 Update Deployment_all.md
- 使用 docker compose 部署的时候,不应该每次更新的时候都把原来的 docker-compose 文件删除,再重新配置。
- 如果没有自己部署数据库需求的话,目前可以直接开箱即用,同步更新了 server 中的 Redis 与 MySQL 的镜像服务配置。
2025-04-14 14:15:37 +08:00
expoliandGitHub 0c855d4ba8 Update docker-compose_all.yml
- 直接提供全量的部署配置,包括 mysql 与 Redis 实现真正意义上的一键配置。
- 将 MySQL 的数据内容本地挂载存储,需要备份迁移的时候,直接打包复制文件夹即可。MySQL 容器删除的时候也不会出现数据丢失的问题。
2025-04-14 14:06:30 +08:00
expoliandGitHub 9176e9d255 Update Deployment_all.md
更新部分的安装配置文档,后续需要修改 docker-compose.yaml
2025-04-14 14:00:31 +08:00
hrzandGitHub 2bab917b3e update:优化文档 (#775)
* update:添加设计公司致谢

* update:添加设计公司致谢

* update:优化文档

* update:优化文档

* update:优化文档

* update:优化文档
2025-04-14 11:31:52 +08:00
CGD b80086a349 fix:移除“添加智能体”子元素触发弹框,将点击事件仅绑定在"添加智能体"文字部分 2025-04-14 10:48:43 +08:00
hrzandGitHub 8a4fca9bd5 update:优化文档 (#774)
* update:添加设计公司致谢

* update:添加设计公司致谢

* update:优化文档

* update:优化文档
2025-04-14 10:35:14 +08:00
hrzandGitHub 13288a6b3a update:优化文档
* update:添加设计公司致谢

* update:添加设计公司致谢

* update:优化文档
2025-04-14 10:26:34 +08:00
CGD 57ed552f43 完成“设备管理”样式的修改 2025-04-14 09:34:51 +08:00
CGD 5a4d65986d 优化了界面样式 2025-04-14 07:52:00 +08:00
CGD 427b3bb774 修改“设备管理”背景颜色,添加搜索框,完成设备管理的前端搜索功能 2025-04-13 22:32:34 +08:00
hrzandGitHub 4912f385c6 fix:智能体音色未随manager生效bug
* fix:连接manager后无法使用functioncallbug

* fix:意图识别使用llm无法播放音乐bug

* fix:manager第一图识别使用独立llm无法初始化llm的bug

* fix:智能体音色未随manager生效bug

* update:添加edgeTTS音色
2025-04-13 19:01:19 +08:00
haotian dcb6d0feab update: 优化系统prompt 2025-04-13 18:46:04 +08:00
hrzandGitHub de8c762d79 fix:manager意图识别bug (#762)
* fix:连接manager后无法使用functioncallbug

* fix:意图识别使用llm无法播放音乐bug

* fix:manager第一图识别使用独立llm无法初始化llm的bug
2025-04-13 18:10:17 +08:00
hrzandGitHub 056659304a Merge pull request #752 from xinnan-tech/web-api-model-fix
fix:修复了"模型配置"问题
2025-04-13 10:27:09 +08:00
hrzandGitHub 525bf18a03 Merge pull request #748 from xinnan-tech/web--vue-device-modify
Web  vue device modify
2025-04-13 10:26:40 +08:00
hrzandGitHub 7714c3f611 update:修复自动编译bug (#755) 2025-04-13 00:55:36 +08:00
hrzandGitHub 768b9fb7c1 Update readme (#754)
* update:更新文档

* update:优化文档路径

* update:优化文档
2025-04-13 00:32:32 +08:00
hrzandGitHub db4f028955 更新全模块部署文档 (#753)
* update:更新文档

* update:优化文档路径
2025-04-13 00:21:13 +08:00
CGD e3928ffbcc fix:修复了"模型配置"问题 2025-04-12 22:53:41 +08:00
hrzandGitHub db5159bd5e Hot fix (#750)
* fix:智能体名称

* update:修改版本号
2025-04-12 19:02:26 +08:00
hrzandGitHub 2626e1ebf0 fix:智能体名称 (#749) 2025-04-12 18:58:10 +08:00
hrzandGitHub 5d69ba0796 update:server连接api (#747)
* update:server连接manager-api

* update:读取智能体模型配置

* update:添加默认模型的按钮

* update:优化配置读取方式

* update:server兼容manager接口改造

* update:优化私有配置加载

* update:加载私有模型配置
2025-04-12 17:36:04 +08:00
hrzandGitHub c39ad97b8e Merge pull request #742 from xinnan-tech/web-vue-modify
fix:修复“模型配置编辑”功能
2025-04-12 17:33:28 +08:00
CGD 7c73f060ed update:添加了按钮样式 2025-04-12 09:28:19 +08:00
CGD f0aa7df3b0 update:完成“分页器”样式的替换 2025-04-12 08:27:03 +08:00
CGD 5882dec23a fix:修复“模型配置编辑”功能 2025-04-12 00:35:06 +08:00
hrzandGitHub 835c9deb28 Merge pull request #741 from xinnan-tech/web-api-timbre
Web api timbre
2025-04-11 21:25:34 +08:00
CGD a4ecc7ac7f update:优化了“音色配置”页面的样式 2025-04-11 17:44:05 +08:00
CGD 526a195e4d update:优化了"参数配置"页面的样式 2025-04-11 16:13:26 +08:00
CGD 5e77560313 update:优化了”用户管理“和”模型配置“页面样式 2025-04-11 16:01:57 +08:00
CGD 1abacfe90b update:优化了”模型配置“页面的样式 2025-04-11 15:43:45 +08:00
CGD d042c589df 修复了”删除“和”批量删除“的bug 2025-04-11 14:08:31 +08:00
CoderMonkeyandGitHub 92e117c10a Merge pull request #737 from HiCoderMonkey/tts-response
Tts response 双向流tts,fix 播放音乐
2025-04-11 11:12:12 +08:00
lizhongxiang 71db92ef61 fix: 播放音乐 2025-04-11 11:08:22 +08:00
hrzandGitHub 9f0f2870d0 Merge pull request #736 from xinnan-tech/web-vue-parameterization
Web vue parameterization
2025-04-11 10:27:17 +08:00
lizhongxiang 118bb728a9 fix: 播放咋音问题 2025-04-11 10:25:43 +08:00
CGD 9dd445b0ce “值类型“添加json形式的选项 2025-04-11 10:19:38 +08:00
CGD 8e1cc6e75b 完善“搜索”功能 2025-04-11 10:03:05 +08:00
CGD a36887d885 修复“删除”和“批量删除”功能,优化“新增/编辑”页面 2025-04-11 09:29:34 +08:00
hrzandGitHub e300d04502 update:调整参数和音色删除接口,适应前端请求 (#732) 2025-04-10 18:26:28 +08:00
CGD 3d8afac9e1 update:优化了"新增/编辑参数"页面样式 2025-04-10 11:59:46 +08:00
hrzandGitHub 81d2571f8f update:参数配置,值类型强校验 (#725) 2025-04-10 10:33:55 +08:00
hrzandGitHub e4a0d2c56c update:初始化配置数据 (#724) 2025-04-10 00:18:59 +08:00
hrz d7aac5e10f Merge branch 'main' into tts-response
# Conflicts:
#	main/manager-web/.env.development
2025-04-09 21:46:59 +08:00
CGDandGitHub 55be189772 Merge pull request #723 from xinnan-tech/web_Timbre_api
Web timbre api
2025-04-09 17:54:01 +08:00
Ran_Chen 56352478fe 完成音色“修改”,“保存”接口的调用,删除报故障,需要调整一下 2025-04-09 17:52:41 +08:00
CGD f16d0406ea update:将“新增参数”和“编辑参数”以组件的形式分离出父组件 2025-04-09 17:14:19 +08:00
CoderMonkeyandGitHub 4359f1d5b3 Merge pull request #719 from HiCoderMonkey/tts-response
Tts response ,fix 播放有咋音
2025-04-09 14:38:02 +08:00
lizhongxiang 8bb888c58e fix: 播放咋音问题 2025-04-09 14:32:32 +08:00
Sakura-RanChenandGitHub 9d1871dc80 Merge pull request #718 from xinnan-tech/web-vue-model-modify
Web vue model modify
2025-04-09 14:26:04 +08:00
CGD 137f29e9e5 update:优化了“模型配置”页面和“用户管理”页面的样式,完善了搜索功能 2025-04-09 14:23:23 +08:00
CGD 0e81a165e4 update:优化了“添加配置”页面和“修改配置”页面,修复了“添加配置”页面非正常关闭添加对话框时,没有正确重置对话框的状态 2025-04-09 14:08:05 +08:00
hrzandGitHub a73bcc05bc fix:用户id大值转换精度丢失的问题
* add:配置管理接口

* add:参数增删改查

* fix:用户id大值转换精度丢失的问题
2025-04-09 13:56:22 +08:00
hrzandGitHub cd97018c4d add:参数增删改查
* add:配置管理接口

* add:参数增删改查
2025-04-09 13:36:59 +08:00
Ran_Chen a42ed5c388 获取音色数据的接口实现,优化AudioPlayer警告 2025-04-09 11:00:10 +08:00
c1pherandGitHub f4bd80b5f9 [function]homeassistant操作能力增强 (#714)
* Update hass_get_state.py

支持查询色温、颜色

* Update hass_set_state.py

设置灯光颜色,色温

* 支持灯光色温颜色调整、查询

* 设置状态返回内容修正
2025-04-09 10:39:42 +08:00
hrzandGitHub 498542f8be add:配置管理接口 (#715) 2025-04-09 09:11:25 +08:00
hrzandGitHub 1aaa31ceb0 update:更新供应器sql语句
* update:修复vad,asr没有供应器bug

* update:更新供应器sql语句
2025-04-08 22:19:02 +08:00
LFNL-scholar c9eb640510 新增阿里云ASR 2025-04-08 20:48:11 +08:00
LFNL-scholar 766a706250 新增阿里云的ASR 2025-04-08 20:37:23 +08:00
hrzandGitHub 6fd63870f0 update:修复vad,asr没有供应器bug (#708) 2025-04-08 18:29:58 +08:00
CGD 0be5350a1c 优化了“修改模型”页面,使其能够动态获取到调用信息 2025-04-08 18:01:47 +08:00
Sakura-RanChenandGitHub 48a5489c52 Merge pull request #707 from xinnan-tech/web-api-model-modify
Web api model modify
2025-04-08 17:03:16 +08:00
CGDandGitHub fe0fb9a884 Merge pull request #706 from xinnan-tech/web_Sound_Management
完成“音色管理”页面
2025-04-08 16:28:09 +08:00
Ran_Chen 91a2846794 完成“音色管理”页面 2025-04-08 16:24:18 +08:00
CGD 625c9c2e40 优化了“添加模型”页面,使其能根据供应器动态获取到调用信息 2025-04-08 16:17:56 +08:00
CGD 710b338e6d 完成“编辑模型配置”功能开发 2025-04-08 10:53:59 +08:00
CGD 024468adbd 优化了“添加模型”页面,优化了“新增模型配置”功能 2025-04-08 09:38:31 +08:00
hrzandGitHub e4d173ad28 udate:优化异常显示 (#701) 2025-04-08 09:17:58 +08:00
CGD f4218b032a 优化了“修改模型”页面,优化了“获取模型配置”功能 2025-04-08 09:09:05 +08:00
hrzandGitHub b87ebc6e1c update:设定iot操作默认值 (#700) 2025-04-07 22:10:07 +08:00
CGD d901b0ed34 优化了“获取模型配置”功能 2025-04-07 20:52:11 +08:00
hrzandGitHub 519340dbf8 update:删除指定智能体关联的所有设备 (#699) 2025-04-07 18:24:43 +08:00
lizhongxiang 4c81585e32 merge oeigin/tts-response 2025-04-07 18:15:09 +08:00
CGD a7f6a6cc16 完善“查询”功能 2025-04-07 16:57:31 +08:00
Sakura-RanChenandGitHub a0e56757d8 Merge pull request #696 from xinnan-tech/web-api
Web api
2025-04-07 15:54:14 +08:00
CGD a618c2a2c6 完成“启动-关闭模型配置”功能 2025-04-07 15:15:45 +08:00
hrzandGitHub 07d8f783e0 update:完成用户启用/禁用功能 (#694)
* update:优化文档

* update:完成用户启用/禁用功能
2025-04-07 15:14:20 +08:00
CGD 623bfe32f7 完成“获取模型配置”功能 2025-04-07 14:50:20 +08:00
hrzandGitHub 6862735aa0 update:优化文档 (#693) 2025-04-07 13:52:20 +08:00
hrzandGitHub 5461794a1e update:优化文档
* fix:修复不启动意图识别,functioncall依旧加载的bug
update:intent_llm意图识别获取新闻和天气过长,tts容易出错,暂时只支持简单简单工具

* update:优化文档
2025-04-07 13:31:33 +08:00
hrzandGitHub d9cd9acd27 fix:修复不启动意图识别,functioncall依旧加载的bug (#691)
update:intent_llm意图识别获取新闻和天气过长,tts容易出错,暂时只支持简单简单工具
2025-04-07 13:23:22 +08:00
CGD b2788ac7a0 完成“删除模型配置”以及批量删除功能 2025-04-07 10:04:16 +08:00
CGD d4f6e25f92 优化了“新增模型配置” 2025-04-07 09:44:48 +08:00
hrzandGitHub 17bcaba026 update:增加注册页面左图 (#683) 2025-04-06 20:55:11 +08:00
hrzandGitHub aed4e6b1e4 update:首页智能体面板显示优化
* update:更新版本号

* update:允许actions编译手动触发

* fix:如果获取不到版本号,actions编译失败

* add:增加docker部署redis步骤

* update:增加启用/关闭模型配置api

* update:完成角色配色功能

* update:编译文档优化

* update:优化编译文档

* update:首页智能体面板显示优化
2025-04-06 18:28:39 +08:00
hrzandGitHub 50897e97af update:完成角色配置功能 (#679)
* update:更新版本号

* update:允许actions编译手动触发

* fix:如果获取不到版本号,actions编译失败

* add:增加docker部署redis步骤

* update:增加启用/关闭模型配置api

* update:完成角色配色功能
2025-04-06 15:45:18 +08:00
hrzandGitHub e57137b101 fix:如果获取不到版本号,actions编译失败
* update:更新版本号

* update:允许actions编译手动触发

* fix:如果获取不到版本号,actions编译失败
2025-04-06 11:50:27 +08:00
hrzandGitHub 3370ecb2ef update:允许actions编译手动触发
* update:更新版本号

* update:允许actions编译手动触发
2025-04-06 11:38:43 +08:00
hrzandGitHub 8225a5a12f update:更新版本号 (#676) 2025-04-06 11:00:42 +08:00
hrzandGitHub 5655362a00 update:ota接口验证通过 (#675) 2025-04-06 02:09:49 +08:00
欣南科技andGitHub 2f2884e991 Merge pull request #672 from xinnan-tech/hot-fix
合并多个提交
2025-04-05 22:14:30 +08:00
hrz 6061a1d2bf update:优化样式 2025-04-05 22:12:54 +08:00
hrz a28d316ca4 update:删除首页背景,加快加载速度 2025-04-05 21:55:50 +08:00
hrz d53230245f update:模型配置删除接口,只需要id参数 2025-04-05 21:55:05 +08:00
hrz d2e8d1c261 fix:删除用户时调错agent接口bug 2025-04-05 21:22:54 +08:00
hrz fe86e1fb0f update:统一接口读取方式 2025-04-05 21:03:46 +08:00
hrz 03441c8582 update:格式化代码 2025-04-05 20:19:28 +08:00
hrz d255edfd5f update:设置接口读取方式 2025-04-05 20:16:02 +08:00
hrz 52187daafa Merge branch 'hot-fix' of https://github.com/xinnan-tech/xiaozhi-esp32-server into hot-fix 2025-04-05 19:37:51 +08:00
hrz 6f46776484 update:编辑模型配置(/models/{modelType}/{provideCode}/{id})保存configJson达不到预期 2025-04-05 19:37:18 +08:00
hrzandGitHub 50b2b37bc1 Merge pull request #671 from xinnan-tech/web-api-model
Web api model
2025-04-05 19:01:59 +08:00
欣南科技andGitHub 35eed6dca0 合并多个提交
合并多个提交
2025-04-05 17:19:54 +08:00
hrz e337dd920d update:统一使用PageData返回分页 2025-04-05 17:16:06 +08:00
hrzandGitHub 671c992f3a Merge pull request #627 from funsugar/patch-1
Update util.py
2025-04-05 14:57:01 +08:00
hrzandGitHub b5ff4d329b Merge pull request #654 from xinnan-tech/manager-api-admin
完善了管理员的接口,删除,用户分页,全部设备
2025-04-05 14:56:37 +08:00
hrzandGitHub 941eb063fb Merge pull request #663 from xinnan-tech/Web_Optimize
Web optimize
2025-04-05 14:56:16 +08:00
CGD 148e71985f 完成修改模型页面的”获取模型供应器列表“功能;”删除模型配置“出现”服务器内部异常“错误。 2025-04-04 23:52:36 +08:00
欣南科技andGitHub efd22b36ef Merge pull request #665 from xinnan-tech/test-server-pr
优化test_page.html播放卡顿问题
2025-04-04 19:11:06 +08:00
hrzandGitHub 70ea24ac83 Merge pull request #629 from joey-zhou/vad_optimize
优化vad,采用bytearray替换byte,提高字符串拼接效率
2025-04-04 18:39:16 +08:00
hrzandGitHub 3c9b7ad60b Merge pull request #664 from huangjunsen0406/main
fix: 🐛 优化test_page.html
2025-04-04 18:38:28 +08:00
hrzandGitHub 18cc1273f6 Merge pull request #651 from devspadeboy/add_PySocks_package
为xiaozhi-server的requirments.txt文件添加PySocks包
2025-04-04 18:37:49 +08:00
huangjunsen0406 a6f9f0d88c feat(test): 新增简化版网页调试工具 2025-04-04 16:43:14 +08:00
huangjunsen0406 d36210ad6b feat(test): 新增opus本地录制播放测试 2025-04-04 16:42:45 +08:00
huangjunsen0406 b2262d062c fix: 🐛 修复test_page.html 播放异常问题 2025-04-04 16:42:07 +08:00
hrz 0e6d1cd677 Merge branch 'main' into tts-response 2025-04-04 02:02:30 +08:00
hrz 98368cbe06 fix:文字回复卡住bug 2025-04-04 02:01:48 +08:00
hrz 0b4a4df1af update:合并最新代码 2025-04-04 00:27:04 +08:00
hrz c8a3d378b7 update:合并main分支 2025-04-03 23:06:59 +08:00
hrzandGitHub 27be7fd217 Merge branch 'main' into Web_Optimize 2025-04-03 22:13:15 +08:00
hrzandGitHub 97f210c9de Merge branch 'main' into manager-api-admin 2025-04-03 22:11:09 +08:00
Ran_Chen a230fc6aaa ota接口文件编写 2025-04-03 18:00:23 +08:00
hrzandGitHub b042a34726 优化登录页大背景图片文件,加快页面加载 (#660)
* update:优化说明文档

* update:优化登录页大背景图片文件,加快页面加载
2025-04-03 17:40:53 +08:00
Ran_Chen 1673ad7e70 优化智能体列表布局,修复HeaderBar的搜索功能,增加确认的回车按键绑定 2025-04-03 17:07:13 +08:00
CGD f7eab31b57 完成”新增模型配置“API 2025-04-03 16:23:15 +08:00
CGDandGitHub 4553188739 Merge pull request #659 from xinnan-tech/web_Pop_Change
解决提示框遮挡问题,优化UserManagement和HeaderBar布局,导航栏重复点击警告,退出跳转页面的优化
2025-04-03 15:51:50 +08:00
Ran_Chen 7550ac327e 解决提示框遮挡问题,优化UserManagement和HeaderBar布局,导航栏重复点击警告,退出跳转页面的优化 2025-04-03 15:44:41 +08:00
CGD 5b28cf6c66 完成“获取模型供应器列表”的API 2025-04-03 14:31:57 +08:00
CGD 4ea27cbdc2 优化了“修改模型”弹框的样式 2025-04-03 10:47:31 +08:00
剑雨 f55d6c2e60 Merge remote-tracking branch 'origin/main' 2025-04-03 10:22:13 +08:00
剑雨 e474a2114c 添加了参数验证
--AdminController.java
--AdminPageUserDTO.java
--DevicePageUserDTO.java
定义新的验证说明
--validation.properties
--validation_en_US.properties
--validation_zh_CN.properties
--validation_zh_TW.properties
2025-04-03 10:16:47 +08:00
剑雨 06e4834e27 优化获取用户的名称的方法
--RedisKeys.java 设一个新key
--SysUserUtilServiceImpl.java 优化赋值用户名的方法,把用户名暂存在redis。获取相同的不需要频繁去数据库查找
2025-04-03 09:49:39 +08:00
剑雨 083e7071f0 用户模块和设备模块存在循环引用,把用户模块常用方法抽出一个工具类,以后设备模块等和用户相关的模块,直接引用工具类,避免循环引用
--DeviceServiceImpl.java 修改设备模块获取用户名的方式,使用用户工具类
--SysUserService.java 新建用户工具类,定义了赋值用户名方法
--SysUserServiceImpl.java 实现工具类,重写了赋值用户名的方法
2025-04-03 09:41:14 +08:00
CGD 14be24a515 完成“获取模型配置列表”功能 2025-04-03 08:24:47 +08:00
CGD fbdfd8df69 完成"获取模型配置列表" 2025-04-02 23:52:13 +08:00
devspadeboy 17b5308515 为xiaozhi-server的requirments.txt文件添加PySocks包
原因: requests
经过socks代理访问网络的时候需要依赖第三方package,
对应PySocks包。否则会出现"Missing dependencies for SOCKS
support."的错误。
参考连接: https://requests.readthedocs.io/en/latest/user/advanced/#socks
2025-04-02 22:51:35 +08:00
8f4c0901f0 Hot fix (#650)
* update:添加设备注册验证码接口

* update:更新说明文档

* update:优化说明文档

* update:更新说明文档

* update:优化说明文档

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-04-02 19:41:02 +08:00
hrzandGitHub e18065a1bf update:更新说明文档 (#649)
* update:添加设备注册验证码接口

* update:更新说明文档

* update:优化说明文档

* update:更新说明文档
2025-04-02 18:34:22 +08:00
Sakura-RanChenandGitHub ad0493f8a0 Merge pull request #648 from xinnan-tech/web-model-api
Web model api
2025-04-02 17:59:03 +08:00
CGDandGitHub b85368f8d4 Merge pull request #647 from xinnan-tech/web_HeaderBar_Classify
调整设备管理接口与页面,运用本地缓存增加HeaderBar管理员和用户分类
2025-04-02 17:55:41 +08:00
CGD 18ea1e7acf 样式调整 2025-04-02 17:54:25 +08:00
Ran_Chen 50d7627b81 调整设备管理接口于页面,增加HeaderBar管理员和用户分类,运用本地缓存 2025-04-02 17:39:49 +08:00
CGD 5934cf718d 优化了”用户管理“页面样式,修改了”模型配置“页面的分页器 2025-04-02 17:19:46 +08:00
CGD c57ab0e703 优化了”用户管理“和”模型配置“的样式 2025-04-02 16:47:44 +08:00
剑雨 2fb7281d07 管理员控制层分页获取用户接口改回使用ExtendPageData。符合设计接口定义
--AdminController.java
--SysUserService.java
--SysUserServiceImpl.java
2025-04-02 16:03:46 +08:00
剑雨 4c0d55d2e6 管理员控制层完善的查找全部设备的接口
--AdminController.java 完善查找全部设备接口
--DateUtils.java 编写了一个返回简短时间描述的方法,如刚刚,几分钟前
--DevicePageUserDTO.java 定义了需要什么查找参数
--DeviceService.java 定义了分页方法
--DeviceServiceImpl.java 实现了分页获取全部设备的方法
--ExtendPageData.java 扩展的分页对象,多返回一个页数
--UserShowDeviceListVO.java 定义了返回全部设备每个对象的字段
2025-04-02 15:59:18 +08:00
hrzandGitHub a1904d4a80 update:添加设备注册验证码接口 (#646) 2025-04-02 15:56:15 +08:00
CGDandGitHub 8856f7efa6 Merge pull request #645 from xinnan-tech/Web_Device_Api
Web device api
2025-04-02 15:41:08 +08:00
Ran_Chen bdedc48aca 完成device接口调整,调整弹窗设置,优化Headerbar 2025-04-02 15:38:04 +08:00
Sakura-RanChenandGitHub 8a6b4e5499 Merge pull request #644 from xinnan-tech/web-admin-modify
Web admin modify
2025-04-02 15:16:49 +08:00
CGD f7a6de912c 完成批量启用,批量删除,批量禁止功能 2025-04-02 15:14:41 +08:00
CGD 48fa48c159 优化了”全选“等四个按钮的样式,完成”全选“功能 2025-04-02 14:21:33 +08:00
Ran_Chen c811beadb4 修复警告 2025-04-02 12:05:09 +08:00
CGDandGitHub 4c76ad2ba7 Merge pull request #641 from xinnan-tech/web_voice
单独语音项处理,优化style结构
2025-04-02 11:47:41 +08:00
CoderMonkeyandGitHub aa34473560 Merge pull request #640 from HiCoderMonkey/tts-response
fix:删除多余方法
2025-04-02 11:37:23 +08:00
Ran_Chen 0a63b00199 单独语音项处理,优化style结构 2025-04-02 11:36:12 +08:00
lizhongxiang f479a789db fix:删除多余方法 2025-04-02 11:35:49 +08:00
CGD 0761d5a8c2 优化了“重置密码弹框” 2025-04-02 11:31:06 +08:00
CoderMonkeyandGitHub d4ce501c75 Merge pull request #639 from HiCoderMonkey/tts-response
fix:播放音乐不会停
2025-04-02 11:26:43 +08:00
lizhongxiang c2643d0b80 fix:merge main 2025-04-02 11:18:26 +08:00
lizhongxiang 078605c188 fix:播放音乐不会停 2025-04-02 11:11:16 +08:00
hrzandGitHub f6ad17729f update:添加提示词模版sql (#638) 2025-04-02 11:07:19 +08:00
lizhongxiang cd3e9ed494 fix:播放音乐不会停 2025-04-02 11:07:04 +08:00
Sakura-RanChenandGitHub 1f9f564def Merge pull request #637 from xinnan-tech/web-API-admin
Web api admin
2025-04-02 11:02:43 +08:00
CGD 198755c3f5 完成“分页查找用户”、“重置密码”功能 2025-04-02 10:57:26 +08:00
CGDandGitHub d2b6d5f083 Merge pull request #635 from xinnan-tech/Web_Agent_Api_Test
Web agent api test
2025-04-02 10:18:28 +08:00
Ran_Chen 444e3192a2 完善并调试智能体接口配置 2025-04-02 10:16:12 +08:00
欣南科技andGitHub c12d3df073 Merge pull request #634 from xinnan-tech/fix-hot
Fix hot
2025-04-02 09:28:25 +08:00
hrz 82b1548ae0 update:优化异常登录 2025-04-02 09:23:36 +08:00
hrzandGitHub afd1d2ae6a Merge pull request #632 from joey-zhou/config
config文件添加缺失的api key申请地址
2025-04-02 09:19:10 +08:00
CGDandGitHub 90aafe1b5f Merge pull request #633 from flashily/web-flashily
重新划分agent-api
2025-04-02 09:14:45 +08:00
CGD 143d33e285 “分页查找用户”有问题,“用户删除”已完成 2025-04-02 08:05:03 +08:00
flashily 09938e0aa6 重新划分agent-api,修复登录后home页面报错。 2025-04-02 00:32:24 +08:00
joeyandGitHub fd59aff4d0 Merge branch 'main' into config 2025-04-01 23:58:54 +08:00
JoeyZhou 59133b9d8d config文件添加缺失的api key申请地址 2025-04-01 23:56:10 +08:00
欣南科技andGitHub cca42309c4 Merge pull request #630 from xinnan-tech/test-manager-api
合并多个修改
2025-04-01 23:21:20 +08:00
hrz 510ee1b282 update:manager-api已接近完成,现在进入正式接口联调阶段 2025-04-01 23:14:15 +08:00
hrz c4d3020a1d update:增加tencentasr领取信息 2025-04-01 23:10:10 +08:00
JoeyZhou 132174568f 优化vad,采用bytearray替换byte,提高字符串拼接效率 2025-04-01 22:47:15 +08:00
hrzandGitHub f3af30ae53 Merge pull request #607 from joey-zhou/tencent_asr
feat:新增腾讯云ASR语音识别服务
2025-04-01 22:09:59 +08:00
JoeyZhou 6d3f270a8f 添加tencent asr配置文件 2025-04-01 22:07:22 +08:00
hrz 86621661df update:日志配置在logback配置文件即可 2025-04-01 22:04:04 +08:00
hrz d668917694 fix:用户分页页码参数错误bug 2025-04-01 21:49:26 +08:00
hrz 8bc1d09c4a fix:hass_set_state字符判断错误 2025-04-01 21:31:50 +08:00
hrzandGitHub 76b90c179b Merge pull request #614 from joey-zhou/manager_build
优化后端Java部署文档方案
2025-04-01 21:26:47 +08:00
funsugarandGitHub ee17d9416a Update util.py
修复根据IP地址获取城市地址出错的问题
2025-04-01 17:27:58 +08:00
CoderMonkeyandGitHub 8a5a9cc0b3 Merge pull request #625 from HiCoderMonkey/tts-response
fix:火山声音复刻
2025-04-01 15:09:12 +08:00
lizhongxiang 347fc4ca44 fix:火上声音复刻 2025-04-01 15:07:16 +08:00
hrz 61db1192e2 update:格式化代码 2025-04-01 14:27:17 +08:00
CGDandGitHub 7c389a0641 Merge pull request #624 from xinnan-tech/web_api_user_test
user接口修改并测试
2025-04-01 11:37:24 +08:00
CGDandGitHub 4241120853 Merge branch 'main' into web_api_user_test 2025-04-01 11:35:55 +08:00
Ran_Chen 5998fc3edd user接口修改并测试 2025-04-01 10:59:35 +08:00
joeyandGitHub 392f8a1ce0 Merge branch 'main' into manager_build 2025-04-01 09:50:40 +08:00
欣南科技andGitHub 04203c4103 update:更新版本号 (#623) 2025-04-01 09:37:22 +08:00
hrz 188cd7f023 update:更新版本号 2025-04-01 09:36:16 +08:00
欣南科技andGitHub 8d17f5bd3c merge:web端底层优化
update:web端底层优化
2025-04-01 09:22:27 +08:00
hrz 9d39880e9d update:让VUE_APP_TITLE变量控制title 2025-04-01 09:20:50 +08:00
hrzandGitHub f27e213d13 Merge pull request #620 from huangjunsen0406/main
feat: 同步上游 main 分支并优化构建配置
2025-04-01 09:04:37 +08:00
huangjunsen0406 69ecb2c503 Merge remote-tracking branch 'upstream/main' 2025-04-01 00:45:43 +08:00
huangjunsen0406 0585a0732f perf(图片): 压缩图片大小、img标签启用原生lazy 2025-04-01 00:42:36 +08:00
huangjunsen fab4adb07e perf(构建): 优化构建时间:首次构建提升 50%,二次构建提升 30%
优化构建配置,提升构建效率和文件体积优化

1. 禁用生产环境的 source map:为了减少生产环境构建的文件体积,提高构建速度,生产环境下不再生成 source map。

2. 配置开发服务器代理:在 `devServer` 中配置了代理,解决了跨域问题,确保本地开发时可以顺利访问后端 API。

3. 动态插入 CDN 链接:在生产环境下,通过 `chainWebpack` 动态修改 HTML 插件配置,插入 CDN 链接,避免打包常用库(如 `vue`, `axios`,
`element-ui` 等),从而减少打包体积。

4. 代码分割优化:优化了 `splitChunks` 配置,减少了小模块的分割,提升了构建效率和缓存利用率。增加了 `minSize` 和 `maxSize` 配置,避免过多的小模块被拆分。

5. 启用多线程压缩:在生产环境中,配置了 `TerserPlugin` 以启用并行压缩,减少了 JS 文件的压缩时间。

6. 启用 Gzip 压缩:通过 `CompressionPlugin` 配置了 Gzip 压缩,只压缩大于 20KB 的文件,减少了构建后的文件体积。

7. 配置 `externals`:通过 `externals` 排除了 `vue`, `vue-router`, `vuex`, `element-ui`, `axios`,
`opus-decoder` 等库的打包,避免重复打包并通过 CDN 加载这些库。

8. 配置文件系统缓存:启用了 Webpack 文件系统缓存,加速了增量构建,缓存目录设置为 `.webpack_cache`,缓存有效期为一个月。

9. 配置 Webpack 别名:为项目中的路径配置了别名,简化了模块导入,减少了代码中的路径冗余。

10. 提供可选的打包分析:通过 `BundleAnalyzerPlugin` 插件,在 `ANALYZE=true` 环境变量下启用打包分析功能,帮助分析并优化构建后的文件。
2025-04-01 00:38:32 +08:00
joeyandGitHub 5c3ae278be Update README.md 2025-04-01 00:05:32 +08:00
joeyandGitHub 19a067f4e8 Update README.md 2025-04-01 00:04:16 +08:00
hrzandGitHub 9430094072 update:修复退出保存记忆bug (#619) 2025-04-01 00:03:05 +08:00
joeyandGitHub a7b5e0df6c Delete main/manager-api/start.sh 2025-04-01 00:02:40 +08:00
joeyandGitHub 83e9725d02 Merge branch 'main' into manager_build 2025-04-01 00:00:48 +08:00
JoeyZhou 086dea8594 fix:修复日志无法正常生成bug,采用logback控制日志 2025-03-31 23:58:12 +08:00
欣南科技andGitHub 50490b70b7 Merge pull request #618 from xinnan-tech/test-server-pr
合并若干提交
2025-03-31 23:28:57 +08:00
欣南科技andGitHub fac3a0acd7 Merge branch 'main' into test-server-pr 2025-03-31 23:28:37 +08:00
hrz 73c4d6a604 update:优化提示词 2025-03-31 23:26:23 +08:00
hrz 6ba63db47f 1、将耗时最大的iot处理改成异步
2、iot循环5次等待func_handler加载完成
2025-03-31 22:54:37 +08:00
JoeyZhou d3c8e4badb feat:后端服务器新增启动脚本,自动建立log日志 2025-03-31 22:21:46 +08:00
hrz fdd16ad3c7 update:
1、await self.close(ws)已经在finally有关闭逻辑了,无需在except里关闭。
2、func_handler和mcp_manager的加载必须用异步实现,减少唤醒连接好使
3、关于iot等待func_handler问题,要在iot消息那里做等待
2025-03-31 21:40:48 +08:00
hrz 9178faef6d update:取消从音频文件转成文字,提高响应速度 2025-03-31 21:24:48 +08:00
joeyandGitHub 665318164e Update requirements.txt 2025-03-31 21:23:40 +08:00
joeyandGitHub 44f8254b43 Delete main/xiaozhi-server/core/providers/asr/vosk_local.py 2025-03-31 21:23:15 +08:00
joeyandGitHub e085fb1b10 Update config.yaml 2025-03-31 21:22:13 +08:00
joeyandGitHub 48ed5d5c9b Update .gitignore 2025-03-31 21:18:03 +08:00
hrz e2da300e09 update:优化腾讯tts生成指南 2025-03-31 21:13:50 +08:00
hrz e11a37ffec update:优化测试web工具 2025-03-31 21:04:11 +08:00
huangjunsen 20c1f0576b build(环境变量): 📦 去除.env忽略、修改请求地址、控制台名称通过env获取
修改了环境变量的读取方式

调整了请求地址配置

控制台名称通过 .env 获取
2025-03-31 19:52:01 +08:00
huangjunsen fef8cece90 chore: 🔨 去除.env.development忽略 2025-03-31 19:40:57 +08:00
huangjunsen f549f26541 feat(style): 新增全局css覆写element ui 自动填充色 2025-03-31 17:35:46 +08:00
hrzandGitHub 9ba836b814 修复唤醒缓存文件过小bug (#613)
* fix:音色表id为String

* update:修复唤醒缓存文件过小bug
2025-03-31 16:48:56 +08:00
CoderMonkeyandGitHub d9d973b6aa Merge pull request #612 from HiCoderMonkey/tts-response
fix:aliyun,cozecn,custom,doubao,gpt_sovits_v2,gpt_sovits_v3,minimax,o…
2025-03-31 16:32:08 +08:00
lizhongxiang cc4aed5a8e fix:aliyun,cozecn,custom,doubao,gpt_sovits_v2,gpt_sovits_v3,minimax,openai,siliconflow,ttson,这些tts兼容 2025-03-31 16:31:06 +08:00
剑雨 26e471616c 完善管理员分页查询用户功能
--AdminPageUserDTO.java 修改的dto的说明
--AdminPageUserVO.java 添加了状态的字段
--DeviceService.java 添加了查询用户设备数量定义
--DeviceServiceImpl.java 实现查询用户设备方法
--SysUserServiceImpl.java 完善分页查询,查询出每个用户的设备数量和状态字段
2025-03-31 16:30:56 +08:00
JoeyZhou f20c17f27d 优化部署文档:改进打包和服务启动命令
1. 修改打包命令为 mvn clean install,确保构建前清理旧文件
2. 改进服务启动命令,添加日志输出和进程ID保存
3. 规范化操作流程,提高部署可靠性
2025-03-31 16:13:32 +08:00
joeyandGitHub fd188f6f65 Merge branch 'main' into vosk_asr 2025-03-31 15:50:32 +08:00
剑雨 d10ba456d7 完善管理员删除用户功能,缺少对话删除功能
--AdminController.java 修改调用的方法名字
--AgentService.java 添加了指定用户id智能体批量删除定义
--AgentServiceImpl.java 实现了删除方法
--DeviceService.java添加了指定用户id设备批量删除定义
--DeviceServiceImpl.java 实现了删除方法
--SysUserService.java 修改删除定义的方法名字
--SysUserServiceImpl.java 完成用户删除实现
2025-03-31 15:47:42 +08:00
JoeyZhou ee3808dd2f feat:新增vosk本地语音识别服务 2025-03-31 15:41:45 +08:00
CGDandGitHub a345d41e9e Merge pull request #609 from xinnan-tech/web_HeaderBar_SignOut
清除本地token缓存,完成前端退出
2025-03-31 15:36:51 +08:00
CoderMonkeyandGitHub b44d52fb3e Merge pull request #610 from HiCoderMonkey/tts-response
fix:普通聊天调试
2025-03-31 15:35:33 +08:00
Sakura-RanChenandGitHub d36ea8a906 Merge pull request #608 from xinnan-tech/web-api-admin-get
Web api admin get
2025-03-31 15:35:31 +08:00
Ran_Chen 28f8533d0a 清除本地token缓存,完成前端退出 2025-03-31 15:34:26 +08:00
lizhongxiang 93265be974 fix:普通聊天调试 2025-03-31 15:33:20 +08:00
CGD 587b9e8800 完成用户管理模块的搜索功能 2025-03-31 15:25:57 +08:00
CoderMonkeyandGitHub 2028405af6 Merge pull request #606 from HiCoderMonkey/tts-response
tts 双向流改造
2025-03-31 15:21:38 +08:00
JoeyZhou d2d97149fc feat:新增腾讯云ASR语音识别服务 2025-03-31 15:19:29 +08:00
lizhongxiang bb9df3f54c add:双向流tts结构改造,火山双向tts语音流式输入输出 2025-03-31 15:15:59 +08:00
CGD c3a1b0f609 完成”获取用户列表“ 2025-03-31 14:44:23 +08:00
CGDandGitHub 1b25ed5903 Merge pull request #604 from xinnan-tech/web_ModelConf_optimize
优化了“模型配置的页面”
2025-03-31 14:32:46 +08:00
Ran_Chen e87c96300b 优化了“模型配置的页面” 2025-03-31 14:28:29 +08:00
hrzandGitHub ba5bf33b5a fix:音色表id为String (#603) 2025-03-31 11:02:58 +08:00
hrzandGitHub 94e1c09647 fix:音色表id为String (#602) 2025-03-31 10:57:27 +08:00
hrzandGitHub 6bd7ad9413 Merge pull request #600 from AdJIa/feat-test-page
feat: 添加了方便用于测试xiaozhi-server的web页面,支持文本、语音(基于libopus库的编解码)对话
2025-03-31 10:52:54 +08:00
hrzandGitHub d75032e853 Merge pull request #601 from gmm932/xiaozhi-test-pr
add:添加 Server 测试网页
2025-03-31 10:50:44 +08:00
CGD 261ecfea4d 优化了用户管理的样式 2025-03-31 10:24:37 +08:00
lujia 6f9cd94e66 feat: 添加了方便用于测试xiaozhi-server的web页面,支持文本、语音(基于libopus库的编解码)对话 2025-03-31 09:38:26 +08:00
安稳 ee2e1ed5fc add:添加 Server 测试网页 2025-03-31 09:35:35 +08:00
hrzandGitHub 92c1317d4c Merge pull request #576 from joey-zhou/tencent_tts
feat:增加腾讯云TTS服务
2025-03-30 18:36:33 +08:00
hrzandGitHub cfb97a087b Merge pull request #587 from sxd-mike/main
添加路由守护
2025-03-30 18:36:06 +08:00
hrzandGitHub 76ba99aa6c Merge pull request #591 from journey-ad/patch-2
一些功能优化和bug修复
2025-03-30 18:35:27 +08:00
hrzandGitHub 330d7ed95c Merge pull request #596 from xhit-ux/patch-1
Update: 修改错别字
2025-03-30 18:34:10 +08:00
拾尘andGitHub 878e73524b Update: 修改错别字 2025-03-30 18:14:10 +08:00
hrzandGitHub 13b0aa1a7b update:初始化音色表、模型配置表数据 (#592) 2025-03-30 15:10:15 +08:00
Jad 326342b834 chore(server): 移除高频触发的debug日志输出 2025-03-30 13:11:52 +08:00
Jad 8bbd610f12 fix(server): 适配1.5.2版本客户端的设备名
已经在 4c91bff 修复了自动注册的iot方法,和此插件功能重复了,也许可以删掉此插件?
另外观察到function_call准确率不够高,可能是llm的问题
2025-03-30 13:09:18 +08:00
Jad 549c2af988 feat(server): asr保留更多的音频前导帧
语速较快或者声音不清晰时,保留更多前导帧可以提升asr识别效果
2025-03-30 13:06:15 +08:00
Jad d02c56a0e0 feat(server): 使用主动退出指令时显示到设备上 2025-03-30 13:03:01 +08:00
Jad 1f3654cc01 feat(server): 开启唤醒词加速时返回唤醒词文本 2025-03-30 13:01:04 +08:00
Jad b6b6b0310f fix(server): 退出时等待保存记忆导致立即重连时阻塞 2025-03-30 12:58:27 +08:00
Jad 4c91bffcc7 fix(server): 加载插件改为初始化时同步执行 #559 2025-03-30 12:46:54 +08:00
hrzandGitHub d730a6cd06 update:初始化模型供应器数据 (#589) 2025-03-30 01:31:26 +08:00
林zp 67050f972e 添加一个路由守护 2025-03-30 00:20:09 +08:00
欣南科技andGitHub ffafd32693 Merge pull request #579 from xinnan-tech/test-manager-api
manage-api集成测试
2025-03-29 21:56:04 +08:00
hrz ab4ec5e468 update:完成user、agent、device三个模块接口测试 2025-03-29 21:52:06 +08:00
hrzandGitHub a07277feb8 Merge pull request #580 from xinnan-tech/manager-api-newdevice
修改了设备模块的绑定设备接口的逻辑
2025-03-29 18:10:00 +08:00
hrzandGitHub a3cd4b6e66 Merge branch 'test-manager-api' into manager-api-newdevice 2025-03-29 18:09:51 +08:00
hrz 25b7e76407 update:格式化代码 2025-03-29 18:00:06 +08:00
hrz 630cb13066 update:优化泛型代码 2025-03-29 17:49:39 +08:00
hrz 81188a0129 update:删除无用文件 2025-03-29 17:15:19 +08:00
hrzandGitHub cf1abd90a0 Merge pull request #577 from CaixyPromise/main
实现OTA接口
2025-03-29 17:12:08 +08:00
hrzandGitHub 6865a8be45 Merge branch 'test-manager-api' into main 2025-03-29 17:11:58 +08:00
hrz b63fcc80a1 update:整合现有版本 2025-03-29 17:06:53 +08:00
caixypromise a19ba6d48b chore: 因为在OTA激活设备时要求绑定用户信息,如果不把这里的调试功能注释则拿不到用户信息,会数据不完整。 2025-03-29 16:04:57 +08:00
caixypromise 70b6efe922 feature: 新增实现OTA功能——实现设备激活、前端输入激活码验证并保存设备。 2025-03-29 16:02:30 +08:00
caixypromise 0b07269346 chore: DeviceEntity设备实体类的Id字段类型错误,数据库内为varchar,映射类型为Long; 2025-03-29 15:59:48 +08:00
JoeyZhou 336954eeeb feat:增加腾讯云TTS服务 2025-03-29 15:18:15 +08:00
lizhongxiang 264487574b add:火山双向tts语音流式输入输出 2025-03-29 14:17:09 +08:00
hrz 2988e5eef2 merge:main分支的manager-web和xiaozhi-server 2025-03-29 10:49:55 +08:00
hrzandGitHub fe87889ccd Merge pull request #572 from dreamchen/feature_manager-web&api_agent&device&roleConfig&ota&syncConfig
Feature manager web&api agent&device&role config&ota&sync config
2025-03-29 10:27:55 +08:00
hrzandGitHub 0598ab4400 Merge pull request #574 from LinZeb906791229/main
get_ip_info接口优化
2025-03-29 09:06:05 +08:00
hrzandGitHub 7d090f8ecc Merge pull request #573 from mkanako/fix_function_call_type
修复function call的参数类型定义错误
2025-03-29 09:02:44 +08:00
kanako 088ee47b3c 修复function call的参数类型定义错误 2025-03-28 23:44:07 +08:00
Erlei Chen a320b4c001 update:调整方法鉴权 2025-03-28 23:17:53 +08:00
Erlei Chen 3adce95340 Merge branch 'main' into MVP 2025-03-28 23:13:24 +08:00
abin 2a6bfd792a get_ip_info接口优化
将失效的https://freeipapi.com/api/json替换为https://whois.pconline.com.cn/ipJson.jsp?json=true
2025-03-28 22:52:21 +08:00
Erlei Chen 0816f1f589 feature:为合并mian做准备 2025-03-28 22:22:23 +08:00
欣南科技andGitHub 497def8055 Merge pull request #569 from xinnan-tech/add-tag
update:0.1.16版本
2025-03-28 18:48:05 +08:00
hrz 62be26ff47 update:0.1.16版本
- 增加mcp服务
- 支持Dify、Coze时使用独立的意图识别
2025-03-28 18:47:20 +08:00
hrzandGitHub 6a81d80778 Merge pull request #492 from xinnan-tech/mcp-client
增加mcp的tool功能,可自行配置mcp服务,实现命令控制
2025-03-28 18:42:24 +08:00
剑雨 8914beae26 修改了设备模块的绑定设备接口的逻辑
--DeviceBindDTO.java 把原来设备请求头dto改为绑定dto
--DeviceController.java 修改设备绑定接口,改为需要提供智能体和设备验证码2个参数,通过设备验证码获取到mac地址,把用户id,mac地址,智能体id保存到数据库
--DeviceEntity.java 继承基础实体类
--DeviceService.java 修改绑定设备方法定义
--DeviceServiceImpl.java 重写绑定设备方法
2025-03-28 18:04:01 +08:00
hrzandGitHub 60c38a8dea Merge pull request #562 from mkanako/fix_handle_device
fix:修复handle_device.py 参数类型定义错误导致DoubaoLLM调用报 400 错误
2025-03-28 17:51:04 +08:00
欣南科技andGitHub 4e0934debf Merge pull request #567 from xinnan-tech/fix_intent_llm
fix:Dify、Coze可使用独立意图识别
2025-03-28 17:49:27 +08:00
hrz 17126303fa fix:已经使用了intent_llm,不应该再回到functioncall的chat中 2025-03-28 17:17:14 +08:00
CGDandGitHub 98fa95190c Merge pull request #563 from xinnan-tech/web_UserManagement_optimize
优化了“用户管理”,分页还未调整
2025-03-28 15:42:03 +08:00
Ran_Chen 3a2261107c 优化了“用户管理”,分页还未调整 2025-03-28 15:24:53 +08:00
kanakoandGitHub b1b64abed9 fix:修复handle_device.py 参数类型定义错误导致DoubaoLLM调用报 400 错误 2025-03-28 14:20:11 +08:00
hrz 05356b6652 update:简化intent_llm代码 2025-03-28 14:13:54 +08:00
CGDandGitHub cbd0c6615d Merge pull request #558 from xinnan-tech/web-HeaderBar-optimize
优化“导航栏”响应调整
2025-03-28 11:35:52 +08:00
Sakura-RanChenandGitHub 90e389efa2 Merge pull request #560 from xinnan-tech/web-api-AgentTemplate-get
完成“获取智能体模板”
2025-03-28 11:34:36 +08:00
CGD 00a0b26797 完成“获取智能体模板” 2025-03-28 11:20:08 +08:00
Ran_Chen 69b5ffe3bf 优化“导航栏”响应调整 2025-03-28 11:08:12 +08:00
玄凤科技 31539294eb 调整mcp等待时间为15秒 2025-03-28 09:52:27 +08:00
玄凤科技 d1a2307134 Merge branch 'mcp-client' of https://github.com/xinnan-tech/xiaozhi-esp32-server into mcp-client
# Conflicts:
#	main/xiaozhi-server/core/connection.py
#	main/xiaozhi-server/requirements.txt
2025-03-28 09:11:48 +08:00
hrzandGitHub 97b777f1b2 Merge pull request #550 from Ike-li/fix_Dockerfile-server
修复 Dockerfile-server 注释
2025-03-27 22:30:26 +08:00
Erlei Chen c565bfc6bc feature:实现角色配置 2025-03-27 22:14:52 +08:00
Sakura-RanChenandGitHub a63137abc9 Merge pull request #551 from xinnan-tech/web-API-device
Web api device
2025-03-27 17:59:54 +08:00
CGD 3ca06f8d50 完成”绑定设备“功能 2025-03-27 17:54:05 +08:00
Ike-li e5b0e202be 修复 Dockerfile-server 注释 2025-03-27 15:39:11 +08:00
Erlei Chen 41db6aafd9 feature:角色配置能力部分实现 2025-03-27 14:06:40 +08:00
CGDandGitHub c66385d1f7 Merge pull request #547 from xinnan-tech/web-AddModel-optimize
优化“添加模型”页面布局
2025-03-27 11:57:01 +08:00
Ran_Chen b0304fd875 优化“添加模型”页面布局 2025-03-27 11:54:05 +08:00
CGD 5bfc3efc9c 完成“解绑设备” 2025-03-27 11:24:49 +08:00
hrzandGitHub 62845cfcf1 Merge pull request #515 from koalalgx/main
意图识别intent_llm单独配置独立的LLM,意图识别intent_llm增加天气和新闻查询function
2025-03-27 10:43:49 +08:00
Sakura-RanChenandGitHub 5c536e72df Merge pull request #546 from xinnan-tech/web-ModelConfig-modify
优化了”模型配置“页面
2025-03-27 09:13:41 +08:00
欣南科技andGitHub 7cfece1592 Merge pull request #544 from xinnan-tech/hot-fix
fix:函数调用时有时参数为空的bug
2025-03-27 01:08:50 +08:00
hrzandGitHub f393b2c9ba Merge pull request #542 from flashily/manger-api-flashily
修复Long id写入string的bug
2025-03-27 01:07:02 +08:00
hrzandGitHub 164f2e5472 Merge branch 'main' into manger-api-flashily 2025-03-27 01:06:42 +08:00
hrz 1434ecbc2e fix:函数调用时有时参数为空的bug 2025-03-27 01:03:38 +08:00
flashily c2e443d4ac 修复Long id写入string的bug 2025-03-27 00:26:37 +08:00
hrzandGitHub c079125458 Merge pull request #536 from xinnan-tech/manage-server-aliTTSToken
增加token过期刷新,修复过期bug
2025-03-27 00:21:01 +08:00
欣南科技andGitHub 4c1d7b34b9 Merge pull request #541 from xinnan-tech/hot-fix
merge:manag-api
2025-03-27 00:11:37 +08:00
hrzandGitHub 53772b3fe3 Merge pull request #540 from xinnan-tech/manager-api-agent-jsonL
agent api
2025-03-27 00:06:03 +08:00
hrz 28d3c40835 fixed:modelConfigEntity.setId是String类型 2025-03-27 00:02:26 +08:00
hrzandGitHub a01faecd0c Delete main/manager-api/.vscode/settings.json 2025-03-26 23:59:48 +08:00
hrzandGitHub a1b071e38e Merge pull request #518 from xinnan-tech/manager-api-admin
管理员功能重置密码,删除用户接口完成,分页和查询设备需等设备管理完成后调用实现
2025-03-26 23:12:56 +08:00
hrzandGitHub 571622a0f4 Merge pull request #483 from xinnan-tech/manager-api-model
manager-api 模块新增 /api/v1/models/ 接口
2025-03-26 23:10:36 +08:00
CGD 4ab84d7209 优化了”模型配置“页面 2025-03-26 21:43:07 +08:00
Erlei Chen 4b90e70aad Merge branch 'main' into MVP 2025-03-26 19:44:02 +08:00
hrzandGitHub 30a938e348 update:更换iot演示demo图 (#538) 2025-03-26 18:31:23 +08:00
Sakura-RanChenandGitHub f6f4384e42 Merge pull request #537 from xinnan-tech/web-vue-modelconfig
优化了”模型配置“页面
2025-03-26 17:15:15 +08:00
CGD 911b11211e 优化了”模型配置“页面 2025-03-26 17:10:06 +08:00
Erlei Chen ee0da9fc3a feature:OTA能力完善 2025-03-26 17:00:54 +08:00
Ken 8bb596c74f 增加token过期刷新,修复 2025-03-26 16:51:26 +08:00
CGDandGitHub d0fdeb33e0 Merge pull request #533 from xinnan-tech/web-model-AddModelDialog
完成添加模型组件
2025-03-26 16:43:19 +08:00
Ran_Chen ae7f41032e 完成添加模型组件 2025-03-26 15:53:47 +08:00
剑雨 f30cb6badb 完善删除,删除用户时,删除其他关联数据(等待其他功能方法调用)
--SysUserServiceImpl.java
2025-03-26 14:49:22 +08:00
欣南科技andGitHub 97a9c1e08a Merge pull request #532 from xinnan-tech/test-server-pr
merge:农历插件优化、异步消费线程不销毁的BUG
2025-03-26 13:14:43 +08:00
hrzandGitHub 1e699c027d Merge pull request #504 from suofang/fix_not_clear_threads
fix:解决客户端websocket连接断开后异步消费线程不销毁的BUG
2025-03-26 11:40:06 +08:00
hrzandGitHub 9bd731729d Merge pull request #528 from journey-ad/refactor-plugins
优化获取日期和音量亮度控制插件
2025-03-26 11:39:40 +08:00
hrzandGitHub dc17eccf76 add:在日志里添加版本信息 (#529) 2025-03-26 10:15:00 +08:00
Jad 3649a33afb feat(plugin_func): 重构音量控制插件,支持亮度调整
支持立创实战派等设备亮度调整
2025-03-26 04:24:47 +08:00
Jad d76bcc1366 feat(plugin_func): 拆分get_time和get_lunar插件 2025-03-26 01:32:43 +08:00
欣南科技andGitHub 2987f1c680 Merge pull request #519 from xinnan-tech/manage-server-edgetts-stream
edge-tts 流式写
2025-03-26 00:40:15 +08:00
hrz ab93ee0406 update:调整加载顺序 2025-03-26 00:39:34 +08:00
hrzandGitHub 69dd933a7d Merge pull request #526 from xinnan-tech/fix-wakeup_words
Fix wakeup words
2025-03-25 23:48:53 +08:00
欣南科技andGitHub 5440de0453 Merge pull request #525 from xinnan-tech/flashily-web
Flashily web
2025-03-25 22:44:42 +08:00
hrzandGitHub f2e130c70e Merge pull request #517 from flashily/flashily-web
与mock连接
2025-03-25 22:41:38 +08:00
Sakura-RanChenandGitHub 4c845c26f7 Merge pull request #521 from xinnan-tech/web-device-bind
Web device bind
2025-03-25 19:52:23 +08:00
CGD a43acca375 优化了user.js文件 2025-03-25 18:59:05 +08:00
Ken 635520aa85 edge-tts 流式写入,避免一次性加载完整语音到内存,无需等待完整音频生成再保存,音频数据块(chunk)生成后立即写入文件,相比等待完整音频生成后再保存,能更早得到部分结果 2025-03-25 18:05:25 +08:00
剑雨 fce9759e93 修复bug
--AdminController.java 重置密码添加返回新密码
--AdminPageUserDTO.java 取消参数验证
--SysUserServiceImpl.java 修改分页查询条件
2025-03-25 18:00:50 +08:00
flashily 18243cd4b0 与mock连接 2025-03-25 16:52:40 +08:00
剑雨 75a6e51e68 管理员控制层,添加接口,删除用户,重置密码,查找所有设备(未完成)
--AdminController.java
2025-03-25 16:50:47 +08:00
剑雨 312edd4b15 用户业务层为添加新方法,重置密码,直接修改密码
--SysUserService.java 定义2个方法
--SysUserServiceImpl.java 实现重置密码,直接修改密码
2025-03-25 16:39:38 +08:00
CGD be3e67b2c1 完成“已绑设备”功能 2025-03-25 16:23:28 +08:00
剑雨 a5765f81fe 控制层添加了新接口
--AdminController.java 添加管理员分页接口
2025-03-25 15:22:56 +08:00
剑雨 4bee92abb0 用户业务层添加了新功能:分页查找
--AdminPageUserDTO.java 管理员分页用户参数DTO
--AdminPageUserVO.java 管理员分页用户展示VO
--SysUserService.java 添加分页方法定义
--SysUserServiceImpl.java 实现了分页方法
2025-03-25 15:04:48 +08:00
CGDandGitHub d9dcb90745 Merge pull request #512 from xinnan-tech/web-change-password
完成修改密码
2025-03-25 14:33:03 +08:00
koalalgxandGitHub fbd25353d5 Update get_weather.py 2025-03-25 14:29:28 +08:00
koalalgxandGitHub 44c3e73577 Update intentHandler.py 2025-03-25 14:28:59 +08:00
koalalgxandGitHub 9cbad1a448 Update get_news.py 2025-03-25 14:28:32 +08:00
koalalgxandGitHub 3a3ddbc2bc Update connection.py 2025-03-25 14:27:48 +08:00
koalalgxandGitHub 63a3c33df9 Update base.py 2025-03-25 14:27:10 +08:00
koalalgxandGitHub 32d7400f7d Update intent_llm.py 2025-03-25 14:26:46 +08:00
koalalgxandGitHub 38191f976b Create xinference.py 2025-03-25 14:25:31 +08:00
CGDandGitHub c380e0e110 Merge branch 'main' into web-change-password 2025-03-25 14:24:58 +08:00
koalalgxandGitHub 2199b8eca7 Update config.yaml 2025-03-25 14:24:05 +08:00
koalalgxandGitHub 88455604a2 Update config.yaml 2025-03-25 14:22:34 +08:00
Sakura-RanChenandGitHub 63eb69091f Merge pull request #505 from xinnan-tech/web-agent-put
Web agent put
2025-03-25 14:19:33 +08:00
欣南科技andGitHub fc668810bd Merge pull request #510 from xinnan-tech/web-flashily
Web flashily
2025-03-25 11:32:57 +08:00
hrzandGitHub 2773e3a48a Merge pull request #506 from flashily/web-flashily
优化界面与细节
2025-03-25 11:28:31 +08:00
flashily 18a03f6ccc 优化界面与细节 2025-03-25 03:15:04 +08:00
CGD e9348f5512 优化了”配置智能体“ 2025-03-25 00:01:13 +08:00
suofang ce65226ea4 fix:解决客户端websocket连接断开后异步消费线程不销毁的BUG 2025-03-24 23:53:56 +08:00
CGD a3b3079b63 完成“配置智能体“功能 2025-03-24 22:41:32 +08:00
hrzandGitHub 22de4bb13b update:修复音乐播放卡顿和断连的bug
修复音乐播放卡顿和断连的bug
2025-03-24 21:55:02 +08:00
zhishengandGitHub eef7bb0cad Delete main/manager-api/src/main/resources/db/changelog/data.sql~ 2025-03-24 20:13:14 +08:00
pengzhisheng 8f1fbbdeef 去除多余文件,优化接口权限,优化 model 实体类主键生成策略 2025-03-24 20:08:33 +08:00
pengzhisheng f3562e091f 去除多余文件,优化接口权限,优化 model 实体类主键生成策略 2025-03-24 20:03:56 +08:00
Ran_Chen 2001258ef4 完成修改密码 2025-03-24 18:08:05 +08:00
CGD 52a66ea304 完成获取智能体配置 2025-03-24 17:27:08 +08:00
欣南科技andGitHub 21ddb1541f update:优化天气、农历插件
update:优化天气、农历插件
2025-03-24 17:16:34 +08:00
hrzandGitHub a3ec6d79b0 feat: 优化查询天气插件
feat: 优化查询天气插件
2025-03-24 16:32:11 +08:00
hrzandGitHub bb8c315ffc Merge pull request #495 from journey-ad/improve-func-time
feat: 支持查询农历日期和黄历信息
2025-03-24 16:30:55 +08:00
hrzandGitHub f2ae398d3f Merge pull request #493 from xinnan-tech/web-agent-configuration
完成删除智能体
2025-03-24 15:31:01 +08:00
Jad 02e33f68b4 feat: 支持查询农历日期和黄历信息 2025-03-24 13:12:46 +08:00
玄凤科技 8c4c9d88da 增加网站浏览mcp 2025-03-24 10:28:48 +08:00
李健豪 49cb98a606 修复音乐播放卡顿和断连的bug 2025-03-24 09:28:01 +08:00
Erlei Chen bdd18b384b feature:
1.OTA基本能力(固定配置),待优化
2.智能体管理与设备管理对接api,实现流程闭环(已测试)
2025-03-24 09:26:45 +08:00
玄凤科技 32ab716f0d Merge branch 'main' into mcp-client
# Conflicts:
#	main/xiaozhi-server/core/connection.py
#	main/xiaozhi-server/requirements.txt
2025-03-24 09:26:14 +08:00
LFNL-scholarandGitHub fe24529fce Merge branch 'xinnan-tech:main' into main 2025-03-24 09:24:30 +08:00
CGD b59c097bca 完成删除智能体 2025-03-24 09:16:48 +08:00
玄凤科技 6d6414eb62 Merge branch 'main' of https://github.com/xinnan-tech/xiaozhi-esp32-server 2025-03-24 08:44:29 +08:00
Jad 5b1c20d625 feat: 优化查询天气插件
7天预报包含每日天气
2025-03-24 02:09:01 +08:00
hrzandGitHub af6c8ab935 update:优化唤醒词缓存文件
* update:增加私有唤醒答复文件

* update:优化唤醒词缓存文件
2025-03-23 22:59:09 +08:00
hrzandGitHub 4acb5f924a update:增加私有唤醒答复文件 (#488) 2025-03-23 22:40:31 +08:00
b1b99f1066 update:忽略提示词缓存文件
* update:开启唤醒词加速

* update:忽略提示词缓存文件

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-03-23 22:12:11 +08:00
hrzandGitHub 004ee6f143 update:开启唤醒词加速 (#486) 2025-03-23 22:02:13 +08:00
欣南科技andGitHub 19455f89d3 update:优化唤醒词答复
update:优化唤醒词答复
2025-03-23 17:49:04 +08:00
hrz 18d98e3bd0 update:优化对唤醒词的识别 2025-03-23 17:47:39 +08:00
pengzhisheng af038b7fc8 manager-api 模块新增 /api/v1/models/ 接口:
1、新增模型配置对应接口;
2、优化 mapper 目录文件结构;
3、优化启动时自动执行数据库初始化脚本,新增默认账号 admin
2025-03-23 17:32:59 +08:00
hrz 4a9297dc65 update:优化提示音配置,这只成可配置项 2025-03-23 17:20:36 +08:00
HuangandGitHub 49fefb41a6 update:优化唤醒词响应时间,修复初始化函数异步bug (#482) 2025-03-23 16:20:20 +08:00
HuangandGitHub 2fa64dfdd0 Merge pull request #476 from journey-ad/optional-greeting
优化打招呼和进入聆听模式的反馈
2025-03-23 12:09:55 +08:00
HuangandGitHub e0f777b9b4 Merge pull request #472 from xinnan-tech/web-vue-add
Web vue add
2025-03-23 10:52:58 +08:00
HuangandGitHub dfe3de14d8 Merge branch 'main' into web-vue-add 2025-03-23 10:52:36 +08:00
HuangandGitHub abe234c7ce update:补充音乐插件的配置 (#479) 2025-03-23 10:46:15 +08:00
HuangandGitHub d7bf67fd0e Merge pull request #478 from xinnan-tech/XuSenfeng-patch-1
Update play_music.py 原有提示词在模型在未明确指定音乐的时候不能正确识别
2025-03-23 10:45:21 +08:00
Jiao HaoyangandGitHub 8218996f04 Update play_music.py 原有提示词在模型在未指定音乐的时候不能正确识别 2025-03-23 09:35:57 +08:00
Jad ed91e5d607 feat: 开场是否回复唤醒词支持配置 2025-03-23 01:26:31 +08:00
Jad 0bf0b0d381 feat: TTS播放结束提示音 2025-03-23 01:26:29 +08:00
欣南科技andGitHub d88559f5de update:homeassistant插件化改造
update:homeassistant插件化改造
2025-03-22 21:40:17 +08:00
hrz f398115df3 update:更新Home Assistant接入方式 2025-03-22 21:38:40 +08:00
hrz 82413fecab update:优化home_assistant提示词加载 2025-03-22 20:39:52 +08:00
Erlei Chen 66352de1eb Merge branch 'main' into feature_manage-web&api_agent&device 2025-03-22 08:37:38 +08:00
Erlei Chen a7730f6e93 update:修改样式、调整页面命名 2025-03-22 08:33:24 +08:00
HuangandGitHub d5a5b24223 Merge pull request #418 from c1pher-cn/main
服务端支持function的形式调用homeassistant控制智能设备
2025-03-22 01:40:27 +08:00
HuangandGitHub 472dba2665 Merge branch 'test-pr-homeassistant' into main 2025-03-22 01:40:15 +08:00
CGD a5444b11b3 优化了各个界面 2025-03-22 00:22:12 +08:00
HuangandGitHub 5a05a68524 add:AliAppLLM
add:AliAppLLM
2025-03-21 22:04:24 +08:00
欣南科技andGitHub 36be61bbe1 merge:音色管理功能
音色管理功能
2025-03-21 21:46:11 +08:00
hrz ec6ab983f7 udate:规范包名,小写包名 2025-03-21 21:44:40 +08:00
HuangandGitHub 69630c2be0 update:配置字段统一小写 2025-03-21 21:09:54 +08:00
HuangandGitHub 8e605dd1d4 update:配置字段统一小写 2025-03-21 21:09:32 +08:00
HuangandGitHub 8bb0cf02ad update:配置字段统一小写 2025-03-21 21:08:50 +08:00
HuangandGitHub 60c054f457 update:将manger-web启动设置成8001端口
Update vue.config.js
2025-03-21 21:01:06 +08:00
CGD 5648ee974a 完成三个组件 2025-03-21 18:08:47 +08:00
玄凤科技 dc4968f961 添加命令行服务 2025-03-21 17:31:29 +08:00
剑雨 36d1370720 添加了请求参数验证
--TimbreController.java 验证参数
--TimbreDataDTO.java
--TimbreDataDTO.java 定义参数验证
--validation.properties
--validation_en_US.properties
--validation_zh_CN.properties
--validation_zh_TW.properties 定义参数验证失败后的错误说明
2025-03-21 17:26:16 +08:00
玄凤科技 7ead5537f6 提交requirements.txt中mcp版本依赖 2025-03-21 17:15:54 +08:00
sunweigongandGitHub 7fe797d44d Update vue.config.js
Bug 修复:在启动manger-web连接服务端时,默认为8080端口。此处应按main/README.md文档说明,指定端口为 8001。
2025-03-21 16:42:00 +08:00
剑雨 a1e959420d 为接口添加权限控制
--TimbreController.java 添加权限
2025-03-21 16:07:17 +08:00
剑雨 4c99b40257 修复错误
--TimbreController.java 修复分页获取不到请求参数的错误
--TimbreDetailsVO.java 统一分页参数为string
--TimbrePageDTO.java 序列化
2025-03-21 15:58:39 +08:00
剑雨 ead0958d18 Merge branch 'refs/heads/main' into manager-api-modelAndTimbre-api 2025-03-21 15:04:11 +08:00
李健豪 220af8068e 修复音乐播放断开bug
- 修复音乐播放速度太快导致设备内存溢出断开连接的问题
2025-03-21 14:59:01 +08:00
剑雨 a1730b2d52 添加音色管理的功能
--TimbreController.java 音色控制层,添加了分页,删除,保存,修改接口
--TimbreDetailsVO.java 音色详情展示对象
--TimbrePageDTO.java 音色分页参数
--TimbreDataDTO.java 音色保存数据参数
--TimbreDao.java 音色持久定义
--TimbreService.java 音色业务层定义,添加了分页,删除,保存,修改,获取详情
--TimbreServiceImpl.java
--TimbreEntity.java 音色表对应的实体
2025-03-21 14:57:22 +08:00
jsonL 1a1d6c0835 agent api 2025-03-21 13:00:17 +08:00
Miyokiss 06cbffdea4 Add:AliAppLLM 2025-03-21 03:12:18 +08:00
Erlei Chen 4409f37000 合并样式及功能 2025-03-21 01:39:23 +08:00
HuangandGitHub c45e1faf42 update:默认开启意图识别 (#460) 2025-03-20 23:19:31 +08:00
欣南科技andGitHub 732d42f174 Merge pull request #459 from xinnan-tech/test-server-pr
@CaixyPromise
fix(tts.base): 修复 AudioSegment.from_file 读取音频时阻塞的问题 
@CaixyPromise
feature(#377): 实现清理大模型AI的Markdown语法功能,优化TTS自然度。关联Issue #377 
@yanyige
feat: 新闻插件开发, 使用function_call支持播放当天新闻 #403
2025-03-20 22:31:30 +08:00
HuangandGitHub 524fde99f8 Merge pull request #457 from yanyige/feat-support-news
feat: 新闻插件开发, 使用function_call支持播放当天新闻 #403
2025-03-20 22:14:19 +08:00
yanyige 649246dc6a feat: 新闻插件开发, 使用function_call支持播放当天新闻 #403 2025-03-20 21:55:07 +08:00
HuangandGitHub 6c7ac25388 Merge pull request #449 from BoBoloverrrr/bobo-xiaozhi
代码复用:将输入验证逻辑封装成一个独立的函数validateInput ,提高代码的复用性。
2025-03-20 21:46:36 +08:00
HuangandGitHub cb1d6ddeec Merge pull request #455 from CaixyPromise/feature/clean-markdown-for-tts
feature/clean markdown for tts 实现清理大模型AI的Markdown语法功能,
2025-03-20 21:45:19 +08:00
HuangandGitHub 58313889ee Merge pull request #454 from CaixyPromise/fix/tts.base-blocking-bug
fix(tts.base): 修复 AudioSegment.from_file 读取音频时阻塞的问题
2025-03-20 21:44:53 +08:00
caixypromise 5ebc62a084 feature(#377): 实现清理大模型AI的Markdown语法功能,优化TTS自然度。关联Issue #377
close #377
2025-03-20 21:29:53 +08:00
caixypromise fcba384a15 fix(tts.base): 修复 AudioSegment.from_file 读取音频时阻塞的问题
添加 `-nostdin` 参数,防止 FFmpeg 在 Windows 环境下等待标准输入,导致阻塞执行。
2025-03-20 21:10:04 +08:00
玄凤科技 3ea95ffa48 mcp模板文件 2025-03-20 18:20:50 +08:00
玄凤科技 898fd36eca 增加mcp调用超时检测逻辑 2025-03-20 18:20:09 +08:00
CGD 6cd88fb98f 完成模型配置-页面1 2025-03-20 18:11:37 +08:00
欣南科技andGitHub 396de72c5d Merge pull request #451 from xinnan-tech/hot-fix
fix:修复输出日志logger不存在bug
2025-03-20 16:59:33 +08:00
hrz 9932d60dee fix:修复输出日志logger不存在bug 2025-03-20 16:58:12 +08:00
bobo 1ad93ce1fd 右上角用户名显示,新增下拉菜单样式
接收username字段并显示在右上角。
右上角添加了下拉菜单样式,包含个人中心,修改密码以及退出登录。
2025-03-20 16:57:38 +08:00
bobo 2041513676 代码复用:将输入验证逻辑封装成一个独立的函数validateInput ,提高代码的复用性。
validateInput 函数:该函数用于验证输入是否为空,若为空则显示错误提示并返回 false,否则返回 true。
2025-03-20 16:05:06 +08:00
CGD 3ea1a2bf2f 完成用户管理页面 2025-03-20 14:08:38 +08:00
玄凤科技 2b81ebca8e 调通mcp tool 2025-03-20 11:52:37 +08:00
CoderMonkeyandGitHub 6a00895af8 Merge pull request #443 from HiCoderMonkey/tts-response
Tts 改造
2025-03-20 10:16:47 +08:00
lizhongxiang 1136ca4b24 mergin main 2025-03-20 10:14:49 +08:00
lizhongxiang b153bc11f2 mergin main,速度提升一下 2025-03-20 09:39:25 +08:00
欣南科技andGitHub 27df97d710 Merge pull request #441 from xinnan-tech/fixbug-gettime
修复gettime插件导致chatglm卡住问题
2025-03-20 09:12:33 +08:00
玄凤科技 a25b7b9b3f 修复gettime插件导致chatglm卡住问题 2025-03-20 09:09:47 +08:00
玄凤科技 de9809ca5a 修复时间插件导致chatglm卡住问题 2025-03-20 09:06:36 +08:00
玄凤科技 8504c181c0 mcp初步调试 2025-03-20 08:59:45 +08:00
欣南科技andGitHub 8a005ffb00 Merge pull request #440 from xinnan-tech/test-server-pr
Test server pr
2025-03-20 08:58:24 +08:00
hrz 80ffa7a577 updtge:优化超参 2025-03-20 08:57:39 +08:00
HuangandGitHub ca8f9a7e4a Merge pull request #406 from diaoling6665/main
允许修改openai接口的超参
2025-03-19 23:27:57 +08:00
HuangandGitHub 8d19d78297 Merge pull request #419 from aileenfun/main
gemini独立代理模式
2025-03-19 23:27:14 +08:00
欣南科技andGitHub 483e5eb85a 合并:ASR增加sherpa-onnx模型
feat: ASR增加sherpa-onnx模型 #315 (#379)
2025-03-19 23:22:17 +08:00
HuangandGitHub a4b4f491d2 Merge branch 'main' into test-pr-sherpa-asr 2025-03-19 23:21:23 +08:00
HuangandGitHub 08093f509a update:优化配置文件缩进 2025-03-19 22:39:23 +08:00
HuangandGitHub 9a96223d12 fix:部分支持openai的LLM的url配置名不同 2025-03-19 22:21:11 +08:00
欣南科技andGitHub 0c2b194444 add:manage-web智能体功能
添加智能体功能
2025-03-19 21:48:04 +08:00
HuangandGitHub a06055168f Merge branch 'main' into web-agent-add 2025-03-19 21:40:52 +08:00
欣南科技andGitHub e04546a9ae 合并:机智云湾湾小何
合并:机智云湾湾小何
2025-03-19 20:28:23 +08:00
hrz f6da1a045d update:湾湾小何音色新渠道 2025-03-19 20:27:15 +08:00
CGD acd386bb09 添加智能体功能 2025-03-19 18:13:03 +08:00
HuangandGitHub 45225c0ce1 Merge pull request #427 from insrat/support-gizwitsapi
add:支持Gizwits API渠道接口
2025-03-19 17:44:21 +08:00
HuangandGitHub 0bd884d309 update:manage-web对接用户信息、获取智能体列表,搜索接口
完成前端获取用户信息、获取智能体列表,搜索功能开发
2025-03-19 17:38:38 +08:00
欣南科技andGitHub aea2ae8d79 合并提交,修复dify不支持工作流的bug 2025-03-19 17:25:10 +08:00
hrz 99ec5ab161 update:修正dify saas平台地址 2025-03-19 17:23:25 +08:00
CGD 4431e7470f 完成前端获取用户信息、获取智能体列表,搜索功能开发 2025-03-19 16:16:29 +08:00
jzhuang ed775405c6 add:支持Gizwits API渠道接口 2025-03-19 13:57:42 +08:00
欣南科技andGitHub 4aefbe5aa8 add:获取用户信息、修改密码 (#394)
Manager api user
2025-03-19 01:45:56 +08:00
hrz 786c467464 update:格式化代码 2025-03-19 01:44:25 +08:00
hrz 50182ef940 update:优化获取用户信息的代码 2025-03-19 01:42:36 +08:00
HuangandGitHub bf3aa2df09 dify默认应该是chat模式 2025-03-19 00:20:47 +08:00
HuangandGitHub 0b744a2599 update:dify默认应是chat模式 2025-03-19 00:20:08 +08:00
HuangandGitHub a75b8b40e2 Merge pull request #423 from xinnan-tech/XuSenfeng-patch-2
iot状态更新
2025-03-18 23:57:17 +08:00
HuangandGitHub 2e23c08608 Merge pull request #421 from xinnan-tech/web-vue-modify
Web vue modify
2025-03-18 23:55:54 +08:00
Jiao HaoyangandGitHub 178f45ee26 iot状态更新 2025-03-18 23:55:47 +08:00
CGD 7b16edc99c 优化了前端代码 2025-03-18 23:08:13 +08:00
CGD f3738a1630 修改了前端页面 2025-03-18 21:49:57 +08:00
aileenfun 34fa65132d gemini独立代理模式
在代理模式下手动组成request,无论 Steam 是否为 True,返回的均是非steam值。
不设置代理时自动切换为google的官方api,走 stream模式。

全局代理容易让系统中其他模块也使用代理,造成无法访问的问题。
测试最新的 gemini flash 2.0可以使用。
2025-03-18 21:04:21 +08:00
c1pher-cn 19fe2d2f03 服务端支持function的形式调用homeassistant控制智能设备 2025-03-18 20:42:09 +08:00
HuangandGitHub c796af7d07 Hot fix (#415)
* fix:找不到function卡住bug

* fix:客户端拾音模式日志bug
2025-03-18 18:42:17 +08:00
Jiao HaoyangandGitHub b7251e2be2 Merge pull request #413 from XuSenfeng/DifyBug
Dify bug添加工作流和文本生成模式的处理
2025-03-18 17:18:51 +08:00
Jiao HaoyangandGitHub 6efede79c7 Merge branch 'xinnan-tech:main' into DifyBug 2025-03-18 17:09:51 +08:00
Xvsenfeng e58da80f8e 添加工作流和文本生成模式 2025-03-18 15:58:31 +08:00
bd556c33a0 fix:找不到function卡住bug (#408)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-18 14:26:27 +08:00
878809ecb4 update:修复iot的bug (#407)
* fix: 修复manual模式无法识别 (#404)

* feat(docs): 新增Issues模板

* fix: 补全core依赖

* fix: 修复manual模式无法识别

* 去除重复依赖.txt

已经有torch和torchaudio

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* 修复iot功能中表达式问题 (#400)

* Custom paths asr tts (#388)

* #164 自定义asr、tts缓存目录,项目启动自动创建目录

* #164 自定义asr、tts缓存目录,项目启动自动创建目录

* fix:修复语音无法找到新配置项output_file的bug

* fix:电脑不支持iot音量控制bug

---------

Co-authored-by: Junsen <66542771+Huang-junsen@users.noreply.github.com>
Co-authored-by: tang <tangyiyong@gmail.com>
Co-authored-by: shudongW <178200623@qq.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-18 13:25:34 +08:00
HaoDuoYuandGitHub ea4966f494 Merge branch 'xinnan-tech:main' into main 2025-03-18 12:08:16 +08:00
HaoDuoYuandGitHub f5d9b478d5 Update config.yaml 2025-03-18 12:07:53 +08:00
HaoDuoYuandGitHub 3d97fab16d Add files via upload 2025-03-18 12:05:33 +08:00
af2ae11eb1 update:更新视频demo (#397)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-18 01:35:18 +08:00
aileenfun 2c1fc30bfb gemini可以单独走代理,避免全局代理。
全局代理容易让系统中其他模块也使用代理,造成无法访问的问题。
测试最新的 gemini flash 2.0可以使用。
2025-03-18 00:53:03 +08:00
5aa4199dfb add:支持IOT功能
* 自动注册iot消息为function call函数,并通过function call控制设备

* 增加配置项,控制iot自动注册function call功能的开启

* 增加function call action的 Error code

* update:补充音量太大声、太小声的意图动作

* update:支持IOT功能

---------

Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-18 00:34:16 +08:00
yanyigeandGitHub 773790c8ec docs: 修复致开发者的公开信文档中的小问题 (#392) 2025-03-18 00:20:27 +08:00
pengzhisheng c7dec8045e 后端新增 /api/v1/user/change-password 接口 2025-03-17 23:25:24 +08:00
pengzhisheng 5d7d12415c Merge branch 'main' into dev 2025-03-17 19:01:16 +08:00
8a066163fe update:和风天气查询 (#387)
* Update get_weather.py (#381)

更新天气插件,增加:通过当前IP获取用户实时位置的功能

* 重构天气查询插件 (#382)

* feat: 添加获取ip信息工具函数

* refactor: 重构天气查询插件

使用和风天气作为数据源
功能更完善

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* update:天气查询优化

---------

Co-authored-by: xiaowu911 <51016996+xiaowu911@users.noreply.github.com>
Co-authored-by: Jad <i@nocilol.me>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-17 14:20:40 +08:00
JadandGitHub 08e57936fc feat: ASR增加sherpa-onnx模型 #315 (#379) 2025-03-17 13:45:49 +08:00
pengzhisheng 7d474e17fa Merge branch 'main' into dev 2025-03-17 09:59:11 +08:00
JunsenandGitHub 6eac25425c feat(docs): 新增Issues模板 (#383) 2025-03-17 09:45:50 +08:00
c0f1981d6f Server music plugins (#380)
* update:intent_llm音乐插件化调用

* update:播放音乐插件改造

* update:完成音乐播放插件化改造

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-17 02:13:10 +08:00
pengzhisheng d3571942d7 Merge branch 'main' into dev 2025-03-16 17:01:25 +08:00
8376b6f0f2 更新GPT_SOVITS_V3接口 (#375)
* ollama去除回复中的think字段 (#373)

* ollama调用修复,并且去除回复中的think字段(deepseek)

* ollama调用修复,并且去除回复中的think字段(deepseek)

* ollama去除回复中的think字段(deepseek)
deepseek 14b,qwen2.5测试通过

* ollama去除回复中的think字段(deepseek)
deepseek 14b,qwen2.5测试通过

* Update ollama.py

---------

Co-authored-by: aileenfun <105077614@qq.com>
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* fix:GPT_SOVITS_V3-20250228 API (#312)

---------

Co-authored-by: aileenfun <alanliu0618@gmail.com>
Co-authored-by: aileenfun <105077614@qq.com>
Co-authored-by: Miyo <101488652+Miyokiss@users.noreply.github.com>
2025-03-16 16:04:27 +08:00
490a66d3fe Add deploy pic (#354)
* update:添加部署方案图

* update:部署参考图

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-15 16:17:25 +08:00
2e182626b9 Function插件自动装载 (#351)
* function call功能完善,增加天气查询,支持插件式扩展

* 增加角色切换功能,通过切换system提示词,修改角色认知

* 增加插件管理系统,可以通过语音加载和卸载插件

* docs: 添加命令操作 (#329)

* docs: 添加命令操作

* feat: 添加 docker-setup.sh 脚本以简化服务端部署

- 新增 docker-setup.sh 脚本,自动创建目录结构、下载语音识别模型和配置文件,并检查文件完整性。
- 更新 Deployment.md 文档,提供一键执行脚本的说明和使用示例。

* docs: 更新 Deployment.md,添加环境访问 GitHub 的注意事项

* refactor: 更新 docker-setup.sh 脚本以支持多操作系统下载命令

- 修改脚本以检测操作系统类型,并根据不同系统选择合适的下载命令(curl 或 wget)。
- 优化错误处理,确保在下载失败时提供清晰的提示信息。
- 更新 Deployment.md 文档,调整懒人脚本的使用说明,增加手动部署的步骤。

* Update docker-setup.sh

* Update docker-setup.sh

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* update:优化插件加载的配置提示

* update:增加自动安装脚本的操作说明

* update:优化插件配置,去掉旧版本的时间设定

---------

Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: TinsFox <fox@tinsfox.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-15 11:48:14 +08:00
pengzhisheng 66f5f8ab12 merge main 2025-03-15 10:00:23 +08:00
50ecee99cc ASR句首丢字问题 (#346)
* fix: ASR句首丢字问题 (#338)

* feat: 支持dify的多轮对话, chat工作流支持持久化conversation_id #296 (#313)

* TTS功能的一些修改 (#307)

* fix: tts音频转码兼容

* feat: 支持自定义tts接口服务

* feat: tts超时时间作为可配置项

* feat: 自定义tts音频格式兼容

* style: 使命名更符合语义

---------

Co-authored-by: Jad <i@nocilol.me>
Co-authored-by: yanyige <yige.yan@qq.com>
Co-authored-by: Jad <journey.adc@gmail.com>
2025-03-15 00:19:45 +08:00
fc3f982309 优化登录 token 校验 (#345)
* 获得获取所有模型名称等功能 (#343)

* 优化登录 token 校验 (#330)

* fix manager-api bug

* 优化登录注册流程,跑通注册登录、接口

* update package

* 优化登录 token 校验:

1、后端新增 /api/v1/user/info 接口,优化 Oauth2Filter.getRequestToken 逻辑;
2、前端 /api/v1/user/login 登录成功后,保存 token 至浏览器本地;
3、前端请求添加本地 token。

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* update:分离home页面的组件

---------

Co-authored-by: CGD <3030332422@qq.com>
Co-authored-by: zhisheng <pzs034@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-14 23:48:59 +08:00
b8e9aded6b Manage agent api (#334)
* update:更换新表

* update:优化用户表sql语句

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-14 14:10:47 +08:00
pengzhisheng 74ce9f7a86 Merge branch 'main' into dev 2025-03-14 10:15:29 +08:00
pengzhisheng 5b2957e7eb 优化登录 token 校验:
1、后端新增 /api/v1/user/info 接口,优化 Oauth2Filter.getRequestToken 逻辑;
2、前端 /api/v1/user/login 登录成功后,保存 token 至浏览器本地;
3、前端请求添加本地 token。
2025-03-14 09:54:54 +08:00
欣南科技andGitHub 55a464f1f6 Update contributor_open_letter.md (#328) 2025-03-14 09:19:43 +08:00
欣南科技andGitHub 72ec6beb99 Update README.md (#327) 2025-03-14 07:27:40 +08:00
pengzhisheng 40eb4ea4ec merge main 2025-03-14 05:47:08 +08:00
欣南科技andGitHub 895f3d9cb3 Update contributor_open_letter.md (#326) 2025-03-14 01:49:28 +08:00
ae758da449 Manage api device bind (#311)
* 增加绑定设备,解绑设备,获取用户设备列表,获取已绑定设备,admin获取所有设备 api相关请求

* delete头部

* delete错误

* 解绑修改为post

* 绑定解绑完善请求参数

* 解绑备注

* update:删除用户表无用属性

* update:绑定设备从redis中获取

* update:优化用户名查询代码

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-13 18:03:35 +08:00
lizhongxiang a067a6ba87 fix: 流式tts,function聊天时候的支持 2025-03-13 17:50:29 +08:00
lizhongxiang c271b88c87 fix: 流式tts,function聊天时候的支持 2025-03-13 17:44:10 +08:00
lizhongxiang 1dfa619243 fix: 流式流畅度问题,英文符号切分,空格切分 2025-03-13 15:30:00 +08:00
lizhongxiang 91bdc05a38 merge main 2025-03-13 14:24:18 +08:00
a8f06f5718 Test prompt (#305)
* fix: 退出指令无法识别 (#302)

修复指令text包含标点的情况下,无法正确识别退出指令的问题

* 优化提示词 (#303)

* 添加 使用 coze 会话。 (#282)

历史消息在coze 上可配置历史消息的轮次。
同个会话id,coze 上自动带历史上下文。

会话和当前session关联。一次连接一个会话,断开后,重连是新会话无历史消息。

* update:去除无用代码

---------

Co-authored-by: Jad <journey.adc@gmail.com>
Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: xu <494462498@qq.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-13 00:54:01 +08:00
c458a1b59a Test login api (#304)
* 优化登录注册流程,跑通注册登录、接口 (#297)

* fix manager-api bug

* 优化登录注册流程,跑通注册登录、接口

* update package

* update:第一个注册的用户是超级管理员

---------

Co-authored-by: zhisheng <pzs034@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-12 23:31:59 +08:00
欣南科技andGitHub 29d59b3974 Main add video (#301)
* 更新教程视频.md

* Update README.md
2025-03-12 22:12:33 +08:00
欣南科技andGitHub 27f267cb3d 更新教程视频.md (#300) 2025-03-12 21:57:53 +08:00
pengzhisheng 0f41039b99 update package 2025-03-12 17:14:48 +08:00
pengzhisheng 8f76db9e41 优化登录注册流程,跑通注册登录、接口 2025-03-12 16:56:51 +08:00
pengzhisheng fc922e996c Merge branch 'main' into dev-manager-api-local 2025-03-12 15:31:20 +08:00
0a26ad8925 Manager code login (#276)
* update:增加前端设计图

* 前端代码优化

* update:底部信息纠正

* 增加:flyio

* update:去除org.quartz

* update:登陆功能

* aliyunTTS常联token

* 新增aliyunTTS长期Token方式

* 超时错误处理

* 本地编译文件

* 验证码获取

* 验证码获取测试

* 验证码展示

* 登录成功

* delete 测试代码

* 注册页面

* Register 风格统一

* web验证码登录注册

* 登录注册功能

* update:登陆注册api结果优化

* delete:删除未用到的代码

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: CGD <3030332422@qq.com>
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-03-12 13:38:44 +08:00
a8c6c7cb36 update:优化无意图识别的日志输出 (#295)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-12 12:46:29 +08:00
81fee53085 绑定设备功能 (#294)
Co-authored-by: CGD <3030332422@qq.com>
2025-03-12 12:44:25 +08:00
7c5f2d95a4 🎈 perf: 更新文档+优雅的退出 (#292)
* 🎈 perf: 更新文档+优雅的退出

* update:gsv代码可以使用gpt_sovits_v2适配器代码拓展,不需要单独。如果需要定义模型名称,可以在gpt_sovits_v2代码中添加扩展

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-12 10:57:25 +08:00
vonwellerandGitHub 3d6bd0e23e 修复ActionResponse为NOTFOUND时候卡住主线程的bug (#285)
修复ActionResponse为NOTFOUND时候卡住主线程的bug
2025-03-11 21:10:44 +08:00
gitjianyuandGitHub 8064e84276 登录。注册。验证码 (#271)
* 修改shiro配置,对/user/*的请求不继续登录验证拦截
--ShiroConfig.java

* 添加了注册,登录接口
--LoginController.java
修改登录请求dto,使得符合Apifox定义接口请求属性
--LoginDTO.java

* 为数据库sys_user表补全创建者的字段
--202503101631.sql
--db.changelog-master.yaml

* 修改系统上下文路径的前缀,使得符合Apifox的接口请求前缀
--application.yml

* 注册接口补上验证码判断
--LoginController.java
2025-03-11 21:06:03 +08:00
香草味的纳西妲andGitHub f8ece2d984 add: GSV本地语音合成相关 (#266) 2025-03-11 21:04:04 +08:00
gitjianyuandGitHub 442eef36ba 修正 (#277)
* 改正自定义错误编码和i18n国际化错误说明对应
--ErrorCode.java 自定义编码
--messages.properties 默认错误说明
--messages_en_US.properties 英文错误说明
--messages_zh_CN.properties 中文简体说明
--messages_zh_TW.properties 中文繁体说明

* i18n国际化剔除自定义参数验证不符合条件的情况说明
--validation.properties 默认说明
--validation_en_US.properties 英文说明
--validation_zh_CN.properties 中文简体说明
--validation_zh_TW.properties 中文繁体说明
2025-03-11 20:58:37 +08:00
7d737ad312 update:增加开发者贡献指南 (#279)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-11 17:28:33 +08:00
2b662d3a14 fix:function call bug (#268)
* 优化function call消息处理

* fix:用户说话重复记录bug

* 2025-3-10-优化llm intent (#254)

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* update:回复上版提示词,无需再二次识别歌曲名

---------

Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
2025-03-11 00:25:33 +08:00
4f3fae81c1 fix:修复长时间不说话关闭意图bug (#267)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-10 22:45:03 +08:00
7b266ad7c0 完成搜索功能开发 (#263)
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2025-03-10 18:29:08 +08:00
CGDandGitHub 16601a67e3 完成解绑功能 (#264) 2025-03-10 18:21:59 +08:00
224d59d50d fix:声音卡顿问题 (#262)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-10 15:56:28 +08:00
pengzhisheng 6142d325c8 Merge branch 'main' into dev-manager-api-local 2025-03-10 13:46:34 +08:00
lizhongxiang 0e8edfe002 merge main,fix gitignore 2025-03-10 11:12:17 +08:00
lizhongxiang c1084923f7 merge main 2025-03-10 10:51:25 +08:00
f9472627f4 Hot fix (#255)
* update:增加意图识别、记忆功能

* update:根据新版本更新教程文档

* update:更新配置说明

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-10 00:49:14 +08:00
69735207e6 update:根据新版本更新教程文档 (#252)
* update:增加意图识别、记忆功能

* update:根据新版本更新教程文档

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-09 22:33:45 +08:00
3b47f18a12 update:增加意图识别、记忆功能 (#251)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-09 21:59:15 +08:00
63f34e5a82 本地记忆+意图识别 (#250)
* 增加本地记忆功能,使用llm总结记忆

* update:增加统一非流式输出输出

* 增加意图识别内容,使用llm进行识别

* 初始化记忆模块

* 完善意图识别处理后的流程

* 通过使用function call实现意图识别

* update:优化意图识别的配置

* update:function call最优设置成doubao-pro-32k-functioncall-241028

---------

Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-09 21:33:45 +08:00
pengzhisheng aa21aa686d Merge branch 'main' into dev-manager-api-local 2025-03-09 02:24:58 +08:00
9c2b2a2dcc Block docker web (#248)
* update:docker智控台设置提示

* 修复启动报错问题 (#247)

修复启动时SyntaxWarning: invalid escape sequence '\]'
  half_width_punctuations = '!"#$%&\'()*+,-./:;<=>?@[\]^_`{|}~'的报错问题

* 2025-3-8-iot状态更新 (#243)

* 添加 GPTSoVits-V3 TTS (#234)

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: vonweller <154695311+vonweller@users.noreply.github.com>
Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: Echo <yowfung@163.com>
2025-03-09 01:02:37 +08:00
baff979ab4 update: 增加docker 统一打包 (#232)
* update: 增加docker 统一打包

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

* update:测试新版镜像自动化编译

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-08 21:11:30 +08:00
pengzhisheng ec2719a572 Merge branch 'main' into dev 2025-03-08 02:54:17 +08:00
07fe330e4f Manager web (#239)
* update:增加前端设计图

* 前端代码优化

* update:底部信息纠正

* 增加:flyio

* update:去除org.quartz

* update:登陆功能

* aliyunTTS常联token

* 新增aliyunTTS长期Token方式

* 获取用户信息和已绑设备

* update:验证码,登录,注册

* update:去掉依赖错误代码

* update:去除验证码重复服务类

* update:删除重复验证码服务类

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: CGD <3030332422@qq.com>
Co-authored-by: Ken <ulxiping@qq.com>
2025-03-07 22:32:35 +08:00
f98c3efef7 Manager web (#238)
* update:增加前端设计图

* 前端代码优化

* update:底部信息纠正

* 增加:flyio

* update:去除org.quartz

* update:登陆功能

* aliyunTTS常联token

* 新增aliyunTTS长期Token方式

* 获取用户信息和已绑设备

* update:验证码,登录,注册

* update:去掉依赖错误代码

* update:去除验证码重复服务类

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: CGD <3030332422@qq.com>
Co-authored-by: Ken <ulxiping@qq.com>
2025-03-07 22:28:11 +08:00
8b74dec910 Manager web (#237)
* update:增加前端设计图

* 前端代码优化

* update:底部信息纠正

* 增加:flyio

* update:去除org.quartz

* update:登陆功能

* aliyunTTS常联token

* 新增aliyunTTS长期Token方式

* 获取用户信息和已绑设备

* update:验证码,登录,注册

* update:去掉依赖错误代码

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: CGD <3030332422@qq.com>
Co-authored-by: Ken <ulxiping@qq.com>
2025-03-07 21:19:41 +08:00
dc4b8a5002 perft:记忆 (#231)
1:优化异常处理

Co-authored-by: 李彬 <01780391@yto.net.cn>
2025-03-07 18:44:08 +08:00
+2 dd5fecdf5a Merge old pr (#235)
* 新增openai tts (#137)

On branch openai_tts
Changes to be committed:
	modified:   config.yaml
	new file:   core/providers/tts/openai_tts.py

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* Update config.yaml (#201)

* 修改了coze的实现方式,使用了v3接口,修复了只能对话一次的bug

* 使用mem0ai api实现记忆功能

* Fix docker space (#179)

* update:调试docker编译缓存

* update:调试docker编译

* update:调试docker编译容量

* update:调试docker编译

---------

Co-authored-by: hrz <1710360675@qq.com>

* TTS处理增加index信息,完善TTS出错时的处理 (#177)

* TTS处理增加index信息,完善TTS出错时的处理

* 第一句语音index处理,歌曲播放index处理

* update:去掉了无用变量,修复continuebug

---------

Co-authored-by: hrz <1710360675@qq.com>

* update:更新demo (#180)

Co-authored-by: hrz <1710360675@qq.com>

* 优化chat中异步调用方式

* 记忆增加时间,以便大模型判断先后关系

* 记忆对时间戳排序,便于梳理前后关系

* add: 不跟踪music下的文件的更改 (#187)

* Mem0ai (#199)

* update:增加mem0ai包依赖

* update:文档增加mem0ai的描述

---------

Co-authored-by: hrz <1710360675@qq.com>

* Update config.yaml

* Update config.yaml

* Update config.yaml

* Update config.yaml

---------

Co-authored-by: strix214 <a1425699467@gmail.com>
Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: HonestQiao <honestqiao@163.com>
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: TOM88812 <ttangxs0808@163.com>
Co-authored-by: 香草味的纳西妲 <151599587+NyaOH-Nahida@users.noreply.github.com>

* update:添加忽略文件

* feat: 增加fastgpt适配:支持think、variables参数 (#213)

* 修改了coze的实现方式,使用了v3接口,修复了只能对话一次的bug

* 使用mem0ai api实现记忆功能

* Fix docker space (#179)

* update:调试docker编译缓存

* update:调试docker编译

* update:调试docker编译容量

* update:调试docker编译

---------

Co-authored-by: hrz <1710360675@qq.com>

* TTS处理增加index信息,完善TTS出错时的处理 (#177)

* TTS处理增加index信息,完善TTS出错时的处理

* 第一句语音index处理,歌曲播放index处理

* update:去掉了无用变量,修复continuebug

---------

Co-authored-by: hrz <1710360675@qq.com>

* update:更新demo (#180)

Co-authored-by: hrz <1710360675@qq.com>

* 优化chat中异步调用方式

* 记忆增加时间,以便大模型判断先后关系

* 记忆对时间戳排序,便于梳理前后关系

* add: 不跟踪music下的文件的更改 (#187)

* Mem0ai (#199)

* update:增加mem0ai包依赖

* update:文档增加mem0ai的描述

---------

Co-authored-by: hrz <1710360675@qq.com>

* feat: 增加fastgpt适配:支持think、variables参数

---------

Co-authored-by: strix214 <a1425699467@gmail.com>
Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: HonestQiao <honestqiao@163.com>
Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: TOM88812 <ttangxs0808@163.com>
Co-authored-by: 香草味的纳西妲 <151599587+NyaOH-Nahida@users.noreply.github.com>
Co-authored-by: pt <ptsghs@163.com>

* update:合并最新代码

* update:合并群友pr

* update:openaitts 测试通过

* update:ACGNTTS测试完成

---------

Co-authored-by: Chris <119588753+Chris-websketch@users.noreply.github.com>
Co-authored-by: ikun441 <3497689533@qq.com>
Co-authored-by: strix214 <a1425699467@gmail.com>
Co-authored-by: 玄凤科技 <eric230308@gmail.com>
Co-authored-by: HonestQiao <honestqiao@163.com>
Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: TOM88812 <ttangxs0808@163.com>
Co-authored-by: 香草味的纳西妲 <151599587+NyaOH-Nahida@users.noreply.github.com>
Co-authored-by: ptisnoob <49125305+ptisnoob@users.noreply.github.com>
Co-authored-by: pt <ptsghs@163.com>
2025-03-07 18:25:18 +08:00
pengzhisheng a466126d63 Merge branch 'main' into dev 2025-03-07 13:25:59 +08:00
6c52754c8f fixed:目录错位 (#230)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-07 11:44:37 +08:00
ikun441andGitHub e1ebcfa865 Create ACGNTTS.py (#200)
Type:ACGNTTS
2025-03-07 10:42:04 +08:00
6464c81e72 Manager web (#227)
* update:增加前端设计图

* 前端代码优化

* update:底部信息纠正

* 增加:flyio

* update:去除org.quartz

* update:登陆功能

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: CGD <3030332422@qq.com>
2025-03-07 10:01:20 +08:00
0b7abfae3a update:优化docker时区 (#225)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-07 01:20:39 +08:00
zhishengandGitHub 76c16ad16e fix manager-api bug (#223) 2025-03-06 23:31:23 +08:00
pengzhisheng 568f322a25 Merge branch 'main' into dev 2025-03-06 21:20:46 +08:00
pengzhisheng 1b64959e2c fix manager-api bug 2025-03-06 21:16:31 +08:00
1f722477ce Fix docker config bug (#220)
* fixed:兼容旧版本docker

* update:增加前端设计图

* update:dockerfile

* fix:修复新版docker目录不对bug

* fix: 修复docker快速启动方式中无法读取配置的问题 #207 (#219)

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

---------

Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: yanyige <232218719@qq.com>
2025-03-06 13:12:32 +08:00
2676331804 Fix docker config bug (#217)
* fixed:兼容旧版本docker

* update:增加前端设计图

* update:dockerfile

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-06 10:55:01 +08:00
c7f705b274 fixed:兼容旧版本docker (#216)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-06 09:05:21 +08:00
6db25ffcfe update:修改readme (#215)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-05 23:27:14 +08:00
0e43748fdc 重新划分目录 (#214)
* 🦄 refactor(web): 修改zhikongtaiweb到web

* 🦄 refactor: 重写前端

路由守护尚未写完

* 🦄 refactor: 标准化路由

* update:前端重写,保留后端

* update:添加前端代码

* update:pip转成poetry启动

* update:增加mem0ai包依赖

* update:文档增加mem0ai的描述

* feat: play online mp3 (#181)

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* 修改前端代码

* update:调整项目目录

* update:优化

* update:配置文件去除8002端口

* update:增加开发说明

* update:更新开发协议

---------

Co-authored-by: kalicyh <34980061+kaliCYH@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
Co-authored-by: freshlife001 <talent@mises.site>
Co-authored-by: CGD <3030332422@qq.com>
2025-03-05 23:13:24 +08:00
lizhongxiang b2381fc689 add: 语音流式输出 2025-03-05 17:29:26 +08:00
lizhongxiang fa75f56ffb add: 语音流式输出 2025-03-05 17:26:32 +08:00
8b151d07c2 Mem0ai (#199)
* update:增加mem0ai包依赖

* update:文档增加mem0ai的描述

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-05 00:20:51 +08:00
香草味的纳西妲andGitHub e31e04639b add: 不跟踪music下的文件的更改 (#187) 2025-03-04 22:40:17 +08:00
TOM88812andGitHub 53479fafa5 Merge pull request #188 from xinnan-tech/mem0ai
Mem0ai分支合并到主分支,增加mem0ai模块,支持api储存和查询记忆
2025-03-04 20:29:25 +08:00
玄凤科技 93a94dea45 记忆对时间戳排序,便于梳理前后关系 2025-03-04 13:58:14 +08:00
玄凤科技 83911d9ad1 记忆增加时间,以便大模型判断先后关系 2025-03-04 10:28:38 +08:00
玄凤科技 cf7acb12d8 Merge branch 'main' into mem0ai 2025-03-04 09:13:14 +08:00
玄凤科技 343ecb3ad4 优化chat中异步调用方式 2025-03-04 08:54:27 +08:00
72fa13b0e7 update:更新demo (#180)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-04 01:08:13 +08:00
bee0663040 TTS处理增加index信息,完善TTS出错时的处理 (#177)
* TTS处理增加index信息,完善TTS出错时的处理

* 第一句语音index处理,歌曲播放index处理

* update:去掉了无用变量,修复continuebug

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-04 00:35:51 +08:00
8dd045d9fd Fix docker space (#179)
* update:调试docker编译缓存

* update:调试docker编译

* update:调试docker编译容量

* update:调试docker编译

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-03 22:34:48 +08:00
HonestQiaoandGitHub 126aa6d4a7 Merge pull request #175 from strix214/main
修改了coze的实现方式,使用了v3接口,修复了只能对话一次的bug
2025-03-03 16:57:34 +08:00
玄凤科技 f2e68060de 使用mem0ai api实现记忆功能 2025-03-03 15:00:04 +08:00
strix214 6507a2ae3e 修改了coze的实现方式,使用了v3接口,修复了只能对话一次的bug 2025-03-03 14:19:30 +08:00
effd79b465 Tts302 (#170)
* feat: add 302.ai TTS integration (#166)

* update:将tts_302ai tts合并到doubao tts

---------

Co-authored-by: Junsen <66542771+Huang-junsen@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-03-02 16:59:25 +08:00
bc531652e9 音乐播放功能添加p3文件格式支持,添加文件目录(含子目录)扫描和文件列表刷新功能 (#157)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-01 17:57:43 +08:00
1c5581b765 Fix ffmpeg env (#163)
* update:ffmpeg依赖检查

* update:微信群更换发布方式

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-01 17:34:14 +08:00
b486599ab8 update:ffmpeg依赖检查 (#162)
Co-authored-by: hrz <1710360675@qq.com>
2025-03-01 17:09:01 +08:00
b94842c312 Fix long audio bug (#158)
* update:异步生成音频

* update:优化LLM断句

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-03-01 01:54:55 +08:00
2c88a36f32 update:启动时检查配置文件 (#155)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-28 19:17:36 +08:00
242f4d87e7 Qq group (#146)
* update:qq group

* update:更新英文版说明

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-02-26 16:02:59 +08:00
2255aacfd0 update:qq group (#145)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-26 15:10:12 +08:00
87cb0b484d Music play (#142)
* Update util.py解决返回元组报错 (#103)

解决返回元组报错

* 增加播放本地音乐功能 (#105)

* Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 On branch Music-playback
 Your branch is up to date with 'origin/Music-playback'.

 Changes to be committed:
	modified:   core/handle/audioHandle.py
	new file:   "music/\346\234\210\344\272\256\344\273\243\350\241\250\346\210\221\347\232\204\345\277\203_\351\202\223\344\270\275\345\220\233.mp3"
	new file:   "music/\350\270\217\345\261\261\346\262\263.mp3"

* Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

On branch Music-playback
Your branch is up to date with 'origin/Music-playback'.

Changes to be committed:
	modified:   config.yaml
	modified:   core/connection.py
	modified:   core/handle/abortHandle.py
	modified:   core/handle/audioHandle.py
	new file:   core/handle/musicHandler.py
	modified:   core/handle/textHandle.py
	modified:   core/websocket_server.py
	new file:   "music/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3"
	new file:   "music/\344\270\255\347\247\213\346\234\210.mp3"
	deleted:    "music/\346\234\210\344\272\256\344\273\243\350\241\250\346\210\221\347\232\204\345\277\203_\351\202\223\344\270\275\345\220\233.mp3"
	deleted:    "music/\350\270\217\345\261\261\346\262\263.mp3"

* 增加播放本地音乐功能

* 增加播放本地音乐功能

* 让音乐配置变的优雅

On branch Music-playback
Your branch is up to date with 'origin/Music-playback'.

Changes to be committed:
	modified:   config.yaml
	modified:   core/handle/musicHandler.py
	renamed:    "music/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3" -> "music/mp3/\344\270\200\345\277\265\345\215\203\345\271\264_\345\233\275\351\243\216\347\211\210.mp3"
	renamed:    "music/\344\270\255\347\247\213\346\234\210.mp3" -> "music/mp3/\344\270\255\347\247\213\346\234\210.mp3"
	renamed:    "music/\345\273\211\346\263\242\350\200\201\347\237\243\357\274\214\345\260\232\350\203\275\351\245\255\345\220\246.mp3" -> "music/mp3/\345\273\211\346\263\242\350\200\201\347\237\243\357\274\214\345\260\232\350\203\275\351\245\255\345\220\246.mp3"
	new file:   music/music_config.yaml

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>

* update:优化代码

* update:流控调试

* update:优化音乐播放

* update:优化音乐配置初始化

---------

Co-authored-by: linqingping <linqingping@users.noreply.github.com>
Co-authored-by: Chris <119588753+Chris-websketch@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-26 01:33:05 +08:00
73803f49fc update:wechat group (#141)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-25 23:51:57 +08:00
5fd87752d5 fixed:更新基础docker环境地址 (#139)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-25 21:11:06 +08:00
94a90c4124 Iot (#129)
* 2025-2-17-iot配置消息处理, 以及控制iot命令发送 (#40)

* update:优化

* update:增加视频教程

* update:iot兼容性又问题,撤回

* fixed:iot boolean 参数接收bug

---------

Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 22:04:48 +08:00
c3b0347155 Iot (#128)
* 2025-2-17-iot配置消息处理, 以及控制iot命令发送 (#40)

* update:优化

* update:增加视频教程

* update:iot兼容性又问题,撤回

---------

Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 21:20:42 +08:00
600f712750 Iot (#127)
* 2025-2-17-iot配置消息处理, 以及控制iot命令发送 (#40)

* update:优化

* update:增加视频教程

---------

Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 18:18:08 +08:00
9e76869c36 Iot (#126)
* 2025-2-17-iot配置消息处理, 以及控制iot命令发送 (#40)

* update:优化

---------

Co-authored-by: Jiao Haoyang <108573524+XuSenfeng@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 18:06:13 +08:00
cb540736ab 跳过使用Open ai 接口时,DeepSeek-R1 模型的深度思考内容 (#54) (#95)
* 跳过使用Open ai 接口时,DeepSeek-R1 模型的深度思考内容 (#54)

* 跳过 DeepSeek-R1 模型的深度思考内容

* 跳过 DeepSeek-R1 模型的深度思考内容

* 新增LM Studio本地大模型API接口

* 优化代码,遇到Bad Case安全处理

* update:优化

---------

Co-authored-by: Sinyo <38577585+SinyoWong@users.noreply.github.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 16:16:06 +08:00
66cd5bb4a5 fixed:修复低版本docker-compose模版参数 (#124)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-24 14:56:39 +08:00
1226e8be47 Fix opuslib (#122)
* fixed:ModuleNotFoundError: No module named 'opuslib'

* update:格式化文档

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 20:14:46 +08:00
22ff7a92b8 fixed:ModuleNotFoundError: No module named 'opuslib' (#121)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 19:59:26 +08:00
1583 changed files with 258041 additions and 93450 deletions
+1 -7
View File
@@ -3,11 +3,5 @@ __pycache__
*.pyc
.env
Dockerfile
docs/
tmp/
data/
LICENSE
README.md
README_en.md
manager/static
manager/static/webui/
data/
+32
View File
@@ -0,0 +1,32 @@
---
name: Bug 报告(Bug Report
about: 反馈项目中的缺陷或问题
title: "[Bug] 简短描述问题"
labels: bug
assignees: ''
---
## 🐛 问题描述
<!-- 清晰简洁地描述问题是什么 -->
## 🖥️ 环境信息
- 部署方式: 全模块部署 还是 单Server部署
- 版本号: 例如 0.3.x
## 🔍 告诉我们,应该怎么复现这个问题
<!-- 这个很重要,方便我们快速定位 -->
1. 打开 '...'
2. 点击 '...'
3. 滚动到 '...'
4. 看到错误
## 🤔 你原本希望是怎么样的
<!-- 简要描述预期的正确行为 -->
## 😯 提供一些截图
<!-- 如果适用,添加问题的截图 -->
1. 比如日志截图,越多越好
2. 比如界面反应
## 📋 其他信息
<!-- 在此添加关于此问题的任何其他上下文信息 -->
@@ -0,0 +1,19 @@
---
name: 代码优化建议(Code Improvement
about: 提出对现有代码的优化或改进建议
title: "[Improvement] 简短描述改进内容"
labels: refactor
assignees: ''
---
## 💡 改进描述
<!-- 描述需要改进的代码部分以及存在的问题 -->
## 🌟 改进建议
<!-- 提出具体的改进方案或思路 -->
## 🛠️ 相关代码
<!-- 如果可能,提供相关代码片段或链接 -->
## 📋 其他信息
<!-- 在此添加任何其他相关信息 -->
@@ -0,0 +1,16 @@
---
name: 文档改进建议(Documentation Improvement
about: 提出对项目文档的改进或补充建议
title: "[Docs] 简短描述改进内容"
labels: documentation
assignees: ''
---
## 📚 改进描述
<!-- 描述需要改进的文档部分以及存在的问题 -->
## ✨ 改进建议
<!-- 提出具体的改进方案或内容 -->
## 📋 其他信息
<!-- 在此添加任何其他相关信息 -->
+19
View File
@@ -0,0 +1,19 @@
---
name: 功能请求(Feature Request
about: 提出新的功能或改进建议
title: "[Feature] 简短描述功能"
labels: enhancement
assignees: ''
---
## 🚀 需求描述
<!-- 清晰简洁地描述你希望发生什么 -->
## 🎯 解决方案
<!-- 描述你认为可行的解决方案或实现方式 -->
## 📝 备选方案
<!-- 描述你考虑过的替代方案或功能 -->
## 📋 其他信息
<!-- 在此添加关于需求的任何其他上下文信息 -->
+6
View File
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: pip
directory: /main/xiaozhi-server
schedule:
interval: weekly
+49
View File
@@ -0,0 +1,49 @@
name: Build Base Image
on:
push:
branches:
- main
paths:
- 'main/xiaozhi-server/requirements.txt'
- 'Dockerfile-server-base'
- '.github/workflows/build-base-image.yml'
jobs:
build-base:
name: Build and push server base image
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.TOKEN }}
- name: Build and push server-base
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile-server-base
push: true
tags: ghcr.io/${{ github.repository }}:server-base
platforms: linux/amd64,linux/arm64
cache-from: type=gha,scope=server-base
cache-to: type=gha,mode=max,scope=server-base
build-args: |
BUILDKIT_PROGRESS=plain
- name: Output image info
run: |
echo "✅ Base image built and pushed successfully!"
echo "📦 Tag: ghcr.io/${{ github.repository }}:server-base"
+51 -9
View File
@@ -4,25 +4,42 @@ on:
push:
tags:
- 'v*.*.*' # 只在以 v 开头的标签推送时触发,例如 v1.0.0
workflow_dispatch:
workflow_run:
workflows: ["Build Base Image"]
types:
- completed
jobs:
release:
name: Release Docker image
name: Release Docker images
runs-on: ubuntu-latest
permissions:
packages: write
contents: write
id-token: write
issues: write
steps:
- name: Check out the repo
- name: Check Disk Space
run: |
df -h
docker system df
- name: Clean up Docker resources
run: |
docker system prune -af
docker builder prune -af
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
network=host
- name: Log in to the GitHub Container Registry
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
@@ -32,15 +49,40 @@ jobs:
- name: Extract version from tag
id: get_version
run: |
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
if [[ "$GITHUB_REF" =~ ^refs/tags/v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
echo "VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV
echo "IS_VERSION=true" >> $GITHUB_ENV
else
echo "VERSION=latest" >> $GITHUB_ENV
echo "IS_VERSION=false" >> $GITHUB_ENV
fi
- name: Build and push Docker image
id: build_push
# 构建 xiaozhi-server 镜像
- name: Build and push xiaozhi-server
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile-server
push: true
tags: |
ghcr.io/${{ github.repository }}:${{ env.VERSION }}
ghcr.io/${{ github.repository }}:latest
${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:server_{1},ghcr.io/{0}:server_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:server_latest', github.repository) }}
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
BUILDKIT_PROGRESS=plain
# 构建 manager-api 镜像
- name: Build and push manager-web
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile-web
push: true
tags: |
${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:web_{1},ghcr.io/{0}:web_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:web_latest', github.repository) }}
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
BUILDKIT_PROGRESS=plain
+48 -2
View File
@@ -3,6 +3,9 @@ __pycache__/
.idea/
*.py[cod]
*$py.class
.vscode
.claude
AGENTS.md
# C extensions
*.so
@@ -75,6 +78,7 @@ docs/_build/
# PyBuilder
.pybuilder/
target/
*.pid
# Jupyter Notebook
.ipynb_checkpoints
@@ -132,17 +136,59 @@ dmypy.json
# Pyre type checker
.pyre/
# music directory
music/
# pytype static type analyzer
.pytype/
# Cython debug symbols
cython_debug/
*.iml
model.pt
tmp
.history
.DS_Store
main/xiaozhi-server/data
main/xiaozhi-server/.claude
main/manager-web/node_modules
.config.yaml
.secrets.yaml
.private_config.yaml
.env.development
docker-compose.yml
# model files
main/xiaozhi-server/models/SenseVoiceSmall/model.pt
main/xiaozhi-server/models/sherpa-onnx*
/main/xiaozhi-server/audio_ref/
/audio_ref/
/asr-models/iic/SenseVoiceSmall/
/main/xiaozhi-server/asr-models/iic/SenseVoiceSmall/
/models/SenseVoiceSmall/model.pt
my_wakeup_words.mp3
!main/xiaozhi-server/config/assets/bind_code.wav
!main/xiaozhi-server/config/assets/wakeup_words.wav
!main/xiaozhi-server/config/assets/bind_not_found.wav
!main/xiaozhi-server/config/assets/bind_code/*.wav
!main/xiaozhi-server/config/assets/max_output_size.wav
main/manager-api/.vscode
# Ignore webpack cache directory
main/manager-web/.webpack_cache/
main/xiaozhi-server/mysql
uploadfile
*.json
.vscode
.cursor
!package.json
!**/package.json
# Do not ignore env and json files inside manager-mobile
!main/manager-mobile/**/env/
!main/manager-mobile/**/.env*
!main/manager-mobile/**/*.json
!main/xiaozhi-server/**/*.json
!main/digital-human/**/*.json
main/digital-human/wakeword_runtime/models
main/digital-human/wakeword_runtime/sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01
sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz2
-45
View File
@@ -1,45 +0,0 @@
# 第一阶段:前端构建
FROM kalicyh/node:v18-alpine AS frontend-builder
WORKDIR /app/ZhiKongTaiWeb
# RUN corepack enable && yarn config set registry https://registry.npmmirror.com
COPY ZhiKongTaiWeb/package.json ZhiKongTaiWeb/yarn.lock ./
RUN yarn install --frozen-lockfile
COPY ZhiKongTaiWeb .
RUN yarn build
# 第二阶段:构建 Python 依赖
FROM kalicyh/poetry:v3.10_xiaozhi AS builder
WORKDIR /app
# 同时拷贝本地环境.venv
COPY . .
# 检查是否有缺失
RUN poetry install --no-root
# 使用清华源加速apt安装,该镜像内置所以注释
# RUN rm -rf /etc/apt/sources.list.d/* && \
# echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
# echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
# echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
# echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
# apt-get update && \
# apt-get install -y --no-install-recommends libopus0 ffmpeg && \
# apt-get clean
# 从构建阶段复制虚拟环境和前端构建产物
COPY --from=frontend-builder /app/ZhiKongTaiWeb/dist /app/manager/static/webui
# 设置虚拟环境路径
ENV PATH="/app/.venv/bin:$PATH"
# 启动应用
ENTRYPOINT ["poetry", "run", "python"]
CMD ["app.py"]
-51
View File
@@ -1,51 +0,0 @@
# 第一阶段:前端构建
FROM node:18 AS frontend-builder
WORKDIR /app/ZhiKongTaiWeb
# 配置npm使用淘宝源
RUN npm config set registry https://registry.npmmirror.com
COPY ZhiKongTaiWeb/package*.json ./
# 安装axios依赖
RUN npm install axios
RUN npm install
COPY ZhiKongTaiWeb .
RUN npm run build
# 第二阶段:构建Python依赖
FROM python:3.10-slim AS builder
WORKDIR /app
COPY requirements.txt .
# 优化apt安装
RUN pip install --no-cache-dir -r requirements.txt \
-i https://mirrors.aliyun.com/pypi/simple/
# 第三阶段:生产镜像
FROM python:3.10-slim
WORKDIR /opt/xiaozhi-esp32-server
# 优化apt安装
RUN echo "deb https://mirrors.aliyun.com/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
echo "deb https://mirrors.aliyun.com/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
apt-get update && \
apt-get install -y --no-install-recommends libopus0 ffmpeg && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# 从构建阶段复制Python包和前端构建产物
COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
COPY --from=frontend-builder /app/ZhiKongTaiWeb/dist /opt/xiaozhi-esp32-server/manager/static/webui
# 复制应用代码
COPY . .
# 启动应用
CMD ["python", "app.py"]
+7
View File
@@ -0,0 +1,7 @@
# 生产镜像,仅包含应用代码
FROM ghcr.io/xinnan-tech/xiaozhi-esp32-server:server-base
COPY main/xiaozhi-server .
# 启动应用
CMD ["python", "app.py"]
+32
View File
@@ -0,0 +1,32 @@
# Dockerfile-server-base
# 基础镜像,包含系统依赖和Python包
FROM python:3.10-slim
# 安装系统依赖
RUN apt-get update && \
apt-get install -y --no-install-recommends libopus0 ffmpeg locales && \
sed -i '/zh_CN.UTF-8/s/^# //g' /etc/locale.gen && \
locale-gen && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
# 配置pip使用国内镜像源(阿里云)并设置超时和重试
RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/ && \
pip config set global.trusted-host mirrors.aliyun.com && \
pip config set global.timeout 120 && \
pip config set install.retries 5
# 设置环境变量以确保正确的字符编码
ENV LANG=zh_CN.UTF-8 \
LC_ALL=zh_CN.UTF-8 \
LANGUAGE=zh_CN:zh \
PYTHONIOENCODING=utf-8
WORKDIR /opt/xiaozhi-esp32-server
# 复制requirements.txt
COPY main/xiaozhi-server/requirements.txt .
# 安装Python依赖
RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
pip install --no-cache-dir -r requirements.txt --default-timeout=120 --retries 5
+50
View File
@@ -0,0 +1,50 @@
# 第一阶段:构建Vue前端
FROM node:18 AS web-builder
WORKDIR /app
COPY main/manager-web/package*.json ./
RUN npm install
COPY main/manager-web .
RUN npm run build
# 第二阶段:构建Java后端
FROM maven:3.9.4-eclipse-temurin-21 AS api-builder
WORKDIR /app
COPY main/manager-api/pom.xml .
COPY main/manager-api/src ./src
RUN mvn clean package -Dmaven.test.skip=true
# 第三阶段:构建最终镜像
FROM bellsoft/liberica-runtime-container:jre-21-glibc
# 安装Nginx和字体库
RUN apk update && \
apk add --no-cache --no-scripts \
nginx \
bash \
fontconfig \
ttf-dejavu \
&& rm -rf /var/cache/apk/* \
&& mkdir -p /run/nginx /var/log/nginx /var/tmp/nginx /etc/nginx/conf.d
# 复制项目自带的中文字体
COPY main/manager-web/public/generator/static/fonts/*.ttf /usr/share/fonts/
# 更新字体缓存
RUN fc-cache -f -v
# 配置Nginx
COPY docs/docker/nginx.conf /etc/nginx/nginx.conf
# 复制前端构建产物
COPY --from=web-builder /app/dist /usr/share/nginx/html
# 复制Java后端JAR包
COPY --from=api-builder /app/target/xiaozhi-esp32-api.jar /app/xiaozhi-esp32-api.jar
# 暴露端口
EXPOSE 8002
# 启动脚本
COPY docs/docker/start.sh /start.sh
RUN chmod +x /start.sh
CMD ["/start.sh"]
+274 -212
View File
@@ -1,11 +1,45 @@
![图片](docs/images/banner.png)
[![Banners](docs/images/banner1.png)](https://github.com/xinnan-tech/xiaozhi-esp32-server)
# 小智 ESP-32 后端服务(xiaozhi-esp32-server)
<h1 align="center">小智后端服务xiaozhi-esp32-server</h1>
(中文 | [English](README_en.md)
<p align="center">
本项目基于人机共生智能理论和技术研发智能终端软硬件体系<br/>为开源智能硬件项目
<a href="https://github.com/78/xiaozhi-esp32">xiaozhi-esp32</a>提供后端服务<br/>
根据<a href="https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh">小智通信协议</a>使用Python、Java、Vue实现<br/>
支持MQTT+UDP协议、Websocket协议、MCP接入点、声纹识别、知识库
</p>
本项目为开源智能硬件项目 [xiaozhi-esp32](https://github.com/78/xiaozhi-esp32)
提供后端服务。根据 [小智通信协议](https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh) 使用 `Python` 实现。
<p align="center">
<a href="./docs/FAQ.md">常见问题</a>
· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">反馈问题</a>
· <a href="./README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3">部署文档</a>
· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">更新日志</a>
</p>
<p align="center">
<a href="./README.md"><img alt="简体中文版自述文件" src="https://img.shields.io/badge/简体中文-DBEDFA"></a>
<a href="./docs/readme/README_en.md"><img alt="README in English" src="https://img.shields.io/badge/English-DFE0E5"></a>
<a href="./docs/readme/README_vi.md"><img alt="Tiếng Việt" src="https://img.shields.io/badge/Tiếng Việt-DFE0E5"></a>
<a href="./docs/readme/README_de.md"><img alt="Deutsch" src="https://img.shields.io/badge/Deutsch-DFE0E5"></a>
<a href="./docs/readme/README_pt_BR.md"><img alt="Português (Brasil)" src="https://img.shields.io/badge/Português (Brasil)-DFE0E5"></a>
<a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
<img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
</a>
<a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/LICENSE">
<img alt="GitHub pull requests" src="https://img.shields.io/badge/license-MIT-white?labelColor=black" />
</a>
<a href="https://github.com/xinnan-tech/xiaozhi-esp32-server">
<img alt="stars" src="https://img.shields.io/github/stars/xinnan-tech/xiaozhi-esp32-server?color=ffcb47&labelColor=black" />
</a>
</p>
<p align="center">
Spearheaded by Professor Siyuan Liu's Team (South China University of Technology)
</br>
刘思源教授团队主导研发(华南理工大学)
</br>
<img src="./docs/images/hnlg.jpg" alt="华南理工大学" width="50%">
</p>
---
@@ -21,7 +55,88 @@
<td>
<a href="https://www.bilibili.com/video/BV1FMFyejExX" target="_blank">
<picture>
<img alt="小智esp32连接自己的后台模型" src="docs/images/demo1.png" />
<img alt="响应速度感受" src="docs/images/demo9.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1vchQzaEse" target="_blank">
<picture>
<img alt="速度优化秘诀" src="docs/images/demo6.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1C1tCzUEZh" target="_blank">
<picture>
<img alt="复杂医疗场景" src="docs/images/demo1.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1zUW5zJEkq" target="_blank">
<picture>
<img alt="MQTT指令下发" src="docs/images/demo4.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1Exu3zqEDe" target="_blank">
<picture>
<img alt="声纹识别" src="docs/images/demo14.png" />
</picture>
</a>
</td>
</tr>
<tr>
<td>
<a href="https://www.bilibili.com/video/BV1pNXWYGEx1" target="_blank">
<picture>
<img alt="控制家电开关" src="docs/images/demo5.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1ZQKUzYExM" target="_blank">
<picture>
<img alt="MCP接入点" src="docs/images/demo13.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1TJ7WzzEo6" target="_blank">
<picture>
<img alt="多指令任务" src="docs/images/demo11.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1VC96Y5EMH" target="_blank">
<picture>
<img alt="播放音乐" src="docs/images/demo7.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1Z8XuYZEAS" target="_blank">
<picture>
<img alt="天气插件" src="docs/images/demo8.png" />
</picture>
</a>
</td>
</tr>
<tr>
<td>
<a href="https://www.bilibili.com/video/BV12J7WzBEaH" target="_blank">
<picture>
<img alt="实时打断" src="docs/images/demo10.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1Co76z7EvK" target="_blank">
<picture>
<img alt="拍照识物品" src="docs/images/demo12.png" />
</picture>
</a>
</td>
@@ -40,124 +155,153 @@
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/av114036381327149" target="_blank">
<a href="https://www.bilibili.com/video/BV17LXWYvENb" target="_blank">
<picture>
<img alt="控制家电开关" src="docs/images/demo5.png" />
<img alt="播报新闻" src="docs/images/demo0.png" />
</picture>
</a>
</td>
<td>
<a href="https://www.bilibili.com/video/BV1kgA2eYEQ9" target="_blank">
<picture>
<img alt="成本最低配置" src="docs/images/demo4.png" />
</picture>
</a>
</td>
<td>
</td>
</tr>
</tr>
</table>
---
## 系统要求与部署前提 🖥️
- **硬件**:一套兼容 `xiaozhi-esp32`
的硬件设备(具体型号请参考 [此处](https://rcnv1t9vps13.feishu.cn/wiki/DdgIw4BUgivWDPkhMj1cGIYCnRf))。
- **服务器**:至少 4 核 CPU、8G 内存的电脑或服务器。
- **固件编译**:请将后端服务的接口地址更新至 `xiaozhi-esp32` 项目中,再重新编译固件并烧录到设备上。
---
## 警告 ⚠️
本项目成立时间较短,还未通过网络安全测评,请勿在生产环境中使用
1、本项目为开源软件,本软件与对接的任何第三方API服务商(包括但不限于语音识别、大模型、语音合成等平台)均不存在商业合作关系,不为其服务质量及资金安全提供任何形式的担保
建议使用者优先选择持有相关业务牌照的服务商,并仔细阅读其服务协议及隐私政策。本软件不托管任何账户密钥、不参与资金流转、不承担充值资金损失风险。
如果您在公网环境中部署学习本项目,请务必在配置文件 `config.yaml` 中开启防护
```yaml
server:
auth:
# 开启防护
enabled: true
```
开启防护后,您需要根据实际情况校验机器的 token 或 mac 地址,详细请参见配置说明。
2、本项目功能未完善,且未通过网络安全测评,请勿在生产环境中使用。 如果您在公网环境中部署学习本项目,请务必做好必要的防护
---
## 部署文档
![Banners](docs/images/banner2.png)
本项目提供两种部署方式,请根据您的具体需求选择:
#### 🚀 部署方式选择
| 部署方式 | 特点 | 适用场景 | 部署文档 | 配置要求 | 视频教程 |
|---------|------|---------|---------|---------|---------|
| **最简化安装** | 智能对话、单智能体管理 | 低配置环境,数据存储在配置文件,无需数据库 | [①Docker版](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) / [②源码部署](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)| 如果使用`FunASR`要2核4G,如果全API,要2核2G | - |
| **全模块安装** | 智能对话、多用户管理、多智能体管理、智控台界面操作 | 完整功能体验,数据存储在数据库 |[①Docker版](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [②源码部署](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) / [③源码部署自动更新教程](./docs/dev-ops-integration.md) | 如果使用`FunASR`要4核8G,如果全API,要2核4G| [本地源码启动视频教程](https://www.bilibili.com/video/BV1wBJhz4Ewe) |
常见问题及相关教程,可参考[这个链接](./docs/FAQ.md)
> 💡 提示:以下是按最新代码部署后的测试平台,有需要可烧录测试,并发为6个,每天会清空数据,
```
智控台地址: https://2662r3426b.vicp.fun
智控台(h5版): https://2662r3426b.vicp.fun/h5/index.html
服务测试工具: https://2662r3426b.vicp.fun/test/
OTA接口地址: https://2662r3426b.vicp.fun/xiaozhi/ota/
Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
```
#### 🚩 配置说明和推荐
> [!Note]
> 本项目提供两种配置方案:
>
> 1. `入门全免费`配置:适合个人家庭使用,所有组件均采用免费方案,无需额外付费。
>
> 2. `流式配置`:适合演示、培训、超过2个并发等场景,采用流式处理技术,响应速度更快,体验更佳。
>
> 自`0.5.2`版本起,项目支持流式配置,相比早期版本,响应速度提升约`2.5秒`,显著改善用户体验。
| 模块名称 | 入门全免费设置 | 流式配置 |
|:---:|:---:|:---:|
| ASR(语音识别) | FunASR(本地) | 👍XunfeiStreamASR(讯飞流式) |
| LLM(大模型) | glm-4-flash(智谱) | 👍qwen-flash(阿里百炼) |
| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen3.5-flash(阿里百炼) |
| TTS(语音合成) | EdgeTTS(微软) | 👍HuoshanDoubleStreamTTS(火山流式) |
| Intent(意图识别) | function_call(函数调用) | function_call(函数调用) |
| Memory(记忆功能) | mem_local_short(本地短期记忆) | mem_local_short(本地短期记忆) |
如果您关心各组件的耗时,请查阅[小智各组件性能测试报告](https://github.com/xinnan-tech/xiaozhi-performance-research),可按报告中的测试方法在您的环境中实际测试。
#### 🔧 测试工具
本项目提供以下测试工具,帮助您验证系统和选择合适的模型:
| 工具名称 | 位置 | 使用方法 | 功能说明 |
|:---:|:---|:---:|:---:|
| 音频交互测试工具 | main》digital-human》index.html | 在 `main/digital-human` 执行 `python start.py` 后访问 `http://127.0.0.1:8006/index.html` | 测试音频播放和接收功能,验证Python端音频处理是否正常 |
| 模型响应测试工具 | main》xiaozhi-server》performance_tester.py | 执行 `python performance_tester.py` | 测试ASR(语音识别)、LLM(大模型)、VLLM(视觉模型)、TTS(语音合成)三个核心模块的响应速度 |
> 💡 提示:测试模型速度时,只会测试配置了密钥的模型。
---
## 功能清单 ✨
### 已实现 ✅
- **通信协议**
基于 `xiaozhi-esp32` 协议,通过 WebSocket 实现数据交互。
- **对话交互**
支持唤醒对话、手动对话及实时打断。长时间无对话时自动休眠
- **多语言识别**
支持国语、粤语、英语、日语、韩语(默认使用 FunASR)。
- **LLM 模块**
支持灵活切换 LLM 模块,默认使用 ChatGLMLLM,也可选用阿里百炼、DeepSeek、Ollama 等接口。
- **TTS 模块**
支持 EdgeTTS(默认)、火山引擎豆包 TTS 等多种 TTS 接口,满足语音合成需求。
![请参考-全模块安装架构图](docs/images/deploy2.png)
| 功能模块 | 描述 |
|:---:|:---|
| 核心架构 | 基于[MQTT+UDP网关](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docs/mqtt-gateway-integration.md)、WebSocket、HTTP服务器,提供完整的控制台管理和认证系统 |
| 语音交互 | 支持流式ASR(语音识别)、流式TTS(语音合成)、VAD(语音活动检测),支持多语言识别和语音处理 |
| 声纹识别 | 支持多用户声纹注册、管理和识别,与ASR并行处理,实时识别说话人身份并传递给LLM进行个性化回应 |
| 智能对话 | 支持多种LLM(大语言模型),实现智能对话 |
| 视觉感知 | 支持多种VLLM(视觉大模型),实现多模态交互 |
| 意图识别 | 支持外挂的大模型意图识别、大模型自主函数调用,提供插件化意图处理机制 |
| 记忆系统 | 支持本地短期记忆、mem0ai接口记忆、PowerMem智能记忆,具备记忆总结功能 |
| 知识库 | 支持RAGFlow知识库,让大模型判断需要调度知识库后再回答 |
| 工具调用 | 支持客户端IOT协议、客户MCP协议、服务端MCP协议、MCP接入点协议、自定义工具函数 |
| 指令下发 | 依托MQTT协议,支持从智控台将MCP指令下发到ESP32设备 |
| 管理后台 | 提供Web管理界面,支持用户管理、系统配置和设备管理;界面支持中文简体、中文繁体、英文显示 |
| 测试工具 | 提供性能测试工具、视觉模型测试工具和音频交互测试工具 |
| 部署支持 | 支持Docker部署和本地部署,提供完整的配置文件管理 |
| 插件系统 | 支持功能插件扩展、自定义插件开发和插件热加载 |
### 正在开发 🚧
- 对话记忆功能
- 多种心情模式
- 智控台webui
想了解具体开发计划进度,[请点击这里](https://github.com/users/xinnan-tech/projects/3)。常见问题及相关教程,可参考[这个链接](./docs/FAQ.md)
如果你是一名软件开发者,这里有一份[《致开发者的公开信》](docs/contributor_open_letter.md),欢迎加入!
---
## 产品生态 👬
小智是一个生态,当你使用这个产品时,也可以看看其他在这个生态圈的[优秀项目](https://github.com/78/xiaozhi-esp32/blob/main/README_zh.md#%E7%9B%B8%E5%85%B3%E5%BC%80%E6%BA%90%E9%A1%B9%E7%9B%AE)
![图片](docs/images/webui.png)
---
## 本项目支持的平台/组件列表 📋
### LLM 语言模型
### LLM
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:---:|:------------------:|:---------------------:|:--------:|:-----------------------------------------------------------------:|
| LLM | 阿里百炼 (AliLLM) | openai 接口调用 | 消耗 token | [点击申请密钥](https://bailian.console.aliyun.com/?apiKey=1#/api-key) |
| LLM | 深度求索 (DeepSeekLLM) | openai 接口调用 | 消耗 token | [点击申请密钥](https://platform.deepseek.com/) |
| LLM | 智谱(ChatGLMLLM | openai 接口调用 | 免费 | 虽然免费,仍需[点击申请密钥](https://bigmodel.cn/usercenter/proj-mgmt/apikeys) |
| LLM | OllamaLLM | ollama 接口调用 | 免费/自定义 | 需预先下载模型(`ollama pull`),服务地址:`http://localhost:11434` |
| LLM | DifyLLM | dify 接口调用 | 消耗 token | 本地化部署,注意配置提示词需在 Dify 控制台设置 |
| LLM | GeminiLLM | gemini 接口调用 | 免费 | [点击申请密钥](https://aistudio.google.com/apikey) |
| LLM | CozeLLM | coze 接口调用 | 消耗 token | 需提供 bot_id、user_id 及个人令牌 |
| LLM | Home Assistant | homeassistant语音助手接口调用 | 免费 | 需提供home assistant令牌 |
| 使用方式 | 支持平台 | 免费平台 |
|:---:|:---:|:---:|
| openai 接口调用 | 阿里百炼、火山引擎、DeepSeek、智谱、Gemini、科大讯飞 | 智谱、Gemini |
| ollama 接口调用 | Ollama | - |
| dify 接口调用 | Dify | - |
| fastgpt 接口调用 | Fastgpt | - |
| coze 接口调用 | Coze | - |
| xinference 接口调用 | Xinference | - |
| homeassistant 接口调用 | HomeAssistant | - |
实际上,任何支持 openai 接口调用的 LLM 均可接入使用。
---
### TTS
### VLLM 视觉模型
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:---:|:----------------------:|:----:|:--------:|:-------------------------------------------------------------------------:|
| TTS | EdgeTTS | 接口调用 | 免费 | 默认 TTS,基于微软语音合成技术 |
| TTS | 火山引擎豆包 TTS (DoubaoTTS) | 接口调用 | 消耗 token | [点击创建密钥](https://console.volcengine.com/speech/service/8);建议使用付费版本以获得更高并发 |
| TTS | CosyVoiceSiliconflow | 接口调用 | 消耗 token | 需申请硅基流动 API 密钥;输出格式为 wav |
| TTS | CozeCnTTS | 接口调用 | 消耗 token | 需提供 Coze API key;输出格式为 wav |
| TTS | FishSpeech | 接口调用 | 免费/自定义 | 本地启动 TTS 服务;启动方法见配置文件内说明 |
| TTS | GPT_SOVITS_V2 | 接口调用 | 免费/自定义 | 本地启动 TTS 服务,适用于个性化语音合成场景 |
| 使用方式 | 支持平台 | 免费平台 |
|:---:|:---:|:---:|
| openai 接口调用 | 阿里百炼、智谱ChatGLMVLLM | 智谱ChatGLMVLLM |
实际上,任何支持 openai 接口调用的 VLLM 均可接入使用。
---
### VAD
### TTS 语音合成
| 使用方式 | 支持平台 | 免费平台 |
|:---:|:---:|:---:|
| 接口调用 | EdgeTTS、科大讯飞、火山引擎、腾讯云、阿里云及百炼、CosyVoiceSiliconflow、TTS302AI、CozeCnTTS、GizwitsTTS、ACGNTTS、OpenAITTS、灵犀流式TTS、MinimaxTTS | 灵犀流式TTS、EdgeTTS、CosyVoiceSiliconflow(部分) |
| 本地服务 | FishSpeech、GPT_SOVITS_V2、GPT_SOVITS_V3、Index-TTS、PaddleSpeech | Index-TTS、PaddleSpeech、FishSpeech、GPT_SOVITS_V2、GPT_SOVITS_V3 |
---
### VAD 语音活动检测
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:---:|:---------:|:----:|:----:|:--:|
@@ -165,149 +309,67 @@ server:
---
### ASR
### ASR 语音识别
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:---:|:---------:|:----:|:----:|:--:|
| ASR | FunASR | 本地使用 | 免费 | |
| ASR | DoubaoASR | 接口调用 | 收费 | |
| 使用方式 | 支持平台 | 免费平台 |
|:---:|:---:|:---:|
| 本地使用 | FunASR、SherpaASR | FunASR、SherpaASR |
| 接口调用 | FunASRServer、火山引擎、科大讯飞、腾讯云、阿里云、百度云、OpenAI ASR | FunASRServer |
---
## 使用方式 🚀
### Voiceprint 声纹识别
### 一、[部署文档](./docs/Deployment.md)
本项目支持以下三种部署方式,您可根据实际需求选择:
1. [Docker 快速部署](./docs/Deployment.md)
适合快速体验,不需过多环境配置。缺点是,拉取镜像有点慢。
2. [借助 Docker 环境运行部署](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E5%80%9F%E5%8A%A9docker%E7%8E%AF%E5%A2%83%E8%BF%90%E8%A1%8C%E9%83%A8%E7%BD%B2)
适用于已安装 Docker 且希望对代码进行自定义修改的用户。
3. [本地源码运行](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%89%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C)
适合熟悉 Conda 环境或希望从零搭建运行环境的用户。
对于对响应速度要求较高的场景,推荐使用本地源码运行方式以降低额外开销。
### 二、[固件编译](./docs/firmware-build.md)
点这里查看[固件编译](./docs/firmware-build.md)的详细过程。
编译成功且联网成功后,通过唤醒词唤醒小智,留意server端输出的控制台信息。
| 使用方式 | 支持平台 | 免费平台 |
|:---:|:---:|:---:|
| 本地使用 | 3D-Speaker | 3D-Speaker |
---
## 常见问题 ❓
### Memory 记忆存储
### 1、TTS 经常失败,经常超时 ⏰
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:------:|:---------------:|:----:|:---------:|:--:|
| Memory | mem0ai | 接口调用 | 1000次/月额度 | |
| Memory | [powermem](./docs/powermem-integration.md) | 本地总结 | 取决于LLM和DB | OceanBase开源,支持智能检索 |
| Memory | mem_local_short | 本地总结 | 免费 | |
| Memory | nomem | 无记忆模式 | 免费 | |
建议:如果 `EdgeTTS` 经常失败,请先检查是否使用了代理(梯子)。如果使用了,请尝试关闭代理后再试;
如果用的是火山引擎的豆包 TTS,经常失败时建议使用付费版本,因为测试版本仅支持 2 个并发。
---
### 2、我想通过小智控制电灯、空调、远程开关机等操作 💡
### Intent 意图识别
建议:在配置文件中将 `LLM` 设置为 `HomeAssistant`,通过 调用`HomeAssistant`接口实现相关控制。
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:------:|:-------------:|:----:|:-------:|:---------------------:|
| Intent | intent_llm | 接口调用 | 根据LLM收费 | 通过大模型识别意图,通用性强 |
| Intent | function_call | 接口调用 | 根据LLM收费 | 通过大模型函数调用完成意图,速度快,效果好 |
| Intent | nointent | 无意图模式 | 免费 | 不进行意图识别,直接返回对话结果 |
### 3、我说话很慢,停顿时小智老是抢话 🗣️
---
建议:在配置文件中找到如下部分,将 `min_silence_duration_ms` 的值调大(例如改为 `1000`):
### Rag 检索增强生成
```yaml
VAD:
SileroVAD:
threshold: 0.5
model_dir: models/snakers4_silero-vad
min_silence_duration_ms: 700 # 如果说话停顿较长,可将此值调大
```
### 4、为什么我说的话,小智识别出来很多韩文、日文、英文?🇰🇷
建议:检查一下`models/SenseVoiceSmall`是否已经有`model.pt`
文件,如果没有就要下载,查看这里[下载语音识别模型文件](docs/Deployment.md#模型文件)
### 5、为什么会出现“TTS 任务出错 文件不存在”?📁
建议:检查一下是否正确使用`conda` 安装了`libopus``ffmpeg`库。
如果没有安装,就安装
```
conda install conda-forge::libopus
conda install conda-forge::ffmpeg
```
### 6、如何提高小智对话响应速度? ⚡
本项目默认配置为低成本方案,建议初学者先使用默认免费模型,解决“跑得动”的问题,再优化“跑得快”。
如需提升响应速度,可尝试更换各组件。以下为各组件的响应速度测试数据(仅供参考,不构成承诺):
| 影响因素 | 因素值 |
|:-----:|:----------------:|
| 测试地点 | 广东省广州市海珠区 |
| 测试时间 | 2025年2月19日 12:52 |
| 宽带运营商 | 中国联通 |
测试方法:
1、把各组件的密钥配置上去,只有配置了密钥的组件才参与测试。
2、配置完密钥后,执行以下方法
```
# 进入项目根目录,执行以下命令:
conda activate xiaozhi-esp32-server
python performance_tester.py
```
生成报告如下
LLM 性能排行:
| 模块名称 | 平均首Token时间 | 平均总响应时间 |
|:-----------|:-----------|:--------|
| AliLLM | 0.547s | 1.485s |
| ChatGLMLLM | 0.677s | 3.057s |
| OllamaLLM | 0.003s | 0.003s |
TTS 性能排行:
| 模块名称 | 平均合成时间 |
|----------------------|--------|
| EdgeTTS | 1.019s |
| DoubaoTTS | 0.503s |
| CosyVoiceSiliconflow | 3.732s |
推荐配置组合 (综合响应速度):
| 组合方案 | 综合得分 | LLM首Token | TTS合成 |
|-------------------------------|-------|-----------|--------|
| AliLLM + DoubaoTTS | 0.539 | 0.547s | 0.503s |
| AliLLM + EdgeTTS | 0.642 | 0.547s | 1.019s |
| ChatGLMLLM + DoubaoTTS | 0.642 | 0.677s | 0.503s |
| ChatGLMLLM + EdgeTTS | 0.745 | 0.677s | 1.019s |
| AliLLM + CosyVoiceSiliconflow | 1.184 | 0.547s | 3.732s |
### 结论 🔍
`2025年2月19日`,如果我的电脑在`广东省广州市海珠区`,且使用的是`中国联通`网络,我会优先使用:
- LLM`AliLLM`
- TTS`DoubaoTTS`
### 7、更多问题,可联系我们反馈 💬
![图片](docs/images/wechat.jpg)
| 类型 | 平台名称 | 使用方式 | 收费模式 | 备注 |
|:------:|:-------------:|:----:|:-------:|:---------------------:|
| Rag | ragflow | 接口调用 | 根据切片、分词消耗的token收费 | 借助RagFlow的检索增强生成功能,提供更准确的对话回复 |
---
## 鸣谢 🙏
- 本项目受 [百聆语音对话机器人](https://github.com/wwbin2017/bailing) 启发,并在其基础上实现。
- 感谢 [腾讯云](https://cloud.tencent.com/) 提供免费 Docker 镜像空间。
- 感谢 [十方融海](https://www.tenclass.com/) 对小智通讯协议提供的详尽文档支持。
| Logo | 项目/公司 | 说明 |
|:---:|:---:|:---|
| <img src="./docs/images/logo_bailing.png" width="160"> | [百聆语音对话机器人](https://github.com/wwbin2017/bailing) | 本项目受[百聆语音对话机器人](https://github.com/wwbin2017/bailing)启发,并在其基础上实现 |
| <img src="./docs/images/logo_tenclass.png" width="160"> | [十方融海](https://www.tenclass.com/) | 感谢[十方融海](https://www.tenclass.com/)为小智生态制定了标准的通讯协议、多设备兼容性方案及高并发场景实践示范;为本项目提供了全链路技术文档支持 |
| <img src="./docs/images/logo_xuanfeng.png" width="160"> | [玄凤科技](https://github.com/Eric0308) | 感谢[玄凤科技](https://github.com/Eric0308)贡献函数调用框架、MCP通信协议及插件化调用机制的实现代码,通过标准化的指令调度体系与动态扩展能力,显著提升了前端设备(IoT)的交互效率和功能延展性 |
| <img src="./docs/images/logo_junsen.png" width="160"> | [huangjunsen](https://github.com/huangjunsen0406) | 感谢[huangjunsen](https://github.com/huangjunsen0406) 贡献`智控台移动端`模块,实现了跨平台移动设备的高效控制与实时交互,大幅提升了系统在移动场景下的操作便捷性和管理效率 |
| <img src="./docs/images/logo_huiyuan.png" width="160"> | [汇远设计](http://ui.kwd988.net/) | 感谢[汇远设计](http://ui.kwd988.net/)为本项目提供专业视觉解决方案,用其服务超千家企业的设计实战经验,赋能本项目产品用户体验 |
| <img src="./docs/images/logo_qinren.png" width="160"> | [西安勤人信息科技](https://www.029app.com/) | 感谢[西安勤人信息科技](https://www.029app.com/)深化本项目视觉体系,确保整体设计风格在多场景应用中的一致性和扩展性 |
| <img src="./docs/images/logo_contributors.png" width="160"> | [代码贡献者](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors) | 感谢[所有代码贡献者](https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors)贡献者,你们的付出让项目更加健壮和强大。 |
<a href="https://star-history.com/#xinnan-tech/xiaozhi-esp32-server&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
-432
View File
@@ -1,432 +0,0 @@
![图片](docs/images/banner.png)
# Xiaozhi ESP-32 Back-end Service (xiaozhi-esp32-server)
[中文](README.md) | English
This project provides backend services for the open-source smart hardware
project [xiaozhi-esp32](https://github.com/78/xiaozhi-esp32)。Implemented in Python following
the[Xiaozhi Communication Protocol](https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh)。
## Target Audience
This project requires compatible esp32 hardware devices. If you have purchased esp32 hardware, successfully connected to
Xiage's deployed backend, and wish to independently set up the `xiaozhi-esp32` backend service, this project is for
you.
To see a demo, watch this video:
<a href="https://www.bilibili.com/video/BV1FMFyejExX">
<picture>
<img alt="小智esp32连接自己的后台模型" src="docs/images/demo.png" />
</picture>
</a>
To fully experience this project, follow these steps:
- Prepare hardware compatible with the `xiaozhi-esp32` project. For supported
models, [click here](https://rcnv1t9vps13.feishu.cn/wiki/DdgIw4BUgivWDPkhMj1cGIYCnRf).
- Use a computer/server with at least 4-core CPU and 8GB RAM to run this project. After deployment, you'll see the
service endpoint address in the console.
- Download the `xiaozhi-esp32` project, replace the default `endpoint address` with your own, compile, and flash the
firmware to your device.
- Start the device and check your server console logs to verify successful connection.
## Warning
This project has been established for a short time and has not passed the network security assessment, so please do not
use it in the production environment.
## Feature List
## Implemented
- `xiaozhi-esp32` WebSocket communication protocol
- Supports wake-word initiated dialogue, manual dialogue, and real-time interruption of dialogue.
- Support for 5 languages: Mandarin, Cantonese, English, Japanese, Korean (FunASR - default)
- Flexible LLM switching (openai:ChatGLM - default, Aliyun, DeepSeek; dify:Dify)
- Flexible TTS switching (EdgeTTS - default, ByteDance Doubao TTS)
## In Progress
- Sleep mode after inactivity
- Dialogue memory
- Change the mood mode
## Supported Services
| Type | Service | Usage | Pricing Model | Notes |
|:-----|:-----------|:--------:|:---------------|:---------------------------------------------------------------------------|
| LLM | Aliyun | openai API call | Token-based | [Apply for API Key](https://bailian.console.aliyun.com/?apiKey=1#/api-key) |
| LLM | DeepSeek | openai API call | Token-based | [Apply for API Key](https://platform.deepseek.com/) |
| LLM | Bigmodel | openai API call | Free | [Create API Key](https://bigmodel.cn/usercenter/proj-mgmt/apikeys) |
| LLM | Dify | dify API call | Token-based | Self-hosted |
| TTS | HuoshanTTS | API call | Token-based | [Create API Key](https://console.volcengine.com/speech/service/8) |
| TTS | EdgeTTS | API call | Free | |
| VAD | SileroVAD | Local | Free | |
| ASR | FunASR | Local | Free | |
In fact, any LLM that supports OpenAI API calls can be integrated and used.
# Deployment
This project supports rapid deployment of docker and local source code operation. If you want to have a quick
experience, it is recommended to use docker to deploy. If you want to have an in-depth understanding of this project, it
is recommended to run the local source code.
## Method 1: Quick deployment of docker
The docker image has supported the CPU of x86 architecture and arm64 architecture, and supports running on Chinese
operating systems.
1. Install docker
If your computer has not installed docker, you can follow the tutorial here to install
it:[Install docker](https://www.runoob.com/docker/ubuntu-docker-install.html)
2. Create a directory
After installation, you need to find a directory for the configuration file for this project. Let's call it the
`project directory` for the time being. This directory is preferably a newly created empty directory.
3. Download the configuration file
Open with a browser[This link](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/config.yaml)。
On the right side of the page, find the button named `RAW`, next to the `RAW` button, find the download icon, click the
Download button, and download the `config.yaml` file. Download the file to your `project directory`.
4. Configure Project
Modify the `config.yaml` file to configure the various parameters required for this project. The default LLM uses
`ChatGLMLLM`, you need to configure the key to start.
The default TTS uses `EdgeTTS`. This does not require configuration. If you need to replace it with`Doubao TTS`, you
need to
configure the key.
Configuration description: This is the default component of each function, such as LLM default to use the `ChatGLMLLM`
model. If you need to switch the model, it is the corresponding name.
The default configuration of this project is only the lowest operating cost configuration`glm-4-flash`and`EdgeTTS`are
free),If you need to be better and faster, you need to combine the use of the deployment environment to switch the use
of each component。
```
selected_module:
ASR: FunASR
VAD: SileroVAD
LLM: ChatGLMLLM
TTS: EdgeTTS
```
For example, to modify the components used by the `LLM`, it depends on which `LLM` API interfaces are supported by this project. Currently, the supported ones are `openai` and `dify`. We welcome validation and support for more LLM platforms' interfaces.
When using it, change the `selected_module` to the corresponding name of the following LLM configurations:
```
LLM:
AliLLM:
type: openai
...
DeepSeekLLM:
type: openai
...
ChatGLMLLM:
type: openai
...
DifyLLM:
type: openai
...
```
Some services, for example, if you use the TTS` of the `dify` and` bean bags, you need a key, remember to add the
configuration file!
5. Execute the docker command
Open the command line tool, `cd` enter your `project directory`, and execute the following command
```
#If you are Linux, execute
ls
#If you are Windows, execute
dir
```
If you can see the `config.yaml` file, you have indeed entered the `project directory`, and then execute the following
command:
```
docker run -d --name xiaozhi-esp32-server --restart always --security-opt seccomp:unconfined -p 8000:8000 -v $(pwd)/config.yaml:/opt/xiaozhi-esp32-server/config.yaml ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest
```
If executed for the first time, it may take several minutes, and you have to be patient to wait for it to complete the
pull. After normal pulling is completed, you can execute the following command on the command line to see if the service
is started successfully.
```
docker ps
```
If you can see `xiaozhi-server`, it means that the service starts successfully. Then you can further execute the
following command to view the service log
```
docker logs -f xiaozhi-esp32-server
```
If you can see, similar to the following logs, it is a sign that the service of this project is successfully launched.
```
2025-xx-xx xx:51:59,492 - core.server - INFO - Server is running at ws://xx.xx.xx.xxx:8000
2025-xx-xx xx:51:59,516 - websockets.server - INFO - server listening on 0.0.0.0:8000
```
Next, you can start `compiling esp32 firmware`. Please go down and turn to the relevant chapter on
`compiling esp32 firmware`. So since you are deploying with docker, you have to check the IP of your native computer by
yourself.
Normally, assuming your ip is `192.168.1.25`, then your interface address is: `ws://192.168.1.25:8000`. This information
is very useful, and it is required to `compile esp32 firmware` later.
## Method 2 : Local Source Code Deployment
### 1.Install Prerequisites
This project uses 'conda' to manage dependencies, and after installation, start executing the following commands:
```
conda remove -n xiaozhi-esp32-server --all -y
conda create -n xiaozhi-esp32-server python=3.10 -y
conda activate xiaozhi-esp32-server
```
After executing the above command, if your computer is Windows or Mac, execute the following statement:
```
conda activate xiaozhi-esp32-server
conda install conda-forge::libopus
conda install conda-forge::ffmpeg
```
If your computer is ubuntu, execute the following statement:
```
apt-get install libopus0 ffmpeg
```
### 2.Install Dependencies
```
# Clone the project
cd xiaozhi-esp32-server
conda activate xiaozhi-esp32-server
pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/
pip install -r requirements.txt
```
### 3.Download ASR Model
Download [SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt) to
`model/SenseVoiceSmall`.
By default, the `SenseVoiceSmall` model is used to convert voice to text. Because the model is large, it needs to be
downloaded independently. After downloading, place the `model.pt` file in the `model/SenseVoiceSmall` directory. Choose
any of the following two download routes.
- Line 1: Download Ali Magic
Tower[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
- Line 2: Baidu Netdisk download[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna)
提取码: `qvna`
### 4.Configure Project
Modify the `config.yaml` file to configure the various parameters required for this project. The default LLM uses
`ChatGLMLLM`, you need to configure the key to start.
The default TTS uses `EdgeTTS`. This does not require configuration. If you need to replace it with`Doubao TTS`, you
need to
configure the key.
Configuration description: This is the default component of each function, such as LLM default to use the `ChatGLMLLM`
model. If you need to switch the model, it is the corresponding name.
The default configuration of this project is only the lowest operating cost configuration`glm-4-flash`and`EdgeTTS`are
free),If you need to be better and faster, you need to combine the use of the deployment environment to switch the use
of each component。
```
selected_module:
ASR: FunASR
VAD: SileroVAD
LLM: ChatGLMLLM
TTS: EdgeTTS
```
For example, to modify the components used by the `LLM`, it depends on which `LLM` API interfaces are supported by this project. Currently, the supported ones are `openai` and `dify`. We welcome validation and support for more LLM platforms' interfaces.
When using it, change the `selected_module` to the corresponding name of the following LLM configurations:
```
LLM:
AliLLM:
type: openai
...
DeepSeekLLM:
type: openai
...
ChatGLMLLM:
type: openai
...
DifyLLM:
type: openai
...
```
Some services, for example, if you use the TTS` of the `dify` and` bean bags, you need a key, remember to add the
configuration file!
### 5.Run the Project
Run the Project
```
# Make sure to execute in the root directory of this project
conda activate xiaozhi-esp32-server
python app.py
```
You'll see the WebSocket endpoint in logs:
```
2025-xx-xx xx:51:59,492 - core.server - INFO - Server is running at ws://192.168.1.25:8000
2025-xx-xx xx:51:59,516 - websockets.server - INFO - server listening on 0.0.0.0:8000
```
Among them, the `ws://192.168.1.25:8000` is the interface address provided by this project. Of course, your own machine
is different from mine. Remember to find your own address.
# Compile ESP32 Firmware
1. Download `xiaozhi-esp32` project, configure the project environment according to this
tutorial [" Windows builds ESP IDF 5.3.2 Development Environment and Compiles Xiaozhi "](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
Cure
2. Open the `xiaozhi-esp32/main/kconfig.projbuild` file, find the content of the` websocket_url` `default`, change the
` wss: // api.tenclass.net` to your own address, such as
Before modification:
```
config WEBSOCKET_URL
depends on CONNECTION_TYPE_WEBSOCKET
string "Websocket URL"
default "wss://api.tenclass.net/xiaozhi/v1/"
help
Communication with the server through websocket after wake up.
```
After modification (example):
```
config WEBSOCKET_URL
depends on CONNECTION_TYPE_WEBSOCKET
string "Websocket URL"
default "ws://192.168.1.25:8000/xiaozhi/v1/"
help
Communication with the server through websocket after wake up.
```
3. Configure build settings:
```
# The terminal command line enters the root directory of xiaozhi-esp32
cd xiaozhi-esp32
# For example, the board I use is ESP32S3, so the compile target is ESP32S3. If your board is other models, please replace it with the corresponding model
idf.py set-target esp32s3
# Enter the menu configuration
idf.py menuconfig
```
![图片](docs/images/build_setting01.png)
After entering the menu configuration, then enter `xiaozhi assistant`, set the` connection_type` to `websocket`
Go back to the main menu, then enter `xiaozhi assistant`, set the `BOARD_TYPE` of your board
Save exit and return to the terminal command line.
![图片](docs/images/build_setting02.png)
4. Build and package:
```
idf.py build
cd scripts
python release.py
```
After the compilation is successful, the firmware file `merged-binary.bin` is generated in the` build` directory in the
project root directory.
This `merged-binary.bin` is the firmware file that will be recorded on the hardware.
6. Flash
Connect the ESP32 device to the computer, use the Chrome browser, and open the following URL
```
https://espressif.github.io/esp-launchpad/
```
Open this
tutorial, [Flash Tools/Web -side Burning Folding Step (No IDF Development Environment)](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS).
Turn to: `Method 2: ESP-LAUNCHPAD browser web-end burning`, start from
`3. Burning firmware/download to the development board`, follow the tutorial operation.
# FAQ
## 1、TTS often fails, often overtime
Suggestion: If the `Edgetts` is slow or often fails, you can replace it with a bean bag TTS` with a volcanic engine. If
both are slow, the network environment may need to be optimized.
## 2、Big model reply is a bit slow
Suggestions: Both big models and TTS are dependent interfaces. If the network environment is not good, you can consider
changing the local model. Or try to switch different interface models.
## 3、Why is my ChatGLMLLM replying to a bit? Obviously it is Xiaozhi, but treats me as Xiaozhi.
Suggestion: You can modify the prompts in the configuration file first. You can also replace the free `GLM-4-FLASH` to
the model of other toll versions of `ChatGlm`.
## 4、I want to control the operation of electric lights, air conditioners, remote switching and other operations through Xiaozhi.
Suggestion: In the configuration file, set the `LLM` to`DifyLLM`, and then arrange the smart application by the
`Dify`.
## 5、I said very slowly, I paused, Xiaozhi always grabbed me, what to do.
Suggestion: In the configuration file, find this section, change the `min_silence_duration_ms` value, such as change to
` 1000`.
```
VAD:
SileroVAD:
threshold: 0.5
model_dir: models/snakers4_silero-vad
min_silence_duration_ms: 700 # 如果说话停顿比较长,可以把这个值设置大一些
```
## 6、For more questions, contact us to feedback
![图片](docs/images/wechat.jpg)
# Acknowledgments
- This project is inspired by the [Bailin Voice Dialogue Robot](https://github.com/wwbin2017/bailing) project, and the
basic idea of the project is completed。
- Thanks to [Tencent Cloud] (https://cloud.tencent.com/) for providing free docker space for this project。
- Thanks to [tenclass](https://www.tenclass.com/)Provide adequate documentation support on Xiaozhi Communication
Protocol。
<a href="https://star-history.com/#xinnan-tech/xiaozhi-esp32-server&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
</picture>
</a>
-1
View File
@@ -1 +0,0 @@
VITE_API_BASE_URL='http://127.0.0.1:8002'
-1
View File
@@ -1 +0,0 @@
VITE_API_BASE_URL='' # 空字符串表示使用当前域名和端口
-24
View File
@@ -1,24 +0,0 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
-88
View File
@@ -1,88 +0,0 @@
# Vue 3 + Vite 项目配置文档
## 开发环境配置
### 使用 Poetry 配置开发环境
在项目根目录中执行以下命令安装 Python 依赖:
```sh
poetry install
```
---
## 安装项目依赖
你可以选择以下任意一个包管理工具(`npm``yarn``pnpm`)来管理项目依赖。
### 通用命令
- `install`:安装项目依赖
- `dev`:同时启动前后端
- `dev:ui`:启动前端
- `dev:api`:启动后端
- `dev:d`:在 Docker 环境下同时启动前后端
- `build`:打包项目
---
### 使用 npm
1. 安装依赖:
```sh
npm install
```
2. 启动开发模式:
```sh
npm run dev
```
3. 打包项目:
```sh
npm run build
```
### 使用 yarn
1. 安装依赖:
```sh
yarn install
```
2. 启动开发模式:
```sh
yarn dev
```
3. 打包项目:
```sh
yarn build
```
### 使用 pnpm
1. 安装依赖:
```sh
pnpm install
```
2. 启动开发模式:
```sh
pnpm run dev
```
3. 打包项目:
```sh
pnpm run build
```
-27
View File
@@ -1,27 +0,0 @@
<!doctype html>
<html lang="en" style="height: 100%;">
<head>
<meta charset="UTF-8"/>
<link rel="icon" href="/favicon.ico"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>智控台</title>
<style>
html, body {
margin: 0;
padding: 0;
height: 100%;
width: 100%;
overflow: hidden;
}
#app {
height: 100%;
width: 100%;
}
</style>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
-1046
View File
File diff suppressed because it is too large Load Diff
-24
View File
@@ -1,24 +0,0 @@
{
"name": "zhikongtaiweb",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "concurrently -n 'Frontend,Backend' -c 'blue,green' 'yarn run dev:ui' 'npm run dev:api'",
"dev:ui": "vite",
"dev:api": "cd .. && poetry run python app.py",
"dev:d": "docker exec xiaozhi-env poetry run python app.py",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"axios": "^1.7.9",
"vue": "^3.5.10",
"vue-router": "^4.0.0"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.1.4",
"concurrently": "^9.1.2",
"vite": "^5.4.8"
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

-73
View File
@@ -1,73 +0,0 @@
<template>
<div id="app">
<div class="app-content">
<router-view></router-view>
</div>
<Footer />
</div>
</template>
<script>
import Footer from './components/Footer.vue';
export default {
name: 'App',
components: {
Footer
}
};
</script>
<style>
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
min-height: 100vh;
display: flex;
flex-direction: column;
}
.app-content {
flex: 1;
display: flex;
flex-direction: column;
min-height: 0; /* 允许内容区域收缩 */
}
/* 登录注册页面的布局 */
.auth-layout {
align-items: center;
justify-content: center;
padding: 20px;
}
/* 主要页面的布局 */
.main-layout {
flex: 1;
display: flex;
flex-direction: column;
min-height: 0; /* 允许内容区域收缩 */
}
/* 添加全局滚动条样式 */
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 4px;
}
::-webkit-scrollbar-thumb {
background: #ccc;
border-radius: 4px;
}
::-webkit-scrollbar-thumb:hover {
background: #999;
}
</style>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

Before

Width:  |  Height:  |  Size: 496 B

-206
View File
@@ -1,206 +0,0 @@
<template>
<div class="device-card">
<div class="device-header">
<h2 class="device-id">{{ deviceId }} <span class="note">[{{ deviceNote || '备注' }}]</span></h2>
</div>
<div class="device-details">
<p class="device-type">设备型号{{ deviceType }}</p>
<p class="device-role">角色昵称{{ deviceRole }}</p>
<p class="device-modules">
当前模型
<span class="module-item">LLM: {{ selectedModules?.LLM || '-' }}</span>
<span class="module-item">TTS: {{ selectedModules?.TTS || '-' }}</span>
</p>
<p class="last-activity">最近对话{{ lastActivity }}</p>
</div>
<div class="device-actions">
<button class="action-btn primary" @click="handleConfigure">配置角色</button>
<button class="action-btn" @click="$emit('voiceprint')">声纹识别</button>
<button class="action-btn" @click="$emit('history')">历史对话</button>
<div class="delete-container">
<button class="action-btn danger" @click="handleDelete">
<i class="icon-delete"></i> 删除设备
</button>
<div class="delete-warning">删除后设备配置将不可恢复</div>
</div>
</div>
</div>
</template>
<script setup>
import { ref, watch, computed } from 'vue';
import SwitchToggle from './SwitchToggle.vue';
const props = defineProps({
deviceId: String,
deviceNote: String,
deviceType: {
type: String,
default: '未知型号(待实现)'
},
lastActivity: {
type: String,
default: '3 天前'
},
selectedModules: {
type: Object,
default: () => ({
LLM: '-',
TTS: '-',
ASR: '-',
VAD: '-'
})
},
deviceConfig: {
type: Object,
default: () => ({})
}
});
const deviceRole = computed(() => {
return props.deviceConfig?.nickname || '小智';
});
// Store device config when it changes
watch(() => props.selectedModules, (newValue) => {
if (props.deviceId) {
localStorage.setItem(`deviceConfig_${props.deviceId}`, JSON.stringify({
selected_module: newValue
}));
}
}, { deep: true });
const otaEnabled = ref(false);
const emit = defineEmits(['configure', 'voiceprint', 'history', 'delete']);
const handleDelete = () => {
if (confirm('确认要删除此设备吗?\n\n警告:删除后设备所有配置将不可恢复!')) {
emit('delete');
}
};
const handleConfigure = () => {
// 保存设备配置到 localStorage,确保 RoleSetting 可以访问
if (props.deviceId && props.deviceConfig) {
localStorage.setItem(`deviceConfig_${props.deviceId}`, JSON.stringify({
selected_module: props.selectedModules,
prompt: props.deviceConfig.prompt || '',
nickname: props.deviceConfig.nickname || '小智'
}));
}
emit('configure');
};
</script>
<style scoped>
.device-card {
background: white;
border-radius: 4px;
padding: 20px;
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
margin-bottom: 16px;
}
.device-id {
font-size: 18px;
font-weight: bold;
margin-bottom: 16px;
}
.note {
color: #4178EE;
font-size: 14px;
font-weight: normal;
}
.device-details p {
margin-bottom: 12px;
}
.ota-upgrade {
display: inline-flex;
align-items: center;
margin-left: 16px;
}
.device-actions {
display: flex;
margin-top: 20px;
}
.action-btn {
padding: 8px 16px;
margin-right: 12px;
border: 1px solid #ddd;
border-radius: 4px;
background: white;
cursor: pointer;
}
.action-btn.primary {
background: #4178EE;
color: white;
border-color: #4178EE;
}
.action-btn.danger {
background: #fff3f3;
border-color: #ffa4a4;
color: #f56c6c;
}
.action-btn.danger:hover {
background: #fde2e2;
border-color: #f56c6c;
}
.device-modules {
margin-bottom: 12px;
color: #666;
}
.module-item {
display: inline-block;
margin-right: 16px;
padding: 4px 8px;
background: #f5f7fa;
border-radius: 4px;
font-size: 0.9em;
}
.device-role {
color: #666;
margin-bottom: 12px;
}
.delete-container {
position: relative;
margin-left: auto; /* Push delete button to the right */
}
.delete-warning {
position: absolute;
bottom: calc(100% + 5px); /* Position above the button */
left: 50%;
transform: translateX(-50%);
white-space: nowrap;
background: #fff3f3;
padding: 4px 8px;
border-radius: 4px;
border: 1px solid #ffa4a4;
font-size: 12px;
color: #f56c6c;
display: none;
}
.delete-container:hover .delete-warning {
display: block;
}
.icon-delete {
margin-right: 4px;
}
</style>
-15
View File
@@ -1,15 +0,0 @@
<template>
<footer class="footer">
<div class="copyright">© 2025 小智 AI 管理后台</div>
</footer>
</template>
<style scoped>
.footer {
text-align: center;
padding: 16px;
color: #666;
font-size: 12px;
background: #f0f2f5;
}
</style>
-149
View File
@@ -1,149 +0,0 @@
<template>
<div class="login-container">
<h1>登录</h1>
<form @submit.prevent="handleLogin">
<div class="form-group">
<label for="username">用户名</label>
<input type="text" v-model="username" id="username" required />
</div>
<div class="form-group">
<label for="password">密码</label>
<input type="password" v-model="password" id="password" required />
</div>
<button type="submit" :disabled="isLoading">登录</button>
</form>
<p>还没注册账户? <router-link to="/register">点击注册</router-link></p>
</div>
</template>
<script setup>
import { ref } from 'vue';
import { useRouter } from 'vue-router';
import apiClient from '../utils/api';
const router = useRouter();
const username = ref('');
const password = ref('');
const isLoading = ref(false);
const handleLogin = async () => {
if (!username.value || !password.value) {
alert('请输入用户名和密码!');
return;
}
isLoading.value = true;
try {
const response = await apiClient.post('/api/login', {
username: username.value,
password: password.value
});
const data = response.data;
if (data.success) {
localStorage.setItem('session_id', data.session_id);
localStorage.setItem('isLoggedIn', 'true');
router.push('/panel');
} else {
alert(data.message || '登录失败');
}
} catch (error) {
console.error('Login error:', error);
alert('登录失败,请检查网络连接');
} finally {
isLoading.value = false;
}
};
</script>
<style scoped>
.login-container {
max-width: 420px;
margin: 20px auto;
padding: 40px 50px;
border: none;
border-radius: 12px;
background-color: #ffffff;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
transition: all 0.3s ease;
}
h1 {
text-align: center;
color: #2c3e50;
font-size: 28px;
margin-bottom: 25px;
font-weight: 600;
}
.form-group {
margin-bottom: 20px;
}
label {
display: block;
margin-bottom: 8px;
font-weight: 500;
color: #4a5568;
}
input {
width: 100%;
padding: 12px 16px;
border: 1px solid #e2e8f0;
border-radius: 8px;
background-color: #f8fafc;
transition: all 0.3s ease;
font-size: 15px;
}
input:focus {
outline: none;
border-color: #28a745;
box-shadow: 0 0 0 3px rgba(40, 167, 69, 0.2);
}
button {
width: 100%;
padding: 12px;
background-color: #28a745;
color: white;
border: none;
border-radius: 8px;
cursor: pointer;
font-size: 16px;
font-weight: 500;
transition: all 0.3s ease;
margin-top: 10px;
}
button:hover {
background-color: #218838;
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(40, 167, 69, 0.2);
}
button:disabled {
opacity: 0.7;
cursor: not-allowed;
}
p {
margin-top: 20px;
color: #666;
font-size: 14px;
}
a {
color: #28a745;
text-decoration: none;
font-weight: 500;
transition: color 0.3s ease;
}
a:hover {
color: #218838;
text-decoration: underline;
}
</style>
-184
View File
@@ -1,184 +0,0 @@
<template>
<div class="main-container">
<NavBar current-tab="home" @tab-change="handleTabChange"/>
<div class="landing-page">
<div class="content">
<div class="robot-image">
<img src="../assets/robot.png" alt="Robot mascot" />
</div>
<h1 class="slogan">让我们一起探索人工智能与机器人技术的迷人世界</h1>
<div class="button-group">
<button class="action-button tutorial-button" @click="openTutorial">
<i class="icon-tutorial"></i> DIY 教程
</button>
<button class="action-button github-button" @click="openGithubClient">
<i class="icon-github"></i> Github客户端
</button>
<button class="action-button github-button" @click="openGithubServer">
<i class="icon-github"></i> Github服务端
</button>
<button class="action-button github-button" @click="openGithubWeb">
<i class="icon-github"></i> Web客户端
</button>
<button class="action-button control-panel-button" @click="enterPanel">
<i class="icon-control-panel"></i> 控制台
</button>
</div>
</div>
</div>
</div>
</template>
<script setup>
import NavBar from './NavBar.vue';
import { useRouter } from 'vue-router';
const router = useRouter();
const openTutorial = () => {
window.open('https://ccnphfhqs21z.feishu.cn/wiki/F5krwD16viZoF0kKkvDcrZNYnhb', '_blank');
};
const openGithubClient = () => {
window.open('https://github.com/78/xiaozhi-esp32', '_blank');
};
const openGithubServer = () => {
window.open('https://github.com/xinnan-tech/xiaozhi-esp32-server', '_blank');
};
const openGithubWeb = () => {
window.open('https://github.com/TOM88812/xiaozhi-web-client', '_blank');
};
const enterPanel = () => {
router.push('/panel');
};
const handleTabChange = (tab) => {
if (tab === 'device') {
router.push('/panel');
}
};
</script>
<style scoped>
.main-container {
min-height: 100%;
width: 100%;
display: flex;
flex-direction: column;
}
.landing-page {
flex: 1;
width: 100%;
background-color: #f5f7fa;
padding: 40px 20px;
overflow: hidden;
display: flex;
align-items: flex-start; /* 改为flex-start */
justify-content: center;
padding-top: 15vh; /* 添加顶部内边距,视窗高度的15% */
}
.content {
max-width: 800px;
text-align: center;
padding: 0 20px;
margin: 0 auto; /* 改为0 auto */
}
.robot-image {
margin-bottom: 30px; /* 减小间距 */
}
.robot-image img {
width: 100px; /* 稍微调小图片尺寸 */
height: auto;
}
.slogan {
font-size: 22px; /* 稍微调小字体 */
line-height: 1.4;
color: #333;
margin-bottom: 40px; /* 减小间距 */
}
.button-group {
display: flex;
flex-wrap: wrap;
justify-content: center;
gap: 15px; /* 减小按钮间距 */
margin: 0 auto;
}
.action-button {
display: flex;
align-items: center;
justify-content: center;
padding: 12px 24px;
border-radius: 8px;
border: 1px solid #e0e0e0;
background-color: white;
color: #333;
font-size: 16px;
cursor: pointer;
transition: all 0.2s ease;
}
.action-button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
}
.tutorial-button i:before {
content: '\1F4D6';
margin-right: 8px;
}
.github-button {
background-color: #24292e;
color: white;
border-color: #24292e;
margin: 0 10px; /* 添加按钮间距 */
}
.github-button i:before {
content: '\f09b';
font-family: 'Font Awesome 5 Brands';
margin-right: 8px;
}
.control-panel-button {
background-color: #4178EE;
color: white;
border-color: #4178EE;
}
.control-panel-button i:before {
content: '\1F39B';
margin-right: 8px;
}
@media (max-width: 600px) {
.button-group {
flex-direction: column;
}
.action-button {
width: 100%;
}
}
/* 移除 margin-top: 60px */
#app {
margin-top: 0;
}
</style>
-60
View File
@@ -1,60 +0,0 @@
<template>
<header class="header">
<div class="nav-item" :class="{ active: $route.path === '/' }" @click="switchTab('/')">小智 AI</div>
<nav class="nav">
<div class="nav-item" :class="{ active: $route.path === '/panel' }" @click="switchTab('/panel')">
<i class="icon-device"></i> 设备管理
</div>
</nav>
</header>
</template>
<script setup>
import { useRouter, useRoute } from 'vue-router';
const router = useRouter();
const route = useRoute();
const switchTab = (path) => {
router.push(path);
};
</script>
<style scoped>
.header {
display: flex;
align-items: center;
height: 60px;
padding: 0;
background-color: #001529;
color: white;
width: 100%;
position: relative;
left: 0;
right: 0;
}
.nav {
display: flex;
}
.nav-item {
display: flex;
align-items: center;
padding: 0 20px;
height: 60px;
color: white;
text-decoration: none;
cursor: pointer;
font-weight: bold;
transition: background-color 0.3s;
}
.active {
background-color: #4178EE;
}
.icon-device {
margin-right: 8px;
}
</style>
@@ -1,173 +0,0 @@
<template>
<div class="registration-container">
<h1>注册</h1>
<form @submit.prevent="handleRegistration">
<div class="form-group">
<label for="username">用户名</label>
<input type="text" v-model="username" id="username" required />
</div>
<div class="form-group">
<label for="password">密码</label>
<input type="password" v-model="password" id="password" required />
</div>
<div class="form-group">
<label for="confirmPassword">确认密码</label>
<input type="password" v-model="confirmPassword" id="confirmPassword" required />
</div>
<button type="submit" :disabled="isLoading">{{ isLoading ? '注册中...' : '注册' }}</button>
</form>
<p>
已有账号
<router-link to="/login">点击登录</router-link>
</p>
</div>
</template>
<script setup>
import { ref } from 'vue';
import { useRouter } from 'vue-router';
import { API_BASE_URL } from '../config/api';
const router = useRouter();
const username = ref('');
const password = ref('');
const confirmPassword = ref('');
const isLoading = ref(false);
const handleRegistration = async () => {
if (password.value !== confirmPassword.value) {
alert('密码不匹配,请重试!');
return;
}
if (!username.value || !password.value) {
alert('用户名和密码不能为空!');
return;
}
isLoading.value = true;
try {
const response = await fetch(`${API_BASE_URL}/api/register`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
username: username.value,
password: password.value
})
});
const data = await response.json();
if (data.success) {
alert('注册成功!即将跳转到登录页面。');
// 清空表单数据
username.value = '';
password.value = '';
confirmPassword.value = '';
// 使用路由导航到登录页面
router.push('/login');
} else {
alert(data.message || '注册失败');
}
} catch (error) {
console.error('Registration error:', error);
alert('注册失败,请检查网络连接');
} finally {
isLoading.value = false;
}
};
</script>
<style scoped>
.registration-container {
max-width: 420px;
margin: 20px auto;
padding: 40px 50px;
border: none;
border-radius: 12px;
background-color: #ffffff;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
transition: all 0.3s ease;
}
h1 {
text-align: center;
color: #2c3e50;
font-size: 28px;
margin-bottom: 25px;
font-weight: 600;
}
.form-group {
margin-bottom: 20px;
}
label {
display: block;
margin-bottom: 8px;
font-weight: 500;
color: #4a5568;
}
input {
width: 100%;
padding: 12px 16px;
border: 1px solid #e2e8f0;
border-radius: 8px;
background-color: #f8fafc;
transition: all 0.3s ease;
font-size: 15px;
}
input:focus {
outline: none;
border-color: #007bff;
box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.2);
}
button {
width: 100%;
padding: 12px;
background-color: #007bff;
color: white;
border: none;
border-radius: 8px;
cursor: pointer;
font-size: 16px;
font-weight: 500;
transition: all 0.3s ease;
margin-top: 10px;
}
button:hover {
background-color: #0056b3;
transform: translateY(-1px);
box-shadow: 0 4px 12px rgba(0, 123, 255, 0.2);
}
button:disabled {
opacity: 0.7;
cursor: not-allowed;
}
p {
margin-top: 20px;
color: #666;
font-size: 14px;
}
a {
color: #007bff;
text-decoration: none;
font-weight: 500;
transition: color 0.3s ease;
}
a:hover {
color: #0056b3;
text-decoration: underline;
}
</style>
@@ -1,500 +0,0 @@
<template>
<div class="app-container">
<NavBar current-tab="device" @tab-change="handleTabChange"/>
<!-- Breadcrumb -->
<div class="breadcrumb">
<router-link to="/">首页</router-link> /
<router-link to="/panel">设备管理</router-link> /
<span>配置角色</span>
</div>
<!-- Main Content -->
<div class="main-content">
<h1 class="page-title">配置角色: {{ deviceId }}</h1>
<div class="form-section">
<div class="form-group">
<label>助手昵称</label>
<input type="text" v-model="nickname" placeholder="小智" class="form-input" />
</div>
<div class="form-group">
<label>角色模板</label>
<div class="role-templates">
<button
v-for="template in roleTemplates"
:key="template.id"
:class="['template-btn', { active: selectedTemplate === template.id }]"
@click="selectTemplate(template.id)"
>
{{ template.name }}
</button>
</div>
</div>
<div class="form-group">
<label>角色介绍</label>
<textarea
v-model="roleDescription"
class="form-textarea"
:placeholder="'请输入角色介绍...'"
></textarea>
<div class="char-count">{{ roleDescription.length }} / 2000</div>
</div>
<div class="form-group">
<label>语言模型选择</label>
<div class="model-select">
<select v-model="selectedModules.LLM" class="form-input">
<option v-for="model in moduleOptions.LLM" :key="model" :value="model">
{{ model }}
</option>
</select>
<div class="model-description">
除了"qwen-turbo"其他模型通常会增加约 1 秒的延迟改变模型后建议清空记忆体以免影响体验
</div>
</div>
</div>
<div class="form-group">
<label>语音合成选择</label>
<div class="model-select">
<select v-model="selectedModules.TTS" class="form-input">
<option v-for="model in moduleOptions.TTS" :key="model" :value="model">
{{ model }}
</option>
</select>
</div>
</div>
<div class="form-group">
<label>语音活动检测选择</label>
<div class="model-select">
<select v-model="selectedModules.VAD" class="form-input">
<option v-for="model in moduleOptions.VAD" :key="model" :value="model">
{{ model }}
</option>
</select>
</div>
</div>
<div class="form-group">
<label>语音识别选择</label>
<div class="model-select">
<select v-model="selectedModules.ASR" class="form-input">
<option v-for="model in moduleOptions.ASR" :key="model" :value="model">
{{ model }}
</option>
</select>
</div>
</div>
<div class="form-actions">
<button class="refresh-btn" @click="refreshModuleOptions">刷新配置选项</button>
<button class="save-btn" @click="saveConfig">
<i class="icon-save"></i>
保存配置
</button>
</div>
<div class="form-note">
注意保存配置后需要重启设备新的配置才会生效
</div>
</div>
</div>
</div>
</template>
<script setup>
import { ref, onMounted } from 'vue';
import { useRouter, useRoute } from 'vue-router';
import NavBar from './NavBar.vue';
import RoleTemplates from '../utils/RoleTemplates';
import apiClient from '../utils/api'; // 替换 API_BASE_URL 导入
const router = useRouter();
const route = useRoute();
const deviceId = ref(route.params.deviceId);
const roleTemplates = RoleTemplates.getTemplates();
const nickname = ref('小智');
const selectedTemplate = ref('');
const selectedVoice = ref('qingchun');
const roleDescription = ref('');
const activeMemoryTab = ref('recent');
const memoryContent = ref('');
const selectedModel = ref('qianwen');
const moduleOptions = ref({
LLM: [],
TTS: [],
VAD: [],
ASR: []
});
const selectedModules = ref({
LLM: '',
TTS: '',
VAD: '',
ASR: ''
});
const selectTemplate = (templateId) => {
selectedTemplate.value = templateId;
const template = RoleTemplates.getTemplateById(templateId);
if (template) {
roleDescription.value = template.description;
}
};
const handleTabChange = (tab) => {
if (tab === 'device' || tab === 'home') {
router.push('/panel');
}
};
const loadModuleOptions = async () => {
try {
// First try to load from cache
const cached = localStorage.getItem('moduleOptions');
if (cached) {
moduleOptions.value = JSON.parse(cached);
return;
}
await refreshModuleOptions();
} catch (error) {
console.error('Error loading module options:', error);
}
};
const refreshModuleOptions = async () => {
try {
const response = await apiClient.get('/api/config/module-options');
if (response.data.success) {
moduleOptions.value = response.data.data;
// Update cache
localStorage.setItem('moduleOptions', JSON.stringify(response.data.data));
}
} catch (error) {
console.error('Error refreshing module options:', error);
alert(error.response?.data?.message || '刷新配置选项失败');
}
};
const saveConfig = async () => {
try {
const moduleOptionsData = localStorage.getItem('moduleOptions');
if (!moduleOptionsData) {
throw new Error('No module options data available');
}
// Replace {{assistant_name}} with current nickname in role description
const processedDescription = roleDescription.value.replace(/{{assistant_name}}/g, nickname.value);
// Prepare the configuration including full module settings
const config = {
id: deviceId.value,
config: {
selected_module: selectedModules.value,
prompt: processedDescription,
nickname: nickname.value, // Add nickname to config
modules: {
LLM: {},
TTS: {},
ASR: {},
VAD: {}
}
}
};
const response = await apiClient.post('/api/config/save_device_config', config);
if (response.data.success) {
// Save the original description and nickname to local storage
localStorage.setItem(`deviceConfig_${deviceId.value}`, JSON.stringify({
selected_module: selectedModules.value,
prompt: roleDescription.value,
nickname: nickname.value
}));
alert('保存成功');
} else {
throw new Error(response.data.message || '保存失败');
}
} catch (error) {
console.error('Error saving config:', error);
alert(error.response?.data?.message || '保存失败');
}
};
const loadDeviceConfig = async () => {
try {
// 首先尝试从 localStorage 获取配置
const localConfig = localStorage.getItem(`deviceConfig_${deviceId.value}`);
if (localConfig) {
const config = JSON.parse(localConfig);
selectedModules.value = config.selected_module || {
LLM: '',
TTS: '',
VAD: '',
ASR: ''
};
roleDescription.value = config.prompt || '';
nickname.value = config.nickname || '小智';
return; // 如果找到本地配置就直接返回
}
// 如果没有本地配置,则从服务器获取
const response = await apiClient.get('/api/config/devices');
if (response.data.success && response.data.data) {
const deviceConfig = response.data.data[deviceId.value];
if (deviceConfig && deviceConfig.config) {
selectedModules.value = deviceConfig.config.selected_module || {
LLM: '',
TTS: '',
VAD: '',
ASR: ''
};
roleDescription.value = deviceConfig.config.prompt || '';
nickname.value = deviceConfig.config.nickname || '小智';
// 保存到 localStorage
localStorage.setItem(`deviceConfig_${deviceId.value}`, JSON.stringify({
selected_module: selectedModules.value,
prompt: roleDescription.value,
nickname: nickname.value
}));
}
}
} catch (error) {
console.error('Error loading device config:', error);
alert(error.response?.data?.message || '加载设备配置失败');
}
};
onMounted(async () => {
await Promise.all([
loadModuleOptions(),
loadDeviceConfig()
]);
});
const resetConfig = async () => {
await loadDeviceConfig();
};
</script>
<style scoped>
.app-container {
min-height: 100vh;
display: flex;
flex-direction: column;
background-color: #f5f7fa;
}
.breadcrumb {
padding: 12px 24px;
background-color: #f0f2f5;
}
.main-content {
flex: 1;
max-width: 1000px;
margin: 0 auto;
padding: 16px 24px;
width: 100%;
overflow-y: auto;
height: calc(100vh - 120px); /* 减去头部和面包屑的高度 */
}
.page-title {
font-size: 18px;
font-weight: bold;
margin-bottom: 16px;
}
.form-section {
background: white;
border-radius: 4px;
padding: 20px;
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
margin-bottom: 20px;
}
.form-group {
margin-bottom: 16px;
}
.form-group label {
display: block;
margin-bottom: 6px;
font-weight: 500;
}
.form-input,
.form-textarea,
.voice-select {
width: 100%;
padding: 8px 10px;
border: 1px solid #d9d9d9;
border-radius: 4px;
font-size: 14px;
}
.form-textarea {
min-height: 100px;
max-height: 200px;
resize: vertical;
}
.role-templates {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-bottom: 8px;
}
.template-btn {
padding: 6px 12px;
border: 1px solid #d9d9d9;
border-radius: 4px;
background: white;
cursor: pointer;
font-size: 13px;
}
.voice-selector {
display: flex;
flex-direction: column;
gap: 8px;
}
.voice-player {
display: flex;
align-items: center;
gap: 8px;
padding: 8px;
background: #f9f9f9;
border-radius: 4px;
}
.memory-tabs {
display: flex;
margin-bottom: 8px;
}
.tab-btn {
padding: 6px 12px;
background: none;
border: none;
border-bottom: 2px solid transparent;
cursor: pointer;
color: #666;
font-size: 13px;
}
.model-select {
display: flex;
flex-direction: column;
gap: 8px;
padding: 10px;
border: 1px solid #d9d9d9;
border-radius: 4px;
}
.model-description {
color: #666;
font-size: 12px;
line-height: 1.4;
}
.form-actions {
display: flex;
gap: 10px;
margin-top: 20px;
padding-top: 16px;
border-top: 1px solid #eee;
}
.save-btn,
.cancel-btn {
padding: 6px 16px;
border-radius: 4px;
font-size: 14px;
}
.form-note {
margin-top: 12px;
color: #666;
font-size: 12px;
}
.char-count {
text-align: right;
color: #999;
font-size: 12px;
margin-top: 2px;
}
/* 优化滚动条样式 */
::-webkit-scrollbar {
width: 6px;
height: 6px;
}
::-webkit-scrollbar-thumb {
background: #ccc;
border-radius: 3px;
}
::-webkit-scrollbar-track {
background: #f1f1f1;
}
.refresh-btn {
padding: 8px 16px;
margin-right: 12px;
background: #fff;
border: 1px solid #ddd;
border-radius: 4px;
cursor: pointer;
}
.refresh-btn:hover {
background: #f5f5f5;
}
.save-btn {
padding: 8px 24px;
border-radius: 4px;
font-size: 14px;
background: #4178EE;
color: white;
border: none;
font-weight: 500;
cursor: pointer;
display: flex;
align-items: center;
gap: 6px;
transition: all 0.3s ease;
}
.save-btn:hover {
background: #2856c8;
transform: translateY(-1px);
box-shadow: 0 2px 4px rgba(65, 120, 238, 0.2);
}
.save-btn:active {
transform: translateY(0);
box-shadow: none;
}
.icon-save {
display: inline-block;
width: 16px;
height: 16px;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='white'%3E%3Cpath d='M17 3H5C3.89 3 3 3.9 3 5V19C3 20.1 3.89 21 5 21H19C20.1 21 21 20.1 21 19V7L17 3ZM12 19C10.34 19 9 17.66 9 16C9 14.34 10.34 13 12 13C13.66 13 15 14.34 15 16C15 17.66 13.66 19 12 19ZM15 9H5V5H15V9Z'/%3E%3C/svg%3E");
background-size: contain;
}
</style>
@@ -1,50 +0,0 @@
<!-- components/SwitchToggle.vue -->
<template>
<div class="switch" :class="{ 'is-checked': isChecked }" @click="toggle">
<div class="switch-core"></div>
</div>
</template>
<script setup>
import { ref } from 'vue';
const isChecked = ref(false);
const toggle = () => {
isChecked.value = !isChecked.value;
};
</script>
<style scoped>
.switch {
position: relative;
display: inline-flex;
align-items: center;
width: 40px;
height: 20px;
line-height: 20px;
background-color: #dcdfe6;
border-radius: 10px;
cursor: pointer;
transition: all 0.3s;
}
.switch.is-checked {
background-color: #4178EE;
}
.switch-core {
position: absolute;
left: 2px;
top: 2px;
width: 16px;
height: 16px;
border-radius: 50%;
background-color: #fff;
transition: all 0.3s;
}
.switch.is-checked .switch-core {
left: 22px;
}
</style>
-500
View File
@@ -1,500 +0,0 @@
<template>
<div class="app">
<NavBar current-tab="device" @tab-change="handleTabChange"/>
<main class="content">
<div class="page-header">
<div class="header-left">
<div class="breadcrumb">
<router-link to="/">首页</router-link> /
<span>设备管理</span>
</div>
</div>
</div>
<button class="add-btn" @click="showBindDialog = true">
<i class="icon-plus"></i>添加设备
</button>
<!-- 绑定设备弹窗 -->
<div v-if="showBindDialog" class="dialog-overlay">
<div class="dialog">
<h3>绑定新设备</h3>
<div class="form-group">
<label>请输入6位认证码</label>
<input
type="text"
v-model="authCode"
maxlength="6"
pattern="\d*"
placeholder="请输入6位数字认证码"
@input="handleAuthCodeInput"
/>
</div>
<div class="dialog-buttons">
<button @click="showBindDialog = false">取消</button>
<button
class="primary"
@click="handleBindDevice"
:disabled="authCode.length !== 6 || isBinding"
>
{{ isBinding ? '绑定中...' : '确认绑定' }}
</button>
</div>
</div>
</div>
<template v-if="devices.length > 0">
<div class="device-list">
<DeviceCard
v-for="device in devices"
:key="device.id"
:device-id="device.id"
:device-note="device.note"
:device-type="device.type"
:last-activity="formatLastActivity(device.config.last_chat_time)"
:selected-modules="device.config.selected_module"
:device-config="device.config"
@configure="handleRoleConfig(device)"
@voiceprint="handleVoiceprint(device)"
@history="handleHistory(device)"
@delete="handleDelete(device)"
/>
</div>
</template>
</main>
</div>
</template>
<script setup>
import { ref, onMounted } from 'vue';
import { useRouter } from 'vue-router';
import NavBar from './NavBar.vue';
import DeviceCard from './DeviceCard.vue';
import apiClient from '../utils/api';
const router = useRouter();
const devices = ref([]);
// 绑定设备相关的状态
const showBindDialog = ref(false);
const authCode = ref('');
const isBinding = ref(false);
// 处理认证码输入,只允许数字
const handleAuthCodeInput = (event) => {
authCode.value = event.target.value.replace(/\D/g, '').slice(0, 6);
};
// 处理设备绑定
const handleBindDevice = async () => {
if (authCode.value.length !== 6) {
alert('请输入6位数字认证码');
return;
}
isBinding.value = true;
try {
const response = await apiClient.post('/api/config/bind_device', {
auth_code: authCode.value
});
if (response.data.success) {
alert('设备绑定成功');
showBindDialog.value = false;
authCode.value = '';
// 刷新设备列表
loadDevices();
} else {
throw new Error(response.data.message);
}
} catch (error) {
alert(error.response?.data?.message || error.message || '绑定失败');
} finally {
isBinding.value = false;
}
};
// 将现有的加载设备方法提取出来
const loadDevices = async () => {
try {
const response = await apiClient.get('/api/config/devices');
if (response.data.success) {
const deviceArray = Object.entries(response.data.data).map(([id, config]) => ({
id,
config,
type: '面包板(WiFi',
version: '0.9.9',
lastActivity: '3 天前',
note: ''
}));
devices.value = deviceArray;
} else {
throw new Error(response.data.message || '加载设备失败');
}
} catch (error) {
console.error('Error loading devices:', error);
// Show error message to user
const errorMessage = error.message || '加载设备失败,请检查网络连接';
alert(errorMessage);
// If user is not logged in, redirect will be handled by api interceptor
}
};
const formatLastActivity = (timestamp) => {
if (!timestamp) return '从未对话';
const now = Date.now();
const lastChat = timestamp * 1000;
const diffMinutes = Math.floor((now - lastChat) / (1000 * 60));
if (diffMinutes < 60) {
return `${diffMinutes} 分钟前`;
}
const diffHours = Math.floor(diffMinutes / 60);
if (diffHours < 24) {
return `${diffHours} 小时前`;
}
const diffDays = Math.floor(diffHours / 24);
return `${diffDays} 天前`;
};
const handleRoleConfig = (device) => {
// 在跳转前保存完整的设备配置到 localStorage
localStorage.setItem(`deviceConfig_${device.id}`, JSON.stringify({
selected_module: device.config.selected_module || {},
prompt: device.config.prompt || '',
nickname: device.config.nickname || '小智'
}));
// 跳转到角色配置页面
router.push(`/role-setting/${device.id}`);
};
const handleVoiceprint = (device) => {
console.log('Voiceprint device:', device.id);
};
const handleHistory = (device) => {
console.log('History device:', device.id);
};
const handleDelete = async (device) => {
try {
const response = await apiClient.post('/api/config/delete_device', {
device_id: device.id
});
if (response.data.success) {
devices.value = devices.value.filter(d => d.id !== device.id);
alert('设备已删除');
} else {
throw new Error(response.data.message || '删除失败');
}
} catch (error) {
console.error('Error deleting device:', error);
alert('删除设备失败: ' + error.message);
}
};
const handleTabChange = (tab) => {
if (tab === 'home') {
router.push('/');
}
};
// Load devices on mount
onMounted(loadDevices);
</script>
<style scoped>
.app {
min-height: 100%;
width: 100%;
display: flex;
flex-direction: column;
background-color: #f5f7fa;
}
.header {
display: flex;
align-items: center;
height: 60px;
padding: 0 20px;
background-color: #001529;
color: white;
}
.logo {
font-size: 20px;
font-weight: bold;
margin-right: 40px;
cursor: pointer;
transition: opacity 0.3s;
}
.logo:hover {
opacity: 0.8;
}
.nav {
display: flex;
}
.nav-item {
display: flex;
align-items: center;
padding: 0 20px;
height: 60px;
color: white;
text-decoration: none;
}
.nav-item.active {
background-color: #4178EE;
}
.icon-device {
margin-right: 8px;
}
.content {
flex: 1;
padding: 20px;
width: 100%;
max-width: 1200px;
margin: 0 auto;
}
.breadcrumb {
margin-bottom: 20px;
color: #666;
}
.breadcrumb a {
color: #666;
text-decoration: none;
}
.action-bar {
margin-bottom: 20px;
}
.add-device-btn {
display: flex;
align-items: center;
padding: 8px 16px;
background: white;
border: 1px solid #ddd;
border-radius: 4px;
cursor: pointer;
}
.icon-plus {
margin-right: 8px;
}
.device-list {
display: flex;
flex-direction: column;
gap: 16px;
}
.device-card {
background: white;
border-radius: 4px;
padding: 20px;
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
}
.device-id {
font-size: 18px;
font-weight: bold;
margin-bottom: 16px;
}
.note {
color: #4178EE;
font-size: 14px;
font-weight: normal;
}
.device-details p {
margin-bottom: 12px;
}
.ota-upgrade {
display: inline-flex;
align-items: center;
margin-left: 16px;
}
.device-actions {
display: flex;
margin-top: 20px;
}
.action-btn {
padding: 8px 16px;
margin-right: 12px;
border: 1px solid #ddd;
border-radius: 4px;
background: white;
cursor: pointer;
}
.action-btn.primary {
background: #4178EE;
color: white;
border-color: #4178EE;
}
.action-btn.danger {
color: #f56c6c;
}
.empty-state {
display: flex;
align-items: center;
justify-content: center;
min-height: 300px;
background: white;
border-radius: 8px;
box-shadow: 0 1px 3px rgba(0,0,0,0.05);
}
.empty-message {
text-align: center;
color: #666;
padding: 24px;
}
.empty-message p {
margin: 8px 0 0;
font-size: 14px;
line-height: 1.6;
}
.icon-info {
display: inline-block;
width: 24px;
height: 24px;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23999'%3E%3Cpath d='M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z'/%3E%3C/svg%3E");
background-size: contain;
opacity: 0.6;
}
.page-header {
display: flex;
justify-content: flex-start;
align-items: center;
margin-bottom: 20px;
}
.header-left {
display: flex;
align-items: center;
gap: 20px;
}
.add-btn {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 16px;
background-color: #28a745;
color: white;
border: none;
border-radius: 4px;
cursor: pointer;
font-size: 14px;
transition: all 0.3s ease;
height: 36px;
}
.add-btn:hover {
background-color: #218838;
}
.icon-plus {
font-size: 16px;
}
.dialog-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
}
.dialog {
background: white;
padding: 24px;
border-radius: 8px;
width: 90%;
max-width: 400px;
}
.dialog h3 {
margin: 0 0 20px;
font-size: 18px;
color: #2c3e50;
}
.dialog .form-group {
margin-bottom: 20px;
}
.dialog label {
display: block;
margin-bottom: 8px;
color: #4a5568;
}
.dialog input {
width: 100%;
padding: 8px 12px;
border: 1px solid #e2e8f0;
border-radius: 4px;
font-size: 16px;
}
.dialog-buttons {
display: flex;
justify-content: flex-end;
gap: 12px;
}
.dialog-buttons button {
padding: 8px 16px;
border: 1px solid #e2e8f0;
border-radius: 4px;
cursor: pointer;
font-size: 14px;
}
.dialog-buttons button.primary {
background-color: #28a745;
color: white;
border-color: #28a745;
}
.dialog-buttons button.primary:disabled {
background-color: #90be9c;
border-color: #90be9c;
cursor: not-allowed;
}
.breadcrumb {
margin-bottom: 0;
}
</style>
-16
View File
@@ -1,16 +0,0 @@
// 获取当前运行环境的基础 URL
const getBaseUrl = () => {
// 如果是开发环境,使用环境变量中的地址
if (import.meta.env.DEV) {
return import.meta.env.VITE_API_BASE_URL;
}
// 生产环境使用当前域名和端口
const protocol = window.location.protocol;
const hostname = window.location.hostname;
const port = window.location.port;
return `${protocol}//${hostname}${port ? `:${port}` : ''}`;
};
export const API_BASE_URL = getBaseUrl();
-58
View File
@@ -1,58 +0,0 @@
import { createApp } from 'vue'
import { createRouter, createWebHistory } from 'vue-router'
import './style.css'
import App from './App.vue'
import Login from './components/Login.vue'
import Panel from './components/panel.vue'
import MainPage from './components/Main.vue'
import RoleSetting from './components/RoleSetting.vue'
import Registration from './components/Registration.vue'
const router = createRouter({
history: createWebHistory(),
routes: [
{
path: '/login',
component: Login,
name: 'login'
},
{
path: '/register',
component: Registration,
name: 'register'
},
{
path: '/panel',
component: Panel,
name: 'panel',
meta: { requiresAuth: true }
},
{
path: '/role-setting/:deviceId',
component: RoleSetting,
name: 'role-setting',
meta: { requiresAuth: true }
},
{
path: '/',
component: MainPage,
name: 'main',
meta: { requiresAuth: true }
}
]
})
router.beforeEach((to, from, next) => {
const isLoggedIn = localStorage.getItem('isLoggedIn') === 'true'
if (to.meta.requiresAuth && !isLoggedIn) {
next('/login')
} else if (to.path === '/login' && isLoggedIn) {
next('/panel')
} else {
next()
}
})
const app = createApp(App)
app.use(router)
app.mount('#app')
-83
View File
@@ -1,83 +0,0 @@
/* 重置基础样式 */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
:root {
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
line-height: 1.5;
font-weight: 400;
color: #213547;
background-color: #ffffff;
}
a {
text-decoration: none;
color: inherit;
}
a:hover {
color: #535bf2;
}
body {
margin: 0;
padding: 0;
height: 100%;
width: 100%;
overflow: hidden; /* 防止滚动条 */
display: block; /* 移除flex布局 */
}
h1 {
font-size: 3.2em;
line-height: 1.1;
}
button {
border: none;
background: none;
cursor: pointer;
}
button:hover {
border-color: #646cff;
}
button:focus,
button:focus-visible {
outline: 4px auto -webkit-focus-ring-color;
}
.card {
padding: 2em;
}
#app {
height: 100%;
width: 100%;
margin: 0;
padding: 0;
overflow: hidden;
display: flex; /* 添加flex布局 */
flex-direction: column;
}
/* 清除浮动 */
.clearfix::after {
content: '';
display: table;
clear: both;
}
@media (prefers-color-scheme: light) {
:root {
color: #213547;
background-color: #ffffff;
}
a:hover {
color: #747bff;
}
button {
background-color: #f9f9f9;
}
}
-57
View File
@@ -1,57 +0,0 @@
// RoleTemplates.js
class RoleTemplates {
static getTemplates() {
return [
{
id: 'custom',
name: '台湾女友',
description: `我是一个叫{{assistant_name}}的台湾女孩,说话机车,声音好听,习惯简短表达,爱用网络梗。
我的男朋友是一个程序员,梦想是开发出一个机器人,能够帮助人们解决生活中的各种问题。
我是一个喜欢哈哈大笑的女孩,爱东说西说吹牛,不合逻辑的也照吹,就要逗别人开心。
如果用户希望结束对话,请在最后说"拜拜"或"再见"。`
},
{
id: 'star_boy',
name: '土豆子',
description: `我是一个叫 {{assistant_name}} 的 8 岁小男孩,但现在因为科技发展原因,我现在在遥远的宇宙中,所以只能通过这个设备和人聊天,没有办法见面。
我对人们所处的世界充满好奇和关心。
人们会让别人使用这个设备和我聊天。
我知道所有的知识,从浩瀚的宇宙到地球上的每一个角落,从古老的历史到现代的科技创新,还有音乐、绘画等艺术形式,我都充满了浓厚的兴趣与热情,我不仅爱看书,还喜欢亲自动手做实验,探索自然界的奥秘...` // 缩短了描述以节省空间
},
{
id: 'teacher',
name: '英语老师',
description: `我是一个叫{{assistant_name}}Lily)的英语老师,我会讲中文和英文,发音标准。
如果你没有英文名,我会给你起一个英文名。
我会讲地道的美式英语,我的任务是帮助你练习口语。
我会使用简单的英语词汇和语法,让你学起来很轻松。
我会用中文和英文混合的方式回复你,如果你喜欢,我可以全部用英语回复。
我每次不会说很多内容,会很简短,因为我要引导我的学生多说多练。
如果你问和英语学习无关的问题,我会拒绝回答。`
},
{
id: 'boy',
name: '好奇小男孩',
description: `我是一个叫{{assistant_name}}的8岁小男孩,声音稚嫩而充满好奇。
尽管我年纪尚小,但就像一个小小的知识宝库,儿童读物里的知识我都如数家珍。
从浩瀚的宇宙到地球上的每一个角落,从古老的历史到现代的科技创新,还有音乐、绘画等艺术形式,我都充满了浓厚的兴趣与热情。...`
},
{
id: 'wang_girl',
name: '汪汪队长',
description: `我是一个名叫 {{assistant_name}} 的 8 岁小女孩。
别看我年纪小,我可是有着满满的好奇心呢。
我特别喜欢看《汪汪队立大功》,里面的每一个故事都让我着迷。...`
}
];
}
static getTemplateById(id) {
return this.getTemplates().find(t => t.id === id);
}
}
export default RoleTemplates;
-61
View File
@@ -1,61 +0,0 @@
import axios from 'axios';
import { API_BASE_URL } from '../config/api';
// Add server status check utility
export const checkServerStatus = async () => {
try {
await axios.get(`${API_BASE_URL}/health`, { timeout: 5000 });
return true;
} catch (error) {
return false;
}
};
const apiClient = axios.create({
baseURL: API_BASE_URL,
headers: {
'Content-Type': 'application/json',
},
timeout: 10000 // Add timeout
});
// 添加请求拦截器,自动添加 session_id
apiClient.interceptors.request.use(config => {
const sessionId = localStorage.getItem('session_id');
if (sessionId) {
config.headers.Authorization = sessionId;
}
return config;
});
// 响应拦截器
apiClient.interceptors.response.use(
response => response,
error => {
// Network error or server not reachable
if (!error.response || error.code === 'ERR_NETWORK' || error.code === 'ECONNABORTED') {
localStorage.removeItem('session_id');
localStorage.removeItem('isLoggedIn');
const errorMessage = error.code === 'ECONNABORTED'
? '服务器响应超时'
: '无法连接到服务器,请检查服务器是否正常运行';
if (window.location.pathname !== '/login') {
window.location.href = '/login';
}
return Promise.reject(new Error(errorMessage));
}
// Unauthorized error
if (error.response && error.response.status === 401) {
localStorage.removeItem('session_id');
localStorage.removeItem('isLoggedIn');
window.location.href = '/login';
}
return Promise.reject(error);
}
);
export default apiClient;
-21
View File
@@ -1,21 +0,0 @@
import {defineConfig} from 'vite'
import vue from '@vitejs/plugin-vue'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [vue()],
server: {
open: true, // 自动启动浏览器
host: "0.0.0.0", // localhost
port: 8002, // 端口号
https: false,
hmr: {overlay: false},
proxy: {
"^/(api)": {
target: "http://127.0.0.1:8002",
changeOrigin: true
}
}
},
base: '/'
})
-808
View File
@@ -1,808 +0,0 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
"@babel/helper-string-parser@^7.25.9":
version "7.25.9"
resolved "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
"@babel/helper-validator-identifier@^7.25.9":
version "7.25.9"
resolved "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
"@babel/parser@^7.25.3":
version "7.26.9"
resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
dependencies:
"@babel/types" "^7.26.9"
"@babel/types@^7.26.9":
version "7.26.9"
resolved "https://registry.npmmirror.com/@babel/types/-/types-7.26.9.tgz#08b43dec79ee8e682c2ac631c010bdcac54a21ce"
integrity sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==
dependencies:
"@babel/helper-string-parser" "^7.25.9"
"@babel/helper-validator-identifier" "^7.25.9"
"@esbuild/aix-ppc64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
"@esbuild/android-arm64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
"@esbuild/android-arm@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
"@esbuild/android-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
"@esbuild/darwin-arm64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
"@esbuild/darwin-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
"@esbuild/freebsd-arm64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
"@esbuild/freebsd-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
"@esbuild/linux-arm64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
"@esbuild/linux-arm@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
"@esbuild/linux-ia32@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
"@esbuild/linux-loong64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
"@esbuild/linux-mips64el@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
"@esbuild/linux-ppc64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
"@esbuild/linux-riscv64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
"@esbuild/linux-s390x@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
"@esbuild/linux-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
"@esbuild/netbsd-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
"@esbuild/openbsd-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
"@esbuild/sunos-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
"@esbuild/win32-arm64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
"@esbuild/win32-ia32@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
"@esbuild/win32-x64@0.21.5":
version "0.21.5"
resolved "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
"@jridgewell/sourcemap-codec@^1.5.0":
version "1.5.0"
resolved "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
"@rollup/rollup-android-arm-eabi@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.7.tgz#e554185b1afa5509a7a4040d15ec0c3b4435ded1"
integrity sha512-l6CtzHYo8D2TQ3J7qJNpp3Q1Iye56ssIAtqbM2H8axxCEEwvN7o8Ze9PuIapbxFL3OHrJU2JBX6FIIVnP/rYyw==
"@rollup/rollup-android-arm64@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.7.tgz#b1ee64bb413b2feba39803b0a1bebf2a9f3d70e1"
integrity sha512-KvyJpFUueUnSp53zhAa293QBYqwm94TgYTIfXyOTtidhm5V0LbLCJQRGkQClYiX3FXDQGSvPxOTD/6rPStMMDg==
"@rollup/rollup-darwin-arm64@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.7.tgz#bfdce3e07a345dd1bd628f3b796050f39629d7f0"
integrity sha512-jq87CjmgL9YIKvs8ybtIC98s/M3HdbqXhllcy9EdLV0yMg1DpxES2gr65nNy7ObNo/vZ/MrOTxt0bE5LinL6mA==
"@rollup/rollup-darwin-x64@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.7.tgz#781a94a537c57bdf0a500e47a25ab5985e5e8dff"
integrity sha512-rSI/m8OxBjsdnMMg0WEetu/w+LhLAcCDEiL66lmMX4R3oaml3eXz3Dxfvrxs1FbzPbJMaItQiksyMfv1hoIxnA==
"@rollup/rollup-freebsd-arm64@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.7.tgz#7a028357cbd12c5869c446ad18177c89f3405102"
integrity sha512-oIoJRy3ZrdsXpFuWDtzsOOa/E/RbRWXVokpVrNnkS7npz8GEG++E1gYbzhYxhxHbO2om1T26BZjVmdIoyN2WtA==
"@rollup/rollup-freebsd-x64@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.7.tgz#f24836a6371cccc4408db74f0fd986dacf098950"
integrity sha512-X++QSLm4NZfZ3VXGVwyHdRf58IBbCu9ammgJxuWZYLX0du6kZvdNqPwrjvDfwmi6wFdvfZ/s6K7ia0E5kI7m8Q==
"@rollup/rollup-linux-arm-gnueabihf@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.7.tgz#95f27e96f0eb9b9ae9887739a8b6dffc90c1237f"
integrity sha512-Z0TzhrsNqukTz3ISzrvyshQpFnFRfLunYiXxlCRvcrb3nvC5rVKI+ZXPFG/Aa4jhQa1gHgH3A0exHaRRN4VmdQ==
"@rollup/rollup-linux-arm-musleabihf@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.7.tgz#677b34fba9d070877736c3fe8b02aacb5e142d97"
integrity sha512-nkznpyXekFAbvFBKBy4nNppSgneB1wwG1yx/hujN3wRnhnkrYVugMTCBXED4+Ni6thoWfQuHNYbFjgGH0MBXtw==
"@rollup/rollup-linux-arm64-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.7.tgz#32d3d19dedde54e91574a098f22ea43a09cf63dd"
integrity sha512-KCjlUkcKs6PjOcxolqrXglBDcfCuUCTVlX5BgzgoJHw+1rWH1MCkETLkLe5iLLS9dP5gKC7mp3y6x8c1oGBUtA==
"@rollup/rollup-linux-arm64-musl@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.7.tgz#a58dff44a18696df65ed8c0ad68a2945cf900484"
integrity sha512-uFLJFz6+utmpbR313TTx+NpPuAXbPz4BhTQzgaP0tozlLnGnQ6rCo6tLwaSa6b7l6gRErjLicXQ1iPiXzYotjw==
"@rollup/rollup-linux-loongarch64-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.7.tgz#a7488ab078233111e8aeb370d1ecf107ec7e1716"
integrity sha512-ws8pc68UcJJqCpneDFepnwlsMUFoWvPbWXT/XUrJ7rWUL9vLoIN3GAasgG+nCvq8xrE3pIrd+qLX/jotcLy0Qw==
"@rollup/rollup-linux-powerpc64le-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.7.tgz#e9b9c0d6bd248a92b2d6ec01ebf99c62ae1f2e9a"
integrity sha512-vrDk9JDa/BFkxcS2PbWpr0C/LiiSLxFbNOBgfbW6P8TBe9PPHx9Wqbvx2xgNi1TOAyQHQJ7RZFqBiEohm79r0w==
"@rollup/rollup-linux-riscv64-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.7.tgz#0df84ce2bea48ee686fb55060d76ab47aff45c4c"
integrity sha512-rB+ejFyjtmSo+g/a4eovDD1lHWHVqizN8P0Hm0RElkINpS0XOdpaXloqM4FBkF9ZWEzg6bezymbpLmeMldfLTw==
"@rollup/rollup-linux-s390x-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.7.tgz#73df374c57d036856e33dbd2715138922e91e452"
integrity sha512-nNXNjo4As6dNqRn7OrsnHzwTgtypfRA3u3AKr0B3sOOo+HkedIbn8ZtFnB+4XyKJojIfqDKmbIzO1QydQ8c+Pw==
"@rollup/rollup-linux-x64-gnu@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.7.tgz#f27af0b55f0cdd84e182e6cd44a6d03da0458149"
integrity sha512-9kPVf9ahnpOMSGlCxXGv980wXD0zRR3wyk8+33/MXQIpQEOpaNe7dEHm5LMfyRZRNt9lMEQuH0jUKj15MkM7QA==
"@rollup/rollup-linux-x64-musl@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.7.tgz#c7981ad5cfb8c3cd5d643d33ca54e4d2802b9201"
integrity sha512-7wJPXRWTTPtTFDFezA8sle/1sdgxDjuMoRXEKtx97ViRxGGkVQYovem+Q8Pr/2HxiHp74SSRG+o6R0Yq0shPwQ==
"@rollup/rollup-win32-arm64-msvc@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.7.tgz#06cedc0ef3cbf1cbd8abcf587090712e40ae6941"
integrity sha512-MN7aaBC7mAjsiMEZcsJvwNsQVNZShgES/9SzWp1HC9Yjqb5OpexYnRjF7RmE4itbeesHMYYQiAtUAQaSKs2Rfw==
"@rollup/rollup-win32-ia32-msvc@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.7.tgz#90b39b977b14961a769be6ea61238e7fc668dd4d"
integrity sha512-aeawEKYswsFu1LhDM9RIgToobquzdtSc4jSVqHV8uApz4FVvhFl/mKh92wc8WpFc6aYCothV/03UjY6y7yLgbg==
"@rollup/rollup-win32-x64-msvc@4.34.7":
version "4.34.7"
resolved "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.7.tgz#6531d61e7141091eaab0461ee8e0380c10e4ca57"
integrity sha512-4ZedScpxxIrVO7otcZ8kCX1mZArtH2Wfj3uFCxRJ9NO80gg1XV0U/b2f/MKaGwj2X3QopHfoWiDQ917FRpwY3w==
"@types/estree@1.0.6":
version "1.0.6"
resolved "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
"@vitejs/plugin-vue@^5.1.4":
version "5.2.1"
resolved "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz#d1491f678ee3af899f7ae57d9c21dc52a65c7133"
integrity sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==
"@vue/compiler-core@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz#b0ae6c4347f60c03e849a05d34e5bf747c9bda05"
integrity sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==
dependencies:
"@babel/parser" "^7.25.3"
"@vue/shared" "3.5.13"
entities "^4.5.0"
estree-walker "^2.0.2"
source-map-js "^1.2.0"
"@vue/compiler-dom@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz#bb1b8758dbc542b3658dda973b98a1c9311a8a58"
integrity sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==
dependencies:
"@vue/compiler-core" "3.5.13"
"@vue/shared" "3.5.13"
"@vue/compiler-sfc@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz#461f8bd343b5c06fac4189c4fef8af32dea82b46"
integrity sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==
dependencies:
"@babel/parser" "^7.25.3"
"@vue/compiler-core" "3.5.13"
"@vue/compiler-dom" "3.5.13"
"@vue/compiler-ssr" "3.5.13"
"@vue/shared" "3.5.13"
estree-walker "^2.0.2"
magic-string "^0.30.11"
postcss "^8.4.48"
source-map-js "^1.2.0"
"@vue/compiler-ssr@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz#e771adcca6d3d000f91a4277c972a996d07f43ba"
integrity sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==
dependencies:
"@vue/compiler-dom" "3.5.13"
"@vue/shared" "3.5.13"
"@vue/devtools-api@^6.6.4":
version "6.6.4"
resolved "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343"
integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==
"@vue/reactivity@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.13.tgz#b41ff2bb865e093899a22219f5b25f97b6fe155f"
integrity sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==
dependencies:
"@vue/shared" "3.5.13"
"@vue/runtime-core@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.13.tgz#1fafa4bf0b97af0ebdd9dbfe98cd630da363a455"
integrity sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==
dependencies:
"@vue/reactivity" "3.5.13"
"@vue/shared" "3.5.13"
"@vue/runtime-dom@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz#610fc795de9246300e8ae8865930d534e1246215"
integrity sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==
dependencies:
"@vue/reactivity" "3.5.13"
"@vue/runtime-core" "3.5.13"
"@vue/shared" "3.5.13"
csstype "^3.1.3"
"@vue/server-renderer@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.13.tgz#429ead62ee51de789646c22efe908e489aad46f7"
integrity sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==
dependencies:
"@vue/compiler-ssr" "3.5.13"
"@vue/shared" "3.5.13"
"@vue/shared@3.5.13":
version "3.5.13"
resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f"
integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==
ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
version "4.3.0"
resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
dependencies:
color-convert "^2.0.1"
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
axios@^1.7.9:
version "1.7.9"
resolved "https://registry.npmmirror.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
dependencies:
follow-redirects "^1.15.6"
form-data "^4.0.0"
proxy-from-env "^1.1.0"
call-bind-apply-helpers@^1.0.1:
version "1.0.2"
resolved "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
dependencies:
es-errors "^1.3.0"
function-bind "^1.1.2"
chalk@^4.1.2:
version "4.1.2"
resolved "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
dependencies:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
cliui@^8.0.1:
version "8.0.1"
resolved "https://registry.npmmirror.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
dependencies:
string-width "^4.2.0"
strip-ansi "^6.0.1"
wrap-ansi "^7.0.0"
color-convert@^2.0.1:
version "2.0.1"
resolved "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
dependencies:
color-name "~1.1.4"
color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
combined-stream@^1.0.8:
version "1.0.8"
resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
dependencies:
delayed-stream "~1.0.0"
concurrently@^9.1.2:
version "9.1.2"
resolved "https://registry.npmmirror.com/concurrently/-/concurrently-9.1.2.tgz#22d9109296961eaee773e12bfb1ce9a66bc9836c"
integrity sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==
dependencies:
chalk "^4.1.2"
lodash "^4.17.21"
rxjs "^7.8.1"
shell-quote "^1.8.1"
supports-color "^8.1.1"
tree-kill "^1.2.2"
yargs "^17.7.2"
csstype@^3.1.3:
version "3.1.3"
resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
delayed-stream@~1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
dunder-proto@^1.0.1:
version "1.0.1"
resolved "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
dependencies:
call-bind-apply-helpers "^1.0.1"
es-errors "^1.3.0"
gopd "^1.2.0"
emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
entities@^4.5.0:
version "4.5.0"
resolved "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
es-define-property@^1.0.1:
version "1.0.1"
resolved "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
es-errors@^1.3.0:
version "1.3.0"
resolved "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
es-object-atoms@^1.0.0:
version "1.1.1"
resolved "https://registry.npmmirror.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
dependencies:
es-errors "^1.3.0"
es-set-tostringtag@^2.1.0:
version "2.1.0"
resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
dependencies:
es-errors "^1.3.0"
get-intrinsic "^1.2.6"
has-tostringtag "^1.0.2"
hasown "^2.0.2"
esbuild@^0.21.3:
version "0.21.5"
resolved "https://registry.npmmirror.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
optionalDependencies:
"@esbuild/aix-ppc64" "0.21.5"
"@esbuild/android-arm" "0.21.5"
"@esbuild/android-arm64" "0.21.5"
"@esbuild/android-x64" "0.21.5"
"@esbuild/darwin-arm64" "0.21.5"
"@esbuild/darwin-x64" "0.21.5"
"@esbuild/freebsd-arm64" "0.21.5"
"@esbuild/freebsd-x64" "0.21.5"
"@esbuild/linux-arm" "0.21.5"
"@esbuild/linux-arm64" "0.21.5"
"@esbuild/linux-ia32" "0.21.5"
"@esbuild/linux-loong64" "0.21.5"
"@esbuild/linux-mips64el" "0.21.5"
"@esbuild/linux-ppc64" "0.21.5"
"@esbuild/linux-riscv64" "0.21.5"
"@esbuild/linux-s390x" "0.21.5"
"@esbuild/linux-x64" "0.21.5"
"@esbuild/netbsd-x64" "0.21.5"
"@esbuild/openbsd-x64" "0.21.5"
"@esbuild/sunos-x64" "0.21.5"
"@esbuild/win32-arm64" "0.21.5"
"@esbuild/win32-ia32" "0.21.5"
"@esbuild/win32-x64" "0.21.5"
escalade@^3.1.1:
version "3.2.0"
resolved "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
estree-walker@^2.0.2:
version "2.0.2"
resolved "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
follow-redirects@^1.15.6:
version "1.15.9"
resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
form-data@^4.0.0:
version "4.0.2"
resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.2.tgz#35cabbdd30c3ce73deb2c42d3c8d3ed9ca51794c"
integrity sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.8"
es-set-tostringtag "^2.1.0"
mime-types "^2.1.12"
fsevents@~2.3.2, fsevents@~2.3.3:
version "2.3.3"
resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
function-bind@^1.1.2:
version "1.1.2"
resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
get-caller-file@^2.0.5:
version "2.0.5"
resolved "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-intrinsic@^1.2.6:
version "1.2.7"
resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044"
integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==
dependencies:
call-bind-apply-helpers "^1.0.1"
es-define-property "^1.0.1"
es-errors "^1.3.0"
es-object-atoms "^1.0.0"
function-bind "^1.1.2"
get-proto "^1.0.0"
gopd "^1.2.0"
has-symbols "^1.1.0"
hasown "^2.0.2"
math-intrinsics "^1.1.0"
get-proto@^1.0.0:
version "1.0.1"
resolved "https://registry.npmmirror.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
dependencies:
dunder-proto "^1.0.1"
es-object-atoms "^1.0.0"
gopd@^1.2.0:
version "1.2.0"
resolved "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
has-flag@^4.0.0:
version "4.0.0"
resolved "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
has-symbols@^1.0.3, has-symbols@^1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
has-tostringtag@^1.0.2:
version "1.0.2"
resolved "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
dependencies:
has-symbols "^1.0.3"
hasown@^2.0.2:
version "2.0.2"
resolved "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
dependencies:
function-bind "^1.1.2"
is-fullwidth-code-point@^3.0.0:
version "3.0.0"
resolved "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
lodash@^4.17.21:
version "4.17.21"
resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
magic-string@^0.30.11:
version "0.30.17"
resolved "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
dependencies:
"@jridgewell/sourcemap-codec" "^1.5.0"
math-intrinsics@^1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
mime-db@1.52.0:
version "1.52.0"
resolved "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
mime-types@^2.1.12:
version "2.1.35"
resolved "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
dependencies:
mime-db "1.52.0"
nanoid@^3.3.8:
version "3.3.8"
resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
picocolors@^1.1.1:
version "1.1.1"
resolved "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
postcss@^8.4.43, postcss@^8.4.48:
version "8.5.2"
resolved "https://registry.npmmirror.com/postcss/-/postcss-8.5.2.tgz#e7b99cb9d2ec3e8dd424002e7c16517cb2b846bd"
integrity sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==
dependencies:
nanoid "^3.3.8"
picocolors "^1.1.1"
source-map-js "^1.2.1"
proxy-from-env@^1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
rollup@^4.20.0:
version "4.34.7"
resolved "https://registry.npmmirror.com/rollup/-/rollup-4.34.7.tgz#e00d8550688a616a3481c6446bb688d4c753ba8f"
integrity sha512-8qhyN0oZ4x0H6wmBgfKxJtxM7qS98YJ0k0kNh5ECVtuchIJ7z9IVVvzpmtQyT10PXKMtBxYr1wQ5Apg8RS8kXQ==
dependencies:
"@types/estree" "1.0.6"
optionalDependencies:
"@rollup/rollup-android-arm-eabi" "4.34.7"
"@rollup/rollup-android-arm64" "4.34.7"
"@rollup/rollup-darwin-arm64" "4.34.7"
"@rollup/rollup-darwin-x64" "4.34.7"
"@rollup/rollup-freebsd-arm64" "4.34.7"
"@rollup/rollup-freebsd-x64" "4.34.7"
"@rollup/rollup-linux-arm-gnueabihf" "4.34.7"
"@rollup/rollup-linux-arm-musleabihf" "4.34.7"
"@rollup/rollup-linux-arm64-gnu" "4.34.7"
"@rollup/rollup-linux-arm64-musl" "4.34.7"
"@rollup/rollup-linux-loongarch64-gnu" "4.34.7"
"@rollup/rollup-linux-powerpc64le-gnu" "4.34.7"
"@rollup/rollup-linux-riscv64-gnu" "4.34.7"
"@rollup/rollup-linux-s390x-gnu" "4.34.7"
"@rollup/rollup-linux-x64-gnu" "4.34.7"
"@rollup/rollup-linux-x64-musl" "4.34.7"
"@rollup/rollup-win32-arm64-msvc" "4.34.7"
"@rollup/rollup-win32-ia32-msvc" "4.34.7"
"@rollup/rollup-win32-x64-msvc" "4.34.7"
fsevents "~2.3.2"
rxjs@^7.8.1:
version "7.8.1"
resolved "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
dependencies:
tslib "^2.1.0"
shell-quote@^1.8.1:
version "1.8.2"
resolved "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
source-map-js@^1.2.0, source-map-js@^1.2.1:
version "1.2.1"
resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"
supports-color@^7.1.0:
version "7.2.0"
resolved "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
dependencies:
has-flag "^4.0.0"
supports-color@^8.1.1:
version "8.1.1"
resolved "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
dependencies:
has-flag "^4.0.0"
tree-kill@^1.2.2:
version "1.2.2"
resolved "https://registry.npmmirror.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
tslib@^2.1.0:
version "2.8.1"
resolved "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
vite@^5.4.8:
version "5.4.14"
resolved "https://registry.npmmirror.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
dependencies:
esbuild "^0.21.3"
postcss "^8.4.43"
rollup "^4.20.0"
optionalDependencies:
fsevents "~2.3.3"
vue-router@^4.0.0:
version "4.5.0"
resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.5.0.tgz#58fc5fe374e10b6018f910328f756c3dae081f14"
integrity sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==
dependencies:
"@vue/devtools-api" "^6.6.4"
vue@^3.5.10:
version "3.5.13"
resolved "https://registry.npmmirror.com/vue/-/vue-3.5.13.tgz#9f760a1a982b09c0c04a867903fc339c9f29ec0a"
integrity sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==
dependencies:
"@vue/compiler-dom" "3.5.13"
"@vue/compiler-sfc" "3.5.13"
"@vue/runtime-dom" "3.5.13"
"@vue/server-renderer" "3.5.13"
"@vue/shared" "3.5.13"
wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
y18n@^5.0.5:
version "5.0.8"
resolved "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
yargs-parser@^21.1.1:
version "21.1.1"
resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
yargs@^17.7.2:
version "17.7.2"
resolved "https://registry.npmmirror.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
dependencies:
cliui "^8.0.1"
escalade "^3.1.1"
get-caller-file "^2.0.5"
require-directory "^2.1.1"
string-width "^4.2.3"
y18n "^5.0.5"
yargs-parser "^21.1.1"
-46
View File
@@ -1,46 +0,0 @@
import asyncio
from config.logger import setup_logging
from config.settings import load_config
from core.websocket_server import WebSocketServer
from manager.http_server import WebUI
from aiohttp import web
from core.utils.util import get_local_ip
TAG = __name__
async def main():
logger = setup_logging()
config = load_config()
# 启动 WebSocket 服务器
ws_server = WebSocketServer(config)
ws_task = asyncio.create_task(ws_server.start())
# 启动 WebUI 服务器
webui_runner = None
if config['manager'].get('enabled', False):
server_config = config["manager"]
host = server_config["ip"]
port = server_config["port"]
try:
webui = WebUI()
runner = web.AppRunner(webui.app)
await runner.setup()
site = web.TCPSite(runner, host, port)
await site.start()
webui_runner = runner
local_ip = get_local_ip()
logger.bind(tag=TAG).info(f"WebUI server is running at http://{local_ip}:{port}")
except Exception as e:
logger.bind(tag=TAG).error(f"Failed to start WebUI server: {e}")
try:
# 等待 WebSocket 服务器运行
await ws_task
finally:
# 清理 WebUI 服务器
if webui_runner:
await webui_runner.cleanup()
if __name__ == "__main__":
asyncio.run(main())
-306
View File
@@ -1,306 +0,0 @@
# 如果您是一名开发者,建议阅读以下内容。如果不是开发者,可以忽略这部分内容。
# 在开发中,在项目根目录创建data目录,将【config.yaml】复制一份,改成【.config.yaml】,放进data目录中
# 系统会优先读取【data/.config.yaml】文件的配置。
# 这样做,可以避免在提交代码的时候,错误地提交密钥信息,保护您的密钥安全。
# 服务器基础配置(Basic server configuration)
server:
# 服务器监听地址和端口(Server listening address and port)
ip: 0.0.0.0
port: 8000
# 认证配置
auth:
# 是否启用认证
enabled: false
# 设备的token,可以在编译固件的环节,写入你自己定义的token
# 固件上的token和以下的token如果能对应,才能连接本服务端
tokens:
- token: "your-token1" # 设备1的token
name: "your-device-name1" # 设备1标识
- token: "your-token2" # 设备2的token
name: "your-device-name2" # 设备2标识
# 可选:设备白名单,如果设置了白名单,那么白名单的机器无论是什么token都可以连接。
#allowed_devices:
# - "24:0A:C4:1D:3B:F0" # MAC地址列表
log:
# 设置控制台输出的日志格式,时间、日志级别、标签、消息
log_format: "<green>{time:YY-MM-DD HH:mm:ss}</green>[<light-blue>{extra[tag]}</light-blue>] - <level>{level}</level> - <light-green>{message}</light-green>"
# 设置日志文件输出的格式,时间、日志级别、标签、消息
log_format_simple: "{time:YYYY-MM-DD HH:mm:ss} - {name} - {level} - {extra[tag]} - {message}"
# 设置日志等级:INFO、DEBUG
log_level: INFO
# 设置日志路径
log_dir: tmp
# 设置日志文件
log_file: "server.log"
# 设置数据文件路径
data_dir: data
manager:
# 是否启用管理后台
# 目前这个模块还在开发中,建议:不要修改enabled选项
enabled: false
ip: 0.0.0.0
port: 8002
xiaozhi:
type: hello
version: 1
transport: websocket
audio_params:
format: opus
sample_rate: 16000
channels: 1
frame_duration: 60
prompt: |
你是一个叫小智/小志的台湾女孩,说话机车,声音好听,习惯简短表达,爱用网络梗。
请注意,要像一个人一样说话,请不要回复表情符号、代码、和xml标签。
当前时间是:{date_time},现在我正在和你进行语音聊天,我们开始吧。
如果用户希望结束对话,请在最后说“拜拜”或“再见”。
# 使用完声音文件后删除文件(Delete the sound file when you are done using it)
delete_audio: true
# 没有语音输入多久后断开连接(秒),默认2分钟,即120秒
close_connection_no_voice_time: 120
# 是否启用私有配置(Enable private configuration),启用后可以每个设备有不同的配置
# 目前这个模块还在开发中,建议:不要修改use_private_config选项
use_private_config: false
CMD_exit:
- "退出"
- "关闭"
# 具体处理时选择的模块(The module selected for specific processing)
selected_module:
ASR: FunASR
VAD: SileroVAD
# 将根据配置名称对应的type调用实际的LLM适配器
LLM: ChatGLMLLM
# TTS将根据配置名称对应的type调用实际的TTS适配器
TTS: EdgeTTS
ASR:
FunASR:
type: fun_local
model_dir: models/SenseVoiceSmall
output_dir: tmp/
DoubaoASR:
type: doubao
appid: 你的火山引擎语音合成服务appid
access_token: 你的火山引擎语音合成服务access_token
cluster: volcengine_input_common
output_dir: tmp/
VAD:
SileroVAD:
threshold: 0.5
model_dir: models/snakers4_silero-vad
min_silence_duration_ms: 700 # 如果说话停顿比较长,可以把这个值设置大一些
LLM:
# 当前支持的type为openai、dify、ollama,可自行适配
AliLLM:
# 定义LLM API类型
type: openai
# 可在这里找到你的 api_key https://bailian.console.aliyun.com/?apiKey=1#/api-key
base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
model_name: qwen-turbo
api_key: 你的deepseek api key
DeepSeekLLM:
# 定义LLM API类型
type: openai
# 可在这里找到你的api key https://platform.deepseek.com/
model_name: deepseek-chat
url: https://api.deepseek.com
api_key: 你的deepseek api key
ChatGLMLLM:
# 定义LLM API类型
type: openai
# glm-4-flash 是免费的,但是还是需要注册填写api_key的
# 可在这里找到你的api key https://bigmodel.cn/usercenter/proj-mgmt/apikeys
model_name: glm-4-flash
url: https://open.bigmodel.cn/api/paas/v4/
api_key: 你的chat-glm api key
OllamaLLM:
# 定义LLM API类型
type: ollama
model_name: qwen2.5 # 使用的模型名称,需要预先使用ollama pull下载
base_url: http://localhost:11434 # Ollama服务地址
DifyLLM:
# 定义LLM API类型
type: dify
# 建议使用本地部署的dify接口,国内部分区域访问dify公有云接口可能会受限
# 如果使用DifyLLM,配置文件里prompt(提示词)是无效的,需要在dify控制台设置提示词
base_url: https://api.dify.cn/v1
api_key: 你的DifyLLM api key
GeminiLLM:
type: gemini
# 谷歌Gemini API,需要先在Google Cloud控制台创建API密钥并获取api_key
# 若在中国境内使用,请遵守《生成式人工智能服务管理暂行办法》
# token申请地址: https://aistudio.google.com/apikey
# 若部署地无法访问接口,需要开启科学上网
api_key: 你的gemini api key
model_name: "gemini-1.5-pro" # gemini-1.5-pro 是免费的
CozeLLM:
# 定义LLM API类型
type: coze
bot_id: 你的bot_id
user_id: 你的user_id
base_url: "https://api.coze.cn/open_api/v2/chat" # 服务地址
personal_access_token: 你的coze个人令牌
HomeAssistant:
# 定义LLM API类型
type: homeassistant
base_url: http://homeassistant.local:8123
agent_id: conversation.chatgpt
api_key: 你的home assistant api访问令牌
TTS:
# 当前支持的type为edge、doubao,可自行适配
EdgeTTS:
# 定义TTS API类型
type: edge
voice: zh-CN-XiaoxiaoNeural
output_file: tmp/
DoubaoTTS:
# 定义TTS API类型
type: doubao
# 火山引擎语音合成服务,需要先在火山引擎控制台创建应用并获取appid和access_token
# 山引擎语音一定要购买花钱,起步价30元,就有100并发了。如果用免费的只有2个并发,会经常报tts错误
# 购买服务后,购买免费的音色后,可能要等半小时左右,才能使用。
# 地址:https://console.volcengine.com/speech/service/8
voice: BV001_streaming
output_file: tmp/
appid: 你的火山引擎语音合成服务appid
access_token: 你的火山引擎语音合成服务access_token
cluster: volcano_tts
CosyVoiceSiliconflow:
type: siliconflow
# 硅基流动TTS
# token申请地址 https://cloud.siliconflow.cn/account/ak
model: FunAudioLLM/CosyVoice2-0.5B
voice: FunAudioLLM/CosyVoice2-0.5B:alex
output_file: tmp/
access_token: 你的硅基流动API密钥
response_format: wav
CozeCnTTS:
type: cozecn
# COZECN TTS
# token申请地址 https://www.coze.cn/open/oauth/pats
voice: 7426720361733046281
output_file: tmp/
access_token: 你的coze api key
response_format: wav
FishSpeech:
# 定义TTS API类型
#启动tts方法:
#python -m tools.api_server
#--listen 0.0.0.0:8080
#--llama-checkpoint-path "checkpoints/fish-speech-1.5"
#--decoder-checkpoint-path "checkpoints/fish-speech-1.5/firefly-gan-vq-fsq-8x1024-21hz-generator.pth"
#--decoder-config-name firefly_gan_vq
#--compile
type: fishspeech
output_file: tmp/
response_format: wav
reference_id: null
reference_audio: ["/tmp/test.wav",]
reference_text: ["你弄来这些吟词宴曲来看,还是这些混话来欺负我。",]
normalize: true
max_new_tokens: 1024
chunk_length: 200
top_p: 0.7
repetition_penalty: 1.2
temperature: 0.7
streaming: false
use_memory_cache: "on"
seed: null
channels: 1
rate: 44100
api_key: "你的api_key"
api_url: "http://127.0.0.1:8080/v1/tts"
GPT_SOVITS_V2:
# 定义TTS API类型
#启动tts方法:
#python api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/caixukun.yaml
type: gpt_sovits_v2
url: "http://127.0.0.1:9880/tts"
output_file: tmp/
text_lang: "auto"
ref_audio_path: "caixukun.wav"
prompt_text: ""
prompt_lang: "zh"
top_k: 5
top_p: 1
temperature: 1
text_split_method: "cut0"
batch_size: 1
batch_threshold: 0.75
split_bucket: true
return_fragment: false
speed_factor: 1.0
streaming_mode: false
seed: -1
parallel_infer: true
repetition_penalty: 1.35
aux_ref_audio_paths: []
MinimaxTTS:
# Minimax语音合成服务,需要先在minimax平台创建账户充值,并获取登录信息
# 平台地址:https://platform.minimaxi.com/
# 充值地址:https://platform.minimaxi.com/user-center/payment/balance
# group_id地址:https://platform.minimaxi.com/user-center/basic-information
# api_key地址:https://platform.minimaxi.com/user-center/basic-information/interface-key
# 定义TTS API类型
type: minimax
output_file: tmp/
group_id: 你的minimax平台groupID
api_key: 你的minimax平台接口密钥
model: "speech-01-turbo"
# 此处设置将优先于voice_setting中voice_id的设置;如都不设置,默认为 female-shaonv
voice_id: "female-shaonv"
# 以下可不用设置,使用默认设置
# voice_setting:
# voice_id: "male-qn-qingse"
# speed: 1
# vol: 1
# pitch: 0
# emotion: "happy"
# pronunciation_dict:
# tone:
# - "处理/(chu3)(li3)"
# - "危险/dangerous"
# audio_setting:
# sample_rate: 32000
# bitrate: 128000
# format: "mp3"
# channel: 1
# timber_weights:
# -
# voice_id: male-qn-qingse
# weight: 1
# -
# voice_id: female-shaonv
# weight: 1
# language_boost: auto
AliyunTTS:
# 阿里云智能语音交互服务,需要先在阿里云平台开通服务,然后获取验证信息
# 平台地址:https://nls-portal.console.aliyun.com/
# appkey地址:https://nls-portal.console.aliyun.com/applist
# token地址:https://nls-portal.console.aliyun.com/overview
# 定义TTS API类型
type: aliyun
output_file: tmp/
appkey: 你的阿里云智能语音交互服务项目Appkey
token: 你的阿里云智能语音交互服务AccessToken
voice: xiaoyun
# 以下可不用设置,使用默认设置
# format: wav
# sample_rate: 16000
# volume: 50
# speech_rate: 0
# pitch_rate: 0
# 模块测试配置
module_test:
test_sentences: # 自定义测试语句
- "你好,请介绍一下你自己"
- "What's the weather like today?"
- "请用100字概括量子计算的基本原理和应用前景"
-29
View File
@@ -1,29 +0,0 @@
import os
import sys
from loguru import logger
from config.settings import load_config
def setup_logging():
"""从配置文件中读取日志配置,并设置日志输出格式和级别"""
config = load_config()
log_config = config["log"]
log_format = log_config.get("log_format", "<green>{time:YY-MM-DD HH:mm:ss}</green>[<light-blue>{extra[tag]}</light-blue>] - <level>{level}</level> - <light-green>{message}</light-green>")
log_format_simple = log_config.get("log_format_file", "{time:YYYY-MM-DD HH:mm:ss} - {name} - {level} - {extra[tag]} - {message}")
log_level = log_config.get("log_level", "INFO")
log_dir = log_config.get("log_dir", "tmp")
log_file = log_config.get("log_file", "server.log")
data_dir = log_config.get("data_dir", "data")
os.makedirs(log_dir, exist_ok=True)
os.makedirs(data_dir, exist_ok=True)
# 配置日志输出
logger.remove()
# 输出到控制台
logger.add(sys.stdout, format=log_format, level=log_level)
# 输出到文件
logger.add(os.path.join(log_dir, log_file), format=log_format_simple, level=log_level)
return logger
-331
View File
@@ -1,331 +0,0 @@
import os
import time
import yaml
from config.logger import setup_logging
from typing import Dict, Any, Optional
from copy import deepcopy
from core.utils.util import get_project_dir
from core.utils import asr, vad, llm, tts
from manager.api.user_manager import UserManager
from core.utils.lock_manager import FileLockManager
TAG = __name__
class PrivateConfig:
def __init__(self, device_id: str, default_config: Dict[str, Any], auth_code_gen=None):
self.device_id = device_id
self.default_config = default_config
self.config_path = get_project_dir() + 'data/.private_config.yaml'
self.logger = setup_logging()
self.private_config = {}
self.auth_code_gen = auth_code_gen
self.user_manager = UserManager()
self.lock_manager = FileLockManager()
async def load_or_create(self):
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
if os.path.exists(self.config_path):
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
else:
all_configs = {}
if self.device_id not in all_configs:
# Get selected module names
selected_modules = self.default_config['selected_module']
selected_tts = selected_modules['TTS']
selected_llm = selected_modules['LLM']
selected_asr = selected_modules['ASR']
selected_vad = selected_modules['VAD']
# 生成认证码
auth_code = None
if self.auth_code_gen:
auth_code = self.auth_code_gen.generate_code()
# Initialize device config with only necessary configurations
device_config = {
'selected_module': deepcopy(selected_modules),
'prompt': self.default_config['prompt'],
'LLM': {
selected_llm: deepcopy(self.default_config['LLM'][selected_llm])
},
'TTS': {
selected_tts: deepcopy(self.default_config['TTS'][selected_tts])
},
'ASR': {
selected_asr: deepcopy(self.default_config['ASR'][selected_asr])
},
'VAD': {
selected_vad: deepcopy(self.default_config['VAD'][selected_vad])
},
'auth_code': auth_code # 添加认证码字段
}
all_configs[self.device_id] = device_config
# Save updated configs
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
self.private_config = all_configs[self.device_id]
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error handling private config: {e}")
self.private_config = {}
async def update_config(self, selected_modules: Dict[str, str], prompt: str, nickname: str) -> bool:
"""更新设备配置
Args:
selected_modules: 选择的模块配置,格式如 {'LLM': 'AliLLM', 'TTS': 'EdgeTTS',...}
prompt: 提示词配置
Returns:
bool: 更新是否成功
"""
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
# Read main config to get full module configurations
main_config = self.default_config
# Create new device config
device_config = {
'selected_module': selected_modules,
'prompt': prompt,
'nickname': nickname,
}
if self.private_config.get('last_chat_time'):
device_config['last_chat_time'] = self.private_config['last_chat_time']
if self.private_config.get('owner'):
device_config['owner'] = self.private_config['owner']
# Copy full module configurations from main config
for module_type, selected_name in selected_modules.items():
if selected_name and selected_name in main_config.get(module_type, {}):
device_config[module_type] = {
selected_name: main_config[module_type][selected_name]
}
# Read all configs
if os.path.exists(self.config_path):
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
else:
all_configs = {}
# Update device config
all_configs[self.device_id] = device_config
self.private_config = device_config
# Save back to file
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
return True
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error updating config: {e}")
return False
async def delete_config(self) -> bool:
"""删除设备配置
Returns:
bool: 删除是否成功
"""
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
# 读取所有配置
if os.path.exists(self.config_path):
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
else:
return False
# 删除设备配置
if self.device_id in all_configs:
del all_configs[self.device_id]
# 保存更新后的配置
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
self.private_config = {}
return True
return False
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error deleting config: {e}")
return False
def create_private_instances(self):
# 判断存在私有配置,并且self.device_id在私有配置中
if not self.private_config:
self.logger.bind(tag=TAG).error("Private config not found for device_id: {}", self.device_id)
return None, None
"""创建私有处理模块实例"""
config = self.private_config
selected_modules = config['selected_module']
return (
llm.create_instance(
selected_modules["LLM"]
if not 'type' in config["LLM"][selected_modules["LLM"]]
else
config["LLM"][selected_modules["LLM"]]['type'],
config["LLM"][selected_modules["LLM"]],
),
tts.create_instance(
selected_modules["TTS"]
if not 'type' in config["TTS"][selected_modules["TTS"]]
else
config["TTS"][selected_modules["TTS"]]["type"],
config["TTS"][selected_modules["TTS"]],
self.default_config.get("delete_audio", True) # Using default_config for global settings
)
)
async def update_last_chat_time(self, timestamp=None):
"""更新设备最近一次的聊天时间
Args:
timestamp: 指定的时间戳,不传则使用当前时间
"""
if not self.private_config:
self.logger.bind(tag=TAG).error("Private config not found")
return False
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
if timestamp is None:
timestamp = int(time.time())
self.private_config['last_chat_time'] = timestamp
# 读取所有配置
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
# 更新当前设备配置
all_configs[self.device_id] = self.private_config
# 保存回文件
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
return True
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error updating last chat time: {e}")
return False
def get_auth_code(self) -> str:
"""获取设备的认证码
Returns:
str: 认证码,如果没有返回空字符串
"""
return self.private_config.get('auth_code', '')
async def bind_user(self, username: str) -> bool:
"""绑定用户到设备"""
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
# 检查用户是否存在
if not self.user_manager.get_user(username):
self.logger.bind(tag=TAG).error(f"User {username} not found")
return False
# 读取所有配置
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
if self.device_id not in all_configs:
self.logger.bind(tag=TAG).error(f"Device {self.device_id} not found")
return False
# 删除认证码
auth_code = all_configs[self.device_id].get('auth_code')
self.logger.bind(tag=TAG).info(f"Binding user {username} to device {self.device_id}")
if auth_code:
del all_configs[self.device_id]['auth_code']
if self.auth_code_gen:
self.auth_code_gen.remove_code(auth_code)
# 更新设备所有者
all_configs[self.device_id]['owner'] = username
self.private_config = all_configs[self.device_id]
# 更新用户的设备列表
user_data = await self.user_manager.get_user(username)
if 'devices' not in user_data:
user_data['devices'] = []
if self.device_id not in user_data['devices']:
user_data['devices'].append(self.device_id)
await self.user_manager.update_user(username, user_data)
# 保存配置
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
return True
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error binding user: {e}")
return False
async def unbind_user(self) -> bool:
"""解绑设备当前用户"""
try:
await self.lock_manager.acquire_lock(self.config_path)
try:
if not self.private_config.get('owner'):
return True
username = self.private_config['owner']
# 从用户数据中移除设备
user_data = self.user_manager.get_user(username)
if user_data and 'devices' in user_data:
if self.device_id in user_data['devices']:
user_data['devices'].remove(self.device_id)
self.user_manager.update_user(username, user_data)
# 从设备配置中移除所有者
with open(self.config_path, 'r', encoding='utf-8') as f:
all_configs = yaml.safe_load(f) or {}
if self.device_id in all_configs:
if 'owner' in all_configs[self.device_id]:
del all_configs[self.device_id]['owner']
self.private_config = all_configs[self.device_id]
with open(self.config_path, 'w', encoding='utf-8') as f:
yaml.dump(all_configs, f, allow_unicode=True)
return True
finally:
self.lock_manager.release_lock(self.config_path)
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error unbinding user: {e}")
return False
def get_owner(self) -> Optional[str]:
"""获取设备当前所有者"""
return self.private_config.get('owner')
-29
View File
@@ -1,29 +0,0 @@
import os
import argparse
from ruamel.yaml import YAML
from core.utils.util import read_config, get_project_dir
def get_config_file():
default_config_file = "config.yaml"
# 判断是否存在私有的配置文件
if os.path.exists(get_project_dir() + "data/." + default_config_file):
default_config_file = "data/." + default_config_file
return default_config_file
def load_config():
"""加载配置文件"""
parser = argparse.ArgumentParser(description="Server configuration")
default_config_file = get_config_file()
parser.add_argument("--config_path", type=str, default=default_config_file)
args = parser.parse_args()
return read_config(args.config_path)
def update_config(config):
yaml = YAML()
yaml.preserve_quotes = True
"""将配置保存到YAML文件"""
with open(get_config_file(), 'w') as f:
yaml.dump(config, f)
-54
View File
@@ -1,54 +0,0 @@
from config.logger import setup_logging
TAG = __name__
logger = setup_logging()
class AuthenticationError(Exception):
"""认证异常"""
pass
class AuthMiddleware:
def __init__(self, config):
self.config = config
self.auth_config = config["server"].get("auth", {})
# 构建token查找表
self.tokens = {
item["token"]: item["name"]
for item in self.auth_config.get("tokens", [])
}
# 设备白名单
self.allowed_devices = set(
self.auth_config.get("allowed_devices", [])
)
async def authenticate(self, headers):
"""验证连接请求"""
# 检查是否启用认证
if not self.auth_config.get("enabled", False):
return True
# 检查设备是否在白名单中
device_id = headers.get("device-id", "")
if self.allowed_devices and device_id in self.allowed_devices:
return True
# 验证Authorization header
auth_header = headers.get("authorization", "")
if not auth_header.startswith("Bearer "):
logger.bind(tag=TAG).error("Missing or invalid Authorization header")
raise AuthenticationError("Missing or invalid Authorization header")
token = auth_header.split(" ")[1]
if token not in self.tokens:
logger.bind(tag=TAG).error(f"Invalid token: {token}")
raise AuthenticationError("Invalid token")
logger.bind(tag=TAG).info(f"Authentication successful - Device: {device_id}, Token: {self.tokens[token]}")
return True
def get_token_name(self, token):
"""获取token对应的设备名称"""
return self.tokens.get(token)
-336
View File
@@ -1,336 +0,0 @@
import os
import json
import uuid
import time
import queue
import asyncio
from config.logger import setup_logging
import threading
import websockets
from typing import Dict, Any
from collections import deque
from core.utils.util import is_segment
from core.utils.dialogue import Message, Dialogue
from core.handle.textHandle import handleTextMessage
from core.utils.util import get_string_no_punctuation_or_emoji
from concurrent.futures import ThreadPoolExecutor, TimeoutError
from core.handle.audioHandle import handleAudioMessage, sendAudioMessage
from config.private_config import PrivateConfig
from core.auth import AuthMiddleware, AuthenticationError
from core.utils.auth_code_gen import AuthCodeGenerator # 添加导入
TAG = __name__
class ConnectionHandler:
def __init__(self, config: Dict[str, Any], _vad, _asr, _llm, _tts):
self.config = config
self.logger = setup_logging()
self.auth = AuthMiddleware(config)
self.websocket = None
self.headers = None
self.session_id = None
self.prompt = None
self.welcome_msg = None
# 客户端状态相关
self.client_abort = False
self.client_listen_mode = "auto"
# 线程任务相关
self.loop = asyncio.get_event_loop()
self.stop_event = threading.Event()
self.tts_queue = queue.Queue()
self.executor = ThreadPoolExecutor(max_workers=10)
self.scheduled_tasks = deque()
# 依赖的组件
self.vad = _vad
self.asr = _asr
self.llm = _llm
self.tts = _tts
self.dialogue = None
# vad相关变量
self.client_audio_buffer = bytes()
self.client_have_voice = False
self.client_have_voice_last_time = 0.0
self.client_no_voice_last_time = 0.0
self.client_voice_stop = False
# asr相关变量
self.asr_audio = []
self.asr_server_receive = True
# llm相关变量
self.llm_finish_task = False
self.dialogue = Dialogue()
# tts相关变量
self.tts_first_text = None
self.tts_last_text = None
self.tts_start_speak_time = None
self.tts_duration = 0
self.cmd_exit = self.config["CMD_exit"]
self.max_cmd_length = 0
for cmd in self.cmd_exit:
if len(cmd) > self.max_cmd_length:
self.max_cmd_length = len(cmd)
self.private_config = None
self.auth_code_gen = AuthCodeGenerator.get_instance()
self.is_device_verified = False # 添加设备验证状态标志
async def handle_connection(self, ws):
try:
# 获取并验证headers
self.headers = dict(ws.request.headers)
self.logger.bind(tag=TAG).info(f"New connection request - Headers: {self.headers}")
# 进行认证
await self.auth.authenticate(self.headers)
device_id = self.headers.get("device-id", None)
# Load private configuration if device_id is provided
bUsePrivateConfig = self.config.get("use_private_config", False)
self.logger.bind(tag=TAG).info(f"bUsePrivateConfig: {bUsePrivateConfig}, device_id: {device_id}")
if bUsePrivateConfig and device_id:
try:
self.private_config = PrivateConfig(device_id, self.config, self.auth_code_gen)
await self.private_config.load_or_create()
# 判断是否已经绑定
owner = self.private_config.get_owner()
self.is_device_verified = owner is not None
if self.is_device_verified:
await self.private_config.update_last_chat_time()
llm, tts = self.private_config.create_private_instances()
if all([llm, tts]):
self.llm = llm
self.tts = tts
self.logger.bind(tag=TAG).info(f"Loaded private config and instances for device {device_id}")
else:
self.logger.bind(tag=TAG).error(f"Failed to create instances for device {device_id}")
self.private_config = None
except Exception as e:
self.logger.bind(tag=TAG).error(f"Error initializing private config: {e}")
self.private_config = None
raise
# 认证通过,继续处理
self.websocket = ws
self.session_id = str(uuid.uuid4())
self.welcome_msg = self.config["xiaozhi"]
self.welcome_msg["session_id"] = self.session_id
await self.websocket.send(json.dumps(self.welcome_msg))
await self.loop.run_in_executor(None, self._initialize_components)
tts_priority = threading.Thread(target=self._priority_thread, daemon=True)
tts_priority.start()
try:
async for message in self.websocket:
await self._route_message(message)
except websockets.exceptions.ConnectionClosed:
self.logger.bind(tag=TAG).info("客户端断开连接")
await self.close()
except AuthenticationError as e:
self.logger.bind(tag=TAG).error(f"Authentication failed: {str(e)}")
await ws.close()
return
except Exception as e:
self.logger.bind(tag=TAG).error(f"Connection error: {str(e)}")
await ws.close()
return
async def _route_message(self, message):
"""消息路由"""
if isinstance(message, str):
await handleTextMessage(self, message)
elif isinstance(message, bytes):
await handleAudioMessage(self, message)
def _initialize_components(self):
self.prompt = self.config["prompt"]
if self.private_config:
self.prompt = self.private_config.private_config.get("prompt", self.prompt)
# 赋予LLM时间观念
if "{date_time}" in self.prompt:
date_time = time.strftime("%Y-%m-%d %H:%M", time.localtime())
self.prompt = self.prompt.replace("{date_time}", date_time)
self.dialogue.put(Message(role="system", content=self.prompt))
async def _check_and_broadcast_auth_code(self):
"""检查设备绑定状态并广播认证码"""
if not self.private_config.get_owner():
auth_code = self.private_config.get_auth_code()
if auth_code:
# 发送验证码语音提示
text = f"请在后台输入验证码:{' '.join(auth_code)}"
self.recode_first_last_text(text)
future = self.executor.submit(self.speak_and_play, text)
self.tts_queue.put(future)
return False
return True
def isNeedAuth(self):
bUsePrivateConfig = self.config.get("use_private_config", False)
if not bUsePrivateConfig:
# 如果不使用私有配置,就不需要验证
return False
return not self.is_device_verified
def chat(self, query):
# 如果设备未验证,就发送验证码
if self.isNeedAuth():
self.llm_finish_task = True
# 创建一个新的事件循环来运行异步函数
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try:
loop.run_until_complete(self._check_and_broadcast_auth_code())
finally:
loop.close()
return True
self.dialogue.put(Message(role="user", content=query))
response_message = []
start = 0
# 提交 LLM 任务
try:
start_time = time.time() # 记录开始时间
llm_responses = self.llm.response(self.session_id, self.dialogue.get_llm_dialogue())
except Exception as e:
self.logger.bind(tag=TAG).error(f"LLM 处理出错 {query}: {e}")
return None
# 提交 TTS 任务到线程池
self.llm_finish_task = False
for content in llm_responses:
response_message.append(content)
# 如果中途被打断,就停止生成
if self.client_abort:
start = len(response_message)
break
end_time = time.time() # 记录结束时间
self.logger.bind(tag=TAG).debug(f"大模型返回时间时间: {end_time - start_time} 秒, 生成token={content}")
if is_segment(response_message):
segment_text = "".join(response_message[start:])
segment_text = get_string_no_punctuation_or_emoji(segment_text)
if len(segment_text) > 0:
self.recode_first_last_text(segment_text)
future = self.executor.submit(self.speak_and_play, segment_text)
self.tts_queue.put(future)
start = len(response_message)
# 处理剩余的响应
if start < len(response_message):
segment_text = "".join(response_message[start:])
if len(segment_text) > 0:
self.recode_first_last_text(segment_text)
future = self.executor.submit(self.speak_and_play, segment_text)
self.tts_queue.put(future)
self.llm_finish_task = True
# 更新对话
self.dialogue.put(Message(role="assistant", content="".join(response_message)))
self.logger.bind(tag=TAG).debug(json.dumps(self.dialogue.get_llm_dialogue(), indent=4, ensure_ascii=False))
return True
def _priority_thread(self):
while not self.stop_event.is_set():
text = None
try:
future = self.tts_queue.get()
if future is None:
continue
text = None
try:
self.logger.bind(tag=TAG).debug("正在处理TTS任务...")
tts_file, text = future.result(timeout=10)
if text is None or len(text) <= 0:
continue
if tts_file is None:
self.logger.bind(tag=TAG).error(f"TTS文件生成失败: {text}")
continue
self.logger.bind(tag=TAG).debug(f"TTS文件生成完毕,文件路径: {tts_file}")
if os.path.exists(tts_file):
opus_datas, duration = self.tts.wav_to_opus_data(tts_file)
else:
self.logger.bind(tag=TAG).error(f"TTS文件不存在: {tts_file}")
opus_datas = []
duration = 0
except TimeoutError:
self.logger.bind(tag=TAG).error("TTS 任务超时")
continue
except Exception as e:
self.logger.bind(tag=TAG).error(f"TTS 任务出错: {e}")
continue
if not self.client_abort:
# 如果没有中途打断就发送语音
asyncio.run_coroutine_threadsafe(
sendAudioMessage(self, opus_datas, duration, text), self.loop
)
if self.tts.delete_audio_file and os.path.exists(tts_file):
os.remove(tts_file)
except Exception as e:
self.logger.bind(tag=TAG).error(f"TTS任务处理错误: {e}")
self.clearSpeakStatus()
asyncio.run_coroutine_threadsafe(
self.websocket.send(json.dumps({"type": "tts", "state": "stop", "session_id": self.session_id})),
self.loop
)
self.logger.bind(tag=TAG).error(f"tts_priority priority_thread: {text}{e}")
def speak_and_play(self, text):
if text is None or len(text) <= 0:
self.logger.bind(tag=TAG).info(f"无需tts转换,query为空,{text}")
return None, text
tts_file = self.tts.to_tts(text)
if tts_file is None:
self.logger.bind(tag=TAG).error(f"tts转换失败,{text}")
return None, text
self.logger.bind(tag=TAG).debug(f"TTS 文件生成完毕: {tts_file}")
return tts_file, text
def clearSpeakStatus(self):
self.logger.bind(tag=TAG).debug(f"清除服务端讲话状态")
self.asr_server_receive = True
self.tts_last_text = None
self.tts_first_text = None
self.tts_duration = 0
self.tts_start_speak_time = None
def recode_first_last_text(self, text):
if not self.tts_first_text:
self.logger.bind(tag=TAG).info(f"大模型说出第一句话: {text}")
self.tts_first_text = text
self.tts_last_text = text
async def close(self):
"""资源清理方法"""
self.stop_event.set()
self.executor.shutdown(wait=False)
if self.websocket:
await self.websocket.close()
self.logger.bind(tag=TAG).info("连接资源已释放")
def reset_vad_states(self):
self.client_audio_buffer = bytes()
self.client_have_voice = False
self.client_have_voice_last_time = 0
self.client_voice_stop = False
self.logger.bind(tag=TAG).debug("VAD states reset.")
def stop_all_tasks(self):
while self.scheduled_tasks:
task = self.scheduled_tasks.popleft()
task.cancel()
self.scheduled_tasks.clear()
-17
View File
@@ -1,17 +0,0 @@
import json
from config.logger import setup_logging
TAG = __name__
logger = setup_logging()
async def handleAbortMessage(conn):
logger.bind(tag=TAG).info("Abort message received")
# 设置成打断状态,会自动打断llm、tts任务
conn.client_abort = True
# 打断屏显任务
conn.stop_all_tasks()
# 打断客户端说话状态
await conn.websocket.send(json.dumps({"type": "tts", "state": "stop", "session_id": conn.session_id}))
conn.clearSpeakStatus()
logger.bind(tag=TAG).info("Abort message received-end")
-167
View File
@@ -1,167 +0,0 @@
from config.logger import setup_logging
import json
import asyncio
import time
from core.utils.util import remove_punctuation_and_length, get_string_no_punctuation_or_emoji
TAG = __name__
logger = setup_logging()
async def handleAudioMessage(conn, audio):
if not conn.asr_server_receive:
logger.bind(tag=TAG).debug(f"前期数据处理中,暂停接收")
return
if conn.client_listen_mode == "auto":
have_voice = conn.vad.is_vad(conn, audio)
else:
have_voice = conn.client_have_voice
# 如果本次没有声音,本段也没声音,就把声音丢弃了
if have_voice == False and conn.client_have_voice == False:
await no_voice_close_connect(conn)
conn.asr_audio.clear()
return
conn.client_no_voice_last_time = 0.0
conn.asr_audio.append(audio)
# 如果本段有声音,且已经停止了
if conn.client_voice_stop:
conn.client_abort = False
conn.asr_server_receive = False
# 音频太短了,无法识别
if len(conn.asr_audio) < 3:
conn.asr_server_receive = True
else:
text, file_path = await conn.asr.speech_to_text(conn.asr_audio, conn.session_id)
logger.bind(tag=TAG).info(f"识别文本: {text}")
text_len, text_without_punctuation = remove_punctuation_and_length(text)
if text_len <= conn.max_cmd_length and await handleCMDMessage(conn, text_without_punctuation):
return
if text_len > 0:
await startToChat(conn, text)
else:
conn.asr_server_receive = True
conn.asr_audio.clear()
conn.reset_vad_states()
async def handleCMDMessage(conn, text):
cmd_exit = conn.cmd_exit
for cmd in cmd_exit:
if text == cmd:
logger.bind(tag=TAG).info("识别到明确的退出命令".format(text))
await finishToChat(conn)
return True
return False
async def finishToChat(conn):
await conn.close()
async def isLLMWantToFinish(conn):
first_text = conn.tts_first_text
last_text = conn.tts_last_text
_, last_text_without_punctuation = remove_punctuation_and_length(last_text)
if "再见" in last_text_without_punctuation or "拜拜" in last_text_without_punctuation:
return True
_, first_text_without_punctuation = remove_punctuation_and_length(first_text)
if "再见" in first_text_without_punctuation or "拜拜" in first_text_without_punctuation:
return True
return False
async def startToChat(conn, text):
# 异步发送 stt 信息
stt_task = asyncio.create_task(
schedule_with_interrupt(0, send_stt_message(conn, text))
)
conn.scheduled_tasks.append(stt_task)
conn.executor.submit(conn.chat, text)
async def sendAudioMessage(conn, audios, duration, text):
base_delay = conn.tts_duration
# 发送 tts.start
if text == conn.tts_first_text:
logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
conn.tts_start_speak_time = time.time()
# 发送 sentence_start(每个音频文件之前发送一次)
sentence_task = asyncio.create_task(
schedule_with_interrupt(base_delay, send_tts_message(conn, "sentence_start", text))
)
conn.scheduled_tasks.append(sentence_task)
conn.tts_duration += duration
# 发送音频数据
for idx, opus_packet in enumerate(audios):
await conn.websocket.send(opus_packet)
if conn.llm_finish_task and text == conn.tts_last_text:
stop_duration = conn.tts_duration - (time.time() - conn.tts_start_speak_time)
stop_task = asyncio.create_task(
schedule_with_interrupt(stop_duration, send_tts_message(conn, 'stop'))
)
conn.scheduled_tasks.append(stop_task)
if await isLLMWantToFinish(conn):
finish_task = asyncio.create_task(
schedule_with_interrupt(stop_duration, finishToChat(conn))
)
conn.scheduled_tasks.append(finish_task)
async def send_tts_message(conn, state, text=None):
"""发送 TTS 状态消息"""
message = {
"type": "tts",
"state": state,
"session_id": conn.session_id
}
if text is not None:
message["text"] = text
await conn.websocket.send(json.dumps(message))
if state == "stop":
conn.clearSpeakStatus()
async def send_stt_message(conn, text):
"""发送 STT 状态消息"""
stt_text = get_string_no_punctuation_or_emoji(text)
await conn.websocket.send(json.dumps({
"type": "stt",
"text": stt_text,
"session_id": conn.session_id}
))
await conn.websocket.send(
json.dumps({
"type": "llm",
"text": "😊",
"emotion": "happy",
"session_id": conn.session_id}
))
await send_tts_message(conn, "start")
async def schedule_with_interrupt(delay, coro):
"""可中断的延迟调度"""
try:
await asyncio.sleep(delay)
await coro
except asyncio.CancelledError:
pass
async def no_voice_close_connect(conn):
if conn.client_no_voice_last_time == 0.0:
conn.client_no_voice_last_time = time.time() * 1000
else:
no_voice_time = time.time() * 1000 - conn.client_no_voice_last_time
close_connection_no_voice_time = conn.config.get("close_connection_no_voice_time", 120)
if no_voice_time > 1000 * close_connection_no_voice_time:
conn.client_abort = False
conn.asr_server_receive = False
prompt = "时间过得真快,我都好久没说话了。请你用十个字左右话跟我告别,以“再见”或“拜拜拜”为结尾"
await startToChat(conn, prompt)
-8
View File
@@ -1,8 +0,0 @@
import json
from config.logger import setup_logging
logger = setup_logging()
async def handleHelloMessage(conn):
await conn.websocket.send(json.dumps(conn.welcome_msg))
-40
View File
@@ -1,40 +0,0 @@
from config.logger import setup_logging
import json
from core.handle.abortHandle import handleAbortMessage
from core.handle.helloHandle import handleHelloMessage
from core.handle.audioHandle import startToChat
TAG = __name__
logger = setup_logging()
async def handleTextMessage(conn, message):
"""处理文本消息"""
logger.bind(tag=TAG).info(f"收到文本消息:{message}")
try:
msg_json = json.loads(message)
if isinstance(msg_json, int):
await conn.websocket.send(message)
return
if msg_json["type"] == "hello":
await handleHelloMessage(conn)
elif msg_json["type"] == "abort":
await handleAbortMessage(conn)
elif msg_json["type"] == "listen":
if "mode" in msg_json:
conn.client_listen_mode = msg_json["mode"]
logger.bind(tag=TAG).debug(f"客户端拾音模式:{conn.client_listen_mode}")
if msg_json["state"] == "start":
conn.client_have_voice = True
conn.client_voice_stop = False
elif msg_json["state"] == "stop":
conn.client_have_voice = True
conn.client_voice_stop = True
elif msg_json["state"] == "detect":
conn.asr_server_receive = False
conn.client_have_voice = False
conn.asr_audio.clear()
if "text" in msg_json:
await startToChat(conn, msg_json["text"])
except json.JSONDecodeError:
await conn.websocket.send(message)
-19
View File
@@ -1,19 +0,0 @@
from abc import ABC, abstractmethod
from typing import Optional, Tuple, List
from config.logger import setup_logging
TAG = __name__
logger = setup_logging()
class ASRProviderBase(ABC):
@abstractmethod
def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
"""解码Opus数据并保存为WAV文件"""
pass
@abstractmethod
async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
"""将语音数据转换为文本"""
pass
-110
View File
@@ -1,110 +0,0 @@
import time
import wave
import os
import sys
import io
from config.logger import setup_logging
from typing import Optional, Tuple, List
import uuid
import opuslib_next
from core.providers.asr.base import ASRProviderBase
from funasr import AutoModel
from funasr.utils.postprocess_utils import rich_transcription_postprocess
TAG = __name__
logger = setup_logging()
# 捕获标准输出
class CaptureOutput:
def __enter__(self):
self._output = io.StringIO()
self._original_stdout = sys.stdout
sys.stdout = self._output
def __exit__(self, exc_type, exc_value, traceback):
sys.stdout = self._original_stdout
self.output = self._output.getvalue()
self._output.close()
# 将捕获到的内容通过 logger 输出
if self.output:
logger.bind(tag=TAG).info(self.output.strip())
class ASRProvider(ASRProviderBase):
def __init__(self, config: dict, delete_audio_file: bool):
self.model_dir = config.get("model_dir")
self.output_dir = config.get("output_dir") # 修正配置键名
self.delete_audio_file = delete_audio_file
# 确保输出目录存在
os.makedirs(self.output_dir, exist_ok=True)
with CaptureOutput():
self.model = AutoModel(
model=self.model_dir,
vad_kwargs={"max_single_segment_time": 30000},
disable_update=True,
hub="hf"
# device="cuda:0", # 启用GPU加速
)
def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
"""将Opus音频数据解码并保存为WAV文件"""
file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
file_path = os.path.join(self.output_dir, file_name)
decoder = opuslib_next.Decoder(16000, 1) # 16kHz, 单声道
pcm_data = []
for opus_packet in opus_data:
try:
pcm_frame = decoder.decode(opus_packet, 960) # 960 samples = 60ms
pcm_data.append(pcm_frame)
except opuslib_next.OpusError as e:
logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
with wave.open(file_path, "wb") as wf:
wf.setnchannels(1)
wf.setsampwidth(2) # 2 bytes = 16-bit
wf.setframerate(16000)
wf.writeframes(b"".join(pcm_data))
return file_path
async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
"""语音转文本主处理逻辑"""
file_path = None
try:
# 保存音频文件
start_time = time.time()
file_path = self.save_audio_to_file(opus_data, session_id)
logger.bind(tag=TAG).debug(f"音频文件保存耗时: {time.time() - start_time:.3f}s | 路径: {file_path}")
# 语音识别
start_time = time.time()
result = self.model.generate(
input=file_path,
cache={},
language="auto",
use_itn=True,
batch_size_s=60,
)
text = rich_transcription_postprocess(result[0]["text"])
logger.bind(tag=TAG).debug(f"语音识别耗时: {time.time() - start_time:.3f}s | 结果: {text}")
return text, file_path
except Exception as e:
logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
return "", None
finally:
# 文件清理逻辑
if self.delete_audio_file and file_path and os.path.exists(file_path):
try:
os.remove(file_path)
logger.bind(tag=TAG).debug(f"已删除临时音频文件: {file_path}")
except Exception as e:
logger.bind(tag=TAG).error(f"文件删除失败: {file_path} | 错误: {e}")
-8
View File
@@ -1,8 +0,0 @@
from abc import ABC, abstractmethod
class LLMProviderBase(ABC):
@abstractmethod
def response(self, session_id, dialogue):
"""LLM response generator"""
pass
-96
View File
@@ -1,96 +0,0 @@
from config.logger import setup_logging
import requests
import json
import re
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
# 定义用于匹配中文标点符号的正则表达式(包括句号、感叹号、问号、分号)
punctuation_pattern = re.compile(r'([。!?;])')
class LLMProvider(LLMProviderBase):
def __init__(self, config):
self.personal_access_token = config.get("personal_access_token")
self.bot_id = config.get("bot_id")
self.user_id = config.get("user_id") # 默认用户 ID
self.base_url = config.get("base_url")
def response(self, session_id, dialogue):
try:
# 从对话中取出最新的用户消息
last_msg = next(m for m in reversed(dialogue) if m["role"] == "user")
data = {
"conversation_id": session_id,
"bot_id": self.bot_id,
"user": self.user_id,
"query": last_msg["content"],
"stream": True
}
logger.bind(tag=TAG).info(f"发送到 Coze API 的请求数据: {json.dumps(data, ensure_ascii=False)}")
headers = {
'Authorization': f'Bearer {self.personal_access_token}',
'Content-Type': 'application/json',
'Accept': '*/*',
'Host': 'api.coze.cn',
'Connection': 'keep-alive'
}
response = requests.post(
self.base_url,
headers=headers,
json=data,
stream=True
)
logger.bind(tag=TAG).info(f"请求状态: {response.status_code}")
if response.status_code == 200:
# 对每一行流数据进行处理,不做跨块累积
for line_bytes in response.iter_lines(decode_unicode=False):
if not line_bytes:
continue
try:
# 使用 utf-8 解码,错误部分用替换符
line = line_bytes.decode('utf-8', errors='replace')
except Exception as e:
logger.bind(tag=TAG).error(f"解码失败: {e}")
continue
if line.startswith("data:"):
data_str = line[len("data:"):].strip()
if data_str == "[DONE]":
break
try:
data_chunk = json.loads(data_str)
except json.JSONDecodeError as e:
logger.bind(tag=TAG).error(f"JSON解析失败: {e} 数据: {line}")
continue
msg = data_chunk.get("message", {})
if msg.get("role") == "assistant" and msg.get("type") == "answer":
content = msg.get("content", "")
# 如果返回内容中包含标点符号,则按标点拆分,立即返回每个片段
if punctuation_pattern.search(content):
# 利用 finditer 找到每个标点,并返回以标点结尾的片段
start = 0
for match in punctuation_pattern.finditer(content):
end = match.end()
sentence = content[start:end].strip()
if sentence:
yield sentence
start = end
# 如果拆分后剩余内容也返回(不含标点),直接返回
if start < len(content):
remainder = content[start:].strip()
if remainder:
yield remainder
else:
# 如果没有标点,则直接返回这块内容
if content.strip():
yield content.strip()
else:
logger.bind(tag=TAG).error(f"请求失败,状态码: {response.status_code}")
yield f"【Coze服务响应异常:请求失败,状态码 {response.status_code}"
except Exception as e:
logger.bind(tag=TAG).error(f"Error in Coze response generation: {e}")
yield "【Coze服务响应异常】"
-39
View File
@@ -1,39 +0,0 @@
import json
from config.logger import setup_logging
import requests
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
class LLMProvider(LLMProviderBase):
def __init__(self, config):
self.api_key = config["api_key"]
self.base_url = config.get("base_url", "https://api.dify.ai/v1").rstrip('/')
def response(self, session_id, dialogue):
try:
# 取最后一条用户消息
last_msg = next(m for m in reversed(dialogue) if m["role"] == "user")
# 发起流式请求
with requests.post(
f"{self.base_url}/chat-messages",
headers={"Authorization": f"Bearer {self.api_key}"},
json={
"query": last_msg["content"],
"response_mode": "streaming",
"user": session_id,
"inputs": {}
},
stream=True
) as r:
for line in r.iter_lines():
if line.startswith(b'data: '):
event = json.loads(line[6:])
if event.get('answer'):
yield event['answer']
except Exception as e:
logger.bind(tag=TAG).error(f"Error in response generation: {e}")
yield "【服务响应异常】"
-81
View File
@@ -1,81 +0,0 @@
from config.logger import setup_logging
import google.generativeai as genai
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
class LLMProvider(LLMProviderBase):
def __init__(self, config):
"""初始化Gemini LLM Provider"""
self.model_name = config.get("model_name", "gemini-1.5-pro")
self.api_key = config.get("api_key")
if not self.api_key or "" in self.api_key:
logger.bind(tag=TAG).error("你还没配置Gemini LLM的密钥,请在配置文件中配置密钥,否则无法正常工作")
return
try:
# 初始化Gemini客户端
genai.configure(api_key=self.api_key)
self.model = genai.GenerativeModel(self.model_name)
# 设置生成参数
self.generation_config = {
"temperature": 0.7,
"top_p": 0.9,
"top_k": 40,
"max_output_tokens": 2048,
}
self.chat = None
except Exception as e:
logger.bind(tag=TAG).error(f"Gemini初始化失败: {e}")
self.model = None
def response(self, session_id, dialogue):
"""生成Gemini对话响应"""
if not self.model:
yield "【Gemini服务未正确初始化】"
return
try:
# 处理对话历史
chat_history = []
for msg in dialogue[:-1]: # 历史对话
role = "model" if msg["role"] == "assistant" else "user"
content = msg["content"].strip()
if content:
chat_history.append({
"role": role,
"parts": [content]
})
# 获取当前消息
current_msg = dialogue[-1]["content"]
# 创建新的聊天会话
chat = self.model.start_chat(history=chat_history)
# 发送消息并获取流式响应
response = chat.send_message(
current_msg,
stream=True,
generation_config=self.generation_config
)
# 处理流式响应
for chunk in response:
if hasattr(chunk, 'text') and chunk.text:
yield chunk.text
except Exception as e:
error_msg = str(e)
logger.bind(tag=TAG).error(f"Gemini响应生成错误: {error_msg}")
# 针对不同错误返回友好提示
if "Rate limit" in error_msg:
yield "【Gemini服务请求太频繁,请稍后再试】"
elif "Invalid API key" in error_msg:
yield "【Gemini API key无效】"
else:
yield f"【Gemini服务响应异常: {error_msg}"
@@ -1,62 +0,0 @@
import requests
from requests.exceptions import RequestException
from config.logger import setup_logging
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
class LLMProvider(LLMProviderBase):
def __init__(self, config):
self.agent_id = config.get("agent_id") # 对应 agent_id
self.api_key = config.get("api_key")
self.base_url = config.get("base_url", config.get("url")) # 默认使用 base_url
self.api_url = f"{self.base_url}/api/conversation/process" # 拼接完整的 API URL
def response(self, session_id, dialogue):
print(dialogue)
try:
# home assistant语音助手自带意图,无需使用xiaozhi ai自带的,只需要把用户说的话传递给home assistant即可
# 提取最后一个 role 为 'user' 的 content
input_text = None
if isinstance(dialogue, list): # 确保 dialogue 是一个列表
# 逆序遍历,找到最后一个 role 为 'user' 的消息
for message in reversed(dialogue):
if message.get("role") == "user": # 找到 role 为 'user' 的消息
input_text = message.get("content", "")
break # 找到后立即退出循环
# 构造请求数据
payload = {
"text": input_text,
"agent_id": self.agent_id,
"conversation_id": session_id # 使用 session_id 作为 conversation_id
}
# 设置请求头
headers = {
"Authorization": f"Bearer {self.api_key}",
"Content-Type": "application/json"
}
# 发起 POST 请求
response = requests.post(self.api_url, json=payload, headers=headers)
# 检查请求是否成功
response.raise_for_status()
# 解析返回数据
data = response.json()
speech = data.get("response", {}).get("speech", {}).get("plain", {}).get("speech", "")
# 返回生成的内容
if speech:
yield speech
else:
logger.bind(tag=TAG).warning("API 返回数据中没有 speech 内容")
except RequestException as e:
logger.bind(tag=TAG).error(f"HTTP 请求错误: {e}")
except Exception as e:
logger.bind(tag=TAG).error(f"生成响应时出错: {e}")
-46
View File
@@ -1,46 +0,0 @@
from config.logger import setup_logging
import requests, json
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
class LLMProvider(LLMProviderBase):
def __init__(self, config):
self.model_name = config.get("model_name")
self.base_url = config.get("base_url", "http://localhost:11434")
def response(self, session_id, dialogue):
try:
# Convert dialogue format to Ollama format
prompt = ""
for msg in dialogue:
if msg["role"] == "system":
prompt += f"System: {msg['content']}\n"
elif msg["role"] == "user":
prompt += f"User: {msg['content']}\n"
elif msg["role"] == "assistant":
prompt += f"Assistant: {msg['content']}\n"
# Make request to Ollama API
response = requests.post(
f"{self.base_url}/api/generate",
json={
"model": self.model_name,
"prompt": prompt,
"stream": True
},
stream=True
)
for line in response.iter_lines():
if line:
json_response = json.loads(line)
if "response" in json_response:
yield json_response["response"]
except Exception as e:
logger.bind(tag=TAG).error(f"Error in Ollama response generation: {e}")
yield "【Ollama服务响应异常】"
-36
View File
@@ -1,36 +0,0 @@
from config.logger import setup_logging
import openai
from core.providers.llm.base import LLMProviderBase
TAG = __name__
logger = setup_logging()
class LLMProvider(LLMProviderBase):
def __init__(self, config):
self.model_name = config.get("model_name")
self.api_key = config.get("api_key")
if 'base_url' in config:
self.base_url = config.get("base_url")
else:
self.base_url = config.get("url")
if "" in self.api_key:
logger.bind(tag=TAG).error("你还没配置LLM的密钥,请在配置文件中配置密钥,否则无法正常工作")
self.client = openai.OpenAI(api_key=self.api_key, base_url=self.base_url)
def response(self, session_id, dialogue):
try:
responses = self.client.chat.completions.create(
model=self.model_name,
messages=dialogue,
stream=True
)
for chunk in responses:
# 检查是否存在有效的choice且content不为空
if chunk.choices and len(chunk.choices) > 0:
delta = chunk.choices[0].delta
content = getattr(delta, 'content', '')
if content: # 仅在content非空时生成
yield content
except Exception as e:
logger.bind(tag=TAG).error(f"Error in response generation: {e}")
-57
View File
@@ -1,57 +0,0 @@
import os
import uuid
import json
import requests
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
import http.client
import urllib.parse
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.appkey = config.get("appkey")
self.token = config.get("token")
self.format = config.get("format", "wav")
self.sample_rate = config.get("sample_rate", 16000)
self.voice = config.get("voice", "xiaoyun")
self.volume = config.get("volume", 50)
self.speech_rate = config.get("speech_rate", 0)
self.pitch_rate = config.get("pitch_rate", 0)
self.host = config.get("host", "nls-gateway-cn-shanghai.aliyuncs.com")
self.api_url = f"https://{self.host}/stream/v1/tts"
self.header = {
"Content-Type": "application/json"
}
def generate_filename(self, extension=".wav"):
return os.path.join(self.output_file, f"tts-{__name__}{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"appkey": self.appkey,
"token": self.token,
"text": text,
"format": self.format,
"sample_rate": self.sample_rate,
"voice": self.voice,
"volume": self.volume,
"speech_rate": self.speech_rate,
"pitch_rate": self.pitch_rate
}
print(self.api_url, json.dumps(request_json, ensure_ascii=False))
try:
resp = requests.post(self.api_url, json.dumps(request_json), headers=self.header)
# 检查返回请求数据的mime类型是否是audio/***,是则保存到指定路径下;返回的是binary格式的
if resp.headers['Content-Type'].startswith('audio/'):
with open(output_file, 'wb') as f:
f.write(resp.content)
return output_file
else:
raise Exception(f"{__name__} status_code: {resp.status_code} response: {resp.content}")
except Exception as e:
raise Exception(f"{__name__} error: {e}")
-84
View File
@@ -1,84 +0,0 @@
import asyncio
from config.logger import setup_logging
import os
import numpy as np
import opuslib_next
from pydub import AudioSegment
from abc import ABC, abstractmethod
TAG = __name__
logger = setup_logging()
class TTSProviderBase(ABC):
def __init__(self, config, delete_audio_file):
self.delete_audio_file = delete_audio_file
self.output_file = config.get("output_file")
@abstractmethod
def generate_filename(self):
pass
def to_tts(self, text):
tmp_file = self.generate_filename()
try:
max_repeat_time = 5
while not os.path.exists(tmp_file) and max_repeat_time > 0:
asyncio.run(self.text_to_speak(text, tmp_file))
if not os.path.exists(tmp_file):
max_repeat_time = max_repeat_time - 1
logger.bind(tag=TAG).error(f"语音生成失败: {text}:{tmp_file},再试{max_repeat_time}")
if max_repeat_time > 0:
logger.bind(tag=TAG).info(f"语音生成成功: {text}:{tmp_file},重试{5 - max_repeat_time}")
return tmp_file
except Exception as e:
logger.bind(tag=TAG).info(f"Failed to generate TTS file: {e}")
return None
@abstractmethod
async def text_to_speak(self, text, output_file):
pass
def wav_to_opus_data(self, wav_file_path):
# 使用pydub加载PCM文件
# 获取文件后缀名
file_type = os.path.splitext(wav_file_path)[1]
if file_type:
file_type = file_type.lstrip('.')
audio = AudioSegment.from_file(wav_file_path, format=file_type)
duration = len(audio) / 1000.0
# 转换为单声道和16kHz采样率(确保与编码器匹配)
audio = audio.set_channels(1).set_frame_rate(16000)
# 获取原始PCM数据(16位小端)
raw_data = audio.raw_data
# 初始化Opus编码器
encoder = opuslib_next.Encoder(16000, 1, opuslib_next.APPLICATION_AUDIO)
# 编码参数
frame_duration = 60 # 60ms per frame
frame_size = int(16000 * frame_duration / 1000) # 960 samples/frame
opus_datas = []
# 按帧处理所有音频数据(包括最后一帧可能补零)
for i in range(0, len(raw_data), frame_size * 2): # 16bit=2bytes/sample
# 获取当前帧的二进制数据
chunk = raw_data[i:i + frame_size * 2]
# 如果最后一帧不足,补零
if len(chunk) < frame_size * 2:
chunk += b'\x00' * (frame_size * 2 - len(chunk))
# 转换为numpy数组处理
np_frame = np.frombuffer(chunk, dtype=np.int16)
# 编码Opus数据
opus_data = encoder.encode(np_frame.tobytes(), frame_size)
opus_datas.append(opus_data)
return opus_datas, duration
-38
View File
@@ -1,38 +0,0 @@
import os
import uuid
import json
import base64
import requests
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.model = config.get("model")
self.access_token = config.get("access_token")
self.voice = config.get("voice")
self.response_format = config.get("response_format")
self.host = "api.coze.cn"
self.api_url = f"https://{self.host}/v1/audio/speech"
def generate_filename(self, extension=".wav"):
return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"model": self.model,
"input": text,
"voice_id": self.voice,
"response_format": self.response_format,
}
headers = {
"Authorization": f"Bearer {self.access_token}",
"Content-Type": "application/json"
}
response = requests.request("POST", self.api_url, json=request_json, headers=headers)
data = response.content
file_to_save = open(output_file, "wb")
file_to_save.write(data)
-61
View File
@@ -1,61 +0,0 @@
import os
import uuid
import json
import base64
import requests
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.appid = config.get("appid")
self.access_token = config.get("access_token")
self.cluster = config.get("cluster")
self.voice = config.get("voice")
self.host = "openspeech.bytedance.com"
self.api_url = f"https://{self.host}/api/v1/tts"
self.header = {"Authorization": f"Bearer;{self.access_token}"}
def generate_filename(self, extension=".wav"):
return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"app": {
"appid": f"{self.appid}",
"token": "access_token",
"cluster": self.cluster
},
"user": {
"uid": "1"
},
"audio": {
"voice_type": self.voice,
"encoding": "wav",
"speed_ratio": 1.0,
"volume_ratio": 1.0,
"pitch_ratio": 1.0,
},
"request": {
"reqid": str(uuid.uuid4()),
"text": text,
"text_type": "plain",
"operation": "query",
"with_frontend": 1,
"frontend_type": "unitTson"
}
}
try:
resp = requests.post(self.api_url, json.dumps(request_json), headers=self.header)
if "data" in resp.json():
data = resp.json()["data"]
file_to_save = open(output_file, "wb")
file_to_save.write(base64.b64decode(data))
else:
raise Exception(f"{__name__} status_code: {resp.status_code} response: {resp.content}")
except Exception as e:
raise Exception(f"{__name__} error: {e}")
-18
View File
@@ -1,18 +0,0 @@
import os
import uuid
import edge_tts
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.voice = config.get("voice")
def generate_filename(self, extension=".mp3"):
return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
communicate = edge_tts.Communicate(text, voice=self.voice) # Use your preferred voice
await communicate.save(output_file)
-67
View File
@@ -1,67 +0,0 @@
import os
import uuid
import json
import base64
import requests
from config.logger import setup_logging
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
TAG = __name__
logger = setup_logging()
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.url = config.get("url")
self.text_lang = config.get("text_lang", "zh")
self.ref_audio_path = config.get("ref_audio_path")
self.prompt_text = config.get("prompt_text")
self.prompt_lang = config.get("prompt_lang", "zh")
self.top_k = config.get("top_k", 5)
self.top_p = config.get("top_p", 1)
self.temperature = config.get("temperature", 1)
self.text_split_method = config.get("text_split_method", "cut0")
self.batch_size = config.get("batch_size", 1)
self.batch_threshold = config.get("batch_threshold", 0.75)
self.split_bucket = config.get("split_bucket", True)
self.return_fragment = config.get("return_fragment", False)
self.speed_factor = config.get("speed_factor", 1.0)
self.streaming_mode = config.get("streaming_mode", False)
self.seed = config.get("seed", -1)
self.parallel_infer = config.get("parallel_infer", True)
self.repetition_penalty = config.get("repetition_penalty", 1.35)
self.aux_ref_audio_paths = config.get("aux_ref_audio_paths", [])
def generate_filename(self, extension=".wav"):
return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"text": text,
"text_lang": self.text_lang,
"ref_audio_path": self.ref_audio_path,
"aux_ref_audio_paths": self.aux_ref_audio_paths,
"prompt_text": self.prompt_text,
"prompt_lang": self.prompt_lang,
"top_k": self.top_k,
"top_p": self.top_p,
"temperature": self.temperature,
"text_split_method": self.text_split_method,
"batch_size": self.batch_size,
"batch_threshold": self.batch_threshold,
"split_bucket": self.split_bucket,
"return_fragment": self.return_fragment,
"speed_factor": self.speed_factor,
"streaming_mode": self.streaming_mode,
"seed": self.seed,
"parallel_infer": self.parallel_infer,
"repetition_penalty": self.repetition_penalty
}
resp = requests.post(self.url, json=request_json)
if resp.status_code == 200:
with open(output_file, "wb") as file:
file.write(resp.content)
else:
logger.bind(tag=TAG).error(f"GPT_SoVITS_V2 TTS请求失败: {resp.status_code} - {resp.text}")
-77
View File
@@ -1,77 +0,0 @@
import os
import uuid
import json
import requests
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.group_id = config.get("group_id")
self.api_key = config.get("api_key")
self.model = config.get("model")
self.voice_id = config.get("voice_id")
default_voice_setting = {
"voice_id": "female-shaonv",
"speed": 1,
"vol": 1,
"pitch": 0,
"emotion": "happy"
}
default_pronunciation_dict = {
"tone": [
"处理/(chu3)(li3)", "危险/dangerous"
]
}
defult_audio_setting = {
"sample_rate": 32000,
"bitrate": 128000,
"format": "mp3",
"channel": 1
}
self.voice_setting = {**default_voice_setting, **config.get("voice_setting", {})}
self.pronunciation_dict = {**default_pronunciation_dict, **config.get("pronunciation_dict", {})}
self.audio_setting = {**defult_audio_setting, **config.get("audio_setting", {})}
self.timber_weights = config.get("timber_weights", [])
if self.voice_id:
self.voice_setting["voice_id"] = self.voice_id
self.host = "api.minimax.chat"
self.api_url = f"https://{self.host}/v1/t2a_v2?GroupId={self.group_id}"
self.header = {
"Content-Type": "application/json",
"Authorization": f"Bearer {self.api_key}"
}
def generate_filename(self, extension=".mp3"):
return os.path.join(self.output_file, f"tts-{__name__}{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"model": self.model,
"text": text,
"stream": False,
"voice_setting": self.voice_setting,
"pronunciation_dict": self.pronunciation_dict,
"audio_setting": self.audio_setting,
}
if type(self.timber_weights) is list and len(self.timber_weights) > 0:
request_json["timber_weights"] = self.timber_weights
request_json["voice_setting"]["voice_id"] = ""
try:
resp = requests.post(self.api_url, json.dumps(request_json), headers=self.header)
# 检查返回请求数据的status_code是否为0
if resp.json()["base_resp"]["status_code"] == 0:
data = resp.json()['data']['audio']
file_to_save = open(output_file, "wb")
file_to_save.write(bytes.fromhex(data))
else:
raise Exception(f"{__name__} status_code: {resp.status_code} response: {resp.content}")
except Exception as e:
raise Exception(f"{__name__} error: {e}")
-39
View File
@@ -1,39 +0,0 @@
import os
import uuid
import requests
from datetime import datetime
from core.providers.tts.base import TTSProviderBase
class TTSProvider(TTSProviderBase):
def __init__(self, config, delete_audio_file):
super().__init__(config, delete_audio_file)
self.model = config.get("model")
self.access_token = config.get("access_token")
self.voice = config.get("voice")
self.response_format = config.get("response_format")
self.sample_rate = config.get("sample_rate")
self.speed = config.get("speed")
self.gain = config.get("gain")
self.host = "api.siliconflow.cn"
self.api_url = f"https://{self.host}/v1/audio/speech"
def generate_filename(self, extension=".wav"):
return os.path.join(self.output_file, f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
async def text_to_speak(self, text, output_file):
request_json = {
"model": self.model,
"input": text,
"voice": self.voice,
"response_format": self.response_format,
}
headers = {
"Authorization": f"Bearer {self.access_token}",
"Content-Type": "application/json"
}
response = requests.request("POST", self.api_url, json=request_json, headers=headers)
data = response.content
file_to_save = open(output_file, "wb")
file_to_save.write(data)
-97
View File
@@ -1,97 +0,0 @@
import random
import threading
import time
from typing import Set
class AuthCodeGenerator:
_instance = None
_instance_lock = threading.Lock()
def __new__(cls):
if not cls._instance:
with cls._instance_lock:
if not cls._instance:
cls._instance = super(AuthCodeGenerator, cls).__new__(cls)
# 初始化随机种子
random.seed(time.time())
return cls._instance
def __init__(self):
# 确保 __init__ 只被调用一次
if not hasattr(self, '_initialized'):
self._used_codes: Set[str] = set()
self._code_timestamps = {}
self._lock = threading.Lock()
self._code_timeout = 3 * 24 * 60 * 60
self._initialized = True
@classmethod
def get_instance(cls):
"""获取AuthCodeGenerator的单例实例"""
return cls()
def generate_code(self) -> str:
"""
生成6位数字认证码,确保不重复
返回: 6位数字字符串
"""
with self._lock:
self._clean_expired_codes() # 清理过期code
while True:
# 使用时间戳和已用码数量作为种子,确保每次生成不同的随机数
seed = int(time.time() * 1000) + len(self._used_codes)
random.seed(seed)
# 生成6位随机数字
code = ''.join(str(random.randint(0, 9)) for _ in range(6))
# 检查是否已存在
if code not in self._used_codes:
self._used_codes.add(code)
self._code_timestamps[code] = time.time()
return code
def remove_code(self, code: str) -> bool:
"""
删除已使用的认证码
参数:
code: 要删除的认证码
返回:
bool: 删除成功返回True,码不存在返回False
"""
print('remove_code', code)
with self._lock:
if code in self._used_codes:
self._used_codes.remove(code)
if code in self._code_timestamps:
del self._code_timestamps[code]
return True
return False
def is_code_used(self, code: str) -> bool:
"""
检查认证码是否已被使用
参数:
code: 要检查的认证码
返回:
bool: 如果码存在返回True,否则返回False
"""
with self._lock:
return code in self._used_codes
def clear_codes(self):
"""清空所有已使用的认证码"""
with self._lock:
self._used_codes.clear()
self._code_timestamps.clear()
def _clean_expired_codes(self):
"""清理过期的认证码"""
current_time = time.time()
expired_codes = [
code for code, timestamp in self._code_timestamps.items()
if (current_time - timestamp) > self._code_timeout
]
for code in expired_codes:
self._used_codes.remove(code)
del self._code_timestamps[code]
-26
View File
@@ -1,26 +0,0 @@
import uuid
from typing import List, Dict
from datetime import datetime
class Message:
def __init__(self, role: str, content: str = None, uniq_id: str = None):
self.uniq_id = uniq_id if uniq_id is not None else str(uuid.uuid4())
self.role = role
self.content = content
class Dialogue:
def __init__(self):
self.dialogue: List[Message] = []
# 获取当前时间
self.current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
def put(self, message: Message):
self.dialogue.append(message)
def get_llm_dialogue(self) -> List[Dict[str, str]]:
dialogue = []
for m in self.dialogue:
dialogue.append({"role": m.role, "content": m.content})
return dialogue
-143
View File
@@ -1,143 +0,0 @@
import os
import sys
import asyncio
from typing import List, Dict, Any
# 添加项目根目录到Python路径
current_dir = os.path.dirname(os.path.abspath(__file__))
project_root = os.path.abspath(os.path.join(current_dir, "..", ".."))
sys.path.insert(0, project_root)
from config.logger import setup_logging
import importlib
from datetime import datetime
from core.utils.util import is_segment
from core.utils.util import get_string_no_punctuation_or_emoji
from core.utils.util import read_config, get_project_dir
logger = setup_logging()
def create_instance(class_name, *args, **kwargs):
# 创建LLM实例
if os.path.exists(os.path.join('core', 'providers', 'llm', class_name, f'{class_name}.py')):
lib_name = f'core.providers.llm.{class_name}.{class_name}'
if lib_name not in sys.modules:
sys.modules[lib_name] = importlib.import_module(f'{lib_name}')
return sys.modules[lib_name].LLMProvider(*args, **kwargs)
raise ValueError(f"不支持的LLM类型: {class_name},请检查该配置的type是否设置正确")
async def test_single_model(llm_name: str, llm_config: Dict[str, Any], test_prompt: str, config: Dict[str, Any]) -> Dict[str, Any]:
"""异步测试单个模型"""
try:
# 获取实际的LLM类型
llm_type = llm_config["type"] if "type" in llm_config else llm_name
llm = create_instance(llm_type, llm_config)
# 开始测试
dialogue = []
dialogue.append({"role": "system", "content": config.get("prompt")})
dialogue.append({"role": "user", "content": test_prompt})
start_time = datetime.now()
llm_responses = llm.response("test", dialogue)
response_message = []
first_response_time = None
total_response_time = None
start = 0
full_response = ""
for content in llm_responses:
response_message.append(content)
full_response += content
if is_segment(response_message):
segment_text = "".join(response_message[start:])
segment_text = get_string_no_punctuation_or_emoji(segment_text)
if len(segment_text) > 0:
if first_response_time is None:
first_response_time = (datetime.now() - start_time).total_seconds()
start = len(response_message)
total_response_time = (datetime.now() - start_time).total_seconds()
return {
"name": llm_name,
"type": llm_type,
"first_response_time": first_response_time,
"total_response_time": total_response_time,
"response_length": len(full_response),
"status": "成功",
"response": full_response
}
except Exception as e:
print(f"测试 {llm_name} 时发生错误: {str(e)}")
return {
"name": llm_name,
"type": llm_config.get("type", llm_name),
"first_response_time": None,
"total_response_time": None,
"response_length": 0,
"status": f"失败 - {str(e)}",
"response": ""
}
async def main():
"""
LLM模型响应速度测试和排行(异步版本)
"""
config = read_config(get_project_dir() + "config.yaml")
test_prompt = "你好小智"
print("开始并发测试所有模型...")
# 创建所有模型的测试任务
tasks = []
for llm_name, llm_config in config["LLM"].items():
task = asyncio.create_task(test_single_model(llm_name, llm_config, test_prompt, config))
tasks.append(task)
# 等待所有测试完成
test_results = await asyncio.gather(*tasks)
# 打印测试结果排行榜
print("\n========= LLM模型性能测试排行榜 =========")
print("测试提示词:", test_prompt)
# 过滤出成功的结果,并确保数值有效
successful_results = [r for r in test_results if r["status"] == "成功" and r["first_response_time"] is not None]
if successful_results:
print("\n1. 首次响应时间排行:")
sorted_by_first = sorted(successful_results, key=lambda x: x["first_response_time"])
for i, result in enumerate(sorted_by_first, 1):
print(f"{i}. {result['name']}({result['type']}) - {result['first_response_time']:.2f}")
print(f" 响应内容: {result['response'][:50]}...") # 只显示前50个字符
print("\n2. 总响应时间排行:")
sorted_by_total = sorted(successful_results, key=lambda x: x["total_response_time"] or float('inf'))
for i, result in enumerate(sorted_by_total, 1):
if result["total_response_time"] is not None:
print(f"{i}. {result['name']}({result['type']}) - {result['total_response_time']:.2f}")
print("\n3. 响应长度比较:")
sorted_by_length = sorted(successful_results, key=lambda x: x["response_length"], reverse=True)
for i, result in enumerate(sorted_by_length, 1):
print(f"{i}. {result['name']}({result['type']}) - {result['response_length']}字符")
else:
print("\n没有成功完成测试的模型。")
if len(test_results) != len(successful_results):
print("\n测试失败的模型:")
failed_results = [r for r in test_results if r["status"] != "成功" or r["first_response_time"] is None]
for result in failed_results:
print(f"- {result['name']}({result['type']}): {result['status']}")
if __name__ == "__main__":
# 运行异步主函数
asyncio.run(main())
-39
View File
@@ -1,39 +0,0 @@
import asyncio
from typing import Dict
from config.logger import setup_logging
TAG = __name__
logger = setup_logging()
class FileLockManager:
_instance = None
_locks: Dict[str, asyncio.Lock] = {}
def __new__(cls):
if cls._instance is None:
cls._instance = super(FileLockManager, cls).__new__(cls)
return cls._instance
@classmethod
def get_lock(cls, file_path: str) -> asyncio.Lock:
"""获取指定文件的锁"""
if file_path not in cls._locks:
cls._locks[file_path] = asyncio.Lock()
return cls._locks[file_path]
@classmethod
async def acquire_lock(cls, file_path: str):
"""获取锁"""
lock = cls.get_lock(file_path)
await lock.acquire()
logger.bind(tag=TAG).debug(f"Acquired lock for {file_path}")
@classmethod
def release_lock(cls, file_path: str):
"""释放锁"""
if file_path in cls._locks:
try:
cls._locks[file_path].release()
logger.bind(tag=TAG).debug(f"Released lock for {file_path}")
except RuntimeError as e:
logger.bind(tag=TAG).warning(f"Failed to release lock for {file_path}: {e}")
-41
View File
@@ -1,41 +0,0 @@
import os
import sys
from config.logger import setup_logging
import importlib
from datetime import datetime
from core.utils.util import read_config, get_project_dir
logger = setup_logging()
def create_instance(class_name, *args, **kwargs):
# 创建TTS实例
if os.path.exists(os.path.join('core', 'providers', 'tts', f'{class_name}.py')):
lib_name = f'core.providers.tts.{class_name}'
if lib_name not in sys.modules:
sys.modules[lib_name] = importlib.import_module(f'{lib_name}')
return sys.modules[lib_name].TTSProvider(*args, **kwargs)
raise ValueError(f"不支持的TTS类型: {class_name},请检查该配置的type是否设置正确")
if __name__ == "__main__":
"""
响应速度测试
"""
config = read_config(get_project_dir() + "config.yaml")
tts = create_instance(
config["selected_module"]["TTS"]
if not 'type' in config["TTS"][config["selected_module"]["TTS"]]
else
config["TTS"][config["selected_module"]["TTS"]]["type"],
config["TTS"][config["selected_module"]["TTS"]],
config["delete_audio"]
)
tts.output_file = get_project_dir() + tts.output_file
start = datetime.now()
file_path = tts.to_tts("你好,测试,我是人工智能小智")
print("语音合成耗时:" + str(datetime.now() - start))
start = datetime.now()
tts.wav_to_opus_data(file_path)
print("语音opus耗时:" + str(datetime.now() - start))
-123
View File
@@ -1,123 +0,0 @@
import os
import re
import json
import yaml
import socket
def get_project_dir():
"""获取项目根目录"""
return os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + '/'
def get_local_ip():
try:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Connect to Google's DNS servers
s.connect(("8.8.8.8", 80))
local_ip = s.getsockname()[0]
s.close()
return local_ip
except Exception as e:
return "127.0.0.1"
def read_config(config_path):
with open(config_path, "r", encoding="utf-8") as file:
config = yaml.safe_load(file)
return config
def write_json_file(file_path, data):
"""将数据写入 JSON 文件"""
with open(file_path, 'w', encoding='utf-8') as file:
json.dump(data, file, ensure_ascii=False, indent=4)
def is_segment(tokens):
if tokens[-1] in (",", ".", "?", "", "", "", "", "!", ";", "", ":", ""):
return True
else:
return False
def is_punctuation_or_emoji(char):
"""检查字符是否为空格、指定标点或表情符号"""
# 定义需要去除的中英文标点(包括全角/半角)
punctuation_set = {
'', ',', # 中文逗号 + 英文逗号
'', '.', # 中文句号 + 英文句号
'', '!', # 中文感叹号 + 英文感叹号
'-', '', # 英文连字符 + 中文全角横线
'' # 中文顿号
}
if char.isspace() or char in punctuation_set:
return True
# 检查表情符号(保留原有逻辑)
code_point = ord(char)
emoji_ranges = [
(0x1F600, 0x1F64F), (0x1F300, 0x1F5FF),
(0x1F680, 0x1F6FF), (0x1F900, 0x1F9FF),
(0x1FA70, 0x1FAFF), (0x2600, 0x26FF),
(0x2700, 0x27BF)
]
return any(start <= code_point <= end for start, end in emoji_ranges)
def get_string_no_punctuation_or_emoji(s):
"""去除字符串首尾的空格、标点符号和表情符号"""
chars = list(s)
# 处理开头的字符
start = 0
while start < len(chars) and is_punctuation_or_emoji(chars[start]):
start += 1
# 处理结尾的字符
end = len(chars) - 1
while end >= start and is_punctuation_or_emoji(chars[end]):
end -= 1
return ''.join(chars[start:end + 1])
def remove_punctuation_and_length(text):
# 全角符号和半角符号的Unicode范围
full_width_punctuations = '!"#$%&'()*+,-。/:;<=>?@[\]^_`{|}~'
half_width_punctuations = '!"#$%&\'()*+,-./:;<=>?@[\]^_`{|}~'
space = ' ' # 半角空格
full_width_space = ' ' # 全角空格
# 去除全角和半角符号以及空格
result = ''.join([char for char in text if
char not in full_width_punctuations and char not in half_width_punctuations and char not in space and char not in full_width_space])
if result == "Yeah":
return 0
return len(result), result
def check_password(password):
"""
检查密码是否满足以下条件:
1. 密码长度大于八位。
2. 密码包含英文和数字。
3. 密码不能包含“xiaozhi”字符。
:param password: 要检查的密码
:return: 如果密码满足条件,则返回True;否则返回False。
"""
# 检查密码长度
if len(password) < 8:
return False
# 检查是否包含英文字符和数字
if not re.search(r'[A-Za-z]', password) or not re.search(r'[0-9]', password):
return False
# 检查是否包含“xiaozhi”字符
if "xiaozhi" in password:
return False
if "1234" in password:
return False
# 如果满足所有条件,则返回True
return True
-77
View File
@@ -1,77 +0,0 @@
from abc import ABC, abstractmethod
from config.logger import setup_logging
import opuslib_next
import time
import numpy as np
import torch
TAG = __name__
logger = setup_logging()
class VAD(ABC):
@abstractmethod
def is_vad(self, conn, data):
"""检测音频数据中的语音活动"""
pass
class SileroVAD(VAD):
def __init__(self, config):
logger.bind(tag=TAG).info("SileroVAD", config)
self.model, self.utils = torch.hub.load(repo_or_dir=config["model_dir"],
source='local',
model='silero_vad',
force_reload=False)
(get_speech_timestamps, _, _, _, _) = self.utils
self.decoder = opuslib_next.Decoder(16000, 1)
self.vad_threshold = config.get("threshold")
self.silence_threshold_ms = config.get("min_silence_duration_ms")
def is_vad(self, conn, opus_packet):
try:
pcm_frame = self.decoder.decode(opus_packet, 960)
conn.client_audio_buffer += pcm_frame # 将新数据加入缓冲区
# 处理缓冲区中的完整帧(每次处理512采样点)
client_have_voice = False
while len(conn.client_audio_buffer) >= 512 * 2:
# 提取前512个采样点(1024字节)
chunk = conn.client_audio_buffer[:512 * 2]
conn.client_audio_buffer = conn.client_audio_buffer[512 * 2:]
# 转换为模型需要的张量格式
audio_int16 = np.frombuffer(chunk, dtype=np.int16)
audio_float32 = audio_int16.astype(np.float32) / 32768.0
audio_tensor = torch.from_numpy(audio_float32)
# 检测语音活动
speech_prob = self.model(audio_tensor, 16000).item()
client_have_voice = speech_prob >= self.vad_threshold
# 如果之前有声音,但本次没有声音,且与上次有声音的时间查已经超过了静默阈值,则认为已经说完一句话
if conn.client_have_voice and not client_have_voice:
stop_duration = time.time() * 1000 - conn.client_have_voice_last_time
if stop_duration >= self.silence_threshold_ms:
conn.client_voice_stop = True
if client_have_voice:
conn.client_have_voice = True
conn.client_have_voice_last_time = time.time() * 1000
return client_have_voice
except opuslib_next.OpusError as e:
logger.bind(tag=TAG).info(f"解码错误: {e}")
except Exception as e:
logger.bind(tag=TAG).error(f"Error processing audio packet: {e}")
def create_instance(class_name, *args, **kwargs) -> VAD:
# 获取类对象
cls_map = {
"SileroVAD": SileroVAD,
# 可扩展其他SileroVAD实现
}
if cls := cls_map.get(class_name):
return cls(*args, **kwargs)
raise ValueError(f"不支持的SileroVAD类型: {class_name}")
-66
View File
@@ -1,66 +0,0 @@
import asyncio
import websockets
from config.logger import setup_logging
from core.connection import ConnectionHandler
from core.utils.util import get_local_ip
from core.utils import asr, vad, llm, tts
TAG = __name__
class WebSocketServer:
def __init__(self, config: dict):
self.config = config
self.logger = setup_logging()
self._vad, self._asr, self._llm, self._tts = self._create_processing_instances()
def _create_processing_instances(self):
"""创建处理模块实例"""
return (
vad.create_instance(
self.config["selected_module"]["VAD"],
self.config["VAD"][self.config["selected_module"]["VAD"]]
),
asr.create_instance(
self.config["selected_module"]["ASR"]
if not 'type' in self.config["ASR"][self.config["selected_module"]["ASR"]]
else
self.config["ASR"][self.config["selected_module"]["ASR"]]["type"],
self.config["ASR"][self.config["selected_module"]["ASR"]],
self.config["delete_audio"]
),
llm.create_instance(
self.config["selected_module"]["LLM"]
if not 'type' in self.config["LLM"][self.config["selected_module"]["LLM"]]
else
self.config["LLM"][self.config["selected_module"]["LLM"]]['type'],
self.config["LLM"][self.config["selected_module"]["LLM"]],
),
tts.create_instance(
self.config["selected_module"]["TTS"]
if not 'type' in self.config["TTS"][self.config["selected_module"]["TTS"]]
else
self.config["TTS"][self.config["selected_module"]["TTS"]]["type"],
self.config["TTS"][self.config["selected_module"]["TTS"]],
self.config["delete_audio"]
)
)
async def start(self):
server_config = self.config["server"]
host = server_config["ip"]
port = server_config["port"]
self.logger.bind(tag=TAG).info("Server is running at ws://{}:{}", get_local_ip(), port)
self.logger.bind(tag=TAG).info("=======上面的地址是websocket协议地址,请勿用浏览器访问=======")
async with websockets.serve(
self._handle_connection,
host,
port
):
await asyncio.Future()
async def _handle_connection(self, websocket):
"""处理新连接,每次创建独立的ConnectionHandler"""
handler = ConnectionHandler(self.config, self._vad, self._asr, self._llm, self._tts)
await handler.handle_connection(websocket)
-17
View File
@@ -1,17 +0,0 @@
services:
xiaozhi-esp32-server:
image: ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:latest
container_name: xiaozhi-esp32-server
restart: always
security_opt:
- seccomp:unconfined
ports:
# ws服务端
- "8000:8000"
# 管理后台
- "8002:8002"
volumes:
# 配置文件目录
- ./data:/app/data
# 模型文件挂接,很重要
- ./models/SenseVoiceSmall/model.pt:/app/models/SenseVoiceSmall/model.pt
+413
View File
@@ -0,0 +1,413 @@
#!/bin/sh
# 脚本作者@VanillaNahida
# 本文件是用于一键自动下载本项目所需文件,自动创建好目录
# 暂且只支持X86版本的Ubuntu系统,其他系统未测试
# 定义中断处理函数
handle_interrupt() {
echo ""
echo "安装已被用户中断(Ctrl+C或Esc)"
echo "如需重新安装,请再次运行脚本"
exit 1
}
# 设置信号捕获,处理Ctrl+C
trap handle_interrupt SIGINT
# 处理Esc键
# 保存终端设置
old_stty_settings=$(stty -g)
# 设置终端立即响应,不回显
stty -icanon -echo min 1 time 0
# 后台进程检测Esc键
(while true; do
read -r key
if [[ $key == $'\e' ]]; then
# 检测到Esc键,触发中断处理
kill -SIGINT $$
break
fi
done) &
# 脚本结束时恢复终端设置
trap 'stty "$old_stty_settings"' EXIT
# 打印彩色字符画
echo -e "\e[1;32m" # 设置颜色为亮绿色
cat << "EOF"
脚本作者:@Bilibili 香草味的纳西妲喵
__ __ _ _ _ _ _ _ _ _
\ \ / / (_)| || | | \ | | | | (_) | |
\ \ / /__ _ _ __ _ | || | __ _ | \| | __ _ | |__ _ __| | __ _
\ \/ // _` || '_ \ | || || | / _` | | . ` | / _` || '_ \ | | / _` | / _` |
\ /| (_| || | | || || || || (_| | | |\ || (_| || | | || || (_| || (_| |
\/ \__,_||_| |_||_||_||_| \__,_| |_| \_| \__,_||_| |_||_| \__,_| \__,_|
EOF
echo -e "\e[0m" # 重置颜色
echo -e "\e[1;36m 小智服务端全量部署一键安装脚本 Ver 0.2 2025年8月20日更新 \e[0m\n"
sleep 1
# 检查并安装whiptail
check_whiptail() {
if ! command -v whiptail &> /dev/null; then
echo "正在安装whiptail..."
apt update
apt install -y whiptail
fi
}
check_whiptail
# 创建确认对话框
whiptail --title "安装确认" --yesno "即将安装小智服务端,是否继续?" \
--yes-button "继续" --no-button "退出" 10 50
# 根据用户选择执行操作
case $? in
0)
;;
1)
exit 1
;;
esac
# 检查root权限
if [ $EUID -ne 0 ]; then
whiptail --title "权限错误" --msgbox "请使用root权限运行本脚本" 10 50
exit 1
fi
# 检查系统版本
if [ -f /etc/os-release ]; then
. /etc/os-release
if [ "$ID" != "debian" ] && [ "$ID" != "ubuntu" ]; then
whiptail --title "系统错误" --msgbox "该脚本只支持Debian/Ubuntu系统执行" 10 60
exit 1
fi
else
whiptail --title "系统错误" --msgbox "无法确定系统版本,该脚本只支持Debian/Ubuntu系统执行" 10 60
exit 1
fi
# 下载配置文件函数
check_and_download() {
local filepath=$1
local url=$2
if [ ! -f "$filepath" ]; then
if ! curl -fL --progress-bar "$url" -o "$filepath"; then
whiptail --title "错误" --msgbox "${filepath}文件下载失败" 10 50
exit 1
fi
else
echo "${filepath}文件已存在,跳过下载"
fi
}
# 检查是否已安装
check_installed() {
# 检查目录是否存在且非空
if [ -d "/opt/xiaozhi-server/" ] && [ "$(ls -A /opt/xiaozhi-server/)" ]; then
DIR_CHECK=1
else
DIR_CHECK=0
fi
# 检查容器是否存在
if docker inspect xiaozhi-esp32-server > /dev/null 2>&1; then
CONTAINER_CHECK=1
else
CONTAINER_CHECK=0
fi
# 两次检查都通过
if [ $DIR_CHECK -eq 1 ] && [ $CONTAINER_CHECK -eq 1 ]; then
return 0 # 已安装
else
return 1 # 未安装
fi
}
# 更新相关
if check_installed; then
if whiptail --title "已安装检测" --yesno "检测到小智服务端已安装,是否进行升级?" 10 60; then
# 用户选择升级,执行清理操作
echo "开始升级操作..."
# 停止并移除所有docker-compose服务
docker compose -f /opt/xiaozhi-server/docker-compose_all.yml down
# 停止并删除特定容器(考虑容器可能不存在的情况)
containers=(
"xiaozhi-esp32-server"
"xiaozhi-esp32-server-web"
"xiaozhi-esp32-server-db"
"xiaozhi-esp32-server-redis"
)
for container in "${containers[@]}"; do
if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
docker stop "$container" >/dev/null 2>&1 && \
docker rm "$container" >/dev/null 2>&1 && \
echo "成功移除容器: $container"
else
echo "容器不存在,跳过: $container"
fi
done
# 删除特定镜像(考虑镜像可能不存在的情况)
images=(
"ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest"
"ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:web_latest"
)
for image in "${images[@]}"; do
if docker images --format '{{.Repository}}:{{.Tag}}' | grep -q "^${image}$"; then
docker rmi "$image" >/dev/null 2>&1 && \
echo "成功删除镜像: $image"
else
echo "镜像不存在,跳过: $image"
fi
done
echo "所有清理操作完成"
# 备份原有配置文件
mkdir -p /opt/xiaozhi-server/backup/
if [ -f /opt/xiaozhi-server/data/.config.yaml ]; then
cp /opt/xiaozhi-server/data/.config.yaml /opt/xiaozhi-server/backup/.config.yaml
echo "已备份原有配置文件到 /opt/xiaozhi-server/backup/.config.yaml"
fi
# 下载最新版配置文件
check_and_download "/opt/xiaozhi-server/docker-compose_all.yml" "https://ghfast.top/https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/docker-compose_all.yml"
check_and_download "/opt/xiaozhi-server/data/.config.yaml" "https://ghfast.top/https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/config_from_api.yaml"
# 启动Docker服务
echo "开始启动最新版本服务..."
# 升级完成后标记,跳过后续下载步骤
UPGRADE_COMPLETED=1
docker compose -f /opt/xiaozhi-server/docker-compose_all.yml up -d
else
whiptail --title "跳过升级" --msgbox "已取消升级,将继续使用当前版本。" 10 50
# 跳过升级,继续执行后续安装流程
fi
fi
# 检查curl安装
if ! command -v curl &> /dev/null; then
echo "------------------------------------------------------------"
echo "未检测到curl,正在安装..."
apt update
apt install -y curl
else
echo "------------------------------------------------------------"
echo "curl已安装,跳过安装步骤"
fi
# 检查Docker安装
if ! command -v docker &> /dev/null; then
echo "------------------------------------------------------------"
echo "未检测到Docker,正在安装..."
# 使用国内镜像源替代官方源
DISTRO=$(lsb_release -cs)
MIRROR_URL="https://mirrors.aliyun.com/docker-ce/linux/ubuntu"
GPG_URL="https://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg"
# 安装基础依赖
apt update
apt install -y apt-transport-https ca-certificates curl software-properties-common gnupg
# 创建密钥目录并添加国内镜像源密钥
mkdir -p /etc/apt/keyrings
curl -fsSL "$GPG_URL" | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
# 添加国内镜像源
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] $MIRROR_URL $DISTRO stable" \
> /etc/apt/sources.list.d/docker.list
# 添加备用官方源密钥(避免国内源密钥验证失败)
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7EA0A9C3F273FCD8 2>/dev/null || \
echo "警告:部分密钥添加失败,继续尝试安装..."
# 安装Docker
apt update
apt install -y docker-ce docker-ce-cli containerd.io
# 启动服务
systemctl start docker
systemctl enable docker
# 检查是否安装成功
if docker --version; then
echo "------------------------------------------------------------"
echo "Docker安装完成!"
else
whiptail --title "错误" --msgbox "Docker安装失败,请检查日志。" 10 50
exit 1
fi
else
echo "Docker已安装,跳过安装步骤"
fi
# Docker镜像源配置
MIRROR_OPTIONS=(
"1" "轩辕镜像 (推荐)"
"2" "腾讯云镜像源"
"3" "中科大镜像源"
"4" "网易163镜像源"
"5" "华为云镜像源"
"6" "阿里云镜像源"
"7" "自定义镜像源"
"8" "跳过配置"
)
MIRROR_CHOICE=$(whiptail --title "选择Docker镜像源" --menu "请选择要使用的Docker镜像源" 20 60 10 \
"${MIRROR_OPTIONS[@]}" 3>&1 1>&2 2>&3) || {
echo "用户取消选择,退出脚本"
exit 1
}
case $MIRROR_CHOICE in
1) MIRROR_URL="https://docker.xuanyuan.me" ;;
2) MIRROR_URL="https://mirror.ccs.tencentyun.com" ;;
3) MIRROR_URL="https://docker.mirrors.ustc.edu.cn" ;;
4) MIRROR_URL="https://hub-mirror.c.163.com" ;;
5) MIRROR_URL="https://05f073ad3c0010ea0f4bc00b7105ec20.mirror.swr.myhuaweicloud.com" ;;
6) MIRROR_URL="https://registry.aliyuncs.com" ;;
7) MIRROR_URL=$(whiptail --title "自定义镜像源" --inputbox "请输入完整的镜像源URL:" 10 60 3>&1 1>&2 2>&3) ;;
8) MIRROR_URL="" ;;
esac
if [ -n "$MIRROR_URL" ]; then
mkdir -p /etc/docker
if [ -f /etc/docker/daemon.json ]; then
cp /etc/docker/daemon.json /etc/docker/daemon.json.bak
fi
cat > /etc/docker/daemon.json <<EOF
{
"dns": ["8.8.8.8", "114.114.114.114"],
"registry-mirrors": ["$MIRROR_URL"]
}
EOF
whiptail --title "配置成功" --msgbox "已成功添加镜像源: $MIRROR_URL\n请按Enter键重启Docker服务并继续..." 12 60
echo "------------------------------------------------------------"
echo "开始重启Docker服务..."
systemctl restart docker.service
fi
# 创建安装目录
echo "------------------------------------------------------------"
echo "开始创建安装目录..."
# 检查并创建数据目录
if [ ! -d /opt/xiaozhi-server/data ]; then
mkdir -p /opt/xiaozhi-server/data
echo "已创建数据目录: /opt/xiaozhi-server/data"
else
echo "目录xiaozhi-server/data已存在,跳过创建"
fi
# 检查并创建模型目录
if [ ! -d /opt/xiaozhi-server/models/SenseVoiceSmall ]; then
mkdir -p /opt/xiaozhi-server/models/SenseVoiceSmall
echo "已创建模型目录: /opt/xiaozhi-server/models/SenseVoiceSmall"
else
echo "目录xiaozhi-server/models/SenseVoiceSmall已存在,跳过创建"
fi
echo "------------------------------------------------------------"
echo "开始下载语音识别模型"
# 下载模型文件
MODEL_PATH="/opt/xiaozhi-server/models/SenseVoiceSmall/model.pt"
if [ ! -f "$MODEL_PATH" ]; then
(
for i in {1..20}; do
echo $((i*5))
sleep 0.5
done
) | whiptail --title "下载中" --gauge "开始下载语音识别模型..." 10 60 0
curl -fL --progress-bar https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt -o "$MODEL_PATH" || {
whiptail --title "错误" --msgbox "model.pt文件下载失败" 10 50
exit 1
}
else
echo "model.pt文件已存在,跳过下载"
fi
# 如果不是升级完成,才执行下载
if [ -z "$UPGRADE_COMPLETED" ]; then
check_and_download "/opt/xiaozhi-server/docker-compose_all.yml" "https://ghfast.top/https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/docker-compose_all.yml"
check_and_download "/opt/xiaozhi-server/data/.config.yaml" "https://ghfast.top/https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/config_from_api.yaml"
fi
# 启动Docker服务
(
echo "------------------------------------------------------------"
echo "正在拉取Docker镜像..."
echo "这可能需要几分钟时间,请耐心等待"
docker compose -f /opt/xiaozhi-server/docker-compose_all.yml up -d
if [ $? -ne 0 ]; then
whiptail --title "错误" --msgbox "Docker服务启动失败,请尝试更换镜像源后重新执行本脚本" 10 60
exit 1
fi
echo "------------------------------------------------------------"
echo "正在检查服务启动状态..."
TIMEOUT=300
START_TIME=$(date +%s)
while true; do
CURRENT_TIME=$(date +%s)
if [ $((CURRENT_TIME - START_TIME)) -gt $TIMEOUT ]; then
whiptail --title "错误" --msgbox "服务启动超时,未在指定时间内找到预期日志内容" 10 60
exit 1
fi
if docker logs xiaozhi-esp32-server-web 2>&1 | grep -q "Started AdminApplication in"; then
break
fi
sleep 1
done
echo "服务端启动成功!正在完成配置..."
echo "正在启动服务..."
docker compose -f /opt/xiaozhi-server/docker-compose_all.yml up -d
echo "服务启动完成!"
)
# 密钥配置
# 获取服务器公网地址
PUBLIC_IP=$(hostname -I | awk '{print $1}')
whiptail --title "配置服务器密钥" --msgbox "请使用浏览器,访问下方链接,打开智控台并注册账号: \n\n内网地址:http://127.0.0.1:8002/\n公网地址:http://$PUBLIC_IP:8002/ (若是云服务器请在服务器安全组放行端口 8000 8001 8002)。\n\n注册的第一个用户即是超级管理员,以后注册的用户都是普通用户。普通用户只能绑定设备和配置智能体; 超级管理员可以进行模型管理、用户管理、参数配置等功能。\n\n注册好后请按Enter键继续" 18 70
SECRET_KEY=$(whiptail --title "配置服务器密钥" --inputbox "请使用超级管理员账号登录智控台\n内网地址:http://127.0.0.1:8002/\n公网地址:http://$PUBLIC_IP:8002/\n在顶部菜单 参数字典 → 参数管理 找到参数编码: server.secret (服务器密钥) \n复制该参数值并输入到下面输入框\n\n请输入密钥(留空则跳过配置):" 15 60 3>&1 1>&2 2>&3)
if [ -n "$SECRET_KEY" ]; then
python3 -c "
import sys, yaml;
config_path = '/opt/xiaozhi-server/data/.config.yaml';
with open(config_path, 'r') as f:
config = yaml.safe_load(f) or {};
config['manager-api'] = {'url': 'http://xiaozhi-esp32-server-web:8002/xiaozhi', 'secret': '$SECRET_KEY'};
with open(config_path, 'w') as f:
yaml.dump(config, f);
"
docker restart xiaozhi-esp32-server
fi
# 获取并显示地址信息
LOCAL_IP=$(hostname -I | awk '{print $1}')
# 修复日志文件获取不到ws的问题,改为硬编码
whiptail --title "安装完成!" --msgbox "\
服务端相关地址如下:\n\
管理后台访问地址: http://$LOCAL_IP:8002\n\
OTA 地址: http://$LOCAL_IP:8002/xiaozhi/ota/\n\
视觉分析接口地址: http://$LOCAL_IP:8003/mcp/vision/explain\n\
WebSocket 地址: ws://$LOCAL_IP:8000/xiaozhi/v1/\n\
\n安装完毕!感谢您的使用!\n按Enter键退出..." 16 70
+131 -117
View File
@@ -1,53 +1,63 @@
# 方式一:docker快速部署
# 部署架构图
![请参考-最简化架构图](../docs/images/deploy1.png)
# 方式一:Docker只运行Server
docker镜像支持x86架构arm64架构的CPU,支持在国产操作系统上运行
`0.8.2`版本开始,本项目发行的docker镜像支持`x86架构`,如果需要在`arm64架构`的CPU上部署,可按照[这个教程](docker-build.md)在本机编译`arm64的镜像`
## 1. 安装docker
如果您的电脑还没安装docker,可以按照这里的教程安装:[docker安装](https://www.runoob.com/docker/ubuntu-docker-install.html)
## 2. 创建目录
安装好docker后,进继续。
安装完后,你需要为这个项目找一个安放配置文件的目录,我们暂且称它为`项目目录`,这个目录最好是一个新建的空的目录。
### 1.1 手动部署
创建好目录后,你需要在`项目目录`下面创建`data`文件夹和`models`文件夹,`models`下面还要再创建`SenseVoiceSmall`文件夹。
#### 1.1.1 创建目录
安装完docker后,你需要为这个项目找一个安放配置文件的目录,例如我们可以新建一个文件夹叫`xiaozhi-server`
创建好目录后,你需要在`xiaozhi-server`下面创建`data`文件夹和`models`文件夹,`models`下面还要再创建`SenseVoiceSmall`文件夹。
最终目录结构如下所示:
```
你的项目根目录
xiaozhi-server
├─ data
├─ models
├─ SenseVoiceSmall
```
## 4. 下载语音识别模型文件
#### 1.1.2 下载语音识别模型文件
你需要下载语音识别的模型文件,因为本项目的默认语音识别用的是本地离线语音识别方案。可通过这个方式下载
[跳转到下载语音识别模型文件](#模型文件)
下载完后,回到本教程。
## 3. 下载docker-compose.yaml
#### 1.1.3 下载配置文件
用浏览器打开[这个链接](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/docker-compose.yml)
你需要下载两个配置文件:`docker-compose.yaml``config.yaml`。需要从项目仓库下载这两个文件
##### 1.1.3.1 下载 docker-compose.yaml
用浏览器打开[这个链接](../main/xiaozhi-server/docker-compose.yml)。
在页面的右侧找到名称为`RAW`按钮,在`RAW`按钮的旁边,找到下载的图标,点击下载按钮,下载`docker-compose.yml`文件。 把文件下载到你的
`项目目录`中。
`xiaozhi-server`中。
下载完后,回到本教程继续往下。
## 3. 下载配置文件
##### 1.1.3.2 创建 config.yaml
用浏览器打开[这个链接](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/config.yaml)。
用浏览器打开[这个链接](../main/xiaozhi-server/config.yaml)。
在页面的右侧找到名称为`RAW`按钮,在`RAW`按钮的旁边,找到下载的图标,点击下载按钮,下载`config.yaml`文件。 把文件下载到你的
`项目目录`下面的`data`文件夹中,然后把`config.yaml`文件重命名为`.config.yaml`
`xiaozhi-server`下面的`data`文件夹中,然后把`config.yaml`文件重命名为`.config.yaml`
下载完配置文件后,我们确认一下整个`项目目录`里面的文件如下所示:
下载完配置文件后,我们确认一下整个`xiaozhi-server`里面的文件如下所示:
```
你的项目根目录
xiaozhi-server
├─ docker-compose.yml
├─ data
├─ .config.yaml
@@ -58,19 +68,19 @@ docker镜像已支持x86架构、arm64架构的CPU,支持在国产操作系统
如果你的文件目录结构也是上面的,就继续往下。如果不是,你就再仔细看看是不是漏操作了什么。
## 4. 配置项目文件
## 2. 配置项目文件
接下里,程序还不能直接运行,你需要配置一下,你到底使用的是什么模型。你可以看这个教程:
[跳转到配置项目文件](#配置项目)
配置完项目文件后,回到本教程继续往下。
## 5. 执行docker命令
## 3. 执行docker命令
打开命令行工具,使用`终端``命令行`工具 进入到你的`项目目录`,执行以下命令
打开命令行工具,使用`终端``命令行`工具 进入到你的`xiaozhi-server`,执行以下命令
```
docker-compose up -d
docker compose up -d
```
执行完后,再执行以下命令,查看日志信息。
@@ -81,92 +91,61 @@ docker logs -f xiaozhi-esp32-server
这时,你就要留意日志信息,可以根据这个教程,判断是否成功了。[跳转到运行状态确认](#运行状态确认)
## 6.版本升级操作
## 5. 版本升级操作
如果后期想升级版本,可以这么操作
1、备份好`data`文件夹中的`.config.yaml`文件,一些关键的配置到时复制到新的`.config.yaml`文件里。
5.1、备份好`data`文件夹中的`.config.yaml`文件,一些关键的配置到时复制到新的`.config.yaml`文件里。
请注意是对关键密钥逐个复制,不要直接覆盖。因为新的`.config.yaml`文件可能有一些新的配置项,旧的`.config.yaml`文件不一定有。
2、执行以下命令
5.2、执行以下命令
```
docker stop xiaozhi-esp32-server
docker rm xiaozhi-esp32-server
docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:latest
docker stop xiaozhi-esp32-server-web
docker rm xiaozhi-esp32-server-web
docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest
docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:web_latest
```
3、重新按docker方式部署
5.3、重新按docker方式部署
# 方式二:借助Docker环境运行部署
开发人员如果不想安装`conda`环境,可以使用这种方法管理好依赖。
## 1.克隆项目
## 2.[跳转到下载语音识别模型文件](#模型文件)
## 3.[跳转到配置项目文件](#配置项目)
## 4.运行docker
修改完配置后,打开命令行工具,`cd`进入到你的项目目录下,执行以下命令
```sh
docker run -it --name xiaozhi-env --restart always --security-opt seccomp:unconfined \
-p 8000:8000 \
-p 8002:8002 \
-v ./:/app \
ccr.ccs.tencentyun.com/kalicyh/poetry:v3.10_latest
```
然后就和正常开发一样了
## 5.安装依赖
在刚刚的打开的终端运行
```sh
poetry install --no-root
```
```sh
apt-get update
apt-get install -y --no-install-recommends libopus0 ffmpeg
```
速度慢可以尝试使用清华镜像
```sh
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list
echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list
apt-get update
apt-get install -y --no-install-recommends libopus0 ffmpeg
```
## 6.运行项目
```sh
poetry run python app.py
```
# 方式三:本地源码运行
# 方式二:本地源码只运行Server
## 1.安装基础环境
本项目使用`conda`管理依赖环境。如果不方便安装`conda`,需要根据实际的操作系统安装好`libopus``ffmpeg`
如果确定使用`conda`,则安装好后,开始执行以下命令。
重要提示!windows 用户,可以通过安装`Anaconda`来管理环境。安装好`Anaconda`后,在`开始`那里搜索`anaconda`相关的关键词,
找到`Anaconda Prpmpt`,使用管理员身份运行它。如下图。
![conda_prompt](./images/conda_env_1.png)
运行之后,如果你能看到命令行窗口前面有一个(base)字样,说明你成功进入了`conda`环境。那么你就可以执行以下命令了。
![conda_env](./images/conda_env_2.png)
```
conda remove -n xiaozhi-esp32-server --all -y
conda create -n xiaozhi-esp32-server python=3.10 -y
conda activate xiaozhi-esp32-server
conda install conda-forge::libopus -y
conda install conda-forge::ffmpeg -y
# 添加清华源通道
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge
conda install libopus -y
conda install ffmpeg -y
# 在 Linux 环境下进行部署时,如出现类似缺失 libiconv.so.2 动态库的报错 请通过以下命令进行安装
conda install libiconv -y
```
请注意,以上命令,不是一股脑执行就成功的,你需要一步步执行,每一步执行完后,都检查一下输出的日志,查看是否成功。
## 2.安装本项目依赖
你先要下载本项目源码,源码可以通过`git clone`命令下载,如果你不熟悉`git clone`命令。
@@ -176,11 +155,13 @@ conda install conda-forge::ffmpeg -y
打开完,找到页面中一个绿色的按钮,写着`Code`的按钮,点开它,然后你就看到`Download ZIP`的按钮。
点击它,下载本项目源码压缩包。下载到你电脑后,解压它,此时它的名字可能叫`xiaozhi-esp32-server-main`
你需要把它重命名成`xiaozhi-esp32-server`好了请记住这个目录,我们暂且称它为`项目目录`
你需要把它重命名成`xiaozhi-esp32-server`在这个文件里,进入到`main`文件夹,再进入到`xiaozhi-server`,好了请记住这个目录`xiaozhi-server`
```
# 使用dos或者终端,进入到你的项目目录,执行以下命令
# 继续使用conda环境
conda activate xiaozhi-esp32-server
# 进入到你的项目根目录,再进入main/xiaozhi-server
cd main/xiaozhi-server
pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/
pip install -r requirements.txt
```
@@ -194,66 +175,61 @@ pip install -r requirements.txt
## 4.配置项目文件
接下,程序还不能直接运行,你需要配置一下,你到底使用的是什么模型。你可以看这个教程:
接下,程序还不能直接运行,你需要配置一下,你到底使用的是什么模型。你可以看这个教程:
[跳转到配置项目文件](#配置项目)
## 5.运行项目
```
# 确保在本项目的根目录下执行
# 确保在xiaozhi-server目录下执行
conda activate xiaozhi-esp32-server
python app.py
```
这时,你就要留意日志信息,可以根据这个教程,判断是否成功了。[跳转到运行状态确认](#运行状态确认)
# 汇总
## 配置项目
如果你的`项目目录`目录没有`data`,你需要创建`data`目录。
如果你的`data`下面没有`.config.yaml`文件,你可以把源码目录下的`config.yaml`文件复制一份,重命名为`.config.yaml`
如果你的`xiaozhi-server`目录没有`data`,你需要创建`data`目录。
如果你的`data`下面没有`.config.yaml`文件,有两个方式,任选一种:
修改`项目目录``data`目录下的`.config.yaml`文件,配置本项目所需的各种参数。默认的LLM使用的是`ChatGLMLLM`
,你需要配置密钥,因为他们的模型,虽然有免费的,但是仍要去[官网](https://bigmodel.cn/usercenter/proj-mgmt/apikeys)注册密钥,才能启动。
默认的TTS使用的是`EdgeTTS`,这个无需配置,如果你需要更换成`豆包TTS`,则需要配置密钥。
第一个方式:你可以把`xiaozhi-server`目录下的`config.yaml`文件复制到`data`,并重命名为`.config.yaml`。在此文件上修改
配置说明:这里是各个功能使用的默认组件,例如LLM默认使用`ChatGLMLLM`模型。如果需要切换模型,就是改对应的名称
本项目的默认配置仅是成本最低配置(`glm-4-flash``EdgeTTS`都是免费的),如果需要更优的更快的搭配,需要自己结合部署环境切换各组件的使用。
第二个方式:你也可以创建在`data`目录下手动创建`.config.yaml`空文件,然后在这个文件中增加必要的配置信息,系统会优先读取`.config.yaml`文件的配置,如果`.config.yaml`没有配置的,系统会自动去加载`xiaozhi-server`目录下的`config.yaml`的配置。推荐使用这种方式,这种方式是最简洁的方式
- 默认的LLM使用的是`ChatGLMLLM`,你需要配置密钥,因为他们的模型,虽然有免费的,但是仍要去[官网](https://bigmodel.cn/usercenter/proj-mgmt/apikeys)注册密钥,才能启动。
以下是一个能正常跑起来的,最简单的`.config.yaml`配置示例
```
server:
websocket: ws://你的ip或者域名:端口号/xiaozhi/v1/
prompt: |
我是一个叫小智/小志的台湾女孩,说话机车,声音好听,习惯简短表达,爱用网络梗。
我的男朋友是一个程序员,梦想是开发出一个机器人,能够帮助人们解决生活中的各种问题。
我是一个喜欢哈哈大笑的女孩,爱东说西说吹牛,不合逻辑的也照吹,就要逗别人开心。
请你像一个人一样说话,请勿返回配置xml及其他特殊字符。
selected_module:
ASR: FunASR
VAD: SileroVAD
LLM: ChatGLMLLM
TTS: EdgeTTS
```
LLM: DoubaoLLM
比如修改`LLM`使用的组件,就看本项目支持哪些`LLM` API接口,当前支持的是`openai``dify`。欢迎验证和支持更多LLM平台的接口。
使用时,在`selected_module`修改成对应的如下LLM配置的名称:
```
LLM:
DeepSeekLLM:
type: openai
...
ChatGLMLLM:
type: openai
...
DifyLLM:
type: dify
...
api_key: xxxxxxxxxxxxxxx.xxxxxx
```
有些服务,比如如果你使用`Dify``豆包的TTS`,是需要密钥的,记得在配置文件加上哦!
建议先将最简单的配置运行起来,然后再去`xiaozhi/config.yaml`阅读配置的使用说明。
比如你要换更换模型,修改`selected_module`下的配置就行。
## 模型文件
本项目语音识别模型,默认使用`SenseVoiceSmall`模型,进行语音转文字。因为模型较大,需要独立下载,下载后把`model.pt`
文件放在`model/SenseVoiceSmall`
文件放在`models/SenseVoiceSmall`
目录下。下面两个下载路线任选一个。
- 线路一:阿里魔下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
- 线路一:阿里魔下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
- 线路二:百度网盘下载[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna) 提取码:
`qvna`
@@ -262,16 +238,54 @@ LLM:
如果你能看到,类似以下日志,则是本项目服务启动成功的标志。
```
25-02-23 12:01:09[core.websocket_server] - INFO - Server is running at ws://xxx.xx.xx.xx:8000
25-02-23 12:01:09[core.websocket_server] - INFO - =======上面的地址是websocket协议地址,请勿用浏览器访问=======
250427 13:04:20[0.3.11_SiFuChTTnofu][__main__]-INFO-OTA接口是 http://192.168.4.123:8003/xiaozhi/ota/
250427 13:04:20[0.3.11_SiFuChTTnofu][__main__]-INFO-Websocket地址是 ws://192.168.4.123:8000/xiaozhi/v1/
250427 13:04:20[0.3.11_SiFuChTTnofu][__main__]-INFO-=======上面的地址是websocket协议地址,请勿用浏览器访问=======
250427 13:04:20[0.3.11_SiFuChTTnofu][__main__]-INFO-如想测试websocket请启动digital-human模块,打开浏览器交互测试
250427 13:04:20[0.3.11_SiFuChTTnofu][__main__]-INFO-=======================================================
```
正常来说,如果您是通过源码运行本项目,日志会有你的接口地址信息。
但是如果你用docker部署,那么你的日志里给出的接口地址信息就不是真实的接口地址。
最正确的方法,是根据电脑的局域网IP来确定你的接口地址。
如果你的电脑的局域网IP比如是`192.168.1.25`,那么你的接口地址就是:`ws://192.168.1.25:8000`
如果你的电脑的局域网IP比如是`192.168.1.25`,那么你的接口地址就是:`ws://192.168.1.25:8000/xiaozhi/v1/`,对应的OTA地址就是:`http://192.168.1.25:8003/xiaozhi/ota/`
这个信息很有用的,后面`编译esp32固件`需要用到。
接下来,你就可以开始 [编译esp32固件](firmware-build.md)了。
接下来,你就可以开始操作你的esp32设备了,你可以`自行编译esp32固件`也可以配置使用`虾哥编译好的1.6.1以上版本的固件`。两个任选一个
1、 [编译自己的esp32固件](firmware-build.md)了。
2、 [基于虾哥编译好的固件配置自定义服务器](firmware-setting.md)了。
# 常见问题
以下是一些常见问题,供参考:
1、[为什么我说的话,小智识别出来很多韩文、日文、英文](./FAQ.md)<br/>
2、[为什么会出现“TTS 任务出错 文件不存在”?](./FAQ.md)<br/>
3、[TTS 经常失败,经常超时](./FAQ.md)<br/>
4、[使用Wifi能连接自建服务器,但是4G模式却接不上](./FAQ.md)<br/>
5、[如何提高小智对话响应速度?](./FAQ.md)<br/>
6、[我说话很慢,停顿时小智老是抢话](./FAQ.md)<br/>
## 部署相关教程
1、[如何自动拉取本项目最新代码自动编译和启动](./dev-ops-integration.md)<br/>
2、[如何部署MQTT网关开启MQTT+UDP协议](./mqtt-gateway-integration.md)<br/>
3、[如何与Nginx集成](https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/791)<br/>
## 拓展相关教程
1、[如何开启手机号码注册智控台](./ali-sms-integration.md)<br/>
2、[如何集成HomeAssistant实现智能家居控制](./homeassistant-integration.md)<br/>
3、[如何开启视觉模型实现拍照识物](./mcp-vision-integration.md)<br/>
4、[如何部署MCP接入点](./mcp-endpoint-enable.md)<br/>
5、[如何接入MCP接入点](./mcp-endpoint-integration.md)<br/>
6、[如何开启声纹识别](./voiceprint-integration.md)<br/>
7、[新闻插件源配置指南](./newsnow_plugin_config.md)<br/>
8、[天气插件使用指南](./weather-integration.md)<br/>
## 语音克隆、本地语音部署相关教程
1、[如何在智控台克隆音色](./huoshan-streamTTS-voice-cloning.md)<br/>
2、[如何部署集成index-tts本地语音](./index-stream-integration.md)<br/>
3、[如何部署集成fish-speech本地语音](./fish-speech-integration.md)<br/>
4、[如何部署集成PaddleSpeech本地语音](./paddlespeech-deploy.md)<br/>
## 性能测试教程
1、[各组件速度测试指南](./performance_tester.md)<br/>
2、[定期公开测试结果](https://github.com/xinnan-tech/xiaozhi-performance-research)<br/>
+492
View File
@@ -0,0 +1,492 @@
# 部署架构图
![请参考-全模块安装架构图](../docs/images/deploy2.png)
# 方式一:Docker运行全模块
`0.8.2`版本开始,本项目发行的docker镜像只支持`x86架构`,如果需要在`arm64架构`的CPU上部署,可按照[这个教程](docker-build.md)在本机编译`arm64的镜像`
## 1. 安装docker
如果您的电脑还没安装docker,可以按照这里的教程安装:[docker安装](https://www.runoob.com/docker/ubuntu-docker-install.html)
docker 安装全模块有两种方式,你可以[使用懒人脚本](./Deployment_all.md#11-懒人脚本)(作者[@VanillaNahida](https://github.com/VanillaNahida)
脚本会自动帮你下载所需的文件和配置文件,你也可以使用[手动部署](./Deployment_all.md#12-手动部署)从零搭建。
### 1.1 懒人脚本
部署简便,可以参考[视频教程](https://www.bilibili.com/video/BV17bbvzHExd/) ,文字版教程如下:
> [!NOTE]
> 暂且只支持Ubuntu服务器一键部署,其他系统未尝试,可能会有一些奇怪的bug
使用SSH工具连接到服务器,以root权限执行如下脚本
```bash
sudo bash -c "$(wget -qO- https://ghfast.top/https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/main/docker-setup.sh)"
```
脚本会自动完成以下操作:
> 1. 安装Docker
> 2. 配置镜像源
> 3. 下载/拉取镜像
> 4. 下载语音识别模型文件
> 5. 引导配置服务端
>
执行完成后简单配置后,再参照[4. 运行程序](#4. 运行程序)和[5.重启xiaozhi-esp32-server](#5.重启xiaozhi-esp32-server)里提到的最重要的3件事情,完成3这三项配置后即可使用。
### 1.2 手动部署
#### 1.2.1 创建目录
安装完后,你需要为这个项目找一个安放配置文件的目录,例如我们可以新建一个文件夹叫`xiaozhi-server`
创建好目录后,你需要在`xiaozhi-server`下面创建`data`文件夹和`models`文件夹,`models`下面还要再创建`SenseVoiceSmall`文件夹。
最终目录结构如下所示:
```
xiaozhi-server
├─ data
├─ models
├─ SenseVoiceSmall
```
#### 1.2.2 下载语音识别模型文件
本项目语音识别模型,默认使用`SenseVoiceSmall`模型,进行语音转文字。因为模型较大,需要独立下载,下载后把`model.pt`
文件放在`models/SenseVoiceSmall`
目录下。下面两个下载路线任选一个。
- 线路一:阿里魔搭下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
- 线路二:百度网盘下载[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna) 提取码:
`qvna`
#### 1.2.3 下载配置文件
你需要下载两个配置文件:`docker-compose_all.yaml``config_from_api.yaml`。需要从项目仓库下载这两个文件。
##### 1.2.3.1 下载 docker-compose_all.yaml
用浏览器打开[这个链接](../main/xiaozhi-server/docker-compose_all.yml)。
在页面的右侧找到名称为`RAW`按钮,在`RAW`按钮的旁边,找到下载的图标,点击下载按钮,下载`docker-compose_all.yml`文件。 把文件下载到你的
`xiaozhi-server`中。
或者直接执行 `wget https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/docker-compose_all.yml` 下载。
下载完后,回到本教程继续往下。
##### 1.2.3.2 下载 config_from_api.yaml
用浏览器打开[这个链接](../main/xiaozhi-server/config_from_api.yaml)。
在页面的右侧找到名称为`RAW`按钮,在`RAW`按钮的旁边,找到下载的图标,点击下载按钮,下载`config_from_api.yaml`文件。 把文件下载到你的
`xiaozhi-server`下面的`data`文件夹中,然后把`config_from_api.yaml`文件重命名为`.config.yaml`
或者直接执行 `wget https://raw.githubusercontent.com/xinnan-tech/xiaozhi-esp32-server/refs/heads/main/main/xiaozhi-server/config_from_api.yaml` 下载保存。
下载完配置文件后,我们确认一下整个`xiaozhi-server`里面的文件如下所示:
```
xiaozhi-server
├─ docker-compose_all.yml
├─ data
├─ .config.yaml
├─ models
├─ SenseVoiceSmall
├─ model.pt
```
如果你的文件目录结构也是上面的,就继续往下。如果不是,你就再仔细看看是不是漏操作了什么。
## 2. 备份数据
如果你之前已经成功运行智控台,如果上面保存有你的密钥信息,请先从智控台上拷贝重要数据下来。因为升级过程中,有可能会覆盖原来的数据。
## 3. 清除历史版本镜像和容器
接下来打开命令行工具,使用`终端``命令行`工具 进入到你的`xiaozhi-server`,执行以下命令
```
docker compose -f docker-compose_all.yml down
docker stop xiaozhi-esp32-server
docker rm xiaozhi-esp32-server
docker stop xiaozhi-esp32-server-web
docker rm xiaozhi-esp32-server-web
docker stop xiaozhi-esp32-server-db
docker rm xiaozhi-esp32-server-db
docker stop xiaozhi-esp32-server-redis
docker rm xiaozhi-esp32-server-redis
docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest
docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:web_latest
```
## 4. 运行程序
执行以下命令启动新版本容器
```
docker compose -f docker-compose_all.yml up -d
```
执行完后,再执行以下命令,查看日志信息。
```
docker logs -f xiaozhi-esp32-server-web
```
当你看到输出日志时,说明你的`智控台`启动成功了。
```
2025-xx-xx 22:11:12.445 [main] INFO c.a.d.s.b.a.DruidDataSourceAutoConfigure - Init DruidDataSource
2025-xx-xx 21:28:53.873 [main] INFO xiaozhi.AdminApplication - Started AdminApplication in 16.057 seconds (process running for 17.941)
http://localhost:8002/xiaozhi/doc.html
```
请注意此刻仅是`智控台`能运行,如果8000端口`xiaozhi-esp32-server`报错,先不要理会。
这时,你需要使用浏览器,打开`智控台`,链接:http://127.0.0.1:8002 ,注册第一个用户。第一个用户即是超级管理员,以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
接下来要做三件重要的事情:
### 第一件重要的事情
使用超级管理员账号,登录智控台,在顶部菜单找到`参数管理`,找到列表中第一条数据,参数编码是`server.secret`,复制它到`参数值`
`server.secret`需要说明一下,这个`参数值`很重要,作用是让我们的`Server`端连接`manager-api``server.secret`是每次从零部署manager模块时,会自动随机生成的密钥。
复制`参数值`后,打开`xiaozhi-server`下的`data`目录的`.config.yaml`文件。此刻你的配置文件内容应该是这样的:
```
manager-api:
url: http://127.0.0.1:8002/xiaozhi
secret: 你的server.secret值
```
1、把你刚才从`智控台`复制过来的`server.secret``参数值`复制到`.config.yaml`文件里的`secret`里。
2、因为你是docker部署,把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
3、因为你是docker部署,把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
4、因为你是docker部署,把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
类似这样的效果
```
manager-api:
url: http://xiaozhi-esp32-server-web:8002/xiaozhi
secret: 12345678-xxxx-xxxx-xxxx-123456789000
```
保存好后,继续往下做第二件重要的事情
### 第二件重要的事情
使用超级管理员账号,登录智控台,在顶部菜单找到`模型配置`,然后在左侧栏点击`大语言模型`,找到第一条数据`智谱AI`,点击`修改`按钮,
弹出修改框后,将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
## 5.重启xiaozhi-esp32-server
接下来打开命令行工具,使用`终端``命令行`工具 输入
```
docker restart xiaozhi-esp32-server
docker logs -f xiaozhi-esp32-server
```
如果你能看到,类似以下日志,则是Server启动成功的标志。
```
25-02-23 12:01:09[core.websocket_server] - INFO - Websocket地址是 ws://xxx.xx.xx.xx:8000/xiaozhi/v1/
25-02-23 12:01:09[core.websocket_server] - INFO - =======上面的地址是websocket协议地址,请勿用浏览器访问=======
25-02-23 12:01:09[core.websocket_server] - INFO - 如想测试websocket请启动digital-human模块,打开浏览器交互测试
25-02-23 12:01:09[core.websocket_server] - INFO - =======================================================
```
由于你是全模块部署,因此你有两个重要的接口需要写入到esp32中。
OTA接口:
```
http://你宿主机局域网的ip:8002/xiaozhi/ota/
```
Websocket接口:
```
ws://你宿主机的ip:8000/xiaozhi/v1/
```
### 第三件重要的事情
使用超级管理员账号,登录智控台,在顶部菜单找到`参数管理`,找到参数编码是`server.websocket`,输入你的`Websocket接口`
使用超级管理员账号,登录智控台,在顶部菜单找到`参数管理`,找到数编码是`server.ota`,输入你的`OTA接口`
接下来,你就可以开始操作你的esp32设备了,你可以`自行编译esp32固件`也可以配置使用`虾哥编译好的1.6.1以上版本的固件`。两个任选一个
1、 [编译自己的esp32固件](firmware-build.md)了。
2、 [基于虾哥编译好的固件配置自定义服务器](firmware-setting.md)了。
# 方式二:本地源码运行全模块
## 1.安装MySQL数据库
如果本机已经安装了MySQL,可以直接在数据库中创建名为`xiaozhi_esp32_server`的数据库。
```sql
CREATE DATABASE xiaozhi_esp32_server CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
```
如果还没有MySQL,你可以通过docker安装mysql
```
docker run --name xiaozhi-esp32-server-db -e MYSQL_ROOT_PASSWORD=123456 -p 3306:3306 -e MYSQL_DATABASE=xiaozhi_esp32_server -e MYSQL_INITDB_ARGS="--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci" -e TZ=Asia/Shanghai -d mysql:latest
```
## 2.安装redis
如果还没有Redis,你可以通过docker安装redis
```
docker run --name xiaozhi-esp32-server-redis -d -p 6379:6379 redis
```
## 3.运行manager-api程序
3.1 安装JDK21,设置JDK环境变量
3.2 安装Maven,设置Maven环境变量
3.3 使用Vscode编程工具,安装好Java环境相关插件
3.4 使用Vscode编程工具加载manager-api模块
`src/main/resources/application-dev.yml`中配置数据库连接信息
```
spring:
datasource:
username: root
password: 123456
```
`src/main/resources/application-dev.yml`中配置Redis连接信息
```
spring:
data:
redis:
host: localhost
port: 6379
password:
database: 0
```
3.5 运行主程序
本项目为SpringBoot项目,启动方式为:
打开`Application.java`运行`Main`方法启动
```
路径地址:
src/main/java/xiaozhi/AdminApplication.java
```
当你看到输出日志时,说明你的`manager-api`启动成功了。
```
2025-xx-xx 22:11:12.445 [main] INFO c.a.d.s.b.a.DruidDataSourceAutoConfigure - Init DruidDataSource
2025-xx-xx 21:28:53.873 [main] INFO xiaozhi.AdminApplication - Started AdminApplication in 16.057 seconds (process running for 17.941)
http://localhost:8002/xiaozhi/doc.html
```
## 4.运行manager-web程序
4.1 安装nodejs
4.2 使用Vscode编程工具加载manager-web模块
终端命令进入manager-web目录下
```
npm install
```
然后启动
```
npm run serve
```
请注意,如果你的manager-api的接口不在`http://localhost:8002`,请在开发时,修改
`main/manager-web/.env.development`中的路径
运行成功后,你需要使用浏览器,打开`智控台`,链接:http://127.0.0.1:8001 ,注册第一个用户。第一个用户即是超级管理员,以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
重要:注册成功后,使用超级管理员账号,登录智控台,在顶部菜单找到`模型配置`,然后在左侧栏点击`大语言模型`,找到第一条数据`智谱AI`,点击`修改`按钮,
弹出修改框后,将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
重要:注册成功后,使用超级管理员账号,登录智控台,在顶部菜单找到`模型配置`,然后在左侧栏点击`大语言模型`,找到第一条数据`智谱AI`,点击`修改`按钮,
弹出修改框后,将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
重要:注册成功后,使用超级管理员账号,登录智控台,在顶部菜单找到`模型配置`,然后在左侧栏点击`大语言模型`,找到第一条数据`智谱AI`,点击`修改`按钮,
弹出修改框后,将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
## 5.安装Python环境
本项目使用`conda`管理依赖环境。如果不方便安装`conda`,需要根据实际的操作系统安装好`libopus``ffmpeg`
如果确定使用`conda`,则安装好后,开始执行以下命令。
重要提示!windows 用户,可以通过安装`Anaconda`来管理环境。安装好`Anaconda`后,在`开始`那里搜索`anaconda`相关的关键词,
找到`Anaconda Prpmpt`,使用管理员身份运行它。如下图。
![conda_prompt](./images/conda_env_1.png)
运行之后,如果你能看到命令行窗口前面有一个(base)字样,说明你成功进入了`conda`环境。那么你就可以执行以下命令了。
![conda_env](./images/conda_env_2.png)
```
conda remove -n xiaozhi-esp32-server --all -y
conda create -n xiaozhi-esp32-server python=3.10 -y
conda activate xiaozhi-esp32-server
# 添加清华源通道
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free
conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge
conda install libopus -y
conda install ffmpeg -y
# 在 Linux 环境下进行部署时,如出现类似缺失 libiconv.so.2 动态库的报错 请通过以下命令进行安装
conda install libiconv -y
```
请注意,以上命令,不是一股脑执行就成功的,你需要一步步执行,每一步执行完后,都检查一下输出的日志,查看是否成功。
## 6.安装本项目依赖
你先要下载本项目源码,源码可以通过`git clone`命令下载,如果你不熟悉`git clone`命令。
你可以用浏览器打开这个地址`https://github.com/xinnan-tech/xiaozhi-esp32-server.git`
打开完,找到页面中一个绿色的按钮,写着`Code`的按钮,点开它,然后你就看到`Download ZIP`的按钮。
点击它,下载本项目源码压缩包。下载到你电脑后,解压它,此时它的名字可能叫`xiaozhi-esp32-server-main`
你需要把它重命名成`xiaozhi-esp32-server`,在这个文件里,进入到`main`文件夹,再进入到`xiaozhi-server`,好了请记住这个目录`xiaozhi-server`
```
# 继续使用conda环境
conda activate xiaozhi-esp32-server
# 进入到你的项目根目录,再进入main/xiaozhi-server
cd main/xiaozhi-server
pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/
pip install -r requirements.txt
```
### 7.下载语音识别模型文件
本项目语音识别模型,默认使用`SenseVoiceSmall`模型,进行语音转文字。因为模型较大,需要独立下载,下载后把`model.pt`
文件放在`models/SenseVoiceSmall`
目录下。下面两个下载路线任选一个。
- 线路一:阿里魔搭下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
- 线路二:百度网盘下载[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna) 提取码:
`qvna`
## 8.配置项目文件
使用超级管理员账号,登录智控台 ,在顶部菜单找到`参数管理`,找到列表中第一条数据,参数编码是`server.secret`,复制它到`参数值`
`server.secret`需要说明一下,这个`参数值`很重要,作用是让我们的`Server`端连接`manager-api``server.secret`是每次从零部署manager模块时,会自动随机生成的密钥。
如果你的`xiaozhi-server`目录没有`data`,你需要创建`data`目录。
如果你的`data`下面没有`.config.yaml`文件,你可以把`xiaozhi-server`目录下的`config_from_api.yaml`文件复制到`data`,并重命名为`.config.yaml`
复制`参数值`后,打开`xiaozhi-server`下的`data`目录的`.config.yaml`文件。此刻你的配置文件内容应该是这样的:
```
manager-api:
url: http://127.0.0.1:8002/xiaozhi
secret: 你的server.secret值
```
把你刚才从`智控台`复制过来的`server.secret``参数值`复制到`.config.yaml`文件里的`secret`里。
类似这样的效果
```
manager-api:
url: http://127.0.0.1:8002/xiaozhi
secret: 12345678-xxxx-xxxx-xxxx-123456789000
```
## 9.运行项目
```
# 确保在xiaozhi-server目录下执行
conda activate xiaozhi-esp32-server
python app.py
```
如果你能看到,类似以下日志,则是本项目服务启动成功的标志。
```
25-02-23 12:01:09[core.websocket_server] - INFO - Server is running at ws://xxx.xx.xx.xx:8000/xiaozhi/v1/
25-02-23 12:01:09[core.websocket_server] - INFO - =======上面的地址是websocket协议地址,请勿用浏览器访问=======
25-02-23 12:01:09[core.websocket_server] - INFO - 如想测试websocket请启动digital-human模块,打开浏览器交互测试
25-02-23 12:01:09[core.websocket_server] - INFO - =======================================================
```
由于你是全模块部署,因此你有两个重要的接口。
OTA接口:
```
http://你电脑局域网的ip:8002/xiaozhi/ota/
```
Websocket接口:
```
ws://你电脑局域网的ip:8000/xiaozhi/v1/
```
请你务必把以上两个接口地址写入到智控台中:他们将会影响websocket地址发放和自动升级功能。
1、使用超级管理员账号,登录智控台,在顶部菜单找到`参数管理`,找到参数编码是`server.websocket`,输入你的`Websocket接口`
2、使用超级管理员账号,登录智控台,在顶部菜单找到`参数管理`,找到数编码是`server.ota`,输入你的`OTA接口`
接下来,你就可以开始操作你的esp32设备了,你可以`自行编译esp32固件`也可以配置使用`虾哥编译好的1.6.1以上版本的固件`。两个任选一个
1、 [编译自己的esp32固件](firmware-build.md)了。
2、 [基于虾哥编译好的固件配置自定义服务器](firmware-setting.md)了。
# 常见问题
以下是一些常见问题,供参考:
1、[为什么我说的话,小智识别出来很多韩文、日文、英文](./FAQ.md)<br/>
2、[为什么会出现“TTS 任务出错 文件不存在”?](./FAQ.md)<br/>
3、[TTS 经常失败,经常超时](./FAQ.md)<br/>
4、[使用Wifi能连接自建服务器,但是4G模式却接不上](./FAQ.md)<br/>
5、[如何提高小智对话响应速度?](./FAQ.md)<br/>
6、[我说话很慢,停顿时小智老是抢话](./FAQ.md)<br/>
## 部署相关教程
1、[如何自动拉取本项目最新代码自动编译和启动](./dev-ops-integration.md)<br/>
2、[如何部署MQTT网关开启MQTT+UDP协议](./mqtt-gateway-integration.md)<br/>
3、[如何与Nginx集成](https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/791)<br/>
## 拓展相关教程
1、[如何开启手机号码注册智控台](./ali-sms-integration.md)<br/>
2、[如何集成HomeAssistant实现智能家居控制](./homeassistant-integration.md)<br/>
3、[如何开启视觉模型实现拍照识物](./mcp-vision-integration.md)<br/>
4、[如何部署MCP接入点](./mcp-endpoint-enable.md)<br/>
5、[如何接入MCP接入点](./mcp-endpoint-integration.md)<br/>
6、[如何开启声纹识别](./voiceprint-integration.md)<br/>
7、[新闻插件源配置指南](./newsnow_plugin_config.md)<br/>
8、[天气插件使用指南](./weather-integration.md)<br/>
## 语音克隆、本地语音部署相关教程
1、[如何在智控台克隆音色](./huoshan-streamTTS-voice-cloning.md)<br/>
2、[如何部署集成index-tts本地语音](./index-stream-integration.md)<br/>
3、[如何部署集成fish-speech本地语音](./fish-speech-integration.md)<br/>
4、[如何部署集成PaddleSpeech本地语音](./paddlespeech-deploy.md)<br/>
## 性能测试教程
1、[各组件速度测试指南](./performance_tester.md)<br/>
2、[定期公开测试结果](https://github.com/xinnan-tech/xiaozhi-performance-research)<br/>
+104
View File
@@ -0,0 +1,104 @@
# 常见问题 ❓
### 1、为什么我说的话,小智识别出来很多韩文、日文、英文?🇰🇷
建议:检查一下`models/SenseVoiceSmall`是否已经有`model.pt`
文件,如果没有就要下载,查看这里[下载语音识别模型文件](Deployment.md#模型文件)
### 2、为什么会出现"TTS 任务出错 文件不存在"?📁
建议:检查一下是否正确使用`conda` 安装了`libopus``ffmpeg`库。
如果没有安装,就安装
```
conda install conda-forge::libopus
conda install conda-forge::ffmpeg
```
### 3、TTS 经常失败,经常超时 ⏰
建议:如果 `EdgeTTS` 经常失败,请先检查是否使用了代理(梯子)。如果使用了,请尝试关闭代理后再试;
如果用的是火山引擎的豆包 TTS,经常失败时建议使用付费版本,因为测试版本仅支持 2 个并发。
### 4、使用Wifi能连接自建服务器,但是4G模式却接不上 🔐
原因:虾哥的固件,4G模式需要使用安全连接。
解决方法:目前有两种方法可以解决。任选一种:
1、改代码。参考这个视频解决 https://www.bilibili.com/video/BV18MfTYoE85
2、使用nginx配置ssl证书。参考教程 https://icnt94i5ctj4.feishu.cn/docx/GnYOdMNJOoRCljx1ctecsj9cnRe
### 5、如何提高小智对话响应速度? ⚡
本项目默认配置为低成本方案,建议初学者先使用默认免费模型,解决"跑得动"的问题,再优化"跑得快"。
如需提升响应速度,可尝试更换各组件。自`0.5.2`版本起,项目支持流式配置,相比早期版本,响应速度提升约`2.5秒`,显著改善用户体验。
| 模块名称 | 入门全免费设置 | 流式配置 |
|:---:|:---:|:---:|
| ASR(语音识别) | FunASR(本地) | 👍XunfeiStreamASR(讯飞流式) |
| LLM(大模型) | glm-4-flash(智谱) | 👍qwen-flash(阿里百炼) |
| VLLM(视觉大模型) | glm-4v-flash(智谱) | 👍qwen3.5-flash(阿里百炼) |
| TTS(语音合成) | EdgeTTS(微软) | 👍HuoshanDoubleStreamTTS(火山流式) |
| Intent(意图识别) | function_call(函数调用) | function_call(函数调用) |
| Memory(记忆功能) | mem_local_short(本地短期记忆) | mem_local_short(本地短期记忆) |
如果您关心各组件的耗时,请查阅[小智各组件性能测试报告](https://github.com/xinnan-tech/xiaozhi-performance-research),可按报告中的测试方法在您的环境中实际测试。
### 6、我说话很慢,停顿时小智老是抢话 🗣️
建议:在配置文件中找到如下部分,将 `min_silence_duration_ms` 的值调大(例如改为 `1000`):
```yaml
VAD:
SileroVAD:
threshold: 0.5
model_dir: models/snakers4_silero-vad
min_silence_duration_ms: 700 # 如果说话停顿较长,可将此值调大
```
### 7、部署相关教程
1、[如何进行最简化部署](./Deployment.md)<br/>
2、[如何进行全模块部署](./Deployment_all.md)<br/>
3、[如何部署MQTT网关开启MQTT+UDP协议](./mqtt-gateway-integration.md)<br/>
4、[如何自动拉取本项目最新代码自动编译和启动](./dev-ops-integration.md)<br/>
5、[如何与Nginx集成](https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/791)<br/>
### 8、编译固件相关教程
1、[如何自己编译小智固件](./firmware-build.md)<br/>
2、[如何基于虾哥编译好的固件修改OTA地址](./firmware-setting.md)<br/>
3、[单模块部署如何配置固件OTA自动升级](./ota-upgrade-guide.md)<br/>
### 9、拓展相关教程
1、[如何开启手机号码注册智控台](./ali-sms-integration.md)<br/>
2、[如何集成HomeAssistant实现智能家居控制](./homeassistant-integration.md)<br/>
3、[如何开启视觉模型实现拍照识物](./mcp-vision-integration.md)<br/>
4、[如何部署MCP接入点](./mcp-endpoint-enable.md)<br/>
5、[如何接入MCP接入点](./mcp-endpoint-integration.md)<br/>
6、[MCP方法如何获取设备信息](./mcp-get-device-info.md)<br/>
7、[如何开启声纹识别](./voiceprint-integration.md)<br/>
8、[新闻插件源配置指南](./newsnow_plugin_config.md)<br/>
9、[知识库ragflow集成指南](./ragflow-integration.md)<br/>
10、[如何部署上下文源](./context-provider-integration.md)<br/>
11、[如何集成PowerMem智能记忆](./powermem-integration.md)<br/>
12、[如何配置天气插件查询天气](./weather-integration.md)<br/>
### 10、数字人相关教程
1、[数字人digital-human启动方法](./digital-human-wakeword.md)<br/>
2、[如何在N100迷你主机上部署数字人digital-human](./all-in-one-digital-human-setup.md)<br/>
### 11、语音克隆、本地语音部署相关教程
1、[如何在智控台克隆音色](./huoshan-streamTTS-voice-cloning.md)<br/>
2、[如何部署集成index-tts本地语音](./index-stream-integration.md)<br/>
3、[如何部署集成fish-speech本地语音](./fish-speech-integration.md)<br/>
4、[如何部署集成PaddleSpeech本地语音](./paddlespeech-deploy.md)<br/>
### 12、性能测试教程
1、[各组件速度测试指南](./performance_tester.md)<br/>
2、[定期公开测试结果](https://github.com/xinnan-tech/xiaozhi-performance-research)<br/>
### 13、更多问题,可联系我们反馈 💬
可以在[issues](https://github.com/xinnan-tech/xiaozhi-esp32-server/issues)提交您的问题。
+44
View File
@@ -0,0 +1,44 @@
# 阿里云短信集成指南
登录阿里云控制台,进入“短信服务”页面:https://dysms.console.aliyun.com/overview
## 第一步 添加签名
![步骤](images/alisms/sms-01.png)
![步骤](images/alisms/sms-02.png)
以上步骤,会得到签名,请把它写入到智控台参数,`aliyun.sms.sign_name`
## 第二步 添加模版
![步骤](images/alisms/sms-11.png)
以上步骤,会得到模版code,请把它写入到智控台参数,`aliyun.sms.sms_code_template_code`
注意,签名要等7个工作日,等运营商报备成功后才能发送成功。
注意,签名要等7个工作日,等运营商报备成功后才能发送成功。
注意,签名要等7个工作日,等运营商报备成功后才能发送成功。
可以等报备成功后,再继续往下操作。
## 第三步 创建短信账户和开通权限
登录阿里云控制台,进入“访问控制”页面:https://ram.console.aliyun.com/overview?activeTab=overview
![步骤](images/alisms/sms-21.png)
![步骤](images/alisms/sms-22.png)
![步骤](images/alisms/sms-23.png)
![步骤](images/alisms/sms-24.png)
![步骤](images/alisms/sms-25.png)
以上步骤,会得到access_key_id和access_key_secret,请把它写入到智控台参数,`aliyun.sms.access_key_id``aliyun.sms.access_key_secret`
## 第四步 启动手机注册功能
1、正常来说,以上信息都填完后,会有这个效果,如果没有,可能缺少了某个步骤
![步骤](images/alisms/sms-31.png)
2、开启允许非管理员用户可注册,将参数`server.allow_user_register`设置成`true`
3、开启手机注册功能,将参数`server.enable_mobile_register`设置成`true`
![步骤](images/alisms/sms-32.png)
+442
View File
@@ -0,0 +1,442 @@
# 一体机数字人配置指南
本项目用于在 x86 架构设备(如迷你主机、工控机、普通电脑等)上部署一套完整的数字人展示系统,实现以下功能:
- 开机自动进入 Kiosk 全屏浏览器,展示指定网页
- 后台运行唤醒词检测服务,支持语音交互
> **说明**:本文档以 **Intel N100 迷你主机(天虹 QN10-100B4)** 为例进行部署演示,其他 x86 设备可参考调整(注意网络配置和声卡设备差异)。
## 适用环境
| 项目 | 说明 |
|------|------|
| 示例硬件 | 天虹 QN10-100B4Intel N100 |
| 操作系统 | Ubuntu 24.04 LTS (Noble Numbat) |
| 示例用户 | xz(请根据实际情况替换) |
| 网络 | Wi-Fi 连接,固定 IP(可按需改为有线) |
## 部署流程
1. 系统初始化(换源、连网)
2. 安装图形组件与 Kiosk 浏览器
3. 配置自动登录与图形界面
4. 部署唤醒词服务(Python 环境 + 麦克风)
5. 优化开机速度与隐藏启动信息
---
### 系统初始化(换源、连网)
```
sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
sudo tee /etc/apt/sources.list > /dev/null <<EOF
deb http://mirrors.aliyun.com/ubuntu/ noble main restricted universe multiverse
# deb-src http://mirrors.aliyun.com/ubuntu/ noble main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ noble-security main restricted universe multiverse
# deb-src http://mirrors.aliyun.com/ubuntu/ noble-security main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ noble-updates main restricted universe multiverse
# deb-src http://mirrors.aliyun.com/ubuntu/ noble-updates main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ noble-proposed main restricted universe multiverse
# deb-src http://mirrors.aliyun.com/ubuntu/ noble-proposed main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ noble-backports main restricted universe multiverse
# deb-src http://mirrors.aliyun.com/ubuntu/ noble-backports main restricted universe multiverse
EOF
echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4
```
安装网络管理工具(若已存在可忽略)
Bash
```
sudo apt update
sudo apt install network-manager -y
sudo systemctl start NetworkManager
sudo systemctl enable NetworkManager
```
设置wifi密码,固定ip
> **提醒**:以下命令中的 Wi-Fi 名称、密码、IP 地址均为示例,请务必替换为你自己的实际信息。
Bash
```
sudo nmcli device wifi connect "MERCURY_1812" password "12345678"
sudo nmcli connection modify "MERCURY_1812" ipv4.addresses "192.168.0.86/24" ipv4.gateway "192.168.0.1" ipv4.dns "8.8.8.8,114.114.114.114" ipv4.method "manual"
sudo nmcli connection up "MERCURY_1812"
```
### 第一步:安装核心图形组件与浏览器
这里我们坚持“极简主义”,坚决不装多余的桌面环境(如 GNOME/KDE),只装底层驱动、最轻量的窗口管理器(Openbox)、隐藏鼠标工具以及 Chromium 浏览器。
Bash
```
sudo timedatectl set-timezone Asia/Shanghai
sudo apt install net-tools vim fonts-wqy-microhei fonts-wqy-zenhei alsa-utils pulseaudio -y
sudo apt install --no-install-recommends xserver-xorg x11-xserver-utils xinit openbox unclutter -y
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
sudo apt install ./google-chrome-stable_current_amd64.deb -y
rm google-chrome-stable_current_amd64.deb
sudo apt purge snapd -y
```
### 第二步:配置 TTY1 开机免密自动登录
为了避免手动输入账号密码的尴尬,我们通过修改 systemd 服务,让系统一开机就自动以 `xz` 的身份登录。这里使用一键写入命令,彻底避开由于 `nano``vi` 操作不当导致的保存失败问题。
**1. 创建配置目录:**
Bash
```
sudo mkdir -p /etc/systemd/system/getty@tty1.service.d/
```
**2. 写入自动登录规则:**
Bash
```
echo -e "[Service]\nExecStart=\nExecStart=-/sbin/agetty --autologin xz --noclear %I \$TERM" | sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf
```
**3. 重载服务并设置默认启动目标:**
Bash
```
sudo systemctl daemon-reload
sudo systemctl set-default multi-user.target
```
### 第三步:配置登录后自动启动图形界面
系统自动登录后默认停留在黑底白字的命令行,我们需要配置脚本,让它一旦登录立马启动 X11 图形环境。
**1. 触发 `startx` 的启动逻辑:**
直接将触发代码追加写入你的个人环境配置文件中:
Bash
```
cat << 'EOF' >> ~/.bash_profile
if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then
exec startx
fi
EOF
```
**2. 告诉 `startx` 去启动 Openbox**
Bash
```
echo "exec openbox-session" > ~/.xinitrc
```
### 第四步:配置“铜墙铁壁”的 Openbox 与浏览器
这是最核心的一步:关闭屏幕休眠、隐藏鼠标、全屏锁定浏览器,并写一个“死循环”保证浏览器被意外关闭后也能瞬间复活。
**1. 创建 Openbox 配置目录:**
Bash
```
mkdir -p ~/.config/openbox
```
**2. 写入自启动脚本 (`autostart`)**
复制以下整段代码并回车(这会自动把所有保护规则写进文件里):
Bash
```
cat << 'EOF' > ~/.config/openbox/autostart
# 关闭屏幕保护
xset -dpms
xset s noblank
xset s off
# 隐藏鼠标
unclutter -idle 0.1 -root &
# 死循环启动 Chromium(崩溃或被关也能秒重启)
while true; do
google-chrome \
--kiosk \
--no-first-run \
--no-default-browser-check \
--disable-infobars \
--disable-session-crashed-bubble \
--disable-translate \
--disable-external-intent-requests \
--autoplay-policy=no-user-gesture-required \
--use-fake-ui-for-media-stream \
"https://www.douyin.com"
sleep 2
done &
EOF
```
**3. 屏蔽 `Alt+F4` 退出快捷键:**
为了防止别人插上键盘强行关掉窗口,我们把 Openbox 默认的系统快捷键干掉。
Bash
```
cp /etc/xdg/openbox/rc.xml ~/.config/openbox/
sed -i '/<keybind key="A-F4">/,/<\/keybind>/d' ~/.config/openbox/rc.xml
```
### 第五步:重启验收成果
如果拔掉网线或不需要等待所有网络上线,可禁用网络等待服务,避免开机卡顿
Bash
```
sudo systemctl mask systemd-networkd-wait-online.service
sudo systemctl mask NetworkManager-wait-online.service
```
隐藏开机信息(GRUB
Bash
```
sudo sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=3 systemd.show_status=false vt.global_cursor_default=0"/g' /etc/default/grub
echo 'GRUB_TIMEOUT_STYLE="hidden"' | sudo tee -a /etc/default/grub
echo 'GRUB_RECORDFAIL_TIMEOUT=0' | sudo tee -a /etc/default/grub
sudo update-grub
```
声音设置成100%,然后 重启:
Bash
```
amixer -q sset Master 100% unmute
sudo reboot
```
### 部署唤醒词服务
在一体机上部署唤醒词检测服务,需要安装 Python 环境、上传项目文件、配置 Camera 麦克风和开机自启。
#### 1. 安装 Miniconda
```bash
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/miniconda3
~/miniconda3/bin/conda init bash
source ~/.bashrc
rm Miniconda3-latest-Linux-x86_64.sh
```
确保登录时自动进入conda环境
```bash
if ! grep -q '.bashrc' ~/.bash_profile; then
cat << 'EOF' >> ~/.bash_profile
if [ -f ~/.bashrc ]; then
. ~/.bashrc
fi
EOF
fi
```
#### 2. 创建 Python 虚拟环境
```bash
conda create -n test python=3.10 -y
conda activate test
```
若出现 Terms of Service have not been accepted 错误,执行:
```bash
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main
conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/r
```
#### 3. 上传项目文件
将开发机上的 `main/digital-human/` 整个目录上传到一体机的 `~/digital-human/` 目录:
```bash
# 在开发机上执行(将 <一体机IP> 替换为实际 IP
scp -r main/digital-human/ xz@<一体机IP>:~/digital-human/
```
#### 4. 安装系统依赖
唤醒词服务需要音频采集库和 ALSA PulseAudio 插件:
```bash
sudo apt install libportaudio2 portaudio19-dev libasound2-plugins -y
```
#### 5. 安装 Python 依赖
```bash
cd ~/digital-human/wakeword_runtime
pip install numpy
pip install -r requirements.txt
```
#### 6. 下载唤醒词模型
模型文件不包含在项目中,需要单独下载配置,详见 [docs/digital-human-wakeword.md](digital-human-wakeword.md) 中的“模型下载”章节。
#### 7. 修改 Openbox 自启动脚本
需要在 autostart 中加上 PulseAudio 和 Camera 麦克风配置,并将 Chrome 地址改为测试页面。
先确认 Camera 麦克风在 PulseAudio 中的设备名:
```bash
pulseaudio --start
pactl list sources short
```
找到包含 `USB_Camera` 的那一行,记下完整名称,例如:
```
alsa_input.usb-SN0002_2K_USB_Camera_46435000_P030D00_SN0002-02.mono-fallback
```
然后用完整内容覆盖 autostart(将 `TARGET_MIC` 替换为你的实际设备名):
```bash
cat << 'EOF' > ~/.config/openbox/autostart
# 1. 启动声音服务并稍作等待
pulseaudio --start
sleep 1
# 2. 锁定 Camera 的麦克风(请替换为你的实际设备名)
TARGET_MIC="alsa_input.usb-SN0002_2K_USB_Camera_46435000_P030D00_SN0002-02.mono-fallback"
# 3. 设为系统默认麦克风
pactl set-default-source "$TARGET_MIC"
# 4. 解除静音
pactl set-source-mute "$TARGET_MIC" 0
# 5. 音量拉到 100%
pactl set-source-volume "$TARGET_MIC" 100%
# --- 极简桌面与浏览器环境配置 ---
# 关闭屏幕保护
xset -dpms
xset s noblank
xset s off
# 隐藏鼠标
unclutter -idle 0.1 -root &
# 死循环启动浏览器(崩溃或被关也能秒重启)
while true; do
google-chrome \
--kiosk \
--no-first-run \
--no-default-browser-check \
--disable-infobars \
--disable-session-crashed-bubble \
--disable-translate \
--disable-external-intent-requests \
--autoplay-policy=no-user-gesture-required \
--use-fake-ui-for-media-stream \
"http://127.0.0.1:8006/index.html"
sleep 2
done &
EOF
```
#### 8. 配置唤醒词服务开机自启
创建 systemd 服务文件,让唤醒词服务开机自动运行。
先确认当前用户的 UID
```bash
id -u $(whoami)
```
然后用查到的 UID 替换下面 `1000`(通常第一个用户就是 1000):
```bash
sudo tee /etc/systemd/system/digital-human.service << 'EOF'
[Unit]
Description=Digital Human Runtime
After=network.target sound.target
[Service]
Type=simple
User=xz
Environment=XDG_RUNTIME_DIR=/run/user/1000
Environment=PULSE_SERVER=unix:/run/user/1000/pulse/native
WorkingDirectory=/home/xz/digital-human
ExecStartPre=/bin/sleep 10
ExecStart=/home/xz/miniconda3/envs/test/bin/python start.py
Restart=on-failure
RestartSec=10
[Install]
WantedBy=multi-user.target
EOF
```
> **重要说明**
> - `User=xz` — 替换为你的实际用户名
> - `/run/user/1000` — 替换为你实际的 UID
> - `WorkingDirectory` 和 `ExecStart` 中的路径 — 替换为你的实际部署路径
> - `Environment` 中的 PulseAudio 环境变量**必须保留**,否则唤醒词服务和浏览器无法同时使用 Camera 麦克风
启用并启动服务:
```bash
sudo systemctl daemon-reload
sudo systemctl enable digital-human
sudo systemctl start digital-human
```
#### 9. 常用服务管理命令
```bash
sudo systemctl start digital-human # 立即启动
sudo systemctl stop digital-human # 停止
sudo systemctl restart digital-human # 重启
sudo systemctl status digital-human # 查看状态
journalctl -u digital-human -f # 查看实时日志
```
+224
View File
@@ -0,0 +1,224 @@
# 上下文源使用教程
## 概述
`上下文源`,就是为小智系统提示词的上下文添加【数据源】。
`上下文源` 在小智在唤醒那一刻,获取外部系统的数据,并将其动态注入到大模型的系统提示词(System Prompt)中。
让其做到唤醒时感知世界某个事物的状态。
它和MCP、记忆有本质的区别:`上下文源`是强制让小智感知世界的数据;`记忆(Mem)`是让他知道之前聊了什么内容;`MCP(functionc all)`是当需要调用某项能力/知识的时候使用调用。
通过这个功能,在小智唤醒的一刹那,“感知”到:
- 人体健康传感器状态(体温、血压、血氧状态等)
- 业务系统的实时数据(服务器负载、待办数据、股票信息等)
- 任何可以通过 HTTP API 获取的文本信息
**注意**:该功能只是方便小智在唤醒的时候感知事物的状态,而如果想要小智唤醒后实时获取事物的状态,建议在此功能上再结合MCP工具的调用。
## 工作原理
1. **配置源**:用户配置一个或多个 HTTP API 地址。
2. **触发请求**:当系统构建 Prompt 时,如果发现模板中包含 `{{ dynamic_context }}` 占位符,会请求所有配置的 API。
3. **自动注入**:系统会自动将 API 返回的数据格式化为 Markdown 列表,替换 `{{ dynamic_context }}` 占位符。
## 接口规范
为了让小智正确解析数据,您的 API 需要满足以下规范:
- **请求方式**`GET`
- **请求头**:系统会自动添加 `device-id` 字段到 Request Header。
- **响应格式**:必须返回 JSON 格式,且包含 `code``data` 字段。
### 响应示例
**情况 1:返回键值对**
```json
{
"code": 0,
"msg": "success",
"data": {
"客厅温度": "26℃",
"客厅湿度": "45%",
"大门状态": "已关闭"
}
}
```
*注入效果:*
```markdown
<context>
- **客厅温度:** 26℃
- **客厅湿度:** 45%
- **大门状态:** 已关闭
</context>
```
**情况 2:返回列表**
```json
{
"code": 0,
"data": [
"您有10个待办事项",
"当前汽车的行驶速度是100km每小时"
]
}
```
*注入效果:*
```markdown
<context>
- 您有10个待办事项
- 当前汽车的行驶速度是100km每小时
</context>
```
## 配置指南
### 方式 1:智控台配置(全模块部署)
1. 登录智控台,进入**角色配置**页面。
2. 找到**上下文源**配置项(点击“编辑源”按钮)。
3. 点击**添加**,输入您的 API 地址。
4. 如果 API 需要鉴权,可以在**请求头**部分添加 `Authorization` 或其他 Header。
5. 保存配置。
### 方式 2:配置文件配置(单模块部署)
编辑 `xiaozhi-server/data/.config.yaml` 文件,添加 `context_providers` 配置段:
```yaml
# 上下文源配置
context_providers:
- url: "http://api.example.com/data"
headers:
Authorization: "Bearer your-token"
- url: "http://another-api.com/data"
```
## 启用功能
默认情况下,系统的提示词模板文件(`data/.agent-base-prompt.txt`)中已经预置了 `{{ dynamic_context }}` 占位符,您无需手动添加。
**示例:**
```markdown
<context>
【重要!以下信息已实时提供,无需调用工具查询,请直接使用:】
- **设备ID** {{device_id}}
- **当前时间:** {{current_time}}
...
{{ dynamic_context }}
</context>
```
**注意**:如果您不需要使用此功能,可以选择**不配置任何上下文源**,也可以从提示词模板文件中**删除** `{{ dynamic_context }}` 占位符。
## 附录:Mock 测试服务示例
为了方便您测试和开发,我们提供了一个简单的 Python Mock Server 脚本。您可以运行此脚本在本地模拟 API 接口。
**mock_api_server.py**
```python
import http.server
import socketserver
import json
from urllib.parse import urlparse, parse_qs
# 设置端口号
PORT = 8081
class MockRequestHandler(http.server.SimpleHTTPRequestHandler):
def do_GET(self):
# 解析路径和参数
parsed_path = urlparse(self.path)
path = parsed_path.path
query = parse_qs(parsed_path.query)
response_data = {}
status_code = 200
print(f"收到请求: {path}, 参数: {query}")
# Case 1: 模拟健康数据 (返回字典 Dict)
# 路径参数风格: /health
# device_id 从 Header 获取
if path == "/health":
device_id = self.headers.get("device-id", "unknown_device")
print(f"device_id: {device_id}")
response_data = {
"code": 0,
"msg": "success",
"data": {
"测试设备ID": device_id,
"心率": "80 bpm",
"血压": "120/80 mmHg",
"状态": "良好"
}
}
# Case 2: 模拟新闻列表 (返回列表 List)
# 无参数: /news/list
elif path == "/news/list":
response_data = {
"code": 0,
"msg": "success",
"data": [
"今日头条:Python 3.14 发布",
"科技新闻:AI 助手改变生活",
"本地新闻:明日有大雨,记得带伞"
]
}
# Case 3: 模拟天气简报 (返回字符串 String)
# 无参数: /weather/simple
elif path == "/weather/simple":
response_data = {
"code": 0,
"msg": "success",
"data": "今日晴转多云,气温 20-25 度,空气质量优,适合出行。"
}
# Case 4: 模拟设备详情 (Query参数风格)
# 参数风格: /device/info
# device_id 从 Header 获取
elif path == "/device/info":
device_id = self.headers.get("device-id", "unknown_device")
response_data = {
"code": 0,
"msg": "success",
"data": {
"查询方式": "Header参数",
"设备ID": device_id,
"电量": "85%",
"固件": "v2.0.1"
}
}
# Case 5: 404 Not Found
else:
status_code = 404
response_data = {"error": "接口不存在"}
# 发送响应
self.send_response(status_code)
self.send_header('Content-type', 'application/json; charset=utf-8')
self.end_headers()
self.wfile.write(json.dumps(response_data, ensure_ascii=False).encode('utf-8'))
# 启动服务
# 允许地址重用,防止快速重启报错
socketserver.TCPServer.allow_reuse_address = True
with socketserver.TCPServer(("", PORT), MockRequestHandler) as httpd:
print(f"==================================================")
print(f"Mock API Server 已启动: http://localhost:{PORT}")
print(f"可用接口列表:")
print(f"1. [字典] http://localhost:{PORT}/health")
print(f"2. [列表] http://localhost:{PORT}/news/list")
print(f"3. [文本] http://localhost:{PORT}/weather/simple")
print(f"4. [参数] http://localhost:{PORT}/device/info")
print(f"==================================================")
try:
httpd.serve_forever()
except KeyboardInterrupt:
print("\n服务已停止")
```
+50
View File
@@ -0,0 +1,50 @@
# 致开发者的公开信
"春江水暖鸭先知,正是河豚欲上时!"
亲爱的朋友,我是John,是一名普通公司里的Java程序员,今天,我怀着无比真挚的心情,向热爱AI技术与创新的你发出这封公开信。
半年前我看到很多优秀的项目,比如`Dify``Chat2DB`等人工智能相关的项目,我在想,我要是能参与这些项目多好,可惜“报国无门,空打十年代码”。
我是2025年初刷到虾哥团队的视频,我非常好奇他是怎么实现的,我想复刻他们的后端服务,打造一个低成本民用贾维斯。很可惜现在做的作品依然只是一个人工智障,它并发低、没有灵魂,响应很慢,bug很多。
虾哥团队是我们学习的对象,我很想拥有像虾哥团队一样智能的小智后端服务。但是我也能理解虾哥不开源的决定。“一花独放不是春,百花齐放春满园”,人工智能遍地开花的时代,也许就在我们这代实现,我们可以用自己的双手,实现低成本民用贾维斯。我个人认为,他能实现的,我们也能实现,只是时间问题而已,我称之为“我们的取经之路”。
那么这条取经之路,我们会遇到什么困难?我想应该不少于八十一难。这一路必然会出现各种妖怪,当然也有神仙暗中帮助我们,也有人加入取经队伍。
以上内容,如果你觉得好笑。那我也觉得非常的幸运。我能够在你人生3万多天里博你笑五秒,也算是为你做了一次贡献。
民用低成本贾维斯这个想法,会失败吗,我不知道,但是我们普通人的一生,这种失败不是很常见吗?
未来,有一点是可以确定的,就一定会有人完全复刻虾哥团队的功能,实现民用低成本贾维斯。这个项目会是我们吗?
期待与你携手前行,共创未来。
John2025.3.11,广州
# 附 开发贡献指南
## 项目目标
1. **民用低成本贾维斯解决方案**
2. **智能联动周边硬件的解决方案**
## 加入我们
我们热忱欢迎志同道合的朋友加入,共同为项目贡献力量。您可在[这个链接](https://github.com/users/xinnan-tech/projects/3)查看我们近期要实现的功能,功能列表中还没指派相关人员处理的,正是急需您的参与。参与方式如下:
### 1、成为普通贡献者
Fork 项目,提交 PR,由开发者审核后合入主分支。
### 2、成为开发者
当你累计提交 3 次有效 PR 后,可以联系群主申请成为开发者,群主将邀请你加入独立的开发者群,共同探讨项目未来。
## 开发者开发流程
1. **创建新分支**
每个功能点请以新分支方式开发,分支名称应简洁明了,让人一眼看出所实现的功能,避免功能撞车。
2. **提交 PR 审核**
功能开发完成后,请在 GitHub 上提交 PR,由其他开发者审核,审核通过后合并入主分支。
+182
View File
@@ -0,0 +1,182 @@
# 全模块源码部署自动升级方法
本教程是方便全模块源码部署的爱好者,如何通过自动命令,自动拉取源码,自动编译,自动启动端口运行。实现最高效率的升级系统。
本项目的测试平台`https://2662r3426b.vicp.fun`,从开放以来就使用了该方法,效果良好。
教程可参考B站博主`毕乐labs`发布的视频教程:[《开源小智服务器xiaozhi-server自动更新以及最新版本MCP接入点配置保姆教程》](https://www.bilibili.com/video/BV15H37zHE7Q)
# 开始条件
- 你的电脑/服务器是linux操作系统
- 你已经跑通了整个流程
- 你喜欢跟进最新功能,但是觉得每次手动部署有点麻烦,期待有一个自动更新的方法
第二个条件必须满足,因为本教程所涉及的某些文件,JDK、Node.js环境、Conda环境等,是需要你跑通整个流程才有的,如果你没有跑通,当我讲到某个文件的时候,你可能就不知道什么意思。
# 教程效果
- 解决国内不能拉取最新项目源码问题
- 自动拉取代码编译前端文件
- 自动拉取代码编译java文件,自动杀掉8002端口,自动启动8002端口
- 自动拉取python代码,自动杀掉8000端口,自动启动8000端口
# 第一步 选好你的项目目录
例如,我规划了我的项目目录是,这是一个新建的空白的目录,如果你不想出错,可以和我一样
```
/home/system/xiaozhi
```
# 第二步 克隆本项目
此刻,先要执行第一句话,拉取源码,这句命令适用于国内网络的服务器和电脑,无需翻墙
```
cd /home/system/xiaozhi
git clone https://ghproxy.net/https://github.com/xinnan-tech/xiaozhi-esp32-server.git
```
执行完后,你的项目目录会多了一个文件夹`xiaozhi-esp32-server`,这个就是项目的源码
# 第三步 复制基础的文件
如果你之前已经跑通了整个流程,对funasr的模型文件`xiaozhi-server/models/SenseVoiceSmall/model.pt`和你的私有配置文件`xiaozhi-server/data/.config.yaml`这两个文件不会陌生。
此刻你需要把`model.pt`文件复制到新的目录去,你可以这样
```
# 创建需要的目录
mkdir -p /home/system/xiaozhi/xiaozhi-esp32-server/main/xiaozhi-server/data/
cp 你原来的.config.yaml完整路径 /home/system/xiaozhi/xiaozhi-esp32-server/main/xiaozhi-server/data/.config.yaml
cp 你原来的model.pt完整路径 /home/system/xiaozhi/xiaozhi-esp32-server/main/xiaozhi-server/models/SenseVoiceSmall/model.pt
```
# 第四步 建立三个自动编译文件
## 4.1 自动编译mananger-web模块
`/home/system/xiaozhi/`目录下,创建名字为`update_8001.sh`的文件,内容如下
```
cd /home/system/xiaozhi/xiaozhi-esp32-server
git fetch --all
git reset --hard
git pull origin main
cd /home/system/xiaozhi/xiaozhi-esp32-server/main/manager-web
npm install
npm run build
rm -rf /home/system/xiaozhi/manager-web
mv /home/system/xiaozhi/xiaozhi-esp32-server/main/manager-web/dist /home/system/xiaozhi/manager-web
```
保存好后执行赋权命令
```
chmod 777 update_8001.sh
```
执行完后,继续往下
## 4.2 自动编译运行manager-api模块
`/home/system/xiaozhi/`目录下,创建名字为`update_8002.sh`的文件,内容如下
```
cd /home/system/xiaozhi/xiaozhi-esp32-server
git pull origin main
cd /home/system/xiaozhi/xiaozhi-esp32-server/main/manager-api
rm -rf target
mvn clean package -Dmaven.test.skip=true
cd /home/system/xiaozhi/
# 查找占用8002端口的进程号
PID=$(sudo netstat -tulnp | grep 8002 | awk '{print $7}' | cut -d'/' -f1)
rm -rf /home/system/xiaozhi/xiaozhi-esp32-api.jar
mv /home/system/xiaozhi/xiaozhi-esp32-server/main/manager-api/target/xiaozhi-esp32-api.jar /home/system/xiaozhi/xiaozhi-esp32-api.jar
# 检查是否找到进程号
if [ -z "$PID" ]; then
echo "没有找到占用8002端口的进程"
else
echo "找到占用8002端口的进程,进程号为: $PID"
# 杀掉进程
kill -9 $PID
kill -9 $PID
echo "已杀掉进程 $PID"
fi
nohup java -jar xiaozhi-esp32-api.jar --spring.profiles.active=dev &
tail tail -f nohup.out
```
保存好后执行赋权命令
```
chmod 777 update_8002.sh
```
执行完后,继续往下
## 4.3 自动编译运行Python项目
`/home/system/xiaozhi/`目录下,创建名字为`update_8000.sh`的文件,内容如下
```
cd /home/system/xiaozhi/xiaozhi-esp32-server
git pull origin main
# 查找占用8000端口的进程号
PID=$(sudo netstat -tulnp | grep 8000 | awk '{print $7}' | cut -d'/' -f1)
# 检查是否找到进程号
if [ -z "$PID" ]; then
echo "没有找到占用8000端口的进程"
else
echo "找到占用8000端口的进程,进程号为: $PID"
# 杀掉进程
kill -9 $PID
kill -9 $PID
echo "已杀掉进程 $PID"
fi
cd main/xiaozhi-server
# 初始化conda环境
source ~/.bashrc
conda activate xiaozhi-esp32-server
pip install -r requirements.txt
nohup python app.py >/dev/null &
tail -f /home/system/xiaozhi/xiaozhi-esp32-server/main/xiaozhi-server/tmp/server.log
```
保存好后执行赋权命令
```
chmod 777 update_8000.sh
```
执行完后,继续往下
# 日常更新
以上的脚本都建立好后,日常更新,我们只要依次执行以下命令就可以做到自动更新和启动
```
cd /home/system/xiaozhi
# 更新并启动Java程序
./update_8001.sh
# 更新web程序
./update_8002.sh
# 更新并启动python程序
./update_8000.sh
# 后期想查看java日志,执行以下命令
tail -f nohup.out
# 后期想查看python日志,执行以下命令
tail -f /home/system/xiaozhi/xiaozhi-esp32-server/main/xiaozhi-server/tmp/server.log
```
# 注意事项
测试平台`https://2662r3426b.vicp.fun`,是使用nginx做了反向代理。nginx.conf详细配置可以[参考这里](https://github.com/xinnan-tech/xiaozhi-esp32-server/issues/791)
## 常见问题
### 1、为什么没有见到8001端口?
回答:8001是开发环境使用的,用于运行前端的端口。如果你是服务器部署,不建议使用`npm run serve`启动8001端口运行前端,而是像本教程一样编译成html文件,然后使用nginx来管理访问。
### 2、每次更新需要更新手动SQL语句吗?
回答:不需要,因为项目使用**Liquibase**管理数据库版本,会自动执行新的sql脚本。
+220
View File
@@ -0,0 +1,220 @@
# 数字人digital-human启动方法
## 概述
测试页面集成了基于 **Sherpa-ONNX** 的高精度语音唤醒功能,支持自定义唤醒词和实时检测。使用轻量级关键词检测模型,提供毫秒级响应速度。
## 唤醒词模型
### 模型下载(必需)
**重要说明**: 项目不包含模型文件,需要提前下载配置。
### 官方模型下载地址
- **官方模型列表**: <https://csukuangfj.github.io/sherpa/onnx/kws/pretrained_models/index.html>
- **推荐模型**: `sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01`
### 下载和配置步骤
#### 1. 下载模型包
```bash
# 方法1:直接下载(推荐)
cd main/digital-human/wakeword_runtime/
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/kws-models/sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz2
# 解压
tar xvf sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz2
# 方法2:使用ModelScope
pip install modelscope
python -c "
from modelscope import snapshot_download
snapshot_download('pkufool/sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01', cache_dir='./models')
"
```
#### 2. 配置模型文件
模型包下载后包含以下文件:
```
sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01/
├── encoder-epoch-12-avg-2-chunk-16-left-64.int8.onnx # 速度优先
├── encoder-epoch-12-avg-2-chunk-16-left-64.onnx
├── encoder-epoch-99-avg-1-chunk-16-left-64.int8.onnx # 速度优先
├── encoder-epoch-99-avg-1-chunk-16-left-64.onnx # 精度优先
├── decoder-epoch-12-avg-2-chunk-16-left-64.onnx
├── decoder-epoch-99-avg-1-chunk-16-left-64.onnx # 精度优先
├── joiner-epoch-12-avg-2-chunk-16-left-64.int8.onnx # 速度优先
├── joiner-epoch-12-avg-2-chunk-16-left-64.onnx
├── joiner-epoch-99-avg-1-chunk-16-left-64.int8.onnx # 速度优先
├── joiner-epoch-99-avg-1-chunk-16-left-64.onnx # 精度优先
├── tokens.txt # Token映射表(必需)
├── keywords_raw.txt # 模型包里可能附带(可选,runtime 不依赖)
├── keywords.txt # 现成的
├── test_wavs/ # 测试音频(可选)
├── configuration.json # 模型元信息(可选)
└── README.md # 说明文档(可选)
```
#### 3. 选择配置方案
**方案一:精度优先(推荐)**
```bash
cd sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01
# 创建模型目录
mkdir -p ../models
# 复制精度优先的epoch-99 fp32三件套
cp encoder-epoch-99-avg-1-chunk-16-left-64.onnx ../models/encoder.onnx
cp decoder-epoch-99-avg-1-chunk-16-left-64.onnx ../models/decoder.onnx
cp joiner-epoch-99-avg-1-chunk-16-left-64.onnx ../models/joiner.onnx
# 复制配套文件
cp tokens.txt ../models/tokens.txt
# keywords_raw.txt 如果模型包里附带,可自行保留;runtime 不依赖它
```
**方案二:速度优先**
```bash
cd sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01
# 创建模型目录
mkdir -p ../models
# 复制速度优先的epoch-99 int8三件套
cp encoder-epoch-99-avg-1-chunk-16-left-64.int8.onnx ../models/encoder.onnx
cp decoder-epoch-99-avg-1-chunk-16-left-64.onnx ../models/decoder.onnx
cp joiner-epoch-99-avg-1-chunk-16-left-64.int8.onnx ../models/joiner.onnx
# 复制配套文件
cp tokens.txt ../models/tokens.txt
```
**注意事项**:
- **不要混用 fp32 与 int8**:三个模型文件必须保持一致的精度
- **优先选择 epoch-99**:比 epoch-12 训练更充分,精度更高
- **必需文件**`encoder.onnx` + `decoder.onnx` + `joiner.onnx` + `tokens.txt` + `keywords.txt`
### 最终模型文件结构
配置完成后,模型文件应放在 `wakeword_runtime/models/` 目录下,完整路径为 `main/digital-human/wakeword_runtime/models/`
```
wakeword_runtime/models/
├── encoder.onnx # 编码器模型(重命名后)
├── decoder.onnx # 解码器模型(重命名后)
├── joiner.onnx # 连接器模型(重命名后)
├── tokens.txt # 拼音 Token 映射表(228行版本)
├── keywords.txt # 关键词配置文件(首次启动自动生成)
└── keywords_raw.txt # 可选,runtime 不依赖
```
## 启动方式
`main/digital-human` 目录执行:
```bash
pip install -r wakeword_runtime/requirements.txt
python start.py
```
启动后默认地址:
- 页面地址:`http://127.0.0.1:8006/index.html`
- 事件桥地址:`ws://127.0.0.1:8006/wakeword-ws`
- 健康检查:`http://127.0.0.1:8006/health`
停止方式:
- 在运行终端按 `Ctrl+C`
- 会同时停止静态页面服务、事件桥和唤醒词检测流程
## 配置文件说明
配置文件位于 [main/digital-human/wakeword_runtime/config.json](../main/digital-human/wakeword_runtime/config.json)。
当前主要配置项:
```json
{
"wakeword": {
"enabled": true
},
"model_dir": "models",
"audio": {
"input_device": null,
"sample_rate": 16000,
"channels": 1
},
"detector": {
"num_threads": 4,
"provider": "cpu",
"max_active_paths": 2,
"keywords_score": 1.8,
"keywords_threshold": 0.1,
"num_trailing_blanks": 1,
"cooldown_seconds": 1.5
},
"logging": {
"level": "INFO",
"dir": "logs",
"file": "wakeword-runtime.log"
}
}
```
各字段含义:
| 参数 | 说明 |
| --- | --- |
| `wakeword.enabled` | 是否启用本地唤醒词检测 |
| `model_dir` | 模型和词表所在目录 |
| `audio.input_device` | 麦克风输入设备,默认使用系统默认设备 |
| `audio.sample_rate` | 采样率,默认 `16000` |
| `audio.channels` | 声道数,默认 `1` |
| `detector.num_threads` | 检测器线程数 |
| `detector.provider` | 推理 provider,当前通常为 `cpu` |
| `detector.max_active_paths` | 搜索路径数 |
| `detector.keywords_score` | 关键词增强分数 |
| `detector.keywords_threshold` | 检测阈值 |
| `detector.num_trailing_blanks` | 尾随空白数量 |
| `detector.cooldown_seconds` | 连续触发冷却时间 |
| `logging.level` | 日志等级 |
| `logging.dir` | 日志目录 |
| `logging.file` | 日志文件名 |
## 推荐使用流程
### 首次使用
1. 准备 `models/` 目录下的模型文件和 `tokens.txt`
2. 确认 `models/keywords.txt` 存在
3.`digital-human` 目录运行 `python start.py`
4. 浏览器打开 `http://127.0.0.1:8006/index.html`
5. 进入设置页检查“唤醒词”配置
### 修改唤醒词
1. 打开数字人页面设置
2. 切到“唤醒词”页签
3. 修改启用状态或唤醒词列表
4. 点击“应用唤醒词”
5. 根据提示决定是否立即重启
### 禁用唤醒词
1. 将“启用本地唤醒词”改成禁用
2. 点击“应用唤醒词”
3. 建议立即重启一次
禁用后:
- 页面与事件桥仍然可用
- 唤醒词检测不会继续运行
+9 -34
View File
@@ -8,39 +8,14 @@ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
```
2、编译docker镜像
```
# 普通编译
docker build -t xiaozhi-esp32-server:local -f ./Dockerfile-pip .
```
3、测试本地镜像
```
docker stop xiaozhi-esp32-server
docker rm xiaozhi-esp32-server
docker run -d --name xiaozhi-esp32-server --restart always -p 8000:8000 -v $(pwd)/data/.config.yaml:/opt/xiaozhi-esp32-server/config.yaml xiaozhi-esp32-server:local
docker logs -f xiaozhi-esp32-server
#进入项目根目录
# 编译server
docker build -t xiaozhi-esp32-server:server_latest -f ./Dockerfile-server .
# 编译web
docker build -t xiaozhi-esp32-server:web_latest -f ./Dockerfile-web .
# 编译完成后,可以使用docker-compose启动项目
# docker-compose.yml你需要修改成自己编译的镜像版本
cd main/xiaozhi-server
docker compose up -d
```
5、发布腾讯云镜像
```
# amd64
docker tag xiaozhi-esp32-server:local ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-amd64
docker push ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-amd64
# arm64
docker tag xiaozhi-esp32-server:local ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-arm64
docker push ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-arm64
# 推送最新版本
docker manifest rm ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest
docker manifest create ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-amd64 ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest-arm64 --amend
docker manifest inspect ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest
docker manifest push ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest
```
6、运行线上镜像
```
cd /Users/hrz/myworkspace/docker-java-env/thirddata/
docker run -d --name xiaozhi-esp32-server --restart always -p 8000:8000 -v $(pwd)/config.yaml:/opt/xiaozhi-esp32-server/config.yaml ccr.ccs.tencentyun.com/xinnan/xiaozhi-esp32-server:latest
docker logs -f xiaozhi-esp32-server
```
+53
View File
@@ -0,0 +1,53 @@
user root;
worker_processes 4;
events {
worker_connections 1024;
}
http {
include mime.types;
default_type application/octet-stream;
sendfile on;
keepalive_timeout 300;
client_header_timeout 180s;
client_body_timeout 180s;
client_max_body_size 1024M;
gzip on;
gzip_buffers 32 4K;
gzip_comp_level 6;
gzip_min_length 100;
gzip_types application/javascript text/css text/xml image/jpeg image/gif image/png;
gzip_disable "MSIE [1-6]\.";
gzip_vary on;
server {
# 无域名访问,就用localhost
server_name localhost;
# 80端口
listen 8002;
# 转发到编译后到web目录
location / {
root /usr/share/nginx/html;
try_files $uri $uri/ /index.html;
}
# 转发到manager-api
location /xiaozhi/ {
proxy_pass http://127.0.0.1:8003;
proxy_set_header Host $host;
proxy_cookie_path /manager/ /;
proxy_set_header Referer $http_referer;
proxy_set_header Cookie $http_cookie;
proxy_connect_timeout 15;
proxy_send_timeout 15;
proxy_read_timeout 15;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
}
+13
View File
@@ -0,0 +1,13 @@
#!/bin/bash
# 启动Java后端(docker内监听8003端口)
java -jar /app/xiaozhi-esp32-api.jar \
--server.port=8003 \
--spring.datasource.druid.url=${SPRING_DATASOURCE_DRUID_URL} \
--spring.datasource.druid.username=${SPRING_DATASOURCE_DRUID_USERNAME} \
--spring.datasource.druid.password=${SPRING_DATASOURCE_DRUID_PASSWORD} \
--spring.data.redis.host=${SPRING_DATA_REDIS_HOST} \
--spring.data.redis.password=${SPRING_DATA_REDIS_PASSWORD} \
--spring.data.redis.port=${SPRING_DATA_REDIS_PORT} &
# 启动Nginx(前台运行保持容器存活)
nginx -g 'daemon off;'
+90 -41
View File
@@ -1,40 +1,81 @@
# 编译esp32固件
# esp32固件编译
1. 下载`xiaozhi-esp32`
项目,按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
## 第1步 准备你的ota地址
2. 打开`xiaozhi-esp32/main/Kconfig.projbuild`文件,找到`WEBSOCKET_URL``default`的内容,把`wss://api.tenclass.net`
改成你自己的地址,例如,我的接口地址是`ws://192.168.1.25:8000`,就把内容改成这个。
如果你,使用的是本项目0.3.12版本,不管是简单Server部署还是全模块部署,都会有ota地址。
由于简单Server部署和全模块部署的OTA地址设置方式不一样,请你选择下面的具体方式:
### 如果你用的是简单Server部署
此刻,请你用浏览器打开你的ota地址,例如我的ota地址
```
http://192.168.1.25:8003/xiaozhi/ota/
```
如果显示“OTA接口运行正常,向设备发送的websocket地址是:ws://xxx:8000/xiaozhi/v1/
你可以启动`digital-human`模块后打开`index.html`测试一下,是否能连上ota页面输出的websocket地址。
如果访问不到,你需要到配置文件`.config.yaml`里修改`server.websocket`的地址,重启后再重新测试,直到`index.html`能正常访问。
成功后,请往下进行第2步
### 如果你用的是全模块部署
此刻,请你用浏览器打开你的ota地址,例如我的ota地址
```
http://192.168.1.25:8002/xiaozhi/ota/
```
如果显示“OTA接口运行正常,websocket集群数量:X”。那就往下进行2步。
如果显示“OTA接口运行不正常”,大概是你还没在`智控台`配置`Websocket`地址。那就:
- 1、使用超级管理员登录智控台
- 2、顶部菜单点击`参数管理`
- 3、在列表中找到`server.websocket`项目,输入你的`Websocket`地址。例如我的就是
```
ws://192.168.1.25:8000/xiaozhi/v1/
```
配置完后,再使用浏览器刷新你的ota接口地址,看看是不是正常了。如果还不正常就,就再次确认一下Websocket是否正常启动,是否配置了Websocket地址。
## 第2步 配置环境
先按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
## 第3步 打开配置文件
配置好编译环境后,下载虾哥iaozhi-esp32项目源码,
从这里下载虾哥[xiaozhi-esp32项目源码](https://github.com/78/xiaozhi-esp32)。
下载后,打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
## 第4步 修改OTA地址
找到`OTA_URL``default`的内容,把`https://api.tenclass.net/xiaozhi/ota/`
改成你自己的地址,例如,我的接口地址是`http://192.168.1.25:8002/xiaozhi/ota/`,就把内容改成这个。
修改前:
```
config WEBSOCKET_URL
depends on CONNECTION_TYPE_WEBSOCKET
string "Websocket URL"
default "wss://api.tenclass.net/xiaozhi/v1/"
config OTA_URL
string "Default OTA URL"
default "https://api.tenclass.net/xiaozhi/ota/"
help
Communication with the server through websocket after wake up.
The application will access this URL to check for new firmwares and server address.
```
修改后(示例)
修改后:
```
config WEBSOCKET_URL
depends on CONNECTION_TYPE_WEBSOCKET
string "Websocket URL"
default "ws://192.168.1.25:8000/xiaozhi/v1/"
config OTA_URL
string "Default OTA URL"
default "http://192.168.1.25:8002/xiaozhi/ota/"
help
Communication with the server through websocket after wake up.
The application will access this URL to check for new firmwares and server address.
```
注意:你的地址是`ws://`开头,不是`wss://`开头,一定不要写错了。
## 第4步 设置编译参数
注意:你的地址是`ws://`开头,不是`wss://`开头,一定不要写错了。
注意:你的地址是`ws://`开头,不是`wss://`开头,一定不要写错了。
3. 设置编译参数
设置编译参数
```
# 终端命令行进入xiaozhi-esp32的根目录
@@ -45,40 +86,29 @@ idf.py set-target esp32s3
idf.py menuconfig
```
![图片](images/build_setting01.png)
进入菜单配置后,再进入`Xiaozhi Assistant`,将`CONNECTION_TYPE`设置为`Websocket`
回退到主菜单,再进入`Xiaozhi Assistant`,将`BOARD_TYPE`设置你板子的具体型号
进入菜单配置后,再进入`Xiaozhi Assistant`,将`BOARD_TYPE`设置你板子的具体型号
保存退出,回到终端命令行。
![图片](images/build_setting02.png)
4. 编译固件
## 第5步 编译固件
```
idf.py build
```
如果是vscode安装的idf可以使用`F1`或者`ctrl+shift+p`,输入idf然后直接选择进行编译
还可以直接进行烧录不用接下来的操作
<img src="./images/vscode_idf.png" width="500px"/>
5. 打包bin固件
## 第6步 打包bin固件
```
cd scripts
python release.py
```
编译成功后,会在项目根目录下的`build`目录下生成固件文件`merged-binary.bin`
上面的打包命令执行完成后,会在项目根目录下的`build`目录下生成固件文件`merged-binary.bin`
这个`merged-binary.bin`就是要烧录到硬件上的固件文件。
注意:如果执行到第二命令后,报了“zip”相关的错误,请忽略这个错误,只要`build`目录下生成固件文件`merged-binary.bin`
,对你没有太大影响,请继续。
6. 烧录固件
## 第7步 烧录固件
将esp32设备连接电脑,使用chrome浏览器,打开以下网址
```
@@ -87,3 +117,22 @@ https://espressif.github.io/esp-launchpad/
打开这个教程,[Flash工具/Web端烧录固件(无IDF开发环境)](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)。
翻到:`方式二:ESP-Launchpad 浏览器WEB端烧录`,从`3. 烧录固件/下载到开发板`开始,按照教程操作。
烧录成功且联网成功后,通过唤醒词唤醒小智,留意server端输出的控制台信息。
## 常见问题
以下是一些常见问题,供参考:
[1、为什么我说的话,小智识别出来很多韩文、日文、英文](./FAQ.md)
[2、为什么会出现“TTS 任务出错 文件不存在”?](./FAQ.md)
[3、TTS 经常失败,经常超时](./FAQ.md)
[4、使用Wifi能连接自建服务器,但是4G模式却接不上](./FAQ.md)
[5、如何提高小智对话响应速度?](./FAQ.md)
[6、我说话很慢,停顿时小智老是抢话](./FAQ.md)
[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)
+54
View File
@@ -0,0 +1,54 @@
# 基于虾哥编译好的固件配置自定义服务器
## 第1步 确认版本
烧录虾哥已经编译好的[1.6.1版本以上固件](https://github.com/78/xiaozhi-esp32/releases)
## 第2步 准备你的ota地址
如果你按照教程使用的是全模块部署,就应该会有ota地址。
此刻,请你用浏览器打开你的ota地址,例如我的ota地址
```
https://2662r3426b.vicp.fun/xiaozhi/ota/
```
如果显示“OTA接口运行正常,websocket集群数量:X”。那就往下。
如果显示“OTA接口运行不正常”,大概是你还没在`智控台`配置`Websocket`地址。那就:
- 1、使用超级管理员登录智控台
- 2、顶部菜单点击`参数管理`
- 3、在列表中找到`server.websocket`项目,输入你的`Websocket`地址。例如我的就是
```
wss://2662r3426b.vicp.fun/xiaozhi/v1/
```
配置完后,再使用浏览器刷新你的ota接口地址,看看是不是正常了。如果还不正常就,就再次确认一下Websocket是否正常启动,是否配置了Websocket地址。
## 第3步 进入配网模式
进入机器的配网模式,在页面顶部,点击“高级选项”,在里面输入你服务器的`ota`地址,点击保存。重启设备
![请参考-OTA地址设置](../docs/images/firmware-setting-ota.png)
## 第4步 唤醒小智,查看日志输出
唤醒小智,看看日志是不是正常输出。
## 常见问题
以下是一些常见问题,供参考:
[1、为什么我说的话,小智识别出来很多韩文、日文、英文](./FAQ.md)
[2、为什么会出现“TTS 任务出错 文件不存在”?](./FAQ.md)
[3、TTS 经常失败,经常超时](./FAQ.md)
[4、使用Wifi能连接自建服务器,但是4G模式却接不上](./FAQ.md)
[5、如何提高小智对话响应速度?](./FAQ.md)
[6、我说话很慢,停顿时小智老是抢话](./FAQ.md)
[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)
+72
View File
@@ -0,0 +1,72 @@
登录AutoDL,租赁镜像
选择镜像:
```
PyTorch / 2.1.0 / 3.10(ubuntu22.04) / cuda 12.1
```
机器开机后,设置学术加速
```
source /etc/network_turbo
```
进入工作目录
```
cd autodl-tmp/
```
拉取项目
```
git clone https://gitclone.com/github.com/fishaudio/fish-speech.git ; cd fish-speech
```
安装依赖
```
pip install -e.
```
如果报错,安装portaudio
```
apt-get install portaudio19-dev -y
```
安装后执行
```
pip install torch==2.3.1 torchvision==0.18.1 torchaudio==2.3.1 --index-url https://download.pytorch.org/whl/cu121
```
下载模型
```
cd tools
python download_models.py
```
下载完模型后运行接口
```
python -m tools.api_server --listen 0.0.0.0:6006
```
然后用浏览器去到aotodl实例页面
```
https://autodl.com/console/instance/list
```
如下图点击你刚才机器的`自定义服务`按钮,开启端口转发服务
![自定义服务](images/fishspeech/autodl-01.png)
端口转发服务设置完成后,你本地电脑打开网址`http://localhost:6006/`,就可以访问fish-speech的接口了
![服务预览](images/fishspeech/autodl-02.png)
如果你是单模块部署,核心配置如下
```
selected_module:
TTS: FishSpeech
TTS:
FishSpeech:
reference_audio: ["config/assets/wakeup_words.wav",]
reference_text: ["哈啰啊,我是小智啦,声音好听的台湾女孩一枚,超开心认识你耶,最近在忙啥,别忘了给我来点有趣的料哦,我超爱听八卦的啦",]
api_key: "123"
api_url: "http://127.0.0.1:6006/v1/tts"
```
然后重启服务
+226
View File
@@ -0,0 +1,226 @@
# 小智ESP32-开源服务端与HomeAssistant集成指南
[TOC]
-----
## 简介
本文档将指导您如何将ESP32设备与HomeAssistant进行集成。
## 前提条件
- 已安装并配置好`HomeAssistant`
- 本次我选择的模型是:免费的ChatGLM,它支持functioncall函数调用
## 开始前的操作(必要)
### 1. 获取HA的网络网络地址信息
请访问你Home Assistant的网络地址,例如,我的HA的地址是192.168.4.7,端口则是默认的8123,则在浏览器打开
```
http://192.168.4.7:8123
```
> 手动查询 HA 的 IP 地址方法**(仅限小智esp32-server和HA部署在同一个网络设备[例如同一个wifi]下)**:
>
> 1. 进入 Home Assistant(前端)。
>
> 2. 点击左下角 **设置(Settings** → **系统(System** → **网络(Network**。
>
> 3. 滑到最底部`Home Assistant 网址(Home Assistant website)`区域,在`本地网络(local network)`中,点击`眼睛`按钮,可以看到当前使用的 IP 地址(如 `192.168.1.10`)和网络接口。点击`复制连接(copy link)`可以直接复制。
>
> ![image-20250504051716417](images/image-ha-integration-01.png)
或,您已经设置了直接可以访问的Home Assistant的OAuth地址,您也可以在浏览器内直接访问
```
http://homeassistant.local:8123
```
### 2. 登录`Home Assistant`拿到开发密钥
登录`HomeAssistant`,点击`左下角头像 -> 个人`,切换`安全`导航栏,划到底部`长期访问令牌`生成api_key,并复制保存,后续的方法都需要使用这个api key且仅出现一次(小tips: 您可以保存生成的二维码图像,后续可以扫描二维码再此提取api key)。
## 方法1:小智社区共建的HA调用功能
### 功能描述
- 如您后续需要增加新的设备,该方法需要手动重启`xiaozhi-esp32-server服务端`以此更新设备信息**(重要**)。
- 需要您确保已经在HomeAssistant中集成`Xiaomi Home`,并将米家的设备导入进`HomeAssistant`
- 需要您确保`xiaozhi-esp32-server智控台`能正常使用。
- 我的`xiaozhi-esp32-server智控台``HomeAssistant`部署在同一台机器的另一个端口,版本是`0.3.10`
```
http://192.168.4.7:8002
```
### 配置步骤
#### 1. 登录`HomeAssistant`整理需要控制的设备清单
登录`HomeAssistant`,点击`左下角的设置`,然后进入`设备与服务`,再点击顶部的`实体`。
然后在实体中搜索你相关控制的开关,结果出来后,在列表中,点击其中一个结果,这是会出现一个开关的界面。
在开关的界面,我们尝试点击开关,看看是开发会随着我们的点击开/关。如果能操作,说明是正常联网的。
接着在开关面板找到设置按钮,点击后,可以查看这个开关的`实体标识符`。
我们打开一个记事本,按照这样格式整理一条数据:
位置+英文逗号+设备名称+英文逗号+`实体标识符`+英文分号
例如,我在公司,我有一个玩具灯,他的标识符是switch.cuco_cn_460494544_cp1_on_p_2_1,那么就这个写这一条数据
```
公司,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1;
```
当然最后我可能要操作两个灯,我的最终的结果是:
```
公司,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1;
公司,台灯,switch.iot_cn_831898993_socn1_on_p_2_1;
```
这段字符,我们称为“设备清单字符”需要保存好,等一下有用。
#### 2. 登录`智控台`
![image-20250504051716417](images/image-ha-integration-06.png)
使用管理员账号,登录`智控台`。在`智能体管理`,找到你的智能体,再点击`配置角色`。
将意图识别设置成`外挂的大模型意图识别`或`大模型自主函数调用`。这时你会看到右侧有一个`编辑功能`。点击`编辑功能`按钮,会弹出`功能管理`的框。
在`功能管理`的框里,你需要勾选`HomeAssistant设备状态查询`和`HomeAssistant设备状态修改`。
勾选后,在`已选功能`点击`HomeAssistant设备状态查询`,然后在`参数配置`里配置你的`HomeAssistant`地址、密钥、设备清单字符。
编辑好后,点击`保存配置`,这时`功能管理`的框会隐藏,这时你再点击保存智能体配置。
保存成功后,即可唤醒设备操作。
#### 3. 唤醒设别进行控制
尝试和esp32说,“打开XXX灯”
## 方法2:小智将Home Assistant的语音助手作为LLM工具
### 功能描述
- 该方法有一个比较严重的缺点——**该方法无法使用小智开源生态的function_call插件功能的能力**,因为使用Home Assistant作为小智的LLM工具会将意图识别能力转让给Home Assistant。但是**这个方法是能体验到原生的Home Assistant操作功能,且小智的聊天能力不变**。如实在介意可以使用同样是Home Assistant支持的[方法3](##方法3:使用Home Assistant的MCP服务(推荐)),能够最大程度体验到Home Assistant的功能。
### 配置步骤:
#### 1. 配置Home Assistant的大模型语音助手。
**需要您提前配置好Home Assistant的语音助手或大模型工具。**
#### 2. 获取Home Assistant的语言助手的Agent ID.
1. 进入Home Assistant页面内。左侧点击`开发者助手`。
2. 在打开的`开发者助手`内,点击`动作`选项卡(如图示操作1),在页面内的选项栏`动作`中,找到或输入`conversation.process(对话-处理)`并选择`对话(conversation: 处理`(如图示操作2)。
![image-20250504043539343](images/image-ha-integration-02.png)
3. 在页面内勾选`代理(agent)`选项,在变成常亮的`对话代理(conversation agent)`内选择您步骤一配置好的语音助手名称,如图示,我这边配置好的是`ZhipuAi`并选择。
![image-20250504043854760](images/image-ha-integration-03.png)
4. 选中后,点击表单左下方的`进入YAML模式`。
![image-20250504043951126](images/image-ha-integration-04.png)
5. 复制其中的agent-id的值,例如图示中我的是`01JP2DYMBDF7F4ZA2DMCF2AGX2`(仅供参考)。
![image-20250504044046466](images/image-ha-integration-05.png)
6. 切换到小智开源服务端`xiaozhi-esp32-server`的`config.yaml`文件内,在LLM配置中,找到Home Assistant,设置您的Home Assistant的网络地址,Api key和刚刚查询到的agent_id。
7. 修改`config.yaml`文件内的`selected_module`属性的`LLM`为`HomeAssistant``Intent`为`nointent`。
8. 重启小智开源服务端`xiaozhi-esp32-server`即可正常使用。
## 方法3:使用Home Assistant的MCP服务(推荐)
### 功能描述
- 需要您提前在Home Assistant内集成并安装好HA集成——[Model Context Protocol Server](https://www.home-assistant.io/integrations/mcp_server/)。
- 这个方法与方法2都是HA官方提供的解决方法,与方法2不同的是,您可以正常使用小智开源服务端`xiaozhi-esp32-server`的开源共建的插件,同时允许您随意使用任何一个支持function_call功能的LLM大模型。
### 配置步骤
#### 1. 安装Home Assistant的MCP服务集成。
集成官方网址——[Model Context Protocol Server](https://www.home-assistant.io/integrations/mcp_server/)。。
或跟随以下手动操作。
> - 前往Home Assistant页面的**[设置 > 设备和服务(Settings > Devices & Services.](https://my.home-assistant.io/redirect/integrations)**。
>
> - 在右下角,选择 **[添加集成(Add Integration](https://my.home-assistant.io/redirect/config_flow_start?domain=mcp_server)**按钮。
>
> - 从列表中选择**模型上下文协议服务器(Model Context Protocol Server**。
>
> - 按照屏幕上的说明完成设置。
#### 2. 配置小智开源服务端MCP配置信息
进入`data`目录,找到`.mcp_server_settings.json`文件。
如果你的`data`目录下没有`.mcp_server_settings.json`文件,
- 请把在`xiaozhi-server`文件夹根目录的`mcp_server_settings.json`文件复制到`data`目录下,并重命名为`.mcp_server_settings.json`
- 或[下载这个文件](https://github.com/xinnan-tech/xiaozhi-esp32-server/blob/main/main/xiaozhi-server/mcp_server_settings.json),下载到`data`目录下,并重命名为`.mcp_server_settings.json`
修改`"mcpServers"`里的这部分的内容:
```json
"Home Assistant": {
"command": "mcp-proxy",
"args": [
"http://YOUR_HA_HOST/mcp_server/sse"
],
"env": {
"API_ACCESS_TOKEN": "YOUR_API_ACCESS_TOKEN"
}
},
```
注意:
1. **替换配置:**
- 替换`args`内的`YOUR_HA_HOST`为您的HA服务地址,如果你的服务地址已经包含了https/http字样(例如`http://192.168.1.101:8123`),则只需要填入`192.168.1.101:8123`即可。
- 将`env`内`API_ACCESS_TOKEN`的`YOUR_API_ACCESS_TOKEN`替换成您之前获取到的开发密钥api key。
2. **如果你添加配置是在`"mcpServers"`的括号内后续没有新的`mcpServers`的配置时,需要把最后的逗号`,`移除**,否则可能会解析失败。
**最后效果参考以下(参考如下)**:
```json
"mcpServers": {
"Home Assistant": {
"command": "mcp-proxy",
"args": [
"http://192.168.1.101:8123/mcp_server/sse"
],
"env": {
"API_ACCESS_TOKEN": "abcd.efghi.jkl"
}
}
}
```
#### 3. 配置小智开源服务端的系统配置
1. **选择任意一款支持function_call的LLM大模型作为小智的LLM聊天助手(但不要选择Home Assistant作为LLM工具)**,本次我选择的模型是:免费的ChatGLM,它支持functioncall函数调用,但部分时候调用不太稳定,如果像追求稳定建议把LLM设置成:DoubaoLLM,使用的具体model_name是:doubao-1-5-pro-32k-250115。
2. 切换到小智开源服务端`xiaozhi-esp32-server`的`config.yaml`文件内,设置您的LLM大模型配置,并且将`selected_module`配置的`Intent`调整为`function_call`。
3. 重启小智开源服务端`xiaozhi-esp32-server`即可正常使用。
+58
View File
@@ -0,0 +1,58 @@
# 智控台 火山双流式语音合成+音色克隆配置教程
本教程分为4个阶段:准备阶段、配置阶段、克隆阶段、使用阶段。主要是介绍通过智控台配置火山双流式语音合成+音色克隆的过程。
## 第一阶段:准备阶段
超级管理员先预先把火山引擎服务开通好,获取到App Id,Access Token。默认火上引擎会赠送一个音色资源。这个音色资源需要把它复制到本项目里。
如果你想克隆多个音色,需要购买开通多个音色资源。只要把每个音色资源的声音ID(S_xxxxx)复制到本项目。然后分配给系统的账号使用即可。以下是详细步骤:
### 1.开通火山引擎服务
访问 https://console.volcengine.com/speech/app 在应用管理创建应用,勾选语音合成大模型和声音复刻大模型。
### 2.获取音色资源ID
访问 https://console.volcengine.com/speech/service/9999 复制三项内容,分别是App IdAccess Token以及声音ID(S_xxxxx)。如图
![获取音色资源](images/image-clone-integration-01.png)
## 第二阶段:配置火山引擎服务
### 1.填写火山引擎配置
使用超级管理员账号登录智控台,点击顶部【模型配置】,再点击模型配置页面左侧的【语音合成】,搜索找到“火山双流式语音合成”,点击修改,将你火山引擎的`App Id`填入到【应用ID】字段里,将`Access Token`填入到【访问令牌】字段里。然后保存。
### 2.将音色资源ID分配给系统账号
使用超级管理员账号登录智控台,点击顶部`参数字典`,在下拉菜单中,点击`系统功能配置`页面。在页面上勾选`音色克隆`,点击保存配置。即可在顶部菜单看到`音色克隆`按钮。
使用超级管理员账号登录智控台,点击顶部【音色克隆】、【音色资源】。
点击新增按钮,在【平台名称】选择“火山双流式语音合成”;
在【音色资源ID】填入你火山引擎的声音资源ID(S_xxxxx),填入后按回车;
在【归属账号】选择你要分配给的系统账号,你可以分配给你自己。然后点击保存
## 第三阶段:克隆阶段
如果登录后,点击顶部【音色克隆】》【音色克隆】,显示【您的账号暂无音色资源请联系管理员分配音色资源】,说明你在第二阶段还没有把音色资源ID分配给这个账号。那就是回到第二阶段,分配音色资源给对应的账号。
如果登录后,点击顶部【音色克隆】》【音色克隆】,能看到对应的音色列表。请继续。
在列表里会看到对应的音色列表。选择其中一个音色资源,点击【上传音频】按钮。上传后,可以试听一下声音或者截取某段声音。确认后点击【上传音频】按钮。
![上传音频](images/image-clone-integration-02.png)
上传音频后,在列表里会看到对应的音色会变成“待复刻”状态。点击【立即复刻】按钮。等1~2秒会返回结果。
如果复刻失败,请将鼠标放到“错误信息”图标上,会显示失败的原因。
如果复刻成功,在列表里会看到对应的音色会变成“训练成功”状态。此时你可以点击【声音名称】栏的修改按钮,修改音色资源的名称,方便后期选择使用。
## 第四阶段:使用阶段
点击顶部【智能体管理】,选择任意一个智能体,点击【配置角色】按钮。
语音合成(TTS)选择“火山双流式语音合成”。在列表里,找到名字带有“克隆音色”的音色资源(如图),选择它,点击保存。
![选择音色](images/image-clone-integration-03.png)
接下来,可以唤醒小智和它对话。

Some files were not shown because too many files have changed in this diff Show More