فهرست منبع

Merge branch 'dev' of https://github.com/open-webui/open-webui into dev

Timothy J. Baek 5 ماه پیش
والد
کامیت
224b555de5
2فایلهای تغییر یافته به همراه6 افزوده شده و 5 حذف شده
  1. 4 3
      backend/open_webui/apps/retrieval/main.py
  2. 2 2
      src/lib/components/admin/Settings/WebSearch.svelte

+ 4 - 3
backend/open_webui/apps/retrieval/main.py

@@ -428,7 +428,7 @@ async def get_rag_config(user=Depends(get_admin_user)):
             "translation": app.state.YOUTUBE_LOADER_TRANSLATION,
             "translation": app.state.YOUTUBE_LOADER_TRANSLATION,
         },
         },
         "web": {
         "web": {
-            "ssl_verification": app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
+            "web_loader_ssl_verification": app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
             "search": {
             "search": {
                 "enabled": app.state.config.ENABLE_RAG_WEB_SEARCH,
                 "enabled": app.state.config.ENABLE_RAG_WEB_SEARCH,
                 "engine": app.state.config.RAG_WEB_SEARCH_ENGINE,
                 "engine": app.state.config.RAG_WEB_SEARCH_ENGINE,
@@ -537,6 +537,7 @@ async def update_rag_config(form_data: ConfigUpdateForm, user=Depends(get_admin_
 
 
     if form_data.web is not None:
     if form_data.web is not None:
         app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION = (
         app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION = (
+            #Note: When UI "Bypass SSL verification for Websites"=True then ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION=False
             form_data.web.web_loader_ssl_verification
             form_data.web.web_loader_ssl_verification
         )
         )
 
 
@@ -592,7 +593,7 @@ async def update_rag_config(form_data: ConfigUpdateForm, user=Depends(get_admin_
             "translation": app.state.YOUTUBE_LOADER_TRANSLATION,
             "translation": app.state.YOUTUBE_LOADER_TRANSLATION,
         },
         },
         "web": {
         "web": {
-            "ssl_verification": app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
+            "web_loader_ssl_verification": app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
             "search": {
             "search": {
                 "enabled": app.state.config.ENABLE_RAG_WEB_SEARCH,
                 "enabled": app.state.config.ENABLE_RAG_WEB_SEARCH,
                 "engine": app.state.config.RAG_WEB_SEARCH_ENGINE,
                 "engine": app.state.config.RAG_WEB_SEARCH_ENGINE,
@@ -1229,7 +1230,7 @@ def process_web_search(form_data: SearchForm, user=Depends(get_verified_user)):
 
 
         urls = [result.link for result in web_results]
         urls = [result.link for result in web_results]
 
 
-        loader = get_web_loader(urls)
+        loader = get_web_loader(urls, verify_ssl=app.state.config.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION)
         docs = loader.load()
         docs = loader.load()
 
 
         save_docs_to_vector_db(docs, collection_name, overwrite=True)
         save_docs_to_vector_db(docs, collection_name, overwrite=True)

+ 2 - 2
src/lib/components/admin/Settings/WebSearch.svelte

@@ -314,12 +314,12 @@
 						<button
 						<button
 							class="p-1 px-3 text-xs flex rounded transition"
 							class="p-1 px-3 text-xs flex rounded transition"
 							on:click={() => {
 							on:click={() => {
-								webConfig.ssl_verification = !webConfig.ssl_verification;
+								webConfig.web_loader_ssl_verification = !webConfig.web_loader_ssl_verification;
 								submitHandler();
 								submitHandler();
 							}}
 							}}
 							type="button"
 							type="button"
 						>
 						>
-							{#if webConfig.ssl_verification === true}
+							{#if webConfig.web_loader_ssl_verification === false}
 								<span class="ml-2 self-center">{$i18n.t('On')}</span>
 								<span class="ml-2 self-center">{$i18n.t('On')}</span>
 							{:else}
 							{:else}
 								<span class="ml-2 self-center">{$i18n.t('Off')}</span>
 								<span class="ml-2 self-center">{$i18n.t('Off')}</span>