bwt-api 1.0.3__tar.gz → 1.1.0__tar.gz

{bwt_api-1.0.3 → bwt_api-1.1.0}/PKG-INFO

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

{bwt_api-1.0.3 → bwt_api-1.1.0}/src/bwt_api/data.py

@@ -33,55 +33,21 @@ class SmartDosStatus(enum.IntEnum):
     def _missing_(cls, value):
         return None
 
-    @classmethod
-    def normal(cls) -> list["SmartDosStatus"]:
-        """Return SmartDosStatus values considered normal/OK."""
-        return [
-            cls.STANDBY,
-            cls.METERING_ACTIVE,
-        ]
+    def is_fatal(self) -> bool:
+        return self not in WARNING_CODES
 
-    @classmethod
-    def warning(cls) -> list["SmartDosStatus"]:
-        """Return SmartDosStatus values that indicate warnings."""
-        return [
-            cls.MINERAL_CONTAINER_LEVEL_LOW,
-            cls.SMART_MINERAL_RUNNING_LOW,
-        ]
+    def is_normal(self) -> bool:
+        return self in NORMAL_CODES
 
-    @classmethod
-    def error(cls) -> list["SmartDosStatus"]:
-        """Return SmartDosStatus values that indicate errors."""
-        return [
-            cls.MINERAL_CONTAINER_EMPTY,
-            cls.PUMP_FAULT,
-            cls.PUMP_POWER_FAULT,
-            cls.SMART_MINERAL_RUN_OUT,
-            cls.AQA_VOLUME_ALARM,
-            cls.AQA_WATCH_ALARM,
-            cls.AQA_MAXFLOW_ALARM,
-            cls.PUMP_CONTROL_FAULT,
-        ]
+NORMAL_CODES = [
+    SmartDosStatus.STANDBY,
+    SmartDosStatus.METERING_ACTIVE,
+]
 
-    @classmethod
-    def category(cls, value) -> BwtStatus | None:
-        """Return the `BwtStatus` category for a SmartDosStatus value.
-
-        Accepts either an int or a SmartDosStatus member. Returns `BwtStatus.OK`,
-        `BwtStatus.WARNING`, or `BwtStatus.ERROR`, or `None` for unknown values.
-        """
-        try:
-            status = cls(value)
-        except Exception:
-            return None
-
-        if status in cls.normal():
-            return BwtStatus.OK
-        if status in cls.warning():
-            return BwtStatus.WARNING
-        if status in cls.error():
-            return BwtStatus.ERROR
-        return None
+WARNING_CODES = [
+    SmartDosStatus.MINERAL_CONTAINER_LEVEL_LOW,
+    SmartDosStatus.SMART_MINERAL_RUNNING_LOW,
+]
 
 
 class SubstanceType(enum.IntEnum):

{bwt_api-1.0.3 → bwt_api-1.1.0}/src/bwt_api/silk_api.py

@@ -25,10 +25,10 @@ class BwtSilkApi:
     async def close(self):
         await self._session.close()
 
-    async def get_registers(self) -> list[int]:
-        """Internal method to fetch json from the endpoint and handle general errors."""
+    async def __get_json(self, path: str):
+        """Fetch JSON from a Silk HTTP endpoint and handle general errors."""
         try:
-            async with self._session.get(f"http://{self._host}:80/silk/registers") as response:
+            async with self._session.get(f"http://{self._host}:80{path}") as response:
                 self._logger.debug(
                     "Response status: %s, content-type: %s",
                     response.status,
@@ -37,10 +37,19 @@ class BwtSilkApi:
                 if response.status == 200:
                     json = await response.json(content_type=None)
                     self._logger.debug("Raw response: %s", json)
-                    return json["params"]
+                    return json
                 else:
                     text = await response.text()
                     self._logger.warning("Unknown response with status %s: %s", response.status, text)
                     raise ApiException(f"Unknown response: {text}")
         except aiohttp.ClientConnectorError as e:
             raise ConnectException from e
+
+    async def get_registers(self) -> list[int]:
+        """Fetch softener register values from /silk/registers."""
+        json = await self.__get_json("/silk/registers")
+        return json["params"]
+
+    async def get_status(self) -> dict:
+        """Fetch firmware / product metadata from /silk/status."""
+        return await self.__get_json("/silk/status")

{bwt_api-1.0.3 → bwt_api-1.1.0}/src/bwt_api.egg-info/PKG-INFO

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

{bwt_api-1.0.3 → bwt_api-1.1.0}/src/bwt_api.egg-info/scm_file_list.json

@@ -1,41 +1,41 @@
 {
   "files": [
-    "tox.ini",
+    ".coveragerc",
+    ".devcontainer/devcontainer.json",
+    ".github/workflows/python-package.yml",
+    ".github/workflows/python-publish.yml",
+    ".gitignore",
     "LICENSE.txt",
     "README.rst",
-    "setup.py",
     "pyproject.toml",
     "setup.cfg",
-    ".gitignore",
-    ".coveragerc",
-    ".github/workflows/python-publish.yml",
-    ".github/workflows/python-package.yml",
-    ".devcontainer/devcontainer.json",
-    "tests/test_api.py",
-    "tests/test_distinguish.py",
+    "setup.py",
+    "src/bwt_api/__init__.py",
+    "src/bwt_api/api.py",
+    "src/bwt_api/bwt.py",
+    "src/bwt_api/bwt_api.py",
+    "src/bwt_api/data.py",
+    "src/bwt_api/error.py",
+    "src/bwt_api/exception.py",
+    "src/bwt_api/silk_api.py",
+    "src/bwt_api/skeleton.py",
+    "src/bwt_api/smart_dos_api.py",
     "tests/conftest.py",
+    "tests/data/perla/GetCurrentData.json",
+    "tests/data/perla/GetDailyData.json",
+    "tests/data/perla/GetMonthlyData.json",
+    "tests/data/perla/GetYearlyData.json",
     "tests/data/silk/registers.json",
+    "tests/data/smartdos/gatt_0104.json",
+    "tests/data/smartdos/gatt_0201.json",
     "tests/data/smartdos/gatt_0202.json",
     "tests/data/smartdos/gatt_0208.json",
     "tests/data/smartdos/gatt_0401.json",
-    "tests/data/smartdos/gatt_0104.json",
+    "tests/data/smartdos/gatt_0402.json",
     "tests/data/smartdos/gatt_0503.json",
     "tests/data/smartdos/gatt_0505.json",
-    "tests/data/smartdos/gatt_0402.json",
-    "tests/data/smartdos/gatt_0201.json",
-    "tests/data/perla/GetMonthlyData.json",
-    "tests/data/perla/GetDailyData.json",
-    "tests/data/perla/GetCurrentData.json",
-    "tests/data/perla/GetYearlyData.json",
-    "src/bwt_api/data.py",
-    "src/bwt_api/smart_dos_api.py",
-    "src/bwt_api/exception.py",
-    "src/bwt_api/__init__.py",
-    "src/bwt_api/bwt.py",
-    "src/bwt_api/api.py",
-    "src/bwt_api/error.py",
-    "src/bwt_api/bwt_api.py",
-    "src/bwt_api/skeleton.py",
-    "src/bwt_api/silk_api.py"
+    "tests/test_api.py",
+    "tests/test_distinguish.py",
+    "tox.ini"
   ]
 }

bwt_api-1.1.0/src/bwt_api.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.0",
+  "distance": 0,
+  "node": "g0d54cc96494e57410f12e506bd2ca275aca1ac57",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-27"
+}

{bwt_api-1.0.3 → bwt_api-1.1.0}/tests/data/smartdos/gatt_0104.json

@@ -1,5 +1,5 @@
 {
-    "ssid": "Graf WLAN",
+    "ssid": "MyWiFi",
     "rssi": null,
     "rssiAvg": "-54.00",
     "rssiSig": "0.00",

{bwt_api-1.0.3 → bwt_api-1.1.0}/tests/data/smartdos/gatt_0201.json

@@ -1,8 +1,8 @@
 {
     "fwRev": "1.2.0",
     "hwRev": "2.4.0(A)",
-    "productCode": "3HZR-1R37",
-    "iotDevId": "5b29b9e9-24c5-4eea-a599-927922a89f5a",
+    "productCode": "1AAA-2BBB",
+    "iotDevId": "abcdefgh-1234-5678-abcd-1234567890ab",
     "iotDevType": "bwt_bewados",
     "iotDevVariant": "dev",
     "uptime": 6510811,

{bwt_api-1.0.3 → bwt_api-1.1.0}/tests/test_api.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import pytest
 from aiohttp.client_reqrep import ClientResponse
 
-from bwt_api.api import BwtApi, BwtSmartDosApi, treated_to_blended
+from bwt_api.api import BwtApi, BwtSmartDosApi, BwtSilkApi, treated_to_blended
 from bwt_api.error import BwtError
 from bwt_api.data import CurrentResponse, Hardness, BwtStatus, SmartDosStatus, SubstanceType
 
@@ -316,7 +316,7 @@ async def test_smartdos_get_wifi_info():
         )
         async with BwtSmartDosApi("host") as api:
             result = await api.get_wifi_info()
-            assert result.ssid == "Graf WLAN"
+            assert result.ssid == "MyWiFi"
             assert result.rssiAvg == "-54.00"
             assert result.mac == "AA:BB:CC:DD:EE:FF"
 
@@ -332,7 +332,7 @@ async def test_smartdos_get_gatt_0201():
         async with BwtSmartDosApi("host") as api:
             result = await api.get_gatt_0201()
             assert result["fwRev"] == "1.2.0"
-            assert result["productCode"] == "3HZR-1R37"
+            assert result["productCode"] == "1AAA-2BBB"
 
 
 async def test_smartdos_unknown_response():
@@ -451,3 +451,44 @@ def test_treated_to_blended():
     assert treated_to_blended(191, 21, 4) == pytest.approx(235.9411)
     # Edge case: hardness_in == 0 should return treated as-is, not divide by zero
     assert treated_to_blended(100, 0, 0) == 100
+
+
+async def test_silk_get_registers():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/silk/registers",
+            status=200,
+            body='{"params":[0, -1, 8, 30, 250]}',
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSilkApi("host") as api:
+            result = await api.get_registers()
+            assert result == [0, -1, 8, 30, 250]
+
+
+async def test_silk_get_status():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/silk/status",
+            status=200,
+            body='{"version":"2.3.7","gitver":1234,"productCode":"SILK"}',
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSilkApi("host") as api:
+            result = await api.get_status()
+            assert result["version"] == "2.3.7"
+            assert result["gitver"] == 1234
+            assert result["productCode"] == "SILK"
+
+
+async def test_silk_get_status_error():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/silk/status",
+            status=500,
+            body="boom",
+            headers={"Content-Type": "text/plain"},
+        )
+        async with BwtSilkApi("host") as api:
+            with pytest.raises(ApiException):
+                await api.get_status()

bwt_api-1.0.3/src/bwt_api.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.0.3",
-  "distance": 0,
-  "node": "g59008971f6a96776cdf5cac562c45f27f148eec7",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-04"
-}