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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bwt_api
-Version: 0.2.0
+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.0 → 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,13 +62,18 @@ 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}")
         raw = await self.__get_data("GetCurrentData")
-        errors = map(
-            lambda error: BwtError(int(error)), raw["ActiveErrorIDs"].split(",")
-        )
+        errors = [BwtError(int(error)) for error in raw["ActiveErrorIDs"].split(",") if error]
+        
         in_hardness = Hardness(
             raw["HardnessIN_CaCO3"],
             raw["HardnessIN_dH"],
@@ -80,7 +87,7 @@ class BwtApi:
             raw["HardnessOUT_mmol_l"],
         )
         return CurrentResponse(
-            list(errors),
+            errors,
             raw["BlendedWaterSinceSetup_l"],
             raw["CapacityColumn1_ml_dH"],
             raw["CapacityColumn2_ml_dH"],
@@ -90,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.0 → 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.0 → 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.0
+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.0 → 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
@@ -49,6 +51,42 @@ current_json = """
 }
 """
 
+current_json_empty_errors = """
+{
+   "ActiveErrorIDs" : "",
+   "BlendedWaterSinceSetup_l" : 318383,
+   "CapacityColumn1_ml_dH" : 5485275,
+   "CapacityColumn2_ml_dH" : 3833994,
+   "CurrentFlowrate_l_h" : 0,
+   "DosingSinceSetup_ml" : 0,
+   "FirmwareVersion" : "2.0207",
+   "HardnessIN_CaCO3" : 374,
+   "HardnessIN_dH" : 21,
+   "HardnessIN_fH" : 37,
+   "HardnessIN_mmol_l" : 4,
+   "HardnessOUT_CaCO3" : 71,
+   "HardnessOUT_dH" : 4,
+   "HardnessOUT_fH" : 7,
+   "HardnessOUT_mmol_l" : 1,
+   "HolidayModeStartTime" : 0,
+   "LastRegenerationColumn1" : "2023-11-16 04:42:15",
+   "LastRegenerationColumn2" : "2023-11-15 04:41:48",
+   "LastServiceCustomer" : "2023-05-18 10:51:07",
+   "LastServiceTechnican" : "2021-01-25 13:14:06",
+   "OutOfService" : 0,
+   "RegenerationCountSinceSetup" : 1505,
+   "RegenerationCounterColumn1" : 754,
+   "RegenerationCounterColumn2" : 751,
+   "RegenerativLevel" : 20,
+   "RegenerativRemainingDays" : 26,
+   "RegenerativSinceSetup_g" : 245846,
+   "ShowError" : 1,
+   "WaterSinceSetup_l" : 261633,
+   "WaterTreatedCurrentDay_l" : 181,
+   "WaterTreatedCurrentMonth_l" : 3137,
+   "WaterTreatedCurrentYear_l" : 80700
+}
+"""
 
 async def test_wrong_code():
     with aioresponses() as mocked:
@@ -92,10 +130,44 @@ 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,
+                regeneration_count=1505,
+                regenerativ_level=20,
+                regenerativ_days=26,
+                regenerativ_total=245846,
+                show_error=1,
+                treated_day=181,
+                treated_month=3137,
+                treated_year=80700,
+            )
+
+
+async def test_empty_errors():
+    with aioresponses() as mocked:
+        mocked.get("http://host:8080/api/GetCurrentData", status=200, body=current_json_empty_errors)
+        async with BwtApi("host", "code") as api:
+            result = await api.get_current_data()
+            assert result == CurrentResponse(
+                errors=[],
+                blended_total=318383,
+                capacity_1=5485275,
+                capacity_2=3833994,
+                current_flow=0,
+                dosing_total=0,
+                firmware_version="2.0207",
+                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=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,