jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 04:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify HomeWizard sensor names (#108854)

Browse Source 
* Simplify HomeWizard sensor names

* Simplify translations even more by using default device_class names
This commit is contained in:
Duco Sebel 2024-01-29 13:24:00 +01:00 committed by GitHub
parent 789055fd68
commit dbc568cd53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5559 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/homewizard/sensor.py
View File

@ -219,7 +219,6 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
),
HomeWizardSensorEntityDescription(
key="active_power_w",
translation_key="active_power_w",
native_unit_of_measurement=UnitOfPower.WATT,
device_class=SensorDeviceClass.POWER,
state_class=SensorStateClass.MEASUREMENT,
@ -328,7 +327,6 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
),
HomeWizardSensorEntityDescription(
key="active_frequency_hz",
translation_key="active_frequency_hz",
native_unit_of_measurement=UnitOfFrequency.HERTZ,
device_class=SensorDeviceClass.FREQUENCY,
state_class=SensorStateClass.MEASUREMENT,
@ -437,35 +435,30 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
EXTERNAL_SENSORS = {
ExternalDevice.DeviceType.GAS_METER: HomeWizardExternalSensorEntityDescription(
key="gas_meter",
translation_key="total_gas_m3",
suggested_device_class=SensorDeviceClass.GAS,
state_class=SensorStateClass.TOTAL_INCREASING,
device_name="Gas meter",
),
ExternalDevice.DeviceType.HEAT_METER: HomeWizardExternalSensorEntityDescription(
key="heat_meter",
translation_key="total_energy_gj",
suggested_device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
device_name="Heat meter",
),
ExternalDevice.DeviceType.WARM_WATER_METER: HomeWizardExternalSensorEntityDescription(
key="warm_water_meter",
translation_key="total_liter_m3",
suggested_device_class=SensorDeviceClass.WATER,
state_class=SensorStateClass.TOTAL_INCREASING,
device_name="Warm water meter",
),
ExternalDevice.DeviceType.WATER_METER: HomeWizardExternalSensorEntityDescription(
key="water_meter",
translation_key="total_liter_m3",
suggested_device_class=SensorDeviceClass.WATER,
state_class=SensorStateClass.TOTAL_INCREASING,
device_name="Water meter",
),
ExternalDevice.DeviceType.INLET_HEAT_METER: HomeWizardExternalSensorEntityDescription(
key="inlet_heat_meter",
translation_key="total_energy_gj",
suggested_device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL_INCREASING,
device_name="Inlet heat meter",

35
homeassistant/components/homewizard/strings.json
View File

@ -48,37 +48,31 @@
"name": "Wi-Fi SSID"
},
"active_tariff": {
"name": "Active tariff"
"name": "Tariff"
},
"wifi_strength": {
"name": "Wi-Fi strength"
},
"total_energy_import_kwh": {
"name": "Total energy import"
"name": "Energy import"
},
"total_energy_import_tariff_kwh": {
"name": "Total energy import tariff {tariff}"
"name": "Energy import tariff {tariff}"
},
"total_energy_export_kwh": {
"name": "Total energy export"
"name": "Energy export"
},
"total_energy_export_tariff_kwh": {
"name": "Total energy export tariff {tariff}"
},
"active_power_w": {
"name": "Active power"
"name": "Energy export tariff {tariff}"
},
"active_power_phase_w": {
"name": "Active power phase {phase}"
"name": "Power phase {phase}"
},
"active_voltage_phase_v": {
"name": "Active voltage phase {phase}"
"name": "Voltage phase {phase}"
},
"active_current_phase_a": {
"name": "Active current phase {phase}"
},
"active_frequency_hz": {
"name": "Active frequency"
"name": "Current phase {phase}"
},
"voltage_sag_phase_count": {
"name": "Voltage sags detected phase {phase}"
@ -93,25 +87,16 @@
"name": "Long power failures detected"
},
"active_power_average_w": {
"name": "Active average demand"
"name": "Average demand"
},
"monthly_power_peak_w": {
"name": "Peak demand current month"
},
"total_gas_m3": {
"name": "Total gas"
},
"meter_identifier": {
"name": "Meter identifier"
},
"active_liter_lpm": {
"name": "Active water usage"
"name": "Water usage"
},
"total_liter_m3": {
"name": "Total water usage"
},
"total_energy_gj": {
"name": "Total heat energy"
}
},
"switch": {

5387
tests/components/homewizard/snapshots/test_sensor.ambr
View File

File diff suppressed because it is too large Load Diff

324
tests/components/homewizard/test_sensor.py
View File

@ -32,29 +32,29 @@ pytestmark = [
"sensor.device_smart_meter_model",
"sensor.device_smart_meter_identifier",
"sensor.device_wi_fi_ssid",
"sensor.device_active_tariff",
"sensor.device_tariff",
"sensor.device_wi_fi_strength",
"sensor.device_total_energy_import",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_total_energy_export",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_energy_import",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_energy_export",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_power",
"sensor.device_power_phase_1",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",
"sensor.device_voltage_sags_detected_phase_3",
@ -63,41 +63,41 @@ pytestmark = [
"sensor.device_voltage_swells_detected_phase_3",
"sensor.device_power_failures_detected",
"sensor.device_long_power_failures_detected",
"sensor.device_active_average_demand",
"sensor.device_average_demand",
"sensor.device_peak_demand_current_month",
"sensor.device_active_water_usage",
"sensor.device_water_usage",
"sensor.device_total_water_usage",
"sensor.gas_meter_total_gas",
"sensor.water_meter_total_water_usage",
"sensor.warm_water_meter_total_water_usage",
"sensor.heat_meter_total_heat_energy",
"sensor.inlet_heat_meter_total_heat_energy",
"sensor.gas_meter_gas",
"sensor.water_meter_water",
"sensor.warm_water_meter_water",
"sensor.heat_meter_energy",
"sensor.inlet_heat_meter_none",
],
),
(
"HWE-P1-zero-values",
[
"sensor.device_total_energy_import",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_total_energy_export",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_energy_import",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_energy_export",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_power",
"sensor.device_power_phase_1",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",
"sensor.device_voltage_sags_detected_phase_3",
@ -106,8 +106,8 @@ pytestmark = [
"sensor.device_voltage_swells_detected_phase_3",
"sensor.device_power_failures_detected",
"sensor.device_long_power_failures_detected",
"sensor.device_active_average_demand",
"sensor.device_active_water_usage",
"sensor.device_average_demand",
"sensor.device_water_usage",
"sensor.device_total_water_usage",
],
),
@ -116,10 +116,10 @@ pytestmark = [
[
"sensor.device_wi_fi_ssid",
"sensor.device_wi_fi_strength",
"sensor.device_total_energy_import",
"sensor.device_total_energy_export",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_energy_import",
"sensor.device_energy_export",
"sensor.device_power",
"sensor.device_power_phase_1",
],
),
(
@ -127,7 +127,7 @@ pytestmark = [
[
"sensor.device_wi_fi_ssid",
"sensor.device_wi_fi_strength",
"sensor.device_active_water_usage",
"sensor.device_water_usage",
"sensor.device_total_water_usage",
],
),
@ -136,10 +136,10 @@ pytestmark = [
[
"sensor.device_wi_fi_ssid",
"sensor.device_wi_fi_strength",
"sensor.device_total_energy_import",
"sensor.device_total_energy_export",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_energy_import",
"sensor.device_energy_export",
"sensor.device_power",
"sensor.device_power_phase_1",
],
),
(
@ -147,12 +147,12 @@ pytestmark = [
[
"sensor.device_wi_fi_ssid",
"sensor.device_wi_fi_strength",
"sensor.device_total_energy_import",
"sensor.device_total_energy_export",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_energy_import",
"sensor.device_energy_export",
"sensor.device_power",
"sensor.device_power_phase_1",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
],
),
],
@ -184,23 +184,23 @@ async def test_sensors(
"HWE-P1",
[
"sensor.device_wi_fi_strength",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
],
),
(
"HWE-P1-unused-exports",
[
"sensor.device_total_energy_export",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_energy_export",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
],
),
(
@ -248,7 +248,7 @@ async def test_sensors_unreachable(
exception: Exception,
) -> None:
"""Test sensor handles API unreachable."""
assert (state := hass.states.get("sensor.device_total_energy_import_tariff_1"))
assert (state := hass.states.get("sensor.device_energy_import_tariff_1"))
assert state.state == "10830.511"
mock_homewizardenergy.data.side_effect = exception
@ -264,7 +264,7 @@ async def test_external_sensors_unreachable(
mock_homewizardenergy: MagicMock,
) -> None:
"""Test external device sensor handles API unreachable."""
assert (state := hass.states.get("sensor.gas_meter_total_gas"))
assert (state := hass.states.get("sensor.gas_meter_gas"))
assert state.state == "111.111"
mock_homewizardenergy.data.return_value = Data.from_dict({})
@ -281,32 +281,32 @@ async def test_external_sensors_unreachable(
(
"HWE-SKT",
[
"sensor.device_active_average_demand",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_active_tariff",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_water_usage",
"sensor.device_average_demand",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
"sensor.device_tariff",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_water_usage",
"sensor.device_dsmr_version",
"sensor.device_long_power_failures_detected",
"sensor.device_peak_demand_current_month",
"sensor.device_power_failures_detected",
"sensor.device_smart_meter_identifier",
"sensor.device_smart_meter_model",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_total_water_usage",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",
@ -322,28 +322,28 @@ async def test_external_sensors_unreachable(
"sensor.device_dsmr_version",
"sensor.device_smart_meter_model",
"sensor.device_smart_meter_identifier",
"sensor.device_active_tariff",
"sensor.device_total_energy_import",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_total_energy_export",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_active_power",
"sensor.device_active_power_phase_1",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_tariff",
"sensor.device_energy_import",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_energy_export",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_power",
"sensor.device_power_phase_1",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",
"sensor.device_voltage_sags_detected_phase_3",
@ -352,39 +352,39 @@ async def test_external_sensors_unreachable(
"sensor.device_voltage_swells_detected_phase_3",
"sensor.device_power_failures_detected",
"sensor.device_long_power_failures_detected",
"sensor.device_active_average_demand",
"sensor.device_average_demand",
"sensor.device_peak_demand_current_month",
],
),
(
"SDM230",
[
"sensor.device_active_average_demand",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_active_power_phase_2",
"sensor.device_active_power_phase_3",
"sensor.device_active_tariff",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_water_usage",
"sensor.device_average_demand",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_power_phase_2",
"sensor.device_power_phase_3",
"sensor.device_tariff",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_water_usage",
"sensor.device_dsmr_version",
"sensor.device_long_power_failures_detected",
"sensor.device_peak_demand_current_month",
"sensor.device_power_failures_detected",
"sensor.device_smart_meter_identifier",
"sensor.device_smart_meter_model",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_total_water_usage",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",
@ -397,30 +397,30 @@ async def test_external_sensors_unreachable(
(
"SDM630",
[
"sensor.device_active_average_demand",
"sensor.device_active_current_phase_1",
"sensor.device_active_current_phase_2",
"sensor.device_active_current_phase_3",
"sensor.device_active_frequency",
"sensor.device_active_tariff",
"sensor.device_active_voltage_phase_1",
"sensor.device_active_voltage_phase_2",
"sensor.device_active_voltage_phase_3",
"sensor.device_active_water_usage",
"sensor.device_average_demand",
"sensor.device_current_phase_1",
"sensor.device_current_phase_2",
"sensor.device_current_phase_3",
"sensor.device_frequency",
"sensor.device_tariff",
"sensor.device_voltage_phase_1",
"sensor.device_voltage_phase_2",
"sensor.device_voltage_phase_3",
"sensor.device_water_usage",
"sensor.device_dsmr_version",
"sensor.device_long_power_failures_detected",
"sensor.device_peak_demand_current_month",
"sensor.device_power_failures_detected",
"sensor.device_smart_meter_identifier",
"sensor.device_smart_meter_model",
"sensor.device_total_energy_export_tariff_1",
"sensor.device_total_energy_export_tariff_2",
"sensor.device_total_energy_export_tariff_3",
"sensor.device_total_energy_export_tariff_4",
"sensor.device_total_energy_import_tariff_1",
"sensor.device_total_energy_import_tariff_2",
"sensor.device_total_energy_import_tariff_3",
"sensor.device_total_energy_import_tariff_4",
"sensor.device_energy_export_tariff_1",
"sensor.device_energy_export_tariff_2",
"sensor.device_energy_export_tariff_3",
"sensor.device_energy_export_tariff_4",
"sensor.device_energy_import_tariff_1",
"sensor.device_energy_import_tariff_2",
"sensor.device_energy_import_tariff_3",
"sensor.device_energy_import_tariff_4",
"sensor.device_total_water_usage",
"sensor.device_voltage_sags_detected_phase_1",
"sensor.device_voltage_sags_detected_phase_2",