Revert "Merge pull request #517 from zhiqicloud/feat/provider-balance-query"

This reverts commit 7e95e769d5, reversing
changes made to 490306c242.

apps/aether-gateway/src/handlers/admin/provider/ops/providers/actions/mod.rs

@@ -32,68 +32,6 @@ pub(super) fn admin_provider_ops_is_valid_action_type(action_type: &str) -> bool
     )
 }
 
-pub(crate) fn admin_provider_ops_saved_connector_credentials(
-    state: &AdminAppState<'_>,
-    provider: &StoredProviderCatalogProvider,
-) -> serde_json::Map<String, serde_json::Value> {
-    admin_provider_ops_decrypted_credentials(
-        state,
-        admin_provider_ops_config_object(provider)
-            .and_then(admin_provider_ops_connector_object)
-            .and_then(|connector| connector.get("credentials")),
-    )
-}
-
-pub(crate) async fn admin_provider_ops_query_balance_response_for_credentials(
-    state: &AdminAppState<'_>,
-    provider_id: &str,
-    provider: &StoredProviderCatalogProvider,
-    architecture_id: &str,
-    base_url: &str,
-    provider_ops_config: &serde_json::Map<String, serde_json::Value>,
-    connector_config: &serde_json::Map<String, serde_json::Value>,
-    credentials: &serde_json::Map<String, serde_json::Value>,
-    request_config: Option<&serde_json::Map<String, serde_json::Value>>,
-) -> serde_json::Value {
-    let architecture_id = normalize_architecture_id(architecture_id);
-    let Some(architecture) = get_architecture(architecture_id) else {
-        return responses::admin_provider_ops_action_not_supported(
-            "query_balance",
-            ADMIN_PROVIDER_OPS_ACTION_RUST_ONLY_MESSAGE,
-        );
-    };
-    let headers = match build_headers(architecture.architecture_id, connector_config, credentials) {
-        Ok(headers) => headers,
-        Err(message) => {
-            return responses::admin_provider_ops_action_not_configured("query_balance", message);
-        }
-    };
-    let Some(action_config) = resolve_action_config(
-        architecture_id,
-        provider_ops_config,
-        "query_balance",
-        request_config,
-    ) else {
-        return responses::admin_provider_ops_action_not_supported(
-            "query_balance",
-            ADMIN_PROVIDER_OPS_ACTION_RUST_ONLY_MESSAGE,
-        );
-    };
-
-    query_balance::admin_provider_ops_run_query_balance_action(
-        state,
-        provider_id,
-        provider,
-        &architecture,
-        base_url,
-        &action_config,
-        &headers,
-        credentials,
-        None,
-    )
-    .await
-}
-
 pub(crate) async fn admin_provider_ops_local_action_response(
     state: &AdminAppState<'_>,
     provider_id: &str,

apps/aether-gateway/src/handlers/admin/provider/ops/providers/actions/query_balance/mod.rs

@@ -111,14 +111,11 @@ pub(super) async fn admin_provider_ops_run_query_balance_action(
 
     if status != http::StatusCode::OK {
         let cookie_auth = architecture.query_balance_cookie_auth_errors;
-        let new_api_token_auth = architecture.architecture_id == "new_api";
         return match status {
             http::StatusCode::UNAUTHORIZED => admin_provider_ops_action_error(
                 "auth_failed",
                 "query_balance",
-                if new_api_token_auth {
-                    "访问令牌无效，请使用 New API 个人安全设置里的访问令牌"
-                } else if cookie_auth {
+                if cookie_auth {
                     "Cookie 已失效，请重新配置"
                 } else {
                     "认证失败"
@@ -128,9 +125,7 @@ pub(super) async fn admin_provider_ops_run_query_balance_action(
             http::StatusCode::FORBIDDEN => admin_provider_ops_action_error(
                 "auth_failed",
                 "query_balance",
-                if new_api_token_auth {
-                    "访问令牌无效或无权限，请使用 New API 个人安全设置里的访问令牌"
-                } else if cookie_auth {
+                if cookie_auth {
                     "Cookie 已失效或无权限"
                 } else {
                     "无权限访问"

apps/aether-gateway/src/handlers/admin/provider/ops/providers/actions/query_balance/sub2api.rs

@@ -8,9 +8,7 @@ use super::super::responses::{
 };
 use super::super::support::admin_provider_ops_json_object_map;
 use crate::handlers::admin::request::AdminAppState;
-use aether_admin::provider::ops::{
-    parse_sub2api_api_key_usage_payload, parse_sub2api_balance_payload,
-};
+use aether_admin::provider::ops::parse_sub2api_balance_payload;
 use aether_contracts::ProxySnapshot;
 use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogProvider;
 use serde_json::{json, Value};
@@ -26,23 +24,6 @@ pub(super) async fn admin_provider_ops_sub2api_balance_payload(
     proxy_snapshot: Option<&ProxySnapshot>,
 ) -> serde_json::Value {
     let start = std::time::Instant::now();
-    if let Some(api_key) = credentials
-        .get("api_key")
-        .and_then(Value::as_str)
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-    {
-        return admin_provider_ops_sub2api_api_key_balance_payload(
-            state,
-            provider_id,
-            base_url,
-            action_config,
-            api_key,
-            proxy_snapshot,
-            start,
-        )
-        .await;
-    }
     let (access_token, updated_credentials, _frontend_updated_credentials) =
         match admin_provider_ops_sub2api_exchange_token(
             state,
@@ -210,117 +191,6 @@ pub(super) async fn admin_provider_ops_sub2api_balance_payload(
     )
 }
 
-async fn admin_provider_ops_sub2api_api_key_balance_payload(
-    state: &AdminAppState<'_>,
-    provider_id: &str,
-    base_url: &str,
-    action_config: &serde_json::Map<String, serde_json::Value>,
-    api_key: &str,
-    proxy_snapshot: Option<&ProxySnapshot>,
-    start: std::time::Instant,
-) -> serde_json::Value {
-    let usage_endpoint = action_config
-        .get("api_key_usage_endpoint")
-        .or_else(|| action_config.get("usage_endpoint"))
-        .and_then(serde_json::Value::as_str)
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-        .unwrap_or("/v1/usage");
-    let usage_url = admin_provider_ops_sub2api_request_url(base_url, usage_endpoint);
-    let auth_value = match reqwest::header::HeaderValue::from_str(&format!("Bearer {api_key}")) {
-        Ok(value) => value,
-        Err(_) => {
-            return admin_provider_ops_action_error(
-                "parse_error",
-                "query_balance",
-                "API Key 格式无效",
-                Some(start.elapsed().as_millis() as u64),
-            );
-        }
-    };
-    let auth_headers = reqwest::header::HeaderMap::from_iter([
-        (reqwest::header::AUTHORIZATION, auth_value),
-        (
-            reqwest::header::ACCEPT,
-            reqwest::header::HeaderValue::from_static("application/json"),
-        ),
-    ]);
-    let request_id = format!("provider-ops-action:sub2api:usage:{provider_id}");
-    let result = admin_provider_ops_execute_json_request(
-        state,
-        &request_id,
-        reqwest::Method::GET,
-        &usage_url,
-        &auth_headers,
-        None,
-        proxy_snapshot,
-    )
-    .await;
-    let response_time_ms = Some(start.elapsed().as_millis() as u64);
-    let (status, response_json) = match result {
-        Ok(result) => result,
-        Err(AdminProviderOpsExecuteJsonError::InvalidJson(message))
-        | Err(AdminProviderOpsExecuteJsonError::Transport(message)) => {
-            return admin_provider_ops_action_error(
-                "network_error",
-                "query_balance",
-                network_error_message(&message),
-                response_time_ms,
-            );
-        }
-    };
-    if matches!(
-        status,
-        http::StatusCode::UNAUTHORIZED | http::StatusCode::FORBIDDEN
-    ) {
-        return admin_provider_ops_action_error(
-            "auth_failed",
-            "query_balance",
-            "认证失败，请检查 API Key",
-            response_time_ms,
-        );
-    }
-    if status != http::StatusCode::OK {
-        return admin_provider_ops_action_error(
-            "unknown_error",
-            "query_balance",
-            format!(
-                "HTTP {}: {}",
-                status.as_u16(),
-                status.canonical_reason().unwrap_or("Unknown")
-            ),
-            response_time_ms,
-        );
-    }
-
-    let data = match parse_sub2api_api_key_usage_payload(action_config, &response_json) {
-        Ok(payload) => payload,
-        Err(message) => {
-            return admin_provider_ops_action_error(
-                if message.contains("无效") {
-                    "auth_failed"
-                } else if message == "响应格式无效" {
-                    "parse_error"
-                } else {
-                    "unknown_error"
-                },
-                "query_balance",
-                message,
-                response_time_ms,
-            );
-        }
-    };
-
-    admin_provider_ops_action_response(
-        "success",
-        "query_balance",
-        data,
-        None,
-        response_time_ms,
-        86400,
-    )
-}
-
 fn network_error_message(error: &str) -> String {
     let normalized = error.trim();
     let lower = normalized.to_ascii_lowercase();

apps/aether-gateway/src/handlers/admin/provider/ops/providers/config.rs

@@ -250,9 +250,6 @@ pub(super) fn build_admin_provider_ops_saved_config_value(
     provider: &StoredProviderCatalogProvider,
     payload: AdminProviderOpsSaveConfigRequest,
 ) -> Result<serde_json::Value, String> {
-    let architecture_id =
-        admin_provider_ops_pure::normalize_architecture_id(payload.architecture_id.as_str())
-            .to_string();
     let auth_type = payload.connector.auth_type.trim().to_string();
     if auth_type.is_empty() || !admin_provider_ops_is_supported_auth_type(auth_type.as_str()) {
         return Err("connector.auth_type 必须是合法的认证类型".to_string());
@@ -260,7 +257,7 @@ pub(super) fn build_admin_provider_ops_saved_config_value(
 
     let merged_credentials = admin_provider_ops_merge_credentials(
         state,
-        architecture_id.as_str(),
+        payload.architecture_id.as_str(),
         provider,
         payload.connector.credentials,
     );
@@ -281,7 +278,7 @@ pub(super) fn build_admin_provider_ops_saved_config_value(
         .collect::<serde_json::Map<String, serde_json::Value>>();
 
     Ok(json!({
-        "architecture_id": architecture_id,
+        "architecture_id": payload.architecture_id,
         "base_url": payload.base_url,
         "connector": {
             "auth_type": auth_type,
@@ -331,16 +328,14 @@ pub(super) fn build_admin_provider_ops_config_payload(
         });
     };
     let connector = admin_provider_ops_connector_object(provider_ops_config);
-    let architecture_id = provider_ops_config
-        .get("architecture_id")
-        .and_then(serde_json::Value::as_str)
-        .map(admin_provider_ops_pure::normalize_architecture_id)
-        .unwrap_or("generic_api");
 
     json!({
         "provider_id": provider_id,
         "is_configured": true,
-        "architecture_id": architecture_id,
+        "architecture_id": provider_ops_config
+            .get("architecture_id")
+            .and_then(serde_json::Value::as_str)
+            .unwrap_or("generic_api"),
         "base_url": resolve_admin_provider_ops_base_url(
             provider,
             endpoints,

apps/aether-gateway/src/handlers/admin/provider/ops/providers/verify/sub2api.rs

@@ -6,8 +6,7 @@ use crate::handlers::admin::provider::ops::providers::config::persist_admin_prov
 use crate::handlers::admin::request::AdminAppState;
 use aether_admin::provider::ops::{
     admin_provider_ops_frontend_updated_credentials, admin_provider_ops_verify_failure,
-    admin_provider_ops_verify_success, admin_provider_ops_verify_user_payload,
-    parse_sub2api_api_key_usage_payload, parse_verify_payload, ADMIN_PROVIDER_OPS_USER_AGENT,
+    parse_verify_payload, ADMIN_PROVIDER_OPS_USER_AGENT,
 };
 use aether_contracts::ProxySnapshot;
 use aether_data_contracts::repository::provider_catalog::StoredProviderCatalogProvider;
@@ -22,21 +21,6 @@ pub(super) async fn admin_provider_ops_local_sub2api_verify_response(
     credentials: &Map<String, Value>,
     proxy_snapshot: Option<&ProxySnapshot>,
 ) -> Value {
-    if let Some(api_key) = credentials
-        .get("api_key")
-        .and_then(Value::as_str)
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-    {
-        return admin_provider_ops_local_sub2api_api_key_verify_response(
-            state,
-            base_url,
-            api_key,
-            proxy_snapshot,
-        )
-        .await;
-    }
-
     let (access_token, updated_credentials, frontend_updated_credentials) =
         match admin_provider_ops_sub2api_exchange_token(
             state,
@@ -109,78 +93,6 @@ pub(super) async fn admin_provider_ops_local_sub2api_verify_response(
     )
 }
 
-async fn admin_provider_ops_local_sub2api_api_key_verify_response(
-    state: &AdminAppState<'_>,
-    base_url: &str,
-    api_key: &str,
-    proxy_snapshot: Option<&ProxySnapshot>,
-) -> Value {
-    let usage_url = admin_provider_ops_sub2api_request_url(base_url, "/v1/usage");
-    let auth_value = match reqwest::header::HeaderValue::from_str(&format!("Bearer {api_key}")) {
-        Ok(value) => value,
-        Err(_) => return admin_provider_ops_verify_failure("API Key 格式无效"),
-    };
-    let auth_headers = reqwest::header::HeaderMap::from_iter([
-        (reqwest::header::AUTHORIZATION, auth_value),
-        (
-            reqwest::header::ACCEPT,
-            reqwest::header::HeaderValue::from_static("application/json"),
-        ),
-    ]);
-    let auth_headers =
-        admin_provider_ops_headers_with_transport_controls(&auth_headers, None, true);
-    let (status, response_json) = match admin_provider_ops_execute_json_request(
-        state,
-        "provider-ops-verify:sub2api:api-key",
-        reqwest::Method::GET,
-        &usage_url,
-        &auth_headers,
-        None,
-        proxy_snapshot,
-    )
-    .await
-    {
-        Ok(result) => result,
-        Err(AdminProviderOpsExecuteJsonError::InvalidJson(message))
-        | Err(AdminProviderOpsExecuteJsonError::Transport(message)) => {
-            return admin_provider_ops_verify_failure(
-                admin_provider_ops_verify_execution_error_message(&message),
-            );
-        }
-    };
-    if matches!(
-        status,
-        http::StatusCode::UNAUTHORIZED | http::StatusCode::FORBIDDEN
-    ) {
-        return admin_provider_ops_verify_failure("认证失败：API Key 无效或已过期");
-    }
-    if status != http::StatusCode::OK {
-        return admin_provider_ops_verify_failure(format!("验证失败：HTTP {}", status.as_u16()));
-    }
-
-    let payload = match parse_sub2api_api_key_usage_payload(&Map::new(), &response_json) {
-        Ok(payload) => payload,
-        Err(message) => return admin_provider_ops_verify_failure(message),
-    };
-    let quota = payload.get("total_available").and_then(Value::as_f64);
-    let extra = payload
-        .get("extra")
-        .and_then(Value::as_object)
-        .cloned()
-        .unwrap_or_default();
-
-    admin_provider_ops_verify_success(
-        admin_provider_ops_verify_user_payload(
-            Some("Sub2API API Key".to_string()),
-            Some("Sub2API API Key".to_string()),
-            None,
-            quota,
-            Some(extra),
-        ),
-        None,
-    )
-}
-
 // 对齐 Python httpx.AsyncClient(base_url=...) 的行为:
 // 以 "/" 开头的端点始终相对站点根路径解析，而不是简单字符串拼接。
 pub(in super::super) fn admin_provider_ops_sub2api_request_url(