mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-08 02:17:46 +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:
@@ -4,17 +4,19 @@ use aether_crypto::{encrypt_python_fernet_plaintext, DEVELOPMENT_ENCRYPTION_KEY}
|
||||
use aether_data::repository::auth::{
|
||||
InMemoryAuthApiKeySnapshotRepository, StoredAuthApiKeyExportRecord,
|
||||
};
|
||||
use aether_data::repository::candidates::{
|
||||
InMemoryRequestCandidateRepository, RequestCandidateStatus, StoredRequestCandidate,
|
||||
};
|
||||
use aether_data::repository::provider_catalog::{
|
||||
InMemoryProviderCatalogReadRepository, StoredProviderCatalogEndpoint, StoredProviderCatalogKey,
|
||||
StoredProviderCatalogProvider,
|
||||
};
|
||||
use aether_data::repository::usage::{InMemoryUsageReadRepository, StoredRequestUsageAudit};
|
||||
use aether_data::repository::candidates::InMemoryRequestCandidateRepository;
|
||||
use aether_data::repository::provider_catalog::InMemoryProviderCatalogReadRepository;
|
||||
use aether_data::repository::usage::InMemoryUsageReadRepository;
|
||||
use aether_data::repository::users::{
|
||||
InMemoryUserReadRepository, StoredUserAuthRecord, StoredUserExportRow,
|
||||
};
|
||||
use aether_data_contracts::repository::candidates::{
|
||||
RequestCandidateStatus, StoredRequestCandidate,
|
||||
};
|
||||
use aether_data_contracts::repository::provider_catalog::{
|
||||
StoredProviderCatalogEndpoint, StoredProviderCatalogKey, StoredProviderCatalogProvider,
|
||||
};
|
||||
use aether_data_contracts::repository::usage::StoredRequestUsageAudit;
|
||||
use axum::body::Body;
|
||||
use axum::routing::{any, delete, get};
|
||||
use axum::{extract::Request, Router};
|
||||
@@ -685,13 +687,11 @@ async fn gateway_handles_admin_monitoring_cache_stats_locally_with_trusted_admin
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_usage_reader_for_tests(
|
||||
usage_repository,
|
||||
)
|
||||
.with_system_config_values_for_tests([
|
||||
("scheduling_mode".to_string(), json!("cache_affinity")),
|
||||
("provider_priority_mode".to_string(), json!("provider")),
|
||||
]),
|
||||
crate::data::GatewayDataState::with_usage_reader_for_tests(usage_repository)
|
||||
.with_system_config_values_for_tests([
|
||||
("scheduling_mode".to_string(), json!("cache_affinity")),
|
||||
("provider_priority_mode".to_string(), json!("provider")),
|
||||
]),
|
||||
),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
@@ -963,10 +963,8 @@ async fn gateway_handles_admin_monitoring_cache_affinity_locally_without_redis_o
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(
|
||||
user_repository,
|
||||
)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(user_repository)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
@@ -1028,10 +1026,8 @@ async fn gateway_handles_admin_monitoring_cache_users_delete_locally_with_truste
|
||||
let state = AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(
|
||||
user_repository,
|
||||
)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(user_repository)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
)
|
||||
.with_admin_monitoring_cache_affinity_entry_for_tests(
|
||||
"cache_affinity:user-key-1:openai:model-alpha",
|
||||
@@ -1105,10 +1101,8 @@ async fn gateway_handles_admin_monitoring_cache_affinity_delete_locally_with_tru
|
||||
let state = AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(
|
||||
user_repository,
|
||||
)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
crate::data::GatewayDataState::with_user_reader_for_tests(user_repository)
|
||||
.with_auth_api_key_reader(auth_repository),
|
||||
)
|
||||
.with_admin_monitoring_cache_affinity_entry_for_tests(
|
||||
"cache_affinity:user-key-1:openai:model-alpha",
|
||||
@@ -1366,13 +1360,11 @@ async fn gateway_handles_admin_monitoring_cache_metrics_locally_with_trusted_adm
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_usage_reader_for_tests(
|
||||
usage_repository,
|
||||
)
|
||||
.with_system_config_values_for_tests([
|
||||
("scheduling_mode".to_string(), json!("cache_affinity")),
|
||||
("provider_priority_mode".to_string(), json!("provider")),
|
||||
]),
|
||||
crate::data::GatewayDataState::with_usage_reader_for_tests(usage_repository)
|
||||
.with_system_config_values_for_tests([
|
||||
("scheduling_mode".to_string(), json!("cache_affinity")),
|
||||
("provider_priority_mode".to_string(), json!("provider")),
|
||||
]),
|
||||
),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
@@ -2056,10 +2048,10 @@ async fn gateway_handles_admin_monitoring_resilience_circuit_history_locally_wit
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(
|
||||
crate::data::GatewayDataState::with_provider_catalog_reader_for_tests(
|
||||
provider_catalog,
|
||||
crate::data::GatewayDataState::with_provider_catalog_reader_for_tests(
|
||||
provider_catalog,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user