diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2025-09-30 14:00:09 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarIT.de> | 2025-10-01 07:13:10 +0200 |
| commit | e16b6cb148d9fe6599ec8ce4b2803f0aed3a1d6b (patch) | |
| tree | 3beec5a878f90987954fb0a3e4fc52919eacd570 /searx/engines/duckduckgo_weather.py | |
| parent | 41e0f2abf0546c3d27aa33d84e6220ea8bf257d0 (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/duckduckgo_weather.py')
| -rw-r--r-- | searx/engines/duckduckgo_weather.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/searx/engines/duckduckgo_weather.py b/searx/engines/duckduckgo_weather.py index 9fad1e546..4d52effcd 100644 --- a/searx/engines/duckduckgo_weather.py +++ b/searx/engines/duckduckgo_weather.py @@ -76,12 +76,12 @@ def _weather_data(location: weather.GeoLocation, data: dict[str, t.Any]): return EngineResults.types.WeatherAnswer.Item( location=location, - temperature=weather.Temperature(unit="°C", value=data['temperature']), + temperature=weather.Temperature(val=data['temperature'], unit="°C"), condition=WEATHERKIT_TO_CONDITION[data["conditionCode"]], - feels_like=weather.Temperature(unit="°C", value=data['temperatureApparent']), + feels_like=weather.Temperature(val=data['temperatureApparent'], unit="°C"), wind_from=weather.Compass(data["windDirection"]), - wind_speed=weather.WindSpeed(data["windSpeed"], unit="mi/h"), - pressure=weather.Pressure(data["pressure"], unit="hPa"), + wind_speed=weather.WindSpeed(val=data["windSpeed"], unit="mi/h"), + pressure=weather.Pressure(val=data["pressure"], unit="hPa"), humidity=weather.RelativeHumidity(data["humidity"] * 100), cloud_cover=data["cloudCover"] * 100, ) |