meteocatpy 0.0.14 → 0.0.16

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.0.16](https://github.com/figorr/meteocatpy/compare/v0.0.15...v0.0.16) (2024-12-28)
+
+
+### Bug Fixes
+
+* 0.0.16 ([a59edbc](https://github.com/figorr/meteocatpy/commit/a59edbcff6297346113b411405122b9fe6e9fe14))
+* fix installation at README ([15e4651](https://github.com/figorr/meteocatpy/commit/15e46517254c0f9bdd82adf8038a17ae6e4339d5))
+* ignore uvi test json file ([87189ce](https://github.com/figorr/meteocatpy/commit/87189cea76510a75fa41c015aa522075ba71d19f))
+* improve data recovery when invalid date ([3b72e7e](https://github.com/figorr/meteocatpy/commit/3b72e7e1aeb34485e1226c56f2b6cce385b19f38))
+* json file name ([6e97de1](https://github.com/figorr/meteocatpy/commit/6e97de1d585c17936b316eb1fcc1b5ac2b5275d9))
+
+## [0.0.15](https://github.com/figorr/meteocatpy/compare/v0.0.14...v0.0.15) (2024-12-13)
+
+
+### Bug Fixes
+
+* 0.0.15 ([e4362bf](https://github.com/figorr/meteocatpy/commit/e4362bf9830c8eb5f9aa6fd803d06bf6bb64c2c8))
+* add MeteocatUviData ([49807fe](https://github.com/figorr/meteocatpy/commit/49807fe195098db59a654d015942352cb3705b93))
+* add MeteocatUviData class ([16e5eaf](https://github.com/figorr/meteocatpy/commit/16e5eaf7c918c673ab4648d1c3194144605d3249))
+* add uvi url ([b6a42c5](https://github.com/figorr/meteocatpy/commit/b6a42c5f2bc405359c49c7c5f106d576f5c70d9e))
+* ignore uvi test json ([4df4501](https://github.com/figorr/meteocatpy/commit/4df450166c4d01b67e096a754506d6d939ba09a5))
+
 ## [0.0.14](https://github.com/figorr/meteocatpy/compare/v0.0.13...v0.0.14) (2024-12-12)
 
 

package/README.md

@@ -17,14 +17,14 @@ pip install meteocatpy
 ```
 
 ```bash
-from meteocatpy.client import MeteocatClient
+from meteocatpy.town import MeteocatTown
 
 # Replace 'tu_api_key' with your actual API key
 api_key = "tu_api_key"
-client = MeteocatClient(api_key)
+town_client = MeteocatTown(api_key)
 
 # Get a list of municipalities (asynchronous call)
-municipis = await client.get_municipis()
+municipios_data = await town_client.get_municipis()
 print(municipis)
 ```
 

package/meteocatpy/__init__.py

@@ -15,6 +15,7 @@ from .stations import MeteocatStations
 from .townstations import MeteocatTownStations
 from .data import MeteocatStationData
 from .variables import MeteocatVariables
+from .uvi import MeteocatUviData
 
 __all__ = [
     "MeteocatTown", 
@@ -23,5 +24,6 @@ __all__ = [
     "MeteocatStations", 
     "MeteocatTownStations", 
     "MeteocatStationData", 
-    "MeteocatVariables"
+    "MeteocatVariables",
+    "MeteocatUviData"
 ]

package/meteocatpy/const.py

@@ -8,3 +8,4 @@ STATIONS_LIST_URL = "/xema/v1/estacions/metadades"
 STATIONS_MUNICIPI_URL = "/xema/v1/representatives/metadades/municipis/{codi_municipi}/variables/{codi_variable}"
 VARIABLES_URL = "/xema/v1/variables/mesurades/metadades"
 STATION_DATA_URL = "/xema/v1/estacions/mesurades/{codiEstacio}/{any}/{mes}/{dia}"
+UVI_DATA_URL = "/pronostic/v1/uvi/{codi_municipi}"

package/meteocatpy/data.py

@@ -1,5 +1,6 @@
 import aiohttp
 import logging
+import re
 from datetime import datetime
 from .variables import MeteocatVariables
 from .const import BASE_URL, STATION_DATA_URL
@@ -64,6 +65,23 @@ class MeteocatStationData:
 
                     # Gestionar errores según el código de estado
                     if response.status == 400:
+                        error_data = await response.json()
+                        # Intentar extraer la última fecha válida del mensaje de error
+                        if "message" in error_data:
+                            match = re.search(r'entre (\d{2}-\d{2}-\d{4}) i', error_data["message"])
+                            if match:
+                                last_valid_date = match.group(1)  # Captura la última fecha válida
+                                dia, mes, any = map(int, last_valid_date.split('-'))
+                                # Intentar nuevamente con la última fecha válida
+                                new_url = f"{BASE_URL}{STATION_DATA_URL}".format(
+                                    codiEstacio=station_id, any=any, mes=f"{mes:02d}", dia=f"{dia:02d}"
+                                )
+                                async with session.get(new_url, headers=self.headers) as new_response:
+                                    if new_response.status == 200:
+                                        return await new_response.json()
+                                    raise UnknownAPIError(
+                                        f"Failed with the valid date {last_valid_date}: {await new_response.text()}"
+                                    )
                         raise BadRequestError(await response.json())
                     elif response.status == 403:
                         error_data = await response.json()

package/meteocatpy/uvi.py

@@ -0,0 +1,84 @@
+import aiohttp
+import logging
+from .const import (
+    BASE_URL,
+    UVI_DATA_URL
+)
+from .exceptions import (
+    BadRequestError,
+    ForbiddenError,
+    TooManyRequestsError,
+    InternalServerError,
+    UnknownAPIError,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+class MeteocatUviData:
+    """Clase para interactuar con los datos del índice UVI de la API de Meteocat."""
+
+    def __init__(self, api_key: str):
+        """
+        Inicializa la clase MeteocatUviData.
+
+        Args:
+            api_key (str): Clave de API para autenticar las solicitudes.
+        """
+        self.api_key = api_key
+        self.headers = {
+            "Content-Type": "application/json",
+            "X-Api-Key": self.api_key,
+        }
+
+    async def get_uvi_index(self, town_id: str):
+        """
+        Obtiene los datos del índice UVI para un municipio.
+
+        Args:
+            town_id (str): Código del municipio.
+
+        Returns:
+            dict: Datos del índice UVI del municipio.
+        """
+        if not town_id:
+            raise ValueError("El parámetro 'town_id' no puede estar vacío.")
+
+        url = f"{BASE_URL}{UVI_DATA_URL}".format(
+            codi_municipi=town_id
+        )
+    
+        async with aiohttp.ClientSession() as session:
+            try:
+                async with session.get(url, headers=self.headers) as response:
+                    if response.status == 200:
+                        return await response.json()
+
+                    # Gestionar errores según el código de estado
+                    if response.status == 400:
+                        raise BadRequestError(await response.json())
+                    elif response.status == 403:
+                        error_data = await response.json()
+                        if error_data.get("message") == "Forbidden":
+                            raise ForbiddenError(error_data)
+                        elif error_data.get("message") == "Missing Authentication Token":
+                            raise ForbiddenError(error_data)
+                    elif response.status == 429:
+                        raise TooManyRequestsError(await response.json())
+                    elif response.status == 500:
+                        raise InternalServerError(await response.json())
+                    else:
+                        raise UnknownAPIError(
+                            f"Unexpected error {response.status}: {await response.text()}"
+                        )
+
+            except aiohttp.ClientError as e:
+                raise UnknownAPIError(
+                    message=f"Error al conectar con la API de Meteocat: {str(e)}",
+                    status_code=0,
+                )
+
+            except Exception as ex:
+                raise UnknownAPIError(
+                    message=f"Error inesperado: {str(ex)}",
+                    status_code=0,
+                )

package/meteocatpy/version.py

@@ -1,2 +1,2 @@
 # version.py
-__version__ = "0.0.14"
+__version__ = "0.0.16"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocatpy",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "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/meteocatpy)](https://pypi.org/project/meteocatpy)\r [![pipeline status](https://gitlab.com/figorr/meteocatpy/badges/master/pipeline.svg)](https://gitlab.com/figorr/meteocatpy/commits/master)",
   "main": "index.js",
   "directories": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meteocatpy"
-version = "0.0.14"
+version = "0.0.16"
 description = "Script para obtener datos meteorológicos de la API de Meteocat"
 authors = ["figorr <jdcuartero@yahoo.es>"]
 license = "Apache-2.0"

package/tests/integration_test_uvi.py

@@ -0,0 +1,34 @@
+import os
+import pytest
+import json
+from dotenv import load_dotenv
+from meteocatpy.uvi import MeteocatUviData
+
+# Cargar variables desde el archivo .env
+load_dotenv()
+
+# Obtener los valores del archivo .env
+API_KEY = os.getenv("METEOCAT_API_KEY_TEST")
+MUNICIPI_CODI_TEST = os.getenv("MUNICIPI_CODI_TEST")
+
+# Asegúrate de que las variables estén definidas
+assert API_KEY, "API Key is required"
+assert MUNICIPI_CODI_TEST, "Station codi test is required"
+
+@pytest.mark.asyncio
+async def test_municipis():
+    # Crear una instancia de MeteocatUviData con la API Key
+    uvi_client = MeteocatUviData(API_KEY)
+
+    # Obtener los datos del índice UVI
+    uvi_data = await uvi_client.get_uvi_index(MUNICIPI_CODI_TEST)
+
+    # Crear la carpeta si no existe
+    os.makedirs('tests/files', exist_ok=True)
+    
+    # Guardar los datos del índice UVI en un archivo JSON
+    with open(f'tests/files/uvi_{MUNICIPI_CODI_TEST}_data.json', 'w', encoding='utf-8') as f:
+        json.dump(uvi_data, f, ensure_ascii=False, indent=4)
+    
+    # Verificar que los datos del índice UVI no estén vacíos
+    assert uvi_data, "UVI data is empty"