|
@@ -45,6 +45,7 @@ from open_webui.retrieval.loaders.youtube import YoutubeLoader
|
|
|
# Web search engines
|
|
|
from open_webui.retrieval.web.main import SearchResult
|
|
|
from open_webui.retrieval.web.utils import get_web_loader
|
|
|
+from open_webui.retrieval.web.ollama import search_ollama
|
|
|
from open_webui.retrieval.web.brave import search_brave
|
|
|
from open_webui.retrieval.web.kagi import search_kagi
|
|
|
from open_webui.retrieval.web.mojeek import search_mojeek
|
|
@@ -469,6 +470,7 @@ async def get_rag_config(request: Request, user=Depends(get_admin_user)):
|
|
|
"WEB_SEARCH_DOMAIN_FILTER_LIST": request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
"BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL": request.app.state.config.BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL,
|
|
|
"BYPASS_WEB_SEARCH_WEB_LOADER": request.app.state.config.BYPASS_WEB_SEARCH_WEB_LOADER,
|
|
|
+ "OLLAMA_CLOUD_WEB_SEARCH_API_KEY": request.app.state.config.OLLAMA_CLOUD_WEB_SEARCH_API_KEY,
|
|
|
"SEARXNG_QUERY_URL": request.app.state.config.SEARXNG_QUERY_URL,
|
|
|
"YACY_QUERY_URL": request.app.state.config.YACY_QUERY_URL,
|
|
|
"YACY_USERNAME": request.app.state.config.YACY_USERNAME,
|
|
@@ -525,6 +527,7 @@ class WebConfig(BaseModel):
|
|
|
WEB_SEARCH_DOMAIN_FILTER_LIST: Optional[List[str]] = []
|
|
|
BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL: Optional[bool] = None
|
|
|
BYPASS_WEB_SEARCH_WEB_LOADER: Optional[bool] = None
|
|
|
+ OLLAMA_CLOUD_WEB_SEARCH_API_KEY: Optional[str] = None
|
|
|
SEARXNG_QUERY_URL: Optional[str] = None
|
|
|
YACY_QUERY_URL: Optional[str] = None
|
|
|
YACY_USERNAME: Optional[str] = None
|
|
@@ -988,6 +991,9 @@ async def update_rag_config(
|
|
|
request.app.state.config.BYPASS_WEB_SEARCH_WEB_LOADER = (
|
|
|
form_data.web.BYPASS_WEB_SEARCH_WEB_LOADER
|
|
|
)
|
|
|
+ request.app.state.config.OLLAMA_CLOUD_WEB_SEARCH_API_KEY = (
|
|
|
+ form_data.web.OLLAMA_CLOUD_WEB_SEARCH_API_KEY
|
|
|
+ )
|
|
|
request.app.state.config.SEARXNG_QUERY_URL = form_data.web.SEARXNG_QUERY_URL
|
|
|
request.app.state.config.YACY_QUERY_URL = form_data.web.YACY_QUERY_URL
|
|
|
request.app.state.config.YACY_USERNAME = form_data.web.YACY_USERNAME
|
|
@@ -1139,6 +1145,7 @@ async def update_rag_config(
|
|
|
"WEB_SEARCH_DOMAIN_FILTER_LIST": request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
"BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL": request.app.state.config.BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL,
|
|
|
"BYPASS_WEB_SEARCH_WEB_LOADER": request.app.state.config.BYPASS_WEB_SEARCH_WEB_LOADER,
|
|
|
+ "OLLAMA_CLOUD_WEB_SEARCH_API_KEY": request.app.state.config.OLLAMA_CLOUD_WEB_SEARCH_API_KEY,
|
|
|
"SEARXNG_QUERY_URL": request.app.state.config.SEARXNG_QUERY_URL,
|
|
|
"YACY_QUERY_URL": request.app.state.config.YACY_QUERY_URL,
|
|
|
"YACY_USERNAME": request.app.state.config.YACY_USERNAME,
|
|
@@ -1786,7 +1793,15 @@ def search_web(request: Request, engine: str, query: str) -> list[SearchResult]:
|
|
|
"""
|
|
|
|
|
|
# TODO: add playwright to search the web
|
|
|
- if engine == "searxng":
|
|
|
+ if engine == "ollama_cloud":
|
|
|
+ return search_ollama(
|
|
|
+ "https://ollama.com",
|
|
|
+ request.app.state.config.OLLAMA_CLOUD_WEB_SEARCH_API_KEY,
|
|
|
+ query,
|
|
|
+ request.app.state.config.WEB_SEARCH_RESULT_COUNT,
|
|
|
+ request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
+ )
|
|
|
+ elif engine == "searxng":
|
|
|
if request.app.state.config.SEARXNG_QUERY_URL:
|
|
|
return search_searxng(
|
|
|
request.app.state.config.SEARXNG_QUERY_URL,
|