Commit Graph
163 Commits
Author SHA1 Message Date
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
hrzandGitHub bc44ea8757 Update connection.py 2025-06-05 17:07:29 +08:00
chan f8de052d54 fix: 使用deepseek r1-0528模型时,tools_call为空list,tools_call[0]报错 2025-06-05 16:33:47 +08:00
hrzandGitHub e776966ef9 Merge branch 'agent-plugin' into main 2025-06-04 23:52:33 +08:00
hrz d06e297c2d update:ASR加入队列 2025-06-04 11:41:04 +08:00
hrz ce776f210c update:智控台,完成mcp拍照识图 2025-06-01 13:34:32 +08:00
hrz c4f2411fee update:单模块部署xiaozhi-server,支持mcp调用摄像头识图 2025-06-01 02:26:19 +08:00
hrzandGitHub 02d66e8093 Merge pull request #1414 from myifeng/dev
修复 has_tool错误;优化检索复杂度
2025-05-30 16:03:36 +08:00
hrz b1bfaf5a5c update:双麦实时打断 2025-05-30 15:47:32 +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
myifeng a58ddd5880 为空判断处理; 2025-05-30 09:20:40 +08:00
hrz bb42095ca0 update:兼容豆包流式ASR 2025-05-29 23:56:34 +08:00
myifengandGitHub 3db46a84b2 Merge branch 'xinnan-tech:main' into dev 2025-05-29 16:13:13 +08:00
myifeng 4b212753fb 对接小智MCP协议控制 2025-05-29 13:42:31 +08:00
caixypromise fac1c4db7b chore: deleted debug logs. 2025-05-29 01:46:37 +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
hrz 2586843654 update:修复退出卡壳问题 2025-05-28 21:34:21 +08:00
hrz cd930edd06 update:优化资源释放判断 2025-05-28 18:22:31 +08:00
myifeng 19526878b3 接收hello消息中的features信息 2025-05-28 11:49:18 +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
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
hrz 631787a4f1 update:这几天tts流式改造合并后,self.executor的主要任务将是用来上报聊天记录,因此这里其实可以合并在self.executor 2025-05-27 13:41:53 +08:00
hrzandGitHub baf174b059 Merge pull request #1223 from GOODDAYDAY/feature/muti_upload
feat: 增加上报线程池
2025-05-27 13:06:55 +08:00
hrz b8349af3da update:合并双流式 2025-05-26 22:30:45 +08:00
goodyhao 761fc05331 feat: 增加上报时间 2025-05-26 20:27:22 +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
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
hrz 40632019ac update:优化 2025-05-25 08:56:58 +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 920cf4f897 update:优化 2025-05-24 12:11:13 +08:00
hrz 472106390d update:优化音频播放方法 2025-05-24 09:39:10 +08:00
hrz 98e2526f8a update:合并chat和chat_with_function_calling 2025-05-24 02:15:06 +08:00
Sakura-RanChen 02cb9c35b3 update: 记忆模块使用独立LLM openai增加超参 2025-05-22 17:14:58 +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 b8da0714c2 update:优化无用组件 2025-05-20 22:58:42 +08:00
caixypromise 34d9857089 feat: 新增智控台管理websocket服务器端【配置拉取】和【重启】 2025-05-20 20:02:16 +08:00
hrz 86b5eb1818 update:修复init_memorybug 2025-05-15 16:13:32 +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