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

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

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

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

@@ -10,16 +10,10 @@ from zoneinfo import ZoneInfo
 
 from bwt_api.error import BwtError
 from bwt_api.exception import ApiException, ConnectException, WrongCodeException
-
-from bwt_api.data import CurrentResponse, DailyResponse, MonthlyResponse, YearlyResponse
-from bwt_api.data import Hardness
+from bwt_api.data import CurrentResponse, DailyResponse, MonthlyResponse, YearlyResponse, Hardness, BwtStatus
 
 _logger = logging.getLogger(__name__)
 
-class RestApi:
-    """Rest functionality encapsulated for testing."""
-
-
 class BwtApi:
     """BWT Api."""
     _session: aiohttp.ClientSession
@@ -63,7 +57,7 @@ class BwtApi:
             raise ConnectException from e
 
     def _convert_datetime(self, input: str) -> datetime:
-        # It looks like the device even shows everything in UTC
+        # It looks like the device sends and even shows everything in UTC
         return datetime.strptime(
             input, "%Y-%m-%d %H:%M:%S"
         ).replace(tzinfo=ZoneInfo("UTC"))
@@ -108,7 +102,7 @@ class BwtApi:
             raw["RegenerativLevel"],
             raw["RegenerativRemainingDays"],
             raw["RegenerativSinceSetup_g"],
-            raw["ShowError"],
+            BwtStatus(int(raw["ShowError"])),
             raw["WaterTreatedCurrentDay_l"],
             raw["WaterTreatedCurrentMonth_l"],
             raw["WaterTreatedCurrentYear_l"],

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

@@ -1,11 +1,18 @@
 """Data objects received from the API."""
 
 
+import enum
+
 from dataclasses import dataclass
 from datetime import datetime
 from bwt_api.error import BwtError
 
 
+class BwtStatus(enum.Enum):
+    OK = 0
+    WARNING = 1
+    ERROR = 2
+
 @dataclass
 class Hardness:
     caco3: int  # ppm CACO3
@@ -37,7 +44,7 @@ class CurrentResponse:
     regenerativ_level: int  # %
     regenerativ_days: int  # days left
     regenerativ_total: int  # g
-    show_error: int  # 0: ok/blue, 1: warning/yellow, 2: error/red
+    state: BwtStatus
     treated_day: int  # treated water current day
     treated_month: int  # treated water current month
     treated_year: int  # treated water current year
@@ -58,4 +65,4 @@ class MonthlyResponse:
 @dataclass
 class YearlyResponse:
     # treated water in 1 month intervals
-    values: list[int]
+    values: list[int]

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

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

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

@@ -4,7 +4,8 @@ import pytest
 
 from bwt_api.api import BwtApi
 from bwt_api.error import BwtError
-from bwt_api.data import CurrentResponse, Hardness
+from bwt_api.data import CurrentResponse, Hardness, BwtStatus
+
 from aioresponses import aioresponses
 
 from bwt_api.exception import ApiException, ConnectException, WrongCodeException
@@ -43,7 +44,7 @@ current_json = """
    "RegenerativLevel" : 20,
    "RegenerativRemainingDays" : 26,
    "RegenerativSinceSetup_g" : 245846,
-   "ShowError" : 1,
+   "ShowError" : 2,
    "WaterSinceSetup_l" : 261633,
    "WaterTreatedCurrentDay_l" : 181,
    "WaterTreatedCurrentMonth_l" : 3137,
@@ -80,7 +81,7 @@ current_json_empty_errors = """
    "RegenerativLevel" : 20,
    "RegenerativRemainingDays" : 26,
    "RegenerativSinceSetup_g" : 245846,
-   "ShowError" : 1,
+   "ShowError" : 0,
    "WaterSinceSetup_l" : 261633,
    "WaterTreatedCurrentDay_l" : 181,
    "WaterTreatedCurrentMonth_l" : 3137,
@@ -141,7 +142,7 @@ async def test_current_data():
                 regenerativ_level=20,
                 regenerativ_days=26,
                 regenerativ_total=245846,
-                show_error=1,
+                state=BwtStatus.ERROR,
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,
@@ -175,7 +176,7 @@ async def test_empty_errors():
                 regenerativ_level=20,
                 regenerativ_days=26,
                 regenerativ_total=245846,
-                show_error=1,
+                state=BwtStatus.OK,
                 treated_day=181,
                 treated_month=3137,
                 treated_year=80700,