emerald-hws 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

emerald_hws/emeraldhws.py

@@ -40,13 +40,15 @@ class EmeraldHWS():
         self.logger = logging.getLogger(__name__)
         self.update_callback = update_callback
         self._state_lock = threading.RLock()  # Thread-safe lock for state operations
-        
+        self._connection_event = threading.Event()  # Event to signal when MQTT connection is established
+        self.mqttClient = None  # Initialize to None
+
         # Convert minutes to seconds for internal use
         self.connection_timeout = connection_timeout_minutes * 60.0
         self.health_check_interval = health_check_minutes * 60.0 if health_check_minutes > 0 else 0
         self.last_message_time = None
         self.health_check_timer = None
-        
+
         # Connection state tracking
         self.connection_state = "initial"  # possible states: initial, connected, failed
         self.consecutive_failures = 0
@@ -118,7 +120,7 @@ class EmeraldHWS():
         :param reason: Reason for reconnection (scheduled, health_check, etc.)
         """
         self.logger.info(f"emeraldhws: awsiot: Reconnecting MQTT connection (reason: {reason})")
-        
+
         # Store current temperature values for comparison after reconnect
         temp_values = {}
         for properties in self.properties:
@@ -127,8 +129,11 @@ class EmeraldHWS():
                 hws_id = heat_pump['id']
                 if 'last_state' in heat_pump and 'temp_current' in heat_pump['last_state']:
                     temp_values[hws_id] = heat_pump['last_state']['temp_current']
-        
-        self.mqttClient.stop()
+
+        if self.mqttClient is not None:
+            self.mqttClient.stop()
+            self.mqttClient = None  # Clear the client so a new one can be created
+
         self.connectMQTT()
         self.subscribeAllHWS()
         
@@ -153,6 +158,14 @@ class EmeraldHWS():
         """ Establishes a connection to Amazon IOT core's MQTT service
         """
 
+        # If already connected, skip
+        if self.mqttClient is not None:
+            self.logger.debug("emeraldhws: awsiot: MQTT client already exists, skipping connection")
+            return
+
+        # Clear the connection event before starting new connection
+        self._connection_event.clear()
+
         # Certificate path is available but not currently used in the connection
         # os.path.join(os.path.dirname(__file__), '__assets__', 'SFSRootCAG2.pem')
         identityPoolID = self.COGNITO_IDENTITY_POOL_ID
@@ -185,11 +198,16 @@ class EmeraldHWS():
 
         client.start()
         self.mqttClient = client
-        
+
+        # Block until connection is established or timeout (30 seconds)
+        if not self._connection_event.wait(timeout=30):
+            self.logger.warning("emeraldhws: awsiot: Connection establishment timed out after 30 seconds")
+            # Continue anyway - the connection may still succeed asynchronously
+
         # Schedule periodic reconnection using configurable timeout
         if self.connection_timeout > 0:
             threading.Timer(self.connection_timeout, self.reconnectMQTT).start()
-        
+
         # Start health check timer if enabled
         if self.health_check_interval > 0:
             self.health_check_timer = threading.Timer(self.health_check_interval, self.check_connection_health)
@@ -238,6 +256,8 @@ class EmeraldHWS():
         # Reset failure counter and update connection state
         self.consecutive_failures = 0
         self.connection_state = "connected"
+        # Signal that connection is established
+        self._connection_event.set()
         return
 
     def on_lifecycle_connection_failure(self, lifecycle_connection_failure: mqtt5.LifecycleConnectFailureData):
@@ -247,14 +267,18 @@ class EmeraldHWS():
         error_code = getattr(error, 'code', 'unknown')
         error_name = getattr(error, 'name', 'unknown')
         error_message = str(error)
-        
+
         # Update connection state and increment failure counter
         self.connection_state = "failed"
         self.consecutive_failures += 1
-        
+
         # Log at INFO level since this is important for troubleshooting
         self.logger.info(f"emeraldhws: awsiot: connection failed - Error: {error_name} (code: {error_code}), Message: {error_message}")
-        
+
+        # Log additional error details if available
+        if hasattr(error, '__dict__'):
+            self.logger.debug(f"emeraldhws: awsiot: error details: {error.__dict__}")
+
         # If there's a CONNACK packet available, log its details too
         if hasattr(lifecycle_connection_failure, 'connack_packet') and lifecycle_connection_failure.connack_packet:
             connack = lifecycle_connection_failure.connack_packet
@@ -264,6 +288,17 @@ class EmeraldHWS():
                 self.logger.info(f"emeraldhws: awsiot: MQTT CONNACK reason: {reason_code} - {reason_string}")
             else:
                 self.logger.info(f"emeraldhws: awsiot: MQTT CONNACK reason code: {reason_code}")
+
+            # Log all CONNACK properties if available
+            if hasattr(connack, '__dict__'):
+                self.logger.debug(f"emeraldhws: awsiot: CONNACK details: {connack.__dict__}")
+        else:
+            self.logger.debug("emeraldhws: awsiot: no CONNACK packet available in failure data")
+
+        # Log the exception data structure itself for deeper debugging
+        if hasattr(lifecycle_connection_failure, '__dict__'):
+            self.logger.debug(f"emeraldhws: awsiot: failure data: {lifecycle_connection_failure.__dict__}")
+
         return
 
     def on_lifecycle_stopped(self, lifecycle_stopped_data: mqtt5.LifecycleStoppedData):
@@ -278,19 +313,26 @@ class EmeraldHWS():
         # Extract disconnect reason if available
         reason = "unknown reason"
         if hasattr(lifecycle_disconnect_data, 'disconnect_packet') and lifecycle_disconnect_data.disconnect_packet:
-            reason_code = getattr(lifecycle_disconnect_data.disconnect_packet, 'reason_code', 'unknown')
-            reason_string = getattr(lifecycle_disconnect_data.disconnect_packet, 'reason_string', '')
+            disconnect_packet = lifecycle_disconnect_data.disconnect_packet
+            reason_code = getattr(disconnect_packet, 'reason_code', 'unknown')
+            reason_string = getattr(disconnect_packet, 'reason_string', '')
             reason = f"reason code: {reason_code}" + (f" - {reason_string}" if reason_string else "")
-        
+
+            # Log full disconnect packet details at debug level
+            if hasattr(disconnect_packet, '__dict__'):
+                self.logger.debug(f"emeraldhws: awsiot: disconnect packet details: {disconnect_packet.__dict__}")
+        else:
+            # Log the disconnect data structure if no packet available
+            if hasattr(lifecycle_disconnect_data, '__dict__'):
+                self.logger.debug(f"emeraldhws: awsiot: disconnect data: {lifecycle_disconnect_data.__dict__}")
+
         self.logger.info(f"emeraldhws: awsiot: disconnected - {reason}")
         return
 
     def on_lifecycle_attempting_connect(self, lifecycle_attempting_connect_data: mqtt5.LifecycleAttemptingConnectData):
         """ Log message when attempting connect
         """
-        # Include endpoint information if available
-        endpoint = getattr(lifecycle_attempting_connect_data, 'endpoint', 'unknown')
-        self.logger.debug(f"emeraldhws: awsiot: attempting to connect to {endpoint}")
+        self.logger.debug("emeraldhws: awsiot: attempting to connect")
         return
         
     def check_connection_health(self):
@@ -459,10 +501,40 @@ class EmeraldHWS():
         """
         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 getHourlyEnergyUsage(self, id):
+        """ Returns energy usage as reported by heater for the previous hour in kWh and a string of format YYYY-MM-DD HH:00 dictating the starting hour for the energy reading
+        :param id: The UUID of the HWS to query
+        """
+        full_status = self.getFullStatus(id)
+        if not full_status:
+            return None
+
+        consumption = full_status.get("consumption_data")
+        if consumption:
+            consumption = json.loads(consumption)
+        else:
+            return None
+
+        current_hour = consumption.get("current_hour")
+        last_data_at = consumption.get("last_data_at")
+        if current_hour is None or last_data_at is None:
+            return None
+
+        return current_hour, last_data_at
+
     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

{emerald_hws-0.0.15.dist-info → emerald_hws-0.0.17.dist-info}/METADATA

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

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

emerald_hws-0.0.15.dist-info/RECORD

@@ -1,7 +0,0 @@
-emerald_hws/__init__.py,sha256=uukjQ-kiPYKWvGT3jLL6kJA1DCNAxtw4HlLKqPSypXs,61
-emerald_hws/emeraldhws.py,sha256=0yvazkMtwEfimqGsBe6Q3zGEfpQbCKgCiXDpRYwKFL4,22876
-emerald_hws/__assets__/SFSRootCAG2.pem,sha256=hw9W0AnYrrlbcWsOewAgIl1ULEsoO57Ylu35dCjWcS4,1424
-emerald_hws-0.0.15.dist-info/METADATA,sha256=6SQeBxgNLAu_nHDnT4VqJdFB_z7GtkKLixAlSbikCK0,2534
-emerald_hws-0.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-emerald_hws-0.0.15.dist-info/top_level.txt,sha256=ZCiUmnBkDr2n4QVkTet1s_AKiGJjuz3heuCR5w5ZqLY,12
-emerald_hws-0.0.15.dist-info/RECORD,,