meteocat 0.1.22 → 0.1.23

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [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)
 
 

package/custom_components/meteocat/__init__.py

@@ -12,7 +12,7 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "0.1.22"
+__version__ = "0.1.23"
 
 
 async def async_setup(hass: core.HomeAssistant, config: dict) -> bool:

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 = {
@@ -45,8 +36,19 @@ CONDITION_MAPPING = {
     "snow-rainy": [27, 29, 30],
 }
 
-# Platforms
-PLATFORMS = {
-    "sensor", 
-    "entity",
+# 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/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

@@ -8,5 +8,5 @@
     "documentation": "https://gitlab.com/figorr/meteocat",
     "loggers": ["meteocatpy"],
     "requirements": ["meteocatpy==0.0.7", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.22"
+    "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:weather-sunny",
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UV_INDEX_UNIT,
     ),
     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."""

package/custom_components/meteocat/version.py

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "0.1.22",
+  "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.22"
+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"