emerald-hws 0.0.18__py3-none-any.whl → 0.0.20__py3-none-any.whl

emerald_hws/emeraldhws.py

@@ -109,10 +109,39 @@ class EmeraldHWS():
 
         if post_response_json.get("code") == 200:
             self.logger.debug("emeraldhws: Successfully logged into Emerald API")
-            self.properties = post_response_json.get("info").get("property")
+            property_data = post_response_json.get("info", {}).get("property")
+            self.logger.debug(f"emeraldhws: API returned property data: {property_data}")
+
+            with self._state_lock:
+                self.properties = property_data
+
+            # Check if we got valid data
+            if not isinstance(property_data, list) or len(property_data) == 0:
+                raise Exception("No heat pumps found on account - API returned empty or invalid property list")
         else:
             raise Exception("Unable to fetch properties from Emerald API")
 
+    def _wait_for_properties(self, timeout=30):
+        """
+        Wait for properties to be populated and return a thread-safe copy.
+        Blocks until properties is a non-empty list or timeout occurs.
+
+        :param timeout: Maximum seconds to wait
+        :returns: List of properties
+        :raises: Exception if timeout or properties not available
+        """
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            with self._state_lock:
+                if isinstance(self.properties, list) and len(self.properties) > 0:
+                    return list(self.properties)  # Return a copy
+            time.sleep(0.1)  # Small delay before retry
+
+        # Timeout - provide detailed error message
+        with self._state_lock:
+            final_value = self.properties
+        raise Exception(f"Timeout waiting for properties to be populated. Current value: {type(final_value).__name__} = {final_value}")
+
     def replaceCallback(self, update_callback):
         """ Replaces the current registered update callback (if any) with the supplied
         """
@@ -555,9 +584,10 @@ class EmeraldHWS():
         if not self._is_connected:
             self.connect()
 
+        properties_list = self._wait_for_properties()
         hws = []
 
-        for properties in self.properties:
+        for properties in properties_list:
             heat_pumps = properties.get('heat_pump', [])
             for heat_pump in heat_pumps:
                 hws.append(heat_pump["id"])
@@ -568,10 +598,8 @@ class EmeraldHWS():
         """ Subscribes to updates from all detected HWS
         """
 
-        if not self.properties:
-            self.getAllHWS()
-
-        for property in self.properties:
+        properties_list = self._wait_for_properties()
+        for property in properties_list:
             for hws in property.get("heat_pump"):
                 self.subscribeForUpdates(hws.get("id"))
 

{emerald_hws-0.0.18.dist-info → emerald_hws-0.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerald_hws
-Version: 0.0.18
+Version: 0.0.20
 Summary: A package to manipulate and monitor Emerald Heat Pump Hot Water Systems
 Author-email: Ross Williamson <ross@inertia.net.nz>
 License-Expression: MIT

emerald_hws-0.0.20.dist-info/RECORD

@@ -0,0 +1,7 @@
+emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
+emerald_hws/emeraldhws.py,sha256=fVyZ_9uQp9RfHTaAI0ZlHIj37hIn2lHDNeXO0vysV4I,28008
+emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
+emerald_hws-0.0.20.dist-info/METADATA,sha256=UE32BxNZQMJmdZ62Q-CXOOr0u76QMVoMoUQfpDWtvOE,2534
+emerald_hws-0.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+emerald_hws-0.0.20.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
+emerald_hws-0.0.20.dist-info/RECORD,,

emerald_hws-0.0.18.dist-info/RECORD

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