From 37dccd93e97662fadf59464a233cfa8b7dc6644e Mon Sep 17 00:00:00 2001 From: SuYao Date: Thu, 14 Aug 2025 20:06:57 +0800 Subject: [PATCH 1/6] fix: modelname (#9183) --- src/renderer/src/config/models.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts index dff5b37831..b5164dfe5b 100644 --- a/src/renderer/src/config/models.ts +++ b/src/renderer/src/config/models.ts @@ -2721,7 +2721,7 @@ export function isSupportedThinkingTokenDoubaoModel(model?: Model): boolean { const modelId = getLowerBaseModelName(model.id, '/') - return DOUBAO_THINKING_MODEL_REGEX.test(modelId) || DOUBAO_THINKING_MODEL_REGEX.test(modelId) + return DOUBAO_THINKING_MODEL_REGEX.test(modelId) || DOUBAO_THINKING_MODEL_REGEX.test(model.name) } export function isClaudeReasoningModel(model?: Model): boolean { From 31e59ab3954ae0b2582c448c6209ba549bd60841 Mon Sep 17 00:00:00 2001 From: fullex <106392080+0xfullex@users.noreply.github.com> Date: Thu, 14 Aug 2025 20:08:46 +0800 Subject: [PATCH 2/6] fix: update selection-hook to v1.0.9 (#9180) chore: update selection-hook to v1.0.9 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2198986545..a824984845 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "node-stream-zip": "^1.15.0", "officeparser": "^4.2.0", "os-proxy-config": "^1.1.2", - "selection-hook": "^1.0.8", + "selection-hook": "^1.0.9", "turndown": "7.2.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index c970bca393..276a523034 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8629,7 +8629,7 @@ __metadata: remove-markdown: "npm:^0.6.2" rollup-plugin-visualizer: "npm:^5.12.0" sass: "npm:^1.88.0" - selection-hook: "npm:^1.0.8" + selection-hook: "npm:^1.0.9" shiki: "npm:^3.9.1" strict-url-sanitise: "npm:^0.0.1" string-width: "npm:^7.2.0" @@ -20066,14 +20066,14 @@ __metadata: languageName: node linkType: hard -"selection-hook@npm:^1.0.8": - version: 1.0.8 - resolution: "selection-hook@npm:1.0.8" +"selection-hook@npm:^1.0.9": + version: 1.0.9 + resolution: "selection-hook@npm:1.0.9" dependencies: node-addon-api: "npm:^8.4.0" node-gyp: "npm:latest" node-gyp-build: "npm:^4.8.4" - checksum: 10c0/ed7e230ddf10fcd1974b166c5e73170900260664e40454e4e1fcdf0ba21d2a08cf95824c085fa07069aa99b663e0ee3f2aed74c3fbdba0f4e99abe6956bd51dc + checksum: 10c0/5f3114b528d9e1545a5dc4b99927a0ab441570063bb348b52784d757c8f250f0d6a875175d371adf5dc2bfc82bf6bb86f99d3ee66fefe0749040c0b50f3217c3 languageName: node linkType: hard From bef0180e4c034cac9cd8a7d6210d0b2b24ac9016 Mon Sep 17 00:00:00 2001 From: Phantom <59059173+EurFelux@users.noreply.github.com> Date: Thu, 14 Aug 2025 23:19:17 +0800 Subject: [PATCH 3/6] feat: web search icons (#9147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(类型): 添加WebSearchProviderIds常量并更新WebSearchProvider类型 * refactor(web-search): 重构网络搜索提供商配置和logo获取逻辑 将webSearchProviders.ts中的提供商logo获取函数移动到使用组件中 并优化提供商配置的类型定义 * feat(WebSearchButton): 添加不同搜索引擎的图标支持 为WebSearchButton组件添加多个搜索引擎的图标支持，包括Baidu、Google、Bing等 * feat(types): 添加预处理和网页搜索提供者的类型校验函数 添加 PreprocessProviderId 和 WebSearchProviderId 的类型校验函数 isPreprocessProviderId 和 isWebSearchProviderId，用于验证字符串是否为有效的提供者 ID * refactor(types): 重命名ApiProviderUnion并添加更新函数类型 添加用于更新不同类型API提供者的函数类型，提高类型安全性 * refactor(websearch): 将搜索提供商配置提取到单独文件 将websearch store中的搜索提供商配置提取到单独的配置文件，提高代码可维护性 * refactor(PreprocessSettings): 移除未使用的 system 选项禁用逻辑 由于 system 字段实际未使用，移除相关代码以简化逻辑 * refactor(api-key-popup): 移除providerKind参数，改用providerId判断类型 * refactor(preprocessProviders): 使用类型定义优化预处理提供者配置 将 providerId 参数类型从 string 改为 PreprocessProviderId 为 PREPROCESS_PROVIDER_CONFIG 添加类型定义 * refactor(hooks): 使用PreprocessProviderId类型替换字符串类型参数 * refactor(hooks): 使用 WebSearchProviderId 类型替换字符串类型参数 将 useWebSearchProvider 钩子的 id 参数类型从 string 改为 WebSearchProviderId，提高类型安全性 * refactor(knowledge): 将providerId类型改为PreprocessProviderId * refactor(PreprocessSettings): 移除未使用的options相关代码 清理PreprocessSettings组件中已被注释掉的options状态和相关逻辑，简化代码结构 * refactor(WebSearchProviderSetting): 将providerId类型从string改为WebSearchProviderId * refactor(websearch): 移除WebSearchProvider类型中不必要的id字段约束 * style(WebSearchButton): 调整图标大小和样式以保持视觉一致性 * fix(ApiKeyListPopup): 修正LLM提供者判断逻辑 使用'models'属性检查替代原有逻辑，更准确地判断是否为LLM provider * fix(ApiKeyListPopup): 修复预处理provider判断逻辑 处理mistral同时提供预处理和llm服务的情况，避免误判 --- src/renderer/src/components/Icons/SVGIcon.tsx | 126 ++++++++++++++++++ .../components/Popups/ApiKeyListPopup/hook.ts | 48 ++++--- .../Popups/ApiKeyListPopup/list.tsx | 64 +++------ .../Popups/ApiKeyListPopup/popup.tsx | 26 ++-- .../Popups/ApiKeyListPopup/types.ts | 10 +- .../src/config/preprocessProviders.ts | 7 +- src/renderer/src/config/webSearchProviders.ts | 66 ++++++--- src/renderer/src/hooks/usePreprocess.ts | 4 +- .../src/hooks/useWebSearchProviders.ts | 8 +- .../pages/home/Inputbar/WebSearchButton.tsx | 41 ++++-- .../pages/knowledge/components/QuotaTag.tsx | 4 +- .../PreprocessSettings/PreprocessSettings.tsx | 32 ++--- .../settings/PreprocessSettings/index.tsx | 6 +- .../ProviderSettings/ProviderSetting.tsx | 1 - .../WebSearchProviderSetting.tsx | 25 +++- src/renderer/src/store/websearch.ts | 46 +------ src/renderer/src/types/index.ts | 32 ++++- 17 files changed, 359 insertions(+), 187 deletions(-) diff --git a/src/renderer/src/components/Icons/SVGIcon.tsx b/src/renderer/src/components/Icons/SVGIcon.tsx index b9a3eff899..88598bb02e 100644 --- a/src/renderer/src/components/Icons/SVGIcon.tsx +++ b/src/renderer/src/components/Icons/SVGIcon.tsx @@ -112,3 +112,129 @@ export function MdiLightbulbOn(props: SVGProps) { ) } + +export function BingLogo(props: SVGProps) { + return ( + + + + ) +} + +export function SearXNGLogo(props: SVGProps) { + return ( + + + + + + + + ) +} + +export function TavilyLogo(props: SVGProps) { + return ( + + + + + + + + + ) +} + +export function ExaLogo(props: SVGProps) { + return ( + + Exa + + + ) +} + +export function BochaLogo(props: SVGProps) { + return ( + + + + + + + ) +} diff --git a/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts b/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts index 541dd2f156..c4c9459ed0 100644 --- a/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts +++ b/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts @@ -3,7 +3,14 @@ import { isEmbeddingModel, isRerankModel } from '@renderer/config/models' import SelectProviderModelPopup from '@renderer/pages/settings/ProviderSettings/SelectProviderModelPopup' import { checkApi } from '@renderer/services/ApiService' import WebSearchService from '@renderer/services/WebSearchService' -import { Model, PreprocessProvider, Provider, WebSearchProvider } from '@renderer/types' +import { + isPreprocessProviderId, + isWebSearchProviderId, + Model, + PreprocessProvider, + Provider, + WebSearchProvider +} from '@renderer/types' import { ApiKeyConnectivity, ApiKeyWithStatus, HealthStatus } from '@renderer/types/healthCheck' import { formatApiKeys, splitApiKeyString } from '@renderer/utils/api' import { formatErrorMessage } from '@renderer/utils/error' @@ -12,12 +19,11 @@ import { isEmpty } from 'lodash' import { useCallback, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' -import { ApiKeyValidity, ApiProviderKind, ApiProviderUnion } from './types' +import { ApiKeyValidity, ApiProvider, UpdateApiProviderFunc } from './types' interface UseApiKeysProps { - provider: ApiProviderUnion - updateProvider: (provider: Partial) => void - providerKind: ApiProviderKind + provider: ApiProvider + updateProvider: UpdateApiProviderFunc } const logger = loggerService.withContext('ApiKeyListPopup') @@ -25,7 +31,7 @@ const logger = loggerService.withContext('ApiKeyListPopup') /** * API Keys 管理 hook */ -export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKeysProps) { +export function useApiKeys({ provider, updateProvider }: UseApiKeysProps) { const { t } = useTranslation() // 连通性检查的 UI 状态管理 @@ -199,11 +205,13 @@ export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKey try { const startTime = Date.now() - if (isLlmProvider(provider, providerKind) && model) { + if (isLlmProvider(provider) && model) { await checkApi({ ...provider, apiKey: keyToCheck }, model) - } else { + } else if (isWebSearchProvider(provider)) { const result = await WebSearchService.checkSearch({ ...provider, apiKey: keyToCheck }) if (!result.valid) throw new Error(result.error) + } else { + // 不处理预处理供应商 } const latency = Date.now() - startTime @@ -228,7 +236,7 @@ export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKey logger.error('failed to validate the connectivity of the api key', error) } }, - [keys, connectivityStates, updateConnectivityState, provider, providerKind] + [keys, connectivityStates, updateConnectivityState, provider] ) // 检查单个 key 的连通性 @@ -240,23 +248,23 @@ export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKey const currentState = connectivityStates.get(keyToCheck) if (currentState?.checking) return - const model = isLlmProvider(provider, providerKind) ? await getModelForCheck(provider, t) : undefined + const model = isLlmProvider(provider) ? await getModelForCheck(provider, t) : undefined if (model === null) return await runConnectivityCheck(index, model) }, - [provider, keys, connectivityStates, providerKind, t, runConnectivityCheck] + [provider, keys, connectivityStates, t, runConnectivityCheck] ) // 检查所有 keys 的连通性 const checkAllKeysConnectivity = useCallback(async () => { if (!provider || keys.length === 0) return - const model = isLlmProvider(provider, providerKind) ? await getModelForCheck(provider, t) : undefined + const model = isLlmProvider(provider) ? await getModelForCheck(provider, t) : undefined if (model === null) return await Promise.allSettled(keys.map((_, index) => runConnectivityCheck(index, model))) - }, [provider, keys, providerKind, t, runConnectivityCheck]) + }, [provider, keys, t, runConnectivityCheck]) // 计算是否有 key 正在检查 const isChecking = useMemo(() => { @@ -275,16 +283,18 @@ export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKey } } -export function isLlmProvider(obj: any, kind: ApiProviderKind): obj is Provider { - return kind === 'llm' && 'type' in obj && 'models' in obj +export function isLlmProvider(provider: ApiProvider): provider is Provider { + return 'models' in provider } -export function isWebSearchProvider(obj: any, kind: ApiProviderKind): obj is WebSearchProvider { - return kind === 'websearch' && ('url' in obj || 'engines' in obj) +export function isWebSearchProvider(provider: ApiProvider): provider is WebSearchProvider { + return isWebSearchProviderId(provider.id) } -export function isPreprocessProvider(obj: any, kind: ApiProviderKind): obj is PreprocessProvider { - return kind === 'doc-preprocess' && ('quota' in obj || 'options' in obj) +export function isPreprocessProvider(provider: ApiProvider): provider is PreprocessProvider { + // NOTE: mistral 同时提供预处理和llm服务，所以其llm provier可能被误判为预处理provider + // 后面需要使用更严格的判断方式 + return isPreprocessProviderId(provider.id) && !isLlmProvider(provider) } // 获取模型用于检查 diff --git a/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx b/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx index 03e9796886..86076b4ca8 100644 --- a/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx +++ b/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx @@ -6,6 +6,7 @@ import { useProvider } from '@renderer/hooks/useProvider' import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders' import { SettingHelpText } from '@renderer/pages/settings' import { isProviderSupportAuth } from '@renderer/services/ProviderService' +import { PreprocessProviderId, WebSearchProviderId } from '@renderer/types' import { ApiKeyWithStatus, HealthStatus } from '@renderer/types/healthCheck' import { Button, Card, Flex, List, Popconfirm, Space, Tooltip, Typography } from 'antd' import { Plus } from 'lucide-react' @@ -15,19 +16,18 @@ import styled from 'styled-components' import { isLlmProvider, useApiKeys } from './hook' import ApiKeyItem from './item' -import { ApiProviderKind, ApiProviderUnion } from './types' +import { ApiProvider, UpdateApiProviderFunc } from './types' interface ApiKeyListProps { - provider: ApiProviderUnion - updateProvider: (provider: Partial) => void - providerKind: ApiProviderKind + provider: ApiProvider + updateProvider: UpdateApiProviderFunc showHealthCheck?: boolean } /** * Api key 列表，管理 CRUD 操作、连接检查 */ -export const ApiKeyList: FC = ({ provider, updateProvider, providerKind, showHealthCheck = true }) => { +export const ApiKeyList: FC = ({ provider, updateProvider, showHealthCheck = true }) => { const { t } = useTranslation() // 临时新项状态 @@ -42,7 +42,7 @@ export const ApiKeyList: FC = ({ provider, updateProvider, prov checkKeyConnectivity, checkAllKeysConnectivity, isChecking - } = useApiKeys({ provider, updateProvider, providerKind: providerKind }) + } = useApiKeys({ provider, updateProvider }) // 创建一个临时新项 const handleAddNew = () => { @@ -73,7 +73,7 @@ export const ApiKeyList: FC = ({ provider, updateProvider, prov const shouldAutoFocus = () => { if (provider.apiKey) return false - return isLlmProvider(provider, providerKind) && provider.enabled && !isProviderSupportAuth(provider) + return isLlmProvider(provider) && provider.enabled && !isProviderSupportAuth(provider) } // 合并真实 keys 和临时新项 @@ -179,55 +179,33 @@ export const ApiKeyList: FC = ({ provider, updateProvider, prov interface SpecificApiKeyListProps { providerId: string - providerKind: ApiProviderKind showHealthCheck?: boolean } -export const LlmApiKeyList: FC = ({ providerId, providerKind, showHealthCheck = true }) => { +type WebSearchApiKeyList = SpecificApiKeyListProps & { + providerId: WebSearchProviderId +} + +type DocPreprocessApiKeyListProps = SpecificApiKeyListProps & { + providerId: PreprocessProviderId +} + +export const LlmApiKeyList: FC = ({ providerId, showHealthCheck = true }) => { const { provider, updateProvider } = useProvider(providerId) - return ( - - ) + return } -export const WebSearchApiKeyList: FC = ({ - providerId, - providerKind, - showHealthCheck = true -}) => { +export const WebSearchApiKeyList: FC = ({ providerId, showHealthCheck = true }) => { const { provider, updateProvider } = useWebSearchProvider(providerId) - return ( - - ) + return } -export const DocPreprocessApiKeyList: FC = ({ - providerId, - providerKind, - showHealthCheck = true -}) => { +export const DocPreprocessApiKeyList: FC = ({ providerId, showHealthCheck = true }) => { const { provider, updateProvider } = usePreprocessProvider(providerId) - return ( - - ) + return } const ListContainer = styled.div` diff --git a/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx b/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx index 096e00ca58..b4ca91186b 100644 --- a/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx +++ b/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx @@ -1,14 +1,13 @@ import { TopView } from '@renderer/components/TopView' +import { isPreprocessProviderId, isWebSearchProviderId } from '@renderer/types' import { Modal } from 'antd' import { useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' import { DocPreprocessApiKeyList, LlmApiKeyList, WebSearchApiKeyList } from './list' -import { ApiProviderKind } from './types' interface ShowParams { providerId: string - providerKind: ApiProviderKind title?: string showHealthCheck?: boolean } @@ -20,7 +19,7 @@ interface Props extends ShowParams { /** * API Key 列表弹窗容器组件 */ -const PopupContainer: React.FC = ({ providerId, providerKind, title, resolve, showHealthCheck = true }) => { +const PopupContainer: React.FC = ({ providerId, title, resolve, showHealthCheck = true }) => { const [open, setOpen] = useState(true) const { t } = useTranslation() @@ -33,17 +32,14 @@ const PopupContainer: React.FC = ({ providerId, providerKind, title, reso } const ListComponent = useMemo(() => { - switch (providerKind) { - case 'llm': - return LlmApiKeyList - case 'websearch': - return WebSearchApiKeyList - case 'doc-preprocess': - return DocPreprocessApiKeyList - default: - return null + if (isWebSearchProviderId(providerId)) { + return } - }, [providerKind]) + if (isPreprocessProviderId(providerId)) { + return + } + return + }, [providerId, showHealthCheck]) return ( = ({ providerId, providerKind, title, reso centered width={600} footer={null}> - {ListComponent && ( - - )} + {ListComponent} ) } diff --git a/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts b/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts index 4663e70715..bc230c577d 100644 --- a/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts +++ b/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts @@ -8,6 +8,12 @@ export type ApiKeyValidity = { error?: string } -export type ApiProviderUnion = Provider | WebSearchProvider | PreprocessProvider +export type ApiProvider = Provider | WebSearchProvider | PreprocessProvider -export type ApiProviderKind = 'llm' | 'websearch' | 'doc-preprocess' +export type UpdateProviderFunc = (p: Partial) => void + +export type UpdateWebSearchProviderFunc = (p: Partial) => void + +export type UpdatePreprocessProviderFunc = (p: Partial) => void + +export type UpdateApiProviderFunc = UpdateProviderFunc | UpdateWebSearchProviderFunc | UpdatePreprocessProviderFunc diff --git a/src/renderer/src/config/preprocessProviders.ts b/src/renderer/src/config/preprocessProviders.ts index 587e6ea7f9..88215b328d 100644 --- a/src/renderer/src/config/preprocessProviders.ts +++ b/src/renderer/src/config/preprocessProviders.ts @@ -1,8 +1,9 @@ import Doc2xLogo from '@renderer/assets/images/ocr/doc2x.png' import MinerULogo from '@renderer/assets/images/ocr/mineru.jpg' import MistralLogo from '@renderer/assets/images/providers/mistral.png' +import { PreprocessProviderId } from '@renderer/types' -export function getPreprocessProviderLogo(providerId: string) { +export function getPreprocessProviderLogo(providerId: PreprocessProviderId) { switch (providerId) { case 'doc2x': return Doc2xLogo @@ -15,7 +16,9 @@ export function getPreprocessProviderLogo(providerId: string) { } } -export const PREPROCESS_PROVIDER_CONFIG = { +type PreprocessProviderConfig = { websites: { official: string; apiKey: string } } + +export const PREPROCESS_PROVIDER_CONFIG: Record = { doc2x: { websites: { official: 'https://doc2x.noedgeai.com', diff --git a/src/renderer/src/config/webSearchProviders.ts b/src/renderer/src/config/webSearchProviders.ts index d33e9cba35..62c0536f4d 100644 --- a/src/renderer/src/config/webSearchProviders.ts +++ b/src/renderer/src/config/webSearchProviders.ts @@ -1,24 +1,13 @@ -import BochaLogo from '@renderer/assets/images/search/bocha.webp' -import ExaLogo from '@renderer/assets/images/search/exa.png' -import SearxngLogo from '@renderer/assets/images/search/searxng.svg' -import TavilyLogo from '@renderer/assets/images/search/tavily.png' +import { WebSearchProvider, WebSearchProviderId } from '@renderer/types' -export function getWebSearchProviderLogo(providerId: string) { - switch (providerId) { - case 'tavily': - return TavilyLogo - case 'searxng': - return SearxngLogo - case 'exa': - return ExaLogo - case 'bocha': - return BochaLogo - default: - return undefined +type WebSearchProviderConfig = { + websites: { + official: string + apiKey?: string } } -export const WEB_SEARCH_PROVIDER_CONFIG = { +export const WEB_SEARCH_PROVIDER_CONFIG: Record = { tavily: { websites: { official: 'https://tavily.com', @@ -58,3 +47,46 @@ export const WEB_SEARCH_PROVIDER_CONFIG = { } } } + +export const WEB_SEARCH_PROVIDERS: WebSearchProvider[] = [ + { + id: 'tavily', + name: 'Tavily', + apiHost: 'https://api.tavily.com', + apiKey: '' + }, + { + id: 'searxng', + name: 'Searxng', + apiHost: '', + basicAuthUsername: '', + basicAuthPassword: '' + }, + { + id: 'exa', + name: 'Exa', + apiHost: 'https://api.exa.ai', + apiKey: '' + }, + { + id: 'bocha', + name: 'Bocha', + apiHost: 'https://api.bochaai.com', + apiKey: '' + }, + { + id: 'local-google', + name: 'Google', + url: 'https://www.google.com/search?q=%s' + }, + { + id: 'local-bing', + name: 'Bing', + url: 'https://cn.bing.com/search?q=%s&ensearch=1' + }, + { + id: 'local-baidu', + name: 'Baidu', + url: 'https://www.baidu.com/s?wd=%s' + } +] as const diff --git a/src/renderer/src/hooks/usePreprocess.ts b/src/renderer/src/hooks/usePreprocess.ts index 41463227ad..5172e2c68a 100644 --- a/src/renderer/src/hooks/usePreprocess.ts +++ b/src/renderer/src/hooks/usePreprocess.ts @@ -4,10 +4,10 @@ import { updatePreprocessProvider as _updatePreprocessProvider, updatePreprocessProviders as _updatePreprocessProviders } from '@renderer/store/preprocess' -import { PreprocessProvider } from '@renderer/types' +import { PreprocessProvider, PreprocessProviderId } from '@renderer/types' import { useDispatch, useSelector } from 'react-redux' -export const usePreprocessProvider = (id: string) => { +export const usePreprocessProvider = (id: PreprocessProviderId) => { const dispatch = useDispatch() const preprocessProviders = useSelector((state: RootState) => state.preprocess.providers) const provider = preprocessProviders.find((provider) => provider.id === id) diff --git a/src/renderer/src/hooks/useWebSearchProviders.ts b/src/renderer/src/hooks/useWebSearchProviders.ts index 32f9238abf..34ee07403e 100644 --- a/src/renderer/src/hooks/useWebSearchProviders.ts +++ b/src/renderer/src/hooks/useWebSearchProviders.ts @@ -11,7 +11,7 @@ import { updateWebSearchProvider, updateWebSearchProviders } from '@renderer/store/websearch' -import { WebSearchProvider } from '@renderer/types' +import { WebSearchProvider, WebSearchProviderId } from '@renderer/types' export const useDefaultWebSearchProvider = () => { const defaultProvider = useAppSelector((state) => state.websearch.defaultProvider) @@ -49,7 +49,7 @@ export const useWebSearchProviders = () => { } } -export const useWebSearchProvider = (id: string) => { +export const useWebSearchProvider = (id: WebSearchProviderId) => { const providers = useAppSelector((state) => state.websearch.providers) const provider = providers.find((provider) => provider.id === id) const dispatch = useAppDispatch() @@ -60,7 +60,9 @@ export const useWebSearchProvider = (id: string) => { return { provider, - updateProvider: (updates: Partial) => dispatch(updateWebSearchProvider({ id, ...updates })) + updateProvider: (updates: Partial) => { + dispatch(updateWebSearchProvider({ id, ...updates })) + } } } diff --git a/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx b/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx index 7a6a6e6334..70b25084d5 100644 --- a/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx +++ b/src/renderer/src/pages/home/Inputbar/WebSearchButton.tsx @@ -1,9 +1,11 @@ +import { BaiduOutlined, GoogleOutlined } from '@ant-design/icons' +import { BingLogo, BochaLogo, ExaLogo, SearXNGLogo, TavilyLogo } from '@renderer/components/Icons' import { QuickPanelListItem, useQuickPanel } from '@renderer/components/QuickPanel' import { isWebSearchModel } from '@renderer/config/models' import { useAssistant } from '@renderer/hooks/useAssistant' import { useWebSearchProviders } from '@renderer/hooks/useWebSearchProviders' import WebSearchService from '@renderer/services/WebSearchService' -import { Assistant, WebSearchProvider } from '@renderer/types' +import { Assistant, WebSearchProvider, WebSearchProviderId } from '@renderer/types' import { hasObjectKey } from '@renderer/utils' import { Tooltip } from 'antd' import { Globe } from 'lucide-react' @@ -28,6 +30,33 @@ const WebSearchButton: FC = ({ ref, assistant, ToolbarButton }) => { const enableWebSearch = assistant?.webSearchProviderId || assistant.enableWebSearch + const WebSearchIcon = useCallback( + ({ pid, size = 18 }: { pid?: WebSearchProviderId; size?: number }) => { + const iconColor = enableWebSearch ? 'var(--color-primary)' : 'var(--color-icon)' + + switch (pid) { + case 'bocha': + return + case 'exa': + // size微调，视觉上和其他图标平衡一些 + return + case 'tavily': + return + case 'searxng': + return + case 'local-baidu': + return + case 'local-bing': + return + case 'local-google': + return + default: + return + } + }, + [enableWebSearch] + ) + const updateSelectedWebSearchProvider = useCallback( async (providerId?: WebSearchProvider['id']) => { // TODO: updateAssistant有性能问题，会导致关闭快捷面板卡顿 @@ -58,7 +87,7 @@ const WebSearchButton: FC = ({ ref, assistant, ToolbarButton }) => { ? t('settings.tool.websearch.apikey') : t('settings.tool.websearch.free') : t('chat.input.web_search.enable_content'), - icon: , + icon: , isSelected: p.id === assistant?.webSearchProviderId, disabled: !WebSearchService.isWebSearchEnabled(p.id), action: () => updateSelectedWebSearchProvider(p.id) @@ -80,6 +109,7 @@ const WebSearchButton: FC = ({ ref, assistant, ToolbarButton }) => { return items }, [ + WebSearchIcon, assistant.enableWebSearch, assistant.model, assistant?.webSearchProviderId, @@ -135,12 +165,7 @@ const WebSearchButton: FC = ({ ref, assistant, ToolbarButton }) => { mouseLeaveDelay={0} arrow> - + ) diff --git a/src/renderer/src/pages/knowledge/components/QuotaTag.tsx b/src/renderer/src/pages/knowledge/components/QuotaTag.tsx index 8eb8868e98..b6f29ce5d1 100644 --- a/src/renderer/src/pages/knowledge/components/QuotaTag.tsx +++ b/src/renderer/src/pages/knowledge/components/QuotaTag.tsx @@ -2,14 +2,14 @@ import { loggerService } from '@logger' import { usePreprocessProvider } from '@renderer/hooks/usePreprocess' import { getStoreSetting } from '@renderer/hooks/useSettings' import { getKnowledgeBaseParams } from '@renderer/services/KnowledgeService' -import { KnowledgeBase } from '@renderer/types' +import { KnowledgeBase, PreprocessProviderId } from '@renderer/types' import { Tag } from 'antd' import { FC, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' const logger = loggerService.withContext('QuotaTag') -const QuotaTag: FC<{ base: KnowledgeBase; providerId: string; quota?: number }> = ({ +const QuotaTag: FC<{ base: KnowledgeBase; providerId: PreprocessProviderId; quota?: number }> = ({ base, providerId, quota: _quota diff --git a/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx b/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx index c1592ac73f..d19eec4d6d 100644 --- a/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx +++ b/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx @@ -4,23 +4,14 @@ import { getPreprocessProviderLogo, PREPROCESS_PROVIDER_CONFIG } from '@renderer import { usePreprocessProvider } from '@renderer/hooks/usePreprocess' import { PreprocessProvider } from '@renderer/types' import { formatApiKeys, hasObjectKey } from '@renderer/utils' -import { Avatar, Button, Divider, Flex, Input, InputNumber, Segmented, Tooltip } from 'antd' +import { Avatar, Button, Divider, Flex, Input, Tooltip } from 'antd' import Link from 'antd/es/typography/Link' import { List } from 'lucide-react' import { FC, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { - SettingDivider, - SettingHelpLink, - SettingHelpText, - SettingHelpTextRow, - SettingRow, - SettingRowTitle, - SettingSubtitle, - SettingTitle -} from '..' +import { SettingHelpLink, SettingHelpText, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..' interface Props { provider: PreprocessProvider @@ -31,7 +22,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { const { t } = useTranslation() const [apiKey, setApiKey] = useState(preprocessProvider.apiKey || '') const [apiHost, setApiHost] = useState(preprocessProvider.apiHost || '') - const [options, setOptions] = useState(preprocessProvider.options || {}) + // const [options, setOptions] = useState(preprocessProvider.options || {}) const preprocessProviderConfig = PREPROCESS_PROVIDER_CONFIG[preprocessProvider.id] const apiKeyWebsite = preprocessProviderConfig?.websites?.apiKey @@ -40,7 +31,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { useEffect(() => { setApiKey(preprocessProvider.apiKey ?? '') setApiHost(preprocessProvider.apiHost ?? '') - setOptions(preprocessProvider.options ?? {}) + // setOptions(preprocessProvider.options ?? {}) }, [preprocessProvider.apiKey, preprocessProvider.apiHost, preprocessProvider.options]) const onUpdateApiKey = () => { @@ -52,7 +43,6 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { const openApiKeyList = async () => { await ApiKeyListPopup.show({ providerId: preprocessProvider.id, - providerKind: 'doc-preprocess', title: `${preprocessProvider.name} ${t('settings.provider.api.key.list.title')}`, showHealthCheck: false // FIXME: 目前还没有检查功能 }) @@ -70,11 +60,11 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { } } - const onUpdateOptions = (key: string, value: any) => { - const newOptions = { ...options, [key]: value } - setOptions(newOptions) - updateProvider({ options: newOptions }) - } + // const onUpdateOptions = (key: string, value: any) => { + // const newOptions = { ...options, [key]: value } + // setOptions(newOptions) + // updateProvider({ options: newOptions }) + // } return ( <> @@ -145,7 +135,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { )} {/* 这部分看起来暂时用不上了 */} - {hasObjectKey(preprocessProvider, 'options') && preprocessProvider.id === 'system' && ( + {/* {hasObjectKey(preprocessProvider, 'options') && preprocessProvider.id === 'system' && ( <> @@ -177,7 +167,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => { /> - )} + )} */} ) } diff --git a/src/renderer/src/pages/settings/PreprocessSettings/index.tsx b/src/renderer/src/pages/settings/PreprocessSettings/index.tsx index daa76c042c..f80c0cd679 100644 --- a/src/renderer/src/pages/settings/PreprocessSettings/index.tsx +++ b/src/renderer/src/pages/settings/PreprocessSettings/index.tsx @@ -1,4 +1,3 @@ -import { isMac } from '@renderer/config/constant' import { useTheme } from '@renderer/context/ThemeProvider' import { useDefaultPreprocessProvider, usePreprocessProviders } from '@renderer/hooks/usePreprocess' import { PreprocessProvider } from '@renderer/types' @@ -40,8 +39,9 @@ const PreprocessSettings: FC = () => { placeholder={t('settings.tool.preprocess.provider_placeholder')} options={preprocessProviders.map((p) => ({ value: p.id, - label: p.name, - disabled: !isMac && p.id === 'system' // 在非 Mac 系统下禁用 system 选项 + label: p.name + // 由于system字段实际未使用，先注释掉 + // disabled: !isMac && p.id === 'system' // 在非 Mac 系统下禁用 system 选项 }))} /> diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx index b82acaa511..191cce4778 100644 --- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx +++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx @@ -128,7 +128,6 @@ const ProviderSetting: FC = ({ providerId }) => { const openApiKeyList = async () => { await ApiKeyListPopup.show({ providerId: provider.id, - providerKind: 'llm', title: `${fancyProviderName} ${t('settings.provider.api.key.list.title')}` }) } diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx index 68bb689bd6..5c6faa7b78 100644 --- a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx +++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx @@ -1,9 +1,14 @@ import { CheckOutlined, ExportOutlined, LoadingOutlined } from '@ant-design/icons' import { loggerService } from '@logger' +import BochaLogo from '@renderer/assets/images/search/bocha.webp' +import ExaLogo from '@renderer/assets/images/search/exa.png' +import SearxngLogo from '@renderer/assets/images/search/searxng.svg' +import TavilyLogo from '@renderer/assets/images/search/tavily.png' import ApiKeyListPopup from '@renderer/components/Popups/ApiKeyListPopup/popup' -import { getWebSearchProviderLogo, WEB_SEARCH_PROVIDER_CONFIG } from '@renderer/config/webSearchProviders' +import { WEB_SEARCH_PROVIDER_CONFIG } from '@renderer/config/webSearchProviders' import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders' import WebSearchService from '@renderer/services/WebSearchService' +import { WebSearchProviderId } from '@renderer/types' import { formatApiKeys, hasObjectKey } from '@renderer/utils' import { Button, Divider, Flex, Form, Input, Space, Tooltip } from 'antd' import Link from 'antd/es/typography/Link' @@ -16,7 +21,7 @@ import { SettingDivider, SettingHelpLink, SettingHelpText, SettingHelpTextRow, S const logger = loggerService.withContext('WebSearchProviderSetting') interface Props { - providerId: string + providerId: WebSearchProviderId } const WebSearchProviderSetting: FC = ({ providerId }) => { @@ -74,7 +79,6 @@ const WebSearchProviderSetting: FC = ({ providerId }) => { const openApiKeyList = async () => { await ApiKeyListPopup.show({ providerId: provider.id, - providerKind: 'websearch', title: `${provider.name} ${t('settings.provider.api.key.list.title')}` }) } @@ -132,6 +136,21 @@ const WebSearchProviderSetting: FC = ({ providerId }) => { setBasicAuthPassword(provider.basicAuthPassword ?? '') }, [provider.apiKey, provider.apiHost, provider.basicAuthUsername, provider.basicAuthPassword]) + const getWebSearchProviderLogo = (providerId: WebSearchProviderId) => { + switch (providerId) { + case 'tavily': + return TavilyLogo + case 'searxng': + return SearxngLogo + case 'exa': + return ExaLogo + case 'bocha': + return BochaLogo + default: + return undefined + } + } + return ( <> diff --git a/src/renderer/src/store/websearch.ts b/src/renderer/src/store/websearch.ts index d7f0799814..1e3fe2a25b 100644 --- a/src/renderer/src/store/websearch.ts +++ b/src/renderer/src/store/websearch.ts @@ -1,4 +1,5 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit' +import { WEB_SEARCH_PROVIDERS } from '@renderer/config/webSearchProviders' import type { Model, WebSearchProvider } from '@renderer/types' export interface SubscribeSource { key: number @@ -42,48 +43,7 @@ export interface WebSearchState { export const initialState: WebSearchState = { defaultProvider: 'local-bing', - providers: [ - { - id: 'tavily', - name: 'Tavily', - apiHost: 'https://api.tavily.com', - apiKey: '' - }, - { - id: 'searxng', - name: 'Searxng', - apiHost: '', - basicAuthUsername: '', - basicAuthPassword: '' - }, - { - id: 'exa', - name: 'Exa', - apiHost: 'https://api.exa.ai', - apiKey: '' - }, - { - id: 'bocha', - name: 'Bocha', - apiHost: 'https://api.bochaai.com', - apiKey: '' - }, - { - id: 'local-google', - name: 'Google', - url: 'https://www.google.com/search?q=%s' - }, - { - id: 'local-bing', - name: 'Bing', - url: 'https://cn.bing.com/search?q=%s&ensearch=1' - }, - { - id: 'local-baidu', - name: 'Baidu', - url: 'https://www.baidu.com/s?wd=%s' - } - ], + providers: WEB_SEARCH_PROVIDERS, searchWithTime: true, maxResults: 5, excludeDomains: [], @@ -111,7 +71,7 @@ const websearchSlice = createSlice({ updateWebSearchProviders: (state, action: PayloadAction) => { state.providers = action.payload }, - updateWebSearchProvider: (state, action: PayloadAction & { id: string }>) => { + updateWebSearchProvider: (state, action: PayloadAction>) => { const index = state.providers.findIndex((provider) => provider.id === action.payload.id) if (index !== -1) { Object.assign(state.providers[index], action.payload) diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts index 87e5843449..ca4a1fe4fd 100644 --- a/src/renderer/src/types/index.ts +++ b/src/renderer/src/types/index.ts @@ -609,8 +609,20 @@ export type KnowledgeBaseParams = { } } +export const PreprocessProviderIds = { + doc2x: 'doc2x', + mistral: 'mistral', + mineru: 'mineru' +} as const + +export type PreprocessProviderId = keyof typeof PreprocessProviderIds + +export const isPreprocessProviderId = (id: string): id is PreprocessProviderId => { + return Object.hasOwn(PreprocessProviderIds, id) +} + export interface PreprocessProvider { - id: string + id: PreprocessProviderId name: string apiKey?: string apiHost?: string @@ -675,8 +687,24 @@ export type ExternalToolResult = { memories?: MemoryItem[] } +export const WebSearchProviderIds = { + tavily: 'tavily', + searxng: 'searxng', + exa: 'exa', + bocha: 'bocha', + 'local-google': 'local-google', + 'local-bing': 'local-bing', + 'local-baidu': 'local-baidu' +} as const + +export type WebSearchProviderId = keyof typeof WebSearchProviderIds + +export const isWebSearchProviderId = (id: string): id is WebSearchProviderId => { + return Object.hasOwn(WebSearchProviderIds, id) +} + export type WebSearchProvider = { - id: string + id: WebSearchProviderId name: string apiKey?: string apiHost?: string From 5d34e49c57b93547e87611d3f1c4637a84dff2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=C2=B7Dong?= <98630204+GeorgeDong32@users.noreply.github.com> Date: Fri, 15 Aug 2025 01:55:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor(bakcup):=20=E5=8D=95=E4=BE=8B?= =?UTF-8?q?=E5=8C=96S3/WebDAV=20(#9181)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(backup): 单例化S3/WebDAV并动态更新配置 * feat(backup): reuse storage instances by comparing core configs * feat(backup): cache only connection fields for storages --- src/main/services/BackupManager.ts | 125 ++++++++++++++++++++++++++--- 1 file changed, 114 insertions(+), 11 deletions(-) diff --git a/src/main/services/BackupManager.ts b/src/main/services/BackupManager.ts index 56d3a97379..c6d3ee1841 100644 --- a/src/main/services/BackupManager.ts +++ b/src/main/services/BackupManager.ts @@ -21,6 +21,27 @@ class BackupManager { private tempDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup', 'temp') private backupDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup') + // 缓存实例，避免重复创建 + private s3Storage: S3Storage | null = null + private webdavInstance: WebDav | null = null + + // 缓存核心连接配置，用于检测连接配置是否变更 + private cachedS3ConnectionConfig: { + endpoint: string + region: string + bucket: string + accessKeyId: string + secretAccessKey: string + root?: string + } | null = null + + private cachedWebdavConnectionConfig: { + webdavHost: string + webdavUser?: string + webdavPass?: string + webdavPath?: string + } | null = null + constructor() { this.checkConnection = this.checkConnection.bind(this) this.backup = this.backup.bind(this) @@ -87,6 +108,88 @@ class BackupManager { } } + /** + * 比较两个配置对象是否相等，只比较影响客户端连接的核心字段，忽略 fileName 等易变字段 + */ + private isS3ConfigEqual(cachedConfig: typeof this.cachedS3ConnectionConfig, config: S3Config): boolean { + if (!cachedConfig) return false + + return ( + cachedConfig.endpoint === config.endpoint && + cachedConfig.region === config.region && + cachedConfig.bucket === config.bucket && + cachedConfig.accessKeyId === config.accessKeyId && + cachedConfig.secretAccessKey === config.secretAccessKey && + cachedConfig.root === config.root + ) + } + + /** + * 深度比较两个 WebDAV 配置对象是否相等，只比较影响客户端连接的核心字段，忽略 fileName 等易变字段 + */ + private isWebDavConfigEqual(cachedConfig: typeof this.cachedWebdavConnectionConfig, config: WebDavConfig): boolean { + if (!cachedConfig) return false + + return ( + cachedConfig.webdavHost === config.webdavHost && + cachedConfig.webdavUser === config.webdavUser && + cachedConfig.webdavPass === config.webdavPass && + cachedConfig.webdavPath === config.webdavPath + ) + } + + /** + * 获取 S3Storage 实例，如果连接配置未变且实例已存在则复用，否则创建新实例 + * 注意：只有连接相关的配置变更才会重新创建实例，其他配置变更不影响实例复用 + */ + private getS3Storage(config: S3Config): S3Storage { + // 检查核心连接配置是否变更 + const configChanged = !this.isS3ConfigEqual(this.cachedS3ConnectionConfig, config) + + if (configChanged || !this.s3Storage) { + this.s3Storage = new S3Storage(config) + // 只缓存连接相关的配置字段 + this.cachedS3ConnectionConfig = { + endpoint: config.endpoint, + region: config.region, + bucket: config.bucket, + accessKeyId: config.accessKeyId, + secretAccessKey: config.secretAccessKey, + root: config.root + } + logger.debug('[BackupManager] Created new S3Storage instance') + } else { + logger.debug('[BackupManager] Reusing existing S3Storage instance') + } + + return this.s3Storage + } + + /** + * 获取 WebDav 实例，如果连接配置未变且实例已存在则复用，否则创建新实例 + * 注意：只有连接相关的配置变更才会重新创建实例，其他配置变更不影响实例复用 + */ + private getWebDavInstance(config: WebDavConfig): WebDav { + // 检查核心连接配置是否变更 + const configChanged = !this.isWebDavConfigEqual(this.cachedWebdavConnectionConfig, config) + + if (configChanged || !this.webdavInstance) { + this.webdavInstance = new WebDav(config) + // 只缓存连接相关的配置字段 + this.cachedWebdavConnectionConfig = { + webdavHost: config.webdavHost, + webdavUser: config.webdavUser, + webdavPass: config.webdavPass, + webdavPath: config.webdavPath + } + logger.debug('[BackupManager] Created new WebDav instance') + } else { + logger.debug('[BackupManager] Reusing existing WebDav instance') + } + + return this.webdavInstance + } + async backup( _: Electron.IpcMainInvokeEvent, fileName: string, @@ -322,7 +425,7 @@ class BackupManager { async backupToWebdav(_: Electron.IpcMainInvokeEvent, data: string, webdavConfig: WebDavConfig) { const filename = webdavConfig.fileName || 'cherry-studio.backup.zip' const backupedFilePath = await this.backup(_, filename, data, undefined, webdavConfig.skipBackupFile) - const webdavClient = new WebDav(webdavConfig) + const webdavClient = this.getWebDavInstance(webdavConfig) try { let result if (webdavConfig.disableStream) { @@ -349,7 +452,7 @@ class BackupManager { async restoreFromWebdav(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) { const filename = webdavConfig.fileName || 'cherry-studio.backup.zip' - const webdavClient = new WebDav(webdavConfig) + const webdavClient = this.getWebDavInstance(webdavConfig) try { const retrievedFile = await webdavClient.getFileContents(filename) const backupedFilePath = path.join(this.backupDir, filename) @@ -377,7 +480,7 @@ class BackupManager { listWebdavFiles = async (_: Electron.IpcMainInvokeEvent, config: WebDavConfig) => { try { - const client = new WebDav(config) + const client = this.getWebDavInstance(config) const response = await client.getDirectoryContents() const files = Array.isArray(response) ? response : response.data @@ -467,7 +570,7 @@ class BackupManager { } async checkConnection(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) { - const webdavClient = new WebDav(webdavConfig) + const webdavClient = this.getWebDavInstance(webdavConfig) return await webdavClient.checkConnection() } @@ -477,13 +580,13 @@ class BackupManager { path: string, options?: CreateDirectoryOptions ) { - const webdavClient = new WebDav(webdavConfig) + const webdavClient = this.getWebDavInstance(webdavConfig) return await webdavClient.createDirectory(path, options) } async deleteWebdavFile(_: Electron.IpcMainInvokeEvent, fileName: string, webdavConfig: WebDavConfig) { try { - const webdavClient = new WebDav(webdavConfig) + const webdavClient = this.getWebDavInstance(webdavConfig) return await webdavClient.deleteFile(fileName) } catch (error: any) { logger.error('Failed to delete WebDAV file:', error) @@ -525,7 +628,7 @@ class BackupManager { logger.debug(`Starting S3 backup to ${filename}`) const backupedFilePath = await this.backup(_, filename, data, undefined, s3Config.skipBackupFile) - const s3Client = new S3Storage(s3Config) + const s3Client = this.getS3Storage(s3Config) try { const fileBuffer = await fs.promises.readFile(backupedFilePath) const result = await s3Client.putFileContents(filename, fileBuffer) @@ -603,7 +706,7 @@ class BackupManager { logger.debug(`Starting restore from S3: ${filename}`) - const s3Client = new S3Storage(s3Config) + const s3Client = this.getS3Storage(s3Config) try { const retrievedFile = await s3Client.getFileContents(filename) const backupedFilePath = path.join(this.backupDir, filename) @@ -628,7 +731,7 @@ class BackupManager { listS3Files = async (_: Electron.IpcMainInvokeEvent, s3Config: S3Config) => { try { - const s3Client = new S3Storage(s3Config) + const s3Client = this.getS3Storage(s3Config) const objects = await s3Client.listFiles() const files = objects @@ -652,7 +755,7 @@ class BackupManager { async deleteS3File(_: Electron.IpcMainInvokeEvent, fileName: string, s3Config: S3Config) { try { - const s3Client = new S3Storage(s3Config) + const s3Client = this.getS3Storage(s3Config) return await s3Client.deleteFile(fileName) } catch (error: any) { logger.error('Failed to delete S3 file:', error) @@ -661,7 +764,7 @@ class BackupManager { } async checkS3Connection(_: Electron.IpcMainInvokeEvent, s3Config: S3Config) { - const s3Client = new S3Storage(s3Config) + const s3Client = this.getS3Storage(s3Config) return await s3Client.checkConnection() } } From d1e19aad516359c3b8343a3b1f45a15509403be4 Mon Sep 17 00:00:00 2001 From: SuYao Date: Fri, 15 Aug 2025 09:28:43 +0800 Subject: [PATCH 5/6] fix: unexpected loading (#9193) fix --- src/renderer/src/services/ApiService.ts | 8 +++----- .../messageStreaming/callbacks/citationCallbacks.ts | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts index da83fdb660..d447fa7322 100644 --- a/src/renderer/src/services/ApiService.ts +++ b/src/renderer/src/services/ApiService.ts @@ -104,9 +104,9 @@ async function fetchExternalTool( const showListTools = enabledMCPs && enabledMCPs.length > 0 // 是否使用工具 - const hasAnyTool = shouldWebSearch || shouldKnowledgeSearch || shouldSearchMemory || showListTools + const hasAnyTool = shouldWebSearch || shouldKnowledgeSearch || showListTools - // 在工具链开始时发送进度通知 + // 在工具链开始时发送进度通知（不包括记忆搜索） if (hasAnyTool) { onChunkReceived({ type: ChunkType.EXTERNEL_TOOL_IN_PROGRESS }) } @@ -456,8 +456,6 @@ export async function fetchChatCompletion({ const { mcpTools } = await fetchExternalTool(lastUserMessage, assistant, onChunkReceived, lastAnswer) const model = assistant.model || getDefaultModel() - onChunkReceived({ type: ChunkType.LLM_RESPONSE_CREATED }) - const { maxTokens, contextCount } = getAssistantSettings(assistant) const filteredMessages2 = filterUsefulMessages(filteredMessages1) @@ -488,7 +486,7 @@ export async function fetchChatCompletion({ isGenerateImageModel(model) && (isSupportedDisableGenerationModel(model) ? assistant.enableGenerateImage : true) // --- Call AI Completions --- - + onChunkReceived({ type: ChunkType.LLM_RESPONSE_CREATED }) const completionsParams: CompletionsParams = { callType: 'chat', messages: _messages, diff --git a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts index 56d0680839..9ba743b2cd 100644 --- a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts +++ b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts @@ -40,6 +40,7 @@ export const createCitationCallbacks = (deps: CitationCallbacksDependencies) => status: MessageBlockStatus.SUCCESS } blockManager.smartBlockUpdate(citationBlockId, changes, MessageBlockType.CITATION, true) + citationBlockId = null } else { logger.error('[onExternalToolComplete] citationBlockId is null. Cannot update.') } From f2b7b07e511c4ec9ea7567d9e841f7f74693ac35 Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Fri, 15 Aug 2025 10:45:11 +0800 Subject: [PATCH 6/6] refactor(AppUpdater): streamline release version fetching and improve update logic (#9167) - Renamed method from _getPreReleaseVersionFromGithub to _getReleaseVersionFromGithub for clarity. - Enhanced logic to check for the latest release version using semver. - Removed unnecessary checks related to test plans when updates are not available. - Improved logging for better traceability of release version fetching. --- src/main/services/AppUpdater.ts | 71 +++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index e60dac31f0..ea3b1f3f1e 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -9,6 +9,7 @@ import { CancellationToken, UpdateInfo } from 'builder-util-runtime' import { app, BrowserWindow, dialog } from 'electron' import { AppUpdater as _AppUpdater, autoUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater' import path from 'path' +import semver from 'semver' import icon from '../../../build/icon.png?asset' import { configManager } from './ConfigManager' @@ -44,12 +45,6 @@ export default class AppUpdater { // 检测到不需要更新时 autoUpdater.on('update-not-available', () => { - if (configManager.getTestPlan() && this.autoUpdater.channel !== UpgradeChannel.LATEST) { - logger.info('test plan is enabled, but update is not available, do not send update not available event') - // will not send update not available event, because will check for updates with latest channel - return - } - windowService.getMainWindow()?.webContents.send(IpcChannel.UpdateNotAvailable) }) @@ -72,18 +67,24 @@ export default class AppUpdater { this.autoUpdater = autoUpdater } - private async _getPreReleaseVersionFromGithub(channel: UpgradeChannel) { + private async _getReleaseVersionFromGithub(channel: UpgradeChannel) { + const headers = { + Accept: 'application/vnd.github+json', + 'X-GitHub-Api-Version': '2022-11-28', + 'Accept-Language': 'en-US,en;q=0.9' + } try { - logger.info(`get pre release version from github: ${channel}`) + logger.info(`get release version from github: ${channel}`) const responses = await fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', { - headers: { - Accept: 'application/vnd.github+json', - 'X-GitHub-Api-Version': '2022-11-28', - 'Accept-Language': 'en-US,en;q=0.9' - } + headers }) const data = (await responses.json()) as GithubReleaseInfo[] + let mightHaveLatest = false const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => { + if (!item.draft && !item.prerelease) { + mightHaveLatest = true + } + return item.prerelease && item.tag_name.includes(`-${channel}.`) }) @@ -91,8 +92,29 @@ export default class AppUpdater { return null } - logger.info(`prerelease url is ${release.tag_name}, set channel to ${channel}`) + // if the release version is the same as the current version, return null + if (release.tag_name === app.getVersion()) { + return null + } + if (mightHaveLatest) { + logger.info(`might have latest release, get latest release`) + const latestReleaseResponse = await fetch( + 'https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest', + { + headers + } + ) + const latestRelease = (await latestReleaseResponse.json()) as GithubReleaseInfo + if (semver.gt(latestRelease.tag_name, release.tag_name)) { + logger.info( + `latest release version is ${latestRelease.tag_name}, prerelease version is ${release.tag_name}, return null` + ) + return null + } + } + + logger.info(`release url is ${release.tag_name}, set channel to ${channel}`) return `https://github.com/CherryHQ/cherry-studio/releases/download/${release.tag_name}` } catch (error) { logger.error('Failed to get latest not draft version from github:', error as Error) @@ -151,14 +173,14 @@ export default class AppUpdater { return } - const preReleaseUrl = await this._getPreReleaseVersionFromGithub(channel) - if (preReleaseUrl) { - logger.info(`prerelease url is ${preReleaseUrl}, set channel to ${channel}`) - this._setChannel(channel, preReleaseUrl) + const releaseUrl = await this._getReleaseVersionFromGithub(channel) + if (releaseUrl) { + logger.info(`release url is ${releaseUrl}, set channel to ${channel}`) + this._setChannel(channel, releaseUrl) return } - // if no prerelease url, use github latest to avoid error + // if no prerelease url, use github latest to get release this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST) return } @@ -195,17 +217,6 @@ export default class AppUpdater { `update check result: ${this.updateCheckResult?.isUpdateAvailable}, channel: ${this.autoUpdater.channel}, currentVersion: ${this.autoUpdater.currentVersion}` ) - // if the update is not available, and the test plan is enabled, set the feed url to the github latest - if ( - !this.updateCheckResult?.isUpdateAvailable && - configManager.getTestPlan() && - this.autoUpdater.channel !== UpgradeChannel.LATEST - ) { - logger.info('test plan is enabled, but update is not available, set channel to latest') - this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST) - this.updateCheckResult = await this.autoUpdater.checkForUpdates() - } - if (this.updateCheckResult?.isUpdateAvailable && !this.autoUpdater.autoDownload) { // 如果 autoDownload 为 false，则需要再调用下面的函数触发下 // do not use await, because it will block the return of this function