mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-12 20:19:51 +08:00
refactor: 大规模模块拆分与重组,新增 aether-admin crate
- 新建独立 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:
@@ -1,32 +1,29 @@
|
||||
use super::super::stats::round_to;
|
||||
use super::analytics::{
|
||||
admin_usage_provider_key_name, admin_usage_provider_key_names, admin_usage_record_json,
|
||||
};
|
||||
use super::helpers::{
|
||||
admin_usage_bad_request_response, admin_usage_data_unavailable_response,
|
||||
ADMIN_USAGE_DATA_UNAVAILABLE_DETAIL,
|
||||
};
|
||||
use super::analytics::admin_usage_provider_key_names;
|
||||
use super::replay::{
|
||||
admin_usage_build_curl_command, admin_usage_curl_headers, admin_usage_curl_url,
|
||||
admin_usage_headers_from_value, admin_usage_id_from_action_path,
|
||||
admin_usage_id_from_detail_path, admin_usage_resolve_request_preview_body,
|
||||
build_admin_usage_replay_response,
|
||||
admin_usage_curl_headers, admin_usage_curl_url, admin_usage_headers_from_value,
|
||||
admin_usage_id_from_action_path, admin_usage_id_from_detail_path,
|
||||
admin_usage_resolve_request_preview_body, build_admin_usage_curl_response,
|
||||
build_admin_usage_detail_payload, build_admin_usage_replay_response,
|
||||
};
|
||||
use crate::control::GatewayPublicRequestContext;
|
||||
use crate::handlers::admin::request::{AdminAppState, AdminRequestContext};
|
||||
use crate::handlers::admin::shared::{attach_admin_audit_response, query_param_bool};
|
||||
use crate::{AppState, GatewayError};
|
||||
use crate::GatewayError;
|
||||
use aether_admin::observability::usage::{
|
||||
admin_usage_bad_request_response, admin_usage_data_unavailable_response,
|
||||
admin_usage_provider_key_name, ADMIN_USAGE_DATA_UNAVAILABLE_DETAIL,
|
||||
};
|
||||
use axum::{
|
||||
body::Body,
|
||||
http,
|
||||
response::{IntoResponse, Response},
|
||||
Json,
|
||||
};
|
||||
use serde_json::{json, Value};
|
||||
use serde_json::json;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
state: &AppState,
|
||||
request_context: &GatewayPublicRequestContext,
|
||||
state: &AdminAppState<'_>,
|
||||
request_context: &AdminRequestContext<'_>,
|
||||
request_body: Option<&axum::body::Bytes>,
|
||||
) -> Result<Option<Response<Body>>, GatewayError> {
|
||||
let route_kind = request_context
|
||||
@@ -54,12 +51,7 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
return Ok(Some(admin_usage_bad_request_response("usage_id 无效")));
|
||||
};
|
||||
|
||||
let Some(item) = state
|
||||
.data
|
||||
.find_request_usage_by_id(&usage_id)
|
||||
.await
|
||||
.map_err(|err| GatewayError::Internal(err.to_string()))?
|
||||
else {
|
||||
let Some(item) = state.find_request_usage_by_id(&usage_id).await? else {
|
||||
return Ok(Some(
|
||||
(
|
||||
http::StatusCode::NOT_FOUND,
|
||||
@@ -80,7 +72,7 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
};
|
||||
let url = endpoint
|
||||
.as_ref()
|
||||
.map(|endpoint| admin_usage_curl_url(endpoint, &item));
|
||||
.map(|endpoint| admin_usage_curl_url(state, endpoint, &item));
|
||||
let headers_json = item
|
||||
.provider_request_headers
|
||||
.clone()
|
||||
@@ -95,18 +87,8 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
.clone()
|
||||
.or_else(|| item.request_body.clone())
|
||||
.unwrap_or_else(|| admin_usage_resolve_request_preview_body(&item, None));
|
||||
let curl = admin_usage_build_curl_command(url.as_deref(), &headers, Some(&body));
|
||||
|
||||
return Ok(Some(attach_admin_audit_response(
|
||||
Json(json!({
|
||||
"url": url,
|
||||
"method": "POST",
|
||||
"headers": headers_json.unwrap_or_else(|| json!(headers.clone())),
|
||||
"body": body,
|
||||
"curl": curl,
|
||||
"original_request_body_available": item.request_body.is_some() || item.provider_request_body.is_some(),
|
||||
}))
|
||||
.into_response(),
|
||||
build_admin_usage_curl_response(&item, url, headers_json, &headers, &body),
|
||||
"admin_usage_curl_viewed",
|
||||
"view_usage_curl_replay",
|
||||
"usage_record",
|
||||
@@ -153,12 +135,7 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
true,
|
||||
);
|
||||
|
||||
let Some(item) = state
|
||||
.data
|
||||
.find_request_usage_by_id(&usage_id)
|
||||
.await
|
||||
.map_err(|err| GatewayError::Internal(err.to_string()))?
|
||||
else {
|
||||
let Some(item) = state.find_request_usage_by_id(&usage_id).await? else {
|
||||
return Ok(Some(
|
||||
(
|
||||
http::StatusCode::NOT_FOUND,
|
||||
@@ -187,84 +164,19 @@ pub(super) async fn maybe_build_local_admin_usage_detail_response(
|
||||
admin_usage_provider_key_names(state, std::slice::from_ref(&item)).await?;
|
||||
let provider_key_name = admin_usage_provider_key_name(&item, &provider_key_names);
|
||||
|
||||
let mut payload =
|
||||
admin_usage_record_json(&item, &users_by_id, provider_key_name.as_deref());
|
||||
let request_body = item
|
||||
.request_body
|
||||
.clone()
|
||||
.unwrap_or_else(|| admin_usage_resolve_request_preview_body(&item, None));
|
||||
let request_preview_source = if item.request_body.is_some() {
|
||||
"stored_original"
|
||||
} else {
|
||||
"local_reconstruction"
|
||||
};
|
||||
let mut metadata = match item.request_metadata.clone() {
|
||||
Some(serde_json::Value::Object(object)) => serde_json::Value::Object(object),
|
||||
Some(value) => json!({ "request_metadata": value }),
|
||||
None => json!({}),
|
||||
};
|
||||
if let Some(object) = metadata.as_object_mut() {
|
||||
object.insert(
|
||||
"request_preview_source".to_string(),
|
||||
json!(request_preview_source),
|
||||
);
|
||||
object.insert(
|
||||
"original_request_body_available".to_string(),
|
||||
json!(item.request_body.is_some()),
|
||||
);
|
||||
object.insert(
|
||||
"original_response_body_available".to_string(),
|
||||
json!(item.response_body.is_some() || item.client_response_body.is_some()),
|
||||
);
|
||||
}
|
||||
payload["user"] = match item.user_id.as_ref() {
|
||||
Some(user_id) => json!({
|
||||
"id": user_id,
|
||||
"email": payload["user_email"].clone(),
|
||||
"username": payload["username"].clone(),
|
||||
}),
|
||||
None => Value::Null,
|
||||
};
|
||||
payload["request_id"] = json!(item.request_id);
|
||||
payload["billing_status"] = json!(item.billing_status);
|
||||
payload["request_type"] = json!(item.request_type);
|
||||
payload["provider_id"] = json!(item.provider_id);
|
||||
payload["provider_endpoint_id"] = json!(item.provider_endpoint_id);
|
||||
payload["provider_api_key_id"] = json!(item.provider_api_key_id);
|
||||
payload["error_category"] = json!(item.error_category);
|
||||
payload["cache_creation_cost"] = json!(round_to(item.cache_creation_cost_usd, 6));
|
||||
payload["cache_read_cost"] = json!(round_to(item.cache_read_cost_usd, 6));
|
||||
payload["request_cost"] = json!(round_to(item.total_cost_usd, 6));
|
||||
payload["request_headers"] = item
|
||||
.request_headers
|
||||
.clone()
|
||||
.unwrap_or_else(|| json!(admin_usage_curl_headers()));
|
||||
payload["provider_request_headers"] = item
|
||||
.provider_request_headers
|
||||
.clone()
|
||||
.unwrap_or_else(|| json!(admin_usage_curl_headers()));
|
||||
payload["response_headers"] = item.response_headers.clone().unwrap_or(Value::Null);
|
||||
payload["client_response_headers"] =
|
||||
item.client_response_headers.clone().unwrap_or(Value::Null);
|
||||
payload["metadata"] = metadata;
|
||||
payload["has_request_body"] = json!(true);
|
||||
payload["has_provider_request_body"] = json!(item.provider_request_body.is_some());
|
||||
payload["has_response_body"] = json!(item.response_body.is_some());
|
||||
payload["has_client_response_body"] = json!(item.client_response_body.is_some());
|
||||
payload["tiered_pricing"] = serde_json::Value::Null;
|
||||
if include_bodies {
|
||||
payload["request_body"] = request_body;
|
||||
payload["provider_request_body"] =
|
||||
item.provider_request_body.clone().unwrap_or(Value::Null);
|
||||
payload["response_body"] = item.response_body.clone().unwrap_or(Value::Null);
|
||||
payload["client_response_body"] =
|
||||
item.client_response_body.clone().unwrap_or(Value::Null);
|
||||
} else {
|
||||
payload["request_body"] = serde_json::Value::Null;
|
||||
payload["provider_request_body"] = serde_json::Value::Null;
|
||||
payload["response_body"] = serde_json::Value::Null;
|
||||
payload["client_response_body"] = serde_json::Value::Null;
|
||||
}
|
||||
let default_headers = admin_usage_curl_headers();
|
||||
let payload = build_admin_usage_detail_payload(
|
||||
&item,
|
||||
&users_by_id,
|
||||
provider_key_name.as_deref(),
|
||||
include_bodies,
|
||||
request_body,
|
||||
&default_headers,
|
||||
);
|
||||
|
||||
return Ok(Some(attach_admin_audit_response(
|
||||
Json(payload).into_response(),
|
||||
|
||||
Reference in New Issue
Block a user