python-hotspring 3.0.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

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 not self.spa.is_hna:
                 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 not self.spa.is_hna:
             msg = (
                 f"Connected to Spa Network Adapter (SNA) with hostname "
                 f"'{self.spa.info.hostname}'. The Home Network Adapter (HNA) "

hotspring/models.py

@@ -213,6 +213,18 @@ 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)."""
+        return self.info.sna_ready or bool(getattr(self.versions, "control_box", ""))
+
+    @property
+    def device_type(self) -> DeviceType:
+        """Determine whether the device is an HNA or SNA."""
+        if not self.info.hostname:
+            return DeviceType.UNKNOWN
+        return DeviceType.HNA if self.is_hna else DeviceType.SNA
+
 
 @dataclass
 class SpaInfo:
@@ -314,39 +326,24 @@ class SpaInfo:
     def device_type(self) -> DeviceType:
         """Determine whether the device is an HNA or SNA.
 
-        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.
+        Only the HNA can report 'SNAready' as 'Yes'; the SNA firmware always
+        reports 'No'. The hostname/rootTopic MAC suffixes cannot be used,
+        since rootTopic is built from the higher of the two adapter MACs.
 
         Returns
         -------
-            DeviceType.HNA if hostname matches root_topic,
-            DeviceType.SNA if hostname differs from root_topic,
-            DeviceType.UNKNOWN if information is missing.
+            DeviceType.UNKNOWN if /startup data is missing,
+            DeviceType.HNA if sna_ready is True, otherwise DeviceType.SNA.
 
         """
-        if not self.hostname or not self.root_topic:
+        if not self.hostname:
             return DeviceType.UNKNOWN
-
-        mac_suffix = self.hostname.rsplit("_", 1)[-1]
-        if self.root_topic.lower().endswith(mac_suffix.lower()):
-            return DeviceType.HNA
-        return DeviceType.SNA
+        return DeviceType.HNA if self.sna_ready else DeviceType.SNA
 
     @property
     def is_hna(self) -> bool:
         """Return True if this device is the Home Network Adapter (HNA)."""
-        return self.device_type == DeviceType.HNA
-
-    @property
-    def is_sna(self) -> bool:
-        """Return True if this device is the Spa Network Adapter (SNA)."""
-        return self.device_type == DeviceType.SNA
+        return self.sna_ready
 
 
 @dataclass

{python_hotspring-3.0.1.dist-info → python_hotspring-3.1.0.dist-info}/METADATA

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

python_hotspring-3.1.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+hotspring/__init__.py,sha256=wV3giZmeCl0qdz6zStvbQAYOBc6d5qdAFzEaHViYKkA,1560
+hotspring/const.py,sha256=ggMcA7ng0pdfquOAQdM7gUoF48J7ha5diya-YkYqFaA,14490
+hotspring/exceptions.py,sha256=R8YwGfi6mXZ5DcHw4_fmtrRuvgkfOrLRCH-d3x6OUIw,1184
+hotspring/hotspring.py,sha256=uQHNk5hTxHGRIxmiWzn-eGv7DVd0wiGrLouXahIIqaE,28896
+hotspring/models.py,sha256=uiN7_VkHHLmKEagbRDBAa5xvYFLfZ98U_H93K-pkNd0,53465
+hotspring/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_hotspring-3.1.0.dist-info/METADATA,sha256=lq6FH-ct7qVgisgJ24M0mLvVkI6GyyIaQwWKngNq5s8,8118
+python_hotspring-3.1.0.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
+python_hotspring-3.1.0.dist-info/licenses/LICENSE,sha256=4n3vNP1aJ5r8xLfzCCjo5l0EK5-k2-7w9rgucn7WVFM,1080
+python_hotspring-3.1.0.dist-info/RECORD,,

python_hotspring-3.0.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-hotspring/__init__.py,sha256=wV3giZmeCl0qdz6zStvbQAYOBc6d5qdAFzEaHViYKkA,1560
-hotspring/const.py,sha256=ggMcA7ng0pdfquOAQdM7gUoF48J7ha5diya-YkYqFaA,14490
-hotspring/exceptions.py,sha256=R8YwGfi6mXZ5DcHw4_fmtrRuvgkfOrLRCH-d3x6OUIw,1184
-hotspring/hotspring.py,sha256=sMuYgPZr_IOiF2K1oju6MkGDWiVSl-hsuaFBV_uqBIg,28898
-hotspring/models.py,sha256=S45nzQ37k8CTNEvJ5IZXylezbhmRBiLpRg9SVHltvFE,53598
-hotspring/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_hotspring-3.0.1.dist-info/METADATA,sha256=lNpZ6C2qjIRhnGxikU_tnivC7JdqmCHc0NIjP3B_m_I,8118
-python_hotspring-3.0.1.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
-python_hotspring-3.0.1.dist-info/licenses/LICENSE,sha256=4n3vNP1aJ5r8xLfzCCjo5l0EK5-k2-7w9rgucn7WVFM,1080
-python_hotspring-3.0.1.dist-info/RECORD,,