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

Add Gemini CLI v1internal quota support

Browse Source
This commit is contained in:
Mas0nShi
2026-05-22 16:58:04 +08:00
parent 9533bd7043
commit ce02f1ae8c
17 changed files with 985 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-admin/src/provider/quota.rs
+63 -10
View File
@@ -263,9 +263,9 @@ pub fn parse_gemini_cli_retrieve_user_quota_response(
let mut quota_by_model = serde_json::Map::new();
for bucket in buckets {
let Some(bucket_object) = bucket.as_object() else {
if !bucket.is_object() {
continue;
};
}
let model_id = first_json_string_by_paths(
bucket,
&[
@@ -354,6 +354,54 @@ pub fn parse_gemini_cli_retrieve_user_quota_response(
],
)
.or_else(|| remaining_fraction.map(|value| value <= 1e-9));
let remaining_amount = first_json_f64_by_paths(
bucket,
&[
&["remainingAmount"],
&["remaining_amount"],
&["remaining"],
&["remaining_value"],
&["quotaInfo", "remainingAmount"],
&["quotaInfo", "remaining_amount"],
&["quotaInfo", "remaining"],
&["quotaInfo", "remaining_value"],
&["quota", "remainingAmount"],
&["quota", "remaining_amount"],
&["quota", "remaining"],
&["quota", "remaining_value"],
],
);
let explicit_total = first_json_f64_by_paths(
bucket,
&[
&["limit"],
&["limitAmount"],
&["limit_amount"],
&["total"],
&["totalAmount"],
&["total_amount"],
&["quotaInfo", "limit"],
&["quotaInfo", "limitAmount"],
&["quotaInfo", "limit_amount"],
&["quotaInfo", "total"],
&["quotaInfo", "totalAmount"],
&["quotaInfo", "total_amount"],
&["quota", "limit"],
&["quota", "limitAmount"],
&["quota", "limit_amount"],
&["quota", "total"],
&["quota", "totalAmount"],
&["quota", "total_amount"],
],
)
.filter(|value| *value > 0.0);
let total_amount = explicit_total.or_else(|| {
remaining_amount
.zip(remaining_fraction)
.and_then(|(remaining, fraction)| {
(fraction > 0.0).then_some((remaining / fraction).round())
})
});
let mut payload = serde_json::Map::new();
payload.insert("display_name".to_string(), json!(display_name));
@@ -379,15 +427,11 @@ pub fn parse_gemini_cli_retrieve_user_quota_response(
if let Some(is_exhausted) = is_exhausted {
payload.insert("is_exhausted".to_string(), json!(is_exhausted));
}
if bucket_object.contains_key("limit") {
if let Some(value) = bucket_object.get("limit").and_then(coerce_json_f64) {
payload.insert("total".to_string(), json!(value));
}
if let Some(value) = total_amount {
payload.insert("total".to_string(), json!(value));
}
if bucket_object.contains_key("remaining") {
if let Some(value) = bucket_object.get("remaining").and_then(coerce_json_f64) {
payload.insert("remaining".to_string(), json!(value));
}
if let Some(value) = remaining_amount {
payload.insert("remaining".to_string(), json!(value));
}
quota_by_model.insert(quota_key, serde_json::Value::Object(payload));
@@ -1740,6 +1784,7 @@ mod tests {
"tokenType": "model",
"displayName": "Gemini 2.5 Pro",
"remainingFraction": 0.25,
"remainingAmount": "25",
"resetTime": "2030-01-01T00:00:00Z",
"isExhausted": false
},
@@ -1764,6 +1809,14 @@ mod tests {
parsed["quota_by_model"]["gemini-2.5-pro"]["remaining_fraction"],
json!(0.25)
);
assert_eq!(
parsed["quota_by_model"]["gemini-2.5-pro"]["remaining"],
json!(25.0)
);
assert_eq!(
parsed["quota_by_model"]["gemini-2.5-pro"]["total"],
json!(100.0)
);
assert_eq!(
parsed["quota_by_model"]["gemini-2.5-pro"]["reset_at"],
json!(1_893_456_000u64)