violet-poolController-api 0.0.11__tar.gz → 0.0.14__tar.gz

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: violet-poolController-api
-Version: 0.0.11
+Version: 0.0.14
 Summary: Asynchronous Python client for the Violet Pool Controller.
 Home-page: https://github.com/Xerolux/violet-poolController-api
 Author: Basti (Xerolux)

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "violet-poolController-api"
-version = "0.0.11"
+version = "0.0.14"
 authors = [
   { name="Basti (Xerolux)", email="git@xerolux.de" },
 ]

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name="violet-poolController-api",
-    version="0.0.11",
+    version="0.0.14",
     author="Basti (Xerolux)",
     author_email="git@xerolux.de",
     description="Asynchronous Python client for the Violet Pool Controller.",

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/tests/test_api.py

@@ -257,7 +257,7 @@ async def test_dosing_standalone_detection_dict_format(mock_aioresponse, standal
 
 @pytest.mark.asyncio
 async def test_get_hardware_profile(mock_aioresponse, api_client):
-    """Test get_hardware_profile correctly detects components."""
+    """Test get_hardware_profile correctly detects components via alive counters."""
     url = "http://192.168.1.100/getReadings?ALL"
 
     # 1. Base module only (no DOS, EXT)
@@ -270,8 +270,14 @@ async def test_get_hardware_profile(mock_aioresponse, api_client):
         "extension_module_2": False,
     }
 
-    # 2. Base module + Dosing + Ext1
-    mock_aioresponse.get(url, payload={"getReadings": {"PUMPSTATE": "2", "SYSTEM_dosagemodule_cpu_temperature": 45.5, "EXT1_1": "1"}}, status=200)
+    # 2. Base module + Dosing + Ext1 (via alive counters)
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        "SYSTEM_dosagemodule_alive_count": "20392243",
+        "SYSTEM_dosagemodule_cpu_temperature": 45.5,
+        "SYSTEM_ext1module_alive_count": "52443888",
+        "EXT1_1": "1",
+    }}, status=200)
     profile = await api_client.get_hardware_profile()
     assert profile == {
         "base_module": True,
@@ -280,8 +286,14 @@ async def test_get_hardware_profile(mock_aioresponse, api_client):
         "extension_module_2": False,
     }
 
-    # 3. Base module + Ext1 + Ext2 (no Dosing)
-    mock_aioresponse.get(url, payload={"getReadings": {"PUMPSTATE": "2", "EXT1_1": "1", "EXT2_1": "1"}}, status=200)
+    # 3. Base module + Ext1 + Ext2 (via alive counters, no Dosing)
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        "SYSTEM_ext1module_alive_count": "100",
+        "SYSTEM_ext2module_alive_count": "200",
+        "EXT1_1": "1",
+        "EXT2_1": "1",
+    }}, status=200)
     profile = await api_client.get_hardware_profile()
     assert profile == {
         "base_module": True,
@@ -290,6 +302,95 @@ async def test_get_hardware_profile(mock_aioresponse, api_client):
         "extension_module_2": True,
     }
 
+    # 4. Real-world scenario: EXT2 relay data present (value 0) but no ext2 module
+    #    Controller always returns EXT2_* keys even when the module is absent.
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        "SYSTEM_dosagemodule_alive_count": "20392243",
+        "SYSTEM_ext1module_alive_count": "52443888",
+        "EXT1_1": 0, "EXT1_2": 0,
+        "EXT2_1": 0, "EXT2_2": 0,
+        "EXT2_1_LAST_ON": 0, "EXT2_1_LAST_OFF": 0,
+    }}, status=200)
+    profile = await api_client.get_hardware_profile()
+    assert profile["extension_module_1"] is True
+    assert profile["extension_module_2"] is False
+
+@pytest.mark.asyncio
+async def test_set_switch_state_ext1_relay(mock_aioresponse, api_client):
+    """Test set_switch_state sends correct URL for EXT1_2 ON, OFF, and AUTO."""
+    base = "http://192.168.1.100/setFunctionManually"
+
+    mock_aioresponse.get(f"{base}?EXT1_2,ON,0,0", body="OK", status=200)
+    result = await api_client.set_switch_state("EXT1_2", "ON")
+    assert result["success"] is True
+
+    mock_aioresponse.get(f"{base}?EXT1_2,OFF,0,0", body="OK", status=200)
+    result = await api_client.set_switch_state("EXT1_2", "OFF")
+    assert result["success"] is True
+
+    mock_aioresponse.get(f"{base}?EXT1_2,AUTO,0,0", body="OK", status=200)
+    result = await api_client.set_switch_state("EXT1_2", "AUTO")
+    assert result["success"] is True
+
+
+@pytest.mark.asyncio
+async def test_module_alive_on_zero_count(mock_aioresponse, api_client):
+    """EXT1 module must be detected when alive_count key is present but value is 0.
+
+    The alive counter starts at 0 immediately after a controller restart.  The
+    old code required value > 0, which caused EXT1_* readings to be filtered
+    and the relay switch to appear broken right after a restart.
+    """
+    url = "http://192.168.1.100/getReadings?ALL"
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        "SYSTEM_ext1module_alive_count": "0",
+        "EXT1_1": 0,
+        "EXT1_2": 0,
+    }}, status=200)
+
+    result = await api_client.get_readings()
+    assert "EXT1_2" in result, (
+        "EXT1_2 must not be filtered when SYSTEM_ext1module_alive_count is present, "
+        "even if the counter is still 0 after a restart"
+    )
+
+
+@pytest.mark.asyncio
+async def test_ext1_readings_not_filtered_when_detected(mock_aioresponse, api_client):
+    """EXT1_* readings are included when extension_module_1 is detected."""
+    url = "http://192.168.1.100/getReadings?ALL"
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        "SYSTEM_ext1module_alive_count": "12345",
+        "EXT1_1": 1,
+        "EXT1_2": 0,
+        "EXT1_3": 0,
+    }}, status=200)
+
+    result = await api_client.get_readings()
+    assert "EXT1_1" in result
+    assert "EXT1_2" in result
+    assert "EXT1_3" in result
+
+
+@pytest.mark.asyncio
+async def test_ext1_readings_filtered_when_not_detected(mock_aioresponse, api_client):
+    """EXT1_* readings are stripped when extension_module_1 key is absent."""
+    url = "http://192.168.1.100/getReadings?ALL"
+    mock_aioresponse.get(url, payload={"getReadings": {
+        "PUMPSTATE": "2",
+        # No SYSTEM_ext1module_alive_count → module not connected
+        "EXT1_1": 0,
+        "EXT1_2": 0,
+    }}, status=200)
+
+    result = await api_client.get_readings()
+    assert "EXT1_1" not in result
+    assert "EXT1_2" not in result
+
+
 @pytest.mark.asyncio
 async def test_get_hardware_profile_standalone_dosing(mock_aioresponse, standalone_api_client):
     """Test get_hardware_profile with a standalone dosing configuration."""

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/violet_poolController_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: violet-poolController-api
-Version: 0.0.11
+Version: 0.0.14
 Summary: Asynchronous Python client for the Violet Pool Controller.
 Home-page: https://github.com/Xerolux/violet-poolController-api
 Author: Basti (Xerolux)

{violet_poolcontroller_api-0.0.11 → violet_poolcontroller_api-0.0.14}/violet_poolcontroller_api/api.py

@@ -500,23 +500,48 @@ class VioletPoolAPI:
     def _build_hardware_profile(self, flattened: dict[str, Any]) -> dict[str, bool]:
         """Build a hardware presence profile from flattened getReadings data.
 
+        Uses the controller's alive-counters (``SYSTEM_*_alive_count``) to
+        reliably detect connected hardware modules.  The controller always
+        emits relay keys (``EXT1_1``, ``EXT2_1``, …) with a default value of
+        ``0`` even when the physical module is absent, so checking those keys
+        would yield false positives.
+
         Args:
             flattened: The flattened key-value readings dict.
 
         Returns:
             A dictionary with boolean flags for connected hardware components.
         """
-        def is_present(key: str) -> bool:
-            if not isinstance(flattened, dict):
-                return False
-            val = flattened.get(key)
-            return val is not None and str(val).strip().upper() != "N/A"
+        def _module_alive(alive_key: str) -> bool:
+            # Key presence means the module is connected; the counter starts at 0
+            # on boot and the controller only emits alive-count keys for modules
+            # that are physically attached, so checking value > 0 would produce
+            # false negatives immediately after a controller restart.
+            return alive_key in flattened
+
+        def _any_relay_used(prefix: str) -> bool:
+            for key, val in flattened.items():
+                if not key.startswith(prefix):
+                    continue
+                if "_LAST_ON" not in key and "_LAST_OFF" not in key and "_RUNTIME" not in key:
+                    last_on = flattened.get(f"{key}_LAST_ON")
+                    if last_on is not None:
+                        try:
+                            if float(str(last_on).strip()) > 0:
+                                return True
+                        except (ValueError, TypeError):
+                            pass
+            return False
+
+        ext1 = _module_alive("SYSTEM_ext1module_alive_count") or _any_relay_used("EXT1_")
+        ext2 = _module_alive("SYSTEM_ext2module_alive_count") or _any_relay_used("EXT2_")
+        dosing = self.dosing_standalone or _module_alive("SYSTEM_dosagemodule_alive_count")
 
         return {
             "base_module": not self.dosing_standalone,
-            "dosing_module": self.dosing_standalone or is_present("SYSTEM_dosagemodule_cpu_temperature"),
-            "extension_module_1": is_present("EXT1_1"),
-            "extension_module_2": is_present("EXT2_1"),
+            "dosing_module": dosing,
+            "extension_module_1": ext1,
+            "extension_module_2": ext2,
         }
 
     async def get_readings(self) -> dict[str, Any]: