From e16b6cb148d9fe6599ec8ce4b2803f0aed3a1d6b Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 30 Sep 2025 14:00:09 +0200 Subject: [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 --- searx/engines/open_meteo.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'searx/engines/open_meteo.py') 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"], ) -- cgit v1.2.3