meteocatpy 0.0.18 → 0.0.21

package/CHANGELOG.md

@@ -1,12 +1,33 @@
+## [0.0.21](https://github.com/figorr/meteocatpy/compare/v0.0.20...v0.0.21) (2025-02-04)
+
+
+### Bug Fixes
+
+* 1.0.0 ([c237e77](https://github.com/figorr/meteocatpy/commit/c237e7736f3504f19a1bb2e39ed7edd3264de115))
+
+## [0.0.20](https://github.com/figorr/meteocatpy/compare/v0.0.19...v0.0.20) (2025-01-08)
+
+
+### Bug Fixes
+
+* 0.0.20 ([8665c69](https://github.com/figorr/meteocatpy/commit/8665c696476d2a074673c4fc56d35aed61c68559))
+* Update CHANGELOG.md ([495220e](https://github.com/figorr/meteocatpy/commit/495220ef4bc01393a1d1fc5506808ffceac9d80c))
+
+## [0.0.19](https://github.com/figorr/meteocatpy/compare/v0.0.18...v0.0.19) (2025-01-08)
+
+
+### Bug Fixes
+
+* 0.0.19 ([2884a6f](https://github.com/figorr/meteocatpy/commit/2884a6ff7216f412e5144ba8a89a300f6b0a42c2))
+* fix timedelta ([dc716ad](https://github.com/figorr/meteocatpy/commit/dc716ad3843f1e138ccab6ac7e01d406e13cf4a5))
+
 ## [0.0.18](https://github.com/figorr/meteocatpy/compare/v0.0.17...v0.0.18) (2025-01-08)
 
 
 ### Bug Fixes
 
 * 0.0.18 ([bdc81d2](https://github.com/figorr/meteocatpy/commit/bdc81d2c4ada74478e66d376962bd2e7b01fe39b))
-* 0.0.19 ([2884a6f](https://github.com/figorr/meteocatpy/commit/2884a6ff7216f412e5144ba8a89a300f6b0a42c2))
 * fix error variable null ([cba0f9d](https://github.com/figorr/meteocatpy/commit/cba0f9d80c1b2a6e6f3ab8660b7ae703bfe4c148))
-* fix timedelta ([dc716ad](https://github.com/figorr/meteocatpy/commit/dc716ad3843f1e138ccab6ac7e01d406e13cf4a5))
 
 ## [0.0.17](https://github.com/figorr/meteocatpy/compare/v0.0.16...v0.0.17) (2024-12-29)
 

package/filetree.txt

@@ -22,6 +22,7 @@
     ├── forecast.py
     ├── helpers.py
     ├── infostation.py
+    ├── lightning.py
     ├── py.typed
     ├── quotes.py
     ├── stations.py
@@ -46,6 +47,7 @@
     ├── integration_test_complete.py
     ├── integration_test_forecast.py
     ├── integration_test_infostation.py
+    ├── integration_test_lightning.py
     ├── integration_test_quotes.py
     ├── integration_test_station_data.py
     ├── integration_test_stations.py

package/meteocatpy/const.py

@@ -12,3 +12,4 @@ 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}"
 ALERTS_URL = "/pronostic/v2/smp/episodis-oberts?data={any}-{mes}-{dia}Z"
+LIGHTNING_URL = "/xdde/v1/informes/comarques/{codi_comarca}/{any}/{mes}/{dia}"

package/meteocatpy/lightning.py

@@ -0,0 +1,136 @@
+import aiohttp
+import logging
+import re
+from datetime import datetime, timedelta
+from .variables import MeteocatVariables
+from .const import BASE_URL, LIGHTNING_URL
+from .exceptions import (
+    BadRequestError,
+    ForbiddenError,
+    TooManyRequestsError,
+    InternalServerError,
+    UnknownAPIError,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+class MeteocatLightningData:
+    """Clase para interactuar con los datos de rayos de la API de Meteocat."""
+
+    def __init__(self, api_key: str):
+        """
+        Inicializa la clase MeteocatStationData.
+
+        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,
+        }
+        self.variables = MeteocatVariables(api_key)
+    
+    @staticmethod
+    def get_current_date():
+        """
+        Obtiene la fecha actual en formato numérico.
+
+        Returns:
+            tuple: Año (YYYY), mes (MM), día (DD) como enteros.
+        """
+        now = datetime.now()
+        return now.year, now.month, now.day
+    
+    @staticmethod
+    def get_previous_date():
+        """
+        Obtiene la fecha del día anterior en formato numérico.
+
+        Returns:
+            tuple: Año (YYYY), mes (MM), día (DD) como enteros.
+        """
+        yesterday = datetime.now() - timedelta(days=1)
+        return yesterday.year, yesterday.month, yesterday.day
+
+    async def get_lightning_data(self, region_id: str):
+        """
+        Obtiene los datos meteorológicos de rayos desde la API de Meteocat.
+
+        Args:
+            region_id (str): Código de la comarca.
+
+        Returns:
+            dict: Datos de rayos de la comarca.
+        """
+        any, mes, dia = self.get_current_date()  # Calcula la fecha actual
+        url = f"{BASE_URL}{LIGHTNING_URL}".format(
+            codi_comarca=region_id, any=any, mes=f"{mes:02d}", dia=f"{dia:02d}"
+        )
+    
+        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:
+                        error_data = await response.json()
+                        # Filtrar si el mensaje contiene una fecha válida
+                        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}{LIGHTNING_URL}".format(
+                                    codi_comarca=region_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()}"
+                                    )
+                    
+                        # Filtrar si el mensaje es "La comarca '<código>' no mesura la variable 'null'"
+                        if re.search(r"La comarca '.*?' no mesura la variable 'null'", error_data.get("message", "")):
+                            any, mes, dia = self.get_previous_date()  # Obtener la fecha del día anterior
+                            new_url = f"{BASE_URL}{LIGHTNING_URL}".format(
+                                codi_comarca=region_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 previous date: {await new_response.text()}"
+                                )
+                        
+                        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.19"
+__version__ = "1.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meteocatpy",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "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.19"
+version = "1.0.0"
 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_lightning.py

@@ -0,0 +1,36 @@
+import os
+import pytest
+import json
+from dotenv import load_dotenv
+from meteocatpy.lightning import MeteocatLightningData
+
+# Cargar variables desde el archivo .env
+load_dotenv()
+
+# Obtener los valores del archivo .env
+API_KEY = os.getenv("METEOCAT_API_KEY_TEST")
+REGION_CODI_TEST = os.getenv("REGION_CODI_TEST")
+
+# Asegúrate de que las variables estén definidas
+assert API_KEY, "API Key is required"
+assert REGION_CODI_TEST, "Region codi test is required"
+
+@pytest.mark.asyncio
+async def test_lightning():
+    # Crear una instancia de MeteocatLightningData con la API Key
+    lightning_client = MeteocatLightningData(API_KEY)
+
+    # Obtener los datos de rayos
+    lightning_data = await lightning_client.get_lightning_data(REGION_CODI_TEST)
+
+    print("Datos de la API:", lightning_data)  # Para depuración
+
+    # Crear la carpeta si no existe
+    os.makedirs('tests/files', exist_ok=True)
+    
+    # Guardar los datos de rayos en un archivo JSON
+    with open(f'tests/files/lightning_{REGION_CODI_TEST}_data.json', 'w', encoding='utf-8') as f:
+        json.dump(lightning_data, f, ensure_ascii=False, indent=4)
+    
+    # Verificar que los datos de rayos sean una lista
+    assert isinstance(lightning_data, list), "La respuesta no es una lista"