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

feat(usage): support output_config effort badge source

Browse Source 
- extract reasoning effort from provider request body output_config.effort
- include output_config.effort in usage list fallback SQL
- cover the new request body shape in usage metadata tests
This commit is contained in:
AAEE86
2026-05-28 16:14:37 +08:00
parent bb2fc2ec00
commit 60e3ffc402
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data-contracts/src/repository/usage/types.rs
+14 -1
View File
@@ -17,6 +17,13 @@ pub fn extract_provider_reasoning_effort_from_body(value: Option<&Value>) -> Opt
.and_then(|reasoning| reasoning.get("effort")) .and_then(|reasoning| reasoning.get("effort"))
.and_then(Value::as_str) .and_then(Value::as_str)
}) })
.or_else(|| {
object
.get("output_config")
.and_then(Value::as_object)
.and_then(|output_config| output_config.get("effort"))
.and_then(Value::as_str)
})
.and_then(normalize_provider_reasoning_effort) .and_then(normalize_provider_reasoning_effort)
} }
@@ -2437,13 +2444,19 @@ mod tests {
usage.request_metadata = None; usage.request_metadata = None;
usage.provider_request_body = Some(json!({ usage.provider_request_body = Some(json!({
"reasoning_effort": "High", "output_config": { "effort": "High" },
"service_tier": "priority" "service_tier": "priority"
})); }));
assert_eq!(usage.provider_reasoning_effort().as_deref(), Some("high")); assert_eq!(usage.provider_reasoning_effort().as_deref(), Some("high"));
assert_eq!(usage.provider_service_tier().as_deref(), Some("priority")); assert_eq!(usage.provider_service_tier().as_deref(), Some("priority"));
usage.provider_request_body = Some(json!({
"reasoning_effort": "medium"
}));
assert_eq!(usage.provider_reasoning_effort().as_deref(), Some("medium"));
usage.request_metadata = Some(json!({ usage.request_metadata = Some(json!({
"provider_reasoning_effort": "max", "provider_reasoning_effort": "max",
"provider_service_tier": "standard" "provider_service_tier": "standard"
crates/aether-data/src/repository/usage/postgres/queries/list_recent_usage_audits_prefix.sql
+4 -2
View File
@@ -117,7 +117,8 @@ SELECT
OR CASE OR CASE
WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE( WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE(
NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''), NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), '') NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'output_config'->>'effort'), '')
) )
ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '') ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '')
END IS NOT NULL END IS NOT NULL
@@ -140,7 +141,8 @@ SELECT
CASE CASE
WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE( WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE(
NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''), NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), '') NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'output_config'->>'effort'), '')
) )
ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '') ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '')
END, END,
crates/aether-data/src/repository/usage/postgres/queries/list_usage_audits_prefix.sql
+4 -2
View File
@@ -117,7 +117,8 @@ SELECT
OR CASE OR CASE
WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE( WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE(
NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''), NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), '') NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'output_config'->>'effort'), '')
) )
ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '') ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '')
END IS NOT NULL END IS NOT NULL
@@ -140,7 +141,8 @@ SELECT
CASE CASE
WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE( WHEN jsonb_typeof("usage".provider_request_body::jsonb) = 'object' THEN COALESCE(
NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''), NULLIF(BTRIM("usage".provider_request_body->>'reasoning_effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), '') NULLIF(BTRIM("usage".provider_request_body->'reasoning'->>'effort'), ''),
NULLIF(BTRIM("usage".provider_request_body->'output_config'->>'effort'), '')
) )
ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '') ELSE NULLIF(BTRIM("usage".request_metadata->>'provider_reasoning_effort'), '')
END, END,