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 --- tests/unit/engines/test_xpath.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/unit/engines/test_xpath.py') diff --git a/tests/unit/engines/test_xpath.py b/tests/unit/engines/test_xpath.py index 81af052b9..296328102 100644 --- a/tests/unit/engines/test_xpath.py +++ b/tests/unit/engines/test_xpath.py @@ -70,7 +70,7 @@ class TestXpathEngine(SearxTestCase): response = mock.Mock(text=self.html, status_code=200) results = xpath.response(response) - self.assertEqual(type(results), list) + self.assertIsInstance(results, list) self.assertEqual(len(results), 2) self.assertEqual(results[0]['title'], 'Result 1') self.assertEqual(results[0]['url'], 'https://result1.com/') @@ -82,7 +82,7 @@ class TestXpathEngine(SearxTestCase): # with cached urls, without results_xpath xpath.cached_xpath = '//div[@class="search_result"]//a[@class="cached"]/@href' results = xpath.response(response) - self.assertEqual(type(results), list) + self.assertIsInstance(results, list) self.assertEqual(len(results), 2) self.assertEqual(results[0]['cached_url'], 'https://cachedresult1.com') self.assertEqual(results[1]['cached_url'], 'https://cachedresult2.com') @@ -112,7 +112,7 @@ class TestXpathEngine(SearxTestCase): response = mock.Mock(text=self.html, status_code=200) results = xpath.response(response) - self.assertEqual(type(results), list) + self.assertIsInstance(results, list) self.assertEqual(len(results), 2) self.assertEqual(results[0]['title'], 'Result 1') self.assertEqual(results[0]['url'], 'https://result1.com/') @@ -124,7 +124,7 @@ class TestXpathEngine(SearxTestCase): # with cached urls, with results_xpath xpath.cached_xpath = './/a[@class="cached"]/@href' results = xpath.response(response) - self.assertEqual(type(results), list) + self.assertIsInstance(results, list) self.assertEqual(len(results), 2) self.assertEqual(results[0]['cached_url'], 'https://cachedresult1.com') self.assertEqual(results[1]['cached_url'], 'https://cachedresult2.com') -- cgit v1.2.3