Commit Graph
70 Commits
Author SHA1 Message Date
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
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
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
22ff7a92b8 fixed:ModuleNotFoundError: No module named 'opuslib' (#121)
Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 19:59:26 +08:00
3bc0b821a1 update: 修改了服务组件的性能测试代码 (#111)
* update: optimize performance test files

* update:异步测试方法

---------

Co-authored-by: hrz <1710360675@qq.com>
2025-02-23 16:07:33 +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
HuangandGitHub f6baaebba0 Merge pull request #69 from HonestQiao/main
minimax语音tts和阿里云智能语音tts适配
2025-02-19 01:25:42 +08:00
玄凤科技andGitHub 174ab7fdb7 本地模型不重复创建,共用一个 (#51)
* 本地模型不重复创建,共用一个

* 更新web端页面发布版本
2025-02-19 01:00:25 +08:00
HonestQiao b82aaf4867 minimax语音tts和阿里云智能语音tts适配 2025-02-18 22:58:35 +08:00
kalicyh 55981ec764 合并多个更新 (#68)
* 🐳 chore: 优化打包速度

使用国内镜像

* 🎈 perf: 优化打包速度

注释日志的时间信息

* 🐳 chore: 改用docker hub

* 🐎 ci(ci): 自动打包docker

* 🐳 chore: 更新文档

* 🎈 perf: 改用opuslib_next

* 🌈 style: 统一log
2025-02-18 21:33:40 +08:00
kalicyh cfcb6cb97d 🐞 fix(log): bug 2025-02-18 00:45:54 +08:00
kalicyh 2acee60d73 🦄 refactor(log): colorful log 2025-02-18 00:07:19 +08:00
玄凤科技andGitHub c90f4a0c32 Merge branch 'xinnan-tech:main' into main 2025-02-17 15:54:41 +08:00
玄凤科技 aa2d323951 增加通过认证码绑定设备和管理账户的功能,需要开启私有设备配置
增加登录用户鉴权
2025-02-17 15:53:48 +08:00
Kevincoooool f64f578d52 Update gpt_sovits_v2.py 2025-02-17 12:00:52 +08:00
hrz 8dd051944a update:输出地址提示 2025-02-16 21:48:25 +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
wjzdw007andGitHub 02d1a2b7e2 Merge branch 'xinnan-tech:main' into main 2025-02-16 01:00:17 +08:00
wjzdw007 905f3489a8 merge from master 2025-02-16 01:00:08 +08:00
hrz 6566fc8ae3 update:为安全考虑,绑定设备功能未处理之前,只限制一个账号注册 2025-02-16 00:58:31 +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
TOM88812 5b6899052a 修复WebUI api 请求地址,更新docker 部署 2025-02-15 22:36:01 +08:00
欣南科技andGitHub 069ddabe10 Merge branch 'main' into main 2025-02-15 21:13:50 +08:00
fofoandGitHub 68a008bcf0 Merge branch 'xinnan-tech:main' into main 2025-02-15 20:34:24 +08:00
fofo 9feb64486d add tts provider for fish-speech 2025-02-15 20:33:05 +08:00
hrz 2fe4f44529 update:优化http_server代码路径 2025-02-15 20:31:55 +08:00
玄凤科技 bef55e852c 增加设备私有配置,每台设备可以配置不同的模型和提示词
增加后台管理功能,可以通过后台调整设备私有配置信息
2025-02-15 19:48:46 +08:00
hrz 2baba43946 update:完成在web端,修改提示词功能 2025-02-15 19:38:32 +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
hrz e6381c6176 update:去掉重复方法 2025-02-15 11:48:02 +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 1384652dd9 no message 2025-02-15 09:56:24 +08:00
Habermehl 3b4c076f7e update: 添加主页路由和提示词配置界面 2025-02-15 02:09:09 +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 7686e5f1a9 Merge branch 'main' into develop
# Conflicts:
#	core/connection.py
#	core/handle/audioHandle.py
#	core/utils/util.py
2025-02-14 23:17:52 +08:00
hrz c8c75df890 update:优化docker-compose 2025-02-14 23:09:12 +08:00
玄凤科技 4d35a5ae6a 增加关闭聊天的功能
明确的退出命令可以直接关闭聊天
LLM检测到的结束聊天意图则在LLM回复后关闭聊天
2025-02-14 16:35:02 +08:00
玄凤科技 ce64a76dcf clone时修改项目名,也能正确找到项目根目录 2025-02-14 14:35:04 +08:00
hrz d2ecff8e6c update:优先放行设备白名单 2025-02-14 11:33:56 +08:00
欣南科技andGitHub e732adaec2 Merge branch 'main' into main 2025-02-14 10:45:15 +08:00