meteo-lt-pkg 0.5.0b0__py3-none-any.whl → 0.5.1__py3-none-any.whl

meteo_lt/client.py

@@ -93,35 +93,23 @@ class MeteoLtClient:
         session = await self._get_session()
         async with session.get(f"{BASE_URL}/hydro-stations") as resp:
             if resp.status == 200:
+                resp.encoding = ENCODING
                 response = await resp.json()
                 stations = []
                 for station_data in response:
-                    stations.append(
-                        HydroStation(
-                            code=station_data.get("code"),
-                            name=station_data.get("name"),
-                            water_body=station_data.get("waterBody"),
-                            coordinates=station_data.get("coordinates", {}),
-                        )
-                    )
+                    stations.append(HydroStation.from_dict(station_data))
                 return stations
-            else:
-                raise Exception(f"API returned status {resp.status}")
+            raise aiohttp.ClientError(f"API returned status {resp.status}")
 
     async def fetch_hydro_station(self, station_code: str) -> HydroStation:
         """Get information about a specific hydrological station."""
         session = await self._get_session()
         async with session.get(f"{BASE_URL}/hydro-stations/{station_code}") as resp:
             if resp.status == 200:
+                resp.encoding = ENCODING
                 response = await resp.json()
-                return HydroStation(
-                    code=response.get("code"),
-                    name=response.get("name"),
-                    water_body=response.get("waterBody"),
-                    coordinates=response.get("coordinates", {}),
-                )
-            else:
-                raise Exception(f"API returned status {resp.status}")
+                return HydroStation.from_dict(response)
+            raise aiohttp.ClientError(f"API returned status {resp.status}")
 
     async def fetch_hydro_observation_data(
         self,
@@ -136,28 +124,15 @@ class MeteoLtClient:
         ) as resp:
             if resp.status == 200:
                 response = await resp.json()
-                station = HydroStation(
-                    code=response["station"].get("code"),
-                    name=response["station"].get("name"),
-                    water_body=response["station"].get("waterBody"),
-                    coordinates=response["station"].get("coordinates", {}),
-                )
+                station = HydroStation.from_dict(response.get("station"))
 
                 observations = []
                 for obs_data in response.get("observations", []):
-                    observations.append(
-                        HydroObservation(
-                            observation_datetime=obs_data.get("observationTimeUtc"),
-                            water_level=obs_data.get("waterLevel"),
-                            water_temperature=obs_data.get("waterTemperature"),
-                            water_discharge=obs_data.get("waterDischarge"),
-                        )
-                    )
+                    observations.append(HydroObservation.from_dict(obs_data))
 
                 return HydroObservationData(
                     station=station,
                     observations_data_range=response.get("observationsDataRange"),
                     observations=observations,
                 )
-            else:
-                raise Exception(f"API returned status {resp.status}")
+            raise aiohttp.ClientError(f"API returned status {resp.status}")

meteo_lt/models.py

@@ -65,17 +65,17 @@ class WeatherWarning:
 class HydroStation(LocationBase):
     """Hydrological station data."""
 
-    water_body: str
+    water_body: str = field(metadata={"json_key": "waterBody"})
 
 
 @dataclass
 class HydroObservation:
     """Single hydrological observation."""
 
-    observation_datetime: Optional[str] = None
-    water_level: Optional[float] = None  # cm
-    water_temperature: Optional[float] = None  # °C
-    water_discharge: Optional[float] = None  # m3/s
+    observation_datetime: Optional[str] = field(default=None, metadata={"json_key": "observationTimeUtc"})
+    water_level: Optional[float] = field(default=None, metadata={"json_key": "waterLevel"})  # cm
+    water_temperature: Optional[float] = field(default=None, metadata={"json_key": "waterTemperature"})  # °C
+    water_discharge: Optional[float] = field(default=None, metadata={"json_key": "waterDischarge"})  # m3/s
 
 
 @dataclass
@@ -83,7 +83,7 @@ class HydroObservationData:
     """Observation data response."""
 
     station: HydroStation
-    observations_data_range: Optional[dict] = None
+    observations_data_range: Optional[dict] = field(default=None, metadata={"json_key": "observationsDataRange"})
     observations: List[HydroObservation] = field(default_factory=list)
 
 

meteo_lt/utils.py

@@ -1,9 +1,8 @@
 """utils.py"""
 
 from math import radians, sin, cos, sqrt, atan2
-from typing import TypeVar, List
-
-LocationT = TypeVar("LocationT")  # Type variable for location objects with latitude/longitude
+from typing import List
+from meteo_lt.models import LocationBase
 
 
 def haversine(lat1: float, lon1: float, lat2: float, lon2: float) -> float:
@@ -20,7 +19,7 @@ def haversine(lat1: float, lon1: float, lat2: float, lon2: float) -> float:
     return r * c
 
 
-def find_nearest_location(latitude: float, longitude: float, locations: List[LocationT]) -> LocationT:
+def find_nearest_location(latitude: float, longitude: float, locations: List[LocationBase]) -> LocationBase:
     """Find the nearest location from a list of locations based on the given latitude and longitude."""
     nearest_location = None
     min_distance = float("inf")

{meteo_lt_pkg-0.5.0b0.dist-info → meteo_lt_pkg-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meteo_lt-pkg
-Version: 0.5.0b0
+Version: 0.5.1
 Summary: A library to fetch weather data from api.meteo.lt
 Author-email: Brunas <brunonas@gmail.com>
 Project-URL: Homepage, https://github.com/Brunas/meteo_lt-pkg
@@ -310,6 +310,136 @@ warning = WeatherWarning(
 print(f"Warning for {warning.county}: {warning.description}")
 ```
 
+### HydroStation
+
+Represents a hydrological observation station with water body information.
+
+```python
+from meteo_lt import HydroStation
+
+station = HydroStation(
+    code="klaipedos-juru-uosto-vms",
+    name="Klaipėdos jūrų uosto VMS",
+    water_body="Baltijos jūra",
+    coordinates=coords
+)
+print(f"Station: {station.name} on {station.water_body}")
+```
+
+### HydroObservation
+
+Represents a single hydrological observation with water measurements.
+
+```python
+from meteo_lt import HydroObservation
+
+observation = HydroObservation(
+    observation_datetime="2024-07-23T12:00:00+00:00",
+    water_level=481.8,
+    water_temperature=15.5,
+    water_discharge=100.0
+)
+print(f"Water level: {observation.water_level} cm")
+print(f"Water temperature: {observation.water_temperature}°C")
+```
+
+### HydroObservationData
+
+Represents a collection of hydrological observations for a specific station.
+
+```python
+from meteo_lt import HydroObservationData
+
+data = HydroObservationData(
+    station=station,
+    observations=[observation],
+    observations_data_range={"from": "2024-07-01", "to": "2024-07-23"}
+)
+print(f"Station: {data.station.name}")
+print(f"Observations: {len(data.observations)}")
+```
+
+## Hydrological Data
+
+The package provides access to hydrological data from Lithuanian water monitoring stations.
+
+### Fetching Hydrological Stations
+
+To get the list of all hydrological stations:
+
+```python
+async def fetch_hydro_stations():
+    async with MeteoLtAPI() as api:
+        stations = await api.get_hydro_stations()
+        for station in stations:
+            print(f"{station.name} ({station.code}) - Water body: {station.water_body}")
+
+asyncio.run(fetch_hydro_stations())
+```
+
+### Finding the Nearest Hydrological Station
+
+You can find the nearest hydrological station using coordinates:
+
+```python
+async def find_nearest_hydro_station():
+    async with MeteoLtAPI() as api:
+        # Example coordinates for Klaipėda, Lithuania
+        nearest_station = await api.get_nearest_hydro_station(55.6872, 21.2797)
+        print(f"Nearest station: {nearest_station.name}")
+        print(f"Water body: {nearest_station.water_body}")
+        print(f"Distance: approximately {nearest_station.latitude}, {nearest_station.longitude}")
+
+asyncio.run(find_nearest_hydro_station())
+```
+
+### Fetching Hydrological Observations
+
+To get water level and temperature observations for a specific station:
+
+```python
+async def fetch_hydro_observations():
+    async with MeteoLtAPI() as api:
+        # Get observations for a station
+        hydro_data = await api.get_hydro_observation_data("klaipedos-juru-uosto-vms")
+
+        print(f"Station: {hydro_data.station.name}")
+        print(f"Water body: {hydro_data.station.water_body}")
+        print(f"\nRecent observations:")
+
+        for observation in hydro_data.observations[:5]:
+            print(f"  {observation.observation_datetime}")
+            print(f"    Water level: {observation.water_level} cm")
+            print(f"    Water temperature: {observation.water_temperature}°C")
+            if observation.water_discharge:
+                print(f"    Water discharge: {observation.water_discharge} m³/s")
+
+asyncio.run(fetch_hydro_observations())
+```
+
+### Getting Observations for Nearest Station
+
+Combine location finding with observation fetching:
+
+```python
+async def get_nearest_station_observations():
+    async with MeteoLtAPI() as api:
+        # Find nearest hydro station to coordinates
+        nearest_station = await api.get_nearest_hydro_station(55.6872, 21.2797)
+
+        # Get observations for the nearest station
+        hydro_data = await api.get_hydro_observation_data(nearest_station.code)
+
+        print(f"Latest observations from {hydro_data.station.name}:")
+        if hydro_data.observations:
+            latest = hydro_data.observations[0]
+            print(f"  Time: {latest.observation_datetime}")
+            print(f"  Water level: {latest.water_level} cm")
+            print(f"  Temperature: {latest.water_temperature}°C")
+
+asyncio.run(get_nearest_station_observations())
+```
+
 ## Contributing
 
 Contributions are welcome! For major changes please open an issue to discuss or submit a pull request with your changes. If you want to contribute you can use devcontainers in vscode for easiest setup follow [instructions here](.devcontainer/README.md).

meteo_lt_pkg-0.5.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+meteo_lt/__init__.py,sha256=HRQ5O9YMn6h2bXkhx6yuPF6voo6SiUZDrY8RZFeLaks,456
+meteo_lt/api.py,sha256=TJrtP2ScPhT30QR9rHs2NzPibQgbkppMDrPh9JiyBoU,4086
+meteo_lt/client.py,sha256=ubo4-jeIi_829xMhng_8hvPkO24UF1ZioGhu3bIIib8,5200
+meteo_lt/const.py,sha256=Mz_8F5k_dVQlGNdYdGQOXqaEye4G5Z0xoBw971O8vBM,2690
+meteo_lt/models.py,sha256=dWgYBwnvFPN6DjavlB4uD9kSCL7gcnw7CG-rUbz6z7w,6000
+meteo_lt/utils.py,sha256=VhXWnqfeBdKrncrsIrSwzsiN3Sg4-kDG5v6Yz-PBOLc,1281
+meteo_lt/warnings.py,sha256=6wYzinhBzXC3apR38LSEGPwsxiVTrVgLvDWql9-w0B0,6141
+meteo_lt_pkg-0.5.1.dist-info/licenses/LICENSE,sha256=3IGi6xn6NUdXGvcdwD0MUbhy3Yz5NRnUjJrwKanFAD4,1073
+meteo_lt_pkg-0.5.1.dist-info/METADATA,sha256=-5Qzyg9aX-QP8TVeZSaZrZpHb_ufYriz8_j-vaHiZzg,14432
+meteo_lt_pkg-0.5.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+meteo_lt_pkg-0.5.1.dist-info/top_level.txt,sha256=-aEdc9FzHhcIH4_0TNdKNxuvDnS3chKoJy6LK9Ud-G4,9
+meteo_lt_pkg-0.5.1.dist-info/RECORD,,

meteo_lt_pkg-0.5.0b0.dist-info/RECORD

@@ -1,12 +0,0 @@
-meteo_lt/__init__.py,sha256=HRQ5O9YMn6h2bXkhx6yuPF6voo6SiUZDrY8RZFeLaks,456
-meteo_lt/api.py,sha256=TJrtP2ScPhT30QR9rHs2NzPibQgbkppMDrPh9JiyBoU,4086
-meteo_lt/client.py,sha256=LwFRr1GDuVoeFEKj31w0pwmPQegwM-o1prZdtOop5r0,6291
-meteo_lt/const.py,sha256=Mz_8F5k_dVQlGNdYdGQOXqaEye4G5Z0xoBw971O8vBM,2690
-meteo_lt/models.py,sha256=8mUQek55pVMxjuLheW6T8oGwinf0VJdkC1Y8cWv7TIo,5667
-meteo_lt/utils.py,sha256=D2SDbWx0o_iKwJP1tCrHLovWWmT0HUu4C9gNSQEmiDw,1339
-meteo_lt/warnings.py,sha256=6wYzinhBzXC3apR38LSEGPwsxiVTrVgLvDWql9-w0B0,6141
-meteo_lt_pkg-0.5.0b0.dist-info/licenses/LICENSE,sha256=3IGi6xn6NUdXGvcdwD0MUbhy3Yz5NRnUjJrwKanFAD4,1073
-meteo_lt_pkg-0.5.0b0.dist-info/METADATA,sha256=5fBukQnZvFbMZu6XQa4PRAZTxAwivyIFCipoz3uHHhY,10382
-meteo_lt_pkg-0.5.0b0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-meteo_lt_pkg-0.5.0b0.dist-info/top_level.txt,sha256=-aEdc9FzHhcIH4_0TNdKNxuvDnS3chKoJy6LK9Ud-G4,9
-meteo_lt_pkg-0.5.0b0.dist-info/RECORD,,