Bump zwave-js-server-python to 0.29.1 (#55460)

homeassistant/components/zwave_js/climate.py

@@ -4,14 +4,14 @@ from __future__ import annotations
 from typing import Any, cast
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import (
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.thermostat import (
     THERMOSTAT_CURRENT_TEMP_PROPERTY,
     THERMOSTAT_MODE_PROPERTY,
     THERMOSTAT_MODE_SETPOINT_MAP,
     THERMOSTAT_MODES,
     THERMOSTAT_OPERATING_STATE_PROPERTY,
     THERMOSTAT_SETPOINT_PROPERTY,
-    CommandClass,
     ThermostatMode,
     ThermostatOperatingState,
     ThermostatSetpointType,

homeassistant/components/zwave_js/cover.py

@@ -5,7 +5,7 @@ import logging
 from typing import Any
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import BarrierState
+from zwave_js_server.const.command_class.barrior_operator import BarrierState
 from zwave_js_server.model.value import Value as ZwaveValue
 
 from homeassistant.components.cover import (

homeassistant/components/zwave_js/discovery.py

@@ -6,7 +6,10 @@ from dataclasses import asdict, dataclass, field
 from typing import Any
 
 from awesomeversion import AwesomeVersion
-from zwave_js_server.const import THERMOSTAT_CURRENT_TEMP_PROPERTY, CommandClass
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.thermostat import (
+    THERMOSTAT_CURRENT_TEMP_PROPERTY,
+)
 from zwave_js_server.exceptions import UnknownValueData
 from zwave_js_server.model.device_class import DeviceClassItem
 from zwave_js_server.model.node import Node as ZwaveNode

homeassistant/components/zwave_js/discovery_data_template.py

@@ -5,27 +5,29 @@ from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import Any
 
-from zwave_js_server.const import (
-    CO2_SENSORS,
-    CO_SENSORS,
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.meter import (
     CURRENT_METER_TYPES,
-    CURRENT_SENSORS,
-    ENERGY_METER_TYPES,
-    ENERGY_SENSORS,
-    HUMIDITY_SENSORS,
-    ILLUMINANCE_SENSORS,
+    ENERGY_TOTAL_INCREASING_METER_TYPES,
     POWER_FACTOR_METER_TYPES,
     POWER_METER_TYPES,
+    VOLTAGE_METER_TYPES,
+    ElectricScale,
+    MeterScaleType,
+)
+from zwave_js_server.const.command_class.multilevel_sensor import (
+    CO2_SENSORS,
+    CO_SENSORS,
+    CURRENT_SENSORS,
+    ENERGY_MEASUREMENT_SENSORS,
+    HUMIDITY_SENSORS,
+    ILLUMINANCE_SENSORS,
     POWER_SENSORS,
     PRESSURE_SENSORS,
     SIGNAL_STRENGTH_SENSORS,
     TEMPERATURE_SENSORS,
     TIMESTAMP_SENSORS,
-    VOLTAGE_METER_TYPES,
     VOLTAGE_SENSORS,
-    CommandClass,
-    ElectricScale,
-    MeterScaleType,
     MultilevelSensorType,
 )
 from zwave_js_server.model.node import Node as ZwaveNode
@@ -59,7 +61,7 @@ from .const import (
 METER_DEVICE_CLASS_MAP: dict[str, set[MeterScaleType]] = {
     ENTITY_DESC_KEY_CURRENT: CURRENT_METER_TYPES,
     ENTITY_DESC_KEY_VOLTAGE: VOLTAGE_METER_TYPES,
-    ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING: ENERGY_METER_TYPES,
+    ENTITY_DESC_KEY_ENERGY_TOTAL_INCREASING: ENERGY_TOTAL_INCREASING_METER_TYPES,
     ENTITY_DESC_KEY_POWER: POWER_METER_TYPES,
     ENTITY_DESC_KEY_POWER_FACTOR: POWER_FACTOR_METER_TYPES,
 }
@@ -68,7 +70,7 @@ MULTILEVEL_SENSOR_DEVICE_CLASS_MAP: dict[str, set[MultilevelSensorType]] = {
     ENTITY_DESC_KEY_CO: CO_SENSORS,
     ENTITY_DESC_KEY_CO2: CO2_SENSORS,
     ENTITY_DESC_KEY_CURRENT: CURRENT_SENSORS,
-    ENTITY_DESC_KEY_ENERGY_MEASUREMENT: ENERGY_SENSORS,
+    ENTITY_DESC_KEY_ENERGY_MEASUREMENT: ENERGY_MEASUREMENT_SENSORS,
     ENTITY_DESC_KEY_HUMIDITY: HUMIDITY_SENSORS,
     ENTITY_DESC_KEY_ILLUMINANCE: ILLUMINANCE_SENSORS,
     ENTITY_DESC_KEY_POWER: POWER_SENSORS,
@@ -193,7 +195,7 @@ class NumericSensorDataTemplate(BaseDiscoverySchemaDataTemplate):
             # We do this because even though these are energy scales, they don't meet
             # the unit requirements for the energy device class.
             if scale_type in (
-                ElectricScale.PULSE,
+                ElectricScale.PULSE_COUNT,
                 ElectricScale.KILOVOLT_AMPERE_HOUR,
                 ElectricScale.KILOVOLT_AMPERE_REACTIVE_HOUR,
             ):

homeassistant/components/zwave_js/light.py

@@ -5,7 +5,8 @@ import logging
 from typing import Any
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import ColorComponent, CommandClass
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.color_switch import ColorComponent
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,

homeassistant/components/zwave_js/lock.py

@@ -6,12 +6,12 @@ from typing import Any
 
 import voluptuous as vol
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import (
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.lock import (
     ATTR_CODE_SLOT,
     ATTR_USERCODE,
     LOCK_CMD_CLASS_TO_LOCKED_STATE_MAP,
     LOCK_CMD_CLASS_TO_PROPERTY_MAP,
-    CommandClass,
     DoorLockMode,
 )
 from zwave_js_server.model.value import Value as ZwaveValue

homeassistant/components/zwave_js/manifest.json

@@ -3,13 +3,13 @@
   "name": "Z-Wave JS",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zwave_js",
-  "requirements": ["zwave-js-server-python==0.29.0"],
+  "requirements": ["zwave-js-server-python==0.29.1"],
   "codeowners": ["@home-assistant/z-wave"],
   "dependencies": ["usb", "http", "websocket_api"],
   "iot_class": "local_push",
   "usb": [
-   {"vid":"0658","pid":"0200","known_devices":["Aeotec Z-Stick Gen5+", "Z-WaveMe UZB"]},
-   {"vid":"10C4","pid":"8A2A","known_devices":["Nortek HUSBZB-1"]},
-   {"vid":"10C4","pid":"EA60","known_devices":["Aeotec Z-Stick 7", "Silicon Labs UZB-7", "Zooz ZST10 700"]}
+    {"vid":"0658","pid":"0200","known_devices":["Aeotec Z-Stick Gen5+", "Z-WaveMe UZB"]},
+    {"vid":"10C4","pid":"8A2A","known_devices":["Nortek HUSBZB-1"]},
+    {"vid":"10C4","pid":"EA60","known_devices":["Aeotec Z-Stick 7", "Silicon Labs UZB-7", "Zooz ZST10 700"]}
   ]
 }

homeassistant/components/zwave_js/select.py

@@ -2,7 +2,8 @@
 from __future__ import annotations
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import CommandClass, ToneID
+from zwave_js_server.const import CommandClass
+from zwave_js_server.const.command_class.sound_switch import ToneID
 
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN, SelectEntity
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/zwave_js/sensor.py

@@ -8,11 +8,10 @@ from typing import cast
 
 import voluptuous as vol
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import (
+from zwave_js_server.const import CommandClass, ConfigurationValueType
+from zwave_js_server.const.command_class.meter import (
     RESET_METER_OPTION_TARGET_VALUE,
     RESET_METER_OPTION_TYPE,
-    CommandClass,
-    ConfigurationValueType,
 )
 from zwave_js_server.model.node import Node as ZwaveNode
 from zwave_js_server.model.value import ConfigurationValue

homeassistant/components/zwave_js/siren.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from typing import Any
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import ToneID
+from zwave_js_server.const.command_class.sound_switch import ToneID
 
 from homeassistant.components.siren import DOMAIN as SIREN_DOMAIN, SirenEntity
 from homeassistant.components.siren.const import (

homeassistant/components/zwave_js/switch.py

@@ -5,7 +5,9 @@ import logging
 from typing import Any
 
 from zwave_js_server.client import Client as ZwaveClient
-from zwave_js_server.const import BarrierEventSignalingSubsystemState
+from zwave_js_server.const.command_class.barrior_operator import (
+    BarrierEventSignalingSubsystemState,
+)
 
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
 from homeassistant.config_entries import ConfigEntry

requirements_all.txt

@@ -2486,4 +2486,4 @@ zigpy==0.37.1
 zm-py==0.5.2
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.29.0
+zwave-js-server-python==0.29.1

requirements_test_all.txt

@@ -1397,4 +1397,4 @@ zigpy-znp==0.5.4
 zigpy==0.37.1
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.29.0
+zwave-js-server-python==0.29.1

tests/components/zwave_js/test_lock.py

@@ -1,5 +1,5 @@
 """Test the Z-Wave JS lock platform."""
-from zwave_js_server.const import ATTR_CODE_SLOT, ATTR_USERCODE
+from zwave_js_server.const.command_class.lock import ATTR_CODE_SLOT, ATTR_USERCODE
 from zwave_js_server.event import Event
 from zwave_js_server.model.node import NodeStatus