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

refactor: 大规模模块拆分与重组，新增 aether-admin crate

Browse Source 
- 新建独立 aether-admin crate 承载 admin 相关共享契约与纯辅助函数
- 拆分 ai_pipeline 下 kiro/private_envelope/conversion/planner 等大文件为子模块目录
- 重组 admin handlers 各业务域（billing/oauth/provider/system/users 等）为目录结构，移除 shared.rs/builders.rs 等反模式
- 移除 ai_pipeline runtime adapters 旧实现（claude/openai/gemini/kiro/vertex/antigravity 等），改由 provider transport 统一承载
- 移除 control_facade/execution_facade/auth_snapshot_facade 等冗余 facade 层
- 拆分 query/billing 与 query/monitoring 模块、state/runtime/payments 与 security 模块
- 扩展架构测试覆盖 admin_billing/admin_model/admin_users 等新模块
- 删除 docs/architecture/refactor-execution-plan.md 已完成的执行计划文档
This commit is contained in:
fawney19
2026-04-09 00:10:38 +08:00
parent 4fb9882b54
commit 4fc95adfb9
663 changed files with 48471 additions and 40232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/provider/query/mod.rs
+7 -7
View File
@@ -1,16 +1,16 @@
use crate::control::GatewayPublicRequestContext;
use crate::{AppState, GatewayError};
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
use crate::GatewayError;
use axum::body::{Body, Bytes};
use axum::http::Response;
mod models;
mod payload;
mod response;
pub(crate) mod models;
pub(crate) mod payload;
pub(crate) mod response;
mod routes;
pub(crate) async fn maybe_build_local_admin_provider_query_response(
state: &AppState,
request_context: &GatewayPublicRequestContext,
state: &AdminAppState<'_>,
request_context: &AdminRequestContext<'_>,
request_body: Option<&Bytes>,
) -> Result<Option<Response<Body>>, GatewayError> {
routes::maybe_build_local_admin_provider_query_response(state, request_context, request_body)
apps/aether-gateway/src/handlers/admin/provider/query/models.rs
+12 -7
View File
@@ -5,7 +5,8 @@ use super::response::{
ADMIN_PROVIDER_QUERY_NO_LOCAL_MODELS_DETAIL, ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
ADMIN_PROVIDER_QUERY_PROVIDER_NOT_FOUND_DETAIL,
};
use crate::{AppState, GatewayError};
use crate::handlers::admin::request::AdminAppState;
use crate::GatewayError;
use aether_data_contracts::repository::provider_catalog::{
StoredProviderCatalogEndpoint, StoredProviderCatalogKey,
};
@@ -13,9 +14,9 @@ use axum::{body::Body, http::Response, response::IntoResponse, Json};
use serde_json::json;
use std::collections::{BTreeMap, BTreeSet};
pub(super) const ADMIN_PROVIDER_QUERY_LOCAL_TEST_MODEL_MESSAGE: &str =
pub(crate) const ADMIN_PROVIDER_QUERY_LOCAL_TEST_MODEL_MESSAGE: &str =
"Rust local provider-query model test is not configured";
pub(super) const ADMIN_PROVIDER_QUERY_LOCAL_TEST_MODEL_FAILOVER_MESSAGE: &str =
pub(crate) const ADMIN_PROVIDER_QUERY_LOCAL_TEST_MODEL_FAILOVER_MESSAGE: &str =
"Rust local provider-query failover simulation is not configured";
fn provider_query_string_list(value: Option<&serde_json::Value>) -> Vec<String> {
@@ -67,8 +68,8 @@ fn provider_query_resolved_api_formats(
formats
}
pub(super) async fn build_admin_provider_query_models_response(
state: &AppState,
pub(crate) async fn build_admin_provider_query_models_response(
state: &AdminAppState<'_>,
payload: &serde_json::Value,
) -> Result<Response<Body>, GatewayError> {
let Some(provider_id) = provider_query_extract_provider_id(payload) else {
@@ -78,6 +79,7 @@ pub(super) async fn build_admin_provider_query_models_response(
};
let Some(provider) = state
.app()
.read_provider_catalog_providers_by_ids(std::slice::from_ref(&provider_id))
.await?
.into_iter()
@@ -90,9 +92,11 @@ pub(super) async fn build_admin_provider_query_models_response(
let provider_ids = vec![provider.id.clone()];
let endpoints = state
.app()
.list_provider_catalog_endpoints_by_provider_ids(&provider_ids)
.await?;
let keys = state
.app()
.list_provider_catalog_keys_by_provider_ids(&provider_ids)
.await?;
let selected_key = if let Some(api_key_id) = provider_query_extract_api_key_id(payload) {
@@ -114,6 +118,7 @@ pub(super) async fn build_admin_provider_query_models_response(
let resolved_api_formats = provider_query_resolved_api_formats(&endpoints, selected_key);
let provider_models = state
.app()
.list_admin_provider_available_source_models(&provider.id)
.await?;
@@ -188,7 +193,7 @@ pub(super) async fn build_admin_provider_query_models_response(
.into_response())
}
pub(super) fn build_admin_provider_query_test_model_response(
pub(crate) fn build_admin_provider_query_test_model_response(
provider_id: String,
model: String,
) -> Response<Body> {
@@ -207,7 +212,7 @@ pub(super) fn build_admin_provider_query_test_model_response(
.into_response()
}
pub(super) fn build_admin_provider_query_test_model_failover_response(
pub(crate) fn build_admin_provider_query_test_model_failover_response(
provider_id: String,
failover_models: Vec<String>,
) -> Response<Body> {
apps/aether-gateway/src/handlers/admin/provider/query/payload.rs
+7 -7
View File
@@ -2,7 +2,7 @@ use axum::body::Bytes;
use axum::response::{IntoResponse, Response};
use serde_json::json;
pub(super) fn parse_admin_provider_query_body(
pub(crate) fn parse_admin_provider_query_body(
request_body: Option<&Bytes>,
) -> Result<serde_json::Value, Response<axum::body::Body>> {
let Some(raw_body) = request_body else {
@@ -18,7 +18,7 @@ pub(super) fn parse_admin_provider_query_body(
})
}
pub(super) fn provider_query_extract_provider_id(payload: &serde_json::Value) -> Option<String> {
pub(crate) fn provider_query_extract_provider_id(payload: &serde_json::Value) -> Option<String> {
payload
.get("provider_id")
.and_then(serde_json::Value::as_str)
@@ -27,7 +27,7 @@ pub(super) fn provider_query_extract_provider_id(payload: &serde_json::Value) ->
.map(ToOwned::to_owned)
}
pub(super) fn provider_query_extract_api_key_id(payload: &serde_json::Value) -> Option<String> {
pub(crate) fn provider_query_extract_api_key_id(payload: &serde_json::Value) -> Option<String> {
payload
.get("api_key_id")
.and_then(serde_json::Value::as_str)
@@ -36,7 +36,7 @@ pub(super) fn provider_query_extract_api_key_id(payload: &serde_json::Value) ->
.map(ToOwned::to_owned)
}
pub(super) fn provider_query_extract_model(payload: &serde_json::Value) -> Option<String> {
pub(crate) fn provider_query_extract_model(payload: &serde_json::Value) -> Option<String> {
payload
.get("model")
.or_else(|| payload.get("model_name"))
@@ -46,7 +46,7 @@ pub(super) fn provider_query_extract_model(payload: &serde_json::Value) -> Optio
.map(ToOwned::to_owned)
}
pub(super) fn provider_query_extract_failover_models(payload: &serde_json::Value) -> Vec<String> {
pub(crate) fn provider_query_extract_failover_models(payload: &serde_json::Value) -> Vec<String> {
if let Some(items) = payload
.get("failover_models")
.or_else(|| payload.get("models"))
@@ -66,7 +66,7 @@ pub(super) fn provider_query_extract_failover_models(payload: &serde_json::Value
.collect::<Vec<_>>()
}
pub(super) fn provider_query_extract_request_id(payload: &serde_json::Value) -> Option<String> {
pub(crate) fn provider_query_extract_request_id(payload: &serde_json::Value) -> Option<String> {
payload
.get("request_id")
.and_then(serde_json::Value::as_str)
@@ -75,7 +75,7 @@ pub(super) fn provider_query_extract_request_id(payload: &serde_json::Value) ->
.map(ToOwned::to_owned)
}
pub(super) fn provider_query_payload_keys(payload: &serde_json::Value) -> Vec<String> {
pub(crate) fn provider_query_payload_keys(payload: &serde_json::Value) -> Vec<String> {
let Some(object) = payload.as_object() else {
return Vec::new();
};
apps/aether-gateway/src/handlers/admin/provider/query/response.rs
+10 -10
View File
@@ -6,19 +6,19 @@ use axum::{
};
use serde_json::json;
pub(super) const ADMIN_PROVIDER_QUERY_INVALID_JSON_DETAIL: &str = "Invalid JSON request body";
pub(super) const ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL: &str = "provider_id is required";
pub(super) const ADMIN_PROVIDER_QUERY_MODEL_REQUIRED_DETAIL: &str = "model is required";
pub(super) const ADMIN_PROVIDER_QUERY_FAILOVER_MODELS_REQUIRED_DETAIL: &str =
pub(crate) const ADMIN_PROVIDER_QUERY_INVALID_JSON_DETAIL: &str = "Invalid JSON request body";
pub(crate) const ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL: &str = "provider_id is required";
pub(crate) const ADMIN_PROVIDER_QUERY_MODEL_REQUIRED_DETAIL: &str = "model is required";
pub(crate) const ADMIN_PROVIDER_QUERY_FAILOVER_MODELS_REQUIRED_DETAIL: &str =
"failover_models should not be empty";
pub(super) const ADMIN_PROVIDER_QUERY_PROVIDER_NOT_FOUND_DETAIL: &str = "Provider not found";
pub(super) const ADMIN_PROVIDER_QUERY_API_KEY_NOT_FOUND_DETAIL: &str = "API Key not found";
pub(super) const ADMIN_PROVIDER_QUERY_NO_ACTIVE_API_KEY_DETAIL: &str =
pub(crate) const ADMIN_PROVIDER_QUERY_PROVIDER_NOT_FOUND_DETAIL: &str = "Provider not found";
pub(crate) const ADMIN_PROVIDER_QUERY_API_KEY_NOT_FOUND_DETAIL: &str = "API Key not found";
pub(crate) const ADMIN_PROVIDER_QUERY_NO_ACTIVE_API_KEY_DETAIL: &str =
"No active API Key found for this provider";
pub(super) const ADMIN_PROVIDER_QUERY_NO_LOCAL_MODELS_DETAIL: &str =
pub(crate) const ADMIN_PROVIDER_QUERY_NO_LOCAL_MODELS_DETAIL: &str =
"No models available from local provider catalog";
pub(super) fn build_admin_provider_query_bad_request_response(
pub(crate) fn build_admin_provider_query_bad_request_response(
detail: &'static str,
) -> Response<Body> {
(
@@ -28,7 +28,7 @@ pub(super) fn build_admin_provider_query_bad_request_response(
.into_response()
}
pub(super) fn build_admin_provider_query_not_found_response(
pub(crate) fn build_admin_provider_query_not_found_response(
detail: &'static str,
) -> Response<Body> {
(
apps/aether-gateway/src/handlers/admin/provider/query/routes.rs
+7 -134
View File
@@ -1,143 +1,16 @@
use super::models::{
build_admin_provider_query_models_response,
build_admin_provider_query_test_model_failover_response,
build_admin_provider_query_test_model_response,
};
use super::payload::{
parse_admin_provider_query_body, provider_query_extract_failover_models,
provider_query_extract_model, provider_query_extract_provider_id,
provider_query_extract_request_id, provider_query_payload_keys,
};
use super::response::{
build_admin_provider_query_bad_request_response,
ADMIN_PROVIDER_QUERY_FAILOVER_MODELS_REQUIRED_DETAIL,
ADMIN_PROVIDER_QUERY_MODEL_REQUIRED_DETAIL, ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
};
use crate::control::GatewayPublicRequestContext;
use crate::log_ids::short_request_id;
use crate::{AppState, GatewayError};
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
use crate::GatewayError;
use axum::{
body::{Body, Bytes},
http,
http::Response,
};
use tracing::warn;
fn log_admin_provider_query_validation_failure(
request_context: &GatewayPublicRequestContext,
route_kind: &str,
detail: &'static str,
payload: &serde_json::Value,
) {
let provider_id =
provider_query_extract_provider_id(payload).unwrap_or_else(|| "-".to_string());
let model = provider_query_extract_model(payload).unwrap_or_else(|| "-".to_string());
let request_id = provider_query_extract_request_id(payload).unwrap_or_else(|| "-".to_string());
let request_id_for_log = short_request_id(request_id.as_str());
let payload_keys = provider_query_payload_keys(payload);
warn!(
event_name = "admin_provider_query_request_rejected",
log_type = "validation",
route_kind,
path = %request_context.request_path,
request_id = %request_id_for_log,
provider_id = %provider_id,
model = %model,
payload_keys = ?payload_keys,
detail,
"admin provider query request rejected"
);
}
pub(super) async fn maybe_build_local_admin_provider_query_response(
state: &AppState,
request_context: &GatewayPublicRequestContext,
state: &AdminAppState<'_>,
request_context: &AdminRequestContext<'_>,
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_query_manage") {
return Ok(None);
}
if request_context.request_method != http::Method::POST {
return Ok(None);
}
let payload = match parse_admin_provider_query_body(request_body) {
Ok(value) => value,
Err(response) => return Ok(Some(response)),
};
let route_kind = decision.route_kind.as_deref().unwrap_or("query_models");
match route_kind {
"query_models" => Ok(Some(
build_admin_provider_query_models_response(state, &payload).await?,
)),
"test_model" => {
let Some(provider_id) = provider_query_extract_provider_id(&payload) else {
log_admin_provider_query_validation_failure(
request_context,
route_kind,
ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
&payload,
);
return Ok(Some(build_admin_provider_query_bad_request_response(
ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
)));
};
let Some(model) = provider_query_extract_model(&payload) else {
log_admin_provider_query_validation_failure(
request_context,
route_kind,
ADMIN_PROVIDER_QUERY_MODEL_REQUIRED_DETAIL,
&payload,
);
return Ok(Some(build_admin_provider_query_bad_request_response(
ADMIN_PROVIDER_QUERY_MODEL_REQUIRED_DETAIL,
)));
};
Ok(Some(build_admin_provider_query_test_model_response(
provider_id,
model,
)))
}
"test_model_failover" => {
let Some(provider_id) = provider_query_extract_provider_id(&payload) else {
log_admin_provider_query_validation_failure(
request_context,
route_kind,
ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
&payload,
);
return Ok(Some(build_admin_provider_query_bad_request_response(
ADMIN_PROVIDER_QUERY_PROVIDER_ID_REQUIRED_DETAIL,
)));
};
let failover_models = provider_query_extract_failover_models(&payload);
if failover_models.is_empty() {
log_admin_provider_query_validation_failure(
request_context,
route_kind,
ADMIN_PROVIDER_QUERY_FAILOVER_MODELS_REQUIRED_DETAIL,
&payload,
);
return Ok(Some(build_admin_provider_query_bad_request_response(
ADMIN_PROVIDER_QUERY_FAILOVER_MODELS_REQUIRED_DETAIL,
)));
}
Ok(Some(
build_admin_provider_query_test_model_failover_response(
provider_id,
failover_models,
),
))
}
_ => Ok(Some(
build_admin_provider_query_models_response(state, &payload).await?,
)),
}
state
.maybe_build_admin_provider_query_route_response(request_context, request_body)
.await
}