Merge remote-tracking branch 'origin/pr/587'

2026-10-09 18:59:50 +08:00 · 2026-05-28 13:56:04 +08:00
parent 069e1c1e60 4ce056fe45
commit 18566b5837
24 changed files with 1914 additions and 17 deletions
@@ -1,7 +1,7 @@
 use super::extractors::{admin_health_key_id, admin_recover_key_id};
 use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
 use crate::handlers::admin::shared::query_param_value;
-use crate::handlers::public::ApiFormatHealthMonitorOptions;
+use crate::handlers::public::{ApiFormatHealthMonitorOptions, ModelHealthMonitorOptions};
 use crate::GatewayError;
 use axum::{
    body::Body,
@@ -157,6 +157,80 @@ pub(super) async fn maybe_build_local_admin_endpoints_health_response(
        return Ok(Some(Json(payload).into_response()));
    }

+    if decision.route_family.as_deref() == Some("endpoints_health")
+        && decision.route_kind.as_deref() == Some("health_models")
+        && request_context.path() == "/api/admin/endpoints/health/models"
+    {
+        if !state.has_usage_data_reader() {
+            return Ok(Some(build_admin_endpoint_health_data_unavailable_response()));
+        }
+        let lookback_hours = query_param_value(request_context.query_string(), "lookback_hours")
+            .and_then(|value| value.parse::<u64>().ok())
+            .filter(|value| (1..=72).contains(value))
+            .unwrap_or(6);
+        let model_limit = query_param_value(request_context.query_string(), "model_limit")
+            .and_then(|value| value.parse::<usize>().ok())
+            .filter(|value| (1..=50).contains(value))
+            .unwrap_or(12);
+        let per_model_limit = query_param_value(request_context.query_string(), "per_model_limit")
+            .and_then(|value| value.parse::<usize>().ok())
+            .filter(|value| (10..=200).contains(value))
+            .unwrap_or(60);
+        let Some(payload) = state
+            .build_model_health_monitor_payload(
+                lookback_hours,
+                model_limit,
+                per_model_limit,
+                ModelHealthMonitorOptions {
+                    include_provider_count: true,
+                },
+            )
+            .await
+        else {
+            return Ok(Some(build_admin_endpoint_health_data_unavailable_response()));
+        };
+        return Ok(Some(Json(payload).into_response()));
+    }
+
+    if decision.route_family.as_deref() == Some("endpoints_health")
+        && decision.route_kind.as_deref() == Some("health_providers")
+        && request_context.path() == "/api/admin/endpoints/health/providers"
+    {
+        if !state.has_provider_catalog_data_reader() || !state.has_usage_data_reader() {
+            return Ok(Some(build_admin_endpoint_health_data_unavailable_response()));
+        }
+        let lookback_hours = query_param_value(request_context.query_string(), "lookback_hours")
+            .and_then(|value| value.parse::<u64>().ok())
+            .filter(|value| (1..=72).contains(value))
+            .unwrap_or(6);
+        let provider_limit = query_param_value(request_context.query_string(), "provider_limit")
+            .and_then(|value| value.parse::<usize>().ok())
+            .filter(|value| (1..=100).contains(value))
+            .unwrap_or(50);
+        let per_provider_model_limit =
+            query_param_value(request_context.query_string(), "per_provider_model_limit")
+                .and_then(|value| value.parse::<usize>().ok())
+                .filter(|value| (1..=50).contains(value))
+                .unwrap_or(12);
+        let per_model_event_limit =
+            query_param_value(request_context.query_string(), "per_model_limit")
+                .and_then(|value| value.parse::<usize>().ok())
+                .filter(|value| (10..=200).contains(value))
+                .unwrap_or(100);
+        let Some(payload) = state
+            .build_provider_health_monitor_payload(
+                lookback_hours,
+                provider_limit,
+                per_provider_model_limit,
+                per_model_event_limit,
+            )
+            .await
+        else {
+            return Ok(Some(build_admin_endpoint_health_data_unavailable_response()));
+        };
+        return Ok(Some(Json(payload).into_response()));
+    }
+
    if decision.route_family.as_deref() == Some("endpoints_health")
        && decision.route_kind.as_deref() == Some("health_status")
        && request_context.path() == "/api/admin/endpoints/health/status"
@@ -242,6 +242,40 @@ impl<'a> AdminAppState<'a> {
        .await
    }

+    pub(crate) async fn build_model_health_monitor_payload(
+        &self,
+        lookback_hours: u64,
+        model_limit: usize,
+        per_model_limit: usize,
+        options: crate::handlers::public::ModelHealthMonitorOptions,
+    ) -> Option<serde_json::Value> {
+        crate::handlers::public::build_model_health_monitor_payload(
+            self.app,
+            lookback_hours,
+            model_limit,
+            per_model_limit,
+            options,
+        )
+        .await
+    }
+
+    pub(crate) async fn build_provider_health_monitor_payload(
+        &self,
+        lookback_hours: u64,
+        provider_limit: usize,
+        per_provider_model_limit: usize,
+        per_model_event_limit: usize,
+    ) -> Option<serde_json::Value> {
+        crate::handlers::public::build_provider_health_monitor_payload(
+            self.app,
+            lookback_hours,
+            provider_limit,
+            per_provider_model_limit,
+            per_model_event_limit,
+        )
+        .await
+    }
+
    pub(crate) async fn execute_execution_runtime_sync_plan(
        &self,
        trace_id: Option<&str>,