python-pooldose 0.6.6__tar.gz → 0.6.8__tar.gz

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pooldose
-Version: 0.6.6
+Version: 0.6.8
 Summary: Unoffical async Python client for SEKO PoolDose devices
 Author-email: Lukas Maertin <pypi@lukas-maertin.de>
 License-Expression: MIT
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: getmac
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
@@ -942,6 +943,8 @@ Data Classification:
 
 For detailed release notes and version history, please see [CHANGELOG.md](CHANGELOG.md).
 
-### Latest Release (0.6.6)
+### Latest Release (0.6.8)
 
-- **Mapping**: Fixed for PDPR1H1HAR1V0_FW539224**
+- **Client**: Implemented alternate method to retrieve MAC address of device
+- **Mapping**: Further fixes for PDPR1H1HAR1V0_FW539224
+- **Values**: Added conversion for binary sensors

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/README.md

@@ -924,6 +924,8 @@ Data Classification:
 
 For detailed release notes and version history, please see [CHANGELOG.md](CHANGELOG.md).
 
-### Latest Release (0.6.6)
+### Latest Release (0.6.8)
 
-- **Mapping**: Fixed for PDPR1H1HAR1V0_FW539224**
+- **Client**: Implemented alternate method to retrieve MAC address of device
+- **Mapping**: Further fixes for PDPR1H1HAR1V0_FW539224
+- **Values**: Added conversion for binary sensors

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/pyproject.toml

@@ -2,16 +2,11 @@
 name = "python-pooldose"
 dynamic = ["version"]
 description = "Unoffical async Python client for SEKO PoolDose devices"
-authors = [
-    { name = "Lukas Maertin", email = "pypi@lukas-maertin.de" }
-]
+authors = [{ name = "Lukas Maertin", email = "pypi@lukas-maertin.de" }]
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = [
-    "aiohttp",
-    "aiofiles"
-]
+dependencies = ["aiohttp", "aiofiles", "getmac"]
 
 [project.urls]
 Homepage = "https://github.com/lmaertin/python-pooldose"
@@ -28,10 +23,10 @@ build-backend = "setuptools.build_meta"
 dev = ["pytest", "pytest-asyncio"]
 
 [tool.setuptools]
-package-dir = {"" = "src"}
+package-dir = { "" = "src" }
 
 [tool.setuptools.dynamic]
-version = {attr = "pooldose.__version__"}
+version = { attr = "pooldose.__version__" }
 
 [tool.setuptools.packages.find]
 where = ["src"]
@@ -67,7 +62,7 @@ module = "examples.*"
 ignore_errors = true
 
 [[tool.mypy.overrides]]
-module = "tests.*" 
+module = "tests.*"
 ignore_errors = true
 
 # Strict typing for core public API modules
@@ -85,4 +80,4 @@ warn_return_any = false
 [[tool.mypy.overrides]]
 module = "pooldose.request_status"
 disallow_untyped_defs = true
-disallow_incomplete_defs = true
+disallow_incomplete_defs = true

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/__init__.py

@@ -1,5 +1,5 @@
 """Async API client for SEKO Pooldose."""
 from .client import PooldoseClient
 
-__version__ = "0.6.6"
+__version__ = "0.6.8"
 __all__ = ["PooldoseClient"]

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/__main__.py

@@ -12,6 +12,8 @@ from pooldose.device_analyzer import DeviceAnalyzer
 from pooldose.mock_client import MockPooldoseClient
 from pooldose.request_handler import RequestHandler
 
+# pylint: disable=line-too-long
+
 # Import demo utilities if available
 try:
     from examples.demo_utils import (display_static_values,
@@ -25,6 +27,8 @@ except ImportError:
             ("Serial", static_values.sensor_serial_number),
             ("Model", static_values.sensor_model),
             ("Firmware", static_values.sensor_fw_version),
+            ("IP", static_values.sensor_ip),
+            ("MAC", static_values.sensor_mac)
         ]
         print("\nDevice Information:")
         for label, value in device_info:

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/client.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import logging
 from typing import Any, Dict, Optional, Tuple
+from getmac import get_mac_address
 
 from pooldose.constants import get_default_device_info
 from pooldose.mappings.mapping_info import MappingInfo
@@ -121,7 +122,7 @@ class PooldoseClient:
 
         return RequestStatus.SUCCESS, result
 
-    async def _load_device_info(self) -> RequestStatus:  # pylint: disable=too-many-branches
+    async def _load_device_info(self) -> RequestStatus:  # pylint: disable=too-many-branches, too-many-statements
         """
         Load device information from the request handler.
         This method should be called after a successful connection.
@@ -164,7 +165,6 @@ class PooldoseClient:
             _LOGGER.warning("Failed to fetch WiFi station info: %s", status)
         else:
             self.device_info["WIFI_SSID"] = wifi_station.get("SSID")
-            self.device_info["MAC"] = wifi_station.get("MAC")
             self.device_info["IP"] = wifi_station.get("IP")
             # Only include WiFi key if explicitly requested
             if self._include_sensitive_data:
@@ -193,6 +193,15 @@ class PooldoseClient:
         if self._include_sensitive_data:
             _LOGGER.info("Included WiFi and AP keys (use include_sensitive_data=False to exclude)")
 
+        # MAC address via getmac library
+        if self.device_info["IP"]:
+            self.device_info["MAC"] = get_mac_address(ip=self.device_info["IP"])
+            if not self.device_info["MAC"]:
+                _LOGGER.warning("Failed to fetch MAC address via getmac library for IP: %s", self.device_info["IP"])
+        else:
+            _LOGGER.warning("IP address not set, cannot fetch MAC address via getmac library")
+            self.device_info["MAC"] = None
+
         return RequestStatus.SUCCESS
 
     @property

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/device_analyzer.py

@@ -67,7 +67,7 @@ class DeviceAnalyzer:
                 if key in SKIP_KEYS:
                     continue
 
-                # Pattern: {MODEL}_{FW_CODE}_w_{SHORT_ID} or {MODEL}_{FW_CODE}_Elapsed_{...}
+                # Pattern: {MODEL}_{FW_CODE}_w_{SHORT_ID}
                 match = re.match(r"^([A-Z0-9]+)_(FW[A-Z0-9]+)_", key)
                 if match:
                     model = match.group(1)
@@ -390,8 +390,9 @@ class DeviceAnalyzer:
 
         return detail_strings
 
-    def _print_footer(self, widgets: List[WidgetInfo], filtered_widgets: List[WidgetInfo],
-                     show_all: bool) -> None:
+    def _print_footer(self, widgets: List[WidgetInfo],
+                      filtered_widgets: List[WidgetInfo],
+                      show_all: bool) -> None:
         """Print analysis footer."""
         print(f"\n{'='*SEPARATOR_LENGTH}")
         print("ANALYSIS COMPLETE")

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/mappings/model_PDPR1H1HAR1V0_FW539224.json

@@ -60,8 +60,12 @@
     "type": "sensor"
   },
   "pump_running": {
-    "key": "w_1f0iqe0vh",
-    "type": "binary_sensor"
+    "key": "w_1f1fng00q",
+    "type": "binary_sensor",
+    "conversion": {
+      "|PDPR1H1HAR1V0_FW539224_LABEL_w_1f1fng00q_OFF|": "F",
+      "|PDPR1H1HAR1V0_FW539224_LABEL_w_1f1fng00q_ON|": "O"
+    }
   },
   "ph_level_ok": {
     "key": "w_1f0ioo093",
@@ -100,8 +104,12 @@
     "type": "switch"
   },
   "pump_detection": {
-    "key": "w_1f2jpqa6e",
-    "type": "switch"
+    "key": "w_1hn0vte5j",
+    "type": "binary_sensor",
+    "conversion": {
+      "|PDPR1H1HAR1V0_FW539224_LABEL_w_1hn0vte5j_DISABLED|": "F",
+      "|PDPR1H1HAR1V0_FW539224_LABEL_w_1hn0vte5j_ENABLED|": "O"
+    }
   },
   "water_meter_unit": {
     "key": "w_1f3dfp59r",

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/mock_client.py

@@ -109,8 +109,11 @@ class MockPooldoseClient:
             "DEVICE_ID": self._device_key,
             "MODEL": model or "MOCK_MODEL",
             "MODEL_ID": model or "MOCK_MODEL",
-            "FW_CODE": (fw_code.replace('FW', '') if fw_code and fw_code.startswith('FW')
-                       else fw_code or "MOCK_FW"),
+            "FW_CODE": (
+                fw_code.replace('FW', '')
+                if fw_code and fw_code.startswith('FW')
+                else fw_code or "MOCK_FW"
+            ),
             "API_VERSION": API_VERSION_SUPPORTED,
             "IP": "127.0.0.1",  # Mock IP
         })

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/pooldose/values/instant_values.py

@@ -189,7 +189,7 @@ class InstantValues:
             if entry_type == "sensor":
                 return self._process_sensor_value(raw_entry, attributes, name)
             elif entry_type == "binary_sensor":
-                return self._process_binary_sensor_value(raw_entry, name)
+                return self._process_binary_sensor_value(raw_entry, attributes, name)
             elif entry_type == "switch":
                 return self._process_switch_value(raw_entry, name)
             elif entry_type == "number":
@@ -224,15 +224,19 @@ class InstantValues:
 
         return (value, unit)
 
-    def _process_binary_sensor_value(self, raw_entry: Dict[str, Any], name: str) -> Union[bool, None]:
-        """Process binary sensor value and return bool."""
+    def _process_binary_sensor_value(self, raw_entry: Dict[str, Any], attributes: Dict[str, Any], name: str) -> Union[bool, None]:
+        """Process binary sensor value and return bool, with optional conversion mapping."""
         if not isinstance(raw_entry, dict):
             _LOGGER.warning("Invalid raw entry type for binary sensor '%s': expected dict, got %s", name, type(raw_entry))
             return None
 
         value = raw_entry.get("current")
-        if value is None:
-            return None
+
+        # Apply conversion mapping if defined in mapping
+        if value is not None and "conversion" in attributes:
+            conversion = attributes["conversion"]
+            if isinstance(conversion, dict) and str(value) in conversion:
+                value = conversion[str(value)]
 
         # Convert string values to boolean
         if isinstance(value, str):

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/python_pooldose.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-pooldose
-Version: 0.6.6
+Version: 0.6.8
 Summary: Unoffical async Python client for SEKO PoolDose devices
 Author-email: Lukas Maertin <pypi@lukas-maertin.de>
 License-Expression: MIT
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: getmac
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
@@ -942,6 +943,8 @@ Data Classification:
 
 For detailed release notes and version history, please see [CHANGELOG.md](CHANGELOG.md).
 
-### Latest Release (0.6.6)
+### Latest Release (0.6.8)
 
-- **Mapping**: Fixed for PDPR1H1HAR1V0_FW539224**
+- **Client**: Implemented alternate method to retrieve MAC address of device
+- **Mapping**: Further fixes for PDPR1H1HAR1V0_FW539224
+- **Values**: Added conversion for binary sensors

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/src/python_pooldose.egg-info/requires.txt

@@ -1,5 +1,6 @@
 aiohttp
 aiofiles
+getmac
 
 [dev]
 pytest

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/tests/test_client.py

@@ -8,6 +8,7 @@ from pooldose.request_status import RequestStatus
 from pooldose.values.instant_values import InstantValues
 from pooldose.values.static_values import StaticValues
 
+# pylint: disable=line-too-long
 
 class TestPooldoseClient:
     """Test PooldoseClient functionality."""

{python_pooldose-0.6.6 → python_pooldose-0.6.8}/tests/test_instant_values.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+# pylint: disable=line-too-long
 
 class TestInstantValues:  # pylint: disable=too-many-public-methods
     """Test InstantValues functionality."""
@@ -158,7 +159,7 @@ class TestInstantValues:  # pylint: disable=too-many-public-methods
     def test_process_binary_sensor_value_invalid_entry(self, instant_values_fixture):
         """Test processing binary sensor value with invalid entry."""
         # pylint: disable=protected-access
-        value = instant_values_fixture._process_binary_sensor_value("invalid", "test")
+        value = instant_values_fixture._process_binary_sensor_value("invalid", {}, "test")
         assert value is None
 
     def test_process_switch_value_bool(self, instant_values_fixture):