From 36a1ef12399d529f210ceb4f8b28f497fabd0834 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 27 Jan 2025 16:43:43 +0100 Subject: [refactor] typification of SearXNG / EngineResults In [1] and [2] we discussed the need of a Result.results property and how we can avoid unclear code. This patch implements a class for the reslut-lists of engines:: searx.result_types.EngineResults A simple example for the usage in engine development:: from searx.result_types import EngineResults ... def response(resp) -> EngineResults: res = EngineResults() ... res.add( res.types.Answer(answer="lorem ipsum ..", url="https://example.org") ) ... return res [1] https://github.com/searxng/searxng/pull/4183#pullrequestreview-257400034 [2] https://github.com/searxng/searxng/pull/4183#issuecomment-2614301580 Signed-off-by: Markus Heiser --- searx/plugins/self_info.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'searx/plugins/self_info.py') diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py index d1d7f12b9..f5498e480 100644 --- a/searx/plugins/self_info.py +++ b/searx/plugins/self_info.py @@ -7,7 +7,7 @@ import re from flask_babel import gettext from searx.botdetection._helpers import get_real_ip -from searx.result_types import Answer +from searx.result_types import EngineResults from . import Plugin, PluginInfo @@ -41,17 +41,17 @@ class SXNGPlugin(Plugin): preference_section="query", ) - def post_search(self, request: "SXNG_Request", search: "SearchWithPlugins") -> list[Answer]: + def post_search(self, request: "SXNG_Request", search: "SearchWithPlugins") -> EngineResults: """Returns a result list only for the first page.""" - results = [] + results = EngineResults() if search.search_query.pageno > 1: return results if self.ip_regex.search(search.search_query.query): - Answer(results=results, answer=gettext("Your IP is: ") + get_real_ip(request)) + results.add(results.types.Answer(answer=gettext("Your IP is: ") + get_real_ip(request))) if self.ua_regex.match(search.search_query.query): - Answer(results=results, answer=gettext("Your user-agent is: ") + str(request.user_agent)) + results.add(results.types.Answer(answer=gettext("Your user-agent is: ") + str(request.user_agent))) return results -- cgit v1.2.3