mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-08 02:17:46 +08:00
refactor: 拆分 gateway 单体为独立 crate，新增 systemd 部署方案
将 gateway 内部的 model-fetch、provider-transport、scheduler-core、 usage-runtime、video-tasks-core 模块提取为独立 crate；重构 gateway 内部模块结构（state/router/cache/data/query 等）；移除大量遗留模块 文件；新增 systemd 二进制部署骨架及相关文档；更新前端 usage 相关 API 和组件。
This commit is contained in:
fawney19
@@ -0,0 +1,291 @@
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use aether_crypto::{encrypt_python_fernet_plaintext, DEVELOPMENT_ENCRYPTION_KEY};
|
||||
use aether_data::repository::candidates::{
|
||||
InMemoryRequestCandidateRepository, RequestCandidateReadRepository, RequestCandidateStatus,
|
||||
RequestCandidateWriteRepository, UpsertRequestCandidateRecord,
|
||||
};
|
||||
use aether_data::repository::provider_catalog::{
|
||||
InMemoryProviderCatalogReadRepository, StoredProviderCatalogProvider,
|
||||
};
|
||||
use axum::http::StatusCode;
|
||||
use axum::routing::{get, post};
|
||||
use axum::{Json, Router};
|
||||
use serde_json::json;
|
||||
|
||||
use super::ProviderCheckinRunSummary;
|
||||
use crate::AppState;
|
||||
|
||||
async fn start_server(app: Router) -> (String, tokio::task::JoinHandle<()>) {
|
||||
let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
|
||||
.await
|
||||
.expect("listener should bind");
|
||||
let addr = listener.local_addr().expect("local addr should resolve");
|
||||
let handle = tokio::spawn(async move {
|
||||
axum::serve(
|
||||
listener,
|
||||
app.into_make_service_with_connect_info::<std::net::SocketAddr>(),
|
||||
)
|
||||
.await
|
||||
.expect("server should run");
|
||||
});
|
||||
(format!("http://{addr}"), handle)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_background_request_candidate_cleanup_deletes_expired_entries_in_batches() {
|
||||
fn now_unix_secs() -> u64 {
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs()
|
||||
}
|
||||
|
||||
async fn seed_candidate(
|
||||
repository: &InMemoryRequestCandidateRepository,
|
||||
id: &str,
|
||||
created_at_unix_secs: u64,
|
||||
) {
|
||||
repository
|
||||
.upsert(UpsertRequestCandidateRecord {
|
||||
id: id.to_string(),
|
||||
request_id: format!("req-{id}"),
|
||||
user_id: Some("user-1".to_string()),
|
||||
api_key_id: Some("api-key-1".to_string()),
|
||||
username: Some("alice".to_string()),
|
||||
api_key_name: Some("default".to_string()),
|
||||
candidate_index: 0,
|
||||
retry_index: 0,
|
||||
provider_id: Some("provider-1".to_string()),
|
||||
endpoint_id: Some("endpoint-1".to_string()),
|
||||
key_id: Some("key-1".to_string()),
|
||||
status: RequestCandidateStatus::Success,
|
||||
skip_reason: None,
|
||||
is_cached: Some(false),
|
||||
status_code: Some(200),
|
||||
error_type: None,
|
||||
error_message: None,
|
||||
latency_ms: Some(10),
|
||||
concurrent_requests: Some(1),
|
||||
extra_data: None,
|
||||
required_capabilities: None,
|
||||
created_at_unix_secs: Some(created_at_unix_secs),
|
||||
started_at_unix_secs: Some(created_at_unix_secs),
|
||||
finished_at_unix_secs: Some(created_at_unix_secs.saturating_add(1)),
|
||||
})
|
||||
.await
|
||||
.expect("candidate should seed");
|
||||
}
|
||||
|
||||
let repository = Arc::new(InMemoryRequestCandidateRepository::default());
|
||||
seed_candidate(&repository, "cand-expired-1", 1).await;
|
||||
seed_candidate(&repository, "cand-expired-2", 2).await;
|
||||
seed_candidate(&repository, "cand-active", now_unix_secs()).await;
|
||||
|
||||
let data_state =
|
||||
crate::data::GatewayDataState::with_request_candidate_repository_for_tests(
|
||||
Arc::clone(&repository),
|
||||
)
|
||||
.with_system_config_values_for_tests([
|
||||
("enable_auto_cleanup".to_string(), json!(true)),
|
||||
("cleanup_batch_size".to_string(), json!(1)),
|
||||
(
|
||||
"request_candidates_cleanup_batch_size".to_string(),
|
||||
json!(1),
|
||||
),
|
||||
("request_candidates_retention_days".to_string(), json!(30)),
|
||||
]);
|
||||
|
||||
let gateway_state = AppState::new()
|
||||
.expect("gateway state should build")
|
||||
.with_data_state_for_tests(data_state);
|
||||
let background_tasks = gateway_state.spawn_background_tasks();
|
||||
assert!(!background_tasks.is_empty(), "cleanup worker should spawn");
|
||||
|
||||
let deadline = tokio::time::Instant::now() + std::time::Duration::from_millis(500);
|
||||
loop {
|
||||
let rows = repository
|
||||
.list_recent(10)
|
||||
.await
|
||||
.expect("list recent should succeed");
|
||||
if rows.len() == 1 {
|
||||
assert_eq!(rows[0].id, "cand-active");
|
||||
break;
|
||||
}
|
||||
assert!(
|
||||
tokio::time::Instant::now() < deadline,
|
||||
"cleanup worker did not delete expired request candidates within 500ms"
|
||||
);
|
||||
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
|
||||
}
|
||||
|
||||
for handle in background_tasks {
|
||||
handle.abort();
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_provider_checkin_runs_local_query_balance_for_configured_provider() {
|
||||
fn sample_provider(provider_id: &str, ops_url: &str) -> StoredProviderCatalogProvider {
|
||||
StoredProviderCatalogProvider::new(
|
||||
provider_id.to_string(),
|
||||
"openai".to_string(),
|
||||
Some("https://example.com".to_string()),
|
||||
"custom".to_string(),
|
||||
)
|
||||
.expect("provider should build")
|
||||
.with_routing_fields(10)
|
||||
.with_transport_fields(
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
Some(json!({
|
||||
"provider_ops": {
|
||||
"architecture_id": "generic_api",
|
||||
"base_url": ops_url,
|
||||
"connector": {
|
||||
"auth_type": "api_key",
|
||||
"config": {
|
||||
"auth_method": "bearer"
|
||||
},
|
||||
"credentials": {
|
||||
"api_key": encrypt_python_fernet_plaintext(
|
||||
DEVELOPMENT_ENCRYPTION_KEY,
|
||||
"live-secret-api-key",
|
||||
).expect("api key should encrypt"),
|
||||
}
|
||||
}
|
||||
}
|
||||
})),
|
||||
)
|
||||
}
|
||||
|
||||
let checkin_hits = Arc::new(Mutex::new(0usize));
|
||||
let checkin_hits_clone = Arc::clone(&checkin_hits);
|
||||
let balance_hits = Arc::new(Mutex::new(0usize));
|
||||
let balance_hits_clone = Arc::clone(&balance_hits);
|
||||
let ops = Router::new()
|
||||
.route(
|
||||
"/api/user/checkin",
|
||||
post(move |headers: axum::http::HeaderMap| {
|
||||
let checkin_hits_inner = Arc::clone(&checkin_hits_clone);
|
||||
async move {
|
||||
*checkin_hits_inner.lock().expect("mutex should lock") += 1;
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(axum::http::header::AUTHORIZATION)
|
||||
.and_then(|value| value.to_str().ok()),
|
||||
Some("Bearer live-secret-api-key")
|
||||
);
|
||||
(
|
||||
StatusCode::OK,
|
||||
Json(json!({
|
||||
"success": true,
|
||||
"message": "签到成功",
|
||||
})),
|
||||
)
|
||||
}
|
||||
}),
|
||||
)
|
||||
.route(
|
||||
"/api/user/balance",
|
||||
get(move |headers: axum::http::HeaderMap| {
|
||||
let balance_hits_inner = Arc::clone(&balance_hits_clone);
|
||||
async move {
|
||||
*balance_hits_inner.lock().expect("mutex should lock") += 1;
|
||||
assert_eq!(
|
||||
headers
|
||||
.get(axum::http::header::AUTHORIZATION)
|
||||
.and_then(|value| value.to_str().ok()),
|
||||
Some("Bearer live-secret-api-key")
|
||||
);
|
||||
(
|
||||
StatusCode::OK,
|
||||
Json(json!({
|
||||
"success": true,
|
||||
"data": {
|
||||
"quota": 5000000,
|
||||
"used_quota": 1000000
|
||||
}
|
||||
})),
|
||||
)
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
||||
let (ops_url, ops_handle) = start_server(ops).await;
|
||||
let repository = Arc::new(InMemoryProviderCatalogReadRepository::seed(
|
||||
vec![sample_provider("provider-openai", &ops_url)],
|
||||
vec![],
|
||||
vec![],
|
||||
));
|
||||
let gateway_state = AppState::new()
|
||||
.expect("gateway state should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_provider_catalog_repository_for_tests(
|
||||
repository,
|
||||
)
|
||||
.with_system_config_values_for_tests([
|
||||
("enable_provider_checkin".to_string(), json!(true)),
|
||||
("provider_checkin_time".to_string(), json!("01:05")),
|
||||
])
|
||||
.with_encryption_key_for_tests(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
);
|
||||
|
||||
let summary = crate::maintenance::perform_provider_checkin_once(&gateway_state)
|
||||
.await
|
||||
.expect("provider checkin should succeed");
|
||||
|
||||
assert_eq!(
|
||||
summary,
|
||||
ProviderCheckinRunSummary {
|
||||
attempted: 1,
|
||||
succeeded: 1,
|
||||
failed: 0,
|
||||
skipped: 0,
|
||||
}
|
||||
);
|
||||
assert_eq!(*checkin_hits.lock().expect("mutex should lock"), 1);
|
||||
assert_eq!(*balance_hits.lock().expect("mutex should lock"), 1);
|
||||
|
||||
ops_handle.abort();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_provider_checkin_skips_when_disabled_via_system_config() {
|
||||
let repository = Arc::new(InMemoryProviderCatalogReadRepository::seed(
|
||||
vec![],
|
||||
vec![],
|
||||
vec![],
|
||||
));
|
||||
let gateway_state = AppState::new()
|
||||
.expect("gateway state should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_provider_catalog_repository_for_tests(
|
||||
repository,
|
||||
)
|
||||
.with_system_config_values_for_tests([(
|
||||
"enable_provider_checkin".to_string(),
|
||||
json!(false),
|
||||
)]),
|
||||
);
|
||||
|
||||
let summary = crate::maintenance::perform_provider_checkin_once(&gateway_state)
|
||||
.await
|
||||
.expect("provider checkin should short-circuit");
|
||||
|
||||
assert_eq!(
|
||||
summary,
|
||||
ProviderCheckinRunSummary {
|
||||
attempted: 0,
|
||||
succeeded: 0,
|
||||
failed: 0,
|
||||
skipped: 0,
|
||||
}
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user