nwp500-python 9.13.0__tar.gz → 9.13.1__tar.gz

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
     name: Lint and Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -32,10 +32,10 @@ jobs:
     name: Security Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -55,10 +55,10 @@ jobs:
         python-version: ['3.14']
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       
@@ -82,10 +82,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
 
@@ -110,12 +110,12 @@ jobs:
     needs: [lint, test, test-without-cli-extras]
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0  # Required for setuptools_scm
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -131,7 +131,7 @@ jobs:
         run: twine check dist/*
       
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: dist
           path: dist/

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
     name: Pre-release Checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -46,12 +46,12 @@ jobs:
       id-token: write  # Required for trusted publishing
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0  # Required for setuptools_scm
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -75,10 +75,10 @@ jobs:
     needs: build-and-publish
     
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v7
         with:
           python-version: '3.14'
       
@@ -93,7 +93,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
       
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v3
         with:
           body: ${{ steps.changelog.outputs.notes }}
           draft: false

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/CHANGELOG.rst

@@ -2,6 +2,122 @@
 Changelog
 =========
 
+Unreleased
+==========
+
+Version 9.13.1 (2026-11-14)
+===========================
+
+This release makes the MQTT connection steadier, drops the
+``awsiotsdk`` dependency for ``awscrt`` directly, keeps a message whose
+enum code the library does not know, and makes a simulated recovery
+with a TOU window ahead much faster.
+
+Added
+-----
+
+- **Every MQTT payload sent and received can be logged.** Set the
+  ``nwp500.mqtt.payloads`` logger to DEBUG for one line per message:
+  topic, packet id for a send, and the JSON with MAC addresses
+  redacted. See "What did the device get?" in the MQTT diagnostics
+  guide.
+
+Changed
+-------
+
+- **Each command carries its own ``sessionID``**, the send time in
+  milliseconds, in place of one value for the life of the client.
+  Acknowledgements repeat it, so a reply can be matched to its
+  command. App-connection events and the Last-Will keep the client's
+  ``session_id``.
+- **The MQTT keep-alive default is 60 seconds**, down from 1200, so a
+  connection that dies without a disconnect is noticed in about a
+  minute and a half instead of about 20 minutes. Set
+  ``MqttConnectionConfig.keep_alive_secs`` to keep the old value.
+- **The MQTT connection is built with ``awscrt`` directly; the
+  ``awsiotsdk`` dependency is gone.** It was used only to build the
+  signed websocket connection and pinned ``awscrt`` to one release.
+  The library now requires ``awscrt>=0.36.1,<0.39``. The CONNECT
+  packet no longer carries the SDK's name and version in its username.
+
+Fixed
+-----
+
+- **A simulated recovery with a TOU window ahead is no longer slowed
+  by each draw.** A draw during a recovery judged the TOU cap again on
+  a 16-hour walk ahead, so a forecast's small draw every few minutes
+  walked the tank 40 to 50 times the simulated span. The cap is now
+  judged where it can act: as a window opens, at the cap's level, or
+  at the level inside a window. Results are unchanged. A 28-hour day
+  of 10-minute draws with a peak ahead went from 3 to 11 seconds to
+  about half a second, close to the same day without TOU (#409).
+- **The TOU cap's look-ahead stops a running element at its off
+  point.** It walked the tank with what ran at its start, so an
+  element running beside the compressor heated for the whole 16 hours;
+  the cap was judged on an overheated tank, and a long enough walk
+  failed with non-finite layers.
+- **A code the library does not know no longer drops the whole
+  message.** An unlisted ``errorCode``, ``operationMode``,
+  ``currentHeatUse`` or any other enum field in a status or feature
+  message failed validation, and the message was discarded, so status
+  updates stopped when the heater reported a new fault. An unknown code
+  now becomes a pseudo-member named ``UNKNOWN_<code>``: it compares
+  equal to the code, ``.name`` and ``.value`` work as for any member,
+  and it survives pickling and copying. The device list's
+  ``connected`` and the feature's ``volumeCode`` do the same, through
+  ``converters.enum_validator``.
+- **An unknown ``dhwTemperatureSettingUse`` code does not permit
+  temperature writes.** Only the three known enabled control types
+  pass the ``dhw_temperature_setting_use`` capability check.
+- **A status or feature message is parsed and announced once.** With
+  two callbacks subscribed for one device, each message was validated
+  twice and ``status_received`` (or ``feature_received``) was emitted
+  twice. Callbacks for the same device now share one parsed object,
+  and the event and state tracking run once per message.
+- **The CLI unsubscribes the callbacks it registers to wait for a
+  reply**, so ``monitor`` and other long-running commands no longer
+  get each later message again for every earlier request. Over
+  Bluetooth the adapter gains the matching
+  ``unsubscribe_device_status`` and ``unsubscribe_device_feature``.
+- **An unacknowledged unsubscribe no longer leaves the topic marked
+  subscribed.** When the last callback for a topic was removed and the
+  broker's acknowledgement never came, the next subscribe to that topic
+  skipped SUBSCRIBE and got no messages if the broker had dropped it.
+  SUBSCRIBE and UNSUBSCRIBE for a topic now run one at a time and the
+  topic is unmarked before UNSUBSCRIBE is sent, so the next subscribe
+  sends SUBSCRIBE, a subscribe made meanwhile keeps its callback, and a
+  late SUBACK cannot mark a topic that was unsubscribed.
+- **Unsubscribing while disconnected removes the callback.** The
+  ``unsubscribe_*`` methods returned without doing anything while the
+  connection was down, so the callback came back with the next
+  resubscribe. The callback is now removed locally and nothing is sent
+  to the broker.
+- **A failed or cancelled resubscribe no longer loses subscriptions.**
+  After a reconnect without a session, a ``TimeoutError`` or a rejected
+  SUBACK stopped the resubscribe, and every topic not yet restored was
+  dropped for good. Topics that fail are tried twice more before the
+  queued commands are sent, and any still not restored stay registered
+  for the next reconnect. An unsubscribe made while they wait, or while
+  a SUBACK is pending, is kept. A rejected SUBACK in ``subscribe()``
+  removes the handler it added, but not a callback that was already
+  registered. ``resubscribe_all()`` returns whether every subscription
+  was restored.
+- **Reconnects sign with the current AWS credentials.** The connection
+  read the credentials once, so the SDK's own reconnect kept signing
+  with expired ones after a token refresh. It now reads the current
+  ones on each attempt.
+- **A late interruption or resumption from a replaced or closed
+  connection is ignored**, instead of changing the connected state.
+- **Topic logs in the MQTT connection redact the MAC address**, and a
+  failed subscribe logs the error type rather than its text, which
+  carries the topic.
+- **A periodic request task that stops on an unexpected error logs
+  it**, instead of ending silently while still listed as running.
+- **``time_to_ready(..., inlet_measured=True)`` no longer says
+  ``inlet_temp_modelled`` when the scenario has draws.** The mode walks
+  now get the flag, so the heat pump's walk's reasons no longer bring
+  the reason back into the answer.
+
 Version 9.13.0 (2026-11-06)
 ===========================
 

{nwp500_python-9.13.0/src/nwp500_python.egg-info → nwp500_python-9.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nwp500-python
-Version: 9.13.0
+Version: 9.13.1
 Summary: A library for controlling Navien NWP500 Water Heaters via NaviLink
 Author-email: Emmanuel Levijarvi <emansl@gmail.com>
 License-Expression: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.14
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
 Requires-Dist: aiohttp>=3.13.5
-Requires-Dist: awsiotsdk>=1.29.0
+Requires-Dist: awscrt<0.39,>=0.36.1
 Requires-Dist: pydantic>=2.0.0
 Provides-Extra: cli
 Requires-Dist: click>=8.3.0; extra == "cli"

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/docs/how-to/diagnose-mqtt.rst

@@ -33,7 +33,7 @@ Quick Start
    diagnostics = MqttDiagnosticsCollector(enable_verbose_logging=True)
 
    # Connect with hardened config
-   config = MqttConnectionConfig(keep_alive_secs=60)  # Reduced from 1200
+   config = MqttConnectionConfig(keep_alive_secs=60)
    mqtt_client = NavienMqttClient(auth_client, config=config)
 
    # Hook events
@@ -164,8 +164,8 @@ Start with these hardened settings:
    from nwp500.mqtt_utils import MqttConnectionConfig
 
    config = MqttConnectionConfig(
-       # 1. Reduce keep-alive (prevents NAT idle timeout)
-       keep_alive_secs=60,              # Reduced from 1200
+       # 1. Keep-alive below NAT idle timeouts (the default)
+       keep_alive_secs=60,
        
        # 2. Faster reconnection for transient failures
        initial_reconnect_delay=0.5,     # 500ms (was 1s)
@@ -187,10 +187,10 @@ Start with these hardened settings:
 Why These Settings Matter
 --------------------------
 
-**Keep-Alive (1200s → 60s)**
-   Most NAT devices timeout idle connections after 300-600 seconds. Default
-   1200s keep-alive allows NAT to timeout before keep-alive packets arrive,
-   causing connection to die. At 60s, packets arrive before the timeout.
+**Keep-Alive (60s, the default)**
+   Most NAT devices time out idle connections after 300-600 seconds. A 60s
+   keep-alive sends a ping well before that, and a dead connection is noticed
+   within about a minute and a half.
 
 **Faster Reconnection (1s → 0.5s)**
    Transient network glitches often recover in <1 second. Faster initial retry
@@ -489,8 +489,9 @@ and emits as the ``control_failed`` event for every device subscription
 ``failCode`` is 2, "DHW control interval exceeded": the previous DHW control (mode, temperature, power) was sent
 too recently, so wait and resend. The message names the client whose
 command failed, so ``event.own_command`` tells your rejections from
-another client's. A command that is neither acknowledged nor rejected was
-most likely never delivered: check the connection drop log above.
+another client's. The acknowledgement is not sent for every command:
+some commands apply with no reply, so read the device status to see
+whether a command took effect.
 
 .. code-block:: python
 
@@ -502,6 +503,38 @@ most likely never delivered: check the connection drop log above.
 
    mqtt.on(MqttClientEvents.CONTROL_FAILED, on_control_failed)
 
+What did the device get?
+------------------------
+
+Set the ``nwp500.mqtt.payloads`` logger to DEBUG to log every payload
+the client sends and receives, one line each:
+
+.. code-block:: text
+
+   send #1910 cmd/52/navilink-REDACTED/ctrl {"clientID":"navien-client-1996271a","sessionID":"1763116258162",...}
+   recv cmd/52/navilink-REDACTED/navien-client-1996271a/res {"clientID":"navilink-REDACTED","sessionID":"1763116258162",...}
+
+A sent line carries the MQTT packet id after ``#``. MAC addresses are
+replaced with ``REDACTED``; ``clientID`` and ``sessionID`` are kept.
+Every command carries its own ``sessionID``, and a reply carries the
+``sessionID`` of the command it answers, so search the log for a
+command's ``sessionID`` to find its reply, or see that none came.
+``clientID`` names the client a message came from.
+
+.. code-block:: python
+
+   import logging
+
+   logging.getLogger("nwp500.mqtt.payloads").setLevel(logging.DEBUG)
+
+In Home Assistant:
+
+.. code-block:: yaml
+
+   logger:
+     logs:
+       nwp500.mqtt.payloads: debug
+
 Integration Examples
 ====================
 

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/docs/reference/configuration.rst

@@ -158,7 +158,7 @@ Basic Example
    config = MqttConnectionConfig(
        # Connection settings
        client_id="my-custom-client",
-       keep_alive_secs=1200,
+       keep_alive_secs=60,
        
        # Enable features (see guides for details)
        auto_reconnect=True,

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/docs/reference/installation.rst

@@ -55,7 +55,7 @@ Core Dependencies
 The library requires:
 
 * ``aiohttp>=3.13.5``: Async HTTP client for REST API
-* ``awsiotsdk>=1.29.0``: AWS IoT SDK for MQTT
+* ``awscrt>=0.36.1,<0.39``: AWS Common Runtime, for the MQTT connection
 * ``pydantic>=2.0.0``: Data validation and models
 
 Optional Dependencies
@@ -134,11 +134,11 @@ If you get SSL certificate errors:
 AWS IoT Connection Issues
 --------------------------
 
-The MQTT client requires the AWS IoT SDK:
+The MQTT client requires the AWS Common Runtime:
 
 .. code-block:: bash
 
-   pip install awsiotsdk>=1.29.0
+   pip install "awscrt>=0.36.1,<0.39"
 
 Upgrading
 =========

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/docs/reference/protocol/mqtt_protocol.rst

@@ -147,7 +147,7 @@ All MQTT messages are JSON with this structure:
 
    {
      "clientID": "navien-client-1996271a",
-     "sessionID": "session-67890",
+     "sessionID": "1763116258162",
      "requestTopic": "cmd/52/navilink-04786332fca0/ctrl",
      "responseTopic": "cmd/52/navilink-04786332fca0/navien-client-1996271a/res",
      "protocolVersion": 2,
@@ -165,7 +165,8 @@ All MQTT messages are JSON with this structure:
 **Fields:**
 
 * ``clientID``: MQTT client identifier
-* ``sessionID``: Session identifier for tracking
+* ``sessionID``: The send time in milliseconds, a new value per command.
+  The acknowledgement repeats it.
 * ``requestTopic``: Topic the request is published to
 * ``responseTopic``: Topic the reply should be published to
 * ``protocolVersion``: Protocol version (always 2)
@@ -931,7 +932,7 @@ Control commands and ``st`` are acknowledged on
 
    {
      "clientID": "navilink-04786332fca0",
-     "sessionID": "session-67890",
+     "sessionID": "1763116258162",
      "requestTopic": "...",
      "responseTopic": "...",
      "response": {

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "aiohttp>=3.13.5",
-    "awsiotsdk>=1.29.0",
+    "awscrt>=0.36.1,<0.39",
     "pydantic>=2.0.0",
 ]
 
@@ -231,10 +231,6 @@ cache_dir = ".mypy_cache"
 module = "awscrt.*"
 ignore_missing_imports = true
 
-[[tool.mypy.overrides]]
-module = "awsiot.*"
-ignore_missing_imports = true
-
 [[tool.mypy.overrides]]
 module = "aiohttp.*"
 ignore_missing_imports = true

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/setup.cfg

@@ -3,9 +3,16 @@ addopts =
 	--cov nwp500 --cov-report term-missing
 	--verbose
 norecursedirs = 
-	dist
+	.*
+	*.egg
+	_darcs
 	build
-	.tox
+	CVS
+	dist
+	node_modules
+	venv
+	{arch}
+asyncio_default_fixture_loop_scope = function
 testpaths = tests
 
 [devpi:upload]
@@ -44,7 +51,6 @@ forbidden_modules =
 	nwp500.sim_home_assistant
 	aiohttp
 	awscrt
-	awsiot
 	logging
 
 [importlinter:contract:calibrate-no-cli]

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/src/nwp500/__init__.py

@@ -25,7 +25,7 @@ finally:
 
 # The exports load on first use (PEP 562), so a part of the library
 # imports without the others' dependencies: ``nwp500.sim`` needs neither
-# aiohttp nor awsiotsdk, which the clients load.
+# aiohttp nor awscrt, which the clients load.
 if TYPE_CHECKING:
     from nwp500.api_client import (
         NavienAPIClient,

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/src/nwp500/ble/mqtt_adapter.py

@@ -11,6 +11,7 @@ adapter maps.
 
 from __future__ import annotations
 
+import contextlib
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any
@@ -155,6 +156,12 @@ class BleMqttAdapter:
         self._feature_callbacks.append(callback)
         return 0
 
+    async def unsubscribe_device_feature(
+        self, device: Any, callback: FeatureCallback
+    ) -> None:
+        with contextlib.suppress(ValueError):
+            self._feature_callbacks.remove(callback)
+
     async def request_device_info(self, device: Any) -> int:
         """Read the blocks and deliver a :class:`BleDeviceFeature`.
 
@@ -180,6 +187,12 @@ class BleMqttAdapter:
         self._status_callbacks.append(callback)
         return 0
 
+    async def unsubscribe_device_status(
+        self, device: Any, callback: StatusCallback
+    ) -> None:
+        with contextlib.suppress(ValueError):
+            self._status_callbacks.remove(callback)
+
     async def request_device_status(self, device: Any) -> int:
         """Deliver the next :class:`~nwp500.ble.RealTimeStatus` block.
 

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/src/nwp500/cli/__main__.py

@@ -59,9 +59,9 @@ async def _detect_unit_system(
         if not future.done():
             future.set_result(status)
 
-    await mqtt.subscribe_device_status(device, _on_status)
-    await mqtt.request_device_status(device)
     try:
+        await mqtt.subscribe_device_status(device, _on_status)
+        await mqtt.request_device_status(device)
         status = await asyncio.wait_for(future, timeout=5.0)
         if status.temperature_type == TemperatureType.CELSIUS:
             _logger.info("Auto-detected metric unit system from device")
@@ -73,6 +73,10 @@ async def _detect_unit_system(
             "Timed out detecting unit system, defaulting to us_customary"
         )
         return "us_customary"
+    finally:
+        await handlers.unsubscribe_quietly(
+            mqtt.unsubscribe_device_status, device, _on_status
+        )
 
 
 def _parse_filter_hours(

{nwp500_python-9.13.0 → nwp500_python-9.13.1}/src/nwp500/cli/handlers.py

@@ -59,6 +59,9 @@ async def _wait_for_response(
     subscribe_func: Callable[
         [Device, Callable[[Any], None]], Coroutine[Any, Any, Any]
     ],
+    unsubscribe_func: Callable[
+        [Device, Callable[[Any], None]], Coroutine[Any, Any, Any]
+    ],
     device: Device,
     action_func: Callable[[], Coroutine[Any, Any, Any]],
     timeout: float = 10.0,
@@ -71,15 +74,40 @@ async def _wait_for_response(
         if not future.done():
             future.set_result(res)
 
-    await subscribe_func(device, callback)
-    _logger.info(f"Requesting {action_name}...")
-    await action_func()
+    try:
+        # Inside the try: a subscribe cancelled while its acknowledgement
+        # is pending has already registered the callback.
+        await subscribe_func(device, callback)
+        _logger.info(f"Requesting {action_name}...")
+        await action_func()
+        try:
+            return await asyncio.wait_for(future, timeout=timeout)
+        except TimeoutError:
+            _logger.error(f"Timed out waiting for {action_name} response.")
+            raise
+    finally:
+        await unsubscribe_quietly(unsubscribe_func, device, callback)
+
+
+async def unsubscribe_quietly(
+    unsubscribe_func: Callable[
+        [Device, Callable[[Any], None]], Coroutine[Any, Any, Any]
+    ],
+    device: Device,
+    callback: Callable[[Any], None],
+) -> None:
+    """Remove a reply callback without replacing the caller's outcome.
 
+    The callback is removed locally before the broker is asked; a failed
+    or unacknowledged broker unsubscribe is logged, so it can neither
+    hide a reply already received nor replace the request's own error.
+    """
     try:
-        return await asyncio.wait_for(future, timeout=timeout)
-    except TimeoutError:
-        _logger.error(f"Timed out waiting for {action_name} response.")
-        raise
+        await unsubscribe_func(device, callback)
+    except Exception as e:
+        _logger.warning(
+            "Failed to unsubscribe a reply callback: %s", type(e).__name__
+        )
 
 
 async def _handle_command_with_status_feedback(
@@ -94,6 +122,7 @@ async def _handle_command_with_status_feedback(
     try:
         status: Any = await _wait_for_response(
             mqtt.subscribe_device_status,
+            mqtt.unsubscribe_device_status,
             device,
             action_func,
             action_name=action_name,
@@ -124,6 +153,7 @@ async def get_controller_serial_number(
     try:
         feature: Any = await _wait_for_response(
             mqtt.subscribe_device_feature,
+            mqtt.unsubscribe_device_feature,
             device,
             lambda: mqtt.request_device_info(device),
             timeout=timeout,
@@ -155,6 +185,9 @@ async def _handle_info_request(
     subscribe_method: Callable[
         [Device, Callable[[Any], None]], Coroutine[Any, Any, Any]
     ],
+    unsubscribe_method: Callable[
+        [Device, Callable[[Any], None]], Coroutine[Any, Any, Any]
+    ],
     request_method: Callable[[Device], Coroutine[Any, Any, Any]],
     data_key: str,
     action_name: str,
@@ -166,6 +199,7 @@ async def _handle_info_request(
         if not raw:
             res = await _wait_for_response(
                 subscribe_method,
+                unsubscribe_method,
                 device,
                 lambda: request_method(device),
                 action_name=action_name,
@@ -199,6 +233,7 @@ async def handle_status_request(
         mqtt,
         device,
         mqtt.subscribe_device_status,
+        mqtt.unsubscribe_device_status,
         mqtt.request_device_status,
         "status",
         "device status",
@@ -215,6 +250,7 @@ async def handle_device_info_request(
         mqtt,
         device,
         mqtt.subscribe_device_feature,
+        mqtt.unsubscribe_device_feature,
         mqtt.request_device_info,
         "feature",
         "device information",
@@ -888,6 +924,7 @@ async def handle_get_energy_request(
     try:
         res: Any = await _wait_for_response(
             mqtt.subscribe_energy_usage,
+            mqtt.unsubscribe_energy_usage,
             device,
             lambda: mqtt.request_energy_usage(device, year, months),
             action_name="energy usage",
@@ -913,6 +950,7 @@ async def handle_get_energy_monthly_request(
     try:
         res: Any = await _wait_for_response(
             mqtt.subscribe_energy_usage_monthly,
+            mqtt.unsubscribe_energy_usage_monthly,
             device,
             lambda: mqtt.request_energy_usage_monthly(device, years),
             action_name="monthly energy usage",
@@ -937,6 +975,7 @@ async def handle_diagnostics_request(
     try:
         diagnostics: Any = await _wait_for_response(
             mqtt.subscribe_diagnostics,
+            mqtt.unsubscribe_diagnostics,
             device,
             lambda: mqtt.request_diagnostics(device),
             action_name="diagnostics",
@@ -962,6 +1001,7 @@ async def handle_firmware_download_info_request(
     try:
         info: Any = await _wait_for_response(
             mqtt.subscribe_firmware_download_info,
+            mqtt.unsubscribe_firmware_download_info,
             device,
             lambda: mqtt.request_firmware_download_info(device),
             action_name="firmware download info",
@@ -986,6 +1026,7 @@ async def handle_get_recirculation_schedule_request(
     try:
         schedule: Any = await _wait_for_response(
             mqtt.subscribe_recirculation_schedule_response,
+            mqtt.unsubscribe_recirculation_schedule_response,
             device,
             lambda: mqtt.request_recirculation_schedule(device),
             action_name="recirculation schedule",