emerald-hws 0.0.14__py3-none-any.whl → 0.0.16__py3-none-any.whl

emerald_hws/emeraldhws.py

@@ -39,6 +39,7 @@ class EmeraldHWS():
         self.properties = {}
         self.logger = logging.getLogger(__name__)
         self.update_callback = update_callback
+        self._state_lock = threading.RLock()  # Thread-safe lock for state operations
         
         # Convert minutes to seconds for internal use
         self.connection_timeout = connection_timeout_minutes * 60.0
@@ -332,11 +333,14 @@ class EmeraldHWS():
         :param value: value to set
         """
 
-        for properties in self.properties:
-            heat_pumps = properties.get('heat_pump', [])
-            for heat_pump in heat_pumps:
-                if heat_pump['id'] == id:
-                    heat_pump['last_state'][key] = value
+        with self._state_lock:
+            for properties in self.properties:
+                heat_pumps = properties.get('heat_pump', [])
+                for heat_pump in heat_pumps:
+                    if heat_pump['id'] == id:
+                        heat_pump['last_state'][key] = value
+        
+        # Call callback AFTER releasing lock to avoid potential deadlocks
         if self.update_callback is not None:
             self.update_callback()
 
@@ -365,11 +369,13 @@ class EmeraldHWS():
         if not self.properties:
             self.connect()
 
-        for properties in self.properties:
-            heat_pumps = properties.get('heat_pump', [])
-            for heat_pump in heat_pumps:
-                if heat_pump['id'] == id:
-                    return heat_pump
+        with self._state_lock:
+            for properties in self.properties:
+                heat_pumps = properties.get('heat_pump', [])
+                for heat_pump in heat_pumps:
+                    if heat_pump['id'] == id:
+                        return heat_pump
+        return None
 
     def sendControlMessage(self, id, payload):
         """ Sends a message via MQTT to the HWS
@@ -381,6 +387,8 @@ class EmeraldHWS():
             self.connect()
 
         hwsdetail = self.getFullStatus(id)
+        if not hwsdetail:
+            raise Exception(f"Unable to find HWS with ID {id}")
 
         msg = [{"device_id":id,
                 "namespace":"business",
@@ -439,35 +447,54 @@ class EmeraldHWS():
         """ Returns true if the specified HWS is currently on
         :param id: The UUID of the HWS to query
         """
-        switch_status = self.getFullStatus(id).get("last_state").get("switch")
-        return (switch_status == 1 or switch_status == "on")
+        full_status = self.getFullStatus(id)
+        if full_status and full_status.get("last_state"):
+            switch_status = full_status.get("last_state").get("switch")
+            return (switch_status == 1 or switch_status == "on")
+        return False
 
     def isHeating(self, id):
         """ Returns true if the specified HWS is currently heating
         :param id: The UUID of the HWS to query
         """
-        heating_status = self.getFullStatus(id).get("device_operation_status")
-        return (heating_status == 1)
+        full_status = self.getFullStatus(id)
+        if full_status:
+            # Try to get work_state from last_state (updated via MQTT)
+            if full_status.get("last_state") and "work_state" in full_status.get("last_state"):
+                work_state = full_status.get("last_state").get("work_state")
+                # work_state: 0=off/idle, 1=actively heating, 2=on but not heating
+                return (work_state == 1)
+            
+            # Fallback to device_operation_status if work_state not available yet
+            # (e.g., before first MQTT update after initialization)
+            heating_status = full_status.get("device_operation_status")
+            return (heating_status == 1)
+        
+        return False
 
     def currentMode(self, id):
         """ Returns an integer specifying the current mode (0==boost, 1==normal, 2==quiet)
         :param id: The UUID of the HWS to query
         """
-        mode_status = self.getFullStatus(id).get("last_state").get("mode")
-        return mode_status
+        full_status = self.getFullStatus(id)
+        if full_status and full_status.get("last_state"):
+            mode_status = full_status.get("last_state").get("mode")
+            return mode_status
+        return None
 
     def getInfo(self, id):
         """ Returns identifying details for the specified HWS
         :param id: The UUID of the HWS to query
         """
         full_status = self.getFullStatus(id)
-
-        return {'id': id,
-                'serial_number': full_status.get("serial_number"),
-                'brand': full_status.get("brand"),
-                'hw_version': full_status.get("hw_version"),
-                'soft_version': full_status.get("soft_version")
-                }
+        if full_status:
+            return {'id': id,
+                    'serial_number': full_status.get("serial_number"),
+                    'brand': full_status.get("brand"),
+                    'hw_version': full_status.get("hw_version"),
+                    'soft_version': full_status.get("soft_version")
+                    }
+        return None
 
     def listHWS(self):
         """ Returns a list of UUIDs of all discovered HWS

{emerald_hws-0.0.14.dist-info → emerald_hws-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerald_hws
-Version: 0.0.14
+Version: 0.0.16
 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.16.dist-info/RECORD

@@ -0,0 +1,7 @@
+emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
+emerald_hws/emeraldhws.py,sha256=in2F-kUyKXGQApvm00L2DH3CSXFj4H_1Vapnxkfa7xM,23416
+emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
+emerald_hws-0.0.16.dist-info/METADATA,sha256=X2bALg477JBnh4JUPD8MaEgWJiEjyh0INb5QMbGiHxE,2534
+emerald_hws-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+emerald_hws-0.0.16.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
+emerald_hws-0.0.16.dist-info/RECORD,,

emerald_hws-0.0.14.dist-info/RECORD

@@ -1,7 +0,0 @@
-emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
-emerald_hws/emeraldhws.py,sha256=7q-T6jaujtxplGXb4GdnuiBHZLwMrdSlJT14pmn6nw0,22100
-emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
-emerald_hws-0.0.14.dist-info/METADATA,sha256=RRcMNq_lWNHsZigorD4i1tlYfOlAf-9PCBPYMGUlUDs,2534
-emerald_hws-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-emerald_hws-0.0.14.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
-emerald_hws-0.0.14.dist-info/RECORD,,