From 756d00cb298ce419a6274d5e85a5cd49d34fb347 Mon Sep 17 00:00:00 2001 From: Jules Dejaeghere Date: Mon, 5 May 2025 22:22:51 +0200 Subject: [PATCH] Remove prefix --- irm_kmi_api/api.py | 10 +++----- irm_kmi_api/data.py | 2 +- tests/test_radar_forecast.py | 50 ++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/irm_kmi_api/api.py b/irm_kmi_api/api.py index 32a1e3e..b379033 100644 --- a/irm_kmi_api/api.py +++ b/irm_kmi_api/api.py @@ -17,7 +17,7 @@ import async_timeout from .const import MAP_WARNING_ID_TO_SLUG as SLUG_MAP, WWEVOL_TO_ENUM_MAP from .const import STYLE_TO_PARAM_MAP, WEEKDAYS from .data import (AnimationFrameData, CurrentWeatherData, Forecast, - ExtendedForecast, IrmKmiRadarForecast, RadarAnimationData, + ExtendedForecast, RadarForecast, RadarAnimationData, WarningData, RadarStyle, WarningType) from .pollen import PollenParser @@ -32,10 +32,6 @@ class IrmKmiApiCommunicationError(IrmKmiApiError): """Exception to indicate a communication error.""" -class IrmKmiApiParametersError(IrmKmiApiError): - """Exception to indicate a parameter error.""" - - class IrmKmiApiClient: """API client for IRM KMI weather data""" COORD_DECIMALS = 6 @@ -254,7 +250,7 @@ class IrmKmiApiClientHa(IrmKmiApiClient): return current_weather - def get_radar_forecast(self) -> List[IrmKmiRadarForecast]: + def get_radar_forecast(self) -> List[RadarForecast]: """ Create a list of short term forecasts for rain based on the data provided by the rain radar @@ -276,7 +272,7 @@ class IrmKmiApiClientHa(IrmKmiApiClient): forecast = list() for f in sequence: forecast.append( - IrmKmiRadarForecast( + RadarForecast( datetime=f.get("time"), native_precipitation=f.get('value'), rain_forecast_max=round(f.get('positionHigher') * ratio, 2), diff --git a/irm_kmi_api/data.py b/irm_kmi_api/data.py index 5a03feb..1f8a43e 100644 --- a/irm_kmi_api/data.py +++ b/irm_kmi_api/data.py @@ -126,7 +126,7 @@ class WarningData(TypedDict, total=False): ends_at: datetime -class IrmKmiRadarForecast(Forecast): +class RadarForecast(Forecast): """Forecast class to handle rain forecast from the IRM KMI rain radar""" rain_forecast_max: float diff --git a/tests/test_radar_forecast.py b/tests/test_radar_forecast.py index 7502b7d..95b7d0c 100644 --- a/tests/test_radar_forecast.py +++ b/tests/test_radar_forecast.py @@ -1,6 +1,6 @@ import pytest -from irm_kmi_api.data import IrmKmiRadarForecast +from irm_kmi_api.data import RadarForecast from tests.conftest import get_api_with_data @@ -9,28 +9,28 @@ def test_radar_forecast() -> None: result = api.get_radar_forecast() expected = [ - IrmKmiRadarForecast(datetime="2023-12-26T17:00:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T17:10:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T17:20:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T17:30:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T17:40:00+01:00", native_precipitation=0.1, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T17:50:00+01:00", native_precipitation=0.01, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T18:00:00+01:00", native_precipitation=0.12, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T18:10:00+01:00", native_precipitation=1.2, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T18:20:00+01:00", native_precipitation=2, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T18:30:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), - IrmKmiRadarForecast(datetime="2023-12-26T18:40:00+01:00", native_precipitation=0, might_rain=False, - rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min') + RadarForecast(datetime="2023-12-26T17:00:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T17:10:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T17:20:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T17:30:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T17:40:00+01:00", native_precipitation=0.1, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T17:50:00+01:00", native_precipitation=0.01, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T18:00:00+01:00", native_precipitation=0.12, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T18:10:00+01:00", native_precipitation=1.2, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T18:20:00+01:00", native_precipitation=2, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T18:30:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min'), + RadarForecast(datetime="2023-12-26T18:40:00+01:00", native_precipitation=0, might_rain=False, + rain_forecast_max=0, rain_forecast_min=0, unit='mm/10min') ] assert expected == result @@ -40,7 +40,7 @@ def test_radar_forecast_rain_interval() -> None: api = get_api_with_data('forecast_with_rain_on_radar.json') result = api.get_radar_forecast() - _12 = IrmKmiRadarForecast( + _12 = RadarForecast( datetime='2024-05-30T18:00:00+02:00', native_precipitation=0.89, might_rain=True, @@ -49,7 +49,7 @@ def test_radar_forecast_rain_interval() -> None: unit='mm/10min' ) - _13 = IrmKmiRadarForecast( + _13 = RadarForecast( datetime="2024-05-30T18:10:00+02:00", native_precipitation=0.83, might_rain=True,