meteocat 0.1.21 → 0.1.23

package/.releaserc

@@ -15,7 +15,7 @@
       "@semantic-release/git",
       {
         "assets": ["CHANGELOG.md", "package.json", "pyproject.toml"],
-        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        "message": "v${nextRelease.version}\n\n${nextRelease.notes}"
       }
     ]
   ],

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.1.23](https://github.com/figorr/meteocat/compare/v0.1.22...v0.1.23) (2024-12-07)
+
+
+### Bug Fixes
+
+* 0.1.23 ([dda17ae](https://github.com/figorr/meteocat/commit/dda17ae1d73d31879d029d4c7a8f12a1a74f2379))
+* fix sensor data recovery ([564ceb7](https://github.com/figorr/meteocat/commit/564ceb7ff372acd7d2d035272e9784ad583ccece))
+* fix unis of measurement ([c65bce2](https://github.com/figorr/meteocat/commit/c65bce26add578bc32ebb05b82381aa72dfbf9a6))
+
+## [0.1.22](https://github.com/figorr/meteocat/compare/v0.1.21...v0.1.22) (2024-12-07)
+
+
+### Bug Fixes
+
+* 0.1.22 ([54b39fa](https://github.com/figorr/meteocat/commit/54b39fad5e645673c2d46ca3209e82d92db03b95))
+* add platforms ([fbbad49](https://github.com/figorr/meteocat/commit/fbbad49a6de960719d0c4f6a734c6dd1e0f3dfb5))
+* bump meteocatpy to 0.0.7 ([f00b48d](https://github.com/figorr/meteocat/commit/f00b48da53e0f309686fa7214c60647bb0965495))
+* fix coordinator to use entry_data ([5ca5050](https://github.com/figorr/meteocat/commit/5ca50501e04e8b3f6cb222f0f183dea1cc726242))
+* fix UV icon ([f2c86e3](https://github.com/figorr/meteocat/commit/f2c86e3e03df987e40bdf955113f2235db347229))
+
 ## [0.1.21](https://github.com/figorr/meteocat/compare/v0.1.20...v0.1.21) (2024-12-06)
 
 
@@ -8,8 +28,6 @@
 * new repo file structure ([7ef2dbe](https://github.com/figorr/meteocat/commit/7ef2dbe67bc41c77e0f931d833578540dafe0ca8))
 * semantic-release job ([a78eb5c](https://github.com/figorr/meteocat/commit/a78eb5c6dbbaef556a40053f98257906adeeecaa))
 
-# CHANGELOG
-
 
 ## v0.1.14 (2024-11-22)
 

package/custom_components/meteocat/__init__.py

@@ -7,24 +7,12 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from .coordinator import MeteocatSensorCoordinator, MeteocatEntityCoordinator
-from .const import (
-    DOMAIN,
-    CONF_API_KEY,
-    TOWN_NAME,
-    TOWN_ID,
-    VARIABLE_NAME,
-    VARIABLE_ID,
-    STATION_NAME,
-    STATION_ID,
-)
+from .const import DOMAIN, PLATFORMS
 
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "0.1.21"
-
-# Plataformas soportadas por la integración
-PLATFORMS = ["sensor", "entity"]
+__version__ = "0.1.23"
 
 
 async def async_setup(hass: core.HomeAssistant, config: dict) -> bool:
@@ -38,71 +26,50 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     # Extraer los datos necesarios de la entrada de configuración
     entry_data = entry.data
-    required_fields = [
-        CONF_API_KEY, TOWN_NAME, TOWN_ID, VARIABLE_ID, STATION_NAME, STATION_ID
-    ]
 
     # Validar que todos los campos requeridos estén presentes
+    required_fields = [
+        "api_key", "town_name", "town_id", "variable_name",
+        "variable_id", "station_name", "station_id"
+    ]
     if not all(field in entry_data for field in required_fields):
         _LOGGER.error("Faltan datos en la configuración. Por favor, reconfigura la integración.")
         return False
 
-    api_key = entry_data[CONF_API_KEY]
-    town_name = entry_data[TOWN_NAME]
-    town_id = entry_data[TOWN_ID]
-    variable_name = entry_data[VARIABLE_NAME]
-    variable_id = entry_data[VARIABLE_ID]
-    station_name = entry_data[STATION_NAME]
-    station_id = entry_data[STATION_ID]
-
     _LOGGER.info(
-        f"Integración configurada para el municipio '{town_name}' (ID: {town_id}), "
-        f"variable '{variable_name}' (ID: {variable_id}), estación {station_name} (ID: {station_id})."
+        f"Integración configurada para el municipio '{entry_data['town_name']}' "
+        f"(ID: {entry_data['town_id']}), variable '{entry_data['variable_name']}' "
+        f"(ID: {entry_data['variable_id']}), estación '{entry_data['station_name']}' "
+        f"(ID: {entry_data['station_id']})."
     )
 
     # Inicializa y refresca los coordinadores
     try:
-        # Pasar los datos adicionales al constructor del coordinador
+        # Crear el coordinador para sensores
         sensor_coordinator = MeteocatSensorCoordinator(
-            hass,
-            entry,
-            town_name=town_name,
-            town_id=town_id,
-            station_name=station_name,
-            station_id=station_id,
-            variable_name=variable_name,
-            variable_id=variable_id,
+            hass=hass,
+            entry_data=entry_data,  # Pasa los datos como un diccionario
         )
-        # Pasar los mismos datos al constructor de MeteocatEntityCoordinator
+
+        # Crear el coordinador para entidades de predicción
         entity_coordinator = MeteocatEntityCoordinator(
-            hass,
-            entry,
-            town_name=town_name,
-            town_id=town_id,
-            station_name=station_name,
-            station_id=station_id,
-            variable_name=variable_name,
-            variable_id=variable_id,
+            hass=hass,
+            entry_data=entry_data,  # Pasa los mismos datos
         )
 
+        # Ejecutar la primera actualización
         await sensor_coordinator.async_config_entry_first_refresh()
         await entity_coordinator.async_config_entry_first_refresh()
     except HomeAssistantError as err:
         _LOGGER.error(f"Error al inicializar los coordinadores: {err}")
         return False
 
-    # Guardar los datos y los coordinadores en hass.data
+    # Guardar los coordinadores en hass.data
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         "sensor_coordinator": sensor_coordinator,
         "entity_coordinator": entity_coordinator,
-        "api_key": api_key,
-        "town_id": town_id,
-        "town_name": town_name,
-        "station_id": station_id,
-        "station_name": station_name,
-        "variable_id": variable_id,
-        "variable_name": variable_name,
+        **entry_data,
     }
 
     # Configurar las plataformas
@@ -110,6 +77,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     return True
 
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Desactiva una entrada de configuración para Meteocat."""
     if entry.entry_id in hass.data.get(DOMAIN, {}):

package/custom_components/meteocat/const.py

@@ -10,25 +10,16 @@ STATION_NAME = "station_name"
 STATION_ID = "station_id"
 
 # Códigos de sensores de la API
-WIND_SPEED = "30"  # Velocidad del viento
-WIND_DIRECTION = "31"  # Dirección del viento
-TEMPERATURE = "32"  # Temperatura
-HUMIDITY = "33"  # Humedad relativa
-PRESSURE = "34"  # Presión atmosférica
-PRECIPITATION = "35"  # Precipitación
-UV_INDEX = "39"  # UV
-MAX_TEMPERATURE = "40"  # Temperatura máxima
-MIN_TEMPERATURE = "42"  # Temperatura mínima
-WIND_GUST = "50"  # Racha de viento
-
-# Unidades de medida de los sensores
-WIND_SPEED_UNIT = "m/s"
-WIND_DIRECTION_UNIT = "°"
-TEMPERATURE_UNIT = "°C"
-HUMIDITY_UNIT = "%"
-PRESSURE_UNIT = "hPa"
-PRECIPITATION_UNIT = "mm"
-UV_INDEX_UNIT = "UV"
+WIND_SPEED = "wind_speed"  # Velocidad del viento
+WIND_DIRECTION = "wind_direction"  # Dirección del viento
+TEMPERATURE = "temperature"  # Temperatura
+HUMIDITY = "humidity"  # Humedad relativa
+PRESSURE = "pressure"  # Presión atmosférica
+PRECIPITATION = "precipitation"  # Precipitación
+UV_INDEX = "uv_index"  # UV
+MAX_TEMPERATURE = "max_temperature"  # Temperatura máxima
+MIN_TEMPERATURE = "min_temperature"  # Temperatura mínima
+WIND_GUST = "wind_gust"  # Racha de viento
 
 # Mapeo de códigos 'estatCel' a condiciones de Home Assistant
 CONDITION_MAPPING = {
@@ -44,3 +35,20 @@ CONDITION_MAPPING = {
     "fog": [11, 12],
     "snow-rainy": [27, 29, 30],
 }
+
+# Mapeo de códigos a claves de sensores
+VARIABLE_CODE_MAPPING = {
+    30: WIND_SPEED,
+    31: WIND_DIRECTION,
+    32: TEMPERATURE,
+    33: HUMIDITY,
+    34: PRESSURE,
+    35: PRECIPITATION,
+    39: UV_INDEX,
+    40: MAX_TEMPERATURE,
+    42: MIN_TEMPERATURE,
+    50: WIND_GUST,
+}
+
+# Platforms
+PLATFORMS = ["sensor"]

package/custom_components/meteocat/coordinator.py

@@ -33,24 +33,26 @@ class MeteocatSensorCoordinator(DataUpdateCoordinator):
     def __init__(
         self,
         hass: HomeAssistant,
-        api_key: str,
-        town_name: str,
-        town_id: str,
-        station_name: str,
-        station_id: str,
-        variable_name: str,
-        variable_id: str,
+        entry_data: dict,
         update_interval: timedelta = DEFAULT_SENSOR_UPDATE_INTERVAL,
     ):
-        """Inicializa el coordinador de sensores de Meteocat."""
-        self.api_key = api_key
-        self.town_name = town_name
-        self.town_id = town_id
-        self.station_name = station_name
-        self.station_id = station_id
-        self.variable_name = variable_name
-        self.variable_id = variable_id
-        self.meteocat_station_data = MeteocatStationData(api_key)
+        """
+        Inicializa el coordinador de sensores de Meteocat.
+
+        Args:
+            hass (HomeAssistant): Instancia de Home Assistant.
+            entry_data (dict): Datos de configuración obtenidos de core.config_entries.
+            update_interval (timedelta): Intervalo de actualización.
+        """
+        self.api_key = entry_data["api_key"]  # Usamos la API key de la configuración
+        self.town_name = entry_data["town_name"]  # Usamos el nombre del municipio
+        self.town_id = entry_data["town_id"]  # Usamos el ID del municipio
+        self.station_name = entry_data["station_name"]  # Usamos el nombre de la estación
+        self.station_id = entry_data["station_id"]  # Usamos el ID de la estación
+        self.variable_name = entry_data["variable_name"]  # Usamos el nombre de la variable
+        self.variable_id = entry_data["variable_id"]  # Usamos el ID de la variable
+        self.meteocat_station_data = MeteocatStationData(self.api_key)
+
         super().__init__(
             hass,
             _LOGGER,
@@ -59,12 +61,7 @@ class MeteocatSensorCoordinator(DataUpdateCoordinator):
         )
 
     async def _async_update_data(self) -> Dict:
-        """
-        Actualiza los datos de los sensores desde la API de Meteocat.
-
-        Returns:
-            dict: Datos actualizados de los sensores.
-        """
+        """Actualiza los datos de los sensores desde la API de Meteocat."""
         try:
             data = await self.meteocat_station_data.get_station_data_with_variables(self.station_id)
             _LOGGER.debug("Datos de sensores actualizados exitosamente: %s", data)
@@ -105,24 +102,26 @@ class MeteocatEntityCoordinator(DataUpdateCoordinator):
     def __init__(
         self,
         hass: HomeAssistant,
-        api_key: str,
-        town_name: str,
-        town_id: str,
-        station_name: str,
-        station_id: str,
-        variable_name: str,
-        variable_id: str,
+        entry_data: dict,
         update_interval: timedelta = DEFAULT_ENTITY_UPDATE_INTERVAL,
     ):
-        """Inicializa el coordinador de datos para entidades de predicción."""
-        self.api_key = api_key
-        self.town_name = town_name
-        self.town_id = town_id
-        self.station_name = station_name
-        self.station_id = station_id
-        self.variable_name = variable_name
-        self.variable_id = variable_id
-        self.meteocat_forecast = MeteocatForecast(api_key)
+        """
+        Inicializa el coordinador de datos para entidades de predicción.
+
+        Args:
+            hass (HomeAssistant): Instancia de Home Assistant.
+            entry_data (dict): Datos de configuración obtenidos de core.config_entries.
+            update_interval (timedelta): Intervalo de actualización.
+        """
+        self.api_key = entry_data["api_key"]
+        self.town_name = entry_data["town_name"]
+        self.town_id = entry_data["town_id"]
+        self.station_name = entry_data["station_name"]
+        self.station_id = entry_data["station_id"]
+        self.variable_name = entry_data["variable_name"]
+        self.variable_id = entry_data["variable_id"]
+        self.meteocat_forecast = MeteocatForecast(self.api_key)
+
         super().__init__(
             hass,
             _LOGGER,
@@ -131,12 +130,7 @@ class MeteocatEntityCoordinator(DataUpdateCoordinator):
         )
 
     async def _async_update_data(self) -> Dict:
-        """
-        Actualiza los datos de las entidades de predicción desde la API de Meteocat.
-
-        Returns:
-            dict: Datos actualizados de predicción horaria y diaria.
-        """
+        """Actualiza los datos de las entidades de predicción desde la API de Meteocat."""
         try:
             hourly_forecast = await self.meteocat_forecast.get_prediccion_horaria(self.town_id)
             daily_forecast = await self.meteocat_forecast.get_prediccion_diaria(self.town_id)

package/custom_components/meteocat/entity.py

@@ -3,7 +3,14 @@ from __future__ import annotations
 import asyncio
 import logging
 from homeassistant.components.weather import WeatherEntity
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import (
+    DEGREE,
+    PERCENTAGE,
+    UnitOfPressure,
+    UnitOfSpeed,
+    UnitOfTemperature,
+    UnitOfVolumetricFlux,
+)
 
 from .const import (
     DOMAIN,
@@ -38,7 +45,7 @@ class MeteocatWeatherEntity(WeatherEntity):
     def __init__(self, coordinator: MeteocatEntityCoordinator):
         """Inicializa la entidad MeteocatWeather."""
         self._coordinator = coordinator
-        self._attr_temperature_unit = TEMP_CELSIUS
+        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
         self._data = {}
 
     async def async_update(self):

package/custom_components/meteocat/manifest.json

@@ -7,6 +7,6 @@
     "iot_class": "cloud_polling",
     "documentation": "https://gitlab.com/figorr/meteocat",
     "loggers": ["meteocatpy"],
-    "requirements": ["meteocatpy==0.0.6", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.21"
+    "requirements": ["meteocatpy==0.0.7", "packaging>=20.3", "wrapt>=1.14.0"],
+    "version": "0.1.23"
 }

package/custom_components/meteocat/sensor.py

@@ -11,7 +11,14 @@ from homeassistant.components.sensor import (
 from homeassistant.core import callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.const import PERCENTAGE, UnitOfTemperature
+from homeassistant.const import (
+    DEGREE,
+    PERCENTAGE,
+    UnitOfPressure,
+    UnitOfSpeed,
+    UnitOfTemperature,
+    UnitOfVolumetricFlux,
+)
 
 from .const import (
     DOMAIN,
@@ -25,11 +32,7 @@ from .const import (
     MAX_TEMPERATURE,
     MIN_TEMPERATURE,
     WIND_GUST,
-    WIND_SPEED_UNIT,
-    PRESSURE_UNIT,
-    PRECIPITATION_UNIT,
-    UV_INDEX_UNIT,
-    WIND_DIRECTION_UNIT,
+    VARIABLE_CODE_MAPPING,
 )
 
 from .coordinator import MeteocatSensorCoordinator
@@ -47,14 +50,13 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         icon="mdi:weather-windy",
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=WIND_SPEED_UNIT,
+        native_unit_of_measurement=UnitOfSpeed.METERS_PER_SECOND,
     ),
     MeteocatSensorEntityDescription(
         key=WIND_DIRECTION,
         name="Wind Direction",
         icon="mdi:compass",
         device_class=None,
-        native_unit_of_measurement=WIND_DIRECTION_UNIT,
     ),
     MeteocatSensorEntityDescription(
         key=TEMPERATURE,
@@ -78,7 +80,7 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         icon="mdi:gauge",
         device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PRESSURE_UNIT,
+        native_unit_of_measurement=UnitOfPressure.HPA,
     ),
     MeteocatSensorEntityDescription(
         key=PRECIPITATION,
@@ -86,14 +88,12 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         icon="mdi:weather-rainy",
         device_class=None,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PRECIPITATION_UNIT,
+        native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
     ),
     MeteocatSensorEntityDescription(
         key=UV_INDEX,
         name="UV Index",
-        icon="mdi:sun",
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UV_INDEX_UNIT,
+        icon="mdi:weather-sunny",
     ),
     MeteocatSensorEntityDescription(
         key=MAX_TEMPERATURE,
@@ -117,7 +117,7 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         icon="mdi:weather-windy",
         device_class=SensorDeviceClass.WIND_SPEED,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=WIND_SPEED_UNIT,
+        native_unit_of_measurement=UnitOfSpeed.METERS_PER_SECOND,
     ),
 )
 
@@ -155,25 +155,40 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
     @property
     def native_value(self):
         """Return the state of the sensor."""
-        value = getattr(self.coordinator.data, self.entity_description.key, None)
+        sensor_code = next(
+            (code for code, key in VARIABLE_CODE_MAPPING.items() if key == self.entity_description.key),
+            None,
+        )
+        
+        if sensor_code is not None:
+            variable_data = next(
+                (var for var in self.coordinator.data.get("variables", []) if var["codi"] == sensor_code),
+                None,
+            )
+            if variable_data:
+                # Asume que quieres el último valor registrado
+                latest_reading = variable_data["lectures"][-1]
+                value = latest_reading.get("valor")
 
-        if self.entity_description.key == WIND_DIRECTION:
-            return self._convert_degrees_to_cardinal(value)
+                # Convertir grados a direcciones cardinales para WIND_DIRECTION
+                if self.entity_description.key == WIND_DIRECTION and isinstance(value, (int, float)):
+                    return self._convert_degrees_to_cardinal(value)
 
-        return value
+                return value
+
+        return None
 
     @staticmethod
-    def _convert_degrees_to_cardinal(degree: float | None) -> str | None:
+    def _convert_degrees_to_cardinal(degree: float) -> str:
         """Convert degrees to cardinal direction."""
-        if degree is None:
-            return None
         directions = [
             "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE",
             "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW", "N",
         ]
-        index = int(((degree + 11.25) / 22.5)) % 16
+        index = round(degree / 22.5) % 16
         return directions[index]
 
+
     @property
     def device_info(self) -> DeviceInfo:
         """Return the device info."""
@@ -181,10 +196,5 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
             identifiers={(DOMAIN, self._town_id)},
             name=self._town_name,
             manufacturer="Meteocat",
-            model="Meteocat API",
-            additional_properties={
-                "Town ID": self._town_id,
-                "Station Name": self._station_name,
-                "Station ID": self._station_id,
-            },
+            model="Meteocat API"
         )

package/custom_components/meteocat/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.21"
+__version__ = "0.1.23"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)\r [![Python version compatibility](https://img.shields.io/pypi/pyversions/meteocat)](https://pypi.org/project/meteocat)\r [![pipeline status](https://gitlab.com/figorr/meteocat/badges/master/pipeline.svg)](https://gitlab.com/figorr/meteocat/commits/master)",
   "main": "index.js",
   "directories": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meteocat"
-version = "0.1.21"
+version = "0.1.23"
 description = "Script para obtener datos meteorológicos de la API de Meteocat"
 authors = ["figorr <jdcuartero@yahoo.es>"]
 license = "Apache-2.0"