mirror of
https://github.com/open-webui/open-webui
synced 2025-05-29 17:52:48 +00:00
Set filter_list as optional param in serpstack.py
This commit is contained in:
parent
bcb84235b1
commit
c487385980
@ -1,9 +1,9 @@
|
|||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
from typing import List
|
from typing import List, Optional
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from apps.rag.search.main import SearchResult, filter_by_whitelist
|
from apps.rag.search.main import SearchResult, get_filtered_results
|
||||||
from config import SRC_LOG_LEVELS
|
from config import SRC_LOG_LEVELS
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
@ -11,7 +11,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
|
|||||||
|
|
||||||
|
|
||||||
def search_serpstack(
|
def search_serpstack(
|
||||||
api_key: str, query: str, count: int, whitelist:List[str], 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.
|
||||||
|
|
||||||
@ -35,10 +35,11 @@ def search_serpstack(
|
|||||||
results = sorted(
|
results = sorted(
|
||||||
json_response.get("organic_results", []), key=lambda x: x.get("position", 0)
|
json_response.get("organic_results", []), key=lambda x: x.get("position", 0)
|
||||||
)
|
)
|
||||||
filtered_results = filter_by_whitelist(results, whitelist)
|
if 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")
|
||||||
)
|
)
|
||||||
for result in filtered_results[:count]
|
for result in results[:count]
|
||||||
]
|
]
|
||||||
|
Loading…
Reference in New Issue
Block a user