meteocat 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [0.1.40](https://github.com/figorr/meteocat/compare/v0.1.39...v0.1.40) (2024-12-26)
+
+
+### Bug Fixes
+
+* 0.1.40 ([011f139](https://github.com/figorr/meteocat/commit/011f1391874a78d16c1ad1eebbd8f84e6b053b5b))
+* fix hourly forecasts ([bc1aa17](https://github.com/figorr/meteocat/commit/bc1aa178222a7158590b32af442427def4187e38))
+
+## [0.1.39](https://github.com/figorr/meteocat/compare/v0.1.38...v0.1.39) (2024-12-25)
+
+
+### Bug Fixes
+
+* 0.1.39 ([be7e9f3](https://github.com/figorr/meteocat/commit/be7e9f394a02be59521fce9a20100d3091092358))
+* add conditions constants ([95fa3bb](https://github.com/figorr/meteocat/commit/95fa3bba33722d2d976e1545bb58a7f97636ab7b))
+* add MeteocatEntityCoordinator and def json to save files ([f5816cc](https://github.com/figorr/meteocat/commit/f5816cc71dd2d7f4900c796d482969742a67ca05))
+* add MeteocatyEntityCoordinator and update async_remove_entry ([99a9883](https://github.com/figorr/meteocat/commit/99a98837de9923ba4a8604b5ff5ea6e628a51097))
+* add translations to new condition sensor ([92d757c](https://github.com/figorr/meteocat/commit/92d757c82bf9c33bd392d16f74d666f806fc27cb))
+* add weather entity ([914c407](https://github.com/figorr/meteocat/commit/914c4076457c8dd2ff1527ef83e5f62b911112a1))
+* fix condition code ([04c6ea3](https://github.com/figorr/meteocat/commit/04c6ea3e668b19bad95141154ffa6910d4aa8f3a))
+* fix is night code ([d50d587](https://github.com/figorr/meteocat/commit/d50d5871d89eb3ae20217e2070db61dcfc6c2503))
+* fix uvi icon ([d16d452](https://github.com/figorr/meteocat/commit/d16d45282f5eae83f5a337a58d34d5c5e62bee6f))
+* new condition sensor ([8f352fc](https://github.com/figorr/meteocat/commit/8f352fcff6f97e1bfe9ea49d22f03837b177f680))
+* new repo file structure ([ac61261](https://github.com/figorr/meteocat/commit/ac612613e386f926eed526e2796cadd325a3fabc))
+* new weather and condition coordinators ([f8307d8](https://github.com/figorr/meteocat/commit/f8307d8d8de915592c3a285e91dc8c79164953b5))
+* new weather and condition coordinators ([4c457e8](https://github.com/figorr/meteocat/commit/4c457e87f17564fa50743064dfbdd922e4babc17))
+* use await to save json files ([0945320](https://github.com/figorr/meteocat/commit/09453205bf891dcfef811c2628e72bf921aac8bb))
+
 ## [0.1.38](https://github.com/figorr/meteocat/compare/v0.1.37...v0.1.38) (2024-12-18)
 
 

package/conftest.py

@@ -0,0 +1,11 @@
+import pytest
+from homeassistant.core import HomeAssistant
+from pytest_homeassistant_custom_component.common import mock_component
+from homeassistant.setup import async_setup_component
+
+@pytest.fixture(autouse=True)
+async def auto_enable_custom_integrations(hass: HomeAssistant):
+    """Enable custom integrations."""
+    mock_component(hass, "meteocat")
+    await async_setup_component(hass, 'meteocat', {})
+    yield

package/custom_components/meteocat/__init__.py

@@ -10,9 +10,13 @@ from homeassistant.helpers.entity_platform import async_get_platforms
 
 from .coordinator import (
     MeteocatSensorCoordinator,
-    # MeteocatEntityCoordinator,
+    MeteocatStaticSensorCoordinator,
+    MeteocatEntityCoordinator,
     MeteocatUviCoordinator,
     MeteocatUviFileCoordinator,
+    HourlyForecastCoordinator,
+    DailyForecastCoordinator,
+    MeteocatConditionCoordinator,
 )
 
 from .const import DOMAIN, PLATFORMS
@@ -20,7 +24,7 @@ from .const import DOMAIN, PLATFORMS
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "0.1.38"
+__version__ = "0.1.40"
 
 def safe_remove(path: Path, is_folder: bool = False):
     """Elimina de forma segura un archivo o carpeta si existe."""
@@ -65,9 +69,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     try:
         sensor_coordinator = MeteocatSensorCoordinator(hass=hass, entry_data=entry_data)
         await sensor_coordinator.async_config_entry_first_refresh()
+        
+        static_sensor_coordinator = MeteocatStaticSensorCoordinator(hass=hass, entry_data=entry_data)
+        await sensor_coordinator.async_config_entry_first_refresh()
 
-        # entity_coordinator = MeteocatEntityCoordinator(hass=hass, entry_data=entry_data)
-        # await entity_coordinator.async_config_entry_first_refresh()
+        entity_coordinator = MeteocatEntityCoordinator(hass=hass, entry_data=entry_data)
+        await entity_coordinator.async_config_entry_first_refresh()
 
         uvi_coordinator = MeteocatUviCoordinator(hass=hass, entry_data=entry_data)
         await uvi_coordinator.async_config_entry_first_refresh()
@@ -75,6 +82,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         uvi_file_coordinator = MeteocatUviFileCoordinator(hass=hass, entry_data=entry_data)
         await uvi_file_coordinator.async_config_entry_first_refresh()
 
+        hourly_forecast_coordinator = HourlyForecastCoordinator(hass=hass, entry_data=entry_data)
+        await hourly_forecast_coordinator.async_config_entry_first_refresh()
+        
+        daily_forecast_coordinator = DailyForecastCoordinator(hass=hass, entry_data=entry_data)
+        await daily_forecast_coordinator.async_config_entry_first_refresh()
+
+        condition_coordinator = MeteocatConditionCoordinator(hass=hass, entry_data=entry_data)
+        await condition_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
@@ -83,9 +99,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         "sensor_coordinator": sensor_coordinator,
-        # "entity_coordinator": entity_coordinator,
+        "static_sensor_coordinator": static_sensor_coordinator,
+        "entity_coordinator": entity_coordinator,
         "uvi_coordinator":  uvi_coordinator,
         "uvi_file_coordinator": uvi_file_coordinator,
+        "hourly_forecast_coordinator": hourly_forecast_coordinator,
+        "daily_forecast_coordinator": daily_forecast_coordinator,
+        "condition_coordinator": condition_coordinator,
         **entry_data,
     }
 
@@ -138,6 +158,10 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     # Archivo JSON UVI del municipio
     town_data_file = files_folder / f"uvi_{town_id.lower()}_data.json"
 
+    # Arhivos JSON de las predicciones del municipio a eliminar
+    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"
+
     # 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.")
@@ -148,5 +172,7 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     safe_remove(variables_file)
     safe_remove(station_data_file)
     safe_remove(town_data_file)
+    safe_remove(forecast_hourly_data_file)
+    safe_remove(forecast_daily_data_file)
     safe_remove(assets_folder, is_folder=True)
     safe_remove(files_folder, is_folder=True)

package/custom_components/meteocat/condition.py

@@ -2,23 +2,33 @@ from __future__ import annotations
 
 from datetime import datetime
 from .const import CONDITION_MAPPING
-from .helpers import is_night  # Importar la función is_night de helpers.py
+from .helpers import is_night
 
-def get_condition_from_statcel(codi_estatcel, current_time: datetime, hass) -> dict:
+
+def get_condition_from_statcel(
+    codi_estatcel, current_time: datetime, hass, is_hourly: bool = True
+) -> dict:
     """
     Convierte el código 'estatCel' en condición de Home Assistant.
 
-    :param codi_estatcel: Código del estado del cielo (celestial state code).
+    :param codi_estatcel: Código o lista de códigos del estado del cielo.
     :param current_time: Fecha y hora actual (datetime).
     :param hass: Instancia de Home Assistant.
+    :param is_hourly: Indica si los datos son de predicción horaria (True) o diaria (False).
     :return: Diccionario con la condición y el icono.
     """
-    # Determinar si es de noche usando la lógica centralizada en helpers.py
+    # Asegurarse de que codi_estatcel sea una lista válida
+    if codi_estatcel is None:
+        codi_estatcel = []
+    elif isinstance(codi_estatcel, int):  # Convertir enteros en lista
+        codi_estatcel = [codi_estatcel]
+
+    # Determinar si es de noche
     is_night_flag = is_night(current_time, hass)
 
     # Identificar la condición basada en el código
     for condition, codes in CONDITION_MAPPING.items():
-        if codi_estatcel in codes:
+        if any(code in codes for code in codi_estatcel):
             # Ajustar para condiciones nocturnas si aplica
             if condition == "sunny" and is_night_flag:
                 return {"condition": "clear-night", "icon": None}

package/custom_components/meteocat/const.py

@@ -9,6 +9,13 @@ VARIABLE_ID = "variable_id"
 STATION_NAME = "station_name"
 STATION_ID = "station_id"
 
+from homeassistant.const import Platform
+
+ATTRIBUTION = "Powered by Meteocatpy"
+PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
+DEFAULT_NAME = "METEOCAT"
+
+
 # Códigos de sensores de la API
 WIND_SPEED = "wind_speed"  # Velocidad del viento
 WIND_DIRECTION = "wind_direction"  # Dirección del viento
@@ -24,6 +31,7 @@ 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
+CONDITION = "condition"  # Estado del cielo
 
 # Definición de códigos para variables
 WIND_SPEED_CODE = 30
@@ -41,7 +49,7 @@ WIND_GUST_CODE = 50
 # Mapeo de códigos 'estatCel' a condiciones de Home Assistant
 CONDITION_MAPPING = {
     "sunny": [1],
-    "clear-night": [1],
+    # "clear-night": [1],
     "partlycloudy": [2, 3],
     "cloudy": [4, 20, 21, 22],
     "rainy": [5, 6, 23],
@@ -52,6 +60,3 @@ CONDITION_MAPPING = {
     "fog": [11, 12],
     "snow-rainy": [27, 29, 30],
 }
-
-# Platforms
-PLATFORMS = ["sensor"]