meteocat 0.1.27 → 0.1.29

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [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)
+
+
+### Bug Fixes
+
+* 0.1.28 ([2c329cb](https://github.com/figorr/meteocat/commit/2c329cb960aa7bd6ec6bec0c6145db791349758f))
+* bump meteocatpy to 0.0.13 ([52c11c6](https://github.com/figorr/meteocat/commit/52c11c66f66b0ebff40fea58a8a5c4d4a74482be))
+* fix entity_id ([fa61841](https://github.com/figorr/meteocat/commit/fa61841ba3857a79d6b97d0e0ed12a543525c205))
+* fix name sensors to include station_id ([7b868fd](https://github.com/figorr/meteocat/commit/7b868fd0eea66f8ec2655e92137d9ab6dd9d0149))
+* ignore test_call_api ([976826a](https://github.com/figorr/meteocat/commit/976826a978889fcec304a8b3620ccf738e1a1946))
+* save variables.json in assets folder ([d2c2234](https://github.com/figorr/meteocat/commit/d2c2234621aaabbbdc65367429b56b304855f710))
+* setup cache folder and new async_remove_entry ([4dfddc0](https://github.com/figorr/meteocat/commit/4dfddc03a64f82582b39eff47870c561d0775d6d))
+
 ## [0.1.27](https://github.com/figorr/meteocat/compare/v0.1.26...v0.1.27) (2024-12-10)
 
 

package/custom_components/meteocat/__init__.py

@@ -1,27 +1,37 @@
 from __future__ import annotations
 
-import os
 import logging
+from pathlib import Path
 from homeassistant import core
 from homeassistant.config_entries import ConfigEntry
 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.27"
+__version__ = "0.1.29"
 
+def safe_remove(path: Path, is_folder: bool = False):
+    """Elimina de forma segura un archivo o carpeta si existe."""
+    try:
+        if is_folder and path.exists() and not any(path.iterdir()):
+            path.rmdir()
+            _LOGGER.info(f"Carpeta {path.name} eliminada correctamente.")
+        elif not is_folder and path.exists():
+            path.unlink()
+            _LOGGER.info(f"Archivo {path.name} eliminado correctamente.")
+    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...")
@@ -48,9 +58,9 @@ 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)
-
         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()
     except Exception as err:  # Capturar todos los errores
         _LOGGER.exception(f"Error al inicializar los coordinadores: {err}")
@@ -70,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)
@@ -83,54 +92,26 @@ 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}")
 
     # Definir las rutas de los archivos y carpetas a eliminar
-    custom_components_path = hass.config.path("custom_components", DOMAIN)
-    assets_folder = os.path.join(custom_components_path, "assets")
-    files_folder = os.path.join(custom_components_path, "files")
-    symbols_file = os.path.join(assets_folder, "symbols.json")
-    station_data_file = os.path.join(files_folder, "station_data.json")
-
-    # Eliminar el archivo symbols.json si existe
-    try:
-        if os.path.exists(symbols_file):
-            os.remove(symbols_file)
-            _LOGGER.info("Archivo symbols.json eliminado correctamente.")
-        else:
-            _LOGGER.info("El archivo symbols.json no se encontró.")
-    except OSError as e:
-        _LOGGER.error(f"Error al intentar eliminar el archivo symbols.json: {e}")
-
-    # Eliminar el archivo station_data.json si existe
-    try:
-        if os.path.exists(station_data_file):
-            os.remove(station_data_file)
-            _LOGGER.info("Archivo station_data.json eliminado correctamente.")
-        else:
-            _LOGGER.info("El archivo station_data.json no se encontró.")
-    except OSError as e:
-        _LOGGER.error(f"Error al intentar eliminar el archivo station_data.json: {e}")
-
-    # Eliminar la carpeta assets si está vacía
-    try:
-        if os.path.exists(assets_folder) and not os.listdir(assets_folder):
-            os.rmdir(assets_folder)
-            _LOGGER.info("Carpeta assets eliminada correctamente.")
-        elif os.path.exists(assets_folder):
-            _LOGGER.warning("La carpeta assets no está vacía y no se pudo eliminar.")
-    except OSError as e:
-        _LOGGER.error(f"Error al intentar eliminar la carpeta assets: {e}")
-    
-    # Eliminar la carpeta files si está vacía
-    try:
-        if os.path.exists(files_folder) and not os.listdir(files_folder):
-            os.rmdir(files_folder)
-            _LOGGER.info("Carpeta files eliminada correctamente.")
-        elif os.path.exists(files_folder):
-            _LOGGER.warning("La carpeta files no está vacía y no se pudo eliminar.")
-    except OSError as e:
-        _LOGGER.error(f"Error al intentar eliminar la carpeta files: {e}")
+    custom_components_path = Path(hass.config.path("custom_components")) / DOMAIN
+    assets_folder = custom_components_path / "assets"
+    files_folder = custom_components_path / "files"
+    symbols_file = assets_folder / "symbols.json"
+    variables_file = assets_folder / "variables.json"
+    station_data_file = files_folder / "station_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.")
+        return
+
+    # Eliminar archivos y carpetas
+    safe_remove(symbols_file)
+    safe_remove(variables_file)
+    safe_remove(station_data_file)
+    safe_remove(assets_folder, is_folder=True)
+    safe_remove(files_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,43 +98,57 @@ 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"
-        symbols_client = MeteocatSymbols(self.api_key)
+        variables_file = assets_dir / "variables.json"
 
         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
-                )
-                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"
+            # 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
+            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/manifest.json

@@ -7,6 +7,6 @@
     "iot_class": "cloud_polling",
     "documentation": "https://gitlab.com/figorr/meteocat",
     "loggers": ["meteocatpy"],
-    "requirements": ["meteocatpy==0.0.11", "packaging>=20.3", "wrapt>=1.14.0"],
-    "version": "0.1.27"
+    "requirements": ["meteocatpy==0.0.14", "packaging>=20.3", "wrapt>=1.14.0"],
+    "version": "0.1.29"
 }

package/custom_components/meteocat/sensor.py

@@ -319,7 +319,7 @@ class MeteocatSensor(CoordinatorEntity[MeteocatSensorCoordinator], SensorEntity)
         """Return the device info."""
         return DeviceInfo(
             identifiers={(DOMAIN, self._town_id)},
-            name=self._town_name,
+            name="Meteocat " + self._station_id + " " + self._town_name,
             manufacturer="Meteocat",
             model="Meteocat API",
         )

package/custom_components/meteocat/version.py

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

package/package.json

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