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

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

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

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

@@ -132,3 +132,9 @@ class BwtApi:
         raw = await self.__get_data("GetYearlyData")
         keys = [f"Month{month:02}_l" for month in range(1, 13)]
         return YearlyResponse(list(map(lambda k: raw[k], keys)))
+
+def treated_to_blended(treated: int, hardness_in: int, hardness_out: int) -> float:
+    if (hardness_in == 0 | hardness_in == hardness_out):
+        return treated
+
+    return treated / (1.0 - hardness_out / hardness_in)

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

@@ -44,7 +44,7 @@ class CurrentResponse:
     regenerativ_level: int  # %
     regenerativ_days: int  # days left
     regenerativ_total: int  # g
-    show_error: BwtStatus
+    state: BwtStatus
     treated_day: int  # treated water current day
     treated_month: int  # treated water current month
     treated_year: int  # treated water current year

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

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

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

@@ -2,7 +2,7 @@ from datetime import datetime
 from zoneinfo import ZoneInfo
 import pytest
 
-from bwt_api.api import BwtApi
+from bwt_api.api import BwtApi, treated_to_blended
 from bwt_api.error import BwtError
 from bwt_api.data import CurrentResponse, Hardness, BwtStatus
 
@@ -142,7 +142,7 @@ async def test_current_data():
                 regenerativ_level=20,
                 regenerativ_days=26,
                 regenerativ_total=245846,
-                show_error=BwtStatus.ERROR,
+                state=BwtStatus.ERROR,
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,
@@ -176,8 +176,15 @@ async def test_empty_errors():
                 regenerativ_level=20,
                 regenerativ_days=26,
                 regenerativ_total=245846,
-                show_error=BwtStatus.OK,
+                state=BwtStatus.OK,
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,
             )
+
+def test_treated_to_blended():
+    assert treated_to_blended(0, 21, 4) == 0
+    assert treated_to_blended(100, 21, 21) == 100
+    assert treated_to_blended(10, 20, 4) == 12.5
+    assert treated_to_blended(306, 21, 4) == 378
+    assert treated_to_blended(191, 21, 4) == pytest.approx(235.9411)