|
@@ -53,6 +53,7 @@ from open_webui.retrieval.web.jina_search import search_jina
|
|
|
from open_webui.retrieval.web.searchapi import search_searchapi
|
|
|
from open_webui.retrieval.web.serpapi import search_serpapi
|
|
|
from open_webui.retrieval.web.searxng import search_searxng
|
|
|
+from open_webui.retrieval.web.yacy import search_yacy
|
|
|
from open_webui.retrieval.web.serper import search_serper
|
|
|
from open_webui.retrieval.web.serply import search_serply
|
|
|
from open_webui.retrieval.web.serpstack import search_serpstack
|
|
@@ -399,6 +400,9 @@ 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,
|
|
|
"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,
|
|
|
+ "YACY_PASSWORD": request.app.state.config.YACY_PASSWORD,
|
|
|
"GOOGLE_PSE_API_KEY": request.app.state.config.GOOGLE_PSE_API_KEY,
|
|
|
"GOOGLE_PSE_ENGINE_ID": request.app.state.config.GOOGLE_PSE_ENGINE_ID,
|
|
|
"BRAVE_SEARCH_API_KEY": request.app.state.config.BRAVE_SEARCH_API_KEY,
|
|
@@ -448,6 +452,9 @@ class WebConfig(BaseModel):
|
|
|
WEB_SEARCH_DOMAIN_FILTER_LIST: Optional[List[str]] = []
|
|
|
BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL: Optional[bool] = None
|
|
|
SEARXNG_QUERY_URL: Optional[str] = None
|
|
|
+ YACY_QUERY_URL: Optional[str] = None
|
|
|
+ YACY_USERNAME: Optional[str] = None
|
|
|
+ YACY_PASSWORD: Optional[str] = None
|
|
|
GOOGLE_PSE_API_KEY: Optional[str] = None
|
|
|
GOOGLE_PSE_ENGINE_ID: Optional[str] = None
|
|
|
BRAVE_SEARCH_API_KEY: Optional[str] = None
|
|
@@ -669,6 +676,9 @@ async def update_rag_config(
|
|
|
form_data.web.BYPASS_WEB_SEARCH_EMBEDDING_AND_RETRIEVAL
|
|
|
)
|
|
|
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
|
|
|
+ request.app.state.config.YACY_PASSWORD = form_data.web.YACY_PASSWORD
|
|
|
request.app.state.config.GOOGLE_PSE_API_KEY = form_data.web.GOOGLE_PSE_API_KEY
|
|
|
request.app.state.config.GOOGLE_PSE_ENGINE_ID = (
|
|
|
form_data.web.GOOGLE_PSE_ENGINE_ID
|
|
@@ -779,6 +789,9 @@ 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,
|
|
|
"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,
|
|
|
+ "YACY_PASSWORD": request.app.state.config.YACY_PASSWORD,
|
|
|
"GOOGLE_PSE_API_KEY": request.app.state.config.GOOGLE_PSE_API_KEY,
|
|
|
"GOOGLE_PSE_ENGINE_ID": request.app.state.config.GOOGLE_PSE_ENGINE_ID,
|
|
|
"BRAVE_SEARCH_API_KEY": request.app.state.config.BRAVE_SEARCH_API_KEY,
|
|
@@ -1300,6 +1313,7 @@ def search_web(request: Request, engine: str, query: str) -> list[SearchResult]:
|
|
|
"""Search the web using a search engine and return the results as a list of SearchResult objects.
|
|
|
Will look for a search engine API key in environment variables in the following order:
|
|
|
- SEARXNG_QUERY_URL
|
|
|
+ - YACY_QUERY_URL + YACY_USERNAME + YACY_PASSWORD
|
|
|
- GOOGLE_PSE_API_KEY + GOOGLE_PSE_ENGINE_ID
|
|
|
- BRAVE_SEARCH_API_KEY
|
|
|
- KAGI_SEARCH_API_KEY
|
|
@@ -1329,6 +1343,18 @@ def search_web(request: Request, engine: str, query: str) -> list[SearchResult]:
|
|
|
)
|
|
|
else:
|
|
|
raise Exception("No SEARXNG_QUERY_URL found in environment variables")
|
|
|
+ elif engine == "yacy":
|
|
|
+ if request.app.state.config.YACY_QUERY_URL:
|
|
|
+ return search_yacy(
|
|
|
+ request.app.state.config.YACY_QUERY_URL,
|
|
|
+ request.app.state.config.YACY_USERNAME,
|
|
|
+ request.app.state.config.YACY_PASSWORD,
|
|
|
+ query,
|
|
|
+ request.app.state.config.WEB_SEARCH_RESULT_COUNT,
|
|
|
+ request.app.state.config.WEB_SEARCH_DOMAIN_FILTER_LIST,
|
|
|
+ )
|
|
|
+ else:
|
|
|
+ raise Exception("No YACY_QUERY_URL found in environment variables")
|
|
|
elif engine == "google_pse":
|
|
|
if (
|
|
|
request.app.state.config.GOOGLE_PSE_API_KEY
|