jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-29 16:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean zwave_js remaining typing issues (#72488)

Browse Source
This commit is contained in:
Martin Hjelmare 2022-05-25 18:40:38 +02:00 committed by GitHub
parent 10f0509ca3
commit 4723119fad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
homeassistant/components/zwave_js/discovery_data_template.py
View File

@ -1,10 +1,10 @@
"""Data template classes for discovery used to generate additional data for setup.""" """Data template classes for discovery used to generate additional data for setup."""
from __future__ import annotations from __future__ import annotations
from collections.abc import Iterable from collections.abc import Iterable, Mapping
from dataclasses import dataclass, field from dataclasses import dataclass, field
import logging import logging
from typing import Any from typing import Any, Union, cast
from zwave_js_server.const import CommandClass from zwave_js_server.const import CommandClass
from zwave_js_server.const.command_class.meter import ( from zwave_js_server.const.command_class.meter import (
@ -242,7 +242,7 @@ class BaseDiscoverySchemaDataTemplate:
""" """
return {} return {}
def values_to_watch(self, resolved_data: Any) -> Iterable[ZwaveValue]: def values_to_watch(self, resolved_data: Any) -> Iterable[ZwaveValue | None]:
""" """
Return list of all ZwaveValues resolved by helper that should be watched. Return list of all ZwaveValues resolved by helper that should be watched.
@ -261,7 +261,7 @@ class BaseDiscoverySchemaDataTemplate:
@staticmethod @staticmethod
def _get_value_from_id( def _get_value_from_id(
node: ZwaveNode, value_id_obj: ZwaveValueID node: ZwaveNode, value_id_obj: ZwaveValueID
) -> ZwaveValue | None: ) -> ZwaveValue | ZwaveConfigurationValue | None:
"""Get a ZwaveValue from a node using a ZwaveValueDict.""" """Get a ZwaveValue from a node using a ZwaveValueDict."""
value_id = get_value_id( value_id = get_value_id(
node, node,
@ -295,7 +295,9 @@ class DynamicCurrentTempClimateDataTemplate(BaseDiscoverySchemaDataTemplate):
return data return data
def values_to_watch(self, resolved_data: dict[str, Any]) -> Iterable[ZwaveValue]: def values_to_watch(
self, resolved_data: dict[str, Any]
) -> Iterable[ZwaveValue | None]:
"""Return list of all ZwaveValues resolved by helper that should be watched.""" """Return list of all ZwaveValues resolved by helper that should be watched."""
return [ return [
*resolved_data["lookup_table"].values(), *resolved_data["lookup_table"].values(),
@ -331,8 +333,11 @@ class NumericSensorDataTemplate(BaseDiscoverySchemaDataTemplate):
@staticmethod @staticmethod
def find_key_from_matching_set( def find_key_from_matching_set(
enum_value: MultilevelSensorType | MultilevelSensorScaleType | MeterScaleType, enum_value: MultilevelSensorType | MultilevelSensorScaleType | MeterScaleType,
set_map: dict[ set_map: Mapping[
str, set[MultilevelSensorType | MultilevelSensorScaleType | MeterScaleType] str,
set[MultilevelSensorType]
| set[MultilevelSensorScaleType]
| set[MeterScaleType],
], ],
) -> str | None: ) -> str | None:
"""Find a key in a set map that matches a given enum value.""" """Find a key in a set map that matches a given enum value."""
@ -354,11 +359,11 @@ class NumericSensorDataTemplate(BaseDiscoverySchemaDataTemplate):
return NumericSensorDataTemplateData(ENTITY_DESC_KEY_BATTERY, PERCENTAGE) return NumericSensorDataTemplateData(ENTITY_DESC_KEY_BATTERY, PERCENTAGE)
if value.command_class == CommandClass.METER: if value.command_class == CommandClass.METER:
scale_type = get_meter_scale_type(value) meter_scale_type = get_meter_scale_type(value)
unit = self.find_key_from_matching_set(scale_type, METER_UNIT_MAP) unit = self.find_key_from_matching_set(meter_scale_type, METER_UNIT_MAP)
# We do this because even though these are energy scales, they don't meet # We do this because even though these are energy scales, they don't meet
# the unit requirements for the energy device class. # the unit requirements for the energy device class.
if scale_type in ( if meter_scale_type in (
ElectricScale.PULSE_COUNT, ElectricScale.PULSE_COUNT,
ElectricScale.KILOVOLT_AMPERE_HOUR, ElectricScale.KILOVOLT_AMPERE_HOUR,
ElectricScale.KILOVOLT_AMPERE_REACTIVE_HOUR, ElectricScale.KILOVOLT_AMPERE_REACTIVE_HOUR,
@ -368,19 +373,21 @@ class NumericSensorDataTemplate(BaseDiscoverySchemaDataTemplate):
) )
# We do this because even though these are power scales, they don't meet # We do this because even though these are power scales, they don't meet
# the unit requirements for the power device class. # the unit requirements for the power device class.
if scale_type == ElectricScale.KILOVOLT_AMPERE_REACTIVE: if meter_scale_type == ElectricScale.KILOVOLT_AMPERE_REACTIVE:
return NumericSensorDataTemplateData(ENTITY_DESC_KEY_MEASUREMENT, unit) return NumericSensorDataTemplateData(ENTITY_DESC_KEY_MEASUREMENT, unit)
return NumericSensorDataTemplateData( return NumericSensorDataTemplateData(
self.find_key_from_matching_set(scale_type, METER_DEVICE_CLASS_MAP), self.find_key_from_matching_set(
meter_scale_type, METER_DEVICE_CLASS_MAP
),
unit, unit,
) )
if value.command_class == CommandClass.SENSOR_MULTILEVEL: if value.command_class == CommandClass.SENSOR_MULTILEVEL:
sensor_type = get_multilevel_sensor_type(value) sensor_type = get_multilevel_sensor_type(value)
scale_type = get_multilevel_sensor_scale_type(value) multilevel_sensor_scale_type = get_multilevel_sensor_scale_type(value)
unit = self.find_key_from_matching_set( unit = self.find_key_from_matching_set(
scale_type, MULTILEVEL_SENSOR_UNIT_MAP multilevel_sensor_scale_type, MULTILEVEL_SENSOR_UNIT_MAP
) )
if sensor_type == MultilevelSensorType.TARGET_TEMPERATURE: if sensor_type == MultilevelSensorType.TARGET_TEMPERATURE:
return NumericSensorDataTemplateData( return NumericSensorDataTemplateData(
@ -410,7 +417,9 @@ class CoverTiltDataTemplate(BaseDiscoverySchemaDataTemplate, TiltValueMix):
"""Resolve helper class data for a discovered value.""" """Resolve helper class data for a discovered value."""
return {"tilt_value": self._get_value_from_id(value.node, self.tilt_value_id)} return {"tilt_value": self._get_value_from_id(value.node, self.tilt_value_id)}
def values_to_watch(self, resolved_data: dict[str, Any]) -> Iterable[ZwaveValue]: def values_to_watch(
self, resolved_data: dict[str, Any]
) -> Iterable[ZwaveValue | None]:
"""Return list of all ZwaveValues resolved by helper that should be watched.""" """Return list of all ZwaveValues resolved by helper that should be watched."""
return [resolved_data["tilt_value"]] return [resolved_data["tilt_value"]]
@ -492,24 +501,29 @@ class ConfigurableFanValueMappingDataTemplate(
`configuration_option` to the value mapping object. `configuration_option` to the value mapping object.
""" """
def resolve_data(self, value: ZwaveValue) -> dict[str, ZwaveConfigurationValue]: def resolve_data(
self, value: ZwaveValue
) -> dict[str, ZwaveConfigurationValue | None]:
"""Resolve helper class data for a discovered value.""" """Resolve helper class data for a discovered value."""
zwave_value: ZwaveValue = self._get_value_from_id( zwave_value = cast( # type: ignore[redundant-cast]
value.node, self.configuration_option Union[ZwaveConfigurationValue, None],
self._get_value_from_id(value.node, self.configuration_option),
) )
return {"configuration_value": zwave_value} return {"configuration_value": zwave_value}
def values_to_watch(self, resolved_data: dict[str, Any]) -> Iterable[ZwaveValue]: def values_to_watch(
self, resolved_data: dict[str, ZwaveConfigurationValue | None]
) -> Iterable[ZwaveConfigurationValue | None]:
"""Return list of all ZwaveValues that should be watched.""" """Return list of all ZwaveValues that should be watched."""
return [ return [
resolved_data["configuration_value"], resolved_data["configuration_value"],
] ]
def get_fan_value_mapping( def get_fan_value_mapping(
self, resolved_data: dict[str, ZwaveConfigurationValue] self, resolved_data: dict[str, ZwaveConfigurationValue | None]
) -> FanValueMapping | None: ) -> FanValueMapping | None:
"""Get current fan properties from resolved data.""" """Get current fan properties from resolved data."""
zwave_value: ZwaveValue = resolved_data["configuration_value"] zwave_value = resolved_data["configuration_value"]
if zwave_value is None: if zwave_value is None:
_LOGGER.warning("Unable to read device configuration value") _LOGGER.warning("Unable to read device configuration value")