perf(usage): heatmap 改为数据库端按天聚合查询

将 admin 和 user heatmap 从逐条加载 usage audit 记录后在应用层聚合,
改为通过 SQL GROUP BY DATE 在数据库端直接按天汇总, 大幅减少数据传输量。

新增 UsageDailyHeatmapQuery / StoredUsageDailySummary 类型,
在 trait、SQL、内存实现中均补齐 summarize_usage_daily_heatmap 方法。

同时优化 docker-compose: postgres 增加空闲事务超时与 keepalive 参数,
gateway 增加健康检查配置。
This commit is contained in:
fawney19
2026-04-15 02:11:32 +08:00
parent 05fbbac493
commit 98ad1172b0
11 changed files with 289 additions and 54 deletions
@@ -10,8 +10,8 @@ use serde_json::Value;
use super::{
strip_deprecated_usage_display_fields, usage_can_recover_terminal_failure,
StoredProviderApiKeyUsageSummary, StoredProviderUsageSummary, StoredProviderUsageWindow,
StoredRequestUsageAudit, UpsertUsageRecord, UsageAuditListQuery, UsageReadRepository,
UsageWriteRepository,
StoredRequestUsageAudit, StoredUsageDailySummary, UpsertUsageRecord, UsageAuditListQuery,
UsageDailyHeatmapQuery, UsageReadRepository, UsageWriteRepository,
};
use crate::DataLayerError;
@@ -335,6 +335,70 @@ impl UsageReadRepository for InMemoryUsageReadRepository {
Ok(summary)
}
async fn summarize_usage_daily_heatmap(
&self,
query: &UsageDailyHeatmapQuery,
) -> Result<Vec<StoredUsageDailySummary>, DataLayerError> {
let items = self.by_request_id.read().expect("usage repository lock");
let mut daily = BTreeMap::<String, (u64, u64, f64, f64)>::new();
for item in items.values() {
if item.created_at_unix_ms < query.created_from_unix_secs {
continue;
}
if let Some(user_id) = &query.user_id {
if item.user_id.as_deref() != Some(user_id) {
continue;
}
}
if query.admin_mode {
if item.status == "pending" || item.status == "streaming" {
continue;
}
} else if item.billing_status != "settled" || item.total_cost_usd <= 0.0 {
continue;
}
let ts = i64::try_from(item.created_at_unix_ms).unwrap_or_default();
let Some(dt) = chrono::DateTime::<chrono::Utc>::from_timestamp(ts, 0) else {
continue;
};
let date_key = dt.date_naive().to_string();
let entry = daily.entry(date_key).or_insert((0, 0, 0.0, 0.0));
entry.0 += 1;
let cache_creation = if item.cache_creation_input_tokens == 0
&& (item.cache_creation_ephemeral_5m_input_tokens
+ item.cache_creation_ephemeral_1h_input_tokens)
> 0
{
item.cache_creation_ephemeral_5m_input_tokens
+ item.cache_creation_ephemeral_1h_input_tokens
} else {
item.cache_creation_input_tokens
};
entry.1 += item.input_tokens
+ item.output_tokens
+ cache_creation
+ item.cache_read_input_tokens;
entry.2 += item.total_cost_usd;
entry.3 += item.actual_total_cost_usd;
}
let mut result: Vec<_> = daily
.into_iter()
.map(
|(date, (requests, total_tokens, total_cost_usd, actual_total_cost_usd))| {
StoredUsageDailySummary {
date,
requests,
total_tokens,
total_cost_usd,
actual_total_cost_usd,
}
},
)
.collect();
result.sort_by(|a, b| a.date.cmp(&b.date));
Ok(result)
}
}
fn detach_usage_body(