Merge pull request #5 from briis/0.6.1-branch

0.6.1 branch
briis · Oct 16, 2023 · c4b19ef · c4b19ef
2 parents fe774e1 + 4d89d72
commit c4b19ef
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## Release 0.6.1
+
+**Date**: `2023-10-15`
+
+### Changes
+
+- Optimizing the *Fetch Sensor Data* by removing 1 call to the API per cycle.
+
 ## Release 0.6.0
 
 **Date**: `2023-10-14`

diff --git a/async_test_module.py b/async_test_module.py
@@ -44,24 +44,28 @@ async def main() -> None:
     except Exception as err:
         print(err)
 
-    try:
-        sensor_data: WeatherFlowSensorData = await weatherflow.async_fetch_sensor_data()
-        print("TEMPERATURE:", sensor_data.air_temperature)
-        print("APPARENT:", sensor_data.feels_like)
-        print("WIND GUST:", sensor_data.wind_gust)
-        print("LAST LIGHTNING:", sensor_data.lightning_strike_last_epoch)
-        print("WIND DIRECTION: ", sensor_data.wind_direction)
-        print("WIND CARDINAL: ", sensor_data.wind_cardinal)
-        print("PRECIP CHECKED: ", sensor_data.precip_accum_local_day_final)
-        print("ABSOLUTE HUMIDITY: ", sensor_data.absolute_humidity)
-        print("VISIBILITY: ", sensor_data.visibility)
-        print("BEAUFORT: ", sensor_data.beaufort)
-        print("FREEZING ALT: ", sensor_data.freezing_altitude)
-        print("VOLTAGE: ", sensor_data.voltage)
-        print("BATTERY: ", sensor_data.battery)
-
-    except Exception as err:
-        print(err)
+    cnt = 1
+    while cnt < 3:
+        try:
+            sensor_data: WeatherFlowSensorData = await weatherflow.async_fetch_sensor_data()
+            print("TEMPERATURE:", sensor_data.air_temperature)
+            print("APPARENT:", sensor_data.feels_like)
+            print("WIND GUST:", sensor_data.wind_gust)
+            print("LAST LIGHTNING:", sensor_data.lightning_strike_last_epoch)
+            print("WIND DIRECTION: ", sensor_data.wind_direction)
+            print("WIND CARDINAL: ", sensor_data.wind_cardinal)
+            print("PRECIP CHECKED: ", sensor_data.precip_accum_local_day_final)
+            print("ABSOLUTE HUMIDITY: ", sensor_data.absolute_humidity)
+            print("VISIBILITY: ", sensor_data.visibility)
+            print("BEAUFORT: ", sensor_data.beaufort)
+            print("FREEZING ALT: ", sensor_data.freezing_altitude)
+            print("VOLTAGE: ", sensor_data.voltage)
+            print("BATTERY: ", sensor_data.battery)
+
+            cnt += 1
+
+        except Exception as err:
+            print(err)
 
 
     try:

diff --git a/pyweatherflow_forecast/__init__.py b/pyweatherflow_forecast/__init__.py
@@ -17,6 +17,6 @@
 )
 
 __title__ = "pyweatherflow_forecast"
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 __author__ = "briis"
 __license__ = "MIT"
diff --git a/pyweatherflow_forecast/wffcst_lib.py b/pyweatherflow_forecast/wffcst_lib.py
@@ -87,6 +87,8 @@ def api_request(self, url: str) -> dict[str, Any]:
     async def async_api_request(self, url: str) -> dict[str, Any]:
         """Get data from WeatherFlow API."""
 
+        _LOGGER.debug("URL CALLED: %s", url)
+
         is_new_session = False
         if self.session is None:
             self.session = aiohttp.ClientSession()
@@ -138,6 +140,7 @@ def __init__(
         self._api_token = api_token
         self._elevation = elevation
         self._api = api
+        self._device_id = None
         self._json_data = None
         self._station_data: WeatherFlowStationData = None
         self._device_data: WeatherFlowDeviceData = None
@@ -166,11 +169,13 @@ def fetch_sensor_data(self, voltage: float = None) -> list[WeatherFlowSensorData
         device_data = None
         sensor_data = None
 
-        station_url = f"{WEATHERFLOW_STATION_URL}{self._station_id}?token={self._api_token}"
-        json_station_data = self._api.api_request(station_url)
-        station_data: WeatherFlowStationData = _get_station(json_station_data)
+        if self._device_id is None:
+            station_url = f"{WEATHERFLOW_STATION_URL}{self._station_id}?token={self._api_token}"
+            json_station_data = self._api.api_request(station_url)
+            station_data: WeatherFlowStationData = _get_station(json_station_data)
+            self._device_id = station_data.device_id
 
-        if station_data is not None:
+        if self._device_id is not None:
             _device_id = station_data.device_id
             device_url = f"{WEATHERFLOW_DEVICE_URL}{_device_id}?token={self._api_token}"
             json_device_data = self._api.api_request(device_url)
@@ -189,15 +194,16 @@ async def async_fetch_sensor_data(self) -> list[WeatherFlowSensorData]:
         device_data = None
         sensor_data = None
 
-        station_url = f"{WEATHERFLOW_STATION_URL}{self._station_id}?token={self._api_token}"
-        json_station_data = await self._api.async_api_request(station_url)
-        station_data: WeatherFlowStationData = _get_station(json_station_data)
+        if self._device_id is None:
+            station_url = f"{WEATHERFLOW_STATION_URL}{self._station_id}?token={self._api_token}"
+            json_station_data = await self._api.async_api_request(station_url)
+            station_data: WeatherFlowStationData = _get_station(json_station_data)
+            self._device_id = station_data.device_id
 
-        if station_data is not None:
-            _device_id = station_data.device_id
-            device_url = f"{WEATHERFLOW_DEVICE_URL}{_device_id}?token={self._api_token}"
+        if self._device_id is not None:
+            device_url = f"{WEATHERFLOW_DEVICE_URL}{self._device_id}?token={self._api_token}"
             json_device_data = await self._api.async_api_request(device_url)
-            device_data: WeatherFlowDeviceData = _get_device_data(json_device_data, _device_id)
+            device_data: WeatherFlowDeviceData = _get_device_data(json_device_data, self._device_id)
 
         if device_data is not None:
             _voltage = device_data.voltage

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="pyweatherflow-forecast",
-    version="0.6.0",
+    version="0.6.1",
     author="briis",
     author_email="[email protected]",
     description="Gets the weather forecast data from WeatherFlow",