i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-03 16:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(stats): pass query object to raw usage summary

Browse Source
This commit is contained in:
wangpengxiang
2026-09-21 13:07:25 +08:00
parent a9a7c64e5d
commit 593327c803
1 changed files with 21 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/adapters/postgres/src/usage/mod.rs
+21 -58
View File
@@ -3711,14 +3711,15 @@ FROM "#,
async fn summarize_usage_audits_raw( async fn summarize_usage_audits_raw(
&self, &self,
created_from_unix_secs: u64, query: &UsageAuditSummaryQuery,
created_until_unix_secs: u64,
user_id: Option<&str>,
user_ids: Option<&[String]>,
provider_names: Option<&[String]>,
provider_name: Option<&str>,
model: Option<&str>,
) -> Result<StoredUsageAuditSummary, DataLayerError> { ) -> Result<StoredUsageAuditSummary, DataLayerError> {
let created_from_unix_secs = query.created_from_unix_secs;
let created_until_unix_secs = query.created_until_unix_secs;
let user_id = query.user_id.as_deref();
let user_ids = query.user_ids.as_deref();
let provider_names = query.provider_names.as_deref();
let provider_name = query.provider_name.as_deref();
let model = query.model.as_deref();
if created_from_unix_secs >= created_until_unix_secs { if created_from_unix_secs >= created_until_unix_secs {
return Ok(StoredUsageAuditSummary::default()); return Ok(StoredUsageAuditSummary::default());
} }
@@ -3807,62 +3808,28 @@ FROM usage_billing_facts AS "usage"
// Keep these scopes on canonical facts rather than inventing missing daily totals. // Keep these scopes on canonical facts rather than inventing missing daily totals.
if query.provider_names.is_some() || query.provider_name.is_some() || query.model.is_some() if query.provider_names.is_some() || query.provider_name.is_some() || query.model.is_some()
{ {
return self return self.summarize_usage_audits_raw(query).await;
.summarize_usage_audits_raw(
query.created_from_unix_secs,
query.created_until_unix_secs,
query.user_id.as_deref(),
query.user_ids.as_deref(),
query.provider_names.as_deref(),
query.provider_name.as_deref(),
query.model.as_deref(),
)
.await;
} }
let Some(cutoff_utc) = self.read_stats_daily_cutoff_date().await? else { let Some(cutoff_utc) = self.read_stats_daily_cutoff_date().await? else {
return self return self.summarize_usage_audits_raw(query).await;
.summarize_usage_audits_raw(
query.created_from_unix_secs,
query.created_until_unix_secs,
query.user_id.as_deref(),
query.user_ids.as_deref(),
query.provider_names.as_deref(),
None,
None,
)
.await;
}; };
let start_utc = dashboard_unix_secs_to_utc(query.created_from_unix_secs); let start_utc = dashboard_unix_secs_to_utc(query.created_from_unix_secs);
let end_utc = dashboard_unix_secs_to_utc(query.created_until_unix_secs); let end_utc = dashboard_unix_secs_to_utc(query.created_until_unix_secs);
let split = split_dashboard_daily_aggregate_range(start_utc, end_utc, cutoff_utc); let split = split_dashboard_daily_aggregate_range(start_utc, end_utc, cutoff_utc);
let Some(_) = split.aggregate else { let Some(_) = split.aggregate else {
return self return self.summarize_usage_audits_raw(query).await;
.summarize_usage_audits_raw(
query.created_from_unix_secs,
query.created_until_unix_secs,
query.user_id.as_deref(),
query.user_ids.as_deref(),
query.provider_names.as_deref(),
None,
None,
)
.await;
}; };
let mut summary = StoredUsageAuditSummary::default(); let mut summary = StoredUsageAuditSummary::default();
if let Some((raw_start, raw_end)) = split.raw_leading { if let Some((raw_start, raw_end)) = split.raw_leading {
absorb_usage_audit_summary( absorb_usage_audit_summary(
&mut summary, &mut summary,
self.summarize_usage_audits_raw( self.summarize_usage_audits_raw(&UsageAuditSummaryQuery {
dashboard_utc_to_unix_secs(raw_start), created_from_unix_secs: dashboard_utc_to_unix_secs(raw_start),
dashboard_utc_to_unix_secs(raw_end), created_until_unix_secs: dashboard_utc_to_unix_secs(raw_end),
query.user_id.as_deref(), ..query.clone()
query.user_ids.as_deref(), })
query.provider_names.as_deref(),
None,
None,
)
.await?, .await?,
); );
} }
@@ -3881,15 +3848,11 @@ FROM usage_billing_facts AS "usage"
if let Some((raw_start, raw_end)) = split.raw_trailing { if let Some((raw_start, raw_end)) = split.raw_trailing {
absorb_usage_audit_summary( absorb_usage_audit_summary(
&mut summary, &mut summary,
self.summarize_usage_audits_raw( self.summarize_usage_audits_raw(&UsageAuditSummaryQuery {
dashboard_utc_to_unix_secs(raw_start), created_from_unix_secs: dashboard_utc_to_unix_secs(raw_start),
dashboard_utc_to_unix_secs(raw_end), created_until_unix_secs: dashboard_utc_to_unix_secs(raw_end),
query.user_id.as_deref(), ..query.clone()
query.user_ids.as_deref(), })
query.provider_names.as_deref(),
None,
None,
)
.await?, .await?,
); );
} }