meteocat 0.1.29 → 0.1.31

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.1.31](https://github.com/figorr/meteocat/compare/v0.1.30...v0.1.31) (2024-12-13)
+
+
+### Bug Fixes
+
+* 0.1.31 ([6d49197](https://github.com/figorr/meteocat/commit/6d4919717b09d4e38a3225bf9a33d1400a0227d0))
+* add feels like sensor ([caca7a0](https://github.com/figorr/meteocat/commit/caca7a0d2bc53969db584eda2e2818321f3930fc))
+* add feels like sensor ([ccecfae](https://github.com/figorr/meteocat/commit/ccecfae83f1a2e72a2438cf6a189bf5d5186d6b3))
+* bump meteocatpy to 0.0.15 ([8d08b6f](https://github.com/figorr/meteocat/commit/8d08b6f66ac2ce5b029569a1538d524d3d7f50dc))
+
+## [0.1.30](https://github.com/figorr/meteocat/compare/v0.1.29...v0.1.30) (2024-12-12)
+
+
+### Bug Fixes
+
+* 0.1.30 ([2095760](https://github.com/figorr/meteocat/commit/20957606eae28a97e82607136f97fde1abe38f81))
+* add precipitation accumulated sensor ([b05090a](https://github.com/figorr/meteocat/commit/b05090a563656123464d95b17b01ba2d7cada20f))
+* add precipitation_accumulated ([261d877](https://github.com/figorr/meteocat/commit/261d877cf9f68a2106687900951731ba6a4539eb))
+* delete precipitation test ([845d721](https://github.com/figorr/meteocat/commit/845d721ff4e49a2fe79c5cdcf92698d52a6cff36))
+* fix variables json ([df403b1](https://github.com/figorr/meteocat/commit/df403b12ab12cd357f087dc1dceda30c51e4c8f0))
+
 ## [0.1.29](https://github.com/figorr/meteocat/compare/v0.1.28...v0.1.29) (2024-12-12)
 
 

package/custom_components/meteocat/__init__.py

@@ -14,7 +14,7 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "0.1.29"
+__version__ = "0.1.31"
 
 def safe_remove(path: Path, is_folder: bool = False):
     """Elimina de forma segura un archivo o carpeta si existe."""

package/custom_components/meteocat/config_flow.py

@@ -125,15 +125,6 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
             async with aiofiles.open(variables_file, "w", encoding="utf-8") as file:
                 await file.write(json.dumps({"variables": variables_data}, ensure_ascii=False, indent=4))
 
-            # Actualizar la caché
-            cache_data = {
-                "symbols": symbols_data,
-                "variables": variables_data
-            }
-
-            async with aiofiles.open(variables_file, "w", encoding="utf-8") as file:
-                await file.write(json.dumps(cache_data, ensure_ascii=False, indent=4))
-
             _LOGGER.info(f"Variables guardadas en {variables_file}")
 
             # Buscar la variable de temperatura

package/custom_components/meteocat/const.py

@@ -16,10 +16,12 @@ TEMPERATURE = "temperature"  # Temperatura
 HUMIDITY = "humidity"  # Humedad relativa
 PRESSURE = "pressure"  # Presión atmosférica
 PRECIPITATION = "precipitation"  # Precipitación
+PRECIPITATION_ACCUMULATED = "precipitation_accumulated" #Precipitación acumulada
 SOLAR_GLOBAL_IRRADIANCE = "solar_global_irradiance"  # Irradiación solar global
 UV_INDEX = "uv_index"  # UV
 MAX_TEMPERATURE = "max_temperature"  # Temperatura máxima
 MIN_TEMPERATURE = "min_temperature"  # Temperatura mínima
+FEELS_LIKE = "feels_like"  # Sensación térmica
 WIND_GUST = "wind_gust"  # Racha de viento
 STATION_TIMESTAMP = "station_timestamp"  # Código de tiempo de la estación
 

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.14", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.29"
+    "requirements": ["meteocatpy==0.0.15", "packaging>=20.3", "wrapt>=1.14.0"],
+    "version": "0.1.31"
 }

package/custom_components/meteocat/sensor.py

@@ -38,6 +38,7 @@ from .const import (
     HUMIDITY,
     PRESSURE,
     PRECIPITATION,
+    PRECIPITATION_ACCUMULATED,
     SOLAR_GLOBAL_IRRADIANCE,
     UV_INDEX,
     MAX_TEMPERATURE,
@@ -54,6 +55,7 @@ from .const import (
     UV_INDEX_CODE,
     MAX_TEMPERATURE_CODE,
     MIN_TEMPERATURE_CODE,
+    FEELS_LIKE,
     WIND_GUST_CODE,
 )
 
@@ -113,6 +115,14 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
     ),
+    MeteocatSensorEntityDescription(
+        key=PRECIPITATION_ACCUMULATED,
+        name="Precipitation Accumulated",
+        icon="mdi:weather-rainy",
+        device_class=SensorDeviceClass.PRECIPITATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement="mm",
+    ),
     MeteocatSensorEntityDescription(
         key=SOLAR_GLOBAL_IRRADIANCE,
         name="Solar Global Irradiance",
@@ -142,6 +152,14 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
+    MeteocatSensorEntityDescription(
+        key=FEELS_LIKE,
+        name="Feels Like",
+        icon="mdi:sun-thermometer",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    ),
     MeteocatSensorEntityDescription(
         key=WIND_GUST,
         name="Wind Gust",
@@ -253,6 +271,63 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
             if self.entity_description.key == STATION_ID:
                 return self._station_id
         # Información dinámica
+
+        if self.entity_description.key == FEELS_LIKE:
+            stations = self.coordinator.data or []
+
+            # Variables necesarias
+            temperature = None
+            humidity = None
+            wind_speed = None
+
+            # Obtener valores de las variables
+            for station in stations:
+                variables = station.get("variables", [])
+                for var in variables:
+                    code = var.get("codi")
+                    lectures = var.get("lectures", [])
+                    if not lectures:
+                        continue
+                    latest_reading = lectures[-1].get("valor")
+                    
+                    if code == TEMPERATURE_CODE:
+                        temperature = float(latest_reading)
+                    elif code == HUMIDITY_CODE:
+                        humidity = float(latest_reading)
+                    elif code == WIND_SPEED_CODE:
+                        wind_speed = float(latest_reading)
+            
+            # Verificar que todas las variables necesarias están presentes
+            if temperature is not None and humidity is not None and wind_speed is not None:
+                # Cálculo del windchill
+                windchill = (
+                    13.1267 +
+                    0.6215 * temperature -
+                    11.37 * (wind_speed ** 0.16) +
+                    0.3965 * temperature * (wind_speed ** 0.16)
+                )
+                
+                # Cálculo del heat_index
+                heat_index = (
+                    -8.78469476 +
+                    1.61139411 * temperature +
+                    2.338548839 * humidity -
+                    0.14611605 * temperature * humidity -
+                    0.012308094 * (temperature ** 2) -
+                    0.016424828 * (humidity ** 2) +
+                    0.002211732 * (temperature ** 2) * humidity +
+                    0.00072546 * temperature * (humidity ** 2) -
+                    0.000003582 * (temperature ** 2) * (humidity ** 2)
+                )
+                
+                # Lógica de selección
+                if -50 <= temperature <= 10:
+                    return round(windchill, 2)
+                elif temperature > 26 and humidity > 40:
+                    return round(heat_index, 2)
+                else:
+                    return round(temperature, 2)
+
         sensor_code = self.CODE_MAPPING.get(self.entity_description.key)
 
         if sensor_code is not None:
@@ -279,7 +354,8 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
                             return self._convert_degrees_to_cardinal(value)
 
                         return value
-          # Lógica específica para el sensor de timestamp
+                    
+        # Lógica específica para el sensor de timestamp
         if self.entity_description.key == "station_timestamp":
             stations = self.coordinator.data or []
             for station in stations:
@@ -299,8 +375,31 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
                                 # Manejo de errores si el formato no es válido
                                 return None
 
-        return None
+        # Nuevo sensor para la precipitación acumulada
+        if self.entity_description.key == "precipitation_accumulated":
+            stations = self.coordinator.data or []
+            total_precipitation = 0.0  # Usa float para permitir acumulación de decimales
 
+            for station in stations:
+                variables = station.get("variables", [])
+
+                # Filtramos por código de precipitación
+                variable_data = next(
+                    (var for var in variables if var.get("codi") == PRECIPITATION_CODE),
+                    None,
+                )
+
+                if variable_data:
+                    # Sumamos las lecturas de precipitación
+                    lectures = variable_data.get("lectures", [])
+                    for lecture in lectures:
+                        total_precipitation += float(lecture.get("valor", 0.0))  # Convertimos a float
+
+            _LOGGER.debug(f"Total precipitación acumulada: {total_precipitation} mm")
+            return total_precipitation
+        
+        return None
+        
     @staticmethod
     def _convert_degrees_to_cardinal(degree: float) -> str:
         """Convert degrees to cardinal direction."""

package/custom_components/meteocat/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.29"
+__version__ = "0.1.31"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "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.29"
+version = "0.1.31"
 description = "Script para obtener datos meteorológicos de la API de Meteocat"
 authors = ["figorr <jdcuartero@yahoo.es>"]
 license = "Apache-2.0"