mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
perf(usage): 将 status 过滤下推到 SQL 查询层
为 UsageAuditListQuery 新增 statuses 字段,支持在数据库端按状态 筛选用量记录。admin usage summary 路由不再全量拉取后内存过滤, 改为直接查询 pending/streaming 状态的记录。
This commit is contained in:
@@ -25,6 +25,7 @@ pub(crate) async fn list_usage_for_range(
|
||||
user_id: filters.user_id.clone(),
|
||||
provider_name: filters.provider_name.clone(),
|
||||
model: filters.model.clone(),
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
}
|
||||
@@ -44,6 +45,7 @@ pub(crate) async fn list_usage_for_optional_range(
|
||||
user_id: filters.user_id.clone(),
|
||||
provider_name: filters.provider_name.clone(),
|
||||
model: filters.model.clone(),
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ pub(in super::super) async fn list_recent_completed_usage_for_cache_affinity(
|
||||
user_id: user_id.map(ToOwned::to_owned),
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await?;
|
||||
items.retain(|item| item.status == "completed");
|
||||
|
||||
@@ -67,14 +67,23 @@ pub(super) async fn maybe_build_local_admin_usage_summary_response(
|
||||
|
||||
let query = request_context.request_query_string.as_deref();
|
||||
let requested_ids = admin_usage_parse_ids(query);
|
||||
let usage = state
|
||||
.list_usage_audits(&UsageAuditListQuery::default())
|
||||
.await?;
|
||||
let list_query = if requested_ids.is_some() {
|
||||
UsageAuditListQuery::default()
|
||||
} else {
|
||||
UsageAuditListQuery {
|
||||
statuses: Some(vec![
|
||||
"pending".to_string(),
|
||||
"streaming".to_string(),
|
||||
]),
|
||||
..Default::default()
|
||||
}
|
||||
};
|
||||
let usage = state.list_usage_audits(&list_query).await?;
|
||||
let mut items: Vec<_> = usage
|
||||
.into_iter()
|
||||
.filter(|item| match requested_ids.as_ref() {
|
||||
Some(ids) => ids.contains(&item.id),
|
||||
None => matches!(item.status.as_str(), "pending" | "streaming"),
|
||||
None => true,
|
||||
})
|
||||
.collect();
|
||||
items.sort_by(|left, right| {
|
||||
|
||||
@@ -485,6 +485,7 @@ async fn dashboard_list_usage_for_range(
|
||||
user_id: user_id.map(ToOwned::to_owned),
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
{
|
||||
@@ -1213,6 +1214,7 @@ pub(super) async fn handle_dashboard_provider_status_get(
|
||||
user_id: None,
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
{
|
||||
|
||||
@@ -879,6 +879,7 @@ pub(super) async fn handle_users_me_usage_active_get(
|
||||
user_id: Some(auth.user.id.clone()),
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
{
|
||||
@@ -950,6 +951,7 @@ pub(super) async fn handle_users_me_usage_interval_timeline_get(
|
||||
user_id: Some(auth.user.id.clone()),
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
{
|
||||
|
||||
@@ -217,6 +217,7 @@ pub(super) async fn handle_wallet_today_cost(
|
||||
user_id: Some(auth.user.id.clone()),
|
||||
provider_name: None,
|
||||
model: None,
|
||||
statuses: None,
|
||||
})
|
||||
.await
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user