UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-01-29 13:58:09 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: add backwards compat with older searxng urls

Browse Source
This commit is contained in:
Jun Siang Cheah 2024-06-03 21:13:10 +01:00
parent ba56edab19
commit 7fefbb316d
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
backend/apps/rag/search/searxng.py
View File

@ -10,48 +10,54 @@ log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["RAG"]) log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_searxng(query_url: str, query: str, count: int, **kwargs) -> List[SearchResult]: def search_searxng(
query_url: str, query: str, count: int, **kwargs
) -> 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.
The function allows passing additional parameters such as language or time_range to tailor the search result. The function allows passing additional parameters such as language or time_range to tailor the search result.
Args: Args:
query_url (str): The base URL of the SearXNG server with a placeholder for the query "<query>". query_url (str): The base URL of the SearXNG server.
query (str): The search term or question to find in the SearXNG database. query (str): The search term or question to find in the SearXNG database.
count (int): The maximum number of results to retrieve from the search. count (int): The maximum number of results to retrieve from the search.
Keyword Args: Keyword Args:
language (str): Language filter for the search results; e.g., "en-US". Defaults to an empty string. language (str): Language filter for the search results; e.g., "en-US". Defaults to an empty string.
time_range (str): Time range for filtering results by date; e.g., "2023-04-05..today" or "all-time". Defaults to ''. time_range (str): Time range for filtering results by date; e.g., "2023-04-05..today" or "all-time". Defaults to ''.
categories: (Optional[List[str]]): Specific categories within which the search should be performed, defaulting to an empty string if not provided. categories: (Optional[List[str]]): Specific categories within which the search should be performed, defaulting to an empty string if not provided.
Returns: Returns:
List[SearchResult]: A list of SearchResults sorted by relevance score in descending order. List[SearchResult]: A list of SearchResults sorted by relevance score in descending order.
Raise: Raise:
requests.exceptions.RequestException: If a request error occurs during the search process. requests.exceptions.RequestException: If a request error occurs during the search process.
""" """
# Default values for optional parameters are provided as empty strings or None when not specified. # Default values for optional parameters are provided as empty strings or None when not specified.
language = kwargs.get('language', 'en-US') language = kwargs.get("language", "en-US")
time_range = kwargs.get('time_range', '') time_range = kwargs.get("time_range", "")
categories = ''.join(kwargs.get('categories', [])) categories = "".join(kwargs.get("categories", []))
params = { params = {
"q": query, "q": query,
"format": "json", "format": "json",
"pageno": 1, "pageno": 1,
"results_per_page": count, "results_per_page": count,
'language': language, "language": language,
'time_range': time_range, "time_range": time_range,
'engines': '', "engines": "",
'categories': categories, "categories": categories,
'theme': 'simple', "theme": "simple",
'image_proxy': 0 "image_proxy": 0,
} }
# Legacy query format
if "<query>" in query_url:
# Strip all query parameters from the URL
query_url = query_url.split("?")[0]
log.debug(f"searching {query_url}") log.debug(f"searching {query_url}")
response = requests.get( response = requests.get(