bwt-api 1.0.0__tar.gz → 1.0.2__tar.gz

{bwt_api-1.0.0 → bwt_api-1.0.2}/PKG-INFO

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

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/bwt.py

@@ -7,18 +7,16 @@ import logging
 
 from bwt_api.exception import ConnectException
 
-_logger = logging.getLogger(__name__)
-
 class BwtModel(Enum):
     """Enum for BWT models."""
     PERLA_LOCAL_API = 1
     PERLA_SILK = 2
     SMART_DOS = 3
 
-async def determine_bwt_model(host: str) -> BwtModel:
+async def determine_bwt_model(host: str, logger: logging.Logger = logging.getLogger(__name__)) -> BwtModel:
     """Determine the BWT model based on the api response."""
 
-    _logger.debug(f"Determining BWT model for host {host}")
+    logger.info("Determining BWT model for host %s", host)
     timeout = aiohttp.ClientTimeout(total=3)
 
     # Recent BWT Perla models with local API
@@ -26,8 +24,9 @@ async def determine_bwt_model(host: str) -> BwtModel:
         async with aiohttp.ClientSession() as session:
             async with session.get(f"http://{host}:8080/api", timeout=timeout) as response:
                 res = await response.text()
-                _logger.debug(f"Response from {host}:8080/api: {response.status} - {res}")
+                logger.debug("Response from %s:8080/api: %s - %s", host, response.status, res)
                 if response.status == 404 and res == "Not Found":
+                    logger.info("Detected BWT Perla model with local API at %s", host)
                     return BwtModel.PERLA_LOCAL_API
     except Exception:
         pass
@@ -37,8 +36,9 @@ async def determine_bwt_model(host: str) -> BwtModel:
         async with aiohttp.ClientSession() as session:
             async with session.get(f"http://{host}:80/silk/registers", timeout=timeout) as response:
                 res = await response.text()
-                _logger.debug(f"Response from {host}:80/silk/registers: {response.status} - {res}")
+                logger.debug("Response from %s:80/silk/registers: %s - %s", host, response.status, res)
                 if response.status == 200 and res.startswith("""{"params":["""):
+                    logger.info("Detected BWT Perla model with Silk API at %s", host)
                     return BwtModel.PERLA_SILK
     except Exception:
         pass
@@ -48,8 +48,9 @@ async def determine_bwt_model(host: str) -> BwtModel:
         async with aiohttp.ClientSession() as session:
             async with session.get(f"http://{host}:80/api/v1/gatt/0201", timeout=timeout) as response:
                 res = await response.text()
-                _logger.debug(f"Response from {host}:80/api/v1/gatt/0201: {response.status} - {res}")
+                logger.debug("Response from %s:80/api/v1/gatt/0201: %s - %s", host, response.status, res)
                 if response.status == 200 and res.startswith("""{"""):
+                    logger.info("Detected BWT Smart Dos model at %s", host)
                     return BwtModel.SMART_DOS
     except Exception:
         pass

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/bwt_api.py

@@ -9,8 +9,6 @@ from bwt_api.error import BwtError
 from bwt_api.exception import ApiException, ConnectException, WrongCodeException
 from bwt_api.data import CurrentResponse, DailyResponse, MonthlyResponse, YearlyResponse, Hardness, BwtStatus
 
-_logger = logging.getLogger(__name__)
-
 
 class BwtApi:
     """BWT Api."""
@@ -18,12 +16,13 @@ class BwtApi:
     _host: str
     _headers: dict[str, str]
 
-    def __init__(self, host, code):
+    def __init__(self, host, code, logger: logging.Logger = logging.getLogger(__name__)):
         self._host = host
         auth = f"user:{code}"
         base64_auth = base64.b64encode(auth.encode("ascii")).decode("ascii")
         self._headers = {"Authorization": f"Basic {base64_auth}"}
         self._session = aiohttp.ClientSession(headers=self._headers)
+        self._logger = logger 
 
     async def __aenter__(self):
         return self
@@ -38,20 +37,22 @@ class BwtApi:
         """Internal method to fetch json from the endpoint and handle general errors."""
         try:
             async with self._session.get(f"http://{self._host}:8080/api/{endpoint}") as response:
-                _logger.debug(
-                    f"Response status: {response.status}, content-type: {response.headers['content-type']}"
+                self._logger.debug(
+                    "Response status: %s, content-type: %s",
+                    response.status,
+                    response.headers['content-type']
                 )
                 if response.status == 200:
                     json = await response.json(content_type=None)
-                    _logger.debug(f"Raw response: {json}")
+                    self._logger.debug("Raw response: %s", json)
                     return json
                 else:
                     text = await response.text()
                     if response.status == 404 and text == "":
-                        _logger.warning(f"Assuming wrong code: {response}")
+                        self._logger.warning("Assuming wrong code: %s", response)
                         raise WrongCodeException
                     else:
-                        _logger.warning(f"Unknown response with status {response.status}: {text}")
+                        self._logger.warning("Unknown response with status %s: %s", response.status, text)
                         raise ApiException(f"Unknown response: {text}")
         except (aiohttp.ClientConnectorError, TimeoutError) as e:
             raise ConnectException from e
@@ -64,11 +65,11 @@ class BwtApi:
 
     async def get_current_data(self) -> CurrentResponse:
         """Get the current state of the BWT."""
-        _logger.debug(f"Fetching current data from {self._host}")
+        self._logger.debug("Fetching current data from %s", self._host)
         raw = await self.__get_data("GetCurrentData")
         errors = [BwtError(int(error)) for error in raw["ActiveErrorIDs"].split(",") if error]
         if BwtError.UNKNOWN in errors:
-            _logger.warning(f"Unknown error in current data response {raw['ActiveErrorIDs']}")
+            self._logger.warning("Unknown error in current data response %s", raw['ActiveErrorIDs'])
         perla_one = raw["CapacityColumn2_ml_dH"] == -1
 
         in_hardness = Hardness(
@@ -114,7 +115,7 @@ class BwtApi:
 
     async def get_daily_data(self) -> DailyResponse:
         """Get treated water of the current day."""
-        _logger.debug(f"Fetching daily data from {self._host}")
+        self._logger.debug("Fetching daily data from %s", self._host)
         raw = await self.__get_data("GetDailyData")
         keys = [
             f"{min // 60:02}{min % 60:02}_{min // 60:02}{min % 60 + 29:02}_l"
@@ -124,14 +125,14 @@ class BwtApi:
 
     async def get_monthly_data(self) -> MonthlyResponse:
         """Get treated water of the current month."""
-        _logger.debug(f"Fetching monthly data from {self._host}")
+        self._logger.debug("Fetching monthly data from %s", self._host)
         raw = await self.__get_data("GetMonthlyData")
         keys = [f"Day{day:02}_l" for day in range(1, 32)]
         return MonthlyResponse(list(map(lambda k: raw[k], keys)))
 
     async def get_yearly_data(self) -> YearlyResponse:
         """Get treated water of the current year."""
-        _logger.debug(f"Fetching yearly data from {self._host}")
+        self._logger.debug("Fetching yearly data from %s", self._host)
         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)))

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/data.py

@@ -5,6 +5,7 @@ import enum
 
 from dataclasses import dataclass
 from datetime import datetime
+from typing import Optional
 from bwt_api.error import BwtError
 
 
@@ -155,9 +156,9 @@ class PouchInfoResponse:
 @dataclass
 class RemainingCapacityResponse:
     """UUID 0402: Remaining Capacity"""
-    rem_capacity: float  # Remaining volume in ml
-    rem_capacity_pct: float  # Remaining volume in %
-    rem_capacity_days: int  # Remaining volume in days
+    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
 
 
 @dataclass

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/silk_api.py

@@ -5,17 +5,16 @@ import logging
 
 from bwt_api.exception import ApiException, ConnectException
 
-_logger = logging.getLogger(__name__)
-
 
 class BwtSilkApi:
     """BWT Silk Api."""
     _session: aiohttp.ClientSession
     _host: str
 
-    def __init__(self, host):
+    def __init__(self, host, logger: logging.Logger = logging.getLogger(__name__)):
         self._host = host
         self._session = aiohttp.ClientSession()
+        self._logger = logger
 
     async def __aenter__(self):
         return self
@@ -30,16 +29,18 @@ class BwtSilkApi:
         """Internal method to fetch json from the endpoint and handle general errors."""
         try:
             async with self._session.get(f"http://{self._host}:80/silk/registers") as response:
-                _logger.debug(
-                    f"Response status: {response.status}, content-type: {response.headers['content-type']}"
+                self._logger.debug(
+                    "Response status: %s, content-type: %s",
+                    response.status,
+                    response.headers['content-type']
                 )
                 if response.status == 200:
                     json = await response.json(content_type=None)
-                    _logger.debug(f"Raw response: {json}")
+                    self._logger.debug("Raw response: %s", json)
                     return json["params"]
                 else:
                     text = await response.text()
-                    _logger.warning(f"Unknown response with status {response.status}: {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

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/skeleton.py

@@ -12,8 +12,6 @@ __author__ = "dkarv"
 __copyright__ = "dkarv"
 __license__ = "MIT"
 
-_logger = logging.getLogger(__name__)
-
 
 def parse_args(args):
     """Parse command line parameters

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api/smart_dos_api.py

@@ -18,17 +18,16 @@ from bwt_api.data import (
 )
 from bwt_api.exception import ApiException, ConnectException
 
-_logger = logging.getLogger(__name__)
-
 
 class BwtSmartDosApi:
     """BWT Smart Dos Api."""
     _session: aiohttp.ClientSession
     _host: str
 
-    def __init__(self, host: str):
+    def __init__(self, host: str, logger: logging.Logger = logging.getLogger(__name__)):
         self._host = host
         self._session = aiohttp.ClientSession()
+        self._logger = logger
 
     async def __aenter__(self):
         return self
@@ -43,28 +42,30 @@ class BwtSmartDosApi:
         """Internal method to fetch GATT characteristic JSON."""
         try:
             async with self._session.get(f"http://{self._host}:80/api/v1/gatt/{uuid}") as response:
-                _logger.debug(
-                    f"Response status: {response.status}, content-type: {response.headers['content-type']}"
+                self._logger.debug(
+                    "Response status: %s, content-type: %s",
+                    response.status,
+                    response.headers['content-type']
                 )
                 if response.status == 200:
                     json = await response.json(content_type=None)
-                    _logger.debug(f"Raw response for UUID {uuid}: {json}")
+                    self._logger.debug("Raw response for UUID %s: %s", uuid, json)
                     return json
                 text = await response.text()
-                _logger.warning(f"Unknown response with status {response.status}: {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_wifi_info(self) -> WifiResponse:
         """UUID 0104: Get Wi-Fi name and signal strength."""
-        _logger.debug(f"Fetching Wi-Fi info from {self._host}")
+        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"])
 
     async def get_device_info(self) -> DeviceInfoResponse:
         """UUID 0201: Get device information."""
-        _logger.debug(f"Fetching device info from {self._host}")
+        self._logger.debug("Fetching device info from %s", self._host)
         raw = await self._get_gatt("0201")
         return DeviceInfoResponse(
             fw_rev=raw["fwRev"],
@@ -79,7 +80,7 @@ class BwtSmartDosApi:
 
     async def get_configuration(self) -> ConfigurationResponse:
         """UUID 0202: Get device configuration."""
-        _logger.debug(f"Fetching configuration from {self._host}")
+        self._logger.debug("Fetching configuration from %s", self._host)
         raw = await self._get_gatt("0202")
         return ConfigurationResponse(
             buzzer_en=raw["buzzerEn"],
@@ -92,13 +93,13 @@ class BwtSmartDosApi:
 
     async def get_time_info(self) -> TimeResponse:
         """UUID 0208: Get time and timezone information."""
-        _logger.debug(f"Fetching time info from {self._host}")
+        self._logger.debug("Fetching time info from %s", self._host)
         raw = await self._get_gatt("0208")
         return TimeResponse(time=raw["time"], timezone=raw["timezone"])
 
     async def get_pouch_info(self) -> PouchInfoResponse:
         """UUID 0401: Get pouch/container information."""
-        _logger.debug(f"Fetching pouch info from {self._host}")
+        self._logger.debug("Fetching pouch info from %s", self._host)
         raw = await self._get_gatt("0401")
         return PouchInfoResponse(
             tot_cap=raw["totCap"],
@@ -111,24 +112,24 @@ class BwtSmartDosApi:
 
     async def get_remaining_capacity(self) -> RemainingCapacityResponse:
         """UUID 0402: Get remaining capacity information."""
-        _logger.debug(f"Fetching remaining capacity from {self._host}")
+        self._logger.debug("Fetching remaining capacity from %s", self._host)
         raw = await self._get_gatt("0402")
         return RemainingCapacityResponse(
-            rem_capacity=raw["remCapacity"],
-            rem_capacity_pct=raw["remCapacityPct"],
-            rem_capacity_days=raw["remCapacityDays"],
+            rem_capacity=raw.get("remCapacity"),
+            rem_capacity_pct=raw.get("remCapacityPct"),
+            rem_capacity_days=raw.get("remCapacityDays"),
         )
 
     async def get_treated_water(self) -> TreatedWaterResponse:
         """UUID 0503: Get treated water information."""
-        _logger.debug(f"Fetching treated water from {self._host}")
+        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)
 
     async def get_substance_dosage(self) -> SubstanceDosageResponse:
         """UUID 0505: Get substance dosage information."""
-        _logger.debug(f"Fetching substance dosage from {self._host}")
+        self._logger.debug("Fetching substance dosage from %s", self._host)
         raw = await self._get_gatt("0505")
         return SubstanceDosageResponse(dosed_mineral=raw["dosedMineral"])
 

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api.egg-info/PKG-INFO

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

{bwt_api-1.0.0 → bwt_api-1.0.2}/src/bwt_api.egg-info/scm_file_list.json

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

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

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

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

@@ -1,8 +0,0 @@
-{
-  "tag": "1.0.0",
-  "distance": 0,
-  "node": "g5492b4bbc37a2bb17fa43aa4c44738964f42a13f",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-14"
-}