bwt-api 0.4.2__tar.gz → 0.5.1__tar.gz

{bwt_api-0.4.2/src/bwt_api.egg-info → bwt_api-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bwt_api
-Version: 0.4.2
+Version: 0.5.1
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv
@@ -23,6 +23,7 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: aioresponses; extra == "testing"
+Dynamic: license-file
 
 
 bwt_api

{bwt_api-0.4.2 → bwt_api-0.5.1}/src/bwt_api/api.py

@@ -57,16 +57,17 @@ class BwtApi:
             raise ConnectException from e
 
     def _convert_datetime(self, input: str) -> datetime:
-        # It looks like the device sends and even shows everything in UTC
+        # It looks like the device sends and even shows everything in local time
         return datetime.strptime(
             input, "%Y-%m-%d %H:%M:%S"
-        ).replace(tzinfo=ZoneInfo("UTC"))
+        )# .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 = [BwtError(int(error)) for error in raw["ActiveErrorIDs"].split(",") if error]
+        perla_one = raw["CapacityColumn2_ml_dH"] == -1
         
         in_hardness = Hardness(
             raw["HardnessIN_CaCO3"],
@@ -106,6 +107,7 @@ class BwtApi:
             raw["WaterTreatedCurrentDay_l"],
             raw["WaterTreatedCurrentMonth_l"],
             raw["WaterTreatedCurrentYear_l"],
+            1 if perla_one else 2,
         )
 
     async def get_daily_data(self) -> DailyResponse:

{bwt_api-0.4.2 → bwt_api-0.5.1}/src/bwt_api/data.py

@@ -48,6 +48,7 @@ class CurrentResponse:
     treated_day: int  # treated water current day
     treated_month: int  # treated water current month
     treated_year: int  # treated water current year
+    columns: int # number of columns: 2 for BWT Duo and 1 for BWT Perla One
 
 
 @dataclass

{bwt_api-0.4.2 → bwt_api-0.5.1/src/bwt_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bwt_api
-Version: 0.4.2
+Version: 0.5.1
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv
@@ -23,6 +23,7 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: aioresponses; extra == "testing"
+Dynamic: license-file
 
 
 bwt_api

{bwt_api-0.4.2 → bwt_api-0.5.1}/tests/test_api.py

@@ -89,6 +89,43 @@ current_json_empty_errors = """
 }
 """
 
+current_json_perla_one = """
+{
+   "ActiveErrorIDs" : "",
+   "BlendedWaterSinceSetup_l" : 189985,
+   "CapacityColumn1_ml_dH" : 4487511,
+   "CapacityColumn2_ml_dH" : -1,
+   "CurrentFlowrate_l_h" : 0,
+   "DosingSinceSetup_ml" : 0,
+   "FirmwareVersion" : "2.0211",
+   "HardnessIN_CaCO3" : 409,
+   "HardnessIN_dH" : 23,
+   "HardnessIN_fH" : 41,
+   "HardnessIN_mmol_l" : 4,
+   "HardnessOUT_CaCO3" : 107,
+   "HardnessOUT_dH" : 6,
+   "HardnessOUT_fH" : 11,
+   "HardnessOUT_mmol_l" : 1,
+   "HolidayModeStartTime" : 0,
+   "LastRegenerationColumn1" : "2025-01-15 03:00:15",
+   "LastRegenerationColumn2" : "1970-01-01 00:59:59",
+   "LastServiceCustomer" : "2024-11-25 09:13:48",
+   "LastServiceTechnican" : "2023-08-07 11:13:51",
+   "OutOfService" : 0,
+   "RegenerationCountSinceSetup" : 692,
+   "RegenerationCounterColumn1" : 692,
+   "RegenerationCounterColumn2" : 0,
+   "RegenerativLevel" : 37,
+   "RegenerativRemainingDays" : 62,
+   "RegenerativSinceSetup_g" : 207305,
+   "ShowError" : 0,
+   "WaterSinceSetup_l" : 148544,
+   "WaterTreatedCurrentDay_l" : 179,
+   "WaterTreatedCurrentMonth_l" : 514,
+   "WaterTreatedCurrentYear_l" : 500
+}
+"""
+
 async def test_wrong_code():
     with aioresponses() as mocked:
         mocked.get("http://host:8080/api/GetCurrentData", status=404, body="")
@@ -131,10 +168,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=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")),
+                regeneration_last_1=datetime(2023, 11, 16, 4, 42,15,0),
+                regeneration_last_2=datetime(2023, 11, 15, 4, 41,48,0),
+                service_customer=datetime(2023, 5, 18, 10, 51,7,0),
+                service_technician=datetime(2021, 1, 25, 13, 14,6,0),
                 out_of_service=0,
                 regeneration_count_1=754,
                 regeneration_count_2=751,
@@ -146,6 +183,7 @@ async def test_current_data():
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,
+                columns=2,
             )
 
 
@@ -165,10 +203,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=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")),
+                regeneration_last_1=datetime(2023, 11, 16, 4, 42,15,0),
+                regeneration_last_2=datetime(2023, 11, 15, 4, 41,48,0),
+                service_customer=datetime(2023, 5, 18, 10, 51,7,0),
+                service_technician=datetime(2021, 1, 25, 13, 14,6,0),
                 out_of_service=0,
                 regeneration_count_1=754,
                 regeneration_count_2=751,
@@ -180,6 +218,42 @@ async def test_empty_errors():
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,
+                columns=2,
+            )
+
+
+async def test_perla_one():
+    with aioresponses() as mocked:
+        mocked.get("http://host:8080/api/GetCurrentData", status=200, body=current_json_perla_one)
+        async with BwtApi("host", "code") as api:
+            result = await api.get_current_data()
+            assert result == CurrentResponse(
+                errors=[],
+                blended_total=189985,
+                capacity_1=4487511,
+                capacity_2=-1,
+                current_flow=0,
+                dosing_total=0,
+                firmware_version="2.0211",
+                in_hardness=Hardness(caco3=409, dH=23, fH=41, mmol=4),
+                out_hardness=Hardness(caco3=107, dH=6, fH=11, mmol=1),
+                holiday_mode=0,
+                regeneration_last_1=datetime(2025, 1, 15, 3, 0, 15, 0),
+                regeneration_last_2=datetime(1970, 1, 1, 0, 59, 59, 0),
+                service_customer=datetime(2024, 11, 25, 9, 13, 48, 0),
+                service_technician=datetime(2023, 8, 7, 11, 13, 51, 0),
+                out_of_service=0,
+                regeneration_count_1=692,
+                regeneration_count_2=0,
+                regeneration_count=692,
+                regenerativ_level=37,
+                regenerativ_days=62,
+                regenerativ_total=207305,
+                state=BwtStatus.OK,
+                treated_day=179,
+                treated_month=514,
+                treated_year=500,
+                columns=1,
             )
 
 def test_treated_to_blended():