mirror of
https://github.com/open-webui/open-webui
synced 2025-04-19 05:47:22 +00:00
chore: format
This commit is contained in:
parent
20f052eb37
commit
b1d83fc42c
@ -777,7 +777,7 @@ def search_web(engine: str, query: str) -> list[SearchResult]:
|
|||||||
app.state.config.SEARXNG_QUERY_URL,
|
app.state.config.SEARXNG_QUERY_URL,
|
||||||
query,
|
query,
|
||||||
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception("No SEARXNG_QUERY_URL found in environment variables")
|
raise Exception("No SEARXNG_QUERY_URL found in environment variables")
|
||||||
@ -791,7 +791,7 @@ def search_web(engine: str, query: str) -> list[SearchResult]:
|
|||||||
app.state.config.GOOGLE_PSE_ENGINE_ID,
|
app.state.config.GOOGLE_PSE_ENGINE_ID,
|
||||||
query,
|
query,
|
||||||
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
@ -803,7 +803,7 @@ def search_web(engine: str, query: str) -> list[SearchResult]:
|
|||||||
app.state.config.BRAVE_SEARCH_API_KEY,
|
app.state.config.BRAVE_SEARCH_API_KEY,
|
||||||
query,
|
query,
|
||||||
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception("No BRAVE_SEARCH_API_KEY found in environment variables")
|
raise Exception("No BRAVE_SEARCH_API_KEY found in environment variables")
|
||||||
@ -824,7 +824,7 @@ def search_web(engine: str, query: str) -> list[SearchResult]:
|
|||||||
app.state.config.SERPER_API_KEY,
|
app.state.config.SERPER_API_KEY,
|
||||||
query,
|
query,
|
||||||
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception("No SERPER_API_KEY found in environment variables")
|
raise Exception("No SERPER_API_KEY found in environment variables")
|
||||||
@ -834,12 +834,16 @@ def search_web(engine: str, query: str) -> list[SearchResult]:
|
|||||||
app.state.config.SERPLY_API_KEY,
|
app.state.config.SERPLY_API_KEY,
|
||||||
query,
|
query,
|
||||||
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise Exception("No SERPLY_API_KEY found in environment variables")
|
raise Exception("No SERPLY_API_KEY found in environment variables")
|
||||||
elif engine == "duckduckgo":
|
elif engine == "duckduckgo":
|
||||||
return search_duckduckgo(query, app.state.config.RAG_WEB_SEARCH_RESULT_COUNT, app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST)
|
return search_duckduckgo(
|
||||||
|
query,
|
||||||
|
app.state.config.RAG_WEB_SEARCH_RESULT_COUNT,
|
||||||
|
app.state.config.RAG_WEB_SEARCH_DOMAIN_FILTER_LIST,
|
||||||
|
)
|
||||||
elif engine == "tavily":
|
elif engine == "tavily":
|
||||||
if app.state.config.TAVILY_API_KEY:
|
if app.state.config.TAVILY_API_KEY:
|
||||||
return search_tavily(
|
return search_tavily(
|
||||||
|
@ -9,7 +9,9 @@ log = logging.getLogger(__name__)
|
|||||||
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
||||||
|
|
||||||
|
|
||||||
def search_brave(api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None) -> list[SearchResult]:
|
def search_brave(
|
||||||
|
api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None
|
||||||
|
) -> list[SearchResult]:
|
||||||
"""Search using Brave's Search API and return the results as a list of SearchResult objects.
|
"""Search using Brave's Search API and return the results as a list of SearchResult objects.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@ -31,7 +33,7 @@ def search_brave(api_key: str, query: str, count: int, filter_list: Optional[Lis
|
|||||||
results = json_response.get("web", {}).get("results", [])
|
results = json_response.get("web", {}).get("results", [])
|
||||||
if filter_list:
|
if filter_list:
|
||||||
results = get_filtered_results(results, filter_list)
|
results = get_filtered_results(results, filter_list)
|
||||||
|
|
||||||
return [
|
return [
|
||||||
SearchResult(
|
SearchResult(
|
||||||
link=result["url"], title=result.get("title"), snippet=result.get("snippet")
|
link=result["url"], title=result.get("title"), snippet=result.get("snippet")
|
||||||
|
@ -8,7 +8,9 @@ log = logging.getLogger(__name__)
|
|||||||
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
||||||
|
|
||||||
|
|
||||||
def search_duckduckgo(query: str, count: int, filter_list: Optional[List[str]] = None) -> list[SearchResult]:
|
def search_duckduckgo(
|
||||||
|
query: str, count: int, filter_list: Optional[List[str]] = None
|
||||||
|
) -> list[SearchResult]:
|
||||||
"""
|
"""
|
||||||
Search using DuckDuckGo's Search API and return the results as a list of SearchResult objects.
|
Search using DuckDuckGo's Search API and return the results as a list of SearchResult objects.
|
||||||
Args:
|
Args:
|
||||||
|
@ -11,7 +11,11 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
|
|||||||
|
|
||||||
|
|
||||||
def search_google_pse(
|
def search_google_pse(
|
||||||
api_key: str, search_engine_id: str, query: str, count: int, filter_list: Optional[List[str]] = None
|
api_key: str,
|
||||||
|
search_engine_id: str,
|
||||||
|
query: str,
|
||||||
|
count: int,
|
||||||
|
filter_list: Optional[List[str]] = None,
|
||||||
) -> list[SearchResult]:
|
) -> list[SearchResult]:
|
||||||
"""Search using Google's Programmable Search Engine API and return the results as a list of SearchResult objects.
|
"""Search using Google's Programmable Search Engine API and return the results as a list of SearchResult objects.
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@ def get_filtered_results(results, filter_list):
|
|||||||
filtered_results.append(result)
|
filtered_results.append(result)
|
||||||
return filtered_results
|
return filtered_results
|
||||||
|
|
||||||
|
|
||||||
class SearchResult(BaseModel):
|
class SearchResult(BaseModel):
|
||||||
link: str
|
link: str
|
||||||
title: Optional[str]
|
title: Optional[str]
|
||||||
|
@ -11,7 +11,11 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
|
|||||||
|
|
||||||
|
|
||||||
def search_searxng(
|
def search_searxng(
|
||||||
query_url: str, query: str, count: int, filter_list: Optional[List[str]] = None, **kwargs
|
query_url: str,
|
||||||
|
query: str,
|
||||||
|
count: int,
|
||||||
|
filter_list: Optional[List[str]] = None,
|
||||||
|
**kwargs,
|
||||||
) -> List[SearchResult]:
|
) -> List[SearchResult]:
|
||||||
"""
|
"""
|
||||||
Search a SearXNG instance for a given query and return the results as a list of SearchResult objects.
|
Search a SearXNG instance for a given query and return the results as a list of SearchResult objects.
|
||||||
|
@ -10,7 +10,9 @@ log = logging.getLogger(__name__)
|
|||||||
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
log.setLevel(SRC_LOG_LEVELS["RAG"])
|
||||||
|
|
||||||
|
|
||||||
def search_serper(api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None) -> list[SearchResult]:
|
def search_serper(
|
||||||
|
api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None
|
||||||
|
) -> list[SearchResult]:
|
||||||
"""Search using serper.dev's API and return the results as a list of SearchResult objects.
|
"""Search using serper.dev's API and return the results as a list of SearchResult objects.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -11,7 +11,11 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
|
|||||||
|
|
||||||
|
|
||||||
def search_serpstack(
|
def search_serpstack(
|
||||||
api_key: str, query: str, count: int, filter_list: Optional[List[str]] = None, https_enabled: bool = True
|
api_key: str,
|
||||||
|
query: str,
|
||||||
|
count: int,
|
||||||
|
filter_list: Optional[List[str]] = None,
|
||||||
|
https_enabled: bool = True,
|
||||||
) -> list[SearchResult]:
|
) -> list[SearchResult]:
|
||||||
"""Search using serpstack.com's and return the results as a list of SearchResult objects.
|
"""Search using serpstack.com's and return the results as a list of SearchResult objects.
|
||||||
|
|
||||||
|
@ -903,14 +903,14 @@ RAG_WEB_SEARCH_ENGINE = PersistentConfig(
|
|||||||
os.getenv("RAG_WEB_SEARCH_ENGINE", ""),
|
os.getenv("RAG_WEB_SEARCH_ENGINE", ""),
|
||||||
)
|
)
|
||||||
|
|
||||||
# You can provide a list of your own websites to filter after performing a web search.
|
# You can provide a list of your own websites to filter after performing a web search.
|
||||||
# This ensures the highest level of safety and reliability of the information sources.
|
# This ensures the highest level of safety and reliability of the information sources.
|
||||||
RAG_WEB_SEARCH_DOMAIN_FILTER_LIST = PersistentConfig(
|
RAG_WEB_SEARCH_DOMAIN_FILTER_LIST = PersistentConfig(
|
||||||
"RAG_WEB_SEARCH_DOMAIN_FILTER_LIST",
|
"RAG_WEB_SEARCH_DOMAIN_FILTER_LIST",
|
||||||
"rag.rag.web.search.domain.filter_list",
|
"rag.rag.web.search.domain.filter_list",
|
||||||
[
|
[
|
||||||
# "wikipedia.com",
|
# "wikipedia.com",
|
||||||
# "wikimedia.org",
|
# "wikimedia.org",
|
||||||
# "wikidata.org",
|
# "wikidata.org",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -600,4 +600,4 @@
|
|||||||
"Your account status is currently pending activation.": "현재 계정은 아직 활성화되지 않았습니다.",
|
"Your account status is currently pending activation.": "현재 계정은 아직 활성화되지 않았습니다.",
|
||||||
"Youtube": "유튜브",
|
"Youtube": "유튜브",
|
||||||
"Youtube Loader Settings": "유튜브 로더 설정"
|
"Youtube Loader Settings": "유튜브 로더 설정"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user