i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-01 17:00:21 +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

25
crates/aether-admin/src/observability/usage.rs
View File

@@ -285,6 +285,9 @@ fn admin_usage_strip_routing_metadata(metadata: &mut serde_json::Map<String, Val
metadata.remove("candidate_id");
metadata.remove("candidate_index");
metadata.remove("key_name");
metadata.remove("model_id");
metadata.remove("global_model_id");
metadata.remove("global_model_name");
metadata.remove("planner_kind");
metadata.remove("route_family");
metadata.remove("route_kind");
@@ -795,6 +798,17 @@ fn admin_usage_routing_json(
"key_name",
provider_key_name.or_else(|| item.routing_key_name()),
);
maybe_insert_string_field(&mut routing, "model_id", item.routing_model_id());
maybe_insert_string_field(
&mut routing,
"global_model_id",
item.routing_global_model_id(),
);
maybe_insert_string_field(
&mut routing,
"global_model_name",
item.routing_global_model_name(),
);
maybe_insert_string_field(&mut routing, "planner_kind", item.routing_planner_kind());
maybe_insert_string_field(&mut routing, "route_family", item.routing_route_family());
maybe_insert_string_field(&mut routing, "route_kind", item.routing_route_kind());
@@ -2395,7 +2409,10 @@ mod tests {
fn detail_payload_exposes_typed_routing_section() {
let item = StoredRequestUsageAudit {
request_metadata: Some(json!({
"trace_id": "trace-routing-detail"
"trace_id": "trace-routing-detail",
"model_id": "model-1",
"global_model_id": "global-model-1",
"global_model_name": "gpt-5"
})),
candidate_id: Some("cand-1".to_string()),
candidate_index: Some(2),
@@ -2423,6 +2440,9 @@ mod tests {
assert_eq!(payload["routing"]["candidate_id"], "cand-1");
assert_eq!(payload["routing"]["candidate_index"], 2);
assert_eq!(payload["routing"]["key_name"], "resolved-primary");
assert_eq!(payload["routing"]["model_id"], "model-1");
assert_eq!(payload["routing"]["global_model_id"], "global-model-1");
assert_eq!(payload["routing"]["global_model_name"], "gpt-5");
assert_eq!(payload["routing"]["planner_kind"], "claude_cli_sync");
assert_eq!(payload["routing"]["route_family"], "claude");
assert_eq!(payload["routing"]["route_kind"], "cli");
@@ -2437,6 +2457,9 @@ mod tests {
assert!(payload["metadata"]["candidate_id"].is_null());
assert!(payload["metadata"]["candidate_index"].is_null());
assert!(payload["metadata"]["key_name"].is_null());
assert!(payload["metadata"]["model_id"].is_null());
assert!(payload["metadata"]["global_model_id"].is_null());
assert!(payload["metadata"]["global_model_name"].is_null());
assert!(payload["metadata"]["planner_kind"].is_null());
assert!(payload["metadata"]["trace_id"].is_null());
assert!(payload["metadata"]["route_family"].is_null());