mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-11 11:49:50 +08:00
feat: 扩展 Rust gateway 全功能模块,新增 billing/crypto/wallet crate 及完整数据层
- 新增 aether-billing、aether-crypto、aether-wallet 独立 crate - aether-data 扩展 repository 层:announcements、auth_modules、billing、 candidate_selection、gemini_file_mappings、global_models、management_tokens、 oauth_providers、proxy_nodes、quota、users、wallet 等模块 - aether-gateway 新增 api/auth/billing/control/middleware/scheduler/usage/ video_tasks/hooks/maintenance/model_fetch/provider_transport 等功能模块 - 重构 executor decision 和 gateway state 为模块目录结构 - 新增 gateway router、frontdoor 路由层及对应测试 - Python 侧 API 路由重构,新增 compat/support 模块 - 前端 Logo 组件更新及 Provider 管理页面调整
This commit is contained in:
@@ -0,0 +1,126 @@
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use tracing::warn;
|
||||
|
||||
use crate::gateway::data::GatewayDataState;
|
||||
|
||||
const QUOTA_RESET_INTERVAL: Duration = Duration::from_secs(60 * 60);
|
||||
|
||||
pub(crate) async fn reset_due_provider_quotas_once(
|
||||
data: &GatewayDataState,
|
||||
) -> Result<usize, aether_data::DataLayerError> {
|
||||
let now_unix_secs = std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs();
|
||||
data.reset_due_provider_quotas(now_unix_secs).await
|
||||
}
|
||||
|
||||
pub(crate) fn spawn_provider_quota_reset_worker(
|
||||
data: Arc<GatewayDataState>,
|
||||
) -> Option<tokio::task::JoinHandle<()>> {
|
||||
if !data.has_provider_quota_writer() {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(tokio::spawn(async move {
|
||||
if let Err(err) = reset_due_provider_quotas_once(&data).await {
|
||||
warn!(error = %err, "gateway provider quota reset startup failed");
|
||||
}
|
||||
let mut interval = tokio::time::interval(QUOTA_RESET_INTERVAL);
|
||||
interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
|
||||
interval.tick().await;
|
||||
loop {
|
||||
interval.tick().await;
|
||||
if let Err(err) = reset_due_provider_quotas_once(&data).await {
|
||||
warn!(error = %err, "gateway provider quota reset tick failed");
|
||||
}
|
||||
}
|
||||
}))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use aether_data::repository::quota::{
|
||||
InMemoryProviderQuotaRepository, ProviderQuotaReadRepository, StoredProviderQuotaSnapshot,
|
||||
};
|
||||
|
||||
use super::{reset_due_provider_quotas_once, spawn_provider_quota_reset_worker};
|
||||
use crate::gateway::data::GatewayDataState;
|
||||
|
||||
#[tokio::test]
|
||||
async fn resets_due_provider_quotas_from_runtime() {
|
||||
let repository = Arc::new(InMemoryProviderQuotaRepository::seed(vec![
|
||||
StoredProviderQuotaSnapshot::new(
|
||||
"provider-1".to_string(),
|
||||
"monthly_quota".to_string(),
|
||||
Some(20.0),
|
||||
4.0,
|
||||
Some(1),
|
||||
Some(1),
|
||||
None,
|
||||
true,
|
||||
)
|
||||
.expect("quota should build"),
|
||||
]));
|
||||
let data = GatewayDataState::with_provider_quota_repository_for_tests(repository.clone());
|
||||
|
||||
let reset = reset_due_provider_quotas_once(&data)
|
||||
.await
|
||||
.expect("quota reset should succeed");
|
||||
assert_eq!(reset, 1);
|
||||
|
||||
let stored = repository
|
||||
.find_by_provider_id("provider-1")
|
||||
.await
|
||||
.expect("quota lookup should succeed")
|
||||
.expect("quota should exist");
|
||||
assert_eq!(stored.monthly_used_usd, 0.0);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn spawned_worker_resets_due_provider_quotas_immediately() {
|
||||
let repository = Arc::new(InMemoryProviderQuotaRepository::seed(vec![
|
||||
StoredProviderQuotaSnapshot::new(
|
||||
"provider-1".to_string(),
|
||||
"monthly_quota".to_string(),
|
||||
Some(20.0),
|
||||
4.0,
|
||||
Some(1),
|
||||
Some(1),
|
||||
None,
|
||||
true,
|
||||
)
|
||||
.expect("quota should build"),
|
||||
]));
|
||||
let data = Arc::new(GatewayDataState::with_provider_quota_repository_for_tests(
|
||||
repository.clone(),
|
||||
));
|
||||
let handle = spawn_provider_quota_reset_worker(data).expect("worker should spawn");
|
||||
|
||||
let stored = tokio::time::timeout(Duration::from_secs(1), async {
|
||||
loop {
|
||||
let stored = repository
|
||||
.find_by_provider_id("provider-1")
|
||||
.await
|
||||
.expect("quota lookup should succeed")
|
||||
.expect("quota should exist");
|
||||
if stored.monthly_used_usd == 0.0 {
|
||||
break stored;
|
||||
}
|
||||
tokio::time::sleep(Duration::from_millis(10)).await;
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("worker should reset quota on startup");
|
||||
|
||||
handle.abort();
|
||||
|
||||
assert_eq!(stored.monthly_used_usd, 0.0);
|
||||
assert!(stored.quota_last_reset_at_unix_secs.unwrap_or_default() > 1);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user