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

fix(ci): apply rustfmt to usage metadata handlers

Browse Source
This commit is contained in:
RWDai
2026-05-17 20:28:08 +08:00
parent ba661f1b3c
commit 981020a5ab
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/aether-gateway/src/handlers/admin/observability/usage/summary_routes.rs
View File

@@ -5,12 +5,13 @@ use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
use crate::handlers::admin::shared::query_param_value;
use crate::GatewayError;
use aether_admin::observability::usage::{
admin_usage_bad_request_response, admin_usage_client_family, admin_usage_data_unavailable_response,
admin_usage_has_fallback, admin_usage_is_failed, admin_usage_matches_search,
admin_usage_matches_username, admin_usage_parse_ids, admin_usage_parse_limit,
admin_usage_parse_offset, admin_usage_provider_key_name, admin_usage_record_json,
build_admin_usage_active_requests_response, build_admin_usage_records_response,
build_admin_usage_summary_stats_response_from_summary, ADMIN_USAGE_DATA_UNAVAILABLE_DETAIL,
admin_usage_bad_request_response, admin_usage_client_family,
admin_usage_data_unavailable_response, admin_usage_has_fallback, admin_usage_is_failed,
admin_usage_matches_search, admin_usage_matches_username, admin_usage_parse_ids,
admin_usage_parse_limit, admin_usage_parse_offset, admin_usage_provider_key_name,
admin_usage_record_json, build_admin_usage_active_requests_response,
build_admin_usage_records_response, build_admin_usage_summary_stats_response_from_summary,
ADMIN_USAGE_DATA_UNAVAILABLE_DETAIL,
};
use aether_data::repository::users::StoredUserSummary;
use aether_data_contracts::repository::{
@@ -649,7 +650,9 @@ pub(super) async fn maybe_build_local_admin_usage_summary_response(
let active_client_family_filter = client_family_filter
.as_deref()
.filter(|value| !value.trim().is_empty());
let (usage, total) = if attempt_status_filter.is_some() || active_client_family_filter.is_some() {
let (usage, total) = if attempt_status_filter.is_some()
|| active_client_family_filter.is_some()
{
let mut usage = state.list_usage_audits(&base_query).await?;
let user_ids: Vec<String> = usage
.iter()
@@ -679,12 +682,14 @@ pub(super) async fn maybe_build_local_admin_usage_summary_response(
active_username_filter,
&users_by_id,
state.has_auth_user_data_reader(),
) && attempt_status_filter.is_none_or(|attempt_status| admin_usage_matches_attempt_status(
item,
attempt_status,
&attempt_flags_by_usage_id,
request_candidate_reader_available,
)) && admin_usage_matches_client_family(item, active_client_family_filter)
) && attempt_status_filter.is_none_or(|attempt_status| {
admin_usage_matches_attempt_status(
item,
attempt_status,
&attempt_flags_by_usage_id,
request_candidate_reader_available,
)
}) && admin_usage_matches_client_family(item, active_client_family_filter)
});
sort_usage_newest_first(&mut usage);
let total = usage.len();

6
apps/aether-gateway/src/handlers/public/support/user_me_usage.rs
View File

@@ -344,7 +344,11 @@ fn users_me_usage_client_family(item: &StoredRequestUsageAudit) -> Option<&str>
.and_then(serde_json::Value::as_object)
.and_then(|affinity| affinity.get("client_family"))
.and_then(serde_json::Value::as_str)
.or_else(|| metadata.get("client_family").and_then(serde_json::Value::as_str))
.or_else(|| {
metadata
.get("client_family")
.and_then(serde_json::Value::as_str)
})
})
.map(str::trim)
.filter(|value| !value.is_empty())

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

@@ -1166,9 +1166,21 @@ pub fn admin_usage_record_json(
);
object.insert("client_is_stream".to_string(), json!(client_is_stream));
maybe_insert_string_field(object, "client_family", admin_usage_client_family(item));
maybe_insert_string_field(object, "client_ip", admin_usage_metadata_string(item, "client_ip"));
maybe_insert_string_field(object, "user_agent", admin_usage_metadata_string(item, "user_agent"));
maybe_insert_string_field(object, "request_path", admin_usage_metadata_string(item, "request_path"));
maybe_insert_string_field(
object,
"client_ip",
admin_usage_metadata_string(item, "client_ip"),
);
maybe_insert_string_field(
object,
"user_agent",
admin_usage_metadata_string(item, "user_agent"),
);
maybe_insert_string_field(
object,
"request_path",
admin_usage_metadata_string(item, "request_path"),
);
maybe_insert_string_field(
object,
"request_path_and_query",