feat(websearch): initialize subscribeSources in migrateConfig and update WebSearchState interface

This commit is contained in:
kangfenmao 2025-04-11 14:42:35 +08:00
parent 0842b7e84d
commit a1dba93d27
3 changed files with 10 additions and 1 deletions

View File

@ -1198,6 +1198,13 @@ const migrateConfig = {
addWebSearchProvider(state, 'local-google') addWebSearchProvider(state, 'local-google')
addWebSearchProvider(state, 'local-bing') addWebSearchProvider(state, 'local-bing')
addWebSearchProvider(state, 'local-baidu') addWebSearchProvider(state, 'local-baidu')
if (state.websearch) {
if (isEmpty(state.websearch.subscribeSources)) {
state.websearch.subscribeSources = []
}
}
const qiniuProvider = state.llm.providers.find((provider) => provider.id === 'qiniu') const qiniuProvider = state.llm.providers.find((provider) => provider.id === 'qiniu')
if (qiniuProvider && isEmpty(qiniuProvider.models)) { if (qiniuProvider && isEmpty(qiniuProvider.models)) {
qiniuProvider.models = SYSTEM_MODELS.qiniu qiniuProvider.models = SYSTEM_MODELS.qiniu

View File

@ -18,6 +18,7 @@ export interface WebSearchState {
maxResults: number maxResults: number
// 要排除的域名列表 // 要排除的域名列表
excludeDomains: string[] excludeDomains: string[]
// 订阅源列表
subscribeSources: SubscribeSource[] subscribeSources: SubscribeSource[]
// 是否启用搜索增强模式 // 是否启用搜索增强模式
enhanceMode: boolean enhanceMode: boolean

View File

@ -206,8 +206,9 @@ export async function filterResultWithBlacklist(
websearch: WebSearchState websearch: WebSearchState
): Promise<WebSearchResponse> { ): Promise<WebSearchResponse> {
console.log('filterResultWithBlacklist', response) console.log('filterResultWithBlacklist', response)
// 没有结果或者没有黑名单规则时,直接返回原始结果 // 没有结果或者没有黑名单规则时,直接返回原始结果
if (!response.results?.length || (!websearch.excludeDomains.length && !websearch.subscribeSources.length)) { if (!response.results?.length || (!websearch?.excludeDomains?.length && !websearch?.subscribeSources?.length)) {
return response return response
} }