From 41ad57ad4fdcfed29d33d5975494db4d7985828c Mon Sep 17 00:00:00 2001 From: 3030332422 <3030332422@qq.com> Date: Tue, 12 May 2026 09:27:39 +0800 Subject: [PATCH] =?UTF-8?q?update:test=E8=BF=81=E7=A7=BB=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=B8=BAdigital-human?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../digital-human-wakeword.md | 89 +++++++++--------- main/digital-human/README.md | 41 ++++++++ .../test => digital-human}/css/bg.png | Bin .../test => digital-human}/css/test_page.css | 0 .../test => digital-human}/favicon.ico | Bin .../test => digital-human}/images/1.png | Bin .../test => digital-human}/images/2.png | Bin .../test => digital-human}/images/3.png | Bin .../index.html} | 6 +- .../test => digital-human}/js/app.js | 0 .../js/config/default-mcp-tools.json | 0 .../js/config/manager.js | 0 .../js/core/audio/opus-codec.js | 0 .../js/core/audio/player.js | 0 .../js/core/audio/recorder.js | 0 .../js/core/audio/stream-context.js | 0 .../js/core/mcp/tools.js | 0 .../js/core/network/ota-connector.js | 0 .../js/core/network/wakeword-bridge.js | 0 .../js/core/network/websocket.js | 0 .../js/live2d/cubism4.min.js | 0 .../js/live2d/live2d.js | 0 .../js/live2d/live2dcubismcore.min.js | 0 .../test => digital-human}/js/live2d/pixi.js | 0 .../js/ui/background-load.js | 0 .../js/ui/controller.js | 0 .../js/utils/blocking-queue.js | 0 .../js/utils/libopus.js | 0 .../test => digital-human}/js/utils/logger.js | 0 .../resources/hiyori_pro_zh/ReadMe.txt | 0 .../hiyori_pro_zh/hiyori_pro_t04.can3 | Bin .../hiyori_pro_zh/hiyori_pro_t11.cmo3 | Bin .../hiyori_pro_t11.2048/texture_00.png | Bin .../hiyori_pro_t11.2048/texture_01.png | Bin .../runtime/hiyori_pro_t11.cdi3.json | 0 .../hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 | Bin .../runtime/hiyori_pro_t11.model3.json | 0 .../runtime/hiyori_pro_t11.physics3.json | 0 .../runtime/hiyori_pro_t11.pose3.json | 0 .../runtime/motion/hiyori_m01.motion3.json | 0 .../runtime/motion/hiyori_m02.motion3.json | 0 .../runtime/motion/hiyori_m03.motion3.json | 0 .../runtime/motion/hiyori_m04.motion3.json | 0 .../runtime/motion/hiyori_m05.motion3.json | 0 .../runtime/motion/hiyori_m06.motion3.json | 0 .../runtime/motion/hiyori_m07.motion3.json | 0 .../runtime/motion/hiyori_m08.motion3.json | 0 .../runtime/motion/hiyori_m09.motion3.json | 0 .../runtime/motion/hiyori_m10.motion3.json | 0 .../resources/natori_pro_zh/ReadMe.txt | 0 .../natori_pro_zh/natori_pro_exp_t03.can3 | Bin .../natori_pro_zh/natori_pro_motions_t03.can3 | Bin .../natori_pro_zh/natori_pro_t06.cmo3 | Bin .../natori_pro_zh/runtime/exp/Angry.exp3.json | 0 .../runtime/exp/Blushing.exp3.json | 0 .../runtime/exp/Normal.exp3.json | 0 .../natori_pro_zh/runtime/exp/Sad.exp3.json | 0 .../natori_pro_zh/runtime/exp/Smile.exp3.json | 0 .../runtime/exp/Surprised.exp3.json | 0 .../runtime/exp/exp_01.exp3.json | 0 .../runtime/exp/exp_02.exp3.json | 0 .../runtime/exp/exp_03.exp3.json | 0 .../runtime/exp/exp_04.exp3.json | 0 .../runtime/exp/exp_05.exp3.json | 0 .../runtime/motions/mtn_00.motion3.json | 0 .../runtime/motions/mtn_01.motion3.json | 0 .../runtime/motions/mtn_02.motion3.json | 0 .../runtime/motions/mtn_03.motion3.json | 0 .../runtime/motions/mtn_04.motion3.json | 0 .../runtime/motions/mtn_05.motion3.json | 0 .../runtime/motions/mtn_06.motion3.json | 0 .../runtime/motions/mtn_07.motion3.json | 0 .../natori_pro_zh/runtime/natori.pose3.json | 0 .../natori_pro_t06.4096/texture_00.png | Bin .../runtime/natori_pro_t06.cdi3.json | 0 .../natori_pro_zh/runtime/natori_pro_t06.moc3 | Bin .../runtime/natori_pro_t06.model3.json | 0 .../runtime/natori_pro_t06.physics3.json | 0 .../start.py} | 0 .../wakeword_runtime/__init__.py | 0 .../wakeword_runtime/bridge/__init__.py | 0 .../wakeword_runtime/bridge/event_bridge.py | 0 .../wakeword_runtime/config.json | 0 .../wakeword_runtime/config/__init__.py | 0 .../wakeword_runtime/config/config_loader.py | 0 .../wakeword_runtime/config/logging_setup.py | 0 .../wakeword_runtime/core/__init__.py | 0 .../wakeword_runtime/core/detector.py | 0 .../wakeword_runtime/core/detector_assets.py | 0 .../wakeword_runtime/core/microphone.py | 0 .../wakeword_runtime/plugins/__init__.py | 0 .../wakeword_runtime/plugins/audio.py | 0 .../wakeword_runtime/plugins/base.py | 0 .../wakeword_runtime/plugins/manager.py | 0 .../wakeword_runtime/plugins/wake_word.py | 0 .../wakeword_runtime/requirements.txt | 0 .../wakeword_runtime/runtime/__init__.py | 0 .../wakeword_runtime/runtime/app.py | 0 .../wakeword_runtime/runtime/http_server.py | 2 +- 99 files changed, 89 insertions(+), 49 deletions(-) rename main/xiaozhi-server/test/wakeword_runtime/README.md => docs/digital-human-wakeword.md (76%) create mode 100644 main/digital-human/README.md rename main/{xiaozhi-server/test => digital-human}/css/bg.png (100%) rename main/{xiaozhi-server/test => digital-human}/css/test_page.css (100%) rename main/{xiaozhi-server/test => digital-human}/favicon.ico (100%) rename main/{xiaozhi-server/test => digital-human}/images/1.png (100%) rename main/{xiaozhi-server/test => digital-human}/images/2.png (100%) rename main/{xiaozhi-server/test => digital-human}/images/3.png (100%) rename main/{xiaozhi-server/test/test_page.html => digital-human/index.html} (99%) rename main/{xiaozhi-server/test => digital-human}/js/app.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/config/default-mcp-tools.json (100%) rename main/{xiaozhi-server/test => digital-human}/js/config/manager.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/audio/opus-codec.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/audio/player.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/audio/recorder.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/audio/stream-context.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/mcp/tools.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/network/ota-connector.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/network/wakeword-bridge.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/core/network/websocket.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/live2d/cubism4.min.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/live2d/live2d.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/live2d/live2dcubismcore.min.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/live2d/pixi.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/ui/background-load.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/ui/controller.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/utils/blocking-queue.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/utils/libopus.js (100%) rename main/{xiaozhi-server/test => digital-human}/js/utils/logger.js (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/ReadMe.txt (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/hiyori_pro_t04.can3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/hiyori_pro_t11.cmo3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_00.png (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_01.png (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.cdi3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.model3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.physics3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.pose3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m01.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m02.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m03.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m04.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m05.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m06.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m07.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m08.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m09.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/hiyori_pro_zh/runtime/motion/hiyori_m10.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/ReadMe.txt (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/natori_pro_exp_t03.can3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/natori_pro_motions_t03.can3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/natori_pro_t06.cmo3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Angry.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Blushing.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Normal.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Sad.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Smile.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/Surprised.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/exp_01.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/exp_02.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/exp_03.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/exp_04.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/exp/exp_05.exp3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_00.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_01.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_02.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_03.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_04.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_05.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_06.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/motions/mtn_07.motion3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori.pose3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori_pro_t06.4096/texture_00.png (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori_pro_t06.cdi3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori_pro_t06.moc3 (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori_pro_t06.model3.json (100%) rename main/{xiaozhi-server/test => digital-human}/resources/natori_pro_zh/runtime/natori_pro_t06.physics3.json (100%) rename main/{xiaozhi-server/test/start_test_runtime.py => digital-human/start.py} (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/bridge/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/bridge/event_bridge.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/config.json (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/config/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/config/config_loader.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/config/logging_setup.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/core/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/core/detector.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/core/detector_assets.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/core/microphone.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/plugins/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/plugins/audio.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/plugins/base.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/plugins/manager.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/plugins/wake_word.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/requirements.txt (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/runtime/__init__.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/runtime/app.py (100%) rename main/{xiaozhi-server/test => digital-human}/wakeword_runtime/runtime/http_server.py (99%) diff --git a/main/xiaozhi-server/test/wakeword_runtime/README.md b/docs/digital-human-wakeword.md similarity index 76% rename from main/xiaozhi-server/test/wakeword_runtime/README.md rename to docs/digital-human-wakeword.md index c5d66064..71d147be 100644 --- a/main/xiaozhi-server/test/wakeword_runtime/README.md +++ b/docs/digital-human-wakeword.md @@ -1,8 +1,8 @@ -# Test 页面语音唤醒 +# 数字人唤醒词教程 ## 概述 -Test 页面集成了基于 **Sherpa-ONNX** 的高精度语音唤醒功能，支持自定义唤醒词和实时检测。使用轻量级关键词检测模型，提供毫秒级响应速度。 +测试页面集成了基于 **Sherpa-ONNX** 的高精度语音唤醒功能，支持自定义唤醒词和实时检测。使用轻量级关键词检测模型，提供毫秒级响应速度。 ## 唤醒词模型 @@ -21,7 +21,7 @@ Test 页面集成了基于 **Sherpa-ONNX** 的高精度语音唤醒功能，支 ```bash # 方法1：直接下载（推荐） -cd main/xiaozhi-server/test/wakeword_runtime/ +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 # 解压 @@ -42,13 +42,13 @@ snapshot_download('pkufool/sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01 ``` 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-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-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-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映射表（必需） @@ -71,12 +71,12 @@ 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 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 如果模型包里附带，可自行保留；test runtime 不依赖它 +# keywords_raw.txt 如果模型包里附带，可自行保留；runtime 不依赖它 ``` **方案二：速度优先** @@ -92,42 +92,42 @@ 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训练更充分，精度更高 +- **不要混用 fp32 与 int8**：三个模型文件必须保持一致的精度 +- **优先选择 epoch-99**：比 epoch-12 训练更充分，精度更高 - **必需文件**：`encoder.onnx` + `decoder.onnx` + `joiner.onnx` + `tokens.txt` + `keywords.txt` ### 最终模型文件结构 -配置完成后，模型文件应放在 `wakeword_runtime/models/` 目录下（完整路径：`main/xiaozhi-server/test/wakeword_runtime/models/`）： +配置完成后，模型文件应放在 `wakeword_runtime/models/` 目录下，完整路径为 `main/digital-human/wakeword_runtime/models/`： ``` wakeword_runtime/models/ ├── encoder.onnx # 编码器模型（重命名后） ├── decoder.onnx # 解码器模型（重命名后） ├── joiner.onnx # 连接器模型（重命名后） -├── tokens.txt # 拼音Token映射表（228行版本） +├── tokens.txt # 拼音 Token 映射表（228行版本） ├── keywords.txt # 关键词配置文件（首次启动自动生成） └── keywords_raw.txt # 可选，runtime 不依赖 ``` ## 启动方式 -在 `main/xiaozhi-server/test` 目录执行： +在 `main/digital-human` 目录执行： ```bash pip install -r wakeword_runtime/requirements.txt -python start_test_runtime.py +python start.py ``` 启动后默认地址： -- 页面地址：`http://127.0.0.1:8006/test_page.html` +- 页面地址：`http://127.0.0.1:8006/index.html` - 事件桥地址：`ws://127.0.0.1:8006/wakeword-ws` - 健康检查：`http://127.0.0.1:8006/health` @@ -136,38 +136,37 @@ python start_test_runtime.py - 在运行终端按 `Ctrl+C` - 会同时停止静态页面服务、事件桥和唤醒词检测流程 - ## 配置文件说明 -配置文件位于 [config.json](./config.json)。 +配置文件位于 [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": 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" + } } ``` @@ -197,13 +196,13 @@ python start_test_runtime.py 1. 准备 `models/` 目录下的模型文件和 `tokens.txt` 2. 确认 `models/keywords.txt` 存在 -3. 在 `test` 目录运行 `python start_test_runtime.py` -4. 浏览器打开 `http://127.0.0.1:8006/test_page.html` +3. 在 `digital-human` 目录运行 `python start.py` +4. 浏览器打开 `http://127.0.0.1:8006/index.html` 5. 进入设置页检查“唤醒词”配置 ### 修改唤醒词 -1. 打开 test 页面设置 +1. 打开数字人页面设置 2. 切到“唤醒词”页签 3. 修改启用状态或唤醒词列表 4. 点击“应用唤醒词” diff --git a/main/digital-human/README.md b/main/digital-human/README.md new file mode 100644 index 00000000..f21ddf58 --- /dev/null +++ b/main/digital-human/README.md @@ -0,0 +1,41 @@ +本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3) + +如需查看唤醒词模型下载、运行时配置和详细使用说明，[点击这里查看专题文档](../../docs/digital-human-wakeword.md) + +# 项目介绍 + +digital-human 是独立的数字人测试模块，负责提供本地测试页面、前端交互资源、唤醒词运行时和事件桥能力，用于联调整个数字人交互链路。 + +# 快速启动 + +安装依赖： + +```bash +pip install -r wakeword_runtime/requirements.txt +``` + +启动模块： + +```bash +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 + +# 目录说明 + +- `start.py`：模块启动入口 +- `index.html`：数字人测试页面入口 +- `wakeword_runtime`：本地唤醒词运行时与配置目录 +- `js`、`css`：页面前端脚本与样式 +- `images`、`resources`：页面资源文件 + +# 相关文档 + +唤醒词专题文档：[../../docs/digital-human-wakeword.md](../../docs/digital-human-wakeword.md) diff --git a/main/xiaozhi-server/test/css/bg.png b/main/digital-human/css/bg.png similarity index 100% rename from main/xiaozhi-server/test/css/bg.png rename to main/digital-human/css/bg.png diff --git a/main/xiaozhi-server/test/css/test_page.css b/main/digital-human/css/test_page.css similarity index 100% rename from main/xiaozhi-server/test/css/test_page.css rename to main/digital-human/css/test_page.css diff --git a/main/xiaozhi-server/test/favicon.ico b/main/digital-human/favicon.ico similarity index 100% rename from main/xiaozhi-server/test/favicon.ico rename to main/digital-human/favicon.ico diff --git a/main/xiaozhi-server/test/images/1.png b/main/digital-human/images/1.png similarity index 100% rename from main/xiaozhi-server/test/images/1.png rename to main/digital-human/images/1.png diff --git a/main/xiaozhi-server/test/images/2.png b/main/digital-human/images/2.png similarity index 100% rename from main/xiaozhi-server/test/images/2.png rename to main/digital-human/images/2.png diff --git a/main/xiaozhi-server/test/images/3.png b/main/digital-human/images/3.png similarity index 100% rename from main/xiaozhi-server/test/images/3.png rename to main/digital-human/images/3.png diff --git a/main/xiaozhi-server/test/test_page.html b/main/digital-human/index.html similarity index 99% rename from main/xiaozhi-server/test/test_page.html rename to main/digital-human/index.html index bf9ae753..1339ea16 100644 --- a/main/xiaozhi-server/test/test_page.html +++ b/main/digital-human/index.html @@ -24,11 +24,11 @@

您可以使用nginx映射启动测试页面，也可以请按照以下步骤启动测试运行时：

  1. 打开命令行终端
    2. -
  2. 命令行进入到 xiaozhi-server/test 目录
    3. +
  3. 命令行进入到 digital-human 目录
  4. 执行以下命令启动测试页面运行时：
- 
python start_test_runtime.py
-

然后在浏览器中访问：http://localhost:8006/test_page.html

+ 
python start.py
+

然后在浏览器中访问：http://localhost:8006/index.html

`; document.body.appendChild(warningDiv); }); diff --git a/main/xiaozhi-server/test/js/app.js b/main/digital-human/js/app.js similarity index 100% rename from main/xiaozhi-server/test/js/app.js rename to main/digital-human/js/app.js diff --git a/main/xiaozhi-server/test/js/config/default-mcp-tools.json b/main/digital-human/js/config/default-mcp-tools.json similarity index 100% rename from main/xiaozhi-server/test/js/config/default-mcp-tools.json rename to main/digital-human/js/config/default-mcp-tools.json diff --git a/main/xiaozhi-server/test/js/config/manager.js b/main/digital-human/js/config/manager.js similarity index 100% rename from main/xiaozhi-server/test/js/config/manager.js rename to main/digital-human/js/config/manager.js diff --git a/main/xiaozhi-server/test/js/core/audio/opus-codec.js b/main/digital-human/js/core/audio/opus-codec.js similarity index 100% rename from main/xiaozhi-server/test/js/core/audio/opus-codec.js rename to main/digital-human/js/core/audio/opus-codec.js diff --git a/main/xiaozhi-server/test/js/core/audio/player.js b/main/digital-human/js/core/audio/player.js similarity index 100% rename from main/xiaozhi-server/test/js/core/audio/player.js rename to main/digital-human/js/core/audio/player.js diff --git a/main/xiaozhi-server/test/js/core/audio/recorder.js b/main/digital-human/js/core/audio/recorder.js similarity index 100% rename from main/xiaozhi-server/test/js/core/audio/recorder.js rename to main/digital-human/js/core/audio/recorder.js diff --git a/main/xiaozhi-server/test/js/core/audio/stream-context.js b/main/digital-human/js/core/audio/stream-context.js similarity index 100% rename from main/xiaozhi-server/test/js/core/audio/stream-context.js rename to main/digital-human/js/core/audio/stream-context.js diff --git a/main/xiaozhi-server/test/js/core/mcp/tools.js b/main/digital-human/js/core/mcp/tools.js similarity index 100% rename from main/xiaozhi-server/test/js/core/mcp/tools.js rename to main/digital-human/js/core/mcp/tools.js diff --git a/main/xiaozhi-server/test/js/core/network/ota-connector.js b/main/digital-human/js/core/network/ota-connector.js similarity index 100% rename from main/xiaozhi-server/test/js/core/network/ota-connector.js rename to main/digital-human/js/core/network/ota-connector.js diff --git a/main/xiaozhi-server/test/js/core/network/wakeword-bridge.js b/main/digital-human/js/core/network/wakeword-bridge.js similarity index 100% rename from main/xiaozhi-server/test/js/core/network/wakeword-bridge.js rename to main/digital-human/js/core/network/wakeword-bridge.js diff --git a/main/xiaozhi-server/test/js/core/network/websocket.js b/main/digital-human/js/core/network/websocket.js similarity index 100% rename from main/xiaozhi-server/test/js/core/network/websocket.js rename to main/digital-human/js/core/network/websocket.js diff --git a/main/xiaozhi-server/test/js/live2d/cubism4.min.js b/main/digital-human/js/live2d/cubism4.min.js similarity index 100% rename from main/xiaozhi-server/test/js/live2d/cubism4.min.js rename to main/digital-human/js/live2d/cubism4.min.js diff --git a/main/xiaozhi-server/test/js/live2d/live2d.js b/main/digital-human/js/live2d/live2d.js similarity index 100% rename from main/xiaozhi-server/test/js/live2d/live2d.js rename to main/digital-human/js/live2d/live2d.js diff --git a/main/xiaozhi-server/test/js/live2d/live2dcubismcore.min.js b/main/digital-human/js/live2d/live2dcubismcore.min.js similarity index 100% rename from main/xiaozhi-server/test/js/live2d/live2dcubismcore.min.js rename to main/digital-human/js/live2d/live2dcubismcore.min.js diff --git a/main/xiaozhi-server/test/js/live2d/pixi.js b/main/digital-human/js/live2d/pixi.js similarity index 100% rename from main/xiaozhi-server/test/js/live2d/pixi.js rename to main/digital-human/js/live2d/pixi.js diff --git a/main/xiaozhi-server/test/js/ui/background-load.js b/main/digital-human/js/ui/background-load.js similarity index 100% rename from main/xiaozhi-server/test/js/ui/background-load.js rename to main/digital-human/js/ui/background-load.js diff --git a/main/xiaozhi-server/test/js/ui/controller.js b/main/digital-human/js/ui/controller.js similarity index 100% rename from main/xiaozhi-server/test/js/ui/controller.js rename to main/digital-human/js/ui/controller.js diff --git a/main/xiaozhi-server/test/js/utils/blocking-queue.js b/main/digital-human/js/utils/blocking-queue.js similarity index 100% rename from main/xiaozhi-server/test/js/utils/blocking-queue.js rename to main/digital-human/js/utils/blocking-queue.js diff --git a/main/xiaozhi-server/test/js/utils/libopus.js b/main/digital-human/js/utils/libopus.js similarity index 100% rename from main/xiaozhi-server/test/js/utils/libopus.js rename to main/digital-human/js/utils/libopus.js diff --git a/main/xiaozhi-server/test/js/utils/logger.js b/main/digital-human/js/utils/logger.js similarity index 100% rename from main/xiaozhi-server/test/js/utils/logger.js rename to main/digital-human/js/utils/logger.js diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/ReadMe.txt b/main/digital-human/resources/hiyori_pro_zh/ReadMe.txt similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/ReadMe.txt rename to main/digital-human/resources/hiyori_pro_zh/ReadMe.txt diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/hiyori_pro_t04.can3 b/main/digital-human/resources/hiyori_pro_zh/hiyori_pro_t04.can3 similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/hiyori_pro_t04.can3 rename to main/digital-human/resources/hiyori_pro_zh/hiyori_pro_t04.can3 diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/hiyori_pro_t11.cmo3 b/main/digital-human/resources/hiyori_pro_zh/hiyori_pro_t11.cmo3 similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/hiyori_pro_t11.cmo3 rename to main/digital-human/resources/hiyori_pro_zh/hiyori_pro_t11.cmo3 diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_00.png b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_00.png similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_00.png rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_00.png diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_01.png b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_01.png similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_01.png rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.2048/texture_01.png diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.cdi3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.cdi3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.cdi3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.cdi3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.moc3 diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.model3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.model3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.model3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.model3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.physics3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.physics3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.physics3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.physics3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.pose3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.pose3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.pose3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/hiyori_pro_t11.pose3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m01.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m01.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m01.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m01.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m02.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m02.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m02.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m02.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m03.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m03.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m03.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m03.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m04.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m04.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m04.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m04.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m05.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m05.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m05.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m05.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m06.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m06.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m06.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m06.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m07.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m07.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m07.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m07.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m08.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m08.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m08.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m08.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m09.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m09.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m09.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m09.motion3.json diff --git a/main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m10.motion3.json b/main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m10.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/hiyori_pro_zh/runtime/motion/hiyori_m10.motion3.json rename to main/digital-human/resources/hiyori_pro_zh/runtime/motion/hiyori_m10.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/ReadMe.txt b/main/digital-human/resources/natori_pro_zh/ReadMe.txt similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/ReadMe.txt rename to main/digital-human/resources/natori_pro_zh/ReadMe.txt diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_exp_t03.can3 b/main/digital-human/resources/natori_pro_zh/natori_pro_exp_t03.can3 similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_exp_t03.can3 rename to main/digital-human/resources/natori_pro_zh/natori_pro_exp_t03.can3 diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_motions_t03.can3 b/main/digital-human/resources/natori_pro_zh/natori_pro_motions_t03.can3 similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_motions_t03.can3 rename to main/digital-human/resources/natori_pro_zh/natori_pro_motions_t03.can3 diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_t06.cmo3 b/main/digital-human/resources/natori_pro_zh/natori_pro_t06.cmo3 similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/natori_pro_t06.cmo3 rename to main/digital-human/resources/natori_pro_zh/natori_pro_t06.cmo3 diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Angry.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Angry.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Angry.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Angry.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Blushing.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Blushing.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Blushing.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Blushing.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Normal.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Normal.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Normal.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Normal.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Sad.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Sad.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Sad.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Sad.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Smile.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Smile.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Smile.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Smile.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Surprised.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/Surprised.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/Surprised.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/Surprised.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_01.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/exp_01.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_01.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/exp_01.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_02.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/exp_02.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_02.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/exp_02.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_03.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/exp_03.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_03.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/exp_03.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_04.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/exp_04.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_04.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/exp_04.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_05.exp3.json b/main/digital-human/resources/natori_pro_zh/runtime/exp/exp_05.exp3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/exp/exp_05.exp3.json rename to main/digital-human/resources/natori_pro_zh/runtime/exp/exp_05.exp3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_00.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_00.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_00.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_00.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_01.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_01.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_01.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_01.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_02.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_02.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_02.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_02.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_03.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_03.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_03.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_03.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_04.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_04.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_04.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_04.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_05.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_05.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_05.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_05.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_06.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_06.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_06.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_06.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_07.motion3.json b/main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_07.motion3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/motions/mtn_07.motion3.json rename to main/digital-human/resources/natori_pro_zh/runtime/motions/mtn_07.motion3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori.pose3.json b/main/digital-human/resources/natori_pro_zh/runtime/natori.pose3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori.pose3.json rename to main/digital-human/resources/natori_pro_zh/runtime/natori.pose3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.4096/texture_00.png b/main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.4096/texture_00.png similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.4096/texture_00.png rename to main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.4096/texture_00.png diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.cdi3.json b/main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.cdi3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.cdi3.json rename to main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.cdi3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.moc3 b/main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.moc3 similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.moc3 rename to main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.moc3 diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.model3.json b/main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.model3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.model3.json rename to main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.model3.json diff --git a/main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.physics3.json b/main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.physics3.json similarity index 100% rename from main/xiaozhi-server/test/resources/natori_pro_zh/runtime/natori_pro_t06.physics3.json rename to main/digital-human/resources/natori_pro_zh/runtime/natori_pro_t06.physics3.json diff --git a/main/xiaozhi-server/test/start_test_runtime.py b/main/digital-human/start.py similarity index 100% rename from main/xiaozhi-server/test/start_test_runtime.py rename to main/digital-human/start.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/__init__.py b/main/digital-human/wakeword_runtime/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/__init__.py rename to main/digital-human/wakeword_runtime/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/bridge/__init__.py b/main/digital-human/wakeword_runtime/bridge/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/bridge/__init__.py rename to main/digital-human/wakeword_runtime/bridge/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/bridge/event_bridge.py b/main/digital-human/wakeword_runtime/bridge/event_bridge.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/bridge/event_bridge.py rename to main/digital-human/wakeword_runtime/bridge/event_bridge.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/config.json b/main/digital-human/wakeword_runtime/config.json similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/config.json rename to main/digital-human/wakeword_runtime/config.json diff --git a/main/xiaozhi-server/test/wakeword_runtime/config/__init__.py b/main/digital-human/wakeword_runtime/config/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/config/__init__.py rename to main/digital-human/wakeword_runtime/config/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/config/config_loader.py b/main/digital-human/wakeword_runtime/config/config_loader.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/config/config_loader.py rename to main/digital-human/wakeword_runtime/config/config_loader.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/config/logging_setup.py b/main/digital-human/wakeword_runtime/config/logging_setup.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/config/logging_setup.py rename to main/digital-human/wakeword_runtime/config/logging_setup.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/core/__init__.py b/main/digital-human/wakeword_runtime/core/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/core/__init__.py rename to main/digital-human/wakeword_runtime/core/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/core/detector.py b/main/digital-human/wakeword_runtime/core/detector.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/core/detector.py rename to main/digital-human/wakeword_runtime/core/detector.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/core/detector_assets.py b/main/digital-human/wakeword_runtime/core/detector_assets.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/core/detector_assets.py rename to main/digital-human/wakeword_runtime/core/detector_assets.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/core/microphone.py b/main/digital-human/wakeword_runtime/core/microphone.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/core/microphone.py rename to main/digital-human/wakeword_runtime/core/microphone.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/plugins/__init__.py b/main/digital-human/wakeword_runtime/plugins/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/plugins/__init__.py rename to main/digital-human/wakeword_runtime/plugins/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/plugins/audio.py b/main/digital-human/wakeword_runtime/plugins/audio.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/plugins/audio.py rename to main/digital-human/wakeword_runtime/plugins/audio.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/plugins/base.py b/main/digital-human/wakeword_runtime/plugins/base.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/plugins/base.py rename to main/digital-human/wakeword_runtime/plugins/base.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/plugins/manager.py b/main/digital-human/wakeword_runtime/plugins/manager.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/plugins/manager.py rename to main/digital-human/wakeword_runtime/plugins/manager.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/plugins/wake_word.py b/main/digital-human/wakeword_runtime/plugins/wake_word.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/plugins/wake_word.py rename to main/digital-human/wakeword_runtime/plugins/wake_word.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/requirements.txt b/main/digital-human/wakeword_runtime/requirements.txt similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/requirements.txt rename to main/digital-human/wakeword_runtime/requirements.txt diff --git a/main/xiaozhi-server/test/wakeword_runtime/runtime/__init__.py b/main/digital-human/wakeword_runtime/runtime/__init__.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/runtime/__init__.py rename to main/digital-human/wakeword_runtime/runtime/__init__.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/runtime/app.py b/main/digital-human/wakeword_runtime/runtime/app.py similarity index 100% rename from main/xiaozhi-server/test/wakeword_runtime/runtime/app.py rename to main/digital-human/wakeword_runtime/runtime/app.py diff --git a/main/xiaozhi-server/test/wakeword_runtime/runtime/http_server.py b/main/digital-human/wakeword_runtime/runtime/http_server.py similarity index 99% rename from main/xiaozhi-server/test/wakeword_runtime/runtime/http_server.py rename to main/digital-human/wakeword_runtime/runtime/http_server.py index 0030781c..19ce1233 100644 --- a/main/xiaozhi-server/test/wakeword_runtime/runtime/http_server.py +++ b/main/digital-human/wakeword_runtime/runtime/http_server.py @@ -25,7 +25,7 @@ class TestRuntimeHttpServer: @property def page_url(self) -> str: - return f"http://127.0.0.1:{self.port}/test_page.html" + return f"http://127.0.0.1:{self.port}/index.html" @property def bridge_url(self) -> str: