mirror of
https://github.com/searxng/searxng.git
synced 2025-02-23 15:26:23 +00:00
Typification of SearXNG ======================= This patch introduces the typing of the results. The why and how is described in the documentation, please generate the documentation .. $ make docs.clean docs.live and read the following articles in the "Developer documentation": - result types --> http://0.0.0.0:8000/dev/result_types/index.html The result types are available from the `searx.result_types` module. The following have been implemented so far: - base result type: `searx.result_type.Result` --> http://0.0.0.0:8000/dev/result_types/base_result.html - answer results --> http://0.0.0.0:8000/dev/result_types/answer.html including the type for translations (inspired by #3925). For all other types (which still need to be set up in subsequent PRs), template documentation has been created for the transition period. Doc of the fields used in Templates =================================== The template documentation is the basis for the typing and is the first complete documentation of the results (needed for engine development). It is the "working paper" (the plan) with which further typifications can be implemented in subsequent PRs. - https://github.com/searxng/searxng/issues/357 Answer Templates ================ With the new (sub) types for `Answer`, the templates for the answers have also been revised, `Translation` are now displayed with collapsible entries (inspired by #3925). !en-de dog Plugins & Answerer ================== The implementation for `Plugin` and `Answer` has been revised, see documentation: - Plugin: http://0.0.0.0:8000/dev/plugins/index.html - Answerer: http://0.0.0.0:8000/dev/answerers/index.html With `AnswerStorage` and `AnswerStorage` to manage those items (in follow up PRs, `ArticleStorage`, `InfoStorage` and .. will be implemented) Autocomplete ============ The autocompletion had a bug where the results from `Answer` had not been shown in the past. To test activate autocompletion and try search terms for which we have answerers - statistics: type `min 1 2 3` .. in the completion list you should find an entry like `[de] min(1, 2, 3) = 1` - random: type `random uuid` .. in the completion list, the first item is a random UUID Extended Types ============== SearXNG extends e.g. the request and response types of flask and httpx, a module has been set up for type extensions: - Extended Types --> http://0.0.0.0:8000/dev/extended_types.html Unit-Tests ========== The unit tests have been completely revised. In the previous implementation, the runtime (the global variables such as `searx.settings`) was not initialized before each test, so the runtime environment with which a test ran was always determined by the tests that ran before it. This was also the reason why we sometimes had to observe non-deterministic errors in the tests in the past: - https://github.com/searxng/searxng/issues/2988 is one example for the Runtime issues, with non-deterministic behavior .. - https://github.com/searxng/searxng/pull/3650 - https://github.com/searxng/searxng/pull/3654 - https://github.com/searxng/searxng/pull/3642#issuecomment-2226884469 - https://github.com/searxng/searxng/pull/3746#issuecomment-2300965005 Why msgspec.Struct ================== We have already discussed typing based on e.g. `TypeDict` or `dataclass` in the past: - https://github.com/searxng/searxng/pull/1562/files - https://gist.github.com/dalf/972eb05e7a9bee161487132a7de244d2 - https://github.com/searxng/searxng/pull/1412/files - https://github.com/searxng/searxng/pull/1356 In my opinion, TypeDict is unsuitable because the objects are still dictionaries and not instances of classes / the `dataclass` are classes but ... The `msgspec.Struct` combine the advantages of typing, runtime behaviour and also offer the option of (fast) serializing (incl. type check) the objects. Currently not possible but conceivable with `msgspec`: Outsourcing the engines into separate processes, what possibilities this opens up in the future is left to the imagination! Internally, we have already defined that it is desirable to decouple the development of the engines from the development of the SearXNG core / The serialization of the `Result` objects is a prerequisite for this. HINT: The threads listed above were the template for this PR, even though the implementation here is based on msgspec. They should also be an inspiration for the following PRs of typification, as the models and implementations can provide a good direction. Why just one commit? ==================== I tried to create several (thematically separated) commits, but gave up at some point ... there are too many things to tackle at once / The comprehensibility of the commits would not be improved by a thematic separation. On the contrary, we would have to make multiple changes at the same places and the goal of a change would be vaguely recognizable in the fog of the commits. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
182 lines
5.2 KiB
Python
182 lines
5.2 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
# pylint: disable=too-many-branches
|
|
"""
|
|
.. attention::
|
|
|
|
The **"Hostname replace"** plugin has been replace by **"Hostnames
|
|
plugin"**, see :pull:`3463` & :pull:`3552`.
|
|
|
|
The **Hostnames plugin** can be enabled by adding it to the
|
|
``enabled_plugins`` **list** in the ``setting.yml`` like so.
|
|
|
|
.. code:: yaml
|
|
|
|
enabled_plugins:
|
|
- 'Hostnames plugin'
|
|
...
|
|
|
|
- ``hostnames.replace``: A **mapping** of regular expressions to hostnames to be
|
|
replaced by other hostnames.
|
|
|
|
.. code:: yaml
|
|
|
|
hostnames:
|
|
replace:
|
|
'(.*\\.)?youtube\\.com$': 'invidious.example.com'
|
|
'(.*\\.)?youtu\\.be$': 'invidious.example.com'
|
|
...
|
|
|
|
- ``hostnames.remove``: A **list** of regular expressions of the hostnames whose
|
|
results should be taken from the results list.
|
|
|
|
.. code:: yaml
|
|
|
|
hostnames:
|
|
remove:
|
|
- '(.*\\.)?facebook.com$'
|
|
- ...
|
|
|
|
- ``hostnames.high_priority``: A **list** of regular expressions for hostnames
|
|
whose result should be given higher priority. The results from these hosts are
|
|
arranged higher in the results list.
|
|
|
|
.. code:: yaml
|
|
|
|
hostnames:
|
|
high_priority:
|
|
- '(.*\\.)?wikipedia.org$'
|
|
- ...
|
|
|
|
- ``hostnames.lower_priority``: A **list** of regular expressions for hostnames
|
|
whose result should be given lower priority. The results from these hosts are
|
|
arranged lower in the results list.
|
|
|
|
.. code:: yaml
|
|
|
|
hostnames:
|
|
low_priority:
|
|
- '(.*\\.)?google(\\..*)?$'
|
|
- ...
|
|
|
|
If the URL matches the pattern of ``high_priority`` AND ``low_priority``, the
|
|
higher priority wins over the lower priority.
|
|
|
|
Alternatively, you can also specify a file name for the **mappings** or
|
|
**lists** to load these from an external file:
|
|
|
|
.. code:: yaml
|
|
|
|
hostnames:
|
|
replace: 'rewrite-hosts.yml'
|
|
remove:
|
|
- '(.*\\.)?facebook.com$'
|
|
- ...
|
|
low_priority:
|
|
- '(.*\\.)?google(\\..*)?$'
|
|
- ...
|
|
high_priority:
|
|
- '(.*\\.)?wikipedia.org$'
|
|
- ...
|
|
|
|
The ``rewrite-hosts.yml`` from the example above must be in the folder in which
|
|
the ``settings.yml`` file is already located (``/etc/searxng``). The file then
|
|
only contains the lists or the mapping tables without further information on the
|
|
namespaces. In the example above, this would be a mapping table that looks
|
|
something like this:
|
|
|
|
.. code:: yaml
|
|
|
|
'(.*\\.)?youtube\\.com$': 'invidious.example.com'
|
|
'(.*\\.)?youtu\\.be$': 'invidious.example.com'
|
|
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from urllib.parse import urlunparse, urlparse
|
|
|
|
from flask_babel import gettext
|
|
|
|
from searx import settings
|
|
from searx.settings_loader import get_yaml_cfg
|
|
|
|
|
|
name = gettext('Hostnames plugin')
|
|
description = gettext('Rewrite hostnames, remove results or prioritize them based on the hostname')
|
|
default_on = False
|
|
preference_section = 'general'
|
|
|
|
plugin_id = 'hostnames'
|
|
|
|
parsed = 'parsed_url'
|
|
_url_fields = ['iframe_src', 'audio_src']
|
|
|
|
|
|
def _load_regular_expressions(settings_key) -> dict | set | None:
|
|
setting_value = settings.get(plugin_id, {}).get(settings_key)
|
|
|
|
if not setting_value:
|
|
return None
|
|
|
|
# load external file with configuration
|
|
if isinstance(setting_value, str):
|
|
setting_value = get_yaml_cfg(setting_value)
|
|
|
|
if isinstance(setting_value, list):
|
|
return {re.compile(r) for r in setting_value}
|
|
|
|
if isinstance(setting_value, dict):
|
|
return {re.compile(p): r for (p, r) in setting_value.items()}
|
|
|
|
return None
|
|
|
|
|
|
replacements: dict = _load_regular_expressions('replace') or {} # type: ignore
|
|
removables: set = _load_regular_expressions('remove') or set() # type: ignore
|
|
high_priority: set = _load_regular_expressions('high_priority') or set() # type: ignore
|
|
low_priority: set = _load_regular_expressions('low_priority') or set() # type: ignore
|
|
|
|
|
|
def _matches_parsed_url(result, pattern):
|
|
return parsed in result and pattern.search(result[parsed].netloc)
|
|
|
|
|
|
def on_result(_request, _search, result) -> bool:
|
|
for pattern, replacement in replacements.items():
|
|
if _matches_parsed_url(result, pattern):
|
|
# logger.debug(result['url'])
|
|
result[parsed] = result[parsed]._replace(netloc=pattern.sub(replacement, result[parsed].netloc))
|
|
result['url'] = urlunparse(result[parsed])
|
|
# logger.debug(result['url'])
|
|
|
|
for url_field in _url_fields:
|
|
if not result.get(url_field):
|
|
continue
|
|
|
|
url_src = urlparse(result[url_field])
|
|
if pattern.search(url_src.netloc):
|
|
url_src = url_src._replace(netloc=pattern.sub(replacement, url_src.netloc))
|
|
result[url_field] = urlunparse(url_src)
|
|
|
|
for pattern in removables:
|
|
if _matches_parsed_url(result, pattern):
|
|
return False
|
|
|
|
for url_field in _url_fields:
|
|
if not result.get(url_field):
|
|
continue
|
|
|
|
url_src = urlparse(result[url_field])
|
|
if pattern.search(url_src.netloc):
|
|
del result[url_field]
|
|
|
|
for pattern in low_priority:
|
|
if _matches_parsed_url(result, pattern):
|
|
result['priority'] = 'low'
|
|
|
|
for pattern in high_priority:
|
|
if _matches_parsed_url(result, pattern):
|
|
result['priority'] = 'high'
|
|
|
|
return True
|