summaryrefslogtreecommitdiff
path: root/searx/engines/duckduckgo.py
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2025-01-27 16:43:43 +0100
committerMarkus Heiser <markus.heiser@darmarIT.de>2025-01-28 07:07:08 +0100
commit36a1ef12399d529f210ceb4f8b28f497fabd0834 (patch)
tree4015a316c6505c3e52d43eea7137338331cbd4eb /searx/engines/duckduckgo.py
parentedfbf1e1183815cea3b723f3b66260bc55679f32 (diff)
[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 <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/engines/duckduckgo.py')
-rw-r--r--searx/engines/duckduckgo.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index ff6727959..a03a94063 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -27,7 +27,7 @@ from searx.network import get # see https://github.com/searxng/searxng/issues/7
from searx import redisdb
from searx.enginelib.traits import EngineTraits
from searx.exceptions import SearxEngineCaptchaException
-from searx.result_types import Answer
+from searx.result_types import EngineResults
if TYPE_CHECKING:
import logging
@@ -355,12 +355,12 @@ def is_ddg_captcha(dom):
return bool(eval_xpath(dom, "//form[@id='challenge-form']"))
-def response(resp):
+def response(resp) -> EngineResults:
+ results = EngineResults()
if resp.status_code == 303:
- return []
+ return results
- results = []
doc = lxml.html.fromstring(resp.text)
if is_ddg_captcha(doc):
@@ -398,8 +398,15 @@ def response(resp):
and "URL Decoded:" not in zero_click
):
current_query = resp.search_params["data"].get("q")
-
- Answer(results=results, answer=zero_click, url="https://duckduckgo.com/?" + urlencode({"q": current_query}))
+ results.add(
+ results.types.Answer(
+ answer=zero_click,
+ url="https://duckduckgo.com/?"
+ + urlencode(
+ {"q": current_query},
+ ),
+ )
+ )
return results