Feat/pricing config enhancement (#781)

* feat(db): add pricing config fields to proxy_config table - Add default_cost_multiplier field per app type - Add pricing_model_source field (request/response) - Add request_model field to proxy_request_logs table - Implement schema migration v5 * feat(api): add pricing config commands and provider meta fields - Add get/set commands for default cost multiplier - Add get/set commands for pricing model source - Extend ProviderMeta with cost_multiplier and pricing_model_source - Register new commands in Tauri invoke handler * fix(proxy): apply cost multiplier to total cost only - Move multiplier calculation from per-item to total cost - Add resolve_pricing_config for provider-level override - Include request_model and cost_multiplier in usage logs - Return new fields in get_request_logs API * feat(ui): add pricing config UI and usage log enhancements - Add pricing config section to provider advanced settings - Refactor PricingConfigPanel to compact table layout - Display all three apps (Claude/Codex/Gemini) in one view - Add multiplier column and request model display to logs - Add frontend API wrappers for pricing config * feat(i18n): add pricing config translations - Add zh/en/ja translations for pricing defaults config - Add translations for multiplier, requestModel, responseModel - Add provider pricing config translations * fix(pricing): align backfill cost calculation with real-time logic - Fix backfill to deduct cache_read_tokens from input (avoid double billing) - Apply multiplier only to total cost, not to each item - Add multiplier display in request detail panel with i18n support - Use AppError::localized for backend error messages - Fix init_proxy_config_rows to use per-app default values - Fix silent failure in set_default_cost_multiplier/set_pricing_model_source - Add clippy allow annotation for test mutex across await * style: format code with cargo fmt and prettier * fix(tests): correct error type assertions in proxy DAO tests The tests expected AppError::InvalidInput but the DAO functions use AppError::localized() which returns AppError::Localized variant. Updated assertions to match the correct error type with key validation. --------- Co-authored-by: Jason <farion1231@gmail.com>
2026-08-04 11:43:57 +08:00 · 2026-01-27 10:43:05 +08:00
parent c00f431d67
commit 785e1b5add
27 changed files with 2123 additions and 283 deletions
@@ -4,6 +4,7 @@

 use crate::error::AppError;
 use crate::proxy::types::*;
+use rust_decimal::Decimal;

 use super::super::{lock_conn, Database};

@@ -75,6 +76,117 @@ impl Database {
        Ok(())
    }

+    /// 获取默认成本倍率
+    pub async fn get_default_cost_multiplier(&self, app_type: &str) -> Result<String, AppError> {
+        let result = {
+            let conn = lock_conn!(self.conn);
+            conn.query_row(
+                "SELECT default_cost_multiplier FROM proxy_config WHERE app_type = ?1",
+                [app_type],
+                |row| row.get(0),
+            )
+        };
+
+        match result {
+            Ok(value) => Ok(value),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                self.init_proxy_config_rows().await?;
+                Ok("1".to_string())
+            }
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 设置默认成本倍率
+    pub async fn set_default_cost_multiplier(
+        &self,
+        app_type: &str,
+        value: &str,
+    ) -> Result<(), AppError> {
+        let trimmed = value.trim();
+        if trimmed.is_empty() {
+            return Err(AppError::localized(
+                "error.multiplierEmpty",
+                "倍率不能为空",
+                "Multiplier cannot be empty",
+            ));
+        }
+        trimmed.parse::<Decimal>().map_err(|e| {
+            AppError::localized(
+                "error.invalidMultiplier",
+                format!("无效倍率: {value} - {e}"),
+                format!("Invalid multiplier: {value} - {e}"),
+            )
+        })?;
+
+        // 确保行存在
+        self.ensure_proxy_config_row_exists(app_type)?;
+
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "UPDATE proxy_config SET
+                default_cost_multiplier = ?2,
+                updated_at = datetime('now')
+             WHERE app_type = ?1",
+            rusqlite::params![app_type, trimmed],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// 获取计费模式来源
+    pub async fn get_pricing_model_source(&self, app_type: &str) -> Result<String, AppError> {
+        let result = {
+            let conn = lock_conn!(self.conn);
+            conn.query_row(
+                "SELECT pricing_model_source FROM proxy_config WHERE app_type = ?1",
+                [app_type],
+                |row| row.get(0),
+            )
+        };
+
+        match result {
+            Ok(value) => Ok(value),
+            Err(rusqlite::Error::QueryReturnedNoRows) => {
+                self.init_proxy_config_rows().await?;
+                Ok("response".to_string())
+            }
+            Err(e) => Err(AppError::Database(e.to_string())),
+        }
+    }
+
+    /// 设置计费模式来源
+    pub async fn set_pricing_model_source(
+        &self,
+        app_type: &str,
+        value: &str,
+    ) -> Result<(), AppError> {
+        let trimmed = value.trim();
+        if !matches!(trimmed, "response" | "request") {
+            return Err(AppError::localized(
+                "error.invalidPricingMode",
+                format!("无效计费模式: {value}"),
+                format!("Invalid pricing mode: {value}"),
+            ));
+        }
+
+        // 确保行存在
+        self.ensure_proxy_config_row_exists(app_type)?;
+
+        let conn = lock_conn!(self.conn);
+        conn.execute(
+            "UPDATE proxy_config SET
+                pricing_model_source = ?2,
+                updated_at = datetime('now')
+             WHERE app_type = ?1",
+            rusqlite::params![app_type, trimmed],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
    /// 获取应用级代理配置
    pub async fn get_proxy_config_for_app(
        &self,
@@ -177,17 +289,90 @@ impl Database {
        Ok(())
    }

+    /// 确保指定 app_type 的 proxy_config 行存在（同步版本，用于 set_* 函数）
+    ///
+    /// 使用与 schema.rs seed 相同的 per-app 默认值
+    fn ensure_proxy_config_row_exists(&self, app_type: &str) -> Result<(), AppError> {
+        let conn = self
+            .conn
+            .lock()
+            .map_err(|e| AppError::Lock(e.to_string()))?;
+
+        // 根据 app_type 使用不同的默认值（与 schema.rs seed 保持一致）
+        let (retries, fb_timeout, idle_timeout, cb_fail, cb_succ, cb_timeout, cb_rate, cb_min) =
+            match app_type {
+                "claude" => (6, 90, 180, 8, 3, 90, 0.7, 15),
+                "codex" => (3, 60, 120, 4, 2, 60, 0.6, 10),
+                "gemini" => (5, 60, 120, 4, 2, 60, 0.6, 10),
+                _ => (3, 60, 120, 4, 2, 60, 0.6, 10), // 默认值
+            };
+
+        conn.execute(
+            "INSERT OR IGNORE INTO proxy_config (
+                app_type, max_retries,
+                streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout,
+                circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                circuit_error_rate_threshold, circuit_min_requests
+            ) VALUES (?1, ?2, ?3, ?4, 600, ?5, ?6, ?7, ?8, ?9)",
+            rusqlite::params![
+                app_type,
+                retries,
+                fb_timeout,
+                idle_timeout,
+                cb_fail,
+                cb_succ,
+                cb_timeout,
+                cb_rate,
+                cb_min
+            ],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        Ok(())
+    }
+
    /// 初始化 proxy_config 表的三行数据
+    ///
+    /// 使用与 schema.rs seed 相同的 per-app 默认值
    async fn init_proxy_config_rows(&self) -> Result<(), AppError> {
        let conn = lock_conn!(self.conn);

-        for app_type in &["claude", "codex", "gemini"] {
-            conn.execute(
-                "INSERT OR IGNORE INTO proxy_config (app_type) VALUES (?1)",
-                [app_type],
-            )
-            .map_err(|e| AppError::Database(e.to_string()))?;
-        }
+        // 使用与 schema.rs seed 相同的 per-app 默认值
+        // claude: 更激进的重试和超时配置
+        conn.execute(
+            "INSERT OR IGNORE INTO proxy_config (
+                app_type, max_retries,
+                streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout,
+                circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                circuit_error_rate_threshold, circuit_min_requests
+            ) VALUES ('claude', 6, 90, 180, 600, 8, 3, 90, 0.7, 15)",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // codex: 默认配置
+        conn.execute(
+            "INSERT OR IGNORE INTO proxy_config (
+                app_type, max_retries,
+                streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout,
+                circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                circuit_error_rate_threshold, circuit_min_requests
+            ) VALUES ('codex', 3, 60, 120, 600, 4, 2, 60, 0.6, 10)",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // gemini: 稍高的重试次数
+        conn.execute(
+            "INSERT OR IGNORE INTO proxy_config (
+                app_type, max_retries,
+                streaming_first_byte_timeout, streaming_idle_timeout, non_streaming_timeout,
+                circuit_failure_threshold, circuit_success_threshold, circuit_timeout_seconds,
+                circuit_error_rate_threshold, circuit_min_requests
+            ) VALUES ('gemini', 5, 60, 120, 600, 4, 2, 60, 0.6, 10)",
+            [],
+        )
+        .map_err(|e| AppError::Database(e.to_string()))?;

        Ok(())
    }
@@ -662,3 +847,58 @@ impl Database {
        Ok(())
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::database::Database;
+    use crate::error::AppError;
+
+    #[tokio::test]
+    async fn test_default_cost_multiplier_round_trip() -> Result<(), AppError> {
+        let db = Database::memory()?;
+
+        let default = db.get_default_cost_multiplier("claude").await?;
+        assert_eq!(default, "1");
+
+        db.set_default_cost_multiplier("claude", "1.5").await?;
+        let updated = db.get_default_cost_multiplier("claude").await?;
+        assert_eq!(updated, "1.5");
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_default_cost_multiplier_validation() -> Result<(), AppError> {
+        let db = Database::memory()?;
+
+        let err = db
+            .set_default_cost_multiplier("claude", "not-a-number")
+            .await
+            .unwrap_err();
+        // AppError::localized returns AppError::Localized variant
+        assert!(matches!(err, AppError::Localized { key: "error.invalidMultiplier", .. }));
+
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_pricing_model_source_round_trip_and_validation() -> Result<(), AppError> {
+        let db = Database::memory()?;
+
+        let default = db.get_pricing_model_source("claude").await?;
+        assert_eq!(default, "response");
+
+        db.set_pricing_model_source("claude", "request").await?;
+        let updated = db.get_pricing_model_source("claude").await?;
+        assert_eq!(updated, "request");
+
+        let err = db
+            .set_pricing_model_source("claude", "invalid")
+            .await
+            .unwrap_err();
+        // AppError::localized returns AppError::Localized variant
+        assert!(matches!(err, AppError::Localized { key: "error.invalidPricingMode", .. }));
+
+        Ok(())
+    }
+}