feat(ai-config): persist AI settings per provider (#2412)
## 背景说明 AI 设置原本只有一个配置槽,切换模型厂商时会覆盖之前填写的 endpoint、API Key、model 等信息。本次改动让每个模型厂商各自保存一份配置,并在设置页和对话窗口提供已配置状态与快速切换能力。 ## 修改内容 - 新增 ai_provider_configs 存储表,用于按 provider 保存独立 AI 配置 - 新增 Tauri/Web API:保存和加载 provider 级 AI 配置 - 设置页 provider 下拉展示“当前/已配置”状态 - 设置页切换 provider 前会先保存当前表单编辑内容,避免未保存输入丢失 - 对话窗口模型选择器支持查看并切换已配置过的其他 provider - provider 配置保存时强制 config.provider 与 provider key 一致,避免错位配置污染 - 所有语言补齐新增 i18n 文案 ## 修复的问题 - 切换模型厂商时原厂商配置会丢失 - 设置页切换 provider 时本地表单编辑态可能未保存 - provider key 与 config.provider 不一致时可能激活错误厂商 - 对话窗口模型选择器只能看到当前 provider 的模型,不能看到其他已配置厂商 ## 测试 - npx tsc --noEmit - cargo check -p dbx-core - cargo check -p dbx-web - cargo check --manifest-path src-tauri/Cargo.toml
This commit is contained in:
1 parent
486b9ee8ed
commit
a0754206d3
18 files changed
+301
-51
No files matched your search
@@ -1,11 +1,12 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::path::Path;
|
||||
|
||||
use log::warn;
|
||||
use rusqlite::{params, params_from_iter, Connection, DatabaseName, OpenFlags, OptionalExtension, ToSql};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::ai::{AiChatMessage, AiConfig, AiConversation};
|
||||
use crate::ai::{AiChatMessage, AiConfig, AiConversation, AiProvider};
|
||||
use crate::connection_secrets::{
|
||||
MQ_AUTH_API_KEY_VALUE_KEY, MQ_AUTH_CLIENT_SECRET_KEY, MQ_AUTH_PASSWORD_KEY, MQ_AUTH_SECRET_PREFIX,
|
||||
MQ_AUTH_TOKEN_KEY, MQ_TOKEN_SIGNING_KEY, MQ_TOKEN_SIGNING_SECRET_PREFIX,
|
||||
@@ -197,6 +198,10 @@ const SCHEMA_STATEMENTS: &[&str] = &[
|
||||
id INTEGER PRIMARY KEY CHECK (id = 1),
|
||||
config_json TEXT NOT NULL
|
||||
)",
|
||||
"CREATE TABLE IF NOT EXISTS ai_provider_configs (
|
||||
provider TEXT PRIMARY KEY,
|
||||
config_json TEXT NOT NULL
|
||||
)",
|
||||
"CREATE TABLE IF NOT EXISTS ai_conversations (
|
||||
id TEXT PRIMARY KEY,
|
||||
title TEXT NOT NULL DEFAULT '',
|
||||
@@ -620,6 +625,15 @@ impl Storage {
|
||||
|
||||
// AI Config
|
||||
|
||||
fn ai_provider_key(provider: &AiProvider) -> String {
|
||||
serde_json::to_value(provider).ok().and_then(|value| value.as_str().map(ToOwned::to_owned)).unwrap_or_default()
|
||||
}
|
||||
|
||||
fn ai_provider_from_key(provider: &str) -> Result<AiProvider, String> {
|
||||
serde_json::from_value(serde_json::Value::String(provider.to_string()))
|
||||
.map_err(|_| format!("Invalid AI provider: {provider}"))
|
||||
}
|
||||
|
||||
impl Storage {
|
||||
pub async fn save_ai_config(&self, config: &AiConfig) -> Result<(), String> {
|
||||
let json = serde_json::to_string(config).map_err(|e| e.to_string())?;
|
||||
@@ -641,6 +655,65 @@ impl Storage {
|
||||
.await?;
|
||||
json.map(|value| serde_json::from_str(&value).map_err(|e| e.to_string())).transpose()
|
||||
}
|
||||
|
||||
pub async fn save_ai_provider_config(&self, provider: &str, config: &AiConfig) -> Result<(), String> {
|
||||
let parsed_provider = ai_provider_from_key(provider)?;
|
||||
let mut config = config.clone();
|
||||
let config_provider = ai_provider_key(&config.provider);
|
||||
if config_provider != provider {
|
||||
warn!(
|
||||
"save_ai_provider_config: config.provider ({}) does not match provider key ({}), normalizing",
|
||||
config_provider, provider
|
||||
);
|
||||
config.provider = parsed_provider;
|
||||
}
|
||||
let provider = provider.to_string();
|
||||
let json = serde_json::to_string(&config).map_err(|e| e.to_string())?;
|
||||
self.with_conn(move |conn| {
|
||||
conn.execute(
|
||||
"INSERT OR REPLACE INTO ai_provider_configs (provider, config_json) VALUES (?1, ?2)",
|
||||
params![provider, json],
|
||||
)
|
||||
.map(|_| ())
|
||||
.map_err(|e| e.to_string())
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn load_ai_provider_configs(&self) -> Result<HashMap<String, AiConfig>, String> {
|
||||
self.with_conn(|conn| {
|
||||
let mut stmt = conn
|
||||
.prepare("SELECT provider, config_json FROM ai_provider_configs")
|
||||
.map_err(|e| e.to_string())?;
|
||||
let rows = stmt
|
||||
.query_map([], |row| Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?)))
|
||||
.map_err(|e| e.to_string())?;
|
||||
let mut map = HashMap::new();
|
||||
for row in rows {
|
||||
let (provider, json) = row.map_err(|e| e.to_string())?;
|
||||
match serde_json::from_str::<AiConfig>(&json) {
|
||||
Ok(mut config) => {
|
||||
if let Ok(parsed_provider) = ai_provider_from_key(&provider) {
|
||||
let config_provider = ai_provider_key(&config.provider);
|
||||
if config_provider != provider {
|
||||
warn!(
|
||||
"load_ai_provider_configs: stored config.provider ({}) does not match provider key ({}), normalizing",
|
||||
config_provider, provider
|
||||
);
|
||||
config.provider = parsed_provider;
|
||||
}
|
||||
map.insert(provider, config);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
warn!("Failed to deserialize AI config for provider '{}': {}", provider, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(map)
|
||||
})
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
// App Settings
|
||||
|
||||
Reference in new issue
Block a user