meteocat 0.1.44 → 0.1.46

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [0.1.46](https://github.com/figorr/meteocat/compare/v0.1.45...v0.1.46) (2025-01-01)
+
+
+### Bug Fixes
+
+* 0.1.46 ([e2e736e](https://github.com/figorr/meteocat/commit/e2e736e102f25da704060bc6329696eec8c8fac6))
+* add validity days, hours and minutes ([61a6761](https://github.com/figorr/meteocat/commit/61a6761cde31c321dbed4dce126416f65062a90f))
+
+## [0.1.45](https://github.com/figorr/meteocat/compare/v0.1.44...v0.1.45) (2024-12-31)
+
+
+### Bug Fixes
+
+* 0.1.45 ([ab522cf](https://github.com/figorr/meteocat/commit/ab522cf4d94687c64dc84480f8f5507645a79557))
+* change icon for status sensors ([7415646](https://github.com/figorr/meteocat/commit/741564698b09b6e29b774bb388b6c96f718a573a))
+* fix async_add_entities for generic dynamic sensors ([2192214](https://github.com/figorr/meteocat/commit/2192214ebb767e74c187df98e7c811225c21ca33))
+* fix name and comments for Temp Forecast Coordinator ([e65e476](https://github.com/figorr/meteocat/commit/e65e476f03b0de062ab14a9563eaa71b6d80301f))
+* fix name sensor coordinator ([e93d01f](https://github.com/figorr/meteocat/commit/e93d01f359158ee63494e697059550fcea37806f))
+
 ## [0.1.44](https://github.com/figorr/meteocat/compare/v0.1.43...v0.1.44) (2024-12-30)
 
 

package/custom_components/meteocat/__init__.py

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

package/custom_components/meteocat/const.py

@@ -27,6 +27,10 @@ ATTRIBUTION = "Powered by Meteocatpy"
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 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
 
 # Códigos de sensores de la API
 WIND_SPEED = "wind_speed"  # Velocidad del viento

package/custom_components/meteocat/coordinator.py

@@ -5,7 +5,7 @@ import json
 import aiofiles
 import logging
 import asyncio
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, timezone, time
 from typing import Dict, Any
 
 from homeassistant.core import HomeAssistant
@@ -29,6 +29,9 @@ from .condition import get_condition_from_statcel
 from .const import (
     DOMAIN,
     CONDITION_MAPPING,
+    DEFAULT_VALIDITY_DAYS,
+    DEFAULT_VALIDITY_HOURS,
+    DEFAULT_VALIDITY_MINUTES,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -285,6 +288,7 @@ class MeteocatUviCoordinator(DataUpdateCoordinator):
              # Validar la fecha del primer elemento superior a 1 día
             first_date = datetime.strptime(data["uvi"][0].get("date"), "%Y-%m-%d").date()
             today = datetime.now(timezone.utc).date()
+            current_time = datetime.now(timezone.utc).time()
 
             # Log detallado
             _LOGGER.info(
@@ -292,10 +296,11 @@ class MeteocatUviCoordinator(DataUpdateCoordinator):
                 self.uvi_file,
                 today,
                 first_date,
+                current_time,
             )
 
             # Verificar si la antigüedad es mayor a un día
-            if (today - first_date).days > 1:
+            if (today - first_date).days > DEFAULT_VALIDITY_DAYS and current_time >= time(DEFAULT_VALIDITY_HOURS, DEFAULT_VALIDITY_MINUTES):
                 _LOGGER.info(
                     "Los datos en %s son antiguos. Se procederá a llamar a la API.",
                     self.uvi_file,
@@ -508,6 +513,7 @@ class MeteocatEntityCoordinator(DataUpdateCoordinator):
             # Obtener la fecha del primer día
             first_date = datetime.fromisoformat(data["dies"][0]["data"].rstrip("Z")).date()
             today = datetime.now(timezone.utc).date()
+            current_time = datetime.now(timezone.utc).time()
 
             # Log detallado
             _LOGGER.info(
@@ -515,10 +521,11 @@ class MeteocatEntityCoordinator(DataUpdateCoordinator):
                 file_path,
                 today,
                 first_date,
+                current_time,
             )
 
             # Verificar si la antigüedad es mayor a un día
-            if (today - first_date).days > 1:
+            if (today - first_date).days > DEFAULT_VALIDITY_DAYS and current_time >= time(DEFAULT_VALIDITY_HOURS, DEFAULT_VALIDITY_MINUTES):
                 _LOGGER.info(
                     "Los datos en %s son antiguos. Se procederá a llamar a la API.",
                     file_path,
@@ -940,14 +947,14 @@ class MeteocatConditionCoordinator(DataUpdateCoordinator):
         return {"condition": "unknown", "hour": current_hour, "icon": None, "date": current_date}
 
 class MeteocatTempForecastCoordinator(DataUpdateCoordinator):
-    """Coordinator para manejar las predicciones diarias desde archivos locales."""
+    """Coordinator para manejar la temperatura máxima y mínima de las predicciones diarias desde archivos locales."""
 
     def __init__(
         self,
         hass: HomeAssistant,
         entry_data: dict,
     ):
-        """Inicializa el coordinador para predicciones diarias."""
+        """Inicializa el coordinador para las temperaturas máximas y mínimas de predicciones diarias."""
         self.town_name = entry_data["town_name"]
         self.town_id = entry_data["town_id"]
         self.station_name = entry_data["station_name"]
@@ -962,7 +969,7 @@ class MeteocatTempForecastCoordinator(DataUpdateCoordinator):
         super().__init__(
             hass,
             _LOGGER,
-            name=f"{DOMAIN} Daily Forecast Coordinator",
+            name=f"{DOMAIN} Daily Temperature Forecast Coordinator",
             update_interval=DEFAULT_TEMP_FORECAST_UPDATE_INTERVAL,
         )
 
@@ -1005,18 +1012,18 @@ class MeteocatTempForecastCoordinator(DataUpdateCoordinator):
                     if datetime.fromisoformat(dia["data"].rstrip("Z")).date() >= today
                 ]
 
-                # Usar datos del día actual si están disponibles
+                # Usar datos de temperatura del día actual si están disponibles
                 today_temp_forecast = self.get_temp_forecast_for_today(data)
                 if today_temp_forecast:
                     parsed_data = self.parse_temp_forecast(today_temp_forecast)
                     return parsed_data
             except Exception as e:
-                _LOGGER.warning("Error leyendo archivo de predicción diaria: %s", e)
+                _LOGGER.warning("Error leyendo temperaturas del archivo de predicción diaria: %s", e)
 
         return {}
 
     def get_temp_forecast_for_today(self, data: dict) -> dict | None:
-        """Obtiene los datos diarios para el día actual."""
+        """Obtiene los datos de temperaturas diarios para el día actual."""
         if not data or "dies" not in data or not data["dies"]:
             return None
 
@@ -1028,7 +1035,7 @@ class MeteocatTempForecastCoordinator(DataUpdateCoordinator):
         return None
 
     def parse_temp_forecast(self, dia: dict) -> dict:
-        """Convierte un día de predicción en un diccionario con los datos necesarios."""
+        """Convierte la temperatura de un día de predicción en un diccionario con los datos necesarios."""
         variables = dia.get("variables", {})
 
         temp_forecast_data = {

package/custom_components/meteocat/manifest.json

@@ -8,5 +8,5 @@
     "documentation": "https://gitlab.com/figorr/meteocat",
     "loggers": ["meteocatpy"],
     "requirements": ["meteocatpy==0.0.17", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.44"
+    "version": "0.1.46"
 }

package/custom_components/meteocat/sensor.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import datetime, timezone, time
 import logging
 from homeassistant.helpers.entity import (
     DeviceInfo,
@@ -63,6 +63,9 @@ from .const import (
     MIN_TEMPERATURE_CODE,
     FEELS_LIKE,
     WIND_GUST_CODE,
+    DEFAULT_VALIDITY_DAYS,
+    DEFAULT_VALIDITY_HOURS,
+    DEFAULT_VALIDITY_MINUTES,
 )
 
 from .coordinator import (
@@ -237,19 +240,19 @@ SENSOR_TYPES: tuple[MeteocatSensorEntityDescription, ...] = (
     MeteocatSensorEntityDescription(
         key=HOURLY_FORECAST_FILE_STATUS,
         translation_key="hourly_forecast_file_status",
-        icon="mdi:clock",
+        icon="mdi:update",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     MeteocatSensorEntityDescription(
         key=DAILY_FORECAST_FILE_STATUS,
         translation_key="daily_forecast_file_status",
-        icon="mdi:clock",
+        icon="mdi:update",
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     MeteocatSensorEntityDescription(
         key=UVI_FILE_STATUS,
         translation_key="uvi_file_status",
-        icon="mdi:clock",
+        icon="mdi:update",
         entity_category=EntityCategory.DIAGNOSTIC,
     )
 )
@@ -260,7 +263,7 @@ async def async_setup_entry(hass, entry, async_add_entities: AddEntitiesCallback
     entry_data = hass.data[DOMAIN][entry.entry_id]
 
     # Coordinadores para sensores
-    coordinator = entry_data.get("sensor_coordinator")
+    sensor_coordinator = entry_data.get("sensor_coordinator")
     uvi_file_coordinator = entry_data.get("uvi_file_coordinator")
     static_sensor_coordinator = entry_data.get("static_sensor_coordinator")
     condition_coordinator = entry_data.get("condition_coordinator")
@@ -270,9 +273,9 @@ async def async_setup_entry(hass, entry, async_add_entities: AddEntitiesCallback
 
     # Sensores generales
     async_add_entities(
-        MeteocatSensor(coordinator, description, entry_data)
+        MeteocatSensor(sensor_coordinator, description, entry_data)
         for description in SENSOR_TYPES
-        if description.key not in {TOWN_NAME, TOWN_ID, STATION_NAME, STATION_ID, UV_INDEX, CONDITION, MAX_TEMPERATURE_FORECAST, MIN_TEMPERATURE_FORECAST, HOURLY_FORECAST_FILE_STATUS, DAILY_FORECAST_FILE_STATUS, UVI_FILE_STATUS}  # Excluir estáticos y UVI
+        if description.key in {WIND_SPEED, WIND_DIRECTION, TEMPERATURE, HUMIDITY, PRESSURE, PRECIPITATION, PRECIPITATION_ACCUMULATED, SOLAR_GLOBAL_IRRADIANCE, MAX_TEMPERATURE, MIN_TEMPERATURE, FEELS_LIKE, WIND_GUST, STATION_TIMESTAMP}  # Incluir sensores generales en el coordinador SENSOR COORDINATOR
     )
 
     # Sensores estáticos
@@ -502,9 +505,9 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
 
     _attr_has_entity_name = True  # Activa el uso de nombres basados en el dispositivo
 
-    def __init__(self, coordinator, description, entry_data):
+    def __init__(self, sensor_coordinator, description, entry_data):
         """Initialize the sensor."""
-        super().__init__(coordinator)
+        super().__init__(sensor_coordinator)
         self.entity_description = description
         self.api_key = entry_data["api_key"]
         self._town_name = entry_data["town_name"]
@@ -793,9 +796,21 @@ class MeteocatHourlyForecastStatusSensor(CoordinatorEntity[MeteocatEntityCoordin
         first_date = self._get_first_date()
         if first_date:
             today = datetime.now(timezone.utc).date()
+            current_time = datetime.now(timezone.utc).time()
             days_difference = (today - first_date).days
-            _LOGGER.debug(f"Diferencia de días para predicciones horarias: {days_difference}")
-            return "updated" if days_difference <= 1 else "obsolete"
+            _LOGGER.debug(
+                f"Diferencia de días para predicciones horarias: {days_difference}."
+                f"Hora actual de validación: {current_time}."
+                f"Para la validación: "
+                f"número de días= {DEFAULT_VALIDITY_DAYS}, "
+                f"hora de contacto a la API >= {DEFAULT_VALIDITY_HOURS}, "
+                f"minutos de contacto a la API >= {DEFAULT_VALIDITY_MINUTES}."
+            )
+            
+            # Validar fecha y hora según la lógica del coordinador
+            if days_difference > DEFAULT_VALIDITY_DAYS and current_time >= time(DEFAULT_VALIDITY_HOURS, DEFAULT_VALIDITY_MINUTES):
+                return "obsolete"
+            return "updated"
         return "unknown"
 
     @property
@@ -844,9 +859,21 @@ class MeteocatDailyForecastStatusSensor(CoordinatorEntity[MeteocatEntityCoordina
         first_date = self._get_first_date()
         if first_date:
             today = datetime.now(timezone.utc).date()
+            current_time = datetime.now(timezone.utc).time()
             days_difference = (today - first_date).days
-            _LOGGER.debug(f"Diferencia de días para predicciones diarias: {days_difference}")
-            return "updated" if days_difference <= 1 else "obsolete"
+            _LOGGER.debug(
+                f"Diferencia de días para predicciones diarias: {days_difference}."
+                f"Hora actual de validación: {current_time}."
+                f"Para la validación: "
+                f"número de días= {DEFAULT_VALIDITY_DAYS}, "
+                f"hora de contacto a la API >= {DEFAULT_VALIDITY_HOURS}, "
+                f"minutos de contacto a la API >= {DEFAULT_VALIDITY_MINUTES}."
+            )
+
+            # Validar fecha y hora según la lógica del coordinador
+            if days_difference > DEFAULT_VALIDITY_DAYS and current_time >= time(DEFAULT_VALIDITY_HOURS, DEFAULT_VALIDITY_MINUTES):
+                return "obsolete"
+            return "updated"
         return "unknown"
 
     @property
@@ -894,9 +921,21 @@ class MeteocatUviStatusSensor(CoordinatorEntity[MeteocatUviCoordinator], SensorE
         first_date = self._get_first_date()
         if first_date:
             today = datetime.now(timezone.utc).date()
+            current_time = datetime.now(timezone.utc).time()
             days_difference = (today - first_date).days
-            _LOGGER.debug(f"Diferencia de días para UVI: {days_difference}")
-            return "updated" if days_difference <= 1 else "obsolete"
+            _LOGGER.debug(
+                f"Diferencia de días para datos UVI: {days_difference}."
+                f"Hora actual de validación: {current_time}."
+                f"Para la validación: "
+                f"número de días= {DEFAULT_VALIDITY_DAYS}, "
+                f"hora de contacto a la API >= {DEFAULT_VALIDITY_HOURS}, "
+                f"minutos de contacto a la API >= {DEFAULT_VALIDITY_MINUTES}."
+            )
+
+            # Validar fecha y hora según la lógica del coordinador
+            if days_difference > DEFAULT_VALIDITY_DAYS and current_time >= time(DEFAULT_VALIDITY_HOURS, DEFAULT_VALIDITY_MINUTES):
+                return "obsolete"
+            return "updated"
         return "unknown"
 
     @property

package/custom_components/meteocat/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.44"
+__version__ = "0.1.46"

package/package.json

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