From fd18264183df4dde47197fe3ea51a98f4f2150e9 Mon Sep 17 00:00:00 2001 From: Jhao Date: Thu, 9 Apr 2026 21:20:31 +0800 Subject: [PATCH] feat(web-search): add ollama web search provider support #907 --- frontend/src/api/agent/index.ts | 1 + frontend/src/api/web-search-provider.ts | 2 +- frontend/src/components/Input-field.vue | 30 +++- .../src/views/settings/WebSearchSettings.vue | 8 +- .../service/web_search_provider.go | 7 +- internal/container/container.go | 1 + internal/infrastructure/web_search/ollama.go | 155 ++++++++++++++++++ internal/types/web_search_provider.go | 8 + 8 files changed, 200 insertions(+), 12 deletions(-) create mode 100644 internal/infrastructure/web_search/ollama.go diff --git a/frontend/src/api/agent/index.ts b/frontend/src/api/agent/index.ts index 551867e3..1d6fb080 100644 --- a/frontend/src/api/agent/index.ts +++ b/frontend/src/api/agent/index.ts @@ -47,6 +47,7 @@ export interface CustomAgentConfig { // ===== 网络搜索设置 ===== web_search_enabled?: boolean; + web_search_provider_id?: string; web_search_max_results?: number; // ===== 多轮对话设置 ===== diff --git a/frontend/src/api/web-search-provider.ts b/frontend/src/api/web-search-provider.ts index 4a9a3f2d..c980cb40 100644 --- a/frontend/src/api/web-search-provider.ts +++ b/frontend/src/api/web-search-provider.ts @@ -5,7 +5,7 @@ export interface WebSearchProviderEntity { id?: string tenant_id?: number name: string - provider: 'bing' | 'google' | 'duckduckgo' | 'tavily' + provider: 'bing' | 'google' | 'duckduckgo' | 'tavily' | 'ollama' description?: string parameters: { api_key?: string diff --git a/frontend/src/components/Input-field.vue b/frontend/src/components/Input-field.vue index 3f98578c..88d35bc3 100644 --- a/frontend/src/components/Input-field.vue +++ b/frontend/src/components/Input-field.vue @@ -15,7 +15,7 @@ import AgentSelector from './AgentSelector.vue'; import { getCaretCoordinates } from '@/utils/caret'; import { listModels, type ModelConfig } from '@/api/model'; import { listAgents, type CustomAgent, BUILTIN_QUICK_ANSWER_ID, BUILTIN_SMART_REASONING_ID } from '@/api/agent'; -import { getTenantWebSearchConfig } from '@/api/web-search'; +import { listWebSearchProviders, type WebSearchProviderEntity } from '@/api/web-search-provider'; import { getConversationConfig, updateConversationConfig, type ConversationConfig } from '@/api/system'; import { useI18n } from 'vue-i18n'; @@ -192,6 +192,11 @@ const agentWebSearchEnabled = computed(() => { return currentAgentConfig.value?.web_search_enabled ?? true; }); +const agentWebSearchProviderId = computed(() => { + if (!hasAgentConfig.value) return ''; + return currentAgentConfig.value?.web_search_provider_id || ''; +}); + // 网络搜索是否被智能体禁用(只读状态)- 只有明确设置为 false 时才禁用 const isWebSearchDisabledByAgent = computed(() => { return hasAgentConfig.value && agentWebSearchEnabled.value === false; @@ -282,7 +287,6 @@ const isAgentEnabled = computed(() => settingsStore.isAgentEnabled); const isWebSearchEnabled = computed(() => settingsStore.isWebSearchEnabled); const selectedKbIds = computed(() => settingsStore.settings.selectedKnowledgeBases || []); const selectedFileIds = computed(() => settingsStore.settings.selectedFiles || []); -const isWebSearchConfigured = ref(false); // 获取已选择的知识库信息 const knowledgeBases = ref>([]); @@ -521,19 +525,29 @@ watch(selectedFileIds, () => { loadFiles(); }, { immediate: true }); +const webSearchProviders = ref([]); + +const isWebSearchConfigured = computed(() => { + const agentProviderId = agentWebSearchProviderId.value; + if (agentProviderId) { + return webSearchProviders.value.some(p => p.id === agentProviderId); + } + + return webSearchProviders.value.some(p => p.is_default); +}); + const loadWebSearchConfig = async () => { try { - const response: any = await getTenantWebSearchConfig(); - const config = response?.data; - const configured = !!(config && config.provider); - isWebSearchConfigured.value = configured; + const response = await listWebSearchProviders(); + const providers = (response as any)?.data; + webSearchProviders.value = Array.isArray(providers) ? providers : []; - if (!configured && settingsStore.isWebSearchEnabled) { + if (!isWebSearchConfigured.value && settingsStore.isWebSearchEnabled) { settingsStore.toggleWebSearch(false); } } catch (error) { console.error('Failed to load web search config:', error); - isWebSearchConfigured.value = false; + webSearchProviders.value = []; if (settingsStore.isWebSearchEnabled) { settingsStore.toggleWebSearch(false); } diff --git a/frontend/src/views/settings/WebSearchSettings.vue b/frontend/src/views/settings/WebSearchSettings.vue index 2fc0de23..5301d777 100644 --- a/frontend/src/views/settings/WebSearchSettings.vue +++ b/frontend/src/views/settings/WebSearchSettings.vue @@ -64,7 +64,7 @@
{{ pt.name }} - {{ t('webSearchSettings.free') }} + {{ t('webSearchSettings.free') }}
@@ -113,7 +113,7 @@