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

feat(billing): 引入 model_id 精确计费查找路径，传播模型 ID 至用量事件与 report context

Browse Source 
- UsageEventData 新增 model_id / global_model_id 字段，write.rs seed 结构体同步补充
- report_context 新增 model_id / global_model_id / global_model_name，各 payload 构建时从 candidate 传入
- event_enrichment 优先按 model_id 精确查找计费上下文，回退为按名称多轮查找（保留 NoRule 结果降级逻辑）
- BillingReadRepository 新增 find_model_context_by_model_id，memory/sql 分别实现；SQL 查询重构支持按 provider_model_name 和 mappings 匹配并按优先级排序
- pricing.rs 修复：model_tiered_pricing 为空 tiers 时回退到 default_tiered_pricing
- request_metadata 允许字段列表补充 model_id / global_model_id / global_model_name
- admin usage 路由信息输出及脱敏字段列表同步新增三个 model 相关字段
This commit is contained in:
fawney19
2026-04-24 14:40:28 +08:00
parent f3c9835759
commit 780f09c1a2
20 changed files with 665 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/src/repository/billing/memory.rs
+165 -1
View File
@@ -44,12 +44,21 @@ impl BillingReadRepository for InMemoryBillingReadRepository {
provider_api_key_id: Option<&str>,
global_model_name: &str,
) -> Result<Option<StoredBillingModelContext>, DataLayerError> {
let by_key = self.by_key.read().expect("billing repository lock");
if let Some(value) = find_context_by_provider_model_name(
&by_key,
provider_id,
provider_api_key_id,
global_model_name,
) {
return Ok(Some(value));
}
let key = (
provider_id.to_string(),
global_model_name.to_string(),
provider_api_key_id.map(ToOwned::to_owned),
);
let by_key = self.by_key.read().expect("billing repository lock");
if let Some(value) = by_key.get(&key) {
return Ok(Some(value.clone()));
}
@@ -68,6 +77,88 @@ impl BillingReadRepository for InMemoryBillingReadRepository {
})
.map(|(_, value)| value.clone()))
}
async fn find_model_context_by_model_id(
&self,
provider_id: &str,
provider_api_key_id: Option<&str>,
model_id: &str,
) -> Result<Option<StoredBillingModelContext>, DataLayerError> {
let by_key = self.by_key.read().expect("billing repository lock");
if let Some(value) =
find_context_by_model_id_and_key(&by_key, provider_id, provider_api_key_id, model_id)
{
return Ok(Some(value));
}
if let Some(value) = find_context_by_model_id_and_key(&by_key, provider_id, None, model_id)
{
return Ok(Some(value));
}
Ok(by_key
.iter()
.find(|((stored_provider_id, _, _), value)| {
stored_provider_id == provider_id && value.model_id.as_deref() == Some(model_id)
})
.map(|(_, value)| value.clone()))
}
}
fn find_context_by_provider_model_name(
by_key: &BillingContextMap,
provider_id: &str,
provider_api_key_id: Option<&str>,
provider_model_name: &str,
) -> Option<StoredBillingModelContext> {
find_context_by_provider_model_name_and_key(
by_key,
provider_id,
provider_api_key_id,
provider_model_name,
)
.or_else(|| {
find_context_by_provider_model_name_and_key(by_key, provider_id, None, provider_model_name)
})
.or_else(|| {
by_key
.iter()
.find(|((stored_provider_id, _, _), value)| {
stored_provider_id == provider_id
&& value.model_provider_model_name.as_deref() == Some(provider_model_name)
})
.map(|(_, value)| value.clone())
})
}
fn find_context_by_provider_model_name_and_key(
by_key: &BillingContextMap,
provider_id: &str,
provider_api_key_id: Option<&str>,
provider_model_name: &str,
) -> Option<StoredBillingModelContext> {
by_key
.iter()
.find(|((stored_provider_id, _, stored_key_id), value)| {
stored_provider_id == provider_id
&& stored_key_id.as_deref() == provider_api_key_id
&& value.model_provider_model_name.as_deref() == Some(provider_model_name)
})
.map(|(_, value)| value.clone())
}
fn find_context_by_model_id_and_key(
by_key: &BillingContextMap,
provider_id: &str,
provider_api_key_id: Option<&str>,
model_id: &str,
) -> Option<StoredBillingModelContext> {
by_key
.iter()
.find(|((stored_provider_id, _, stored_key_id), value)| {
stored_provider_id == provider_id
&& stored_key_id.as_deref() == provider_api_key_id
&& value.model_id.as_deref() == Some(model_id)
})
.map(|(_, value)| value.clone())
}
#[cfg(test)]
@@ -110,4 +201,77 @@ mod tests {
assert_eq!(stored.provider_id, "provider-1");
assert_eq!(stored.global_model_name, "gpt-5");
}
#[tokio::test]
async fn resolves_by_provider_model_name_before_global_name_collision() {
let global_named_context = StoredBillingModelContext::new(
"provider-1".to_string(),
Some("pay_as_you_go".to_string()),
Some("key-1".to_string()),
None,
Some(60),
"global-model-blank".to_string(),
"claude-sonnet-4-6".to_string(),
None,
None,
None,
Some("model-blank".to_string()),
Some("blank-upstream".to_string()),
None,
None,
None,
)
.expect("blank billing context should build");
let provider_priced_context = StoredBillingModelContext::new(
"provider-1".to_string(),
Some("pay_as_you_go".to_string()),
Some("key-1".to_string()),
None,
Some(60),
"global-model-priced".to_string(),
"claude-opus-4-6".to_string(),
None,
None,
Some(json!({"tiers":[{"up_to":null,"input_price_per_1m":3.0,"output_price_per_1m":15.0}]})),
Some("model-priced".to_string()),
Some("claude-sonnet-4-6".to_string()),
None,
None,
None,
)
.expect("priced billing context should build");
let repository = InMemoryBillingReadRepository::seed(vec![
global_named_context,
provider_priced_context,
]);
let stored = repository
.find_model_context("provider-1", Some("key-1"), "claude-sonnet-4-6")
.await
.expect("lookup should succeed")
.expect("context should exist");
assert_eq!(stored.global_model_name, "claude-opus-4-6");
assert_eq!(
stored.model_provider_model_name.as_deref(),
Some("claude-sonnet-4-6")
);
assert!(stored.default_tiered_pricing.is_some());
}
#[tokio::test]
async fn resolves_by_model_id() {
let repository = InMemoryBillingReadRepository::seed(vec![sample_context()]);
let stored = repository
.find_model_context_by_model_id("provider-1", Some("key-1"), "model-1")
.await
.expect("lookup should succeed")
.expect("context should exist");
assert_eq!(stored.global_model_name, "gpt-5");
assert_eq!(
stored.model_provider_model_name.as_deref(),
Some("gpt-5-upstream")
);
}
}