plugwise 0.37.8__tar.gz → 0.38.0__tar.gz

{plugwise-0.37.8 → plugwise-0.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.37.8
+Version: 0.38.0
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -54,12 +54,13 @@ This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devic
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
-[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
+[![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
+[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
+[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
 [![Latest release](https://github.com/plugwise/python-plugwise/workflows/Latest%20release/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![Newest commit](https://github.com/plugwise/python-plugwise/workflows/Latest%20commit/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/plugwise/python-plugwise/main.svg)](https://results.pre-commit.ci/latest/github/plugwise/python-plugwise/main)
-[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
 [![CodeFactor](https://www.codefactor.io/repository/github/plugwise/python-plugwise/badge)](https://www.codefactor.io/repository/github/plugwise/python-plugwise)
 [![codecov](https://codecov.io/gh/plugwise/python-plugwise/branch/main/graph/badge.svg)](https://codecov.io/gh/plugwise/python-plugwise)
@@ -94,9 +95,9 @@ See the [`plugwise-beta`](https://github.com/plugwise/plugwise-beta) repository
 
 ## Development/patches
 
-Like Home Assistant Core we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
+Like Home Assistant Core, we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
 
-If you want to create a PR please make sure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
+If you want to create a PR, please ensure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
 
 ## Project support status
 
@@ -125,13 +126,13 @@ Module providing interfacing with the Plugwise devices:
 
 ## License, origins and contributors
 
-As per the origins we have retained the appropriate licensing and including the MIT-license for this project.
+As per the origins, we have retained the appropriate licensing and including the MIT-license for this project.
 
 Origins (from newest to oldest):
 
 - Networked (Smile/Stretch) Plugwise support by @bouwew (Bouwe) and @CoMPaTech (Tom). We both support and help out @brefra (Frank) where possible, he's supporting the USB module and integration.
 - 'All' available Plugwise support by @bouwew (Bouwe), @brefra (Frank) and @CoMPaTech (Tom)
-- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta` by @bouwew (Bouwe) & @CoMPaTech (Tom)
+- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta' by @bouwew (Bouwe) & @CoMPaTech (Tom)
 - Networked Plugwise Anna module with custom_module - `haanna/anna-ha` via <https://github.com/laetificat> (Kevin)
 - USB-based stick module with custom_module - `plugwise-stick/plugwise` by @brefra (Frank)
 - USB-plugwise module - `plugwise` by <https://github.com/cyberjunky/python-plugwise> (Ron) originally by <https://github.com/aequitas/python-plugwise> (Johan) (with reference only in license to Sven)
@@ -139,4 +140,4 @@ Origins (from newest to oldest):
 
 ## Thanks
 
-On behalf all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.
+On behalf of all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.

{plugwise-0.37.8 → plugwise-0.38.0}/README.md

@@ -7,12 +7,13 @@ This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devic
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
-[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
+[![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
+[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
+[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
 [![Latest release](https://github.com/plugwise/python-plugwise/workflows/Latest%20release/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![Newest commit](https://github.com/plugwise/python-plugwise/workflows/Latest%20commit/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/plugwise/python-plugwise/main.svg)](https://results.pre-commit.ci/latest/github/plugwise/python-plugwise/main)
-[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
 [![CodeFactor](https://www.codefactor.io/repository/github/plugwise/python-plugwise/badge)](https://www.codefactor.io/repository/github/plugwise/python-plugwise)
 [![codecov](https://codecov.io/gh/plugwise/python-plugwise/branch/main/graph/badge.svg)](https://codecov.io/gh/plugwise/python-plugwise)
@@ -47,9 +48,9 @@ See the [`plugwise-beta`](https://github.com/plugwise/plugwise-beta) repository
 
 ## Development/patches
 
-Like Home Assistant Core we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
+Like Home Assistant Core, we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
 
-If you want to create a PR please make sure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
+If you want to create a PR, please ensure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
 
 ## Project support status
 
@@ -78,13 +79,13 @@ Module providing interfacing with the Plugwise devices:
 
 ## License, origins and contributors
 
-As per the origins we have retained the appropriate licensing and including the MIT-license for this project.
+As per the origins, we have retained the appropriate licensing and including the MIT-license for this project.
 
 Origins (from newest to oldest):
 
 - Networked (Smile/Stretch) Plugwise support by @bouwew (Bouwe) and @CoMPaTech (Tom). We both support and help out @brefra (Frank) where possible, he's supporting the USB module and integration.
 - 'All' available Plugwise support by @bouwew (Bouwe), @brefra (Frank) and @CoMPaTech (Tom)
-- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta` by @bouwew (Bouwe) & @CoMPaTech (Tom)
+- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta' by @bouwew (Bouwe) & @CoMPaTech (Tom)
 - Networked Plugwise Anna module with custom_module - `haanna/anna-ha` via <https://github.com/laetificat> (Kevin)
 - USB-based stick module with custom_module - `plugwise-stick/plugwise` by @brefra (Frank)
 - USB-plugwise module - `plugwise` by <https://github.com/cyberjunky/python-plugwise> (Ron) originally by <https://github.com/aequitas/python-plugwise> (Johan) (with reference only in license to Sven)
@@ -92,4 +93,4 @@ Origins (from newest to oldest):
 
 ## Thanks
 
-On behalf all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.
+On behalf of all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/__init__.py

@@ -18,7 +18,14 @@ from plugwise.constants import (
     PlugwiseData,
     ThermoLoc,
 )
-from plugwise.exceptions import InvalidSetupError, ResponseError, UnsupportedDeviceError
+from plugwise.exceptions import (
+    ConnectionFailedError,
+    DataMissingError,
+    InvalidSetupError,
+    PlugwiseError,
+    ResponseError,
+    UnsupportedDeviceError,
+)
 from plugwise.helper import SmileComm
 from plugwise.legacy.smile import SmileLegacyAPI
 from plugwise.smile import SmileAPI
@@ -141,30 +148,28 @@ class Smile(SmileComm):
             self._user,
             self._port,
             self._timeout,
-         )
-        if self.smile_legacy:
-            self._smile_api = SmileLegacyAPI(
-                self._host,
-                self._passwd,
-                self._websession,
-                self._is_thermostat,
-                self._on_off_device,
-                self._opentherm_device,
-                self._stretch_v2,
-                self._target_smile,
-                self.loc_data,
-                self.smile_fw_version,
-                self.smile_hostname,
-                self.smile_hw_version,
-                self.smile_mac_address,
-                self.smile_model,
-                self.smile_name,
-                self.smile_type,
-                self.smile_zigbee_mac_address,
-                self._user,
-                self._port,
-                self._timeout,
-            )
+         ) if not self.smile_legacy else SmileLegacyAPI(
+            self._host,
+            self._passwd,
+            self._websession,
+            self._is_thermostat,
+            self._on_off_device,
+            self._opentherm_device,
+            self._stretch_v2,
+            self._target_smile,
+            self.loc_data,
+            self.smile_fw_version,
+            self.smile_hostname,
+            self.smile_hw_version,
+            self.smile_mac_address,
+            self.smile_model,
+            self.smile_name,
+            self.smile_type,
+            self.smile_zigbee_mac_address,
+            self._user,
+            self._port,
+            self._timeout,
+        )
 
         # Update all endpoints on first connect
         await self._smile_api.full_update_device()
@@ -289,17 +294,22 @@ class Smile(SmileComm):
         return return_model
 
     async def full_update_device(self) -> None:
-        """Perform a first fetch of all XML data, needed for initialization."""
+        """Helper-function used for testing."""
         await self._smile_api.full_update_device()
 
     def get_all_devices(self) -> None:
-        """Determine the devices present from the obtained XML-data."""
+        """Helper-function used for testing."""
         self._smile_api.get_all_devices()
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
-        data: PlugwiseData = await self._smile_api.async_update()
-        self.gateway_id = data.gateway["gateway_id"]
+        data = PlugwiseData({}, {})
+        try:
+            data = await self._smile_api.async_update()
+            self.gateway_id = data.gateway["gateway_id"]
+        except (DataMissingError, KeyError) as err:
+            raise PlugwiseError("No Plugwise data received") from err
+
         return data
 
 ########################################################################################################
@@ -311,19 +321,19 @@ class Smile(SmileComm):
         key: str,
         loc_id: str,
         option: str,
-        name: str | None = None,
+        state: str | None = None,
     ) -> None:
         """Set the selected option for the applicable Select."""
-        await self._smile_api.set_select(key, loc_id, option, name)
+        await self._smile_api.set_select(key, loc_id, option, state)
 
     async def set_schedule_state(
         self,
         loc_id: str,
-        new_state: str,
+        state: str | None,
         name: str | None = None,
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat."""
-        await self._smile_api.set_schedule_state(loc_id, new_state, name)
+        await self._smile_api.set_schedule_state(loc_id, state, name)
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat."""
@@ -366,4 +376,14 @@ class Smile(SmileComm):
 
     async def delete_notification(self) -> None:
         """Delete the active Plugwise Notification."""
-        await self._smile_api.delete_notification()
+        try:
+            await self._smile_api.delete_notification()
+        except ConnectionFailedError as exc:
+            raise PlugwiseError(f"Failed to delete notification: {str(exc)}") from exc
+
+    async def reboot_gateway(self) -> None:
+        """Reboot the Plugwise Gateway."""
+        try:
+            await self._smile_api.reboot_gateway()
+        except ConnectionFailedError as exc:
+            raise PlugwiseError(f"Failed to reboot gateway: {str(exc)}") from exc

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/constants.py

@@ -17,6 +17,7 @@ DEGREE: Final = "°"
 ELECTRIC_POTENTIAL_VOLT: Final = "V"
 ENERGY_KILO_WATT_HOUR: Final = "kWh"
 ENERGY_WATT_HOUR: Final = "Wh"
+GATEWAY_REBOOT: Final = "/core/gateways;@reboot"
 PERCENTAGE: Final = "%"
 POWER_WATT: Final = "W"
 PRESET_AWAY: Final = "away"
@@ -388,6 +389,7 @@ class GatewayData(TypedDict, total=False):
     heater_id: str
     item_count: int
     notifications: dict[str, dict[str, str]]
+    reboot: bool
     smile_name: str
 
 

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/data.py

@@ -38,6 +38,7 @@ class SmileData(SmileHelper):
                 "gateway_id": self.gateway_id,
                 "item_count": self._count,
                 "notifications": self._notifications,
+                "reboot": True,
                 "smile_name": self.smile_name,
             }
         )

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/exceptions.py

@@ -9,6 +9,10 @@ class ConnectionFailedError(PlugwiseException):
     """Raised when unable to connect."""
 
 
+class DataMissingError(PlugwiseException):
+    """Raised when expected data is missing."""
+
+
 class InvalidAuthentication(PlugwiseException):
     """Raised when unable to authenticate."""
 
@@ -29,14 +33,6 @@ class DeviceSetupError(PlugwiseException):
     """Raised when device is missing critical setup data."""
 
 
-class DeviceTimeoutError(PlugwiseException):
-    """Raised when device is not supported."""
-
-
-class ErrorSendingCommandError(PlugwiseException):
-    """Raised when device is not accepting the command."""
-
-
 class ResponseError(PlugwiseException):
     """Raised when empty or error in response returned."""
 

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/helper.py

@@ -123,6 +123,14 @@ class SmileComm:
                 resp = await self._websession.get(
                     url, headers=use_headers, auth=self._auth
                 )
+            if method == "post":
+                use_headers = {"Content-type": "text/xml"}
+                resp = await self._websession.post(
+                    url,
+                    headers=use_headers,
+                    data=data,
+                    auth=self._auth,
+                )
             if method == "put":
                 use_headers = {"Content-type": "text/xml"}
                 resp = await self._websession.put(
@@ -144,6 +152,17 @@ class SmileComm:
                 raise ConnectionFailedError from exc
             return await self._request(command, retry - 1)
 
+        if resp.status == 504:
+            if retry < 1:
+                LOGGER.warning(
+                    "Failed sending %s %s to Plugwise Smile, error: %s",
+                    method,
+                    command,
+                    "504 Gateway Timeout",
+                )
+                raise ConnectionFailedError
+            return await self._request(command, retry - 1)
+
         return await self._request_validate(resp, method)
 
     async def _request_validate(self, resp: ClientResponse, method: str) -> etree:
@@ -152,8 +171,8 @@ class SmileComm:
         if resp.status == 202:
             return
 
-        # Cornercase for stretch not responding with 202
-        if method == "put" and resp.status == 200:
+        # Cornercase for server not responding with 202
+        if method in ("post", "put") and resp.status == 200:
             return
 
         if resp.status == 401:
@@ -161,7 +180,14 @@ class SmileComm:
             LOGGER.error("%s", msg)
             raise InvalidAuthentication
 
-        if not (result := await resp.text()) or "<error>" in result:
+        if resp.status == 405:
+            msg = "405 Method not allowed."
+            LOGGER.error("%s", msg)
+            raise ConnectionFailedError
+
+        if not (result := await resp.text()) or (
+            "<error>" in result and "Not started" not in result
+        ):
             LOGGER.warning("Smile response empty or error in %s", result)
             raise ResponseError
 

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/legacy/smile.py

@@ -149,6 +149,9 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
     async def delete_notification(self) -> None:
         """Set-function placeholder for legacy devices."""
 
+    async def reboot_gateway(self) -> None:
+        """Set-function placeholder for legacy devices."""
+
     async def set_dhw_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
@@ -182,13 +185,12 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
     async def set_regulation_mode(self, mode: str) -> None:
         """Set-function placeholder for legacy devices."""
 
-    async def set_select(self, key: str, loc_id: str, option: str, name: str | None) -> None:
+    async def set_select(self, key: str, loc_id: str, option: str, state: str | None) -> None:
         """Set the thermostat schedule option."""
-        # schedule state corresponds to select option
-        # schedule name corresponds to select name
-        await self.set_schedule_state("dummy", option, name)
+        # schedule name corresponds to select option
+        await self.set_schedule_state("dummy", state, option)
 
-    async def set_schedule_state(self, _: str, state: str, name: str | None) -> None:
+    async def set_schedule_state(self, _: str, state: str | None, name: str | None) -> None:
         """Activate/deactivate the Schedule.
 
         Determined from - DOMAIN_OBJECTS.

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise/smile.py

@@ -5,6 +5,7 @@ Plugwise backend module for Home Assistant Core.
 from __future__ import annotations
 
 import datetime as dt
+from typing import Any
 
 from plugwise.constants import (
     ADAM,
@@ -14,6 +15,7 @@ from plugwise.constants import (
     DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
+    GATEWAY_REBOOT,
     LOCATIONS,
     MAX_SETPOINT,
     MIN_SETPOINT,
@@ -26,7 +28,7 @@ from plugwise.constants import (
     ThermoLoc,
 )
 from plugwise.data import SmileData
-from plugwise.exceptions import PlugwiseError
+from plugwise.exceptions import ConnectionFailedError, DataMissingError, PlugwiseError
 from plugwise.helper import SmileComm
 
 import aiohttp
@@ -131,13 +133,15 @@ class SmileAPI(SmileComm, SmileData):
         # Perform a full update at day-change
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
-        await self.full_update_device()
-        self.get_all_devices()
-
-        if "heater_id" in self.gw_data:
-            self._heater_id = self.gw_data["heater_id"]
-            if "cooling_enabled" in self.gw_devices[self._heater_id]["binary_sensors"]:
-                self._cooling_enabled = self.gw_devices[self._heater_id]["binary_sensors"]["cooling_enabled"]
+        try:
+            await self.full_update_device()
+            self.get_all_devices()
+            if "heater_id" in self.gw_data:
+                self._heater_id = self.gw_data["heater_id"]
+                if "cooling_enabled" in self.gw_devices[self._heater_id]["binary_sensors"]:
+                    self._cooling_enabled = self.gw_devices[self._heater_id]["binary_sensors"]["cooling_enabled"]
+        except KeyError as err:
+            raise DataMissingError("No Plugwise data received") from err
 
         return PlugwiseData(self.gw_data, self.gw_devices)
 
@@ -145,9 +149,21 @@ class SmileAPI(SmileComm, SmileData):
 ###  API Set and HA Service-related Functions                                                        ###
 ########################################################################################################
 
+    async def call_request(self, uri: str, **kwargs: Any) -> None:
+        """ConnectionFailedError wrapper for calling _request()."""
+        method: str = kwargs["method"]
+        try:
+            await self._request(uri, method=method)
+        except ConnectionFailedError as exc:
+            raise ConnectionFailedError from exc
+
     async def delete_notification(self) -> None:
         """Delete the active Plugwise Notification."""
-        await self._request(NOTIFICATIONS, method="delete")
+        await self.call_request(NOTIFICATIONS, method="delete")
+
+    async def reboot_gateway(self) -> None:
+        """Reboot the Gateway."""
+        await self.call_request(GATEWAY_REBOOT, method="post")
 
     async def set_number(
         self,
@@ -208,7 +224,7 @@ class SmileAPI(SmileComm, SmileData):
 
         await self._request(uri, method="put", data=data)
 
-    async def set_select(self, key: str, loc_id: str, option: str, name: str | None) -> None:
+    async def set_select(self, key: str, loc_id: str, option: str, state: str | None) -> None:
         """Set a dhw/gateway/regulation mode or the thermostat schedule option."""
         match key:
             case "select_dhw_mode":
@@ -218,9 +234,8 @@ class SmileAPI(SmileComm, SmileData):
             case "select_regulation_mode":
                 await self.set_regulation_mode(option)
             case "select_schedule":
-                # schedule state corresponds to select option
-                # schedule name corresponds to select name
-                await self.set_schedule_state(loc_id, option, name)
+                # schedule name corresponds to select option
+                await self.set_schedule_state(loc_id, state, option)
 
     async def set_dhw_mode(self, mode: str) -> None:
         """Set the domestic hot water heating regulation mode."""
@@ -271,7 +286,7 @@ class SmileAPI(SmileComm, SmileData):
     async def set_schedule_state(
         self,
         loc_id: str,
-        new_state: str,
+        new_state: str | None,
         name: str | None,
     ) -> None:
         """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat.

{plugwise-0.37.8 → plugwise-0.38.0}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.37.8
+Version: 0.38.0
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -54,12 +54,13 @@ This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devic
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
-[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
+[![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
+[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
+[![PyPI version fury.io](https://badge.fury.io/py/plugwise.svg)](https://pypi.python.org/pypi/plugwise/)
 [![Latest release](https://github.com/plugwise/python-plugwise/workflows/Latest%20release/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![Newest commit](https://github.com/plugwise/python-plugwise/workflows/Latest%20commit/badge.svg)](https://github.com/plugwise/python-plugwise/actions)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/plugwise/python-plugwise/main.svg)](https://results.pre-commit.ci/latest/github/plugwise/python-plugwise/main)
-[![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)
 
 [![CodeFactor](https://www.codefactor.io/repository/github/plugwise/python-plugwise/badge)](https://www.codefactor.io/repository/github/plugwise/python-plugwise)
 [![codecov](https://codecov.io/gh/plugwise/python-plugwise/branch/main/graph/badge.svg)](https://codecov.io/gh/plugwise/python-plugwise)
@@ -94,9 +95,9 @@ See the [`plugwise-beta`](https://github.com/plugwise/plugwise-beta) repository
 
 ## Development/patches
 
-Like Home Assistant Core we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
+Like Home Assistant Core, we use `pre-commit` and additionally run [pre-commit.ci](http://pre-commit.ci) to automatically validate your commits and PRs.
 
-If you want to create a PR please make sure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
+If you want to create a PR, please ensure you at least run `scripts/setup.sh`. This will ensure your environment is set up correctly before attempting to `git commit`. We sincerely and highly recommended also setting up local testing, see [`tests/README.md`](https://github.com/plugwise/python-plugwise/blob/main/tests/README.md) for more information and run `scripts/setup_test.sh` to prepare your environment.
 
 ## Project support status
 
@@ -125,13 +126,13 @@ Module providing interfacing with the Plugwise devices:
 
 ## License, origins and contributors
 
-As per the origins we have retained the appropriate licensing and including the MIT-license for this project.
+As per the origins, we have retained the appropriate licensing and including the MIT-license for this project.
 
 Origins (from newest to oldest):
 
 - Networked (Smile/Stretch) Plugwise support by @bouwew (Bouwe) and @CoMPaTech (Tom). We both support and help out @brefra (Frank) where possible, he's supporting the USB module and integration.
 - 'All' available Plugwise support by @bouwew (Bouwe), @brefra (Frank) and @CoMPaTech (Tom)
-- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta` by @bouwew (Bouwe) & @CoMPaTech (Tom)
+- Upstreamed haanna/HA-core Anna, including all later products - 'Plugwise-Smile/Plugwise-HA/plugwise-beta' by @bouwew (Bouwe) & @CoMPaTech (Tom)
 - Networked Plugwise Anna module with custom_module - `haanna/anna-ha` via <https://github.com/laetificat> (Kevin)
 - USB-based stick module with custom_module - `plugwise-stick/plugwise` by @brefra (Frank)
 - USB-plugwise module - `plugwise` by <https://github.com/cyberjunky/python-plugwise> (Ron) originally by <https://github.com/aequitas/python-plugwise> (Johan) (with reference only in license to Sven)
@@ -139,4 +140,4 @@ Origins (from newest to oldest):
 
 ## Thanks
 
-On behalf all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.
+On behalf of all of us, big thanks to Plugwise and community members @riemers and @tane from [HAshop](https://hashop.nl) for their support and obviously all our users and testers who dealt with our typos and challenges. Disclaimer, while we are communicating with Plugwise and they expressed their gratitude through their newsletter, we are not part of Plugwise as a company. We are just a bunch of guys anxious to get our (and your) Plugwise products working with Home Assistant.

{plugwise-0.37.8 → plugwise-0.38.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools~=69.0", "wheel~=0.43.0"]
+requires = ["setuptools~=70.0", "wheel~=0.43.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.37.8"
+version         = "0.38.0"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

{plugwise-0.37.8 → plugwise-0.38.0}/tests/test_adam.py

@@ -55,6 +55,10 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
             smile, "675416a629f343c495449970e2ca37b5"
         )
         assert not switch_change
+
+        reboot = await self.tinker_reboot(smile)
+        assert reboot
+
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -78,11 +82,13 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         try:
             await smile.delete_notification()
             notification_deletion = False  # pragma: no cover
-        except pw_exceptions.ResponseError:
+        except pw_exceptions.PlugwiseError:
             notification_deletion = True
-
         assert notification_deletion
 
+        reboot = await self.tinker_reboot(smile, unhappy=True)
+        assert not reboot
+
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -330,6 +336,20 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
             smile, "2022-01-16 00:00:01", testdata_updated, initialize=False
         )
 
+        # Simulate receiving no xml-data after a requesting a reboot of the gateway
+        self.smile_setup = "reboot/adam_plus_anna_new"
+        try:
+            await self.device_test(smile, initialize=False)
+        except pw_exceptions.PlugwiseError:
+            _LOGGER.debug("Receiving no data after a reboot is properly handled")
+
+        # Simulate receiving xml-data with <error>
+        self.smile_setup = "error/adam_plus_anna_new"
+        try:
+            await self.device_test(smile, initialize=False)
+        except pw_exceptions.ResponseError:
+            _LOGGER.debug("Receiving error-data from the Gateway")
+
         await smile.close_connection()
         await self.disconnect(server, client)
 

{plugwise-0.37.8 → plugwise-0.38.0}/tests/test_init.py

@@ -31,6 +31,7 @@ CORE_DOMAIN_OBJECTS_TAIL = "/core/domain_objects{tail:.*}"
 CORE_LOCATIONS = "/core/locations"
 CORE_LOCATIONS_TAIL = "/core/locations{tail:.*}"
 CORE_APPLIANCES_TAIL = "/core/appliances{tail:.*}"
+CORE_GATEWAYS_TAIL = "/core/gateways{tail:.*}"
 CORE_NOTIFICATIONS_TAIL = "/core/notifications{tail:.*}"
 CORE_RULES_TAIL = "/core/rules{tail:.*}"
 EMPTY_XML = "<xml />"
@@ -93,6 +94,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
 
         if fail_auth:
             app.router.add_get("/{tail:.*}", self.smile_fail_auth)
+            app.router.add_route("POST", "/{tail:.*}", self.smile_fail_auth)
             app.router.add_route("PUT", "/{tail:.*}", self.smile_fail_auth)
             return app
 
@@ -106,6 +108,9 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         # Introducte timeout with 2 seconds, test by setting response to 10ms
         # Don't actually wait 2 seconds as this will prolongue testing
         if not raise_timeout:
+            app.router.add_route(
+                "POST", CORE_GATEWAYS_TAIL, self.smile_http_accept
+            )
             app.router.add_route("PUT", CORE_LOCATIONS_TAIL, self.smile_http_accept)
             app.router.add_route(
                 "DELETE", CORE_NOTIFICATIONS_TAIL, self.smile_http_accept
@@ -115,11 +120,14 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 "PUT", CORE_APPLIANCES_TAIL, self.smile_http_accept
             )
         else:
+            app.router.add_route(
+                "POST", CORE_GATEWAYS_TAIL, self.smile_timeout
+            )
             app.router.add_route("PUT", CORE_LOCATIONS_TAIL, self.smile_timeout)
             app.router.add_route("PUT", CORE_RULES_TAIL, self.smile_timeout)
             app.router.add_route("PUT", CORE_APPLIANCES_TAIL, self.smile_timeout)
             app.router.add_route(
-                "DELETE", "/core/notifications{tail:.*}", self.smile_timeout
+                "DELETE", CORE_NOTIFICATIONS_TAIL, self.smile_timeout
             )
 
         return app
@@ -241,7 +249,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
     @classmethod
     async def smile_timeout(cls, request):
         """Render timeout endpoint."""
-        raise TimeoutError
+        raise aiohttp.web.HTTPGatewayTimeout()
 
     @classmethod
     async def smile_broken(cls, request):
@@ -339,7 +347,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             assert connection_state
             return server, smile, client
         except (
-            pw_exceptions.DeviceTimeoutError,
+            pw_exceptions.ConnectionFailedError,
             pw_exceptions.InvalidXMLError,
             pw_exceptions.InvalidAuthentication,
         ) as exception:
@@ -420,7 +428,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             assert connection_state
             return server, smile, client
         except (
-            pw_exceptions.DeviceTimeoutError,
+            pw_exceptions.ConnectionFailedError,
             pw_exceptions.InvalidXMLError,
             pw_exceptions.InvalidAuthentication,
         ) as exception:
@@ -451,7 +459,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             await self.connect(timeout=True)
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
-        except (pw_exceptions.DeviceTimeoutError, pw_exceptions.ResponseError):
+        except pw_exceptions.ConnectionFailedError:
             _LOGGER.info(" + successfully passed timeout handling.")
 
         try:
@@ -478,7 +486,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             await self.connect_legacy(timeout=True)
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
-        except (pw_exceptions.DeviceTimeoutError, pw_exceptions.ResponseError):
+        except pw_exceptions.ConnectionFailedError:
             _LOGGER.info(" + successfully passed timeout handling.")
 
         try:
@@ -628,6 +636,22 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
 
         # pragma warning restore S3776
 
+    @pytest.mark.asyncio
+    async def tinker_reboot(self, smile, unhappy=False):
+        """Test rebooting a gateway."""
+        _LOGGER.info("- Rebooting the gateway")
+        try:
+            await smile.reboot_gateway()
+            _LOGGER.info("  + worked as intended")
+            return True
+        except pw_exceptions.PlugwiseError:
+            if unhappy:
+                _LOGGER.info("  + failed as expected")
+                return False
+            else:  # pragma: no cover
+                _LOGGER.info("  - failed unexpectedly")
+                return False
+
     @pytest.mark.asyncio
     async def tinker_switch(
         self, smile, dev_id=None, members=None, model="relay", unhappy=False
@@ -645,10 +669,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + locked, not switched as expected")
                 return False
-            except (
-                pw_exceptions.ErrorSendingCommandError,
-                pw_exceptions.ResponseError,
-            ):
+            except pw_exceptions.ConnectionFailedError:
                 if unhappy:
                     tinker_switch_passed = True  # test is pass!
                     _LOGGER.info("  + failed as expected")
@@ -673,10 +694,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             await smile.set_temperature(loc_id, test_temp)
             _LOGGER.info("  + tinker_thermostat_temp worked as intended")
             tinker_temp_passed = True
-        except (
-            pw_exceptions.ErrorSendingCommandError,
-            pw_exceptions.ResponseError,
-        ):
+        except pw_exceptions.ConnectionFailedError:
             if unhappy:
                 _LOGGER.info("  + tinker_thermostat_temp failed as expected")
                 tinker_temp_passed = True
@@ -703,10 +721,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + found invalid preset, as expected")
                 tinker_preset_passed = True
-            except (
-                pw_exceptions.ErrorSendingCommandError,
-                pw_exceptions.ResponseError,
-            ):
+            except pw_exceptions.ConnectionFailedError:
                 if unhappy:
                     tinker_preset_passed = True
                     _LOGGER.info("  + tinker_thermostat_preset failed as expected")
@@ -733,16 +748,13 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                     new_schedule = new_schedule[1:]
                 _LOGGER.info("- Adjusting schedule to %s", f"{new_schedule}{warning}")
                 try:
-                    await smile.set_select("select_schedule", loc_id, state, new_schedule)
+                    await smile.set_select("select_schedule", loc_id, new_schedule, state)
                     tinker_schedule_passed = True
                     _LOGGER.info("  + working as intended")
                 except pw_exceptions.PlugwiseError:
                     _LOGGER.info("  + failed as expected")
                     tinker_schedule_passed = True
-                except (
-                    pw_exceptions.ErrorSendingCommandError,
-                    pw_exceptions.ResponseError,
-                ):
+                except pw_exceptions.ConnectionFailedError:
                     tinker_schedule_passed = False
                     if unhappy:
                         _LOGGER.info("  + failed as expected before intended failure")
@@ -763,16 +775,13 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         for state in states:
             _LOGGER.info("- Adjusting schedule to state %s", state)
             try:
-                await smile.set_select("select_schedule", "dummy", state)
+                await smile.set_select("select_schedule", "dummy", None, state)
                 tinker_schedule_passed = True
                 _LOGGER.info("  + working as intended")
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + failed as expected")
                 tinker_schedule_passed = True
-            except (
-                pw_exceptions.ErrorSendingCommandError,
-                pw_exceptions.ResponseError,
-            ):
+            except pw_exceptions.ConnectionFailedError:
                 tinker_schedule_passed = False
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")