mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-25 13:45:03 +08:00
5376ea042b
* i18n: update cache terminology across all languages
- Change 'Cache Read' to 'Cache Hit' in all languages
- Change 'Cache Write' to 'Cache Creation' in all languages
- Update zh: 缓存读取 → 缓存命中, 缓存写入 → 缓存创建
- Update en: Cache Read → Cache Hit, Cache Write → Cache Creation
- Update ja: キャッシュ読取 → キャッシュヒット, キャッシュ書込 → キャッシュ作成
Affected keys: cacheReadTokens, cacheCreationTokens, cacheReadCost,
cacheWriteCost, cacheRead, cacheWrite
* feat(usage): add cache metrics to trend chart
- Add cache creation tokens visualization (orange line)
- Add cache hit tokens visualization (purple line)
- Add gradient definitions for new cache metrics
- Include cache data in hourly aggregation
- Display cache metrics alongside input/output tokens
This provides better visibility into cache usage patterns over time.
* fix(usage): fix timezone handling in datetime picker
- Add timestampToLocalDatetime() to convert Unix timestamp to local datetime
- Add localDatetimeToTimestamp() with validation for incomplete input
- Fix issue where typing hours/minutes would jump to previous day
- Validate datetime format completeness before conversion
- Use local timezone instead of UTC for datetime-local input
This resolves the issue where users couldn't fine-tune time selection
and the input would jump unexpectedly when editing hours or minutes.
* feat(usage): add auto-refresh for usage statistics
- Add 30-second auto-refresh interval for all usage queries
- Disable background refresh to save resources
- Apply to: summary, trends, provider stats, model stats, request logs
- Queries automatically update when tab is active
- Pause refresh when user switches to another tab
This keeps usage data fresh without manual refresh.
* fix(proxy): improve usage logging and cache token parsing
- Log requests even when usage parsing fails (with default values)
- Add detailed debug logging for usage metrics
- Support cache_read_input_tokens field in Codex responses
- Fallback to input_tokens_details.cached_tokens if needed
- Add test case for cached_tokens in input_tokens_details
- Ensure all requests are tracked in database for analytics
This fixes missing request logs when API responses lack usage data
and improves cache token detection across different response formats.
* style(rust): use inline format args in format! macros
- Replace format!("...", var) with format!("...{var}")
- Update universal provider ID formatting
- Update error message formatting
- Update config.toml generation in Codex provider
Fixes clippy::uninlined_format_args warnings.
* feat(proxy): enhance provider router logging
- Add debug logs for failover queue provider count
- Log circuit breaker state for each provider check
- Add logs for missing current provider scenarios
- Log when no current provider is configured
- Use inline format args for better readability
This improves debugging of provider selection and failover behavior.
* feat(database): update model pricing data
- Update Claude models to full version format (e.g. claude-opus-4-5-20251101)
- Add GPT-5.2 series model pricing (10 models)
- Add GPT-5.1 series model pricing (10 models)
- Add GPT-5 series model pricing (12 models)
- Add Gemini 3 series model pricing (2 models)
- Update Gemini 2.5 series model ID format (use dot separator)
- Unify display names by removing thinking level suffixes
* fix(usage): correct Gemini output token calculation
Fix Gemini API output token parsing to use totalTokenCount - promptTokenCount
instead of candidatesTokenCount alone. This ensures thoughtsTokenCount is
included in output statistics.
- Update from_gemini_response to calculate output from total - input
- Update from_gemini_stream_chunks with same logic for consistency
- Fix from_codex_stream_events to use adjusted token calculation
- Add test case for responses with thoughtsTokenCount
- Update existing tests to match new calculation logic
* fix(usage): correct cache token billing and add Codex format auto-detection
- Avoid double-billing cache tokens by subtracting from input before calculation
- Add smart Codex parser that auto-detects OpenAI vs Codex API format
- Extract model name from Codex responses for accurate tracking
* fix(proxy): improve takeover detection with live config check
- Add live config takeover detection for hot-switch decision
- Rebuild takeover when backup is missing or placeholder remains
- Make detect_takeover_in_live_config_for_app public
- Fix is_takeover_active to use actual takeover status
* refactor(usage): simplify model pricing lookup by removing suffix fallback
Replace complex suffix-stripping fallback with direct prefix/suffix cleanup.
Model IDs are now cleaned by removing vendor prefix (before /) and colon
suffix (after :), then matched exactly against pricing table.
* feat(database): add Chinese AI model pricing data
Add pricing for domestic AI models (CNY/1M tokens):
- Doubao-Seed-Code (ByteDance)
- DeepSeek V3/V3.1/V3.2
- Kimi K2/K2-Thinking/K2-Turbo (Moonshot)
- MiniMax M2/M2.1/M2.1-Lightning
- GLM-4.6/4.7 (Zhipu)
- Mimo V2 Flash (Xiaomi)
Also fix test case to use correct model ID and remove invalid currency column.
* refactor(proxy): improve header forwarding with blacklist approach
Change from whitelist to blacklist mode for request header forwarding.
Only skip headers that will be overridden (auth, host, content-length).
This preserves client's original headers and improves compatibility.
* fix(proxy): bypass timeout and retry configs when failover is disabled
When auto_failover_enabled is false, timeout and retry configurations
should not affect normal request flow. This change ensures:
- create_forwarder: passes 0 for all timeout/retry params when failover
is disabled, effectively bypassing these checks
- streaming_timeout_config: returns 0 for both first_byte_timeout and
idle_timeout when failover is disabled
This prevents unnecessary timeout errors and retry attempts when users
have explicitly disabled the failover feature.
* fix(proxy): handle zero value input in failover config fields
* refactor(proxy): remove retry logic and add enabled check for failover
* refactor(proxy): distinguish circuit-open from no-provider errors
* Align usage stats to sliding windows
* feat(proxy): add body and header filtering for upstream requests
* feat(proxy): enable transparent passthrough for headers
- Passthrough anthropic-beta header as-is from client
- Passthrough anthropic-version header from client
- Passthrough client IP headers (x-forwarded-for, x-real-ip) by default
- Filter private params (underscore-prefixed fields) from request body
- No database changes required
* feat(proxy): extract session ID from client requests for logging
- Add SessionIdExtractor to parse session ID from Claude/Codex requests
- Support extraction from metadata.user_id, headers, previous_response_id
- Pass session_id through RequestContext to usage logger
- Enable request correlation by session in proxy_request_logs
189 lines
6.2 KiB
Rust
189 lines
6.2 KiB
Rust
//! Handler 配置模块
|
||
//!
|
||
//! 定义各 API 处理器的配置结构和使用量解析器
|
||
|
||
use crate::app_config::AppType;
|
||
use crate::proxy::usage::parser::TokenUsage;
|
||
use serde_json::Value;
|
||
|
||
/// 使用量解析器类型别名
|
||
pub type StreamUsageParser = fn(&[Value]) -> Option<TokenUsage>;
|
||
pub type ResponseUsageParser = fn(&Value) -> Option<TokenUsage>;
|
||
|
||
/// 模型提取器类型别名
|
||
/// 参数: (流式事件列表, 请求中的模型名称) -> 最终使用的模型名称
|
||
pub type StreamModelExtractor = fn(&[Value], &str) -> String;
|
||
|
||
/// 各 API 的使用量解析配置
|
||
#[derive(Clone, Copy)]
|
||
pub struct UsageParserConfig {
|
||
/// 流式响应解析器
|
||
pub stream_parser: StreamUsageParser,
|
||
/// 非流式响应解析器
|
||
pub response_parser: ResponseUsageParser,
|
||
/// 流式响应中的模型提取器
|
||
pub model_extractor: StreamModelExtractor,
|
||
/// 应用类型字符串(用于日志记录)
|
||
pub app_type_str: &'static str,
|
||
}
|
||
|
||
// ============================================================================
|
||
// 模型提取器实现
|
||
// ============================================================================
|
||
|
||
/// Claude 流式响应模型提取(优先使用 usage.model)
|
||
fn claude_model_extractor(events: &[Value], request_model: &str) -> String {
|
||
// 首先尝试从解析的 usage 中获取模型
|
||
if let Some(usage) = TokenUsage::from_claude_stream_events(events) {
|
||
if let Some(model) = usage.model {
|
||
return model;
|
||
}
|
||
}
|
||
request_model.to_string()
|
||
}
|
||
|
||
/// OpenAI Chat Completions 流式响应模型提取(优先使用 usage.model)
|
||
fn openai_model_extractor(events: &[Value], request_model: &str) -> String {
|
||
// 首先尝试从解析的 usage 中获取模型
|
||
if let Some(usage) = TokenUsage::from_openai_stream_events(events) {
|
||
if let Some(model) = usage.model {
|
||
return model;
|
||
}
|
||
}
|
||
// 回退:从事件中直接提取
|
||
events
|
||
.iter()
|
||
.find_map(|e| e.get("model")?.as_str())
|
||
.unwrap_or(request_model)
|
||
.to_string()
|
||
}
|
||
|
||
/// Codex 智能流式响应模型提取(自动检测格式)
|
||
fn codex_auto_model_extractor(events: &[Value], request_model: &str) -> String {
|
||
// 首先尝试从解析的 usage 中获取模型
|
||
if let Some(usage) = TokenUsage::from_codex_stream_events_auto(events) {
|
||
if let Some(model) = usage.model {
|
||
return model;
|
||
}
|
||
}
|
||
// 回退:从 response.completed 事件中提取
|
||
events
|
||
.iter()
|
||
.find_map(|e| {
|
||
if e.get("type")?.as_str()? == "response.completed" {
|
||
e.get("response")?.get("model")?.as_str()
|
||
} else {
|
||
None
|
||
}
|
||
})
|
||
.or_else(|| {
|
||
// 再回退:从 OpenAI 格式事件中提取
|
||
events.iter().find_map(|e| e.get("model")?.as_str())
|
||
})
|
||
.unwrap_or(request_model)
|
||
.to_string()
|
||
}
|
||
|
||
/// Gemini 流式响应模型提取(优先使用 usage.model)
|
||
fn gemini_model_extractor(events: &[Value], request_model: &str) -> String {
|
||
// 首先尝试从解析的 usage 中获取模型
|
||
if let Some(usage) = TokenUsage::from_gemini_stream_chunks(events) {
|
||
if let Some(model) = usage.model {
|
||
return model;
|
||
}
|
||
}
|
||
request_model.to_string()
|
||
}
|
||
|
||
// ============================================================================
|
||
// 预定义配置
|
||
// ============================================================================
|
||
|
||
/// Claude API 解析配置
|
||
pub const CLAUDE_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||
stream_parser: TokenUsage::from_claude_stream_events,
|
||
response_parser: TokenUsage::from_claude_response,
|
||
model_extractor: claude_model_extractor,
|
||
app_type_str: "claude",
|
||
};
|
||
|
||
/// OpenAI Chat Completions API 解析配置(用于 Codex /v1/chat/completions)
|
||
pub const OPENAI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||
stream_parser: TokenUsage::from_openai_stream_events,
|
||
response_parser: TokenUsage::from_openai_response,
|
||
model_extractor: openai_model_extractor,
|
||
app_type_str: "codex",
|
||
};
|
||
|
||
/// Codex 智能解析配置(自动检测 OpenAI 或 Codex 格式)
|
||
pub const CODEX_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||
stream_parser: TokenUsage::from_codex_stream_events_auto,
|
||
response_parser: TokenUsage::from_codex_response_auto,
|
||
model_extractor: codex_auto_model_extractor,
|
||
app_type_str: "codex",
|
||
};
|
||
|
||
/// Gemini API 解析配置
|
||
pub const GEMINI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig {
|
||
stream_parser: TokenUsage::from_gemini_stream_chunks,
|
||
response_parser: TokenUsage::from_gemini_response,
|
||
model_extractor: gemini_model_extractor,
|
||
app_type_str: "gemini",
|
||
};
|
||
|
||
// ============================================================================
|
||
// Handler 配置(预留,用于进一步简化)
|
||
// ============================================================================
|
||
|
||
/// Handler 基础配置
|
||
///
|
||
/// 预留结构,可用于进一步统一各 handler 的配置
|
||
#[allow(dead_code)]
|
||
#[derive(Clone)]
|
||
pub struct HandlerConfig {
|
||
/// 应用类型
|
||
pub app_type: AppType,
|
||
/// 日志标签
|
||
pub tag: &'static str,
|
||
/// 应用类型字符串
|
||
pub app_type_str: &'static str,
|
||
/// 使用量解析配置
|
||
pub parser_config: &'static UsageParserConfig,
|
||
}
|
||
|
||
/// Claude Handler 配置
|
||
#[allow(dead_code)]
|
||
pub const CLAUDE_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||
app_type: AppType::Claude,
|
||
tag: "Claude",
|
||
app_type_str: "claude",
|
||
parser_config: &CLAUDE_PARSER_CONFIG,
|
||
};
|
||
|
||
/// Codex Chat Completions Handler 配置
|
||
#[allow(dead_code)]
|
||
pub const CODEX_CHAT_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||
app_type: AppType::Codex,
|
||
tag: "Codex",
|
||
app_type_str: "codex",
|
||
parser_config: &OPENAI_PARSER_CONFIG,
|
||
};
|
||
|
||
/// Codex Responses Handler 配置
|
||
#[allow(dead_code)]
|
||
pub const CODEX_RESPONSES_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||
app_type: AppType::Codex,
|
||
tag: "Codex",
|
||
app_type_str: "codex",
|
||
parser_config: &CODEX_PARSER_CONFIG,
|
||
};
|
||
|
||
/// Gemini Handler 配置
|
||
#[allow(dead_code)]
|
||
pub const GEMINI_HANDLER_CONFIG: HandlerConfig = HandlerConfig {
|
||
app_type: AppType::Gemini,
|
||
tag: "Gemini",
|
||
app_type_str: "gemini",
|
||
parser_config: &GEMINI_PARSER_CONFIG,
|
||
};
|