Implement domain whitelisting for web search results

This commit is contained in:
Que Nguyen
2024-06-13 07:14:48 +07:00
committed by GitHub
parent a382e82dec
commit 7b5f434a07
10 changed files with 63 additions and 29 deletions
+5 -4
View File
@@ -1,15 +1,15 @@
import logging
from typing import List
import requests
from apps.rag.search.main import SearchResult
from apps.rag.search.main import SearchResult, filter_by_whitelist
from config import SRC_LOG_LEVELS
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_brave(api_key: str, query: str, count: int) -> list[SearchResult]:
def search_brave(api_key: str, query: str, whitelist:List[str], count: int) -> list[SearchResult]:
"""Search using Brave's Search API and return the results as a list of SearchResult objects.
Args:
@@ -29,9 +29,10 @@ def search_brave(api_key: str, query: str, count: int) -> list[SearchResult]:
json_response = response.json()
results = json_response.get("web", {}).get("results", [])
filtered_results = filter_by_whitelist(results, whitelist)
return [
SearchResult(
link=result["url"], title=result.get("title"), snippet=result.get("snippet")
)
for result in results[:count]
for result in filtered_results[:count]
]
+6 -5
View File
@@ -1,6 +1,6 @@
import logging
from apps.rag.search.main import SearchResult
from typing import List
from apps.rag.search.main import SearchResult, filter_by_whitelist
from duckduckgo_search import DDGS
from config import SRC_LOG_LEVELS
@@ -8,7 +8,7 @@ log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_duckduckgo(query: str, count: int) -> list[SearchResult]:
def search_duckduckgo(query: str, count: int, whitelist:List[str]) -> list[SearchResult]:
"""
Search using DuckDuckGo's Search API and return the results as a list of SearchResult objects.
Args:
@@ -41,6 +41,7 @@ def search_duckduckgo(query: str, count: int) -> list[SearchResult]:
snippet=result.get("body"),
)
)
print(results)
# print(results)
filtered_results = filter_by_whitelist(results, whitelist)
# Return the list of search results
return results
return filtered_results
+5 -4
View File
@@ -1,9 +1,9 @@
import json
import logging
from typing import List
import requests
from apps.rag.search.main import SearchResult
from apps.rag.search.main import SearchResult, filter_by_whitelist
from config import SRC_LOG_LEVELS
log = logging.getLogger(__name__)
@@ -11,7 +11,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_google_pse(
api_key: str, search_engine_id: str, query: str, count: int
api_key: str, search_engine_id: str, query: str, count: int, whitelist:List[str]
) -> list[SearchResult]:
"""Search using Google's Programmable Search Engine API and return the results as a list of SearchResult objects.
@@ -35,11 +35,12 @@ def search_google_pse(
json_response = response.json()
results = json_response.get("items", [])
filtered_results = filter_by_whitelist(results, whitelist)
return [
SearchResult(
link=result["link"],
title=result.get("title"),
snippet=result.get("snippet"),
)
for result in results
for result in filtered_results
]
+11 -1
View File
@@ -1,8 +1,18 @@
from typing import Optional
from urllib.parse import urlparse
from pydantic import BaseModel
def filter_by_whitelist(results, whitelist):
if not whitelist:
return results
filtered_results = []
for result in results:
domain = urlparse(result["url"]).netloc
if any(domain.endswith(whitelisted_domain) for whitelisted_domain in whitelist):
filtered_results.append(result)
return filtered_results
class SearchResult(BaseModel):
link: str
title: Optional[str]
+3 -2
View File
@@ -11,7 +11,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_searxng(
query_url: str, query: str, count: int, **kwargs
query_url: str, query: str, count: int, whitelist:List[str], **kwargs
) -> List[SearchResult]:
"""
Search a SearXNG instance for a given query and return the results as a list of SearchResult objects.
@@ -78,9 +78,10 @@ def search_searxng(
json_response = response.json()
results = json_response.get("results", [])
sorted_results = sorted(results, key=lambda x: x.get("score", 0), reverse=True)
filtered_results = filter_by_whitelist(sorted_results, whitelist)
return [
SearchResult(
link=result["url"], title=result.get("title"), snippet=result.get("content")
)
for result in sorted_results[:count]
for result in filtered_results[:count]
]
+5 -4
View File
@@ -1,16 +1,16 @@
import json
import logging
from typing import List
import requests
from apps.rag.search.main import SearchResult
from apps.rag.search.main import SearchResult, filter_by_whitelist
from config import SRC_LOG_LEVELS
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_serper(api_key: str, query: str, count: int) -> list[SearchResult]:
def search_serper(api_key: str, query: str, count: int, whitelist:List[str]) -> list[SearchResult]:
"""Search using serper.dev's API and return the results as a list of SearchResult objects.
Args:
@@ -29,11 +29,12 @@ def search_serper(api_key: str, query: str, count: int) -> list[SearchResult]:
results = sorted(
json_response.get("organic", []), key=lambda x: x.get("position", 0)
)
filtered_results = filter_by_whitelist(results, whitelist)
return [
SearchResult(
link=result["link"],
title=result.get("title"),
snippet=result.get("description"),
)
for result in results[:count]
for result in filtered_results[:count]
]
+5 -4
View File
@@ -1,10 +1,10 @@
import json
import logging
from typing import List
import requests
from urllib.parse import urlencode
from apps.rag.search.main import SearchResult
from apps.rag.search.main import SearchResult, filter_by_whitelist
from config import SRC_LOG_LEVELS
log = logging.getLogger(__name__)
@@ -15,6 +15,7 @@ def search_serply(
api_key: str,
query: str,
count: int,
whitelist:List[str],
hl: str = "us",
limit: int = 10,
device_type: str = "desktop",
@@ -57,12 +58,12 @@ def search_serply(
results = sorted(
json_response.get("results", []), key=lambda x: x.get("realPosition", 0)
)
filtered_results = filter_by_whitelist(results, whitelist)
return [
SearchResult(
link=result["link"],
title=result.get("title"),
snippet=result.get("description"),
)
for result in results[:count]
for result in filtered_results[:count]
]
+5 -4
View File
@@ -1,9 +1,9 @@
import json
import logging
from typing import List
import requests
from apps.rag.search.main import SearchResult
from apps.rag.search.main import SearchResult, filter_by_whitelist
from config import SRC_LOG_LEVELS
log = logging.getLogger(__name__)
@@ -11,7 +11,7 @@ log.setLevel(SRC_LOG_LEVELS["RAG"])
def search_serpstack(
api_key: str, query: str, count: int, https_enabled: bool = True
api_key: str, query: str, count: int, whitelist:List[str], https_enabled: bool = True
) -> list[SearchResult]:
"""Search using serpstack.com's and return the results as a list of SearchResult objects.
@@ -35,9 +35,10 @@ def search_serpstack(
results = sorted(
json_response.get("organic_results", []), key=lambda x: x.get("position", 0)
)
filtered_results = filter_by_whitelist(results, whitelist)
return [
SearchResult(
link=result["url"], title=result.get("title"), snippet=result.get("snippet")
)
for result in results[:count]
for result in filtered_results[:count]
]