python-hotspring 3.0.1__tar.gz → 3.0.2__tar.gz

{python_hotspring-3.0.1 → python_hotspring-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hotspring
-Version: 3.0.1
+Version: 3.0.2
 Summary: Asynchronous Python client for Hot Spring Connected Spa Kit 2.
 License: MIT
 License-File: LICENSE

{python_hotspring-3.0.1 → python_hotspring-3.0.2}/pyproject.toml

@@ -23,7 +23,7 @@ packages = [
 readme = "README.md"
 repository = "https://github.com/Moustachauve/python-hotspring"
 # The CI/CD and GitHub Actions release workflows are responsible for setting the version tag
-version = "3.0.1"
+version = "3.0.2"
 
 [tool.poetry.dependencies]
 aiohttp = ">=3.0.0"

{python_hotspring-3.0.1 → python_hotspring-3.0.2}/src/hotspring/hotspring.py

@@ -224,7 +224,7 @@ class HotSpring:  # pylint: disable=too-many-public-methods
             ):
                 self.spa.connection_status.spa_connected = True
 
-            if self.validate_device and self.spa.info.is_sna:
+            if self.validate_device and self.spa.is_sna:
                 msg = (
                     f"Connected to Spa Network Adapter (SNA) with hostname "
                     f"'{self.spa.info.hostname}'. The Home Network Adapter (HNA) "
@@ -303,7 +303,7 @@ class HotSpring:  # pylint: disable=too-many-public-methods
         if identity_data:
             self.spa.update_info(identity_data)
 
-        if self.validate_device and self.spa.info.is_sna:
+        if self.validate_device and self.spa.is_sna:
             msg = (
                 f"Connected to Spa Network Adapter (SNA) with hostname "
                 f"'{self.spa.info.hostname}'. The Home Network Adapter (HNA) "

{python_hotspring-3.0.1 → python_hotspring-3.0.2}/src/hotspring/models.py

@@ -213,6 +213,26 @@ class Spa:
         """
         self.freshwater_iq = FreshWaterIQ.from_dict(data)
 
+    @property
+    def is_hna(self) -> bool:
+        """Return True if this device is the Home Network Adapter (HNA)."""
+        if self.info.is_sna:
+            return False
+
+        if self.info.sna_ready:
+            return True
+
+        return (
+            self.heater.current_temperature is not None
+            or self.heater.set_temperature is not None
+            or bool(getattr(self.versions, "control_box", ""))
+        )
+
+    @property
+    def is_sna(self) -> bool:
+        """Return True if this device is the Spa Network Adapter (SNA)."""
+        return not self.is_hna
+
 
 @dataclass
 class SpaInfo:
@@ -317,22 +337,25 @@ class SpaInfo:
         The HNA (Home Network Adapter) is the intended API bridge.
         The SNA (Spa Network Adapter) is the tub-side module.
 
-        On the HNA, the hostname suffix (last 6 characters, e.g. from
-        'ConnectedSpa_112233') matches the last 6 characters of the root_topic
-        (e.g. 'mySpaAABBCC112233').
-        On the SNA, root_topic still points to the paired HNA topic, but
-        the hostname reflects the SNA's own MAC address.
+        On the HNA with an active link to the SNA, 'SNAready' is 'Yes' (True).
+        The SNA firmware always reports 'SNAready' as 'No' (False).
+
+        When 'root_topic' does not match the hostname MAC suffix and 'sna_ready'
+        is False, this indicates an SNA on setups where HNA MAC > SNA MAC.
 
         Returns
         -------
-            DeviceType.HNA if hostname matches root_topic,
-            DeviceType.SNA if hostname differs from root_topic,
+            DeviceType.HNA if sna_ready is True or hostname matches root_topic,
+            DeviceType.SNA if hostname differs from root_topic and sna_ready is False,
             DeviceType.UNKNOWN if information is missing.
 
         """
         if not self.hostname or not self.root_topic:
             return DeviceType.UNKNOWN
 
+        if self.sna_ready:
+            return DeviceType.HNA
+
         mac_suffix = self.hostname.rsplit("_", 1)[-1]
         if self.root_topic.lower().endswith(mac_suffix.lower()):
             return DeviceType.HNA