mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-04 08:27:46 +08:00
Preserve usage data in system imports
This commit is contained in:
fawney19
@@ -185,6 +185,7 @@ impl<'a> AdminAppState<'a> {
|
||||
let standalone_wallets = self
|
||||
.list_wallet_snapshots_by_api_key_ids(&standalone_api_key_ids)
|
||||
.await?;
|
||||
let usage_aggregates = self.export_admin_system_usage_aggregates().await?;
|
||||
|
||||
let wallets_by_user_id = user_wallets
|
||||
.into_iter()
|
||||
@@ -262,6 +263,7 @@ impl<'a> AdminAppState<'a> {
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
json!({
|
||||
"id": user.id.clone(),
|
||||
"email": user.email.clone(),
|
||||
"email_verified": user.email_verified,
|
||||
"username": user.username.clone(),
|
||||
@@ -306,6 +308,7 @@ impl<'a> AdminAppState<'a> {
|
||||
"user_groups": user_groups_data,
|
||||
"users": users_data,
|
||||
"standalone_keys": standalone_keys_data,
|
||||
"usage_aggregates": usage_aggregates,
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -330,6 +333,7 @@ impl<'a> AdminAppState<'a> {
|
||||
include_is_standalone: bool,
|
||||
) -> serde_json::Value {
|
||||
let mut payload = serde_json::Map::from_iter([
|
||||
("api_key_id".to_string(), json!(key.api_key_id.clone())),
|
||||
("key_hash".to_string(), json!(key.key_hash.clone())),
|
||||
("name".to_string(), json!(key.name.clone())),
|
||||
(
|
||||
|
||||
@@ -38,6 +38,10 @@ use aether_data::repository::auth_modules::StoredLdapModuleConfig;
|
||||
use aether_data::repository::oauth_providers::{
|
||||
EncryptedSecretUpdate, UpsertOAuthProviderConfigRecord,
|
||||
};
|
||||
use aether_data::repository::system::{
|
||||
AdminSystemUsageAggregateImportMode, AdminSystemUsageAggregateImportSummary,
|
||||
AdminSystemUsageAggregateSnapshot,
|
||||
};
|
||||
use aether_data::repository::wallet::WalletLookupKey;
|
||||
use aether_data_contracts::repository::global_models::{
|
||||
AdminGlobalModelListQuery, AdminProviderModelListQuery, CreateAdminGlobalModelRecord,
|
||||
@@ -344,54 +348,6 @@ fn imported_oauth_expires_at_unix_secs(normalized_auth_config: Option<&Value>) -
|
||||
None
|
||||
}
|
||||
|
||||
fn imported_oauth_has_refresh_token(normalized_auth_config: Option<&Value>) -> bool {
|
||||
normalized_auth_config
|
||||
.and_then(Value::as_object)
|
||||
.and_then(|object| object.get("refresh_token"))
|
||||
.and_then(Value::as_str)
|
||||
.map(str::trim)
|
||||
.is_some_and(|value| !value.is_empty())
|
||||
}
|
||||
|
||||
async fn refresh_imported_oauth_key_after_persist(
|
||||
state: &AdminAppState<'_>,
|
||||
provider: &aether_data_contracts::repository::provider_catalog::StoredProviderCatalogProvider,
|
||||
key_id: &str,
|
||||
) -> Result<(), GatewayError> {
|
||||
let Some(endpoint) =
|
||||
crate::handlers::admin::provider::oauth::runtime::resolve_provider_oauth_runtime_endpoints(
|
||||
state,
|
||||
provider,
|
||||
provider.provider_type.as_str(),
|
||||
)
|
||||
.await?
|
||||
.runtime_endpoint
|
||||
else {
|
||||
return Ok(());
|
||||
};
|
||||
let Some(transport) = state
|
||||
.read_provider_transport_snapshot(&provider.id, &endpoint.id, key_id)
|
||||
.await?
|
||||
else {
|
||||
return Ok(());
|
||||
};
|
||||
if !crate::provider_transport::supports_local_oauth_request_auth_resolution(&transport) {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if let Err(error) = state.force_local_oauth_refresh_entry(&transport).await {
|
||||
tracing::warn!(
|
||||
provider_id = %provider.id,
|
||||
provider_type = %provider.provider_type,
|
||||
key_id = %key_id,
|
||||
error = ?error,
|
||||
"admin system import oauth refresh after credential import failed"
|
||||
);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn build_import_provider_model_record(
|
||||
provider_id: &str,
|
||||
existing_id: Option<&str>,
|
||||
@@ -435,6 +391,8 @@ struct AdminSystemUsersImportStats {
|
||||
users: AdminSystemConfigImportCounter,
|
||||
api_keys: AdminSystemConfigImportCounter,
|
||||
standalone_keys: AdminSystemConfigImportCounter,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
usage_aggregates: Option<AdminSystemUsageAggregateImportSummary>,
|
||||
errors: Vec<String>,
|
||||
}
|
||||
|
||||
@@ -488,6 +446,16 @@ fn validate_imported_system_users_export_version(version: Option<&Value>) -> Res
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn usage_aggregate_import_mode(
|
||||
merge_mode: AdminImportMergeMode,
|
||||
) -> AdminSystemUsageAggregateImportMode {
|
||||
match merge_mode {
|
||||
AdminImportMergeMode::Skip => AdminSystemUsageAggregateImportMode::Skip,
|
||||
AdminImportMergeMode::Overwrite => AdminSystemUsageAggregateImportMode::Overwrite,
|
||||
AdminImportMergeMode::Error => AdminSystemUsageAggregateImportMode::Error,
|
||||
}
|
||||
}
|
||||
|
||||
fn imported_object_field<'a>(
|
||||
value: &'a Value,
|
||||
field_name: &str,
|
||||
@@ -1560,16 +1528,6 @@ impl<'a> AdminAppState<'a> {
|
||||
"更新 Provider '{provider_name}' 的 Key 失败"
|
||||
))));
|
||||
};
|
||||
if auth_type == "oauth"
|
||||
&& imported_oauth_has_refresh_token(normalized_auth_config.as_ref())
|
||||
{
|
||||
refresh_imported_oauth_key_after_persist(
|
||||
self,
|
||||
&provider,
|
||||
&persisted.id,
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
existing_keys[existing_index] = persisted;
|
||||
stats.keys.updated += 1;
|
||||
}
|
||||
@@ -1610,11 +1568,6 @@ impl<'a> AdminAppState<'a> {
|
||||
"创建 Provider '{provider_name}' 的 Key 失败"
|
||||
))));
|
||||
};
|
||||
if auth_type == "oauth"
|
||||
&& imported_oauth_has_refresh_token(normalized_auth_config.as_ref())
|
||||
{
|
||||
refresh_imported_oauth_key_after_persist(self, &provider, &created.id).await?;
|
||||
}
|
||||
existing_keys.push(created);
|
||||
stats.keys.created += 1;
|
||||
}
|
||||
@@ -2052,6 +2005,8 @@ impl<'a> AdminAppState<'a> {
|
||||
));
|
||||
|
||||
let mut stats = AdminSystemUsersImportStats::default();
|
||||
let mut imported_user_id_map = BTreeMap::<String, String>::new();
|
||||
let mut imported_api_key_id_map = BTreeMap::<String, String>::new();
|
||||
let default_group_id = self.effective_default_user_group_id().await?;
|
||||
let existing_groups = self.list_user_groups().await?;
|
||||
let mut groups_by_name = existing_groups
|
||||
@@ -2138,6 +2093,7 @@ impl<'a> AdminAppState<'a> {
|
||||
Ok(value) => value,
|
||||
Err(detail) => return Ok(Err(invalid_request(detail))),
|
||||
};
|
||||
let source_user_id = invalid_value!(imported_optional_string(user.get("id")));
|
||||
let role = invalid_value!(imported_optional_string(user.get("role")))
|
||||
.unwrap_or_else(|| "user".to_string())
|
||||
.to_ascii_lowercase();
|
||||
@@ -2471,6 +2427,9 @@ impl<'a> AdminAppState<'a> {
|
||||
stats.users.created += 1;
|
||||
created.id
|
||||
};
|
||||
if let Some(source_user_id) = source_user_id {
|
||||
imported_user_id_map.insert(source_user_id, user_id.clone());
|
||||
}
|
||||
|
||||
let existing_api_keys = self
|
||||
.list_auth_api_key_export_records_by_user_ids(std::slice::from_ref(&user_id))
|
||||
@@ -2506,6 +2465,8 @@ impl<'a> AdminAppState<'a> {
|
||||
));
|
||||
continue;
|
||||
};
|
||||
let source_api_key_id =
|
||||
invalid_value!(imported_optional_string(key.get("api_key_id")));
|
||||
let name = invalid_value!(imported_optional_string(key.get("name")));
|
||||
let allowed_providers = invalid_value!(normalize_imported_user_string_list(
|
||||
key,
|
||||
@@ -2538,21 +2499,21 @@ impl<'a> AdminAppState<'a> {
|
||||
let auto_delete_on_expiry =
|
||||
invalid_value!(imported_optional_bool(key.get("auto_delete_on_expiry")))
|
||||
.unwrap_or(false);
|
||||
let total_requests = invalid_value!(imported_optional_u64(
|
||||
let imported_total_requests = invalid_value!(imported_optional_u64(
|
||||
key.get("total_requests"),
|
||||
"total_requests"
|
||||
))
|
||||
.unwrap_or(0);
|
||||
let total_tokens = invalid_value!(imported_optional_u64(
|
||||
));
|
||||
let total_requests = imported_total_requests.unwrap_or(0);
|
||||
let imported_total_tokens = invalid_value!(imported_optional_u64(
|
||||
key.get("total_tokens"),
|
||||
"total_tokens"
|
||||
))
|
||||
.unwrap_or(0);
|
||||
let total_cost_usd = invalid_value!(imported_optional_f64(
|
||||
));
|
||||
let total_tokens = imported_total_tokens.unwrap_or(0);
|
||||
let imported_total_cost_usd = invalid_value!(imported_optional_f64(
|
||||
key.get("total_cost_usd"),
|
||||
"total_cost_usd"
|
||||
))
|
||||
.unwrap_or(0.0);
|
||||
));
|
||||
let total_cost_usd = imported_total_cost_usd.unwrap_or(0.0);
|
||||
let feature_settings = invalid_value!(imported_optional_json_object(
|
||||
key.get("feature_settings"),
|
||||
"feature_settings"
|
||||
@@ -2624,13 +2585,31 @@ impl<'a> AdminAppState<'a> {
|
||||
is_active,
|
||||
)
|
||||
.await?;
|
||||
if imported_total_requests.is_some()
|
||||
|| imported_total_tokens.is_some()
|
||||
|| imported_total_cost_usd.is_some()
|
||||
{
|
||||
let updated_usage = self
|
||||
.set_api_key_usage_totals(
|
||||
&existing_key.api_key_id,
|
||||
imported_total_requests
|
||||
.unwrap_or(existing_key.total_requests),
|
||||
imported_total_tokens.unwrap_or(existing_key.total_tokens),
|
||||
imported_total_cost_usd
|
||||
.unwrap_or(existing_key.total_cost_usd),
|
||||
)
|
||||
.await?;
|
||||
if updated_usage.is_none() {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
}
|
||||
}
|
||||
if key.contains_key("allowed_api_formats")
|
||||
|| key.contains_key("allowed_models")
|
||||
|| key.contains_key("expires_at")
|
||||
|| key.contains_key("auto_delete_on_expiry")
|
||||
|| key.contains_key("total_requests")
|
||||
|| key.contains_key("total_tokens")
|
||||
|| key.contains_key("total_cost_usd")
|
||||
{
|
||||
stats.errors.push(format!(
|
||||
"用户 '{}' 的现有 API Key 仅覆盖基础字段；高级导入字段保持原值",
|
||||
@@ -2638,6 +2617,10 @@ impl<'a> AdminAppState<'a> {
|
||||
));
|
||||
}
|
||||
stats.api_keys.updated += 1;
|
||||
if let Some(source_api_key_id) = source_api_key_id.clone() {
|
||||
imported_api_key_id_map
|
||||
.insert(source_api_key_id, existing_key.api_key_id.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
@@ -2680,125 +2663,137 @@ impl<'a> AdminAppState<'a> {
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
let created_api_key_id = created.api_key_id.clone();
|
||||
existing_api_keys_by_hash.insert(key_hash, created);
|
||||
if let Some(source_api_key_id) = source_api_key_id {
|
||||
imported_api_key_id_map.insert(source_api_key_id, created_api_key_id);
|
||||
}
|
||||
stats.api_keys.created += 1;
|
||||
}
|
||||
}
|
||||
|
||||
if standalone_keys.is_empty() {
|
||||
return Ok(Ok(json!({
|
||||
"message": "用户数据导入成功",
|
||||
"stats": stats,
|
||||
})));
|
||||
}
|
||||
|
||||
let Some(standalone_owner_id) = standalone_owner_id else {
|
||||
stats.standalone_keys.skipped += standalone_keys.len() as u64;
|
||||
stats
|
||||
.errors
|
||||
.push("无法导入独立余额 Key: 当前管理员用户记录不存在".to_string());
|
||||
return Ok(Ok(json!({
|
||||
"message": "用户数据导入成功",
|
||||
"stats": stats,
|
||||
})));
|
||||
};
|
||||
|
||||
let existing_standalone_keys = self
|
||||
.list_auth_api_key_export_standalone_records()
|
||||
.await?
|
||||
.into_iter()
|
||||
.collect::<Vec<_>>();
|
||||
let mut existing_standalone_by_hash = existing_standalone_keys
|
||||
.into_iter()
|
||||
.map(|record| (record.key_hash.clone(), record))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
|
||||
for (index, raw_key) in standalone_keys.iter().enumerate() {
|
||||
let key = match imported_object_field(raw_key, &format!("standalone_keys[{index}]")) {
|
||||
Ok(value) => value,
|
||||
Err(detail) => return Ok(Err(invalid_request(detail))),
|
||||
};
|
||||
let Some((key_hash, key_encrypted)) =
|
||||
invalid_value!(self.resolve_imported_system_user_api_key_material(key))
|
||||
else {
|
||||
stats.standalone_keys.skipped += 1;
|
||||
if !standalone_keys.is_empty() {
|
||||
let Some(standalone_owner_id) = standalone_owner_id else {
|
||||
stats.standalone_keys.skipped += standalone_keys.len() as u64;
|
||||
stats
|
||||
.errors
|
||||
.push(format!("跳过无效独立余额 Key: standalone_keys[{index}]"));
|
||||
continue;
|
||||
.push("无法导入独立余额 Key: 当前管理员用户记录不存在".to_string());
|
||||
if let Some(summary) = self
|
||||
.import_admin_system_user_usage_aggregates(
|
||||
root.get("usage_aggregates"),
|
||||
&imported_user_id_map,
|
||||
&imported_api_key_id_map,
|
||||
merge_mode,
|
||||
)
|
||||
.await?
|
||||
{
|
||||
stats.usage_aggregates = Some(summary);
|
||||
}
|
||||
return Ok(Ok(json!({
|
||||
"message": "用户数据导入成功",
|
||||
"stats": stats,
|
||||
})));
|
||||
};
|
||||
let name = invalid_value!(imported_optional_string(key.get("name")));
|
||||
let allowed_providers = invalid_value!(normalize_imported_user_string_list(
|
||||
key,
|
||||
"allowed_providers"
|
||||
));
|
||||
let allowed_api_formats = invalid_value!(normalize_imported_user_api_formats(
|
||||
key,
|
||||
"allowed_api_formats"
|
||||
));
|
||||
let allowed_models =
|
||||
invalid_value!(normalize_imported_user_string_list(key, "allowed_models"));
|
||||
let ip_rules = invalid_value!(normalize_imported_user_ip_rules(key));
|
||||
let rate_limit =
|
||||
invalid_value!(imported_optional_i32(key.get("rate_limit"), "rate_limit"))
|
||||
.unwrap_or(0);
|
||||
let concurrent_limit = invalid_value!(imported_optional_i32(
|
||||
key.get("concurrent_limit"),
|
||||
"concurrent_limit"
|
||||
));
|
||||
if concurrent_limit.is_some_and(|value| value < 0) {
|
||||
return Ok(Err(invalid_request("concurrent_limit 必须是非负整数")));
|
||||
}
|
||||
let force_capabilities = imported_optional_value(key.get("force_capabilities"));
|
||||
let is_active =
|
||||
invalid_value!(imported_optional_bool(key.get("is_active"))).unwrap_or(true);
|
||||
let expires_at_unix_secs = invalid_value!(imported_rfc3339_to_unix_secs(
|
||||
key.get("expires_at"),
|
||||
"expires_at"
|
||||
));
|
||||
let auto_delete_on_expiry =
|
||||
invalid_value!(imported_optional_bool(key.get("auto_delete_on_expiry")))
|
||||
.unwrap_or(false);
|
||||
let total_requests = invalid_value!(imported_optional_u64(
|
||||
key.get("total_requests"),
|
||||
"total_requests"
|
||||
))
|
||||
.unwrap_or(0);
|
||||
let total_tokens = invalid_value!(imported_optional_u64(
|
||||
key.get("total_tokens"),
|
||||
"total_tokens"
|
||||
))
|
||||
.unwrap_or(0);
|
||||
let total_cost_usd = invalid_value!(imported_optional_f64(
|
||||
key.get("total_cost_usd"),
|
||||
"total_cost_usd"
|
||||
))
|
||||
.unwrap_or(0.0);
|
||||
let feature_settings = invalid_value!(imported_optional_json_object(
|
||||
key.get("feature_settings"),
|
||||
"feature_settings"
|
||||
)
|
||||
.and_then(normalize_admin_feature_settings));
|
||||
let wallet_payload = match key.get("wallet") {
|
||||
Some(Value::Object(map)) => Some(map),
|
||||
Some(Value::Null) | None => None,
|
||||
Some(_) => return Ok(Err(invalid_request("wallet 必须是对象"))),
|
||||
};
|
||||
let unlimited =
|
||||
invalid_value!(imported_optional_bool(key.get("unlimited"))).unwrap_or(false);
|
||||
let wallet_target =
|
||||
invalid_value!(normalize_imported_wallet_target(wallet_payload, unlimited));
|
||||
|
||||
if let Some(existing_key) = existing_standalone_by_hash.get(&key_hash).cloned() {
|
||||
match merge_mode {
|
||||
AdminImportMergeMode::Skip => {
|
||||
stats.standalone_keys.skipped += 1;
|
||||
}
|
||||
AdminImportMergeMode::Error => {
|
||||
return Ok(Err(invalid_request("独立余额 Key 已存在")));
|
||||
}
|
||||
AdminImportMergeMode::Overwrite => {
|
||||
let updated = self
|
||||
let existing_standalone_keys = self
|
||||
.list_auth_api_key_export_standalone_records()
|
||||
.await?
|
||||
.into_iter()
|
||||
.collect::<Vec<_>>();
|
||||
let mut existing_standalone_by_hash = existing_standalone_keys
|
||||
.into_iter()
|
||||
.map(|record| (record.key_hash.clone(), record))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
|
||||
for (index, raw_key) in standalone_keys.iter().enumerate() {
|
||||
let key = match imported_object_field(raw_key, &format!("standalone_keys[{index}]"))
|
||||
{
|
||||
Ok(value) => value,
|
||||
Err(detail) => return Ok(Err(invalid_request(detail))),
|
||||
};
|
||||
let Some((key_hash, key_encrypted)) =
|
||||
invalid_value!(self.resolve_imported_system_user_api_key_material(key))
|
||||
else {
|
||||
stats.standalone_keys.skipped += 1;
|
||||
stats
|
||||
.errors
|
||||
.push(format!("跳过无效独立余额 Key: standalone_keys[{index}]"));
|
||||
continue;
|
||||
};
|
||||
let source_api_key_id =
|
||||
invalid_value!(imported_optional_string(key.get("api_key_id")));
|
||||
let name = invalid_value!(imported_optional_string(key.get("name")));
|
||||
let allowed_providers = invalid_value!(normalize_imported_user_string_list(
|
||||
key,
|
||||
"allowed_providers"
|
||||
));
|
||||
let allowed_api_formats = invalid_value!(normalize_imported_user_api_formats(
|
||||
key,
|
||||
"allowed_api_formats"
|
||||
));
|
||||
let allowed_models =
|
||||
invalid_value!(normalize_imported_user_string_list(key, "allowed_models"));
|
||||
let ip_rules = invalid_value!(normalize_imported_user_ip_rules(key));
|
||||
let rate_limit =
|
||||
invalid_value!(imported_optional_i32(key.get("rate_limit"), "rate_limit"))
|
||||
.unwrap_or(0);
|
||||
let concurrent_limit = invalid_value!(imported_optional_i32(
|
||||
key.get("concurrent_limit"),
|
||||
"concurrent_limit"
|
||||
));
|
||||
if concurrent_limit.is_some_and(|value| value < 0) {
|
||||
return Ok(Err(invalid_request("concurrent_limit 必须是非负整数")));
|
||||
}
|
||||
let force_capabilities = imported_optional_value(key.get("force_capabilities"));
|
||||
let is_active =
|
||||
invalid_value!(imported_optional_bool(key.get("is_active"))).unwrap_or(true);
|
||||
let expires_at_unix_secs = invalid_value!(imported_rfc3339_to_unix_secs(
|
||||
key.get("expires_at"),
|
||||
"expires_at"
|
||||
));
|
||||
let auto_delete_on_expiry =
|
||||
invalid_value!(imported_optional_bool(key.get("auto_delete_on_expiry")))
|
||||
.unwrap_or(false);
|
||||
let imported_total_requests = invalid_value!(imported_optional_u64(
|
||||
key.get("total_requests"),
|
||||
"total_requests"
|
||||
));
|
||||
let total_requests = imported_total_requests.unwrap_or(0);
|
||||
let imported_total_tokens = invalid_value!(imported_optional_u64(
|
||||
key.get("total_tokens"),
|
||||
"total_tokens"
|
||||
));
|
||||
let total_tokens = imported_total_tokens.unwrap_or(0);
|
||||
let imported_total_cost_usd = invalid_value!(imported_optional_f64(
|
||||
key.get("total_cost_usd"),
|
||||
"total_cost_usd"
|
||||
));
|
||||
let total_cost_usd = imported_total_cost_usd.unwrap_or(0.0);
|
||||
let feature_settings = invalid_value!(imported_optional_json_object(
|
||||
key.get("feature_settings"),
|
||||
"feature_settings"
|
||||
)
|
||||
.and_then(normalize_admin_feature_settings));
|
||||
let wallet_payload = match key.get("wallet") {
|
||||
Some(Value::Object(map)) => Some(map),
|
||||
Some(Value::Null) | None => None,
|
||||
Some(_) => return Ok(Err(invalid_request("wallet 必须是对象"))),
|
||||
};
|
||||
let unlimited =
|
||||
invalid_value!(imported_optional_bool(key.get("unlimited"))).unwrap_or(false);
|
||||
let wallet_target =
|
||||
invalid_value!(normalize_imported_wallet_target(wallet_payload, unlimited));
|
||||
|
||||
if let Some(existing_key) = existing_standalone_by_hash.get(&key_hash).cloned() {
|
||||
match merge_mode {
|
||||
AdminImportMergeMode::Skip => {
|
||||
stats.standalone_keys.skipped += 1;
|
||||
}
|
||||
AdminImportMergeMode::Error => {
|
||||
return Ok(Err(invalid_request("独立余额 Key 已存在")));
|
||||
}
|
||||
AdminImportMergeMode::Overwrite => {
|
||||
let updated = self
|
||||
.update_standalone_api_key_basic(
|
||||
aether_data::repository::auth::UpdateStandaloneApiKeyBasicRecord {
|
||||
api_key_id: existing_key.api_key_id.clone(),
|
||||
@@ -2819,94 +2814,134 @@ impl<'a> AdminAppState<'a> {
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
if updated.is_none() {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
}
|
||||
let _ = self
|
||||
.set_standalone_api_key_active(&existing_key.api_key_id, is_active)
|
||||
.await?;
|
||||
if key.contains_key("feature_settings") {
|
||||
if updated.is_none() {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
}
|
||||
let _ = self
|
||||
.set_standalone_api_key_feature_settings(
|
||||
&existing_key.api_key_id,
|
||||
feature_settings.clone(),
|
||||
)
|
||||
.set_standalone_api_key_active(&existing_key.api_key_id, is_active)
|
||||
.await?;
|
||||
if key.contains_key("feature_settings") {
|
||||
let _ = self
|
||||
.set_standalone_api_key_feature_settings(
|
||||
&existing_key.api_key_id,
|
||||
feature_settings.clone(),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
if imported_total_requests.is_some()
|
||||
|| imported_total_tokens.is_some()
|
||||
|| imported_total_cost_usd.is_some()
|
||||
{
|
||||
let updated_usage = self
|
||||
.set_api_key_usage_totals(
|
||||
&existing_key.api_key_id,
|
||||
imported_total_requests
|
||||
.unwrap_or(existing_key.total_requests),
|
||||
imported_total_tokens.unwrap_or(existing_key.total_tokens),
|
||||
imported_total_cost_usd
|
||||
.unwrap_or(existing_key.total_cost_usd),
|
||||
)
|
||||
.await?;
|
||||
if updated_usage.is_none() {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
}
|
||||
}
|
||||
if key.contains_key("expires_at")
|
||||
|| key.contains_key("auto_delete_on_expiry")
|
||||
|| key.contains_key("force_capabilities")
|
||||
{
|
||||
stats.errors.push(
|
||||
"现有独立余额 Key 仅覆盖基础字段；高级导入字段保持原值"
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
self.sync_imported_api_key_wallet(
|
||||
&existing_key.api_key_id,
|
||||
&wallet_target,
|
||||
key.get("name")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("独立余额 Key"),
|
||||
)
|
||||
.await?;
|
||||
stats.standalone_keys.updated += 1;
|
||||
if let Some(source_api_key_id) = source_api_key_id.clone() {
|
||||
imported_api_key_id_map
|
||||
.insert(source_api_key_id, existing_key.api_key_id.clone());
|
||||
}
|
||||
}
|
||||
if key.contains_key("expires_at")
|
||||
|| key.contains_key("auto_delete_on_expiry")
|
||||
|| key.contains_key("force_capabilities")
|
||||
|| key.contains_key("total_requests")
|
||||
|| key.contains_key("total_tokens")
|
||||
|| key.contains_key("total_cost_usd")
|
||||
{
|
||||
stats.errors.push(
|
||||
"现有独立余额 Key 仅覆盖基础字段；高级导入字段保持原值".to_string(),
|
||||
);
|
||||
}
|
||||
self.sync_imported_api_key_wallet(
|
||||
&existing_key.api_key_id,
|
||||
&wallet_target,
|
||||
key.get("name")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("独立余额 Key"),
|
||||
)
|
||||
.await?;
|
||||
stats.standalone_keys.updated += 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
let created = self
|
||||
.create_standalone_api_key(
|
||||
aether_data::repository::auth::CreateStandaloneApiKeyRecord {
|
||||
user_id: standalone_owner_id.clone(),
|
||||
api_key_id: Uuid::new_v4().to_string(),
|
||||
key_hash: key_hash.clone(),
|
||||
key_encrypted,
|
||||
name,
|
||||
allowed_providers,
|
||||
allowed_api_formats,
|
||||
allowed_models,
|
||||
ip_rules,
|
||||
rate_limit: Some(rate_limit),
|
||||
concurrent_limit,
|
||||
force_capabilities,
|
||||
is_active,
|
||||
expires_at_unix_secs,
|
||||
auto_delete_on_expiry,
|
||||
total_requests,
|
||||
total_tokens,
|
||||
total_cost_usd,
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
let Some(created) = created else {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
};
|
||||
if key.contains_key("feature_settings") {
|
||||
let _ = self
|
||||
.set_standalone_api_key_feature_settings(
|
||||
&created.api_key_id,
|
||||
feature_settings.clone(),
|
||||
let created = self
|
||||
.create_standalone_api_key(
|
||||
aether_data::repository::auth::CreateStandaloneApiKeyRecord {
|
||||
user_id: standalone_owner_id.clone(),
|
||||
api_key_id: Uuid::new_v4().to_string(),
|
||||
key_hash: key_hash.clone(),
|
||||
key_encrypted,
|
||||
name,
|
||||
allowed_providers,
|
||||
allowed_api_formats,
|
||||
allowed_models,
|
||||
ip_rules,
|
||||
rate_limit: Some(rate_limit),
|
||||
concurrent_limit,
|
||||
force_capabilities,
|
||||
is_active,
|
||||
expires_at_unix_secs,
|
||||
auto_delete_on_expiry,
|
||||
total_requests,
|
||||
total_tokens,
|
||||
total_cost_usd,
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
let Some(created) = created else {
|
||||
return Ok(Err((
|
||||
http::StatusCode::SERVICE_UNAVAILABLE,
|
||||
json!({ "detail": "Admin system data unavailable" }),
|
||||
)));
|
||||
};
|
||||
if key.contains_key("feature_settings") {
|
||||
let _ = self
|
||||
.set_standalone_api_key_feature_settings(
|
||||
&created.api_key_id,
|
||||
feature_settings.clone(),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
self.sync_imported_api_key_wallet(
|
||||
&created.api_key_id,
|
||||
&wallet_target,
|
||||
created.name.as_deref().unwrap_or("独立余额 Key"),
|
||||
)
|
||||
.await?;
|
||||
let created_api_key_id = created.api_key_id.clone();
|
||||
existing_standalone_by_hash.insert(key_hash, created);
|
||||
if let Some(source_api_key_id) = source_api_key_id {
|
||||
imported_api_key_id_map.insert(source_api_key_id, created_api_key_id);
|
||||
}
|
||||
stats.standalone_keys.created += 1;
|
||||
}
|
||||
self.sync_imported_api_key_wallet(
|
||||
&created.api_key_id,
|
||||
&wallet_target,
|
||||
created.name.as_deref().unwrap_or("独立余额 Key"),
|
||||
}
|
||||
|
||||
if let Some(summary) = self
|
||||
.import_admin_system_user_usage_aggregates(
|
||||
root.get("usage_aggregates"),
|
||||
&imported_user_id_map,
|
||||
&imported_api_key_id_map,
|
||||
merge_mode,
|
||||
)
|
||||
.await?;
|
||||
existing_standalone_by_hash.insert(key_hash, created);
|
||||
stats.standalone_keys.created += 1;
|
||||
.await?
|
||||
{
|
||||
stats.usage_aggregates = Some(summary);
|
||||
}
|
||||
|
||||
Ok(Ok(json!({
|
||||
@@ -2915,6 +2950,40 @@ impl<'a> AdminAppState<'a> {
|
||||
})))
|
||||
}
|
||||
|
||||
async fn import_admin_system_user_usage_aggregates(
|
||||
&self,
|
||||
value: Option<&Value>,
|
||||
user_id_map: &BTreeMap<String, String>,
|
||||
api_key_id_map: &BTreeMap<String, String>,
|
||||
merge_mode: AdminImportMergeMode,
|
||||
) -> Result<Option<AdminSystemUsageAggregateImportSummary>, GatewayError> {
|
||||
let Some(value) = value else {
|
||||
return Ok(None);
|
||||
};
|
||||
if value.is_null() {
|
||||
return Ok(None);
|
||||
}
|
||||
let snapshot = serde_json::from_value::<AdminSystemUsageAggregateSnapshot>(value.clone())
|
||||
.map_err(|err| GatewayError::Client {
|
||||
status: http::StatusCode::BAD_REQUEST,
|
||||
message: format!("usage_aggregates 格式无效: {err}"),
|
||||
})?;
|
||||
if snapshot.stats_daily.is_empty()
|
||||
&& snapshot.stats_user_daily.is_empty()
|
||||
&& snapshot.stats_daily_api_key.is_empty()
|
||||
{
|
||||
return Ok(None);
|
||||
}
|
||||
self.import_admin_system_usage_aggregates(
|
||||
&snapshot,
|
||||
user_id_map,
|
||||
api_key_id_map,
|
||||
usage_aggregate_import_mode(merge_mode),
|
||||
)
|
||||
.await
|
||||
.map(Some)
|
||||
}
|
||||
|
||||
async fn sync_imported_user_wallet(
|
||||
&self,
|
||||
user_id: &str,
|
||||
|
||||
@@ -70,6 +70,26 @@ impl<'a> AdminAppState<'a> {
|
||||
self.app.purge_admin_system_data(target).await
|
||||
}
|
||||
|
||||
pub(crate) async fn export_admin_system_usage_aggregates(
|
||||
&self,
|
||||
) -> Result<aether_data::repository::system::AdminSystemUsageAggregateSnapshot, GatewayError>
|
||||
{
|
||||
self.app.export_admin_system_usage_aggregates().await
|
||||
}
|
||||
|
||||
pub(crate) async fn import_admin_system_usage_aggregates(
|
||||
&self,
|
||||
snapshot: &aether_data::repository::system::AdminSystemUsageAggregateSnapshot,
|
||||
user_id_map: &std::collections::BTreeMap<String, String>,
|
||||
api_key_id_map: &std::collections::BTreeMap<String, String>,
|
||||
mode: aether_data::repository::system::AdminSystemUsageAggregateImportMode,
|
||||
) -> Result<aether_data::repository::system::AdminSystemUsageAggregateImportSummary, GatewayError>
|
||||
{
|
||||
self.app
|
||||
.import_admin_system_usage_aggregates(snapshot, user_id_map, api_key_id_map, mode)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn run_admin_system_cleanup_once(
|
||||
&self,
|
||||
) -> Result<crate::maintenance::AdminSystemCleanupSummary, GatewayError> {
|
||||
|
||||
@@ -706,6 +706,19 @@ impl<'a> AdminAppState<'a> {
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn set_api_key_usage_totals(
|
||||
&self,
|
||||
api_key_id: &str,
|
||||
total_requests: u64,
|
||||
total_tokens: u64,
|
||||
total_cost_usd: f64,
|
||||
) -> Result<Option<aether_data::repository::auth::StoredAuthApiKeyExportRecord>, GatewayError>
|
||||
{
|
||||
self.app
|
||||
.set_api_key_usage_totals(api_key_id, total_requests, total_tokens, total_cost_usd)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn delete_user_api_key(
|
||||
&self,
|
||||
user_id: &str,
|
||||
|
||||
Reference in New Issue
Block a user