i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-08 18:37:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(admin): 实现系统数据导入导出功能，支持提供商和模型批量配置

Browse Source
This commit is contained in:
fawney19
2026-04-11 21:39:04 +08:00
parent 801e16c988
commit a9f610fa69
36 changed files with 3247 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/aether-gateway/src/handlers/admin/system/shared/export/providers.rs
+125 -83
View File
@@ -5,14 +5,17 @@ use super::support::{
};
use crate::handlers::admin::request::AdminAppState;
use crate::GatewayError;
use aether_admin::system::{
AdminSystemConfigEndpoint, AdminSystemConfigProvider, AdminSystemConfigProviderKey,
AdminSystemConfigProviderModel,
};
use aether_data_contracts::repository::global_models::AdminProviderModelListQuery;
use serde_json::json;
use std::collections::BTreeMap;
pub(crate) async fn build_admin_system_export_providers_payload(
state: &AdminAppState<'_>,
global_model_name_by_id: &BTreeMap<String, String>,
) -> Result<Vec<serde_json::Value>, GatewayError> {
) -> Result<Vec<AdminSystemConfigProvider>, GatewayError> {
let providers = state.list_provider_catalog_providers(false).await?;
let provider_ids = providers
.iter()
@@ -56,24 +59,24 @@ pub(crate) async fn build_admin_system_export_providers_payload(
Ok(providers
.iter()
.map(|provider| {
let endpoints = endpoints_by_provider.remove(&provider.id).unwrap_or_default();
let endpoints = endpoints_by_provider
.remove(&provider.id)
.unwrap_or_default();
let provider_endpoint_formats =
collect_admin_system_export_provider_endpoint_formats(&endpoints);
let endpoints_data = endpoints
.iter()
.map(|endpoint| {
json!({
"api_format": endpoint.api_format,
"base_url": endpoint.base_url,
"header_rules": endpoint.header_rules,
"body_rules": endpoint.body_rules,
"max_retries": endpoint.max_retries,
"is_active": endpoint.is_active,
"custom_path": endpoint.custom_path,
"config": endpoint.config,
"format_acceptance_config": endpoint.format_acceptance_config,
"proxy": endpoint.proxy,
})
.map(|endpoint| AdminSystemConfigEndpoint {
api_format: endpoint.api_format.clone(),
base_url: endpoint.base_url.clone(),
header_rules: endpoint.header_rules.clone(),
body_rules: endpoint.body_rules.clone(),
max_retries: endpoint.max_retries,
is_active: endpoint.is_active,
custom_path: endpoint.custom_path.clone(),
config: endpoint.config.clone(),
format_acceptance_config: endpoint.format_acceptance_config.clone(),
proxy: endpoint.proxy.clone(),
})
.collect::<Vec<_>>();
@@ -95,38 +98,76 @@ pub(crate) async fn build_admin_system_export_providers_payload(
key.api_formats.as_ref(),
&provider_endpoint_formats,
);
let mut payload = json!({
"api_formats": api_formats,
"supported_endpoints": api_formats,
"auth_type": key.auth_type,
"name": key.name,
"note": key.note,
"rate_multipliers": key.rate_multipliers,
"internal_priority": key.internal_priority,
"global_priority_by_format": key.global_priority_by_format,
"rpm_limit": key.rpm_limit,
"allowed_models": key.allowed_models,
"capabilities": key.capabilities,
"cache_ttl_minutes": key.cache_ttl_minutes,
"max_probe_interval_minutes": key.max_probe_interval_minutes,
"is_active": key.is_active,
"proxy": key.proxy,
"fingerprint": key.fingerprint,
"auto_fetch_models": key.auto_fetch_models,
"locked_models": key.locked_models,
"model_include_patterns": key.model_include_patterns,
"model_exclude_patterns": key.model_exclude_patterns,
"api_key": decrypt_admin_system_export_secret(state, &key.encrypted_api_key)
.unwrap_or_default(),
});
if let Some(ciphertext) = key.encrypted_auth_config.as_deref() {
if let Some(plaintext) =
let auth_config = key
.encrypted_auth_config
.as_deref()
.and_then(|ciphertext| {
decrypt_admin_system_export_secret(state, ciphertext)
{
payload["auth_config"] = json!(plaintext);
}
})
.map(serde_json::Value::String);
AdminSystemConfigProviderKey {
api_key: Some(
decrypt_admin_system_export_secret(state, &key.encrypted_api_key)
.unwrap_or_default(),
),
auth_type: Some(key.auth_type.clone()),
auth_config,
name: Some(key.name.clone()),
note: key.note.clone(),
api_formats: Some(api_formats.clone()),
supported_endpoints: Some(api_formats),
rate_multipliers: key.rate_multipliers.clone(),
internal_priority: Some(key.internal_priority),
global_priority_by_format: key.global_priority_by_format.clone(),
rpm_limit: key.rpm_limit,
allowed_models: key.allowed_models.as_ref().and_then(|value| {
value.as_array().map(|items| {
items
.iter()
.filter_map(serde_json::Value::as_str)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
})
}),
capabilities: key.capabilities.clone(),
cache_ttl_minutes: Some(key.cache_ttl_minutes),
max_probe_interval_minutes: Some(key.max_probe_interval_minutes),
auto_fetch_models: Some(key.auto_fetch_models),
locked_models: key.locked_models.as_ref().and_then(|value| {
value.as_array().map(|items| {
items
.iter()
.filter_map(serde_json::Value::as_str)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
})
}),
model_include_patterns: key.model_include_patterns.as_ref().and_then(
|value| {
value.as_array().map(|items| {
items
.iter()
.filter_map(serde_json::Value::as_str)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
})
},
),
model_exclude_patterns: key.model_exclude_patterns.as_ref().and_then(
|value| {
value.as_array().map(|items| {
items
.iter()
.filter_map(serde_json::Value::as_str)
.map(ToOwned::to_owned)
.collect::<Vec<_>>()
})
},
),
is_active: key.is_active,
proxy: key.proxy.clone(),
fingerprint: key.fingerprint.clone(),
}
payload
})
.collect::<Vec<_>>();
@@ -134,46 +175,47 @@ pub(crate) async fn build_admin_system_export_providers_payload(
.remove(&provider.id)
.unwrap_or_default()
.into_iter()
.map(|model| {
json!({
"provider_model_name": model.provider_model_name,
"provider_model_mappings": model.provider_model_mappings,
"price_per_request": model.price_per_request,
"tiered_pricing": model.tiered_pricing,
"supports_vision": model.supports_vision,
"supports_function_calling": model.supports_function_calling,
"supports_streaming": model.supports_streaming,
"supports_extended_thinking": model.supports_extended_thinking,
"supports_image_generation": model.supports_image_generation,
"is_active": model.is_active,
"config": model.config,
"global_model_name": global_model_name_by_id.get(&model.global_model_id),
})
.map(|model| AdminSystemConfigProviderModel {
global_model_name: global_model_name_by_id.get(&model.global_model_id).cloned(),
provider_model_name: model.provider_model_name,
provider_model_mappings: model.provider_model_mappings,
price_per_request: model.price_per_request,
tiered_pricing: model.tiered_pricing,
supports_vision: model.supports_vision,
supports_function_calling: model.supports_function_calling,
supports_streaming: model.supports_streaming,
supports_extended_thinking: model.supports_extended_thinking,
supports_image_generation: model.supports_image_generation,
is_active: model.is_active,
config: model.config,
})
.collect::<Vec<_>>();
json!({
"name": provider.name,
"description": provider.description,
"website": provider.website,
"provider_type": provider.provider_type,
"billing_type": provider.billing_type,
"monthly_quota_usd": provider.monthly_quota_usd,
"quota_reset_day": provider.quota_reset_day,
"provider_priority": provider.provider_priority,
"keep_priority_on_conversion": provider.keep_priority_on_conversion,
"enable_format_conversion": provider.enable_format_conversion,
"is_active": provider.is_active,
"concurrent_limit": provider.concurrent_limit,
"max_retries": provider.max_retries,
"proxy": provider.proxy,
"request_timeout": provider.request_timeout_secs,
"stream_first_byte_timeout": provider.stream_first_byte_timeout_secs,
"config": decrypt_admin_system_export_provider_config(state, provider.config.as_ref()),
"endpoints": endpoints_data,
"api_keys": keys_data,
"models": models_data,
})
AdminSystemConfigProvider {
name: provider.name.clone(),
description: provider.description.clone(),
website: provider.website.clone(),
provider_type: Some(provider.provider_type.clone()),
billing_type: provider.billing_type.clone(),
monthly_quota_usd: provider.monthly_quota_usd,
quota_reset_day: provider.quota_reset_day,
provider_priority: Some(provider.provider_priority),
keep_priority_on_conversion: Some(provider.keep_priority_on_conversion),
enable_format_conversion: Some(provider.enable_format_conversion),
is_active: provider.is_active,
concurrent_limit: provider.concurrent_limit,
max_retries: provider.max_retries,
stream_first_byte_timeout: provider.stream_first_byte_timeout_secs,
request_timeout: provider.request_timeout_secs,
proxy: provider.proxy.clone(),
config: decrypt_admin_system_export_provider_config(
state,
provider.config.as_ref(),
),
endpoints: endpoints_data,
api_keys: keys_data,
models: models_data,
}
})
.collect::<Vec<_>>())
}
apps/aether-gateway/src/handlers/admin/system/shared/export/support.rs
+3 -14
View File
@@ -2,23 +2,12 @@ use super::super::configs::is_sensitive_admin_system_config_key;
use crate::api::ai::admin_endpoint_signature_parts;
use crate::handlers::admin::request::AdminAppState;
use crate::handlers::shared::decrypt_catalog_secret_with_fallbacks;
pub(crate) use aether_admin::system::ADMIN_SYSTEM_CONFIG_EXPORT_VERSION;
use aether_admin::system::ADMIN_SYSTEM_PROVIDER_OPS_SENSITIVE_CREDENTIAL_FIELDS;
use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogEndpoint;
pub(crate) const ADMIN_SYSTEM_CONFIG_EXPORT_VERSION: &str = "2.2";
pub(crate) const ADMIN_SYSTEM_EXPORT_PAGE_LIMIT: usize = 10_000;
const PROVIDER_OPS_SENSITIVE_CREDENTIAL_FIELDS: &[&str] = &[
"api_key",
"password",
"refresh_token",
"session_token",
"session_cookie",
"token_cookie",
"auth_cookie",
"cookie_string",
"cookie",
];
pub(crate) fn decrypt_admin_system_export_secret(
state: &AdminAppState<'_>,
ciphertext: &str,
@@ -74,7 +63,7 @@ pub(super) fn decrypt_admin_system_export_provider_config(
return Some(decrypted);
};
for field in PROVIDER_OPS_SENSITIVE_CREDENTIAL_FIELDS {
for field in ADMIN_SYSTEM_PROVIDER_OPS_SENSITIVE_CREDENTIAL_FIELDS {
let Some(serde_json::Value::String(ciphertext)) = credentials.get(*field).cloned() else {
continue;
};