nwp500-python 9.2.0__tar.gz → 9.2.1__tar.gz

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/CHANGELOG.rst

@@ -5,6 +5,65 @@ Changelog
 Unreleased
 ==========
 
+Version 9.2.1 (2026-07-30)
+==========================
+
+Added
+-----
+- **Confirmed reservation/TOU write helpers and canonical schedule
+  comparison** (`#111 <https://github.com/eman/nwp500-python/issues/111>`_):
+  ``update_reservations`` and ``configure_tou_schedule`` were
+  fire-and-forget, returning only an MQTT publish packet id with no way to
+  confirm the device applied the write. New
+  ``nwp500.reservations.update_reservations_confirmed()`` and
+  ``nwp500.tou_schedule.configure_tou_schedule_confirmed()`` (also exported
+  from the top-level ``nwp500`` package) send the write and await the
+  device's ``rsv/rd``/``tou/rd`` echo, returning the parsed schedule the
+  device now holds (or ``None`` on timeout). Because the protocol has no
+  request/response correlation id on these topics, a response is only
+  accepted once it matches the content that was just written, so a
+  stale/unrelated response from a concurrent read or a previous write
+  can't be mistaken for confirmation. Also added
+  ``ReservationEntry.canonical_key()``/``ReservationSchedule.canonical()``
+  and the ``TOUPeriod``/``TOUReservationSchedule`` equivalents: a stable,
+  order-independent, hashable representation of the raw protocol fields so
+  a desired program can be compared against a device read-back with
+  ``desired.canonical() == confirmed.canonical()`` instead of hand-diffing.
+
+Fixed
+-----
+- **Freeze protection temperature now validated against device limits**
+  (`#112 <https://github.com/eman/nwp500-python/issues/112>`_):
+  ``set_freeze_protection_temperature`` documented a 35-45°F valid range
+  but sent the value straight through with no validation. It now fetches
+  device features and validates against
+  ``freeze_protection_temp_min``/``freeze_protection_temp_max`` (raising
+  ``RangeValidationError`` if out of range), matching the pattern already
+  used by ``set_dhw_temperature``. The command is also now gated behind a
+  new ``freeze_protection_use`` capability (added to
+  ``MqttDeviceCapabilityChecker._CAPABILITY_MAP`` and enforced with
+  ``@requires_capability``), so it's no longer dispatched to devices that
+  don't support freeze protection at all.
+- **Demand response commands gated on the dr_setting_use capability**
+  (`#114 <https://github.com/eman/nwp500-python/issues/114>`_):
+  ``enable_demand_response``/``disable_demand_response`` were dispatched
+  unconditionally even though the ``dr_setting_use`` capability flag
+  exists on ``DeviceFeature``. Every other controllable feature follows
+  flag + ``_CAPABILITY_MAP`` entry + ``@requires_capability`` decorator;
+  DR was the one gap. Added the missing map entry and decorators so DR
+  now follows the same pattern.
+
+Documentation
+-------------
+- **decode_reservation_hex docstring corrected** (`#113
+  <https://github.com/eman/nwp500-python/issues/113>`_): the ``param``
+  byte was documented as "temperature offset by 20°F", contradicting the
+  half-degrees-Celsius encoding used consistently everywhere else
+  (``models/schedule.py``, ``models/_converters.py``). Corrected to
+  "target temperature, half-degrees Celsius; °C = param/2", and fixed the
+  accompanying doctest-style example, which showed a ``minute`` key where
+  the function actually returns ``min``.
+
 Version 9.2.0 (2026-07-06)
 ==========================
 

{nwp500_python-9.2.0/src/nwp500_python.egg-info → nwp500_python-9.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nwp500-python
-Version: 9.2.0
+Version: 9.2.1
 Summary: A library for controlling Navien NWP500 Water Heaters via NaviLink
 Home-page: https://github.com/eman/nwp500-python
 Author: Emmanuel Levijarvi

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/air_filter_reset.py

@@ -8,7 +8,8 @@ after cleaning or replacing the filter on heat pump models.
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the air filter control process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/auto_recovery.py

@@ -21,6 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
+from nwp500.exceptions import Nwp500Error
 from nwp500.mqtt import MqttConnectionConfig
 
 # Configure logging
@@ -167,7 +168,7 @@ async def strategy_full_recreation(auth_client, device):
             mqtt_client = await create_and_connect()
             recovery_attempt = 0  # Reset on success
             logger.info("Successfully recreated MQTT client")
-        except Exception as e:
+        except Nwp500Error as e:
             logger.error(f"Failed to recreate MQTT client: {e}")
 
     try:
@@ -250,7 +251,7 @@ async def strategy_token_refresh(auth_client, device):
 
             recovery_attempt = 0  # Reset on success
 
-        except Exception as e:
+        except Nwp500Error as e:
             logger.error(f"Failed to refresh and reconnect: {e}")
 
     mqtt_client = NavienMqttClient(auth_client, config=config)
@@ -348,7 +349,7 @@ async def strategy_exponential_backoff(auth_client, device):
                 try:
                     if mqtt_client.is_connected:
                         await mqtt_client.disconnect()
-                except Exception as e:
+                except Nwp500Error as e:
                     logger.warning(f"Error disconnecting old client: {e}")
 
             # Create new client
@@ -365,7 +366,7 @@ async def strategy_exponential_backoff(auth_client, device):
             recovery_attempt = 0  # Reset on success
             logger.info("All subscriptions restored")
 
-        except Exception as e:
+        except Nwp500Error as e:
             logger.error(f"Recovery attempt failed: {e}")
 
     mqtt_client = NavienMqttClient(auth_client, config=config)
@@ -442,7 +443,7 @@ if __name__ == "__main__":
         asyncio.run(main())
     except KeyboardInterrupt:
         print("\n\n[WARNING]  Interrupted by user")
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"\n[ERROR] Error: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/combined_callbacks.py

@@ -32,6 +32,7 @@ if __name__ == "__main__":
 from nwp500.api_client import NavienAPIClient
 from nwp500.auth import NavienAuthClient
 from nwp500.enums import OnOffFlag
+from nwp500.exceptions import Nwp500Error
 from nwp500.models import DeviceFeature, DeviceStatus
 from nwp500.mqtt import NavienMqttClient
 
@@ -157,7 +158,7 @@ async def main():
                 await mqtt_client.disconnect()
                 print("\n[SUCCESS] Disconnected")
 
-            except Exception as e:
+            except Nwp500Error as e:
                 print(f"[ERROR] Error: {e}")
                 if mqtt_client.is_connected:
                     await mqtt_client.disconnect()
@@ -165,7 +166,7 @@ async def main():
 
         return 0
 
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"[ERROR] Error: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/demand_response.py

@@ -8,7 +8,8 @@ to help utilities manage peak loads.
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the demand response control process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/device_capabilities.py

@@ -26,6 +26,8 @@ logging.getLogger("nwp500.mqtt_client").setLevel(logging.INFO)
 logging.getLogger("nwp500.auth").setLevel(logging.INFO)
 logging.getLogger("nwp500.api_client").setLevel(logging.INFO)
 
+logger = logging.getLogger(__name__)
+
 # If running from examples directory, add parent to path
 if __name__ == "__main__":
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
@@ -39,7 +41,7 @@ from nwp500.mqtt import NavienMqttClient
 
 try:
     from mask import mask_mac  # type: ignore
-except Exception:
+except ImportError:
 
     def mask_mac(mac):  # pragma: no cover - fallback
         return "[REDACTED_MAC]"
@@ -254,9 +256,7 @@ async def main():
                 print("[SUCCESS] Disconnected successfully")
 
             except Exception:
-                import logging
-
-                logging.exception("MQTT error in device_feature_callback")
+                logger.exception("MQTT error in device_feature_callback")
 
                 if mqtt_client.is_connected:
                     await mqtt_client.disconnect()
@@ -276,9 +276,7 @@ async def main():
         return 1
 
     except Exception:
-        import logging
-
-        logging.exception("Unexpected error in device_feature_callback")
+        logger.exception("Unexpected error in device_feature_callback")
         return 1
 
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/device_status_debug.py

@@ -18,6 +18,8 @@ logging.basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
 )
 
+logger = logging.getLogger(__name__)
+
 # If running from examples directory, add parent to path
 if __name__ == "__main__":
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
@@ -31,7 +33,7 @@ from nwp500.mqtt import NavienMqttClient
 
 try:
     from mask import mask_mac  # type: ignore
-except Exception:
+except ImportError:
 
     def mask_mac(mac):  # pragma: no cover - fallback
         return "[REDACTED_MAC]"
@@ -79,7 +81,7 @@ async def main():
 
             try:
                 from mask import mask_any  # type: ignore
-            except Exception:
+            except ImportError:
 
                 def mask_any(_):
                     return "[REDACTED]"
@@ -177,9 +179,7 @@ async def main():
                 print("[SUCCESS] Disconnected successfully")
 
             except Exception:
-                import logging
-
-                logging.exception("MQTT error in device_status_callback_debug")
+                logger.exception("MQTT error in device_status_callback_debug")
 
                 if mqtt_client.is_connected:
                     await mqtt_client.disconnect()
@@ -199,9 +199,7 @@ async def main():
         return 1
 
     except Exception:
-        import logging
-
-        logging.exception("Unexpected error in device_status_callback_debug")
+        logger.exception("Unexpected error in device_status_callback_debug")
         return 1
 
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/energy_analytics.py

@@ -15,7 +15,7 @@ The energy data comes from the EMS (Energy Management System) API.
 import asyncio
 import os
 import sys
-from datetime import datetime
+from datetime import UTC, datetime
 
 from nwp500 import (
     EnergyUsageResponse,
@@ -23,6 +23,7 @@ from nwp500 import (
     NavienAuthClient,
     NavienMqttClient,
 )
+from nwp500.exceptions import Nwp500Error
 
 
 async def main():
@@ -135,7 +136,7 @@ async def main():
         print("[OK] Subscribed to energy usage responses")
 
         # Request energy usage for current month
-        now = datetime.now()
+        now = datetime.now(UTC).astimezone()
         current_year = now.year
         current_month = now.month
 
@@ -160,7 +161,7 @@ if __name__ == "__main__":
         asyncio.run(main())
     except KeyboardInterrupt:
         print("\n\nInterrupted by user")
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"\n\nError: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/firmware_payload_capture.py

@@ -37,6 +37,7 @@ from pathlib import Path
 from typing import Any
 
 from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
+from nwp500.exceptions import Nwp500Error
 from nwp500.models import DeviceFeature
 from nwp500.mqtt.utils import redact, redact_topic
 from nwp500.topic_builder import MqttTopicBuilder
@@ -163,7 +164,7 @@ async def main() -> None:
                 try:
                     await mqtt_client.request_tou_settings(device, serial)
                     await asyncio.sleep(5)
-                except Exception as exc:
+                except Nwp500Error as exc:
                     print(f"  TOU request failed: {exc}")
 
         # --- Step 5: wait a bit more to catch any late-arriving messages ---

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/mqtt_diagnostics.py

@@ -94,8 +94,8 @@ class MqttDiagnosticsExample:
 
             except asyncio.CancelledError:
                 break
-            except Exception as e:
-                _logger.error(f"Error exporting diagnostics: {e}", exc_info=True)
+            except Exception:
+                _logger.exception("Error exporting diagnostics")
 
     async def monitor_connection_state(self, interval: float = 10.0) -> None:
         """
@@ -124,8 +124,8 @@ class MqttDiagnosticsExample:
 
             except asyncio.CancelledError:
                 break
-            except Exception as e:
-                _logger.error(f"Error monitoring state: {e}", exc_info=True)
+            except Exception:
+                _logger.exception("Error monitoring state")
 
     async def on_connection_drop(self, event) -> None:
         """Handle connection drop event."""
@@ -289,8 +289,8 @@ class MqttDiagnosticsExample:
 
                     _logger.info("Example complete")
 
-        except Exception as e:
-            _logger.error(f"Error during example: {e}", exc_info=True)
+        except Exception:
+            _logger.exception("Error during example")
             raise
 
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/power_control.py

@@ -8,7 +8,8 @@ and receive confirmation of the power state change.
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the power control process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/recirculation_control.py

@@ -8,7 +8,8 @@ trigger the hot button, and configure scheduling.
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the recirculation control process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/reconnection_demo.py

@@ -21,6 +21,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
+from nwp500.exceptions import Nwp500Error
 from nwp500.mqtt import MqttConnectionConfig
 
 
@@ -142,7 +143,7 @@ if __name__ == "__main__":
         asyncio.run(main())
     except KeyboardInterrupt:
         print("\n\n[WARNING]  Interrupted by user")
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"\n[ERROR] Error: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/simple_auto_recovery.py

@@ -24,6 +24,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
+from nwp500.exceptions import Nwp500Error
 from nwp500.mqtt import MqttConnectionConfig
 
 # Configure logging
@@ -76,7 +77,7 @@ class ResilientMqttClient:
         if self.mqtt_client and self.mqtt_client.is_connected:
             try:
                 await self.mqtt_client.disconnect()
-            except Exception as e:
+            except Nwp500Error as e:
                 logger.warning(f"Error disconnecting old client: {e}")
 
         # Create new client
@@ -150,7 +151,7 @@ class ResilientMqttClient:
             self.recovery_attempt = 0
             logger.info("[SUCCESS] Recovery successful!")
 
-        except Exception as e:
+        except Nwp500Error as e:
             logger.error(f"Recovery attempt failed: {e}")
             # The next reconnection_failed event will trigger another recovery attempt
         finally:
@@ -252,7 +253,7 @@ if __name__ == "__main__":
         asyncio.run(main())
     except KeyboardInterrupt:
         print("\n\n[WARNING]  Interrupted by user")
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"\n[ERROR] Error: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/token_restoration.py

@@ -57,8 +57,7 @@ async def save_tokens_example():
         token_data = tokens.to_dict()
 
         # Save to file
-        with open(TOKEN_FILE, "w") as f:
-            json.dump(token_data, f, indent=2)
+        await asyncio.to_thread(TOKEN_FILE.write_text, json.dumps(token_data, indent=2))
 
         logger.info(f"[OK] Tokens saved to {TOKEN_FILE}")
         logger.info("You can now use --restore to skip authentication on future runs")
@@ -81,8 +80,7 @@ async def restore_tokens_example():
         )
 
     # Load saved tokens
-    with open(TOKEN_FILE) as f:
-        token_data = json.load(f)
+    token_data = json.loads(await asyncio.to_thread(TOKEN_FILE.read_text))
 
     logger.info(f"Loading tokens from {TOKEN_FILE}...")
 
@@ -116,8 +114,9 @@ async def restore_tokens_example():
         if tokens.issued_at != stored_tokens.issued_at:
             logger.info("Tokens were refreshed, updating stored copy...")
             token_data = tokens.to_dict()
-            with open(TOKEN_FILE, "w") as f:
-                json.dump(token_data, f, indent=2)
+            await asyncio.to_thread(
+                TOKEN_FILE.write_text, json.dumps(token_data, indent=2)
+            )
             logger.info(f"[OK] Updated tokens saved to {TOKEN_FILE}")
 
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/tou_schedule.py

@@ -7,7 +7,7 @@ import sys
 from typing import Any
 
 from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
-from nwp500.encoding import decode_week_bitfield, decode_price, build_tou_period
+from nwp500.encoding import build_tou_period, decode_price, decode_week_bitfield
 
 
 async def _wait_for_controller_serial(mqtt_client: NavienMqttClient, device) -> str:

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/advanced/water_reservation.py

@@ -8,7 +8,8 @@ system for scheduling water heating.
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the water program configuration process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/beginner/01_authentication.py

@@ -26,6 +26,7 @@ from nwp500.auth import NavienAuthClient
 from nwp500.exceptions import (
     AuthenticationError,
     InvalidCredentialsError,
+    Nwp500Error,
 )
 
 
@@ -97,8 +98,8 @@ async def main():
             print(f"Error code: {e.code}")
         return 1
 
-    except Exception as e:
-        print(f"\n[ERROR] Unexpected error: {str(e)}")
+    except Nwp500Error as e:
+        print(f"\n[ERROR] Unexpected error: {e!s}")
         import traceback
 
         traceback.print_exc()

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/beginner/02_list_devices.py

@@ -17,20 +17,23 @@ logging.basicConfig(
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
 )
 
+logger = logging.getLogger(__name__)
+
 # If running from examples directory, add parent to path
 if __name__ == "__main__":
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
+import re
+
 from nwp500 import NavienAPIClient
 from nwp500.auth import NavienAuthClient
 from nwp500.exceptions import (
     APIError,
     AuthenticationError,
+    Nwp500Error,
 )
 
-import re
-
 
 def mask_mac(mac: str) -> str:
     """Redact all MAC addresses in the input string."""
@@ -72,7 +75,7 @@ async def example_basic_usage():
             # Display device information
             try:
                 from mask import mask_mac  # type: ignore
-            except Exception:
+            except ImportError:
                 # fallback helper if import fails when running examples directly
 
                 def mask_mac(mac: str) -> str:  # pragma: no cover - small fallback
@@ -81,7 +84,7 @@ async def example_basic_usage():
 
             try:
                 from mask import mask_any, mask_location  # type: ignore
-            except Exception:
+            except ImportError:
 
                 def mask_any(_):
                     return "[REDACTED]"
@@ -172,7 +175,7 @@ async def example_basic_usage():
 
     except Exception:
         # Avoid printing raw exception details to stdout in examples
-        logging.exception("Unexpected error in api_client_example")
+        logger.exception("Unexpected error in api_client_example")
         return 1
 
 
@@ -199,7 +202,7 @@ async def example_convenience_function():
 
             try:
                 from mask import mask_any, mask_location  # type: ignore
-            except Exception:
+            except ImportError:
 
                 def mask_any(_):
                     return "[REDACTED]"
@@ -218,8 +221,8 @@ async def example_convenience_function():
 
         return 0
 
-    except Exception as e:
-        print(f"[ERROR] Error: {str(e)}")
+    except Nwp500Error as e:
+        print(f"[ERROR] Error: {e!s}")
         return 1
 
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/beginner/04_set_temperature.py

@@ -8,7 +8,8 @@ This demonstrates how to programmatically change the water heater DHW
 
 import asyncio
 import logging
-from nwp500 import NavienAuthClient, NavienAPIClient, NavienMqttClient
+
+from nwp500 import NavienAPIClient, NavienAuthClient, NavienMqttClient
 
 # Set up logging to see the temperature change process
 logging.basicConfig(level=logging.INFO)

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/intermediate/advanced_auth_patterns.py

@@ -16,6 +16,7 @@ from nwp500 import (
     NavienAuthClient,
     NavienMqttClient,
 )
+from nwp500.exceptions import Nwp500Error
 
 
 async def example_basic_pattern():
@@ -109,7 +110,7 @@ async def example_with_mqtt():
             await mqtt_client.disconnect()
             print("✓ MQTT Disconnected")
 
-        except Exception as e:
+        except Nwp500Error as e:
             print(f"✗ MQTT error: {e}")
 
     print("✓ Context exited, session closed")

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/intermediate/command_queue.py

@@ -26,6 +26,7 @@ logging.basicConfig(
 )
 
 from nwp500.auth import NavienAuthClient
+from nwp500.exceptions import Nwp500Error
 from nwp500.mqtt import MqttConnectionConfig, NavienMqttClient
 
 
@@ -197,7 +198,7 @@ async def command_queue_demo():
 
         return True
 
-    except Exception as e:
+    except Nwp500Error as e:
         print(f"\n[ERROR] Error: {e}")
         import traceback
 

{nwp500_python-9.2.0 → nwp500_python-9.2.1}/examples/intermediate/device_status_callback.py

@@ -29,6 +29,8 @@ logging.getLogger("nwp500.mqtt_client").setLevel(logging.DEBUG)
 logging.getLogger("nwp500.auth").setLevel(logging.INFO)
 logging.getLogger("nwp500.api_client").setLevel(logging.INFO)
 
+logger = logging.getLogger(__name__)
+
 # If running from examples directory, add parent to path
 if __name__ == "__main__":
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "src"))
@@ -42,7 +44,7 @@ from nwp500.mqtt import NavienMqttClient
 
 try:
     from mask import mask_mac, mask_mac_in_topic  # type: ignore
-except Exception:
+except ImportError:
 
     def mask_mac(mac):  # pragma: no cover - fallback
         return "[REDACTED_MAC]"
@@ -236,9 +238,7 @@ async def main():
                 print("[SUCCESS] Disconnected successfully")
 
             except Exception:
-                import logging
-
-                logging.exception("MQTT error in device_status_callback")
+                logger.exception("MQTT error in device_status_callback")
 
                 if mqtt_client.is_connected:
                     await mqtt_client.disconnect()
@@ -258,9 +258,7 @@ async def main():
         return 1
 
     except Exception:
-        import logging
-
-        logging.exception("Unexpected error in device_status_callback")
+        logger.exception("Unexpected error in device_status_callback")
         return 1