summaryrefslogtreecommitdiff
path: root/searx/engines/open_meteo.py
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2025-09-30 14:00:09 +0200
committerMarkus Heiser <markus.heiser@darmarIT.de>2025-10-01 07:13:10 +0200
commite16b6cb148d9fe6599ec8ce4b2803f0aed3a1d6b (patch)
tree3beec5a878f90987954fb0a3e4fc52919eacd570 /searx/engines/open_meteo.py
parent41e0f2abf0546c3d27aa33d84e6220ea8bf257d0 (diff)
[fix] JSON format: serialization of the result-types
The ``JSONEncoder`` (``format="json"``) must perform a conversion to the built-in types for the ``msgspec.Struct``:: if isinstance(o, msgspec.Struct): return msgspec.to_builtins(o) The result types are already of type ``msgspec.Struct``, so they can be converted into built-in types. The field types (in the result type) that were not yet of type ``msgspec.Struct`` have been converted to:: searx.weather.GeoLocation@dataclass -> msgspec.Struct searx.weather.DateTime -> msgspec.Struct searx.weather.Temperature -> msgspec.Struct searx.weather.PressureUnits -> msgspec.Struct searx.weather.WindSpeed -> msgspec.Struct searx.weather.RelativeHumidity -> msgspec.Struct searx.weather.Compass -> msgspec.Struct BTW: Wherever it seemed sensible, the typing was also modernized in the modified files. Closes: https://github.com/searxng/searxng/issues/5250 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/engines/open_meteo.py')
-rw-r--r--searx/engines/open_meteo.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/searx/engines/open_meteo.py b/searx/engines/open_meteo.py
index 31ada12b0..948996b3c 100644
--- a/searx/engines/open_meteo.py
+++ b/searx/engines/open_meteo.py
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
"""Open Meteo (weather)"""
+import typing as t
+
from urllib.parse import urlencode
from datetime import datetime
@@ -106,16 +108,16 @@ WMO_TO_CONDITION: dict[int, weather.WeatherConditionType] = {
}
-def _weather_data(location: weather.GeoLocation, data: dict):
+def _weather_data(location: weather.GeoLocation, data: dict[str, t.Any]):
return WeatherAnswer.Item(
location=location,
- temperature=weather.Temperature(unit="°C", value=data["temperature_2m"]),
+ temperature=weather.Temperature(val=data["temperature_2m"], unit="°C"),
condition=WMO_TO_CONDITION[data["weather_code"]],
- feels_like=weather.Temperature(unit="°C", value=data["apparent_temperature"]),
+ feels_like=weather.Temperature(val=data["apparent_temperature"], unit="°C"),
wind_from=weather.Compass(data["wind_direction_10m"]),
- wind_speed=weather.WindSpeed(data["wind_speed_10m"], unit="km/h"),
- pressure=weather.Pressure(data["pressure_msl"], unit="hPa"),
+ wind_speed=weather.WindSpeed(val=data["wind_speed_10m"], unit="km/h"),
+ pressure=weather.Pressure(val=data["pressure_msl"], unit="hPa"),
humidity=weather.RelativeHumidity(data["relative_humidity_2m"]),
cloud_cover=data["cloud_cover"],
)