Commit Graph
55 Commits
Author SHA1 Message Date
玄凤科技 cf7acb12d8 Merge branch 'main' into mem0ai 2025-03-04 09:13:14 +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
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
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
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
2d01812f8d Performance test (#118)
* update: optimize performance test files

* update:异步测试方法

* update:改回默认FunASR

---------

Co-authored-by: Alexisxty <alexisty233@gmail.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 16:22:21 +08:00
148578399f 使用配置文件设置日志参数 (#116)
* 使用配置文件设置日志参数

* update:优化

---------

Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 15:18:59 +08:00
6c3fbd7a8f Doubao asr (#117)
* 添加豆包在线 ASR (#82)
---------
Co-authored-by: 胡垚 <qsct9501@163.com>
2025-02-23 14:38:21 +08:00
afa469c08c Home assistant (#97)
* add home assistant

* update home assistant remark

* update config

* update:优化文档

---------

Co-authored-by: ck3 <kyriechen03@qq.com>
Co-authored-by: Kyrie Chen <794103684@qq.com>
Co-authored-by: hrz <1710360675@qq.com>
2025-02-20 22:40:41 +08:00
hrz e804ab441c update:优化测试工具使用方法 2025-02-19 13:12:09 +08:00
hgy667 123606310c speedtest1.0 2025-02-19 12:23:37 +08:00
HonestQiao b82aaf4867 minimax语音tts和阿里云智能语音tts适配 2025-02-18 22:58:35 +08:00
hrz 6b1488bc3a update:完成2分钟不说话,自动断开连接的功能 2025-02-16 20:42:55 +08:00
欣南科技andGitHub 870a253912 Merge pull request #30 from Kevincoooool/add-gpt-sovits
增加gpt sovits tts,可以克隆音色
2025-02-16 15:27:52 +08:00
Kevincoooool 4281c3509e 增加gpt sovits tts,可以克隆音色 2025-02-16 15:26:13 +08:00
Kevincoooool 342a64fc03 增加coze llm 2025-02-16 15:22:28 +08:00
hrz ed7fea0b46 update:重新规划私有文件的存储目录 2025-02-16 10:37:43 +08:00
hrz 3f19c518d3 update:优化提示 2025-02-16 01:24:39 +08:00
hrz 920c329a8b update:优化CozeCnTTS申请token地址 2025-02-16 01:23:25 +08:00
wjzdw007 905f3489a8 merge from master 2025-02-16 01:00:08 +08:00
wjzdw007 0b4e708ef8 TTS 增加对coze cn平台的支持 2025-02-16 00:53:47 +08:00
hrz a640cbdd81 update:优化http_server所在目录 2025-02-15 23:49:29 +08:00
欣南科技andGitHub 069ddabe10 Merge branch 'main' into main 2025-02-15 21:13:50 +08:00
hrz b560160035 update:FishSpeech部署方式方式 2025-02-15 21:11:37 +08:00
fofo 9feb64486d add tts provider for fish-speech 2025-02-15 20:33:05 +08:00
玄凤科技 bef55e852c 增加设备私有配置,每台设备可以配置不同的模型和提示词
增加后台管理功能,可以通过后台调整设备私有配置信息
2025-02-15 19:48:46 +08:00
hrz 2901506157 update:优化页面样式 2025-02-15 16:17:08 +08:00
hrz 2379cdc3ba update:优化web端目录结构 2025-02-15 12:30:20 +08:00
欣南科技andGitHub 4d251367e9 Merge branch 'main' into webserver 2025-02-15 11:38:49 +08:00
hrz 7d30ddd660 update:优化gemini配置提示 2025-02-15 11:05:18 +08:00
hrz 0c554b00ec no message 2025-02-15 10:20:57 +08:00
hrz d45be0259b update:移除测试token 2025-02-15 10:01:50 +08:00
hrz 875c12caf2 Merge branch 'develop' of https://github.com/xinnan-tech/xiaozhi-esp32-server into develop 2025-02-15 09:57:37 +08:00
FHY da33ef41ee feat:添加硅基流动tts 2025-02-15 03:40:28 +08:00
Habermehl dbcadf99dd update: 添加HTTP配置服务器支持并更新相关配置 2025-02-15 02:01:54 +08:00
Habermehl 98cd1bae80 update: 添加Gemini LLM支持并更新配置 2025-02-15 01:36:20 +08:00
hrz c8c75df890 update:优化docker-compose 2025-02-14 23:09:12 +08:00
hrz d2ecff8e6c update:优先放行设备白名单 2025-02-14 11:33:56 +08:00
hrz 46d9e65a44 update:暂不开启auth 2025-02-14 10:58:48 +08:00
欣南科技andGitHub e732adaec2 Merge branch 'main' into main 2025-02-14 10:45:15 +08:00
玄凤科技 8266979e91 增加本地大模型ollama支持 2025-02-14 10:24:02 +08:00
欣南科技andGitHub 7c3a84a39c Update config.yaml 2025-02-14 10:01:08 +08:00
欣南科技andGitHub 8950c386f1 Update config.yaml 2025-02-14 09:56:01 +08:00
欣南科技andGitHub 5f34efbee3 Merge branch 'main' into main 2025-02-14 09:48:56 +08:00
欣南科技andGitHub 6a36520eb2 Merge branch 'main' into main 2025-02-14 00:31:20 +08:00
hrz fb69e7fc01 fixed:设置sentence_start成延迟发送,要不然跟语音无法对应 2025-02-13 21:22:36 +08:00
TOM88812 c358774e97 feat: 添加WS TOKEN 认证功能 2025-02-13 17:06:48 +08:00