meteocat 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.1.2](https://github.com/figorr/meteocat/compare/v1.1.1...v1.1.2) (2025-01-26)
+
+
+### Bug Fixes
+
+* 2.0.0 ([8f9ad16](https://github.com/figorr/meteocat/commit/8f9ad169b92da1093c3cdb2ff64ad5ffae9c9b24))
+* update installation methods at README ([e588ffa](https://github.com/figorr/meteocat/commit/e588ffa17c10652992a4c26d19d26b7757b051b5))
+
 ## [1.1.1](https://github.com/figorr/meteocat/compare/v1.1.0...v1.1.1) (2025-01-08)
 
 

package/README.md

@@ -22,7 +22,17 @@ Authors:
 
 ## Installation
 
-#### HACS
+#### HACS - Install using the custom repository method.
+
+1. First of all you need to add a custom repository like [this](https://hacs.xyz/docs/faq/custom_repositories/).
+1. Then download the integration from HACS.
+1. Restart Home Assistant.
+1. Go to `Settings > Devices & Services`
+1. Click `+ Add Integration`
+1. Search for `Meteocat` and follow the configuration instructions
+
+
+#### HACS - Install from the store
 1. Go to `HACS`
 1. Search for `Meteocat` and add it to HACS
 1. Restart Home Assistant
@@ -44,7 +54,11 @@ After submitting your API Key you will either be prompted to pick a town from th
 
 Once you pick the town you will be prompted to pick a station from the list. These are the nearest stations to the picked town.
 
-![Meteocat component station picker dialog](images/pick_station.png)
+![Meteocat custom component station picker dialog](images/pick_station.png)
+
+Then you will be asked to set the XEMA and PREDICTIONS limits from the API.
+
+![Meteocat custom component api limits setting dialog](images/api_limits.png)
 
 Then you will be asked to pick an area for the device.
 

package/custom_components/meteocat/__init__.py

@@ -20,6 +20,8 @@ from .coordinator import (
     DailyForecastCoordinator,
     MeteocatConditionCoordinator,
     MeteocatTempForecastCoordinator,
+    MeteocatAlertsCoordinator,
+    MeteocatAlertsRegionCoordinator,
 )
 
 from .const import DOMAIN, PLATFORMS
@@ -27,7 +29,7 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "1.1.1"
+__version__ = "2.0.0"
 
 # Definir el esquema de configuración CONFIG_SCHEMA
 CONFIG_SCHEMA = vol.Schema(
@@ -121,6 +123,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         temp_forecast_coordinator = MeteocatTempForecastCoordinator(hass=hass, entry_data=entry_data)
         await temp_forecast_coordinator.async_config_entry_first_refresh()
 
+        alerts_coordinator = MeteocatAlertsCoordinator(hass=hass, entry_data=entry_data)
+        await alerts_coordinator.async_config_entry_first_refresh()
+
+        alerts_region_coordinator = MeteocatAlertsRegionCoordinator(hass=hass, entry_data=entry_data)
+        await alerts_region_coordinator.async_config_entry_first_refresh()
+
     except Exception as err:  # Capturar todos los errores
         _LOGGER.exception(f"Error al inicializar los coordinadores: {err}")
         return False
@@ -137,6 +145,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         "daily_forecast_coordinator": daily_forecast_coordinator,
         "condition_coordinator": condition_coordinator,
         "temp_forecast_coordinator": temp_forecast_coordinator,
+        "alerts_coordinator": alerts_coordinator,
+        "alerts_region_coordinator": alerts_region_coordinator,
         **entry_data,
     }
 
@@ -193,6 +203,16 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     forecast_hourly_data_file = files_folder / f"forecast_{town_id.lower()}_hourly_data.json"
     forecast_daily_data_file = files_folder / f"forecast_{town_id.lower()}_daily_data.json"
 
+    # Obtener el `region_id` para identificar el archivo a eliminar
+    region_id = entry.data.get("region_id")
+    if not region_id:
+        _LOGGER.warning("No se encontró 'region_id' en la configuración. No se puede eliminar el archivo de alertas de la comarca.")
+        return
+
+    # Archivos JSON de alertas
+    alerts_file = files_folder / "alerts.json"
+    alerts_region_file = files_folder / f"alerts_{region_id}.json"
+
     # Validar la ruta base
     if not custom_components_path.exists():
         _LOGGER.warning(f"La ruta {custom_components_path} no existe. No se realizará la limpieza.")
@@ -205,5 +225,7 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     safe_remove(town_data_file)
     safe_remove(forecast_hourly_data_file)
     safe_remove(forecast_daily_data_file)
+    safe_remove(alerts_file)
+    safe_remove(alerts_region_file)
     safe_remove(assets_folder, is_folder=True)
     safe_remove(files_folder, is_folder=True)

package/custom_components/meteocat/config_flow.py

@@ -32,7 +32,9 @@ from .const import (
     REGION_NAME,
     PROVINCE_ID,
     PROVINCE_NAME,
-    STATION_STATUS
+    STATION_STATUS,
+    LIMIT_XEMA,
+	LIMIT_PREDICCIO
 )
     
 from .options_flow import MeteocatOptionsFlowHandler
@@ -193,43 +195,20 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
                 infostation_client = MeteocatInfoStation(self.api_key)
                 try:
                     station_metadata = await infostation_client.get_infostation(self.station_id)
+                    # Extraer los valores necesarios de los metadatos
+                    self.station_type = station_metadata.get("tipus", "")
+                    self.latitude = station_metadata.get("coordenades", {}).get("latitud", 0.0)
+                    self.longitude = station_metadata.get("coordenades", {}).get("longitud", 0.0)
+                    self.altitude = station_metadata.get("altitud", 0)
+                    self.region_id = station_metadata.get("comarca", {}).get("codi", "")
+                    self.region_name = station_metadata.get("comarca", {}).get("nom", "")
+                    self.province_id = station_metadata.get("provincia", {}).get("codi", "")
+                    self.province_name = station_metadata.get("provincia", {}).get("nom", "")
+                    self.station_status = station_metadata.get("estats", [{}])[0].get("codi", "")
+                    return await self.async_step_set_api_limits()
                 except Exception as ex:
                     _LOGGER.error("Error al obtener los metadatos de la estación: %s", ex)
                     errors["base"] = "metadata_fetch_failed"
-                    station_metadata = {}
-
-                # Extraer los valores necesarios de los metadatos
-                self.station_type = station_metadata.get("tipus", "")
-                self.latitude = station_metadata.get("coordenades", {}).get("latitud", 0.0)
-                self.longitude = station_metadata.get("coordenades", {}).get("longitud", 0.0)
-                self.altitude = station_metadata.get("altitud", 0)
-                self.region_id = station_metadata.get("comarca", {}).get("codi", "")
-                self.region_name = station_metadata.get("comarca", {}).get("nom", "")
-                self.province_id = station_metadata.get("provincia", {}).get("codi", "")
-                self.province_name = station_metadata.get("provincia", {}).get("nom", "")
-                self.station_status = station_metadata.get("estats", [{}])[0].get("codi", "")
-
-                return self.async_create_entry(
-                    title=self.selected_municipi["nom"],
-                    data={
-                        CONF_API_KEY: self.api_key,
-                        TOWN_NAME: self.selected_municipi["nom"],
-                        TOWN_ID: self.selected_municipi["codi"],
-                        VARIABLE_NAME: "Temperatura",
-                        VARIABLE_ID: str(self.variable_id),
-                        STATION_NAME: self.station_name,
-                        STATION_ID: self.station_id,
-                        STATION_TYPE: self.station_type,
-                        LATITUDE: self.latitude,
-                        LONGITUDE: self.longitude,
-                        ALTITUDE: self.altitude,
-                        REGION_ID: str(self.region_id),
-                        REGION_NAME: self.region_name,
-                        PROVINCE_ID: str(self.province_id),
-                        PROVINCE_NAME: self.province_name,
-                        STATION_STATUS: str(self.station_status),
-                    },
-                )
             else:
                 errors["base"] = "station_not_found"
 
@@ -244,6 +223,48 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(
             step_id="select_station", data_schema=schema, errors=errors
         )
+        
+    async def async_step_set_api_limits(self, user_input=None):
+        """Cuarto paso: Introducir los límites de XEMA y PREDICCIO del plan de la API."""
+        errors = {}
+
+        if user_input is not None:
+            self.limit_xema = user_input.get(LIMIT_XEMA, 750)
+            self.limit_prediccio = user_input.get(LIMIT_PREDICCIO, 100)
+            return self.async_create_entry(
+                title=self.selected_municipi["nom"],
+                data={
+                    CONF_API_KEY: self.api_key,
+                    TOWN_NAME: self.selected_municipi["nom"],
+                    TOWN_ID: self.selected_municipi["codi"],
+                    VARIABLE_NAME: "Temperatura",
+                    VARIABLE_ID: str(self.variable_id),
+                    STATION_NAME: self.station_name,
+                    STATION_ID: self.station_id,
+                    STATION_TYPE: self.station_type,
+                    LATITUDE: self.latitude,
+                    LONGITUDE: self.longitude,
+                    ALTITUDE: self.altitude,
+                    REGION_ID: str(self.region_id),
+                    REGION_NAME: self.region_name,
+                    PROVINCE_ID: str(self.province_id),
+                    PROVINCE_NAME: self.province_name,
+                    STATION_STATUS: str(self.station_status),
+                    LIMIT_XEMA: self.limit_xema,
+                    LIMIT_PREDICCIO: self.limit_prediccio,
+                },
+            )
+
+        schema = vol.Schema(
+            {
+                vol.Required(LIMIT_XEMA, default=750): cv.positive_int,
+                vol.Required(LIMIT_PREDICCIO, default=100): cv.positive_int,
+            }
+        )
+
+        return self.async_show_form(
+            step_id="set_api_limits", data_schema=schema, errors=errors
+        )
 
     @staticmethod
     @callback

package/custom_components/meteocat/const.py

@@ -16,10 +16,22 @@ REGION_ID = "region_id"
 REGION_NAME = "region_name"
 PROVINCE_ID = "province_id"
 PROVINCE_NAME = "province_name"
+LIMIT_XEMA = "limit_xema"
+LIMIT_PREDICCIO = "limit_prediccio"
 STATION_STATUS = "station_status"
 HOURLY_FORECAST_FILE_STATUS = "hourly_forecast_file_status"
 DAILY_FORECAST_FILE_STATUS = "daily_forecast_file_status"
 UVI_FILE_STATUS = "uvi_file_status"
+ALERTS = "alerts"
+ALERT_FILE_STATUS = "alert_file_status"
+ALERT_WIND = "alert_wind"
+ALERT_RAIN_INTENSITY = "alert_rain_intensity"
+ALERT_RAIN = "alert_rain"
+ALERT_SEA = "alert_sea"
+ALERT_COLD = "alert_cold"
+ALERT_WARM = "alert_warm"
+ALERT_WARM_NIGHT = "alert_warm_night"
+ALERT_SNOW = "alert_snow"
 
 from homeassistant.const import Platform
 
@@ -29,8 +41,15 @@ DEFAULT_NAME = "METEOCAT"
 
 # Tiempos para validación de API
 DEFAULT_VALIDITY_DAYS = 1  # Número de días a partir de los cuales se considera que el archivo de información está obsoleto
-DEFAULT_VALIDITY_HOURS = 5  # Hora a partir de la cuall la API tiene la información actualizada de predicciones disponible para descarga
-DEFAULT_VALIDITY_MINUTES = 0 # Minutos a partir de los cuales la API tiene la información actualizada de predicciones disponible para descarga
+DEFAULT_VALIDITY_HOURS = 5  # Hora a partir de la cual la API tiene la información actualizada de predicciones disponible para descarga
+DEFAULT_VALIDITY_MINUTES = 0  # Minutos a partir de los cuales la API tiene la información actualizada de predicciones disponible para descarga
+DEFAULT_ALERT_VALIDITY_TIME = 120  # Minutos a partir de los cuales las alertas están obsoletas y se se debe proceder a una nueva llamada a la API
+
+# Multiplicadores para la duración de validez basada en limit_prediccio
+ALERT_VALIDITY_MULTIPLIER_100 = 12  # para limit_prediccio <= 100
+ALERT_VALIDITY_MULTIPLIER_200 = 6   # para 100 < limit_prediccio <= 200
+ALERT_VALIDITY_MULTIPLIER_500 = 3   # para 200 < limit_prediccio <= 500
+ALERT_VALIDITY_MULTIPLIER_DEFAULT = 1  # para limit_prediccio > 500
 
 # Códigos de sensores de la API
 WIND_SPEED = "wind_speed"  # Velocidad del viento