From 8d53f1e7709868a8a69e1f65d9b1a8232a66fdc0 Mon Sep 17 00:00:00 2001 From: tth37 Date: Sun, 13 Apr 2025 12:55:50 +0800 Subject: [PATCH 1/2] fix: small bugs on updated web/rag settings --- backend/open_webui/routers/retrieval.py | 6 +++--- .../components/admin/Settings/WebSearch.svelte | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/backend/open_webui/routers/retrieval.py b/backend/open_webui/routers/retrieval.py index accb21d32..d46b8b393 100644 --- a/backend/open_webui/routers/retrieval.py +++ b/backend/open_webui/routers/retrieval.py @@ -621,8 +621,8 @@ async def update_rag_config( # Integration settings request.app.state.config.ENABLE_GOOGLE_DRIVE_INTEGRATION = ( - form_data.enable_google_drive_integration - if form_data.enable_google_drive_integration is not None + form_data.ENABLE_GOOGLE_DRIVE_INTEGRATION + if form_data.ENABLE_GOOGLE_DRIVE_INTEGRATION is not None else request.app.state.config.ENABLE_GOOGLE_DRIVE_INTEGRATION ) request.app.state.config.ENABLE_ONEDRIVE_INTEGRATION = ( @@ -706,7 +706,7 @@ async def update_rag_config( request.app.state.config.YOUTUBE_LOADER_PROXY_URL = ( form_data.web.YOUTUBE_LOADER_PROXY_URL ) - request.app.state.config.YOUTUBE_LOADER_TRANSLATION = ( + request.app.state.YOUTUBE_LOADER_TRANSLATION = ( form_data.web.YOUTUBE_LOADER_TRANSLATION ) diff --git a/src/lib/components/admin/Settings/WebSearch.svelte b/src/lib/components/admin/Settings/WebSearch.svelte index 36b53bbc4..cd2691c84 100644 --- a/src/lib/components/admin/Settings/WebSearch.svelte +++ b/src/lib/components/admin/Settings/WebSearch.svelte @@ -46,11 +46,21 @@ webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = []; } + // Convert Youtube loader language string to array before sending + if (webConfig.YOUTUBE_LOADER_LANGUAGE) { + webConfig.YOUTUBE_LOADER_LANGUAGE = webConfig.YOUTUBE_LOADER_LANGUAGE.split(',') + .map((lang) => lang.trim()) + .filter((lang) => lang.length > 0); + } else { + webConfig.YOUTUBE_LOADER_LANGUAGE = []; + } + const res = await updateRAGConfig(localStorage.token, { web: webConfig }); - webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(', '); + webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(','); + webConfig.YOUTUBE_LOADER_LANGUAGE = webConfig.YOUTUBE_LOADER_LANGUAGE.join(','); }; onMount(async () => { @@ -62,7 +72,7 @@ // Convert array back to comma-separated string for display if (webConfig?.WEB_SEARCH_DOMAIN_FILTER_LIST) { webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = - webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(', '); + webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(','); } webConfig.YOUTUBE_LOADER_LANGUAGE = webConfig.YOUTUBE_LOADER_LANGUAGE.join(','); @@ -524,7 +534,6 @@ class="dark:bg-gray-900 w-fit pr-8 rounded-sm px-2 p-1 text-xs bg-transparent outline-hidden text-right" bind:value={webConfig.WEB_LOADER_ENGINE} placeholder={$i18n.t('Select a engine')} - required > {#each webLoaderEngines as engine} From db9d4ead590d94d0569d075787441a4bdfab6cd8 Mon Sep 17 00:00:00 2001 From: tth37 Date: Sun, 13 Apr 2025 13:10:39 +0800 Subject: [PATCH 2/2] format --- src/lib/components/admin/Settings/WebSearch.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/components/admin/Settings/WebSearch.svelte b/src/lib/components/admin/Settings/WebSearch.svelte index cd2691c84..d9771f835 100644 --- a/src/lib/components/admin/Settings/WebSearch.svelte +++ b/src/lib/components/admin/Settings/WebSearch.svelte @@ -71,8 +71,7 @@ // Convert array back to comma-separated string for display if (webConfig?.WEB_SEARCH_DOMAIN_FILTER_LIST) { - webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = - webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(','); + webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST = webConfig.WEB_SEARCH_DOMAIN_FILTER_LIST.join(','); } webConfig.YOUTUBE_LOADER_LANGUAGE = webConfig.YOUTUBE_LOADER_LANGUAGE.join(',');