From c7155348218da35296e635bc7f85f2f834096c60 Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Mon, 30 Jan 2023 14:27:37 -0500 Subject: [PATCH] Bump zwave-js-server-python to 0.45.0 (#86771) --- homeassistant/components/zwave_js/api.py | 16 ++++++++-------- .../components/zwave_js/manifest.json | 2 +- homeassistant/components/zwave_js/update.py | 18 +++++++++--------- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/zwave_js/test_update.py | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/homeassistant/components/zwave_js/api.py b/homeassistant/components/zwave_js/api.py index 890df4add48..4f74f94801c 100644 --- a/homeassistant/components/zwave_js/api.py +++ b/homeassistant/components/zwave_js/api.py @@ -35,14 +35,14 @@ from zwave_js_server.model.controller import ( QRProvisioningInformation, ) from zwave_js_server.model.driver import Driver -from zwave_js_server.model.firmware import ( - FirmwareUpdateData, - FirmwareUpdateProgress, - FirmwareUpdateResult, -) +from zwave_js_server.model.firmware import FirmwareUpdateData from zwave_js_server.model.log_config import LogConfig from zwave_js_server.model.log_message import LogMessage from zwave_js_server.model.node import Node, NodeStatistics +from zwave_js_server.model.node.firmware import ( + NodeFirmwareUpdateProgress, + NodeFirmwareUpdateResult, +) from zwave_js_server.model.utils import async_parse_qr_code_string from zwave_js_server.util.node import async_set_config_parameter @@ -1897,7 +1897,7 @@ async def websocket_is_node_firmware_update_in_progress( def _get_firmware_update_progress_dict( - progress: FirmwareUpdateProgress, + progress: NodeFirmwareUpdateProgress, ) -> dict[str, int | float]: """Get a dictionary of firmware update progress.""" return { @@ -1934,7 +1934,7 @@ async def websocket_subscribe_firmware_update_status( @callback def forward_progress(event: dict) -> None: - progress: FirmwareUpdateProgress = event["firmware_update_progress"] + progress: NodeFirmwareUpdateProgress = event["firmware_update_progress"] connection.send_message( websocket_api.event_message( msg[ID], @@ -1947,7 +1947,7 @@ async def websocket_subscribe_firmware_update_status( @callback def forward_finished(event: dict) -> None: - finished: FirmwareUpdateResult = event["firmware_update_finished"] + finished: NodeFirmwareUpdateResult = event["firmware_update_finished"] connection.send_message( websocket_api.event_message( msg[ID], diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json index 9b313582eb5..91090a327cb 100644 --- a/homeassistant/components/zwave_js/manifest.json +++ b/homeassistant/components/zwave_js/manifest.json @@ -3,7 +3,7 @@ "name": "Z-Wave", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/zwave_js", - "requirements": ["pyserial==3.5", "zwave-js-server-python==0.44.0"], + "requirements": ["pyserial==3.5", "zwave-js-server-python==0.45.0"], "codeowners": ["@home-assistant/z-wave"], "dependencies": ["usb", "http", "websocket_api"], "iot_class": "local_push", diff --git a/homeassistant/components/zwave_js/update.py b/homeassistant/components/zwave_js/update.py index 8432e70af35..c65ba30fa41 100644 --- a/homeassistant/components/zwave_js/update.py +++ b/homeassistant/components/zwave_js/update.py @@ -11,12 +11,12 @@ from zwave_js_server.client import Client as ZwaveClient from zwave_js_server.const import NodeStatus from zwave_js_server.exceptions import BaseZwaveJSServerError, FailedZWaveCommand from zwave_js_server.model.driver import Driver -from zwave_js_server.model.firmware import ( - FirmwareUpdateInfo, - FirmwareUpdateProgress, - FirmwareUpdateResult, -) from zwave_js_server.model.node import Node as ZwaveNode +from zwave_js_server.model.node.firmware import ( + NodeFirmwareUpdateInfo, + NodeFirmwareUpdateProgress, + NodeFirmwareUpdateResult, +) from homeassistant.components.update import ( UpdateDeviceClass, @@ -84,13 +84,13 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity): self.driver = driver self.node = node self.semaphore = semaphore - self._latest_version_firmware: FirmwareUpdateInfo | None = None + self._latest_version_firmware: NodeFirmwareUpdateInfo | None = None self._status_unsub: Callable[[], None] | None = None self._poll_unsub: Callable[[], None] | None = None self._progress_unsub: Callable[[], None] | None = None self._finished_unsub: Callable[[], None] | None = None self._finished_event = asyncio.Event() - self._result: FirmwareUpdateResult | None = None + self._result: NodeFirmwareUpdateResult | None = None # Entity class attributes self._attr_name = "Firmware" @@ -109,7 +109,7 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity): @callback def _update_progress(self, event: dict[str, Any]) -> None: """Update install progress on event.""" - progress: FirmwareUpdateProgress = event["firmware_update_progress"] + progress: NodeFirmwareUpdateProgress = event["firmware_update_progress"] if not self._latest_version_firmware: return self._attr_in_progress = int(progress.progress) @@ -118,7 +118,7 @@ class ZWaveNodeFirmwareUpdate(UpdateEntity): @callback def _update_finished(self, event: dict[str, Any]) -> None: """Update install progress on event.""" - result: FirmwareUpdateResult = event["firmware_update_finished"] + result: NodeFirmwareUpdateResult = event["firmware_update_finished"] self._result = result self._finished_event.set() diff --git a/requirements_all.txt b/requirements_all.txt index 9ed6bbdcffd..86f5faa6d8b 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2720,7 +2720,7 @@ zigpy==0.53.0 zm-py==0.5.2 # homeassistant.components.zwave_js -zwave-js-server-python==0.44.0 +zwave-js-server-python==0.45.0 # homeassistant.components.zwave_me zwave_me_ws==0.3.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 1d505d66b48..f586b884ae4 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1924,7 +1924,7 @@ zigpy-znp==0.9.2 zigpy==0.53.0 # homeassistant.components.zwave_js -zwave-js-server-python==0.44.0 +zwave-js-server-python==0.45.0 # homeassistant.components.zwave_me zwave_me_ws==0.3.0 diff --git a/tests/components/zwave_js/test_update.py b/tests/components/zwave_js/test_update.py index 1650b7e8edd..4152d9aa326 100644 --- a/tests/components/zwave_js/test_update.py +++ b/tests/components/zwave_js/test_update.py @@ -5,7 +5,7 @@ from datetime import timedelta import pytest from zwave_js_server.event import Event from zwave_js_server.exceptions import FailedZWaveCommand -from zwave_js_server.model.firmware import FirmwareUpdateStatus +from zwave_js_server.model.node.firmware import NodeFirmwareUpdateStatus from homeassistant.components.update import ( ATTR_AUTO_UPDATE, @@ -375,7 +375,7 @@ async def test_update_entity_progress( "event": "firmware update finished", "nodeId": node.node_id, "result": { - "status": FirmwareUpdateStatus.OK_NO_RESTART, + "status": NodeFirmwareUpdateStatus.OK_NO_RESTART, "success": True, "reInterview": False, }, @@ -466,7 +466,7 @@ async def test_update_entity_install_failed( "event": "firmware update finished", "nodeId": node.node_id, "result": { - "status": FirmwareUpdateStatus.ERROR_TIMEOUT, + "status": NodeFirmwareUpdateStatus.ERROR_TIMEOUT, "success": False, "reInterview": False, },