mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-08-04 11:43:57 +08:00
feat(health): add configurable test models and reasoning effort support
Enhance stream check service with configurable test models: - Add claude_model, codex_model, gemini_model to StreamCheckConfig - Support reasoning effort syntax (model@level or model#level) - Parse and apply reasoning_effort for OpenAI-compatible models - Remove hardcoded model names from check functions - Add unit tests for model parsing logic - Remove obsolete model_test source files This allows users to customize which models are used for health checks.
This commit is contained in:
@@ -29,6 +29,12 @@ pub struct StreamCheckConfig {
|
||||
pub timeout_secs: u64,
|
||||
pub max_retries: u32,
|
||||
pub degraded_threshold_ms: u64,
|
||||
/// Claude 测试模型
|
||||
pub claude_model: String,
|
||||
/// Codex 测试模型
|
||||
pub codex_model: String,
|
||||
/// Gemini 测试模型
|
||||
pub gemini_model: String,
|
||||
}
|
||||
|
||||
impl Default for StreamCheckConfig {
|
||||
@@ -37,6 +43,9 @@ impl Default for StreamCheckConfig {
|
||||
timeout_secs: 45,
|
||||
max_retries: 2,
|
||||
degraded_threshold_ms: 6000,
|
||||
claude_model: "claude-haiku-4-5-20251001".to_string(),
|
||||
codex_model: "gpt-5.1-codex@low".to_string(),
|
||||
gemini_model: "gemini-3-pro-preview".to_string(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -133,9 +142,15 @@ impl StreamCheckService {
|
||||
.map_err(|e| AppError::Message(format!("创建客户端失败: {e}")))?;
|
||||
|
||||
let result = match app_type {
|
||||
AppType::Claude => Self::check_claude_stream(&client, &base_url, &auth).await,
|
||||
AppType::Codex => Self::check_codex_stream(&client, &base_url, &auth).await,
|
||||
AppType::Gemini => Self::check_gemini_stream(&client, &base_url, &auth).await,
|
||||
AppType::Claude => {
|
||||
Self::check_claude_stream(&client, &base_url, &auth, &config.claude_model).await
|
||||
}
|
||||
AppType::Codex => {
|
||||
Self::check_codex_stream(&client, &base_url, &auth, &config.codex_model).await
|
||||
}
|
||||
AppType::Gemini => {
|
||||
Self::check_gemini_stream(&client, &base_url, &auth, &config.gemini_model).await
|
||||
}
|
||||
};
|
||||
|
||||
let response_time = start.elapsed().as_millis() as u64;
|
||||
@@ -174,6 +189,7 @@ impl StreamCheckService {
|
||||
client: &Client,
|
||||
base_url: &str,
|
||||
auth: &AuthInfo,
|
||||
model: &str,
|
||||
) -> Result<(u16, String), AppError> {
|
||||
let base = base_url.trim_end_matches('/');
|
||||
let url = if base.ends_with("/v1") {
|
||||
@@ -182,8 +198,6 @@ impl StreamCheckService {
|
||||
format!("{base}/v1/messages")
|
||||
};
|
||||
|
||||
let model = "claude-3-5-haiku-latest";
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
"max_tokens": 1,
|
||||
@@ -225,6 +239,7 @@ impl StreamCheckService {
|
||||
client: &Client,
|
||||
base_url: &str,
|
||||
auth: &AuthInfo,
|
||||
model: &str,
|
||||
) -> Result<(u16, String), AppError> {
|
||||
let base = base_url.trim_end_matches('/');
|
||||
let url = if base.ends_with("/v1") {
|
||||
@@ -233,10 +248,11 @@ impl StreamCheckService {
|
||||
format!("{base}/v1/chat/completions")
|
||||
};
|
||||
|
||||
let model = "gpt-4o-mini";
|
||||
// 解析模型名和推理等级 (支持 model@level 或 model#level 格式)
|
||||
let (actual_model, reasoning_effort) = Self::parse_model_with_effort(model);
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
let mut body = json!({
|
||||
"model": actual_model,
|
||||
"messages": [
|
||||
{ "role": "system", "content": "" },
|
||||
{ "role": "assistant", "content": "" },
|
||||
@@ -247,6 +263,11 @@ impl StreamCheckService {
|
||||
"stream": true
|
||||
});
|
||||
|
||||
// 如果是推理模型,添加 reasoning_effort
|
||||
if let Some(effort) = reasoning_effort {
|
||||
body["reasoning_effort"] = json!(effort);
|
||||
}
|
||||
|
||||
let response = client
|
||||
.post(&url)
|
||||
.header("Authorization", format!("Bearer {}", auth.api_key))
|
||||
@@ -279,12 +300,11 @@ impl StreamCheckService {
|
||||
client: &Client,
|
||||
base_url: &str,
|
||||
auth: &AuthInfo,
|
||||
model: &str,
|
||||
) -> Result<(u16, String), AppError> {
|
||||
let base = base_url.trim_end_matches('/');
|
||||
let url = format!("{base}/v1/chat/completions");
|
||||
|
||||
let model = "gemini-1.5-flash";
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
"messages": [{ "role": "user", "content": "hi" }],
|
||||
@@ -328,6 +348,20 @@ impl StreamCheckService {
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析模型名和推理等级 (支持 model@level 或 model#level 格式)
|
||||
/// 返回 (实际模型名, Option<推理等级>)
|
||||
fn parse_model_with_effort(model: &str) -> (String, Option<String>) {
|
||||
// 查找 @ 或 # 分隔符
|
||||
if let Some(pos) = model.find('@').or_else(|| model.find('#')) {
|
||||
let actual_model = model[..pos].to_string();
|
||||
let effort = model[pos + 1..].to_string();
|
||||
if !effort.is_empty() {
|
||||
return (actual_model, Some(effort));
|
||||
}
|
||||
}
|
||||
(model.to_string(), None)
|
||||
}
|
||||
|
||||
fn should_retry(msg: &str) -> bool {
|
||||
let lower = msg.to_lowercase();
|
||||
lower.contains("timeout")
|
||||
@@ -381,4 +415,22 @@ mod tests {
|
||||
assert_eq!(config.max_retries, 2);
|
||||
assert_eq!(config.degraded_threshold_ms, 6000);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_model_with_effort() {
|
||||
// 带 @ 分隔符
|
||||
let (model, effort) = StreamCheckService::parse_model_with_effort("gpt-5.1-codex@low");
|
||||
assert_eq!(model, "gpt-5.1-codex");
|
||||
assert_eq!(effort, Some("low".to_string()));
|
||||
|
||||
// 带 # 分隔符
|
||||
let (model, effort) = StreamCheckService::parse_model_with_effort("o1-preview#high");
|
||||
assert_eq!(model, "o1-preview");
|
||||
assert_eq!(effort, Some("high".to_string()));
|
||||
|
||||
// 无分隔符
|
||||
let (model, effort) = StreamCheckService::parse_model_with_effort("gpt-4o-mini");
|
||||
assert_eq!(model, "gpt-4o-mini");
|
||||
assert_eq!(effort, None);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user