2021-01-13 10:31:25 +00:00
|
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
2021-06-09 15:11:06 +00:00
|
|
|
"""OpenStreetMap (Map)
|
|
|
|
|
|
|
|
"""
|
2014-09-06 12:09:03 +00:00
|
|
|
|
2020-06-09 15:01:59 +00:00
|
|
|
import re
|
[refactor] typification of SearXNG (initial) / result items (part 1)
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>
2024-12-15 08:59:50 +00:00
|
|
|
import urllib.parse
|
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
from functools import partial
|
|
|
|
|
2020-06-09 15:01:59 +00:00
|
|
|
from flask_babel import gettext
|
2014-09-06 12:09:03 +00:00
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
from searx.data import OSM_KEYS_TAGS, CURRENCIES
|
|
|
|
from searx.external_urls import get_external_url
|
2022-02-07 12:05:52 +00:00
|
|
|
from searx.engines.wikidata import send_wikidata_query, sparql_string_escape, get_thumbnail
|
2025-01-27 15:43:43 +00:00
|
|
|
from searx.result_types import EngineResults
|
2021-06-04 07:35:26 +00:00
|
|
|
|
2021-01-13 10:31:25 +00:00
|
|
|
# about
|
|
|
|
about = {
|
|
|
|
"website": 'https://www.openstreetmap.org/',
|
|
|
|
"wikidata_id": 'Q936',
|
|
|
|
"official_api_documentation": 'http://wiki.openstreetmap.org/wiki/Nominatim',
|
|
|
|
"use_official_api": True,
|
|
|
|
"require_api_key": False,
|
|
|
|
"results": 'JSON',
|
|
|
|
}
|
|
|
|
|
2014-09-06 12:09:03 +00:00
|
|
|
# engine dependent config
|
|
|
|
categories = ['map']
|
|
|
|
paging = False
|
2022-06-29 18:14:04 +00:00
|
|
|
language_support = True
|
2022-08-01 15:01:59 +00:00
|
|
|
send_accept_language_header = True
|
2014-09-06 12:09:03 +00:00
|
|
|
|
|
|
|
# search-url
|
2014-12-16 16:01:25 +00:00
|
|
|
base_url = 'https://nominatim.openstreetmap.org/'
|
2021-06-04 07:35:26 +00:00
|
|
|
search_string = 'search?{query}&polygon_geojson=1&format=jsonv2&addressdetails=1&extratags=1&dedupe=1'
|
|
|
|
result_id_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
|
|
|
|
result_lat_lon_url = 'https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom={zoom}&layers=M'
|
2014-09-06 12:09:03 +00:00
|
|
|
|
[refactor] typification of SearXNG (initial) / result items (part 1)
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>
2024-12-15 08:59:50 +00:00
|
|
|
route_url = 'https://graphhopper.com/maps'
|
2020-06-09 15:01:59 +00:00
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
wikidata_image_sparql = """
|
|
|
|
select ?item ?itemLabel ?image ?sign ?symbol ?website ?wikipediaName
|
|
|
|
where {
|
2021-09-25 09:16:22 +00:00
|
|
|
hint:Query hint:optimizer "None".
|
2021-06-04 07:35:26 +00:00
|
|
|
values ?item { %WIKIDATA_IDS% }
|
|
|
|
OPTIONAL { ?item wdt:P18|wdt:P8517|wdt:P4291|wdt:P5252|wdt:P3451|wdt:P4640|wdt:P5775|wdt:P2716|wdt:P1801|wdt:P4896 ?image }
|
|
|
|
OPTIONAL { ?item wdt:P1766|wdt:P8505|wdt:P8667 ?sign }
|
|
|
|
OPTIONAL { ?item wdt:P41|wdt:P94|wdt:P154|wdt:P158|wdt:P2910|wdt:P4004|wdt:P5962|wdt:P8972 ?symbol }
|
|
|
|
OPTIONAL { ?item wdt:P856 ?website }
|
|
|
|
SERVICE wikibase:label {
|
|
|
|
bd:serviceParam wikibase:language "%LANGUAGE%,en".
|
|
|
|
?item rdfs:label ?itemLabel .
|
|
|
|
}
|
|
|
|
OPTIONAL {
|
|
|
|
?wikipediaUrl schema:about ?item;
|
|
|
|
schema:isPartOf/wikibase:wikiGroup "wikipedia";
|
|
|
|
schema:name ?wikipediaName;
|
|
|
|
schema:inLanguage "%LANGUAGE%" .
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ORDER by ?item
|
|
|
|
"""
|
|
|
|
|
2014-09-06 12:09:03 +00:00
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
# key value that are link: mapping functions
|
|
|
|
# 'mapillary': P1947
|
|
|
|
# but https://github.com/kartaview/openstreetcam.org/issues/60
|
|
|
|
# but https://taginfo.openstreetmap.org/keys/kartaview ...
|
|
|
|
def value_to_https_link(value):
|
|
|
|
http = 'http://'
|
|
|
|
if value.startswith(http):
|
|
|
|
value = 'https://' + value[len(http) :]
|
|
|
|
return (value, value)
|
|
|
|
|
|
|
|
|
|
|
|
def value_to_website_link(value):
|
|
|
|
value = value.split(';')[0]
|
|
|
|
return (value, value)
|
|
|
|
|
|
|
|
|
|
|
|
def value_wikipedia_link(value):
|
|
|
|
value = value.split(':', 1)
|
|
|
|
return ('https://{0}.wikipedia.org/wiki/{1}'.format(*value), '{1} ({0})'.format(*value))
|
|
|
|
|
|
|
|
|
|
|
|
def value_with_prefix(prefix, value):
|
|
|
|
return (prefix + value, value)
|
|
|
|
|
|
|
|
|
|
|
|
VALUE_TO_LINK = {
|
|
|
|
'website': value_to_website_link,
|
|
|
|
'contact:website': value_to_website_link,
|
|
|
|
'email': partial(value_with_prefix, 'mailto:'),
|
|
|
|
'contact:email': partial(value_with_prefix, 'mailto:'),
|
|
|
|
'contact:phone': partial(value_with_prefix, 'tel:'),
|
|
|
|
'phone': partial(value_with_prefix, 'tel:'),
|
|
|
|
'fax': partial(value_with_prefix, 'fax:'),
|
|
|
|
'contact:fax': partial(value_with_prefix, 'fax:'),
|
|
|
|
'contact:mastodon': value_to_https_link,
|
|
|
|
'facebook': value_to_https_link,
|
|
|
|
'contact:facebook': value_to_https_link,
|
|
|
|
'contact:foursquare': value_to_https_link,
|
|
|
|
'contact:instagram': value_to_https_link,
|
|
|
|
'contact:linkedin': value_to_https_link,
|
|
|
|
'contact:pinterest': value_to_https_link,
|
|
|
|
'contact:telegram': value_to_https_link,
|
|
|
|
'contact:tripadvisor': value_to_https_link,
|
|
|
|
'contact:twitter': value_to_https_link,
|
|
|
|
'contact:yelp': value_to_https_link,
|
|
|
|
'contact:youtube': value_to_https_link,
|
|
|
|
'contact:webcam': value_to_website_link,
|
|
|
|
'wikipedia': value_wikipedia_link,
|
|
|
|
'wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),
|
|
|
|
'brand:wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),
|
|
|
|
}
|
|
|
|
KEY_ORDER = [
|
|
|
|
'cuisine',
|
|
|
|
'organic',
|
|
|
|
'delivery',
|
|
|
|
'delivery:covid19',
|
|
|
|
'opening_hours',
|
|
|
|
'opening_hours:covid19',
|
|
|
|
'fee',
|
|
|
|
'payment:*',
|
|
|
|
'currency:*',
|
|
|
|
'outdoor_seating',
|
|
|
|
'bench',
|
|
|
|
'wheelchair',
|
|
|
|
'level',
|
|
|
|
'building:levels',
|
|
|
|
'bin',
|
|
|
|
'public_transport',
|
|
|
|
'internet_access:ssid',
|
|
|
|
]
|
|
|
|
KEY_RANKS = {k: i for i, k in enumerate(KEY_ORDER)}
|
2020-06-09 15:01:59 +00:00
|
|
|
|
2014-12-16 14:01:05 +00:00
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
def request(query, params):
|
[refactor] typification of SearXNG (initial) / result items (part 1)
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>
2024-12-15 08:59:50 +00:00
|
|
|
params['url'] = base_url + search_string.format(query=urllib.parse.urlencode({'q': query}))
|
2014-09-06 12:09:03 +00:00
|
|
|
return params
|
|
|
|
|
|
|
|
|
2025-01-27 15:43:43 +00:00
|
|
|
def response(resp) -> EngineResults:
|
|
|
|
results = EngineResults()
|
[refactor] typification of SearXNG (initial) / result items (part 1)
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>
2024-12-15 08:59:50 +00:00
|
|
|
|
|
|
|
nominatim_json = resp.json()
|
2021-06-04 07:35:26 +00:00
|
|
|
user_language = resp.search_params['language']
|
2014-09-06 12:09:03 +00:00
|
|
|
|
[refactor] typification of SearXNG (initial) / result items (part 1)
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>
2024-12-15 08:59:50 +00:00
|
|
|
l = re.findall(r"from\s+(.*)\s+to\s+(.+)", resp.search_params["query"])
|
|
|
|
if not l:
|
|
|
|
l = re.findall(r"\s*(.*)\s+to\s+(.+)", resp.search_params["query"])
|
|
|
|
if l:
|
|
|
|
point1, point2 = [urllib.parse.quote_plus(p) for p in l[0]]
|
2025-01-27 15:43:43 +00:00
|
|
|
|
|
|
|
results.add(
|
|
|
|
results.types.Answer(
|
|
|
|
answer=gettext('Show route in map ..'),
|
|
|
|
url=f"{route_url}/?point={point1}&point={point2}",
|
|
|
|
)
|
2021-12-27 08:26:22 +00:00
|
|
|
)
|
2021-06-04 07:35:26 +00:00
|
|
|
|
2023-09-15 07:53:03 +00:00
|
|
|
# simplify the code below: make sure extratags is a dictionary
|
2023-08-22 17:52:12 +00:00
|
|
|
for result in nominatim_json:
|
|
|
|
if not isinstance(result.get('extratags'), dict):
|
|
|
|
result["extratags"] = {}
|
|
|
|
|
|
|
|
# fetch data from wikidata
|
2021-06-04 07:35:26 +00:00
|
|
|
fetch_wikidata(nominatim_json, user_language)
|
2020-06-09 15:01:59 +00:00
|
|
|
|
2023-08-22 17:52:12 +00:00
|
|
|
# create results
|
2021-06-04 07:35:26 +00:00
|
|
|
for result in nominatim_json:
|
|
|
|
title, address = get_title_address(result)
|
|
|
|
|
|
|
|
# ignore result without title
|
|
|
|
if not title:
|
2015-02-07 00:15:04 +00:00
|
|
|
continue
|
|
|
|
|
2021-06-04 07:35:26 +00:00
|
|
|
url, osm, geojson = get_url_osm_geojson(result)
|
2024-05-12 15:52:52 +00:00
|
|
|
thumbnail = get_thumbnail(get_img_src(result))
|
2021-06-04 07:35:26 +00:00
|
|
|
links, link_keys = get_links(result, user_language)
|
|
|
|
data = get_data(result, user_language, link_keys)
|
2014-11-03 17:46:58 +00:00
|
|
|
|
2021-12-27 08:26:22 +00:00
|
|
|
results.append(
|
|
|
|
{
|
|
|
|
'template': 'map.html',
|
|
|
|
'title': title,
|
|
|
|
'address': address,
|
|
|
|
'address_label': get_key_label('addr', user_language),
|
|
|
|
'url': url,
|
|
|
|
'osm': osm,
|
|
|
|
'geojson': geojson,
|
2024-05-12 15:52:52 +00:00
|
|
|
'thumbnail': thumbnail,
|
2021-12-27 08:26:22 +00:00
|
|
|
'links': links,
|
|
|
|
'data': data,
|
|
|
|
'type': get_tag_label(result.get('category'), result.get('type', ''), user_language),
|
|
|
|
'type_icon': result.get('icon'),
|
|
|
|
'content': '',
|
|
|
|
'longitude': result['lon'],
|
|
|
|
'latitude': result['lat'],
|
|
|
|
'boundingbox': result['boundingbox'],
|
|
|
|
}
|
|
|
|
)
|
2014-09-06 12:09:03 +00:00
|
|
|
|
|
|
|
return results
|
2021-06-04 07:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
def get_wikipedia_image(raw_value):
|
|
|
|
if not raw_value:
|
|
|
|
return None
|
|
|
|
return get_external_url('wikimedia_image', raw_value)
|
|
|
|
|
|
|
|
|
2022-07-02 14:49:25 +00:00
|
|
|
def fetch_wikidata(nominatim_json, user_language):
|
2021-06-04 07:35:26 +00:00
|
|
|
"""Update nominatim_json using the result of an unique to wikidata
|
|
|
|
|
|
|
|
For result in nominatim_json:
|
|
|
|
If result['extratags']['wikidata'] or r['extratags']['wikidata link']:
|
|
|
|
Set result['wikidata'] to { 'image': ..., 'image_sign':..., 'image_symbal':... }
|
|
|
|
Set result['extratags']['wikipedia'] if not defined
|
|
|
|
Set result['extratags']['contact:website'] if not defined
|
|
|
|
"""
|
|
|
|
wikidata_ids = []
|
|
|
|
wd_to_results = {}
|
|
|
|
for result in nominatim_json:
|
2023-08-22 17:52:12 +00:00
|
|
|
extratags = result['extratags']
|
|
|
|
# ignore brand:wikidata
|
|
|
|
wd_id = extratags.get('wikidata', extratags.get('wikidata link'))
|
|
|
|
if wd_id and wd_id not in wikidata_ids:
|
|
|
|
wikidata_ids.append('wd:' + wd_id)
|
|
|
|
wd_to_results.setdefault(wd_id, []).append(result)
|
2021-06-04 07:35:26 +00:00
|
|
|
|
|
|
|
if wikidata_ids:
|
2022-07-02 14:49:25 +00:00
|
|
|
user_language = 'en' if user_language == 'all' else user_language.split('-')[0]
|
2021-06-04 07:35:26 +00:00
|
|
|
wikidata_ids_str = " ".join(wikidata_ids)
|
|
|
|
query = wikidata_image_sparql.replace('%WIKIDATA_IDS%', sparql_string_escape(wikidata_ids_str)).replace(
|
2022-07-02 14:49:25 +00:00
|
|
|
'%LANGUAGE%', sparql_string_escape(user_language)
|
2021-06-04 07:35:26 +00:00
|
|
|
)
|
|
|
|
wikidata_json = send_wikidata_query(query)
|
|
|
|
for wd_result in wikidata_json.get('results', {}).get('bindings', {}):
|
|
|
|
wd_id = wd_result['item']['value'].replace('http://www.wikidata.org/entity/', '')
|
|
|
|
for result in wd_to_results.get(wd_id, []):
|
|
|
|
result['wikidata'] = {
|
|
|
|
'itemLabel': wd_result['itemLabel']['value'],
|
|
|
|
'image': get_wikipedia_image(wd_result.get('image', {}).get('value')),
|
|
|
|
'image_sign': get_wikipedia_image(wd_result.get('sign', {}).get('value')),
|
|
|
|
'image_symbol': get_wikipedia_image(wd_result.get('symbol', {}).get('value')),
|
|
|
|
}
|
|
|
|
# overwrite wikipedia link
|
|
|
|
wikipedia_name = wd_result.get('wikipediaName', {}).get('value')
|
|
|
|
if wikipedia_name:
|
2022-07-02 14:49:25 +00:00
|
|
|
result['extratags']['wikipedia'] = user_language + ':' + wikipedia_name
|
2021-06-04 07:35:26 +00:00
|
|
|
# get website if not already defined
|
|
|
|
website = wd_result.get('website', {}).get('value')
|
|
|
|
if (
|
|
|
|
website
|
|
|
|
and not result['extratags'].get('contact:website')
|
|
|
|
and not result['extratags'].get('website')
|
|
|
|
):
|
|
|
|
result['extratags']['contact:website'] = website
|
|
|
|
|
|
|
|
|
|
|
|
def get_title_address(result):
|
|
|
|
"""Return title and address
|
|
|
|
|
|
|
|
title may be None
|
|
|
|
"""
|
|
|
|
address_raw = result.get('address')
|
|
|
|
address_name = None
|
|
|
|
address = {}
|
|
|
|
|
|
|
|
# get name
|
|
|
|
if (
|
|
|
|
result['category'] == 'amenity'
|
|
|
|
or result['category'] == 'shop'
|
|
|
|
or result['category'] == 'tourism'
|
|
|
|
or result['category'] == 'leisure'
|
|
|
|
):
|
|
|
|
if address_raw.get('address29'):
|
|
|
|
# https://github.com/osm-search/Nominatim/issues/1662
|
|
|
|
address_name = address_raw.get('address29')
|
|
|
|
else:
|
2021-12-27 08:26:22 +00:00
|
|
|
address_name = address_raw.get(result['category'])
|
2021-06-04 07:35:26 +00:00
|
|
|
elif result['type'] in address_raw:
|
2021-12-27 08:26:22 +00:00
|
|
|
address_name = address_raw.get(result['type'])
|
2021-06-04 07:35:26 +00:00
|
|
|
|
|
|
|
# add rest of adressdata, if something is already found
|
|
|
|
if address_name:
|
|
|
|
title = address_name
|
|
|
|
address.update(
|
|
|
|
{
|
|
|
|
'name': address_name,
|
|
|
|
'house_number': address_raw.get('house_number'),
|
|
|
|
'road': address_raw.get('road'),
|
|
|
|
'locality': address_raw.get(
|
|
|
|
'city', address_raw.get('town', address_raw.get('village')) # noqa
|
|
|
|
), # noqa
|
|
|
|
'postcode': address_raw.get('postcode'),
|
|
|
|
'country': address_raw.get('country'),
|
|
|
|
'country_code': address_raw.get('country_code'),
|
|
|
|
}
|
|
|
|
)
|
|
|
|
else:
|
|
|
|
title = result.get('display_name')
|
|
|
|
|
|
|
|
return title, address
|
|
|
|
|
|
|
|
|
|
|
|
def get_url_osm_geojson(result):
|
2021-12-27 08:26:22 +00:00
|
|
|
"""Get url, osm and geojson"""
|
2021-06-04 07:35:26 +00:00
|
|
|
osm_type = result.get('osm_type', result.get('type'))
|
|
|
|
if 'osm_id' not in result:
|
|
|
|
# see https://github.com/osm-search/Nominatim/issues/1521
|
|
|
|
# query example: "EC1M 5RF London"
|
|
|
|
url = result_lat_lon_url.format(lat=result['lat'], lon=result['lon'], zoom=12)
|
|
|
|
osm = {}
|
|
|
|
else:
|
|
|
|
url = result_id_url.format(osm_type=osm_type, osm_id=result['osm_id'])
|
|
|
|
osm = {'type': osm_type, 'id': result['osm_id']}
|
|
|
|
|
|
|
|
geojson = result.get('geojson')
|
|
|
|
# if no geojson is found and osm_type is a node, add geojson Point
|
|
|
|
if not geojson and osm_type == 'node':
|
|
|
|
geojson = {'type': 'Point', 'coordinates': [result['lon'], result['lat']]}
|
|
|
|
|
|
|
|
return url, osm, geojson
|
|
|
|
|
|
|
|
|
|
|
|
def get_img_src(result):
|
|
|
|
"""Get image URL from either wikidata or r['extratags']"""
|
|
|
|
# wikidata
|
|
|
|
img_src = None
|
|
|
|
if 'wikidata' in result:
|
|
|
|
img_src = result['wikidata']['image']
|
|
|
|
if not img_src:
|
|
|
|
img_src = result['wikidata']['image_symbol']
|
|
|
|
if not img_src:
|
|
|
|
img_src = result['wikidata']['image_sign']
|
|
|
|
|
|
|
|
# img_src
|
2023-08-22 17:52:12 +00:00
|
|
|
extratags = result['extratags']
|
|
|
|
if not img_src and extratags.get('image'):
|
|
|
|
img_src = extratags['image']
|
|
|
|
del extratags['image']
|
|
|
|
if not img_src and extratags.get('wikimedia_commons'):
|
|
|
|
img_src = get_external_url('wikimedia_image', extratags['wikimedia_commons'])
|
|
|
|
del extratags['wikimedia_commons']
|
2021-06-04 07:35:26 +00:00
|
|
|
|
|
|
|
return img_src
|
|
|
|
|
|
|
|
|
|
|
|
def get_links(result, user_language):
|
|
|
|
"""Return links from result['extratags']"""
|
|
|
|
links = []
|
|
|
|
link_keys = set()
|
2023-08-22 17:52:12 +00:00
|
|
|
extratags = result['extratags']
|
|
|
|
if not extratags:
|
|
|
|
# minor optimization : no need to check VALUE_TO_LINK if extratags is empty
|
|
|
|
return links, link_keys
|
2021-06-04 07:35:26 +00:00
|
|
|
for k, mapping_function in VALUE_TO_LINK.items():
|
2023-08-22 17:52:12 +00:00
|
|
|
raw_value = extratags.get(k)
|
|
|
|
if not raw_value:
|
|
|
|
continue
|
|
|
|
url, url_label = mapping_function(raw_value)
|
|
|
|
if url.startswith('https://wikidata.org'):
|
|
|
|
url_label = result.get('wikidata', {}).get('itemLabel') or url_label
|
|
|
|
links.append(
|
|
|
|
{
|
|
|
|
'label': get_key_label(k, user_language),
|
|
|
|
'url': url,
|
|
|
|
'url_label': url_label,
|
|
|
|
}
|
|
|
|
)
|
|
|
|
link_keys.add(k)
|
2021-06-04 07:35:26 +00:00
|
|
|
return links, link_keys
|
|
|
|
|
|
|
|
|
|
|
|
def get_data(result, user_language, ignore_keys):
|
|
|
|
"""Return key, value of result['extratags']
|
|
|
|
|
|
|
|
Must be call after get_links
|
|
|
|
|
|
|
|
Note: the values are not translated
|
|
|
|
"""
|
|
|
|
data = []
|
|
|
|
for k, v in result['extratags'].items():
|
|
|
|
if k in ignore_keys:
|
|
|
|
continue
|
|
|
|
if get_key_rank(k) is None:
|
|
|
|
continue
|
|
|
|
k_label = get_key_label(k, user_language)
|
|
|
|
if k_label:
|
2021-12-27 08:26:22 +00:00
|
|
|
data.append(
|
|
|
|
{
|
|
|
|
'label': k_label,
|
|
|
|
'key': k,
|
|
|
|
'value': v,
|
|
|
|
}
|
|
|
|
)
|
2021-06-04 07:35:26 +00:00
|
|
|
data.sort(key=lambda entry: (get_key_rank(entry['key']), entry['label']))
|
|
|
|
return data
|
|
|
|
|
|
|
|
|
|
|
|
def get_key_rank(k):
|
|
|
|
"""Get OSM key rank
|
|
|
|
|
|
|
|
The rank defines in which order the key are displayed in the HTML result
|
|
|
|
"""
|
|
|
|
key_rank = KEY_RANKS.get(k)
|
|
|
|
if key_rank is None:
|
|
|
|
# "payment:*" in KEY_ORDER matches "payment:cash", "payment:debit card", etc...
|
|
|
|
key_rank = KEY_RANKS.get(k.split(':')[0] + ':*')
|
|
|
|
return key_rank
|
|
|
|
|
|
|
|
|
|
|
|
def get_label(labels, lang):
|
|
|
|
"""Get label from labels in OSM_KEYS_TAGS
|
|
|
|
|
|
|
|
in OSM_KEYS_TAGS, labels have key == '*'
|
|
|
|
"""
|
|
|
|
tag_label = labels.get(lang.lower())
|
|
|
|
if tag_label is None:
|
|
|
|
# example: if 'zh-hk' is not found, check 'zh'
|
|
|
|
tag_label = labels.get(lang.split('-')[0])
|
|
|
|
if tag_label is None and lang != 'en':
|
|
|
|
# example: if 'zh' is not found, check 'en'
|
|
|
|
tag_label = labels.get('en')
|
|
|
|
if tag_label is None and len(labels.values()) > 0:
|
|
|
|
# example: if still not found, use the first entry
|
|
|
|
tag_label = labels.values()[0]
|
|
|
|
return tag_label
|
|
|
|
|
|
|
|
|
|
|
|
def get_tag_label(tag_category, tag_name, lang):
|
|
|
|
"""Get tag label from OSM_KEYS_TAGS"""
|
|
|
|
tag_name = '' if tag_name is None else tag_name
|
|
|
|
tag_labels = OSM_KEYS_TAGS['tags'].get(tag_category, {}).get(tag_name, {})
|
|
|
|
return get_label(tag_labels, lang)
|
|
|
|
|
|
|
|
|
|
|
|
def get_key_label(key_name, lang):
|
|
|
|
"""Get key label from OSM_KEYS_TAGS"""
|
|
|
|
if key_name.startswith('currency:'):
|
|
|
|
# currency:EUR --> get the name from the CURRENCIES variable
|
|
|
|
# see https://wiki.openstreetmap.org/wiki/Key%3Acurrency
|
2023-09-15 07:53:03 +00:00
|
|
|
# and for example https://taginfo.openstreetmap.org/keys/currency:EUR#values
|
2021-06-04 07:35:26 +00:00
|
|
|
# but there is also currency=EUR (currently not handled)
|
|
|
|
# https://taginfo.openstreetmap.org/keys/currency#values
|
|
|
|
currency = key_name.split(':')
|
|
|
|
if len(currency) > 1:
|
2023-09-12 15:25:34 +00:00
|
|
|
o = CURRENCIES['iso4217'].get(currency[1])
|
2021-06-04 07:35:26 +00:00
|
|
|
if o:
|
|
|
|
return get_label(o, lang).lower()
|
2023-09-13 08:33:43 +00:00
|
|
|
return currency[1]
|
2021-06-04 07:35:26 +00:00
|
|
|
|
|
|
|
labels = OSM_KEYS_TAGS['keys']
|
|
|
|
for k in key_name.split(':') + ['*']:
|
|
|
|
labels = labels.get(k)
|
|
|
|
if labels is None:
|
|
|
|
return None
|
|
|
|
return get_label(labels, lang)
|