meteocat 0.1.26 → 0.1.27

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.1.27](https://github.com/figorr/meteocat/compare/v0.1.26...v0.1.27) (2024-12-10)
+
+
+### Bug Fixes
+
+* 0.1.27 ([99feff1](https://github.com/figorr/meteocat/commit/99feff14eb85201028c1e6156a13354b05b446c3))
+* bump meteocatpy to 0.0.11 ([03b9485](https://github.com/figorr/meteocat/commit/03b9485b0486a2bef7f0b7f3c0bf9bf1fca3da8c))
+* bump meteocatpy to 0.0.9 ([1fb0de9](https://github.com/figorr/meteocat/commit/1fb0de97181b802494cb8371eb472a37c9a51f40))
+* delete .meteocat_cache ([7941005](https://github.com/figorr/meteocat/commit/79410050e68667ca8162ff6575c0541a5f8b6207))
+* fix python version ([07e3264](https://github.com/figorr/meteocat/commit/07e3264f5dde756c322ca431f4b895a211be998f))
+* fix python version ([32f539b](https://github.com/figorr/meteocat/commit/32f539bb33a343881ebd26eb7ad3f12a58ecbed4))
+* fix python version ([2ff2dfc](https://github.com/figorr/meteocat/commit/2ff2dfcfa597d9fbba0fc59c330f975c6b00a55b))
+* ignore cache tests ([238d148](https://github.com/figorr/meteocat/commit/238d148630a5f84123f8d2d5db66dbd6e6b372f8))
+* set variables cache ([ba77035](https://github.com/figorr/meteocat/commit/ba7703511c4e0604bd5d87f7d07ce487be67bafe))
+* set variables cache ([ba55568](https://github.com/figorr/meteocat/commit/ba55568526fe74e83feaf4d7a0cd5127334ee139))
+
 ## [0.1.26](https://github.com/figorr/meteocat/compare/v0.1.25...v0.1.26) (2024-12-09)
 
 

package/custom_components/meteocat/__init__.py

@@ -8,13 +8,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import async_get_platforms
 
-from .coordinator import MeteocatSensorCoordinator, MeteocatEntityCoordinator
+from .coordinator import MeteocatSensorCoordinator #, MeteocatEntityCoordinator
 from .const import DOMAIN, PLATFORMS
 
 _LOGGER = logging.getLogger(__name__)
 
 # Versión
-__version__ = "0.1.26"
+__version__ = "0.1.27"
 
 
 async def async_setup(hass: core.HomeAssistant, config: dict) -> bool:
@@ -48,10 +48,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Inicializar coordinadores
     try:
         sensor_coordinator = MeteocatSensorCoordinator(hass=hass, entry_data=entry_data)
-        entity_coordinator = MeteocatEntityCoordinator(hass=hass, entry_data=entry_data)
+        # entity_coordinator = MeteocatEntityCoordinator(hass=hass, entry_data=entry_data)
 
         await sensor_coordinator.async_config_entry_first_refresh()
-        await entity_coordinator.async_config_entry_first_refresh()
+        # await entity_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
@@ -60,7 +60,7 @@ 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,
+        # "entity_coordinator": entity_coordinator,
         **entry_data,
     }
 

package/custom_components/meteocat/config_flow.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import json
 import logging
 from pathlib import Path
@@ -115,7 +116,13 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
             errors["base"] = "symbols_download_failed"
 
         if not errors:
-            variables_client = MeteocatVariables(self.api_key)
+            # Configurar la ruta para la caché en la carpeta `custom_components/meteocat`
+            cache_dir = os.path.join(os.path.dirname(__file__), ".meteocat_cache")
+
+            # Crear la carpeta de caché si no existe
+            os.makedirs(cache_dir, exist_ok=True)
+
+            variables_client = MeteocatVariables(self.api_key, cache_dir=cache_dir)
             try:
                 variables_data = await variables_client.get_variables()
                 self.variable_id = next(

package/custom_components/meteocat/coordinator.py

@@ -12,7 +12,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from meteocatpy.data import MeteocatStationData
-from meteocatpy.forecast import MeteocatForecast
+# from meteocatpy.forecast import MeteocatForecast
 from meteocatpy.exceptions import (
     BadRequestError,
     ForbiddenError,
@@ -119,76 +119,76 @@ class MeteocatSensorCoordinator(DataUpdateCoordinator):
             )
             raise
 
-class MeteocatEntityCoordinator(DataUpdateCoordinator):
-    """Coordinator para manejar la actualización de datos de las entidades de predicción."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry_data: dict,
-        update_interval: timedelta = DEFAULT_ENTITY_UPDATE_INTERVAL,
-    ):
-        """
-        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,
-            name=f"{DOMAIN} Entity Coordinator",
-            update_interval=update_interval,
-        )
-
-    async def _async_update_data(self) -> Dict:
-        """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)
-            _LOGGER.debug(
-                "Datos de predicción actualizados exitosamente (Town ID: %s)", self.town_id
-            )
-            return {
-                "hourly_forecast": hourly_forecast,
-                "daily_forecast": daily_forecast,
-            }
-        except ForbiddenError as err:
-            _LOGGER.error(
-                "Acceso denegado al obtener datos de predicción (Town ID: %s): %s",
-                self.town_id,
-                err,
-            )
-            raise ConfigEntryNotReady from err
-        except TooManyRequestsError as err:
-            _LOGGER.warning(
-                "Límite de solicitudes alcanzado al obtener datos de predicción (Town ID: %s): %s",
-                self.town_id,
-                err,
-            )
-            raise ConfigEntryNotReady from err
-        except (BadRequestError, InternalServerError, UnknownAPIError) as err:
-            _LOGGER.error(
-                "Error al obtener datos de predicción (Town ID: %s): %s",
-                self.town_id,
-                err,
-            )
-            raise
-        except Exception as err:
-            _LOGGER.exception(
-                "Error inesperado al obtener datos de predicción (Town ID: %s): %s",
-                self.town_id,
-                err,
-            )
-            raise
+# class MeteocatEntityCoordinator(DataUpdateCoordinator):
+#     """Coordinator para manejar la actualización de datos de las entidades de predicción."""
+
+#     def __init__(
+#         self,
+#         hass: HomeAssistant,
+#         entry_data: dict,
+#         update_interval: timedelta = DEFAULT_ENTITY_UPDATE_INTERVAL,
+#     ):
+#         """
+#         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,
+#             name=f"{DOMAIN} Entity Coordinator",
+#             update_interval=update_interval,
+#         )
+
+#     async def _async_update_data(self) -> Dict:
+#         """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)
+#             _LOGGER.debug(
+#                 "Datos de predicción actualizados exitosamente (Town ID: %s)", self.town_id
+#             )
+#             return {
+#                 "hourly_forecast": hourly_forecast,
+#                 "daily_forecast": daily_forecast,
+#             }
+#         except ForbiddenError as err:
+#             _LOGGER.error(
+#                 "Acceso denegado al obtener datos de predicción (Town ID: %s): %s",
+#                 self.town_id,
+#                 err,
+#             )
+#             raise ConfigEntryNotReady from err
+#         except TooManyRequestsError as err:
+#             _LOGGER.warning(
+#                 "Límite de solicitudes alcanzado al obtener datos de predicción (Town ID: %s): %s",
+#                 self.town_id,
+#                 err,
+#             )
+#             raise ConfigEntryNotReady from err
+#         except (BadRequestError, InternalServerError, UnknownAPIError) as err:
+#             _LOGGER.error(
+#                 "Error al obtener datos de predicción (Town ID: %s): %s",
+#                 self.town_id,
+#                 err,
+#             )
+#             raise
+#         except Exception as err:
+#             _LOGGER.exception(
+#                 "Error inesperado al obtener datos de predicción (Town ID: %s): %s",
+#                 self.town_id,
+#                 err,
+#             )
+#             raise

package/custom_components/meteocat/entity.py

@@ -1,98 +1,98 @@
-from __future__ import annotations
-
-import asyncio
-import logging
-from homeassistant.components.weather import WeatherEntity
-from homeassistant.const import (
-    DEGREE,
-    PERCENTAGE,
-    UnitOfPressure,
-    UnitOfSpeed,
-    UnitOfTemperature,
-    UnitOfVolumetricFlux,
-)
-
-from .const import (
-    DOMAIN,
-    CONF_API_KEY,
-    TOWN_ID,
-    TEMPERATURE,
-    HUMIDITY,
-    WIND_SPEED,
-    WIND_DIRECTION,
-)
-from .condition import get_condition_from_statcel
-from .coordinator import MeteocatEntityCoordinator
-
-
-_LOGGER = logging.getLogger(__name__)
-
-async def async_setup_entry(hass, config_entry, async_add_entities):
-    """Configura el componente weather basado en una entrada de configuración."""
-    api_key = config_entry.data[CONF_API_KEY]
-    town_id = config_entry.data[TOWN_ID]
-
-    # Crear el coordinador
-    coordinator = MeteocatEntityCoordinator(hass, api_key, town_id)
-    # Asegurarse de que el coordinador esté actualizado antes de agregar la entidad
-    await coordinator.async_refresh()
-
-    async_add_entities([MeteocatWeatherEntity(coordinator)], True)
-
-class MeteocatWeatherEntity(WeatherEntity):
-    """Entidad de clima para la integración Meteocat."""
-
-    def __init__(self, coordinator: MeteocatEntityCoordinator):
-        """Inicializa la entidad MeteocatWeather."""
-        self._coordinator = coordinator
-        self._attr_temperature_unit = UnitOfTemperature.CELSIUS
-        self._data = {}
-
-    async def async_update(self):
-        """Actualiza los datos meteorológicos."""
-        try:
-            # Usamos el coordinador para obtener los datos actualizados
-            if self._coordinator.data:
-                hourly_forecast = self._coordinator.data["hourly_forecast"]
-                current_forecast = hourly_forecast["variables"]
-                codi_estatcel = current_forecast.get("estatCel", {}).get("valor")
-                is_night = current_forecast.get("is_night", False)
-                self._data = {
-                    "temperature": current_forecast.get(TEMPERATURE, {}).get("valor"),
-                    "humidity": current_forecast.get(HUMIDITY, {}).get("valor"),
-                    "wind_speed": current_forecast.get(WIND_SPEED, {}).get("valor"),
-                    "wind_bearing": current_forecast.get(WIND_DIRECTION, {}).get("valor"),
-                    "condition": get_condition_from_statcel(codi_estatcel, is_night)["condition"],
-                }
-        except Exception as err:
-            _LOGGER.error("Error al actualizar la predicción de Meteocat: %s", err)
-
-    @property
-    def name(self):
-        """Retorna el nombre de la entidad."""
-        return f"Clima {self._coordinator._town_id}"
-
-    @property
-    def temperature(self):
-        """Retorna la temperatura actual."""
-        return self._data.get("temperature")
-
-    @property
-    def humidity(self):
-        """Retorna la humedad relativa actual."""
-        return self._data.get("humidity")
-
-    @property
-    def wind_speed(self):
-        """Retorna la velocidad del viento."""
-        return self._data.get("wind_speed")
-
-    @property
-    def wind_bearing(self):
-        """Retorna la dirección del viento."""
-        return self._data.get("wind_bearing")
-
-    @property
-    def condition(self):
-        """Retorna la condición climática."""
-        return self._data.get("condition")
+# from __future__ import annotations
+
+# import asyncio
+# import logging
+# from homeassistant.components.weather import WeatherEntity
+# from homeassistant.const import (
+#     DEGREE,
+#     PERCENTAGE,
+#     UnitOfPressure,
+#     UnitOfSpeed,
+#     UnitOfTemperature,
+#     UnitOfVolumetricFlux,
+# )
+
+# from .const import (
+#     DOMAIN,
+#     CONF_API_KEY,
+#     TOWN_ID,
+#     TEMPERATURE,
+#     HUMIDITY,
+#     WIND_SPEED,
+#     WIND_DIRECTION,
+# )
+# from .condition import get_condition_from_statcel
+# from .coordinator import MeteocatEntityCoordinator
+
+
+# _LOGGER = logging.getLogger(__name__)
+
+# async def async_setup_entry(hass, config_entry, async_add_entities):
+#     """Configura el componente weather basado en una entrada de configuración."""
+#     api_key = config_entry.data[CONF_API_KEY]
+#     town_id = config_entry.data[TOWN_ID]
+
+#     # Crear el coordinador
+#     coordinator = MeteocatEntityCoordinator(hass, api_key, town_id)
+#     # Asegurarse de que el coordinador esté actualizado antes de agregar la entidad
+#     await coordinator.async_refresh()
+
+#     async_add_entities([MeteocatWeatherEntity(coordinator)], True)
+
+# class MeteocatWeatherEntity(WeatherEntity):
+#     """Entidad de clima para la integración Meteocat."""
+
+#     def __init__(self, coordinator: MeteocatEntityCoordinator):
+#         """Inicializa la entidad MeteocatWeather."""
+#         self._coordinator = coordinator
+#         self._attr_temperature_unit = UnitOfTemperature.CELSIUS
+#         self._data = {}
+
+#     async def async_update(self):
+#         """Actualiza los datos meteorológicos."""
+#         try:
+#             # Usamos el coordinador para obtener los datos actualizados
+#             if self._coordinator.data:
+#                 hourly_forecast = self._coordinator.data["hourly_forecast"]
+#                 current_forecast = hourly_forecast["variables"]
+#                 codi_estatcel = current_forecast.get("estatCel", {}).get("valor")
+#                 is_night = current_forecast.get("is_night", False)
+#                 self._data = {
+#                     "temperature": current_forecast.get(TEMPERATURE, {}).get("valor"),
+#                     "humidity": current_forecast.get(HUMIDITY, {}).get("valor"),
+#                     "wind_speed": current_forecast.get(WIND_SPEED, {}).get("valor"),
+#                     "wind_bearing": current_forecast.get(WIND_DIRECTION, {}).get("valor"),
+#                     "condition": get_condition_from_statcel(codi_estatcel, is_night)["condition"],
+#                 }
+#         except Exception as err:
+#             _LOGGER.error("Error al actualizar la predicción de Meteocat: %s", err)
+
+#     @property
+#     def name(self):
+#         """Retorna el nombre de la entidad."""
+#         return f"Clima {self._coordinator._town_id}"
+
+#     @property
+#     def temperature(self):
+#         """Retorna la temperatura actual."""
+#         return self._data.get("temperature")
+
+#     @property
+#     def humidity(self):
+#         """Retorna la humedad relativa actual."""
+#         return self._data.get("humidity")
+
+#     @property
+#     def wind_speed(self):
+#         """Retorna la velocidad del viento."""
+#         return self._data.get("wind_speed")
+
+#     @property
+#     def wind_bearing(self):
+#         """Retorna la dirección del viento."""
+#         return self._data.get("wind_bearing")
+
+#     @property
+#     def condition(self):
+#         """Retorna la condición climática."""
+#         return self._data.get("condition")

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.8", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.26"
+    "requirements": ["meteocatpy==0.0.11", "packaging>=20.3", "wrapt>=1.14.0"],
+    "version": "0.1.27"
 }

package/custom_components/meteocat/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.1.26"
+__version__ = "0.1.27"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocat",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "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": {