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

Fix cache token accounting and tiered pricing

Browse Source
This commit is contained in:
elky
2026-07-10 15:13:12 +08:00
parent 736fc76345
commit 4bf5d4c044
19 changed files with 506 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/src/repository/usage/postgres/mod.rs
+50 -17
View File
@@ -4988,9 +4988,13 @@ normalized_usage AS (
successful_response_time_samples,
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens <= 0 THEN input_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
= 'openai'
AND (cache_creation_tokens > 0 OR cache_read_tokens > 0)
THEN GREATEST(input_tokens - cache_creation_tokens - cache_read_tokens, 0)
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('gemini', 'google')
AND cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_read_tokens, 0)
ELSE input_tokens
END AS effective_input_tokens,
@@ -4999,13 +5003,21 @@ normalized_usage AS (
IN ('claude', 'anthropic')
THEN input_tokens + cache_creation_tokens + cache_read_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
= 'openai'
THEN (
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens <= 0 THEN input_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
WHEN cache_creation_tokens > 0 OR cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_creation_tokens - cache_read_tokens, 0)
ELSE input_tokens
END
) + cache_creation_tokens + cache_read_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('gemini', 'google')
THEN (
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_read_tokens, 0)
ELSE input_tokens
END
@@ -7210,9 +7222,13 @@ normalized_usage AS (
success_flag,
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens <= 0 THEN input_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
= 'openai'
AND (cache_creation_tokens > 0 OR cache_read_tokens > 0)
THEN GREATEST(input_tokens - cache_creation_tokens - cache_read_tokens, 0)
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('gemini', 'google')
AND cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_read_tokens, 0)
ELSE input_tokens
END AS effective_input_tokens,
@@ -7221,13 +7237,21 @@ normalized_usage AS (
IN ('claude', 'anthropic')
THEN input_tokens + cache_creation_tokens + cache_read_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
= 'openai'
THEN (
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens <= 0 THEN input_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('openai', 'gemini', 'google')
WHEN cache_creation_tokens > 0 OR cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_creation_tokens - cache_read_tokens, 0)
ELSE input_tokens
END
) + cache_creation_tokens + cache_read_tokens
WHEN split_part(lower(COALESCE(normalized_api_format, '')), ':', 1)
IN ('gemini', 'google')
THEN (
CASE
WHEN input_tokens <= 0 THEN 0
WHEN cache_read_tokens > 0
THEN GREATEST(input_tokens - cache_read_tokens, 0)
ELSE input_tokens
END
@@ -11037,16 +11061,24 @@ fn usage_normalized_api_family(usage: &UpsertUsageRecord) -> String {
fn usage_effective_input_tokens(
input_tokens: Option<i64>,
cache_creation_tokens: Option<i64>,
cache_read_tokens: Option<i64>,
api_family: &str,
) -> Option<i64> {
let input_tokens = input_tokens?;
let cache_creation_tokens = cache_creation_tokens.unwrap_or_default();
let cache_read_tokens = cache_read_tokens.unwrap_or_default();
if matches!(api_family, "openai" | "gemini" | "google")
&& input_tokens > 0
&& cache_read_tokens > 0
{
return Some(input_tokens.saturating_sub(cache_read_tokens));
if input_tokens > 0 {
if api_family == "openai" && (cache_creation_tokens > 0 || cache_read_tokens > 0) {
return Some(
input_tokens
.saturating_sub(cache_creation_tokens)
.saturating_sub(cache_read_tokens),
);
}
if matches!(api_family, "gemini" | "google") && cache_read_tokens > 0 {
return Some(input_tokens.saturating_sub(cache_read_tokens));
}
}
Some(input_tokens)
}
@@ -11145,6 +11177,7 @@ fn usage_settlement_pricing_snapshot_from_usage(
.or_else(|| {
usage_effective_input_tokens(
billing_input_tokens,
billing_cache_creation_tokens,
billing_cache_read_tokens,
api_family.as_str(),
)