PyPI - bwt-api - Versions diffs - 1.0.2__tar.gz → 1.0.3__tar.gz - Mend

bwt-api 1.0.2tar.gz → 1.0.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (51) hide show

{bwt_api-1.0.2 → bwt_api-1.0.3}/PKG-INFO RENAMED Viewed

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

{bwt_api-1.0.2 → bwt_api-1.0.3}/src/bwt_api/data.py RENAMED Viewed

@@ -33,6 +33,56 @@ 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,
+        ]
+    @classmethod
+    def warning(cls) -> list["SmartDosStatus"]:
+        """Return SmartDosStatus values that indicate warnings."""
+        return [
+            cls.MINERAL_CONTAINER_LEVEL_LOW,
+            cls.SMART_MINERAL_RUNNING_LOW,
+        ]
+    @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,
+        ]
+    @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
 class SubstanceType(enum.IntEnum):
     L1_LE = 1
@@ -68,7 +118,7 @@ class CurrentResponse:
     holiday_mode: int  # -1 or 0: inactive, 1: active, unix timestamp: start in future
     regeneration_last_1: datetime
     regeneration_last_2: datetime
-    service_customer: datetime
+    service_customer: datetime
     service_technician: datetime
     out_of_service: int
     regeneration_count_1: int
@@ -81,7 +131,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
+    columns: int  # number of columns: 2 for BWT Duo and 1 for BWT Perla One
 @dataclass
@@ -91,11 +141,13 @@ class DailyResponse:
     # [1] = 00:30 - 00:59
     values: list[int]
 @dataclass
 class MonthlyResponse:
     # treated water in 1 day intervals
     values: list[int]
 @dataclass
 class YearlyResponse:
     # treated water in 1 month intervals
@@ -109,6 +161,15 @@ class WifiResponse:
     """UUID 0104: Wi-Fi Information"""
     ssid: str  # Wi-Fi network name
     rssi: int  # Wi-Fi signal strength in dBm
+    rssiAvg: str  # Average Wi-Fi signal strength in dBm
+    rssiSig: str  # Signal strength standard deviation in dBm
+    dhcp: bool  # DHCP enabled
+    ip: str | None  # IP address
+    sn: str | None  # Serial number
+    sg: str | None  # Subnet mask
+    pDns: str | None  # Primary DNS
+    sDns: str | None  # Secondary DNS
+    mac: str | None  # MAC address
 @dataclass
@@ -122,6 +183,11 @@ class DeviceInfoResponse:
     dev_state: SmartDosStatus | None  # Current device status
     active_states: list[SmartDosStatus | None]  # List of active device statuses
     comm_date: str  # Start-up date (ISO format)
+    device_id: str  # Device ID
+    device_type: str  # Device type
+    device_variant: str  # Device variant
+    total_flow: int  # Total treated water in ml
+    total_dosed: int  # Total dosed substance in ml
 @dataclass
@@ -133,6 +199,12 @@ class ConfigurationResponse:
     aqa_watch_en: bool  # AQA Watch active
     aqa_max_flow_en: bool  # AQA MaxFlow active
     aqa_volume_val: float  # AQA Volume value (l)
+    volume_per_stroke: float  # Volume per stroke (ml)
+    pouch_empty_timeout: int  # Pouch empty timeout (s)
+    pouch_not_empty_timeout: int  # Pouch not empty timeout (s)
+    aqa_watch_val: int  # AQA Watch value (s)
+    aqa_max_flow_val: float  # AQA MaxFlow value (l/h)
+    rest_server_en: bool  # REST server active
 @dataclass
@@ -156,15 +228,17 @@ class PouchInfoResponse:
 @dataclass
 class RemainingCapacityResponse:
     """UUID 0402: Remaining Capacity"""
-    rem_capacity: Optional[float]  # Remaining volume in ml
-    rem_capacity_pct: Optional[float]  # Remaining volume in %
-    rem_capacity_days: Optional[int]  # Remaining volume in days
+    rem_capacity: float  # Remaining volume in ml
+    rem_capacity_pct: float  # Remaining volume in %
+    rem_capacity_days: int  # Remaining volume in days
+    unit: int  # Unit (0 = ml)
 @dataclass
 class TreatedWaterResponse:
     """UUID 0503: Treated Water"""
     total_flow: int  # Total treated water in ml
+    total_ticks: int  # Total treated water ticks??
 @dataclass

{bwt_api-1.0.2 → bwt_api-1.0.3}/src/bwt_api/smart_dos_api.py RENAMED Viewed

@@ -1,5 +1,7 @@
 """The BWT Smart Dos API class."""
+from collections.abc import Mapping
 import aiohttp
 import logging
 from typing import Any
@@ -61,7 +63,19 @@ class BwtSmartDosApi:
         """UUID 0104: Get Wi-Fi name and signal strength."""
         self._logger.debug("Fetching Wi-Fi info from %s", self._host)
         raw = await self._get_gatt("0104")
-        return WifiResponse(ssid=raw["ssid"], rssi=raw["rssi"])
+        return WifiResponse(
+            ssid=raw["ssid"],
+            rssi=raw["rssi"],
+            rssiAvg=raw["rssiAvg"],
+            rssiSig=raw["rssiSig"],
+            dhcp=raw["dhcp"],
+            ip=raw["ip"],
+            sn=raw["sn"],
+            sg=raw["sg"],
+            pDns=raw["pDns"],
+            sDns=raw["sDns"],
+            mac=raw["mac"]
+        )
     async def get_device_info(self) -> DeviceInfoResponse:
         """UUID 0201: Get device information."""
@@ -71,11 +85,16 @@ class BwtSmartDosApi:
             fw_rev=raw["fwRev"],
             hw_rev=raw["hwRev"],
             product_code=raw["productCode"],
+            device_id=raw["iotDevId"],
+            device_type=raw["iotDevType"],
+            device_variant=raw["iotDevVariant"],
             uptime=raw["uptime"],
             operating_time=raw["operatingTime"],
             dev_state=SmartDosStatus(raw["devState"]),
             active_states=[SmartDosStatus(state) for state in raw["activeStates"]],
             comm_date=raw["commDate"],
+            total_flow=raw["lifeTimeFlow_ml"],
+            total_dosed=raw["lifeTimeDosed_ml"],
         )
     async def get_configuration(self) -> ConfigurationResponse:
@@ -85,10 +104,16 @@ class BwtSmartDosApi:
         return ConfigurationResponse(
             buzzer_en=raw["buzzerEn"],
             dosing_rate=raw["dosingRate"],
+            volume_per_stroke=raw["volumePerStroke"],
+            pouch_empty_timeout=raw["pouchEmptyTimeout"],
+            pouch_not_empty_timeout=raw["pouchNotEmptyTimeout"],
             aqa_volume_en=raw["aqaVolumeEn"],
             aqa_watch_en=raw["aqaWatchEn"],
             aqa_max_flow_en=raw["aqaMaxFlowEn"],
             aqa_volume_val=raw["aqaVolumeVal"],
+            aqa_watch_val=raw["aqaWatchVal"],
+            aqa_max_flow_val=raw["aqaMaxFlowVal"],
+            rest_server_en=raw["restServerEn"],
         )
     async def get_time_info(self) -> TimeResponse:
@@ -110,22 +135,24 @@ class BwtSmartDosApi:
             unit=raw["unit"],
         )
-    async def get_remaining_capacity(self) -> RemainingCapacityResponse:
+    async def get_remaining_capacity(self) -> Mapping[int, RemainingCapacityResponse]:
         """UUID 0402: Get remaining capacity information."""
         self._logger.debug("Fetching remaining capacity from %s", self._host)
         raw = await self._get_gatt("0402")
-        return RemainingCapacityResponse(
-            rem_capacity=raw.get("remCapacity"),
-            rem_capacity_pct=raw.get("remCapacityPct"),
-            rem_capacity_days=raw.get("remCapacityDays"),
-        )
+        return {int(k): RemainingCapacityResponse(
+            rem_capacity=v["remCapacity"],
+            rem_capacity_pct=v["remCapacityPct"],
+            rem_capacity_days=v["remCapacityDays"],
+            unit=v["unit"]) for k, v in raw.items()}
-    async def get_treated_water(self) -> TreatedWaterResponse:
+    async def get_treated_water(self) -> Mapping[int, TreatedWaterResponse]:
         """UUID 0503: Get treated water information."""
         self._logger.debug("Fetching treated water from %s", self._host)
         raw = await self._get_gatt("0503")
-        total_flow = raw["flow"]["1"]["totFlow"]
-        return TreatedWaterResponse(total_flow=total_flow)
+        return {int(k): TreatedWaterResponse(
+            total_flow=v["totFlow"],
+            total_ticks=v["totTicks"],
+            ) for k, v in raw["flow"].items()}
     async def get_substance_dosage(self) -> SubstanceDosageResponse:
         """UUID 0505: Get substance dosage information."""

{bwt_api-1.0.2 → bwt_api-1.0.3}/src/bwt_api.egg-info/PKG-INFO RENAMED Viewed

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

{bwt_api-1.0.2 → bwt_api-1.0.3}/src/bwt_api.egg-info/SOURCES.txt RENAMED Viewed

@@ -1,8 +1,5 @@
 .coveragerc
 .gitignore
-AUTHORS.rst
-CHANGELOG.rst
-CONTRIBUTING.rst
 LICENSE.txt
 README.rst
 pyproject.toml
@@ -33,4 +30,17 @@ src/bwt_api.egg-info/scm_version.json
 src/bwt_api.egg-info/top_level.txt
 tests/conftest.py
 tests/test_api.py
-tests/test_distinguish.py
+tests/test_distinguish.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_0402.json
+tests/data/smartdos/gatt_0503.json
+tests/data/smartdos/gatt_0505.json

{bwt_api-1.0.2 → bwt_api-1.0.3}/src/bwt_api.egg-info/scm_file_list.json RENAMED Viewed

@@ -1,32 +1,41 @@
 {
   "files": [
-    ".gitignore",
-    "AUTHORS.rst",
-    "LICENSE.txt",
-    "CHANGELOG.rst",
     "tox.ini",
-    "pyproject.toml",
-    ".coveragerc",
+    "LICENSE.txt",
+    "README.rst",
     "setup.py",
-    "CONTRIBUTING.rst",
+    "pyproject.toml",
     "setup.cfg",
-    "README.rst",
-    "src/bwt_api/bwt_api",
-    "src/bwt_api/api.py",
-    "src/bwt_api/exception.py",
-    "src/bwt_api/bwt.py",
-    "src/bwt_api/data.py",
-    "src/bwt_api/smart_dos_api.py",
-    "src/bwt_api/bwt_api.py",
-    "src/bwt_api/silk_api.py",
-    "src/bwt_api/error.py",
-    "src/bwt_api/skeleton.py",
-    "src/bwt_api/__init__.py",
-    ".devcontainer/devcontainer.json",
+    ".gitignore",
+    ".coveragerc",
     ".github/workflows/python-publish.yml",
     ".github/workflows/python-package.yml",
+    ".devcontainer/devcontainer.json",
+    "tests/test_api.py",
     "tests/test_distinguish.py",
     "tests/conftest.py",
-    "tests/test_api.py"
+    "tests/data/silk/registers.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_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"
   ]
 }

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

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

bwt_api-1.0.3/tests/data/perla/GetCurrentData.json ADDED Viewed

@@ -0,0 +1,33 @@
+{
+  "ActiveErrorIDs": "",
+  "BlendedWaterSinceSetup_l": 123456,
+  "CapacityColumn1_ml_dH": 500000,
+  "CapacityColumn2_ml_dH": -1,
+  "CurrentFlowrate_l_h": 100,
+  "DosingSinceSetup_ml": 2500,
+  "FirmwareVersion": "1.2.3",
+  "HardnessIN_CaCO3": 200,
+  "HardnessIN_dH": 11,
+  "HardnessIN_fH": 19,
+  "HardnessIN_mmol_l": 2.0,
+  "HardnessOUT_CaCO3": 20,
+  "HardnessOUT_dH": 1,
+  "HardnessOUT_fH": 2,
+  "HardnessOUT_mmol_l": 0.2,
+  "HolidayModeStartTime": "",
+  "LastRegenerationColumn1": "2023-07-01 12:00:00",
+  "LastRegenerationColumn2": "2023-07-02 12:00:00",
+  "LastServiceCustomer": "2024-01-01 09:00:00",
+  "LastServiceTechnican": "2024-02-01 10:00:00",
+  "OutOfService": 0,
+  "RegenerationCounterColumn1": 5,
+  "RegenerationCounterColumn2": 0,
+  "RegenerationCountSinceSetup": 10,
+  "RegenerativLevel": 80,
+  "RegenerativRemainingDays": 100,
+  "RegenerativSinceSetup_g": 12345,
+  "ShowError": 0,
+  "WaterTreatedCurrentDay_l": 1234,
+  "WaterTreatedCurrentMonth_l": 5678,
+  "WaterTreatedCurrentYear_l": 23456
+}

bwt_api-1.0.3/tests/data/perla/GetDailyData.json ADDED Viewed

@@ -0,0 +1,50 @@
+{
+  "0000_0029_l": 0,
+  "0030_0059_l": 1,
+  "0100_0129_l": 2,
+  "0130_0159_l": 3,
+  "0200_0229_l": 4,
+  "0230_0259_l": 5,
+  "0300_0329_l": 6,
+  "0330_0359_l": 7,
+  "0400_0429_l": 8,
+  "0430_0459_l": 9,
+  "0500_0529_l": 10,
+  "0530_0559_l": 11,
+  "0600_0629_l": 12,
+  "0630_0659_l": 13,
+  "0700_0729_l": 14,
+  "0730_0759_l": 15,
+  "0800_0829_l": 16,
+  "0830_0859_l": 17,
+  "0900_0929_l": 18,
+  "0930_0959_l": 19,
+  "1000_1029_l": 20,
+  "1030_1059_l": 21,
+  "1100_1129_l": 22,
+  "1130_1159_l": 23,
+  "1200_1229_l": 24,
+  "1230_1259_l": 25,
+  "1300_1329_l": 26,
+  "1330_1359_l": 27,
+  "1400_1429_l": 28,
+  "1430_1459_l": 29,
+  "1500_1529_l": 30,
+  "1530_1559_l": 31,
+  "1600_1629_l": 32,
+  "1630_1659_l": 33,
+  "1700_1729_l": 34,
+  "1730_1759_l": 35,
+  "1800_1829_l": 36,
+  "1830_1859_l": 37,
+  "1900_1929_l": 38,
+  "1930_1959_l": 39,
+  "2000_2029_l": 40,
+  "2030_2059_l": 41,
+  "2100_2129_l": 42,
+  "2130_2159_l": 43,
+  "2200_2229_l": 44,
+  "2230_2259_l": 45,
+  "2300_2329_l": 46,
+  "2330_2359_l": 47
+}

bwt_api-1.0.3/tests/data/perla/GetMonthlyData.json ADDED Viewed

@@ -0,0 +1,33 @@
+{
+  "Day01_l": 1,
+  "Day02_l": 2,
+  "Day03_l": 3,
+  "Day04_l": 4,
+  "Day05_l": 5,
+  "Day06_l": 6,
+  "Day07_l": 7,
+  "Day08_l": 8,
+  "Day09_l": 9,
+  "Day10_l": 10,
+  "Day11_l": 11,
+  "Day12_l": 12,
+  "Day13_l": 13,
+  "Day14_l": 14,
+  "Day15_l": 15,
+  "Day16_l": 16,
+  "Day17_l": 17,
+  "Day18_l": 18,
+  "Day19_l": 19,
+  "Day20_l": 20,
+  "Day21_l": 21,
+  "Day22_l": 22,
+  "Day23_l": 23,
+  "Day24_l": 24,
+  "Day25_l": 25,
+  "Day26_l": 26,
+  "Day27_l": 27,
+  "Day28_l": 28,
+  "Day29_l": 29,
+  "Day30_l": 30,
+  "Day31_l": 31
+}

bwt_api-1.0.3/tests/data/perla/GetYearlyData.json ADDED Viewed

@@ -0,0 +1,14 @@
+{
+  "Month01_l": 100,
+  "Month02_l": 110,
+  "Month03_l": 120,
+  "Month04_l": 130,
+  "Month05_l": 140,
+  "Month06_l": 150,
+  "Month07_l": 160,
+  "Month08_l": 170,
+  "Month09_l": 180,
+  "Month10_l": 190,
+  "Month11_l": 200,
+  "Month12_l": 210
+}

bwt_api-1.0.3/tests/data/silk/registers.json ADDED Viewed

@@ -0,0 +1,3 @@
+{
+  "params": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0104.json ADDED Viewed

@@ -0,0 +1,13 @@
+{
+    "ssid": "Graf WLAN",
+    "rssi": null,
+    "rssiAvg": "-54.00",
+    "rssiSig": "0.00",
+    "dhcp": true,
+    "ip": null,
+    "sn": null,
+    "sg": null,
+    "pDns": null,
+    "sDns": null,
+    "mac": "AA:BB:CC:DD:EE:FF"
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0201.json ADDED Viewed

@@ -0,0 +1,17 @@
+{
+    "fwRev": "1.2.0",
+    "hwRev": "2.4.0(A)",
+    "productCode": "3HZR-1R37",
+    "iotDevId": "5b29b9e9-24c5-4eea-a599-927922a89f5a",
+    "iotDevType": "bwt_bewados",
+    "iotDevVariant": "dev",
+    "uptime": 6510811,
+    "operatingTime": 40773211,
+    "devState": 2001,
+    "activeStates": [
+        2001
+    ],
+    "commDate": "2026-01-04T10:01:05.891Z",
+    "lifeTimeFlow_ml": 112507432,
+    "lifeTimeDosed_ml": 2746.1572265625
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0202.json ADDED Viewed

@@ -0,0 +1,24 @@
+{
+    "buzzerEn": false,
+    "dosingRate": 10,
+    "volumePerStroke": 0.053784001618623734,
+    "pouchEmptyTimeout": 7200,
+    "pouchNotEmptyTimeout": 20,
+    "aqaVolumeEn": false,
+    "aqaWatchEn": false,
+    "aqaMaxFlowEn": false,
+    "aqaVolumeVal": 9999,
+    "aqaWatchVal": 0,
+    "aqaMaxFlowVal": 7,
+    "restServerEn": true,
+    "defaults": {
+        "consumable": {
+            "totCap": 1500
+        },
+        "aqaAlert": {
+            "aqaVolumeVal": 9999,
+            "aqaWatchVal": 60,
+            "aqaMaxFlowVal": 7
+        }
+    }
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0208.json ADDED Viewed

@@ -0,0 +1,4 @@
+{
+  "time": "2026-07-14 12:00:00",
+  "timezone": "UTC"
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0401.json ADDED Viewed

@@ -0,0 +1,8 @@
+{
+  "totCap": 1000,
+  "expDate": "2027-01-01",
+  "orderNr": "ORD123",
+  "batchNr": "BATCH1",
+  "id": 1,
+  "unit": "ml"
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0402.json ADDED Viewed

@@ -0,0 +1,8 @@
+{
+    "1": {
+        "remCapacity": 1451.1103515625,
+        "remCapacityPct": 97,
+        "remCapacityDays": 354,
+        "unit": 0
+    }
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0503.json ADDED Viewed

@@ -0,0 +1,12 @@
+{
+    "flow": {
+        "1": {
+            "totFlow": 112507432,
+            "totTicks": 2587671
+        },
+        "2": {
+            "totFlow": 20244130,
+            "totTicks": 465615
+        }
+    }
+}

bwt_api-1.0.3/tests/data/smartdos/gatt_0505.json ADDED Viewed

@@ -0,0 +1,3 @@
+{
+    "dosedMineral": 2746.1572265625
+}

{bwt_api-1.0.2 → bwt_api-1.0.3}/tests/test_api.py RENAMED Viewed

@@ -1,6 +1,7 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 from unittest.mock import Mock
+from pathlib import Path
 import pytest
 from aiohttp.client_reqrep import ClientResponse
@@ -101,6 +102,11 @@ current_json_empty_errors = """
 }
 """
+def load_json_str(name: str) -> str:
+    """Load a JSON file from tests/data/smartdos and return its text."""
+    return (Path(__file__).parent / "data" / "smartdos" / name).read_text()
 current_json_perla_one = """
 {
    "ActiveErrorIDs" : "",
@@ -300,17 +306,33 @@ def test_unknown_error_no_mutation():
     # Different unknown codes produce different instances
     assert err1 is not err2
+async def test_smartdos_get_wifi_info():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0104",
+            status=200,
+                body=load_json_str("gatt_0104.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_wifi_info()
+            assert result.ssid == "Graf WLAN"
+            assert result.rssiAvg == "-54.00"
+            assert result.mac == "AA:BB:CC:DD:EE:FF"
 async def test_smartdos_get_gatt_0201():
     with aioresponses() as mocked:
         mocked.get(
             "http://host:80/api/v1/gatt/0201",
             status=200,
-            body='{"characteristic":"0201","value":[1,2,3]}',
+                body=load_json_str("gatt_0201.json"),
             headers={"Content-Type": "application/json"},
         )
         async with BwtSmartDosApi("host") as api:
             result = await api.get_gatt_0201()
-            assert result == {"characteristic": "0201", "value": [1, 2, 3]}
+            assert result["fwRev"] == "1.2.0"
+            assert result["productCode"] == "3HZR-1R37"
 async def test_smartdos_unknown_response():
@@ -321,12 +343,41 @@ async def test_smartdos_unknown_response():
                 await api.get_gatt_0201()
+async def test_smartdos_get_configuration():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0202",
+            status=200,
+                body=load_json_str("gatt_0202.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_configuration()
+            assert result.buzzer_en is False
+            assert result.dosing_rate == 10
+            assert result.rest_server_en is True
+async def test_smartdos_get_time_info():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0208",
+            status=200,
+                body=load_json_str("gatt_0208.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_time_info()
+            assert result.time == "2026-07-14 12:00:00"
+            assert result.timezone == "UTC"
 async def test_smartdos_device_info_parses_status_values():
     with aioresponses() as mocked:
         mocked.get(
             "http://host:80/api/v1/gatt/0201",
             status=200,
-            body='{"fwRev":"1.1.0+4","hwRev":"2.4.0(B)","productCode":"8R19-CX2A","uptime":4889,"operatingTime":706889,"devState":2001,"activeStates":[2001],"commDate":"2024-12-04T13:45:38.833Z"}',
+            body='{"fwRev":"1.2.0","hwRev":"2.4.0(A)","productCode":"3HZR-1R37","iotDevId":"5b29b9e9-24c5-4eea-a599-927922a89f5a","iotDevType":"bwt_bewados","iotDevVariant":"dev","uptime":6510811,"operatingTime":40773211,"devState":2001,"activeStates":[2001],"commDate":"2026-01-04T10:01:05.891Z","lifeTimeFlow_ml":112507432,"lifeTimeDosed_ml":2746.1572265625}',
             headers={"Content-Type": "application/json"},
         )
         async with BwtSmartDosApi("host") as api:
@@ -335,17 +386,62 @@ async def test_smartdos_device_info_parses_status_values():
             assert result.active_states == [SmartDosStatus.STANDBY]
+async def test_smartdos_get_remaining_capacity():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0402",
+            status=200,
+                body=load_json_str("gatt_0402.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_remaining_capacity()
+            assert 1 in result
+            assert result[1].rem_capacity == 1451.1103515625
+            assert result[1].rem_capacity_pct == 97
+async def test_smartdos_get_treated_water():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0503",
+            status=200,
+                body=load_json_str("gatt_0503.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_treated_water()
+            assert 1 in result
+            assert result[1].total_flow == 112507432
+            assert 2 in result
+            assert result[2].total_flow == 20244130
+async def test_smartdos_get_substance_dosage():
+    with aioresponses() as mocked:
+        mocked.get(
+            "http://host:80/api/v1/gatt/0505",
+            status=200,
+                body=load_json_str("gatt_0505.json"),
+            headers={"Content-Type": "application/json"},
+        )
+        async with BwtSmartDosApi("host") as api:
+            result = await api.get_substance_dosage()
+            assert result.dosed_mineral == 2746.1572265625
 async def test_smartdos_pouch_info_parses_substance_type():
     with aioresponses() as mocked:
         mocked.get(
             "http://host:80/api/v1/gatt/0401",
             status=200,
-            body='{"totCap":10000,"expDate":"05.12.2025","orderNr":125123456,"batchNr":12345,"id":2,"unit":0}',
+                body=load_json_str("gatt_0401.json"),
             headers={"Content-Type": "application/json"},
         )
         async with BwtSmartDosApi("host") as api:
             result = await api.get_pouch_info()
-            assert result.substance_type == SubstanceType.L2_L3
+            assert result.substance_type == SubstanceType.L1_LE
+            assert result.tot_cap == 1000
 def test_treated_to_blended():
     assert treated_to_blended(0, 21, 4) == 0

bwt_api-1.0.2/AUTHORS.rst DELETED Viewed

@@ -1,5 +0,0 @@
-============
-Contributors
-============
-* dkarv <punzet.david@gmail.com>

bwt_api-1.0.2/CHANGELOG.rst DELETED Viewed

@@ -1,8 +0,0 @@
-=========
-Changelog
-=========
-Version 0.2.1
-=============
-- Initial release

bwt_api-1.0.2/CONTRIBUTING.rst DELETED Viewed

@@ -1,278 +0,0 @@
-============
-Contributing
-============
-Welcome to ``bwt_api`` contributor's guide.
-This document focuses on getting any potential contributor familiarized
-with the development processes, but `other kinds of contributions`_ are also
-appreciated.
-If you are new to using git_ or have never collaborated in a project previously,
-please have a look at `contribution-guide.org`_. Other resources are also
-listed in the excellent `guide created by FreeCodeCamp`_ [#contrib1]_.
-Please notice, all users and contributors are expected to be **open,
-considerate, reasonable, and respectful**. When in doubt, `Python Software
-Foundation's Code of Conduct`_ is a good reference in terms of behavior
-guidelines.
-Issue Reports
-=============
-If you experience bugs or general issues with ``bwt_api``, please have a look
-on the `issue tracker`_. If you don't see anything useful there, please feel
-free to fire an issue report.
-.. tip::
-   Please don't forget to include the closed issues in your search.
-   Sometimes a solution was already reported, and the problem is considered
-   **solved**.
-New issue reports should include information about your programming environment
-(e.g., operating system, Python version) and steps to reproduce the problem.
-Please try also to simplify the reproduction steps to a very minimal example
-that still illustrates the problem you are facing. By removing other factors,
-you help us to identify the root cause of the issue.
-Documentation Improvements
-==========================
-You can help improve ``bwt_api`` docs by making them more readable and coherent, or
-by adding missing information and correcting mistakes.
-   .. tip::
-      Please notice that the `GitHub web interface`_ provides a quick way of
-      propose changes in ``bwt_api``'s files. While this mechanism can
-      be tricky for normal code contributions, it works perfectly fine for
-      contributing to the docs, and can be quite handy.
-      If you are interested in trying this method out, please navigate to
-      the ``docs`` folder in the source repository_, find which file you
-      would like to propose changes and click in the little pencil icon at the
-      top, to open `GitHub's code editor`_. Once you finish editing the file,
-      please write a message in the form at the bottom of the page describing
-      which changes have you made and what are the motivations behind them and
-      submit your proposal.
-Code Contributions
-==================
-Submit an issue
----------------
-Before you work on any non-trivial code contribution it's best to first create
-a report in the `issue tracker`_ to start a discussion on the subject.
-This often provides additional considerations and avoids unnecessary work.
-Create an environment
----------------------
-Before you start coding, we recommend creating an isolated `virtual
-environment`_ to avoid any problems with your installed Python packages.
-This can easily be done via either |virtualenv|_::
-    virtualenv <PATH TO VENV>
-    source <PATH TO VENV>/bin/activate
-or Miniconda_::
-    conda create -n bwt_api python=3 six virtualenv pytest pytest-cov
-    conda activate bwt_api
-Clone the repository
---------------------
-#. Create an user account on |the repository service| if you do not already have one.
-#. Fork the project repository_: click on the *Fork* button near the top of the
-   page. This creates a copy of the code under your account on |the repository service|.
-#. Clone this copy to your local disk::
-    git clone git@github.com:YourLogin/bwt_api.git
-    cd bwt_api
-#. You should run::
-    pip install -U pip setuptools -e .
-   to be able to import the package under development in the Python REPL.
-Implement your changes
-----------------------
-#. Create a branch to hold your changes::
-    git checkout -b my-feature
-   and start making changes. Never work on the main branch!
-#. Start your work on this branch. Don't forget to add docstrings_ to new
-   functions, modules and classes, especially if they are part of public APIs.
-#. Add yourself to the list of contributors in ``AUTHORS.rst``.
-#. When you’re done editing, do::
-    git add <MODIFIED FILES>
-    git commit
-   to record your changes in git_.
-   .. important:: Don't forget to add unit tests and documentation in case your
-      contribution adds an additional feature and is not just a bugfix.
-      Moreover, writing a `descriptive commit message`_ is highly recommended.
-      In case of doubt, you can check the commit history with::
-         git log --graph --decorate --pretty=oneline --abbrev-commit --all
-      to look for recurring communication patterns.
-#. Please check that your changes don't break any unit tests with::
-    tox
-   (after having installed |tox|_ with ``pip install tox`` or ``pipx``).
-   You can also use |tox|_ to run several other pre-configured tasks in the
-   repository. Try ``tox -av`` to see a list of the available checks.
-Submit your contribution
-------------------------
-#. If everything works fine, push your local branch to |the repository service| with::
-    git push -u origin my-feature
-#. Go to the web page of your fork and click |contribute button|
-   to send your changes for review.
-   Find more detailed information in `creating a PR`_. You might also want to open
-   the PR as a draft first and mark it as ready for review after the feedbacks
-   from the continuous integration (CI) system or any required fixes.
-Troubleshooting
----------------
-The following tips can be used when facing problems to build or test the
-package:
-#. Make sure to fetch all the tags from the upstream repository_.
-   The command ``git describe --abbrev=0 --tags`` should return the version you
-   are expecting. If you are trying to run CI scripts in a fork repository,
-   make sure to push all the tags.
-   You can also try to remove all the egg files or the complete egg folder, i.e.,
-   ``.eggs``, as well as the ``*.egg-info`` folders in the ``src`` folder or
-   potentially in the root of your project.
-#. Sometimes |tox|_ misses out when new dependencies are added, especially to
-   ``setup.cfg`` and ``docs/requirements.txt``. If you find any problems with
-   missing dependencies when running a command with |tox|_, try to recreate the
-   ``tox`` environment using the ``-r`` flag. For example, instead of::
-    tox -e docs
-   Try running::
-    tox -r -e docs
-#. Make sure to have a reliable |tox|_ installation that uses the correct
-   Python version (e.g., 3.7+). When in doubt you can run::
-    tox --version
-    # OR
-    which tox
-   If you have trouble and are seeing weird errors upon running |tox|_, you can
-   also try to create a dedicated `virtual environment`_ with a |tox|_ binary
-   freshly installed. For example::
-    virtualenv .venv
-    source .venv/bin/activate
-    .venv/bin/pip install tox
-    .venv/bin/tox -e all
-#. `Pytest can drop you`_ in an interactive session in the case an error occurs.
-   In order to do that you need to pass a ``--pdb`` option (for example by
-   running ``tox -- -k <NAME OF THE FALLING TEST> --pdb``).
-   You can also setup breakpoints manually instead of using the ``--pdb`` option.
-Maintainer tasks
-================
-Releases
---------
-If you are part of the group of maintainers and have correct user permissions
-on PyPI_, the following steps can be used to release a new version for
-``bwt_api``:
-#. Make sure all unit tests are successful.
-#. Tag the current commit on the main branch with a release tag, e.g., ``v1.2.3``.
-#. Push the new tag to the upstream repository_, e.g., ``git push upstream v1.2.3``
-#. Clean up the ``dist`` and ``build`` folders with ``tox -e clean``
-   (or ``rm -rf dist build``)
-   to avoid confusion with old builds and Sphinx docs.
-#. Run ``tox -e build`` and check that the files in ``dist`` have
-   the correct version (no ``.dirty`` or git_ hash) according to the git_ tag.
-   Also check the sizes of the distributions, if they are too big (e.g., >
-   500KB), unwanted clutter may have been accidentally included.
-#. Run ``tox -e publish -- --repository pypi`` and check that everything was
-   uploaded to PyPI_ correctly.
-.. [#contrib1] Even though, these resources focus on open source projects and
-   communities, the general ideas behind collaborating with other developers
-   to collectively create software are general and can be applied to all sorts
-   of environments, including private companies and proprietary code bases.
-.. <-- start -->
-.. |the repository service| replace:: GitHub
-.. |contribute button| replace:: "Create pull request"
-.. _repository: https://github.com/dkarv/bwt_api
-.. _issue tracker: https://github.com/dkarv/bwt_api/issues
-.. <-- end -->
-.. |virtualenv| replace:: ``virtualenv``
-.. |pre-commit| replace:: ``pre-commit``
-.. |tox| replace:: ``tox``
-.. _black: https://pypi.org/project/black/
-.. _CommonMark: https://commonmark.org/
-.. _contribution-guide.org: https://www.contribution-guide.org/
-.. _creating a PR: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
-.. _descriptive commit message: https://chris.beams.io/posts/git-commit
-.. _docstrings: https://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html
-.. _first-contributions tutorial: https://github.com/firstcontributions/first-contributions
-.. _flake8: https://flake8.pycqa.org/en/stable/
-.. _git: https://git-scm.com
-.. _GitHub's fork and pull request workflow: https://guides.github.com/activities/forking/
-.. _guide created by FreeCodeCamp: https://github.com/FreeCodeCamp/how-to-contribute-to-open-source
-.. _Miniconda: https://docs.conda.io/en/latest/miniconda.html
-.. _MyST: https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html
-.. _other kinds of contributions: https://opensource.guide/how-to-contribute
-.. _pre-commit: https://pre-commit.com/
-.. _PyPI: https://pypi.org/
-.. _PyScaffold's contributor's guide: https://pyscaffold.org/en/stable/contributing.html
-.. _Pytest can drop you: https://docs.pytest.org/en/stable/how-to/failures.html#using-python-library-pdb-with-pytest
-.. _Python Software Foundation's Code of Conduct: https://www.python.org/psf/conduct/
-.. _reStructuredText: https://www.sphinx-doc.org/en/master/usage/restructuredtext/
-.. _Sphinx: https://www.sphinx-doc.org/en/master/
-.. _tox: https://tox.wiki/en/stable/
-.. _virtual environment: https://realpython.com/python-virtual-environments-a-primer/
-.. _virtualenv: https://virtualenv.pypa.io/en/stable/
-.. _GitHub web interface: https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files
-.. _GitHub's code editor: https://docs.github.com/en/repositories/working-with-files/managing-files/editing-files

bwt_api-1.0.2/src/bwt_api.egg-info/scm_version.json DELETED Viewed

@@ -1,8 +0,0 @@
-{
-  "tag": "1.0.2",
-  "distance": 0,
-  "node": "g5bd1108162a356c6ba843801c305aa396bb2b6f4",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-18"
-}