mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 01:10:23 +08:00
Merge remote-tracking branch 'origin/pr/384' into codex/pr-376-377-383-384-combined
# Conflicts: # frontend/src/views/admin/PerformanceAnalysis.vue
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
use super::range::{build_comparison_range, parse_bounded_u32};
|
||||
use super::resolve_admin_usage_time_range;
|
||||
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
|
||||
use crate::handlers::admin::shared::query_param_value;
|
||||
use crate::handlers::admin::shared::{query_param_optional_bool, query_param_value};
|
||||
use crate::GatewayError;
|
||||
use aether_admin::observability::stats::{
|
||||
admin_stats_bad_request_response, admin_stats_comparison_empty_response,
|
||||
@@ -203,6 +203,14 @@ pub(super) async fn maybe_build_local_admin_stats_analytics_response(
|
||||
Ok(value) => value.unwrap_or(8) as usize,
|
||||
Err(detail) => return Ok(Some(admin_stats_bad_request_response(detail))),
|
||||
};
|
||||
let slow_threshold_ms =
|
||||
match query_param_value(request_context.query_string(), "slow_threshold_ms")
|
||||
.map(|value| parse_bounded_u32("slow_threshold_ms", &value, 1, 600_000))
|
||||
.transpose()
|
||||
{
|
||||
Ok(value) => u64::from(value.unwrap_or(10_000)),
|
||||
Err(detail) => return Ok(Some(admin_stats_bad_request_response(detail))),
|
||||
};
|
||||
if !state.has_usage_data_reader() {
|
||||
return Ok(Some(admin_stats_provider_performance_empty_response()));
|
||||
}
|
||||
@@ -218,6 +226,16 @@ pub(super) async fn maybe_build_local_admin_stats_analytics_response(
|
||||
granularity,
|
||||
tz_offset_minutes: time_range.tz_offset_minutes,
|
||||
limit,
|
||||
provider_id: query_param_value(request_context.query_string(), "provider_id"),
|
||||
model: query_param_value(request_context.query_string(), "model"),
|
||||
api_format: query_param_value(request_context.query_string(), "api_format"),
|
||||
endpoint_kind: query_param_value(request_context.query_string(), "endpoint_kind"),
|
||||
is_stream: query_param_optional_bool(request_context.query_string(), "is_stream"),
|
||||
has_format_conversion: query_param_optional_bool(
|
||||
request_context.query_string(),
|
||||
"has_format_conversion",
|
||||
),
|
||||
slow_threshold_ms,
|
||||
})
|
||||
.await?;
|
||||
return Ok(Some(build_admin_stats_provider_performance_response(
|
||||
|
||||
@@ -960,6 +960,9 @@ async fn gateway_handles_admin_stats_provider_performance_locally_with_trusted_a
|
||||
assert_eq!(payload["summary"]["avg_output_tps"], 20.17);
|
||||
assert_eq!(payload["summary"]["avg_first_byte_time_ms"], 55.0);
|
||||
assert_eq!(payload["summary"]["avg_response_time_ms"], 590.91);
|
||||
assert_eq!(payload["summary"]["p99_response_time_ms"], 1000);
|
||||
assert_eq!(payload["summary"]["response_time_sample_count"], 11);
|
||||
assert_eq!(payload["summary"]["slow_request_count"], 0);
|
||||
|
||||
assert_eq!(payload["providers"].as_array().map(Vec::len), Some(2));
|
||||
assert_eq!(payload["providers"][0]["provider_id"], "provider-1");
|
||||
@@ -973,9 +976,13 @@ async fn gateway_handles_admin_stats_provider_performance_locally_with_trusted_a
|
||||
assert_eq!(payload["providers"][0]["avg_first_byte_time_ms"], 55.0);
|
||||
assert_eq!(payload["providers"][0]["avg_response_time_ms"], 550.0);
|
||||
assert_eq!(payload["providers"][0]["p90_response_time_ms"], 910);
|
||||
assert_eq!(payload["providers"][0]["p99_response_time_ms"], 991);
|
||||
assert_eq!(payload["providers"][0]["p90_first_byte_time_ms"], 91);
|
||||
assert_eq!(payload["providers"][0]["p99_first_byte_time_ms"], 99);
|
||||
assert_eq!(payload["providers"][0]["tps_sample_count"], 10);
|
||||
assert_eq!(payload["providers"][0]["response_time_sample_count"], 10);
|
||||
assert_eq!(payload["providers"][0]["first_byte_sample_count"], 10);
|
||||
assert_eq!(payload["providers"][0]["slow_request_count"], 0);
|
||||
|
||||
assert_eq!(payload["providers"][1]["provider_id"], "provider-2");
|
||||
assert_eq!(payload["providers"][1]["provider"], "Anthropic");
|
||||
@@ -994,6 +1001,7 @@ async fn gateway_handles_admin_stats_provider_performance_locally_with_trusted_a
|
||||
assert_eq!(payload["timeline"][0]["provider_id"], "provider-1");
|
||||
assert_eq!(payload["timeline"][0]["avg_output_tps"], 20.2);
|
||||
assert_eq!(payload["timeline"][0]["success_rate"], 90.91);
|
||||
assert_eq!(payload["timeline"][0]["slow_request_count"], 0);
|
||||
assert_eq!(payload["timeline"][1]["provider_id"], "provider-2");
|
||||
assert_eq!(
|
||||
payload["timeline"][1]["avg_first_byte_time_ms"],
|
||||
|
||||
Reference in New Issue
Block a user