emerald-hws 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

emerald_hws/emeraldhws.py

@@ -109,13 +109,24 @@ class EmeraldHWS():
 
         if post_response_json.get("code") == 200:
             self.logger.debug("emeraldhws: Successfully logged into Emerald API")
-            property_data = post_response_json.get("info", {}).get("property")
+            info = post_response_json.get("info", {})
+
+            # Retrieve both property and shared_property arrays
+            property_data = info.get("property", [])
+            shared_property_data = info.get("shared_property", [])
+
+            # Combine both arrays into a single list
+            combined_properties = []
+            if isinstance(property_data, list):
+                combined_properties.extend(property_data)
+            if isinstance(shared_property_data, list):
+                combined_properties.extend(shared_property_data)
 
             with self._state_lock:
-                self.properties = property_data
+                self.properties = combined_properties
 
             # Check if we got valid data
-            if not isinstance(property_data, list) or len(property_data) == 0:
+            if len(combined_properties) == 0:
                 # Log the full response when properties are invalid to help diagnose the issue
                 self.logger.debug(f"emeraldhws: Poperties empty/invalid, full response: {post_response_json}")
                 raise Exception("No heat pumps found on account - API returned empty or invalid property list")
@@ -217,7 +228,9 @@ class EmeraldHWS():
                 on_lifecycle_attempting_connect = self.on_lifecycle_attempting_connect,
                 on_lifecycle_disconnection = self.on_lifecycle_disconnection,
                 on_lifecycle_connection_failure = self.on_lifecycle_connection_failure,
-                on_publish_received = self.mqttCallback
+                on_publish_received = self.mqttCallback,
+                # The default keep-alive is 20 minutes, which we might want to reduce
+                # keep_alive_interval_sec = 60,
             )
 
             client.start()
@@ -277,7 +290,7 @@ class EmeraldHWS():
     def on_lifecycle_connection_failure(self, lifecycle_connection_failure: mqtt5.LifecycleConnectFailureData):
         """ Log message when connection failed
         """
-        error = lifecycle_connection_failure.error
+        error = lifecycle_connection_failure.exception
         error_code = getattr(error, 'code', 'unknown')
         error_name = getattr(error, 'name', 'unknown')
         error_message = str(error)
@@ -306,6 +319,11 @@ class EmeraldHWS():
             # Log all CONNACK properties if available
             if hasattr(connack, '__dict__'):
                 self.logger.debug(f"emeraldhws: awsiot: CONNACK details: {connack.__dict__}")
+            
+            if reason_code == mqtt5.ConnectReasonCode.CLIENT_IDENTIFIER_NOT_VALID:
+                self.logger.debug("emeraldhws: awsiot: The client identifier is not valid. Getting a new login token.")
+                self.getLoginToken()
+                self.reconnectMQTT(reason="invalid_client_id")
         else:
             self.logger.debug("emeraldhws: awsiot: no CONNACK packet available in failure data")
 
@@ -346,6 +364,7 @@ class EmeraldHWS():
 
         # Clear connection event when disconnected
         self._connection_event.clear()
+        self._is_connected = False
         return
 
     def on_lifecycle_attempting_connect(self, lifecycle_attempting_connect_data: mqtt5.LifecycleAttemptingConnectData):
@@ -422,8 +441,12 @@ class EmeraldHWS():
         :param id: The UUID of the requested HWS
         """
         with self._mqtt_lock:
-            if not self.mqttClient:
+            retry = 0
+            while not self.mqttClient:
                 self.connectMQTT()
+                if retry >= 3:
+                    raise Exception("MQTT client not connected after multiple attempts")
+                retry += 1
 
             mqtt_topic = "ep/heat_pump/from_gw/{}".format(id)
             subscribe_future = self.mqttClient.subscribe(

{emerald_hws-0.0.22.dist-info → emerald_hws-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerald_hws
-Version: 0.0.22
+Version: 0.0.24
 Summary: A package to manipulate and monitor Emerald Heat Pump Hot Water Systems
 Author-email: Ross Williamson <ross@inertia.net.nz>
 License-Expression: MIT
@@ -8,7 +8,7 @@ Project-URL: Homepage, https://github.com/ross-w/emerald_hws_py
 Project-URL: Bug Tracker, https://github.com/ross-w/emerald_hws_py/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: boto3<2.0.0,>=1.40.0
 Requires-Dist: awsiotsdk<2.0.0,>=1.24.0

emerald_hws-0.0.24.dist-info/RECORD

@@ -0,0 +1,7 @@
+emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
+emerald_hws/emeraldhws.py,sha256=Cwk-4ixiJPATY9EuPOoWAdOu2o5v64BHIr610tfVeck,30048
+emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
+emerald_hws-0.0.24.dist-info/METADATA,sha256=yUDQKxj5YRXw42KgqTkh2pDDXkOtzj0VtQ7txOf2-Y0,2534
+emerald_hws-0.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+emerald_hws-0.0.24.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
+emerald_hws-0.0.24.dist-info/RECORD,,

emerald_hws-0.0.22.dist-info/RECORD

@@ -1,7 +0,0 @@
-emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
-emerald_hws/emeraldhws.py,sha256=DI3yaAoL_iNRqM480AuSKwVKa_nfbsvEVMdnrlW7OIA,28936
-emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
-emerald_hws-0.0.22.dist-info/METADATA,sha256=aOWR41PKiop_mbtnkokueGiQuw46tFUB7nm84wnxvZk,2534
-emerald_hws-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-emerald_hws-0.0.22.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
-emerald_hws-0.0.22.dist-info/RECORD,,