fix: ensure_default_models 每次启动重新检查模型文件存在性
This commit is contained in:
95
.test_e2e.sh
Normal file
95
.test_e2e.sh
Normal file
@@ -0,0 +1,95 @@
|
||||
#!/bin/bash
|
||||
# M2.1 端到端测试 — 文字对话管线 (LLM → TTS)
|
||||
set -e
|
||||
cd ~/Showen/ShowenV2
|
||||
|
||||
echo "=== M2.1 端到端测试: 文字对话 ==="
|
||||
|
||||
# 停生产服务
|
||||
systemctl --user stop showen_v2.service
|
||||
sleep 1
|
||||
|
||||
# 启动新编译的 release 版 (后台)
|
||||
source ~/.cargo/env
|
||||
./target/release/showen_v2 --config configs/dog_state_machine.json > /tmp/m21_e2e.log 2>&1 &
|
||||
APP_PID=$!
|
||||
echo "启动 PID=$APP_PID, 等待服务就绪..."
|
||||
|
||||
# 等待 HTTP 服务就绪 (最多 15s)
|
||||
for i in $(seq 1 15); do
|
||||
if curl -s http://127.0.0.1:5000/api/status > /dev/null 2>&1; then
|
||||
echo "服务就绪 (${i}s)"
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# 测试 1: 模型管理 API
|
||||
echo ""
|
||||
echo "=== 测试 1: GET /api/models ==="
|
||||
MODELS_RESP=$(curl -s http://127.0.0.1:5000/api/models)
|
||||
echo "$MODELS_RESP" | python3 -c "
|
||||
import json, sys
|
||||
data = json.load(sys.stdin)
|
||||
if 'models' in data:
|
||||
print(f'模型数: {len(data[\"models\"])}')
|
||||
for m in data['models'][:4]:
|
||||
status = '已下载' if m.get('downloaded') else '未下载'
|
||||
print(f' - {m[\"name\"]} ({m[\"kind\"]}) [{status}]')
|
||||
print(f'配额: {data.get(\"quota\", 0) // (1024*1024)}MB, 已用: {data.get(\"used_space\", 0) // (1024*1024)}MB')
|
||||
else:
|
||||
print('错误:', data)
|
||||
" 2>&1 || echo "模型 API 响应解析失败: $MODELS_RESP"
|
||||
|
||||
# 测试 2: 文字对话 (LLM + TTS 管线, 跳过 ASR)
|
||||
echo ""
|
||||
echo "=== 测试 2: POST /api/chat/text ==="
|
||||
echo "输入: '你好，你叫什么名字？'"
|
||||
START=$(date +%s%N)
|
||||
CHAT_RESP=$(curl -s -X POST http://127.0.0.1:5000/api/chat/text \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"text":"你好，你叫什么名字？","session_id":"e2e_test"}' \
|
||||
--max-time 60)
|
||||
END=$(date +%s%N)
|
||||
MS=$(( (END - START) / 1000000 ))
|
||||
echo "响应耗时: ${MS}ms"
|
||||
|
||||
echo "$CHAT_RESP" | python3 -c "
|
||||
import json, sys
|
||||
try:
|
||||
data = json.load(sys.stdin)
|
||||
if data.get('error'):
|
||||
print(f'错误: {data[\"error\"]}')
|
||||
else:
|
||||
print(f'回复文本: {data.get(\"reply_text\", \"(空)\")}')
|
||||
audio = data.get('reply_audio_path')
|
||||
if audio:
|
||||
print(f'回复音频: {audio}')
|
||||
else:
|
||||
print('回复音频: (无)')
|
||||
print(f'会话: {data.get(\"session_id\")}')
|
||||
except Exception as e:
|
||||
print(f'解析失败: {e}')
|
||||
print(f'原始响应: {sys.stdin.read()[:200]}')
|
||||
" 2>&1
|
||||
|
||||
# 检查音频文件是否真的生成
|
||||
echo ""
|
||||
echo "=== 检查 TTS 音频文件 ==="
|
||||
ls -lh /tmp/showen_ai/tts_*.wav 2>/dev/null | tail -3 || echo "无 TTS 音频文件"
|
||||
|
||||
# 清理
|
||||
echo ""
|
||||
echo "=== 清理 ==="
|
||||
kill $APP_PID 2>/dev/null
|
||||
wait $APP_PID 2>/dev/null
|
||||
sleep 1
|
||||
|
||||
# 恢复生产服务
|
||||
systemctl --user start showen_v2.service
|
||||
sleep 2
|
||||
systemctl --user is-active showen_v2.service
|
||||
echo "生产服务已恢复"
|
||||
|
||||
echo ""
|
||||
echo "=== 测试完成 ==="
|
||||
@@ -148,12 +148,10 @@ impl ModelManager {
|
||||
}
|
||||
|
||||
/// 初始化默认模型清单（首次启动或清单缺失时）
|
||||
/// 每次启动都重新检查文件存在性，更新 downloaded 状态（符号链接可能后建）
|
||||
pub fn ensure_default_models(&mut self) -> Result<()> {
|
||||
if !self.registry.models.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// Spike 推荐的默认模型清单
|
||||
// 首次：注册表为空，填充默认清单
|
||||
if self.registry.models.is_empty() {
|
||||
let defaults = vec![
|
||||
ModelInfo {
|
||||
id: "qwen2.5-0.5b-q4_k_m".to_string(),
|
||||
@@ -164,7 +162,7 @@ impl ModelManager {
|
||||
memory_required: 1024 * 1024 * 1024,
|
||||
recommended_tier: "4G 内存档可用".to_string(),
|
||||
url: "https://hf-mirror.com/Qwen/Qwen2.5-0.5B-Instruct-GGUF/resolve/main/qwen2.5-0.5b-instruct-q4_k_m.gguf".to_string(),
|
||||
sha256: String::new(), // 实际部署时填充
|
||||
sha256: String::new(),
|
||||
filename: "qwen2.5-0.5b-q4_k_m.gguf".to_string(),
|
||||
},
|
||||
ModelInfo {
|
||||
@@ -206,12 +204,10 @@ impl ModelManager {
|
||||
];
|
||||
|
||||
for info in defaults {
|
||||
let filename = info.filename.clone();
|
||||
let downloaded = self.store_dir.join(info.kind.dir_name()).join(&filename).exists();
|
||||
self.registry.models.push(LocalModelEntry {
|
||||
info,
|
||||
downloaded,
|
||||
download_progress: if downloaded { 100 } else { 0 },
|
||||
downloaded: false,
|
||||
download_progress: 0,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -225,6 +221,15 @@ impl ModelManager {
|
||||
if !self.registry.active.contains_key(&ModelKind::Tts) {
|
||||
self.registry.active.insert(ModelKind::Tts, "piper-zh-huayan".to_string());
|
||||
}
|
||||
}
|
||||
|
||||
// 每次启动都重新检查文件存在性（符号链接可能后建，或文件被手动删除）
|
||||
for entry in &mut self.registry.models {
|
||||
let path = self.store_dir.join(entry.info.kind.dir_name()).join(&entry.info.filename);
|
||||
let exists = path.exists();
|
||||
entry.downloaded = exists;
|
||||
entry.download_progress = if exists { 100 } else { 0 };
|
||||
}
|
||||
|
||||
self.save_registry()?;
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user