Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-24 18:50:56 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: enhance web search recognization in AI providers (#6423)

Browse Source
This commit is contained in:
SuYao 2025-05-25 21:13:29 +08:00 committed by GitHub
parent 47b1133cf1
commit 2b6d02f470
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/providers/AiProvider/AnthropicProvider.ts
View File

@ -254,7 +254,7 @@ export default class AnthropicProvider extends BaseProvider {
}
}
const isEnabledBuiltinWebSearch = assistant.enableWebSearch
const isEnabledBuiltinWebSearch = assistant.enableWebSearch && isWebSearchModel(model)
if (isEnabledBuiltinWebSearch) {
const webSearchTool = await this.getWebSearchParams(model)

3
src/renderer/src/providers/AiProvider/OpenAIProvider.ts
View File

@ -15,6 +15,7 @@ import {
isSupportedThinkingTokenModel,
isSupportedThinkingTokenQwenModel,
isVisionModel,
isWebSearchModel,
isZhipuModel
} from '@renderer/config/models'
import { getStoreSetting } from '@renderer/hooks/useSettings'
@ -371,7 +372,7 @@ export default class OpenAIProvider extends BaseOpenAIProvider {
const model = assistant.model || defaultModel
const { contextCount, maxTokens, streamOutput } = getAssistantSettings(assistant)
const isEnabledBultinWebSearch = assistant.enableWebSearch
const isEnabledBultinWebSearch = assistant.enableWebSearch && isWebSearchModel(model)
messages = addImageFileToContents(messages)
const enableReasoning =
((isSupportedThinkingTokenModel(model) || isSupportedReasoningEffortModel(model)) &&

5
src/renderer/src/providers/AiProvider/OpenAIResponseProvider.ts
View File

@ -5,7 +5,8 @@ import {
isSupportedFlexServiceTier,
isSupportedModel,
isSupportedReasoningEffortOpenAIModel,
isVisionModel
isVisionModel,
isWebSearchModel
} from '@renderer/config/models'
import { getStoreSetting } from '@renderer/hooks/useSettings'
import i18n from '@renderer/i18n'
@ -317,7 +318,7 @@ export abstract class BaseOpenAIProvider extends BaseProvider {
const model = assistant.model || defaultModel
const { contextCount, maxTokens, streamOutput } = getAssistantSettings(assistant)
const isEnabledBuiltinWebSearch = assistant.enableWebSearch
const isEnabledBuiltinWebSearch = assistant.enableWebSearch && isWebSearchModel(model)
let tools: OpenAI.Responses.Tool[] = []
const toolChoices: OpenAI.Responses.ToolChoiceTypes = {