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/engines/duckduckgo_definitions.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'searx/engines/duckduckgo_definitions.py') diff --git a/searx/engines/duckduckgo_definitions.py b/searx/engines/duckduckgo_definitions.py index e1947f4c0..75021242f 100644 --- a/searx/engines/duckduckgo_definitions.py +++ b/searx/engines/duckduckgo_definitions.py @@ -21,7 +21,7 @@ from lxml import html from searx.data import WIKIDATA_UNITS from searx.utils import extract_text, html_to_text, get_string_replaces_function from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom -from searx.result_types import Answer +from searx.result_types import EngineResults if TYPE_CHECKING: import logging @@ -76,9 +76,9 @@ def request(query, params): return params -def response(resp): +def response(resp) -> EngineResults: # pylint: disable=too-many-locals, too-many-branches, too-many-statements - results = [] + results = EngineResults() search_res = resp.json() @@ -103,7 +103,12 @@ def response(resp): answer_type = search_res.get('AnswerType') logger.debug('AnswerType="%s" Answer="%s"', answer_type, answer) if isinstance(answer, str) and answer_type not in ['calc', 'ip']: - Answer(results=results, answer=html_to_text(answer), url=search_res.get('AbstractURL', '')) + results.add( + results.types.Answer( + answer=html_to_text(answer), + url=search_res.get('AbstractURL', ''), + ) + ) # add infobox if 'Definition' in search_res: -- cgit v1.2.3