bwt-api 0.2.1__tar.gz → 0.3.0__tar.gz

{bwt_api-0.2.1 → bwt_api-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bwt_api
-Version: 0.2.1
+Version: 0.3.0
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv

{bwt_api-0.2.1 → bwt_api-0.3.0}/src/bwt_api/api.py

@@ -5,6 +5,8 @@ from tokenize import String
 import aiohttp
 import base64
 import logging
+from datetime import datetime
+from zoneinfo import ZoneInfo
 
 from bwt_api.error import BwtError
 from bwt_api.exception import ApiException, ConnectException, WrongCodeException
@@ -60,6 +62,12 @@ class BwtApi:
         except aiohttp.ClientConnectorError as e:
             raise ConnectException from e
 
+    def _convert_datetime(self, input: str) -> datetime:
+        # It looks like the device even shows everything in UTC
+        return datetime.strptime(
+            input, "%Y-%m-%d %H:%M:%S"
+        ).replace(tzinfo=ZoneInfo("UTC"))
+
     async def get_current_data(self) -> CurrentResponse:
         """Get the current state of the BWT."""
         _logger.debug(f"Fetching current data from {self._host}")
@@ -89,10 +97,10 @@ class BwtApi:
             in_hardness,
             out_hardness,
             raw["HolidayModeStartTime"],
-            raw["LastRegenerationColumn1"],
-            raw["LastRegenerationColumn2"],
-            raw["LastServiceCustomer"],
-            raw["LastServiceTechnican"],
+            self._convert_datetime(raw["LastRegenerationColumn1"]),
+            self._convert_datetime(raw["LastRegenerationColumn2"]),
+            self._convert_datetime(raw["LastServiceCustomer"]),
+            self._convert_datetime(raw["LastServiceTechnican"]),
             raw["OutOfService"],
             raw["RegenerationCounterColumn1"],
             raw["RegenerationCounterColumn2"],

{bwt_api-0.2.1 → bwt_api-0.3.0}/src/bwt_api/data.py

@@ -2,6 +2,7 @@
 
 
 from dataclasses import dataclass
+from datetime import datetime
 from bwt_api.error import BwtError
 
 
@@ -25,10 +26,10 @@ class CurrentResponse:
     in_hardness: Hardness
     out_hardness: Hardness
     holiday_mode: int  # -1 or 0: inactive, 1: active, unix timestamp: start in future
-    regeneration_last_1: str  # date time
-    regeneration_last_2: str  # date time
-    service_customer: str
-    service_technician: str
+    regeneration_last_1: datetime
+    regeneration_last_2: datetime
+    service_customer: datetime 
+    service_technician: datetime
     out_of_service: int
     regeneration_count_1: int
     regeneration_count_2: int

{bwt_api-0.2.1 → bwt_api-0.3.0}/src/bwt_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: bwt-api
-Version: 0.2.1
+Name: bwt_api
+Version: 0.3.0
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv

{bwt_api-0.2.1 → bwt_api-0.3.0}/tests/test_api.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+from zoneinfo import ZoneInfo
 import pytest
 
 from bwt_api.api import BwtApi
@@ -128,10 +130,10 @@ async def test_current_data():
                 in_hardness=Hardness(caco3=374, dH=21, fH=37, mmol=4),
                 out_hardness=Hardness(caco3=71, dH=4, fH=7, mmol=1),
                 holiday_mode=0,
-                regeneration_last_1="2023-11-16 04:42:15",
-                regeneration_last_2="2023-11-15 04:41:48",
-                service_customer="2023-05-18 10:51:07",
-                service_technician="2021-01-25 13:14:06",
+                regeneration_last_1=datetime(2023, 11, 16, 4, 42,15,0,ZoneInfo("UTC")),
+                regeneration_last_2=datetime(2023, 11, 15, 4, 41,48,0,ZoneInfo("UTC")),
+                service_customer=datetime(2023, 5, 18, 10, 51,7,0,ZoneInfo("UTC")),
+                service_technician=datetime(2021, 1, 25, 13, 14,6,0,ZoneInfo("UTC")),
                 out_of_service=0,
                 regeneration_count_1=754,
                 regeneration_count_2=751,
@@ -162,10 +164,10 @@ async def test_empty_errors():
                 in_hardness=Hardness(caco3=374, dH=21, fH=37, mmol=4),
                 out_hardness=Hardness(caco3=71, dH=4, fH=7, mmol=1),
                 holiday_mode=0,
-                regeneration_last_1="2023-11-16 04:42:15",
-                regeneration_last_2="2023-11-15 04:41:48",
-                service_customer="2023-05-18 10:51:07",
-                service_technician="2021-01-25 13:14:06",
+                regeneration_last_1=datetime(2023, 11, 16, 4, 42,15,0,ZoneInfo("UTC")),
+                regeneration_last_2=datetime(2023, 11, 15, 4, 41,48,0,ZoneInfo("UTC")),
+                service_customer=datetime(2023, 5, 18, 10, 51,7,0,ZoneInfo("UTC")),
+                service_technician=datetime(2021, 1, 25, 13, 14,6,0,ZoneInfo("UTC")),
                 out_of_service=0,
                 regeneration_count_1=754,
                 regeneration_count_2=751,