mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 17:30:23 +08:00
refactor: extract runtime state backends
This commit is contained in:
@@ -130,7 +130,7 @@ async fn gateway_clears_admin_external_models_cache_locally_with_trusted_admin_p
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["cleared"], false);
|
||||
assert_eq!(payload["message"], "Redis 未启用");
|
||||
assert_eq!(payload["message"], "缓存不存在");
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
|
||||
@@ -1307,9 +1307,11 @@ async fn gateway_handles_admin_monitoring_cache_redis_keys_delete_locally_with_t
|
||||
.await
|
||||
.expect("request should succeed");
|
||||
|
||||
assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["detail"], json!("Redis 未启用"));
|
||||
assert_eq!(payload["status"], json!("ok"));
|
||||
assert_eq!(payload["category"], json!("upstream_models"));
|
||||
assert_eq!(payload["deleted_count"], json!(0));
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
@@ -1485,11 +1487,9 @@ async fn gateway_handles_admin_monitoring_model_mapping_stats_locally_with_trust
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["status"], json!("ok"));
|
||||
assert_eq!(payload["data"]["available"], json!(false));
|
||||
assert_eq!(
|
||||
payload["data"]["message"],
|
||||
json!("Redis 未启用,模型映射缓存不可用")
|
||||
);
|
||||
assert_eq!(payload["data"]["available"], json!(true));
|
||||
assert_eq!(payload["data"]["backend"], json!("memory"));
|
||||
assert_eq!(payload["data"]["total_keys"], json!(0));
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
@@ -1707,8 +1707,9 @@ async fn gateway_handles_admin_monitoring_redis_keys_locally_with_trusted_admin_
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["status"], json!("ok"));
|
||||
assert_eq!(payload["data"]["available"], json!(false));
|
||||
assert_eq!(payload["data"]["message"], json!("Redis 未启用"));
|
||||
assert_eq!(payload["data"]["available"], json!(true));
|
||||
assert_eq!(payload["data"]["backend"], json!("memory"));
|
||||
assert_eq!(payload["data"]["total_keys"], json!(0));
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
|
||||
@@ -1118,9 +1118,16 @@ async fn gateway_handles_admin_provider_oauth_start_key_locally_with_trusted_adm
|
||||
.await
|
||||
.expect("request should succeed");
|
||||
|
||||
assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["detail"], "provider oauth redis unavailable");
|
||||
assert_eq!(payload["provider_type"], "codex");
|
||||
assert_eq!(
|
||||
payload["redirect_uri"],
|
||||
"http://localhost:1455/auth/callback"
|
||||
);
|
||||
assert!(payload["authorization_url"]
|
||||
.as_str()
|
||||
.is_some_and(|url| url.contains("state=")));
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
@@ -1174,9 +1181,16 @@ async fn gateway_handles_admin_provider_oauth_start_provider_locally_with_truste
|
||||
.await
|
||||
.expect("request should succeed");
|
||||
|
||||
assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let payload: serde_json::Value = response.json().await.expect("json body should parse");
|
||||
assert_eq!(payload["detail"], "provider oauth redis unavailable");
|
||||
assert_eq!(payload["provider_type"], "codex");
|
||||
assert_eq!(
|
||||
payload["redirect_uri"],
|
||||
"http://localhost:1455/auth/callback"
|
||||
);
|
||||
assert!(payload["authorization_url"]
|
||||
.as_str()
|
||||
.is_some_and(|url| url.contains("state=")));
|
||||
assert_eq!(*upstream_hits.lock().expect("mutex should lock"), 0);
|
||||
|
||||
gateway_handle.abort();
|
||||
|
||||
@@ -9,6 +9,7 @@ use aether_crypto::{
|
||||
use aether_data::repository::provider_catalog::InMemoryProviderCatalogReadRepository;
|
||||
use aether_data::repository::proxy_nodes::InMemoryProxyNodeRepository;
|
||||
use aether_data_contracts::repository::provider_catalog::ProviderCatalogReadRepository;
|
||||
use aether_runtime_state::{RedisClientConfig, RuntimeState};
|
||||
use aether_testkit::ManagedRedisServer;
|
||||
use axum::body::to_bytes;
|
||||
use axum::body::Body;
|
||||
@@ -42,6 +43,23 @@ async fn start_managed_redis_or_skip() -> Option<ManagedRedisServer> {
|
||||
}
|
||||
}
|
||||
|
||||
async fn redis_runtime_state_for_test(
|
||||
redis: &ManagedRedisServer,
|
||||
key_prefix: &str,
|
||||
) -> Arc<RuntimeState> {
|
||||
Arc::new(
|
||||
RuntimeState::redis(
|
||||
RedisClientConfig {
|
||||
url: redis.redis_url().to_string(),
|
||||
key_prefix: Some(key_prefix.to_string()),
|
||||
},
|
||||
None,
|
||||
)
|
||||
.await
|
||||
.expect("redis runtime state should build"),
|
||||
)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn gateway_handles_admin_provider_ops_architectures_locally_with_trusted_admin_principal() {
|
||||
let upstream_hits = Arc::new(Mutex::new(0usize));
|
||||
@@ -3529,16 +3547,16 @@ async fn gateway_handles_admin_provider_ops_balance_cache_refresh_modes_with_red
|
||||
vec![],
|
||||
));
|
||||
let data_state = GatewayDataState::from_config(
|
||||
GatewayDataConfig::disabled()
|
||||
.with_redis_url(redis.redis_url(), Some("provider_ops_balance_cache"))
|
||||
.with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
GatewayDataConfig::disabled().with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
)
|
||||
.expect("data state should build")
|
||||
.attach_provider_catalog_repository_for_tests(Arc::clone(&provider_catalog_repository));
|
||||
let runtime_state = redis_runtime_state_for_test(&redis, "provider_ops_balance_cache").await;
|
||||
let gateway = build_router_with_state(
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(data_state),
|
||||
.with_data_state_for_tests(data_state)
|
||||
.with_runtime_state(runtime_state),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
let client = reqwest::Client::new();
|
||||
@@ -3683,19 +3701,17 @@ async fn gateway_handles_admin_provider_ops_balance_cache_miss_without_refresh_r
|
||||
vec![],
|
||||
));
|
||||
let data_state = GatewayDataState::from_config(
|
||||
GatewayDataConfig::disabled()
|
||||
.with_redis_url(
|
||||
redis.redis_url(),
|
||||
Some("provider_ops_balance_cache_sync_miss"),
|
||||
)
|
||||
.with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
GatewayDataConfig::disabled().with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
)
|
||||
.expect("data state should build")
|
||||
.attach_provider_catalog_repository_for_tests(Arc::clone(&provider_catalog_repository));
|
||||
let runtime_state =
|
||||
redis_runtime_state_for_test(&redis, "provider_ops_balance_cache_sync_miss").await;
|
||||
let gateway = build_router_with_state(
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(data_state),
|
||||
.with_data_state_for_tests(data_state)
|
||||
.with_runtime_state(runtime_state),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
let client = reqwest::Client::new();
|
||||
@@ -3841,19 +3857,17 @@ async fn gateway_clears_admin_provider_ops_balance_cache_after_config_save_with_
|
||||
vec![],
|
||||
));
|
||||
let data_state = GatewayDataState::from_config(
|
||||
GatewayDataConfig::disabled()
|
||||
.with_redis_url(
|
||||
redis.redis_url(),
|
||||
Some("provider_ops_balance_cache_config_save"),
|
||||
)
|
||||
.with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
GatewayDataConfig::disabled().with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
)
|
||||
.expect("data state should build")
|
||||
.attach_provider_catalog_repository_for_tests(Arc::clone(&provider_catalog_repository));
|
||||
let runtime_state =
|
||||
redis_runtime_state_for_test(&redis, "provider_ops_balance_cache_config_save").await;
|
||||
let gateway = build_router_with_state(
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(data_state),
|
||||
.with_data_state_for_tests(data_state)
|
||||
.with_runtime_state(runtime_state),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
let client = reqwest::Client::new();
|
||||
@@ -4058,19 +4072,17 @@ async fn gateway_verify_does_not_pollute_balance_cache_and_balance_uses_saved_ac
|
||||
vec![],
|
||||
));
|
||||
let data_state = GatewayDataState::from_config(
|
||||
GatewayDataConfig::disabled()
|
||||
.with_redis_url(
|
||||
redis.redis_url(),
|
||||
Some("provider_ops_verify_cache_isolation"),
|
||||
)
|
||||
.with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
GatewayDataConfig::disabled().with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
)
|
||||
.expect("data state should build")
|
||||
.attach_provider_catalog_repository_for_tests(Arc::clone(&provider_catalog_repository));
|
||||
let runtime_state =
|
||||
redis_runtime_state_for_test(&redis, "provider_ops_verify_cache_isolation").await;
|
||||
let gateway = build_router_with_state(
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(data_state),
|
||||
.with_data_state_for_tests(data_state)
|
||||
.with_runtime_state(runtime_state),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
let client = reqwest::Client::new();
|
||||
@@ -4232,16 +4244,16 @@ async fn gateway_handles_admin_provider_ops_batch_balance_with_pending_cache_hit
|
||||
vec![],
|
||||
));
|
||||
let data_state = GatewayDataState::from_config(
|
||||
GatewayDataConfig::disabled()
|
||||
.with_redis_url(redis.redis_url(), Some("provider_ops_batch_balance"))
|
||||
.with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
GatewayDataConfig::disabled().with_encryption_key(DEVELOPMENT_ENCRYPTION_KEY),
|
||||
)
|
||||
.expect("data state should build")
|
||||
.attach_provider_catalog_repository_for_tests(Arc::clone(&provider_catalog_repository));
|
||||
let runtime_state = redis_runtime_state_for_test(&redis, "provider_ops_batch_balance").await;
|
||||
let gateway = build_router_with_state(
|
||||
AppState::new()
|
||||
.expect("gateway should build")
|
||||
.with_data_state_for_tests(data_state),
|
||||
.with_data_state_for_tests(data_state)
|
||||
.with_runtime_state(runtime_state),
|
||||
);
|
||||
let (gateway_url, gateway_handle) = start_server(gateway).await;
|
||||
let client = reqwest::Client::new();
|
||||
|
||||
Reference in New Issue
Block a user