From 3a740969b9e57bb6d0a145bc12615774dc76926e Mon Sep 17 00:00:00 2001 From: pengshiyu <18026300876@163.com> Date: Tue, 6 Jan 2026 22:24:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20X-Provider-Id=20he?= =?UTF-8?q?ader=20=E6=94=AF=E6=8C=81=E5=AE=9E=E7=8E=B0=E7=B2=BE=E7=A1=AE?= =?UTF-8?q?=20Provider=20=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 API 请求中添加 X-Provider-Id header 用于精确路由到指定 Provider - 修复 Chat 专家模式使用 Deepseek 等自定义 Provider 时路由错误的问题 - 优化 toast 通知持续时间和去重机制 - 移除 App.tsx 中重复的 Toaster 组件 修改文件: - api.rs: 解析 X-Provider-Id header 并支持 provider_id_hint 路由 - api_key_provider_service.rs: 添加 get_next_api_key_with_provider_info 方法 - protocols/mod.rs, openai.rs, anthropic.rs: Protocol trait 添加 provider_id 参数 - native_agent.rs, native_agent_cmd.rs: 传递 provider_id 到请求中 - useAgentChat.ts: 增加错误 toast 持续时间到 8 秒 - sonner.tsx: 默认 toast 持续时间从 3 秒增加到 5 秒 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- src-tauri/src/agent/protocols/anthropic.rs | 34 ++++++++++---- src-tauri/src/agent/protocols/mod.rs | 2 + src-tauri/src/agent/protocols/openai.rs | 38 +++++++++++---- .../src/services/api_key_provider_service.rs | 47 +++++++++++++++++++ src/App.tsx | 2 - src/components/ui/sonner.tsx | 2 +- 6 files changed, 104 insertions(+), 21 deletions(-) diff --git a/src-tauri/src/agent/protocols/anthropic.rs b/src-tauri/src/agent/protocols/anthropic.rs index 3b28e79a8..6e06b8699 100644 --- a/src-tauri/src/agent/protocols/anthropic.rs +++ b/src-tauri/src/agent/protocols/anthropic.rs @@ -375,12 +375,14 @@ impl Protocol for AnthropicProtocol { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result { info!( - "[AnthropicProtocol] 发送流式请求: model={}, history_len={}, tools_count={}", + "[AnthropicProtocol] 发送流式请求: model={}, history_len={}, tools_count={}, provider_id={:?}", model, messages.len(), - tools.map(|t| t.len()).unwrap_or(0) + tools.map(|t| t.len()).unwrap_or(0), + provider_id ); let (anthropic_messages, system) = @@ -400,11 +402,18 @@ impl Protocol for AnthropicProtocol { let url = format!("{}{}", base_url, self.endpoint()); - let response = client + let mut req_builder = client .post(&url) .header("Authorization", format!("Bearer {}", api_key)) .header("Content-Type", "application/json") - .header("anthropic-version", "2023-06-01") + .header("anthropic-version", "2023-06-01"); + + // 添加 X-Provider-Id header 用于精确路由 + if let Some(pid) = provider_id { + req_builder = req_builder.header("X-Provider-Id", pid); + } + + let response = req_builder .json(&request) .send() .await @@ -435,12 +444,14 @@ impl Protocol for AnthropicProtocol { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result { debug!( - "[AnthropicProtocol] 继续流式对话: model={}, history_len={}, tools_count={}", + "[AnthropicProtocol] 继续流式对话: model={}, history_len={}, tools_count={}, provider_id={:?}", model, messages.len(), - tools.map(|t| t.len()).unwrap_or(0) + tools.map(|t| t.len()).unwrap_or(0), + provider_id ); let (anthropic_messages, system) = Self::build_messages_from_history(messages, config); @@ -459,11 +470,18 @@ impl Protocol for AnthropicProtocol { let url = format!("{}{}", base_url, self.endpoint()); - let response = client + let mut req_builder = client .post(&url) .header("Authorization", format!("Bearer {}", api_key)) .header("Content-Type", "application/json") - .header("anthropic-version", "2023-06-01") + .header("anthropic-version", "2023-06-01"); + + // 添加 X-Provider-Id header 用于精确路由 + if let Some(pid) = provider_id { + req_builder = req_builder.header("X-Provider-Id", pid); + } + + let response = req_builder .json(&request) .send() .await diff --git a/src-tauri/src/agent/protocols/mod.rs b/src-tauri/src/agent/protocols/mod.rs index 1674985bf..198f3dfcb 100644 --- a/src-tauri/src/agent/protocols/mod.rs +++ b/src-tauri/src/agent/protocols/mod.rs @@ -36,6 +36,7 @@ pub trait Protocol: Send + Sync { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result; /// 继续流式对话（工具调用后） @@ -51,6 +52,7 @@ pub trait Protocol: Send + Sync { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result; /// 获取 API 端点 diff --git a/src-tauri/src/agent/protocols/openai.rs b/src-tauri/src/agent/protocols/openai.rs index 1d0499ef1..79dab6bd5 100644 --- a/src-tauri/src/agent/protocols/openai.rs +++ b/src-tauri/src/agent/protocols/openai.rs @@ -358,12 +358,14 @@ impl Protocol for OpenAIProtocol { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result { info!( - "[OpenAIProtocol] 发送流式请求: model={}, history_len={}, tools_count={}", + "[OpenAIProtocol] 发送流式请求: model={}, history_len={}, tools_count={}, provider_id={:?}", model, messages.len(), - tools.map(|t| t.len()).unwrap_or(0) + tools.map(|t| t.len()).unwrap_or(0), + provider_id ); let chat_messages = Self::build_messages(messages, user_message, images, config); @@ -387,14 +389,21 @@ impl Protocol for OpenAIProtocol { let url = format!("{}{}", base_url, self.endpoint()); eprintln!( - "[OpenAIProtocol] 发送请求到: {} model={} stream={}", - url, model, request.stream + "[OpenAIProtocol] 发送请求到: {} model={} stream={} provider_id={:?}", + url, model, request.stream, provider_id ); - let response = client + let mut req_builder = client .post(&url) .header("Authorization", format!("Bearer {}", api_key)) - .header("Content-Type", "application/json") + .header("Content-Type", "application/json"); + + // 添加 X-Provider-Id header 用于精确路由 + if let Some(pid) = provider_id { + req_builder = req_builder.header("X-Provider-Id", pid); + } + + let response = req_builder .json(&request) .send() .await @@ -429,12 +438,14 @@ impl Protocol for OpenAIProtocol { config: &AgentConfig, tools: Option<&[Tool]>, tx: mpsc::Sender, + provider_id: Option<&str>, ) -> Result { debug!( - "[OpenAIProtocol] 继续流式对话: model={}, history_len={}, tools_count={}", + "[OpenAIProtocol] 继续流式对话: model={}, history_len={}, tools_count={}, provider_id={:?}", model, messages.len(), - tools.map(|t| t.len()).unwrap_or(0) + tools.map(|t| t.len()).unwrap_or(0), + provider_id ); let chat_messages = Self::build_messages_from_history(messages, config); @@ -457,10 +468,17 @@ impl Protocol for OpenAIProtocol { let url = format!("{}{}", base_url, self.endpoint()); - let response = client + let mut req_builder = client .post(&url) .header("Authorization", format!("Bearer {}", api_key)) - .header("Content-Type", "application/json") + .header("Content-Type", "application/json"); + + // 添加 X-Provider-Id header 用于精确路由 + if let Some(pid) = provider_id { + req_builder = req_builder.header("X-Provider-Id", pid); + } + + let response = req_builder .json(&request) .send() .await diff --git a/src-tauri/src/services/api_key_provider_service.rs b/src-tauri/src/services/api_key_provider_service.rs index 4133beb48..e54b6dde9 100644 --- a/src-tauri/src/services/api_key_provider_service.rs +++ b/src-tauri/src/services/api_key_provider_service.rs @@ -492,6 +492,53 @@ impl ApiKeyProviderService { .map_err(|e| e.to_string()) } + /// 获取下一个可用的 API Key 以及 Provider 信息（按 provider_id 精确查找） + /// 用于支持 X-Provider-Id 请求头指定具体的 Provider + pub fn get_next_api_key_with_provider_info( + &self, + db: &DbConnection, + provider_id: &str, + ) -> Result, String> { + let conn = db.lock().map_err(|e| e.to_string())?; + + // 获取 Provider 信息 + let provider = match ApiKeyProviderDao::get_provider_by_id(&conn, provider_id) + .map_err(|e| e.to_string())? + { + Some(p) => p, + None => return Ok(None), + }; + + // 检查 Provider 是否启用 + if !provider.enabled { + return Ok(None); + } + + // 获取该 Provider 的所有启用的 API Keys + let keys = ApiKeyProviderDao::get_enabled_api_keys_by_provider(&conn, provider_id) + .map_err(|e| e.to_string())?; + + if keys.is_empty() { + return Ok(None); + } + + // 获取或创建轮询索引 + let index = { + let mut indices = self.round_robin_index.write().map_err(|e| e.to_string())?; + indices + .entry(provider_id.to_string()) + .or_insert_with(|| AtomicUsize::new(0)) + .fetch_add(1, Ordering::SeqCst) + }; + + // 选择 API Key + let selected_key = &keys[index % keys.len()]; + + // 解密并返回 + let decrypted = self.encryption.decrypt(&selected_key.api_key_encrypted)?; + Ok(Some((decrypted, provider))) + } + /// 按 Provider 类型获取下一个可用的 API Key（轮询负载均衡） /// 这个方法会查找所有该类型的 Provider（包括自定义 Provider） pub fn get_next_api_key_by_type( diff --git a/src/App.tsx b/src/App.tsx index 66c6b6768..56092c0d2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -19,7 +19,6 @@ import { ToolsPage } from "./components/tools/ToolsPage"; import { AgentChatPage } from "./components/agent"; import { PluginUIRenderer } from "./components/plugins/PluginUIRenderer"; import { PluginsPage } from "./components/plugins/PluginsPage"; -import { Toaster } from "./components/ui/sonner"; import { flowEventManager } from "./lib/flowEventManager"; import { OnboardingWizard, useOnboardingState } from "./components/onboarding"; import { ConnectConfirmDialog } from "./components/connect"; @@ -209,7 +208,6 @@ function App() { {renderPage()} - {/* ProxyCast Connect 确认弹窗 */} {/* _Requirements: 5.2_ */}