mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-10 03:09:50 +08:00
refactor: 大规模模块拆分与代码精简，新增 ai-pipeline/data-contracts 独立 crate
- 新增 aether-ai-pipeline 和 aether-data-contracts crate，将 pipeline 逻辑与数据契约从 gateway 中解耦 - 重构 admin handlers：拆分单体模块为 auth/billing/endpoint/features/model/observability/provider/system 等独立子模块 - 合并 chat/cli 重复代码路径：精简 conversion、finalize、planner 中的 sync/chat/cli 分支 - 重构 scheduler/executor/data 层，引入 facade 模式降低模块间耦合 - 移除冗余的 intent 模块，将 plan_fallback/policy/stream_path/sync_path 迁移至 executor - 前端适配：调整 admin API 调用和 provider 模型测试对话框
This commit is contained in:
fawney19
@@ -0,0 +1,259 @@
|
||||
use super::super::write::{normalize_provider_billing_type, parse_optional_rfc3339_unix_secs};
|
||||
use super::shared::admin_provider_strategy_provider_not_found_response;
|
||||
use crate::handlers::admin::shared::unix_secs_to_rfc3339;
|
||||
use crate::{AppState, GatewayError};
|
||||
use axum::{
|
||||
body::Body,
|
||||
http,
|
||||
response::{IntoResponse, Response},
|
||||
Json,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(super) struct AdminProviderStrategyBillingRequest {
|
||||
pub(super) billing_type: String,
|
||||
#[serde(default)]
|
||||
pub(super) monthly_quota_usd: Option<f64>,
|
||||
#[serde(default = "default_provider_strategy_quota_reset_day")]
|
||||
pub(super) quota_reset_day: u64,
|
||||
#[serde(default)]
|
||||
pub(super) quota_last_reset_at: Option<String>,
|
||||
#[serde(default)]
|
||||
pub(super) quota_expires_at: Option<String>,
|
||||
#[serde(default)]
|
||||
pub(super) rpm_limit: Option<i32>,
|
||||
#[serde(default = "default_provider_strategy_provider_priority")]
|
||||
pub(super) provider_priority: i32,
|
||||
}
|
||||
|
||||
fn default_provider_strategy_quota_reset_day() -> u64 {
|
||||
30
|
||||
}
|
||||
|
||||
fn default_provider_strategy_provider_priority() -> i32 {
|
||||
100
|
||||
}
|
||||
|
||||
pub(super) fn build_provider_strategy_list_response() -> Response<Body> {
|
||||
Json(json!({
|
||||
"strategies": [{
|
||||
"name": "sticky_priority",
|
||||
"priority": 110,
|
||||
"version": "1.0.0",
|
||||
"description": "粘性优先级负载均衡策略，正常时始终使用同一提供商",
|
||||
"author": "System",
|
||||
}],
|
||||
"total": 1,
|
||||
}))
|
||||
.into_response()
|
||||
}
|
||||
|
||||
pub(super) async fn build_provider_strategy_update_billing_response(
|
||||
state: &AppState,
|
||||
provider_id: String,
|
||||
payload: AdminProviderStrategyBillingRequest,
|
||||
) -> Result<Response<Body>, GatewayError> {
|
||||
let Some(existing) = state
|
||||
.read_provider_catalog_providers_by_ids(std::slice::from_ref(&provider_id))
|
||||
.await?
|
||||
.into_iter()
|
||||
.next()
|
||||
else {
|
||||
return Ok(admin_provider_strategy_provider_not_found_response());
|
||||
};
|
||||
|
||||
let billing_type = match normalize_provider_billing_type(&payload.billing_type) {
|
||||
Ok(value) => value,
|
||||
Err(message) => {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": message })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
};
|
||||
if payload
|
||||
.monthly_quota_usd
|
||||
.is_some_and(|value| !value.is_finite() || value < 0.0)
|
||||
{
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "monthly_quota_usd 必须是非负数" })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
if !(1..=365).contains(&payload.quota_reset_day) {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "quota_reset_day 必须是 1 到 365 之间的整数" })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
if !(0..=10_000).contains(&payload.provider_priority) {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "provider_priority 必须在 0 到 10000 之间" })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
|
||||
let quota_last_reset_at_unix_secs = match payload.quota_last_reset_at.as_deref() {
|
||||
Some(value) => match parse_optional_rfc3339_unix_secs(value, "quota_last_reset_at") {
|
||||
Ok(value) => Some(value),
|
||||
Err(message) => {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": message })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
},
|
||||
None => existing.quota_last_reset_at_unix_secs,
|
||||
};
|
||||
let quota_expires_at_unix_secs = match payload.quota_expires_at.as_deref() {
|
||||
Some(value) => match parse_optional_rfc3339_unix_secs(value, "quota_expires_at") {
|
||||
Ok(value) => Some(value),
|
||||
Err(message) => {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": message })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
},
|
||||
None => existing.quota_expires_at_unix_secs,
|
||||
};
|
||||
|
||||
let synced_monthly_used_usd = match quota_last_reset_at_unix_secs {
|
||||
Some(quota_last_reset_at_unix_secs) if state.has_usage_data_reader() => Some(
|
||||
state
|
||||
.summarize_provider_usage_since(&provider_id, quota_last_reset_at_unix_secs)
|
||||
.await?
|
||||
.total_cost_usd,
|
||||
),
|
||||
_ => existing.monthly_used_usd,
|
||||
};
|
||||
|
||||
let _ignored_rpm_limit = payload.rpm_limit;
|
||||
let updated = existing
|
||||
.clone()
|
||||
.with_billing_fields(
|
||||
Some(billing_type.clone()),
|
||||
payload.monthly_quota_usd,
|
||||
synced_monthly_used_usd,
|
||||
Some(payload.quota_reset_day),
|
||||
quota_last_reset_at_unix_secs,
|
||||
quota_expires_at_unix_secs,
|
||||
)
|
||||
.with_routing_fields(payload.provider_priority);
|
||||
let Some(updated) = state.update_provider_catalog_provider(&updated).await? else {
|
||||
return Ok(admin_provider_strategy_provider_not_found_response());
|
||||
};
|
||||
|
||||
Ok(Json(json!({
|
||||
"message": "Provider billing config updated successfully",
|
||||
"provider": {
|
||||
"id": updated.id,
|
||||
"name": updated.name,
|
||||
"billing_type": billing_type,
|
||||
"provider_priority": updated.provider_priority,
|
||||
},
|
||||
}))
|
||||
.into_response())
|
||||
}
|
||||
|
||||
pub(super) async fn build_provider_strategy_stats_response(
|
||||
state: &AppState,
|
||||
provider_id: String,
|
||||
hours: u64,
|
||||
) -> Result<Response<Body>, GatewayError> {
|
||||
let now_unix_secs = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs();
|
||||
let since_unix_secs = now_unix_secs.saturating_sub(hours.saturating_mul(3600));
|
||||
|
||||
let Some(provider) = state
|
||||
.read_provider_catalog_providers_by_ids(std::slice::from_ref(&provider_id))
|
||||
.await?
|
||||
.into_iter()
|
||||
.next()
|
||||
else {
|
||||
return Ok(admin_provider_strategy_provider_not_found_response());
|
||||
};
|
||||
|
||||
let summary = state
|
||||
.summarize_provider_usage_since(&provider_id, since_unix_secs)
|
||||
.await?;
|
||||
let monthly_used_usd = provider.monthly_used_usd.unwrap_or(0.0);
|
||||
let quota_remaining_usd = provider
|
||||
.monthly_quota_usd
|
||||
.map(|value| value - monthly_used_usd);
|
||||
let success_rate = if summary.total_requests > 0 {
|
||||
summary.successful_requests as f64 / summary.total_requests as f64
|
||||
} else {
|
||||
0.0
|
||||
};
|
||||
|
||||
Ok(Json(json!({
|
||||
"provider_id": provider_id,
|
||||
"provider_name": provider.name,
|
||||
"period_hours": hours,
|
||||
"billing_info": {
|
||||
"billing_type": provider.billing_type,
|
||||
"monthly_quota_usd": provider.monthly_quota_usd,
|
||||
"monthly_used_usd": monthly_used_usd,
|
||||
"quota_remaining_usd": quota_remaining_usd,
|
||||
"quota_expires_at": provider.quota_expires_at_unix_secs.and_then(unix_secs_to_rfc3339),
|
||||
},
|
||||
"usage_stats": {
|
||||
"total_requests": summary.total_requests,
|
||||
"successful_requests": summary.successful_requests,
|
||||
"failed_requests": summary.failed_requests,
|
||||
"success_rate": success_rate,
|
||||
"avg_response_time_ms": (summary.avg_response_time_ms * 100.0).round() / 100.0,
|
||||
"total_cost_usd": (summary.total_cost_usd * 10_000.0).round() / 10_000.0,
|
||||
},
|
||||
}))
|
||||
.into_response())
|
||||
}
|
||||
|
||||
pub(super) async fn build_provider_strategy_reset_quota_response(
|
||||
state: &AppState,
|
||||
provider_id: String,
|
||||
) -> Result<Response<Body>, GatewayError> {
|
||||
let Some(provider) = state
|
||||
.read_provider_catalog_providers_by_ids(std::slice::from_ref(&provider_id))
|
||||
.await?
|
||||
.into_iter()
|
||||
.next()
|
||||
else {
|
||||
return Ok(admin_provider_strategy_provider_not_found_response());
|
||||
};
|
||||
|
||||
if provider.billing_type.as_deref() != Some("monthly_quota") {
|
||||
return Ok((
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "Only monthly quota providers can be reset" })),
|
||||
)
|
||||
.into_response());
|
||||
}
|
||||
|
||||
let previous_used = provider.monthly_used_usd.unwrap_or(0.0);
|
||||
let mut updated = provider.clone();
|
||||
updated.monthly_used_usd = Some(0.0);
|
||||
let Some(updated) = state.update_provider_catalog_provider(&updated).await? else {
|
||||
return Ok(admin_provider_strategy_provider_not_found_response());
|
||||
};
|
||||
|
||||
Ok(Json(json!({
|
||||
"message": "Provider quota reset successfully",
|
||||
"provider_name": updated.name,
|
||||
"previous_used": previous_used,
|
||||
"current_used": 0.0,
|
||||
}))
|
||||
.into_response())
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
use crate::control::GatewayPublicRequestContext;
|
||||
use crate::{AppState, GatewayError};
|
||||
use axum::body::{Body, Bytes};
|
||||
use axum::http::Response;
|
||||
|
||||
mod builders;
|
||||
mod routes;
|
||||
mod shared;
|
||||
|
||||
pub(crate) async fn maybe_build_local_admin_provider_strategy_response(
|
||||
state: &AppState,
|
||||
request_context: &GatewayPublicRequestContext,
|
||||
request_body: Option<&Bytes>,
|
||||
) -> Result<Option<Response<Body>>, GatewayError> {
|
||||
routes::maybe_build_local_admin_provider_strategy_response(state, request_context, request_body)
|
||||
.await
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
use super::builders::{
|
||||
build_provider_strategy_list_response, build_provider_strategy_reset_quota_response,
|
||||
build_provider_strategy_stats_response, build_provider_strategy_update_billing_response,
|
||||
AdminProviderStrategyBillingRequest,
|
||||
};
|
||||
use super::shared::{
|
||||
admin_provider_strategy_data_unavailable_response,
|
||||
admin_provider_strategy_dispatcher_not_found_response,
|
||||
admin_provider_strategy_provider_not_found_response,
|
||||
ADMIN_PROVIDER_STRATEGY_DATA_UNAVAILABLE_DETAIL,
|
||||
ADMIN_PROVIDER_STRATEGY_STATS_DATA_UNAVAILABLE_DETAIL,
|
||||
};
|
||||
use crate::control::GatewayPublicRequestContext;
|
||||
use crate::handlers::admin::provider::shared::{
|
||||
admin_provider_id_for_provider_strategy_billing, admin_provider_id_for_provider_strategy_quota,
|
||||
admin_provider_id_for_provider_strategy_stats, is_admin_provider_strategy_strategies_root,
|
||||
};
|
||||
use crate::handlers::admin::shared::query_param_value;
|
||||
use crate::{AppState, GatewayError};
|
||||
use axum::{
|
||||
body::{Body, Bytes},
|
||||
http,
|
||||
response::{IntoResponse, Response},
|
||||
Json,
|
||||
};
|
||||
use serde_json::json;
|
||||
|
||||
pub(super) async fn maybe_build_local_admin_provider_strategy_response(
|
||||
state: &AppState,
|
||||
request_context: &GatewayPublicRequestContext,
|
||||
request_body: Option<&Bytes>,
|
||||
) -> Result<Option<Response<Body>>, GatewayError> {
|
||||
let Some(decision) = request_context.control_decision.as_ref() else {
|
||||
return Ok(None);
|
||||
};
|
||||
if decision.route_family.as_deref() != Some("provider_strategy_manage") {
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
if decision.route_kind.as_deref() == Some("list_strategies")
|
||||
&& request_context.request_method == http::Method::GET
|
||||
&& is_admin_provider_strategy_strategies_root(&request_context.request_path)
|
||||
{
|
||||
return Ok(Some(build_provider_strategy_list_response()));
|
||||
}
|
||||
|
||||
if decision.route_kind.as_deref() == Some("update_provider_billing")
|
||||
&& request_context.request_method == http::Method::PUT
|
||||
{
|
||||
if !state.has_provider_catalog_data_reader() || !state.has_provider_catalog_data_writer() {
|
||||
return Ok(Some(admin_provider_strategy_data_unavailable_response(
|
||||
ADMIN_PROVIDER_STRATEGY_DATA_UNAVAILABLE_DETAIL,
|
||||
)));
|
||||
}
|
||||
|
||||
let Some(provider_id) =
|
||||
admin_provider_id_for_provider_strategy_billing(&request_context.request_path)
|
||||
else {
|
||||
return Ok(Some(admin_provider_strategy_provider_not_found_response()));
|
||||
};
|
||||
|
||||
let Some(request_body) = request_body else {
|
||||
return Ok(Some(
|
||||
(
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "请求体不能为空" })),
|
||||
)
|
||||
.into_response(),
|
||||
));
|
||||
};
|
||||
let payload =
|
||||
match serde_json::from_slice::<AdminProviderStrategyBillingRequest>(request_body) {
|
||||
Ok(payload) => payload,
|
||||
Err(_) => {
|
||||
return Ok(Some(
|
||||
(
|
||||
http::StatusCode::BAD_REQUEST,
|
||||
Json(json!({ "detail": "请求数据验证失败" })),
|
||||
)
|
||||
.into_response(),
|
||||
))
|
||||
}
|
||||
};
|
||||
|
||||
return Ok(Some(
|
||||
build_provider_strategy_update_billing_response(state, provider_id, payload).await?,
|
||||
));
|
||||
}
|
||||
|
||||
if decision.route_kind.as_deref() == Some("get_provider_stats")
|
||||
&& request_context.request_method == http::Method::GET
|
||||
{
|
||||
if !state.has_provider_catalog_data_reader() || !state.has_usage_data_reader() {
|
||||
return Ok(Some(admin_provider_strategy_data_unavailable_response(
|
||||
ADMIN_PROVIDER_STRATEGY_STATS_DATA_UNAVAILABLE_DETAIL,
|
||||
)));
|
||||
}
|
||||
|
||||
let Some(provider_id) =
|
||||
admin_provider_id_for_provider_strategy_stats(&request_context.request_path)
|
||||
else {
|
||||
return Ok(Some(admin_provider_strategy_provider_not_found_response()));
|
||||
};
|
||||
|
||||
let hours = query_param_value(request_context.request_query_string.as_deref(), "hours")
|
||||
.and_then(|value| value.parse::<u64>().ok())
|
||||
.filter(|value| *value > 0)
|
||||
.unwrap_or(24);
|
||||
|
||||
return Ok(Some(
|
||||
build_provider_strategy_stats_response(state, provider_id, hours).await?,
|
||||
));
|
||||
}
|
||||
|
||||
if decision.route_kind.as_deref() == Some("reset_provider_quota")
|
||||
&& request_context.request_method == http::Method::DELETE
|
||||
{
|
||||
if !state.has_provider_catalog_data_reader() || !state.has_provider_catalog_data_writer() {
|
||||
return Ok(Some(admin_provider_strategy_data_unavailable_response(
|
||||
ADMIN_PROVIDER_STRATEGY_DATA_UNAVAILABLE_DETAIL,
|
||||
)));
|
||||
}
|
||||
|
||||
let Some(provider_id) =
|
||||
admin_provider_id_for_provider_strategy_quota(&request_context.request_path)
|
||||
else {
|
||||
return Ok(Some(admin_provider_strategy_provider_not_found_response()));
|
||||
};
|
||||
|
||||
return Ok(Some(
|
||||
build_provider_strategy_reset_quota_response(state, provider_id).await?,
|
||||
));
|
||||
}
|
||||
|
||||
Ok(Some(admin_provider_strategy_dispatcher_not_found_response()))
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
use super::super::build_proxy_error_response;
|
||||
use axum::{
|
||||
body::Body,
|
||||
http,
|
||||
response::{IntoResponse, Response},
|
||||
Json,
|
||||
};
|
||||
use serde_json::json;
|
||||
|
||||
pub(super) const ADMIN_PROVIDER_STRATEGY_DATA_UNAVAILABLE_DETAIL: &str =
|
||||
"Admin provider strategy data unavailable";
|
||||
pub(super) const ADMIN_PROVIDER_STRATEGY_STATS_DATA_UNAVAILABLE_DETAIL: &str =
|
||||
"Admin provider strategy stats data unavailable";
|
||||
|
||||
pub(super) fn admin_provider_strategy_data_unavailable_response(detail: &str) -> Response<Body> {
|
||||
build_proxy_error_response(
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
"data_unavailable",
|
||||
detail,
|
||||
Some(json!({ "error": detail })),
|
||||
)
|
||||
}
|
||||
|
||||
pub(super) fn admin_provider_strategy_provider_not_found_response() -> Response<Body> {
|
||||
(
|
||||
http::StatusCode::NOT_FOUND,
|
||||
Json(json!({ "detail": "Provider not found" })),
|
||||
)
|
||||
.into_response()
|
||||
}
|
||||
|
||||
pub(super) fn admin_provider_strategy_dispatcher_not_found_response() -> Response<Body> {
|
||||
(
|
||||
http::StatusCode::NOT_FOUND,
|
||||
Json(json!({ "detail": "Provider strategy route not found" })),
|
||||
)
|
||||
.into_response()
|
||||
}
|
||||
Reference in New Issue
Block a user