meteocat 0.1.28 → 0.1.30

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [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)
+
+
+### Bug Fixes
+
+* 0.1.29 ([f80cb9e](https://github.com/figorr/meteocat/commit/f80cb9eda9bd7d731489b51c161bc16a00ac57f0))
+* bump meteocatpy to 0.0.14 ([74cc591](https://github.com/figorr/meteocat/commit/74cc591ac7e9911c77649a20088af15d3af2d350))
+* remove cache ([8c4f29b](https://github.com/figorr/meteocat/commit/8c4f29b0b2c2cfa33f2b45f72bed57bf45b9a3dd))
+* remove cache tests ([6082096](https://github.com/figorr/meteocat/commit/6082096a92ade5a033e0493a819b20e950aff7a3))
+
 ## [0.1.28](https://github.com/figorr/meteocat/compare/v0.1.27...v0.1.28) (2024-12-11)
 
 

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.28"
+__version__ = "0.1.30"
 
 def safe_remove(path: Path, is_folder: bool = False):
     """Elimina de forma segura un archivo o carpeta si existe."""
@@ -28,12 +28,10 @@ def safe_remove(path: Path, is_folder: bool = False):
     except OSError as e:
         _LOGGER.error(f"Error al intentar eliminar {path.name}: {e}")
 
-
 async def async_setup(hass: core.HomeAssistant, config: dict) -> bool:
     """Configuración inicial del componente Meteocat."""
     return True
 
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Configura una entrada de configuración para Meteocat."""
     _LOGGER.info("Configurando la integración de Meteocat...")
@@ -57,11 +55,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         f"Estación '{entry_data['station_name']}' (ID: {entry_data['station_id']})."
     )
 
-    # Configurar ruta de la caché
-    cache_dir = Path(hass.config.path("custom_components", DOMAIN, ".meteocat_cache"))
-    cache_dir.mkdir(parents=True, exist_ok=True)
-    _LOGGER.debug(f"Directorio de caché configurado en: {cache_dir}")
-
     # Inicializar coordinadores
     try:
         sensor_coordinator = MeteocatSensorCoordinator(hass=hass, entry_data=entry_data)
@@ -87,7 +80,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     return True
 
-
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Desactiva una entrada de configuración para Meteocat."""
     platforms = async_get_platforms(hass, DOMAIN)
@@ -100,7 +92,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
-
 async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Limpia cualquier dato adicional al desinstalar la integración."""
     _LOGGER.info(f"Eliminando datos residuales de la integración: {entry.entry_id}")
@@ -109,7 +100,6 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     custom_components_path = Path(hass.config.path("custom_components")) / DOMAIN
     assets_folder = custom_components_path / "assets"
     files_folder = custom_components_path / "files"
-    cache_folder = custom_components_path / ".meteocat_cache"
     symbols_file = assets_folder / "symbols.json"
     variables_file = assets_folder / "variables.json"
     station_data_file = files_folder / "station_data.json"
@@ -125,4 +115,3 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     safe_remove(station_data_file)
     safe_remove(assets_folder, is_folder=True)
     safe_remove(files_folder, is_folder=True)
-    safe_remove(cache_folder, is_folder=True)

package/custom_components/meteocat/config_flow.py

@@ -47,6 +47,7 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
         self.variable_id: str | None = None
         self.station_id: str | None = None
         self.station_name: str | None = None
+        self._cache = {}
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -97,46 +98,48 @@ class MeteocatConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(step_id="select_municipi", data_schema=schema, errors=errors)
 
     async def fetch_symbols_and_variables(self):
-        """Descarga los símbolos y las variables después de seleccionar el municipio."""
+        """Descarga y guarda los símbolos y variables después de seleccionar el municipio."""
 
         errors = {}
 
-        # Descargar y guardar los símbolos
+        # Crear directorio de activos (assets) si no existe
         assets_dir = Path(__file__).parent / "assets"
         assets_dir.mkdir(parents=True, exist_ok=True)
         symbols_file = assets_dir / "symbols.json"
         variables_file = assets_dir / "variables.json"
-        symbols_client = MeteocatSymbols(self.api_key)
 
         try:
+            # Descargar y guardar los símbolos
+            symbols_client = MeteocatSymbols(self.api_key)
             symbols_data = await symbols_client.fetch_symbols()
+
             async with aiofiles.open(symbols_file, "w", encoding="utf-8") as file:
                 await file.write(json.dumps({"symbols": symbols_data}, ensure_ascii=False, indent=4))
-        except (BadRequestError, ForbiddenError, TooManyRequestsError, InternalServerError, UnknownAPIError) as ex:
-            _LOGGER.error("Error al descargar o guardar los símbolos: %s", ex)
-            errors["base"] = "symbols_download_failed"
+            
+            _LOGGER.info(f"Símbolos guardados en {symbols_file}")
 
-        if not errors:
-            # Configurar la ruta para la caché en la carpeta `custom_components/meteocat`
-            cache_dir = os.path.join(os.path.dirname(__file__), ".meteocat_cache")
+            # Descargar y guardar las variables
+            variables_client = MeteocatVariables(self.api_key)
+            variables_data = await variables_client.get_variables()
 
-            # Crear la carpeta de caché si no existe
-            os.makedirs(cache_dir, exist_ok=True)
+            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))
 
-            variables_client = MeteocatVariables(self.api_key, cache_dir=cache_dir)
-            try:
-                variables_data = await variables_client.get_variables()
-                self.variable_id = next(
-                    (v["codi"] for v in variables_data if v["nom"].lower() == "temperatura"), None
-                )
-                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))
-                if not self.variable_id:
-                    _LOGGER.error("No se encontró la variable 'Temperatura'")
-                    errors["base"] = "variable_not_found"
-            except (BadRequestError, ForbiddenError, TooManyRequestsError, InternalServerError, UnknownAPIError) as ex:
-                _LOGGER.error("Error al obtener las variables: %s", ex)
-                errors["base"] = "variables_fetch_failed"
+            _LOGGER.info(f"Variables guardadas en {variables_file}")
+
+            # Buscar la variable de temperatura
+            self.variable_id = next(
+                (v["codi"] for v in variables_data if v["nom"].lower() == "temperatura"), None
+            )
+            if not self.variable_id:
+                _LOGGER.error("No se encontró la variable 'Temperatura'")
+                errors["base"] = "variable_not_found"
+        except (BadRequestError, ForbiddenError, TooManyRequestsError, InternalServerError, UnknownAPIError) as ex:
+            _LOGGER.error("Error al conectar con la API de Meteocat: %s", ex)
+            errors["base"] = "cannot_connect"
+        except Exception as ex:
+            _LOGGER.error("Error inesperado al descargar los datos: %s", ex)
+            errors["base"] = "unknown"
 
         if errors:
             raise HomeAssistantError(errors)

package/custom_components/meteocat/const.py

@@ -16,6 +16,7 @@ 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

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.13", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.28"
+    "requirements": ["meteocatpy==0.0.14", "packaging>=20.3", "wrapt>=1.14.0"],
+    "version": "0.1.30"
 }

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,
@@ -113,6 +114,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",
@@ -299,8 +308,36 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
                                 # Manejo de errores si el formato no es válido
                                 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
 
+    @property
+    def precipitation_accumulated(self):
+        """Return the accumulated precipitation state of the sensor."""
+        
+
     @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.28"
+__version__ = "0.1.30"

package/package.json

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