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

Improve naming of units used in statistics (#79276)

Browse Source
This commit is contained in:
Erik Montnemery 2022-09-30 08:38:44 +02:00 committed by GitHub
parent 0001270bad
commit bc2dffabc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/recorder/core.py
View File

@ -485,11 +485,13 @@ class Recorder(threading.Thread):
statistic_id: str, statistic_id: str,
start_time: datetime, start_time: datetime,
sum_adjustment: float, sum_adjustment: float,
display_unit: str, adjustment_unit: str,
) -> None: ) -> None:
"""Adjust statistics.""" """Adjust statistics."""
self.queue_task( self.queue_task(
AdjustStatisticsTask(statistic_id, start_time, sum_adjustment, display_unit) AdjustStatisticsTask(
statistic_id, start_time, sum_adjustment, adjustment_unit
)
) )
@callback @callback

12
homeassistant/components/recorder/statistics.py
View File

@ -899,7 +899,7 @@ def list_statistic_ids(
result = { result = {
meta["statistic_id"]: { meta["statistic_id"]: {
"display_unit_of_measurement": meta["state_unit_of_measurement"], "state_unit_of_measurement": meta["state_unit_of_measurement"],
"has_mean": meta["has_mean"], "has_mean": meta["has_mean"],
"has_sum": meta["has_sum"], "has_sum": meta["has_sum"],
"name": meta["name"], "name": meta["name"],
@ -926,7 +926,7 @@ def list_statistic_ids(
"has_sum": meta["has_sum"], "has_sum": meta["has_sum"],
"name": meta["name"], "name": meta["name"],
"source": meta["source"], "source": meta["source"],
"display_unit_of_measurement": meta["state_unit_of_measurement"], "state_unit_of_measurement": meta["state_unit_of_measurement"],
"unit_class": _get_unit_class(meta["unit_of_measurement"]), "unit_class": _get_unit_class(meta["unit_of_measurement"]),
"unit_of_measurement": meta["unit_of_measurement"], "unit_of_measurement": meta["unit_of_measurement"],
} }
@ -939,7 +939,7 @@ def list_statistic_ids(
"has_sum": info["has_sum"], "has_sum": info["has_sum"],
"name": info.get("name"), "name": info.get("name"),
"source": info["source"], "source": info["source"],
"display_unit_of_measurement": info["display_unit_of_measurement"], "state_unit_of_measurement": info["state_unit_of_measurement"],
"statistics_unit_of_measurement": info["unit_of_measurement"], "statistics_unit_of_measurement": info["unit_of_measurement"],
"unit_class": info["unit_class"], "unit_class": info["unit_class"],
} }
@ -1605,7 +1605,7 @@ def adjust_statistics(
statistic_id: str, statistic_id: str,
start_time: datetime, start_time: datetime,
sum_adjustment: float, sum_adjustment: float,
display_unit: str, adjustment_unit: str,
) -> bool: ) -> bool:
"""Process an add_statistics job.""" """Process an add_statistics job."""
@ -1617,7 +1617,9 @@ def adjust_statistics(
return True return True
statistic_unit = metadata[statistic_id][1]["unit_of_measurement"] statistic_unit = metadata[statistic_id][1]["unit_of_measurement"]
convert = _get_display_to_statistic_unit_converter(display_unit, statistic_unit) convert = _get_display_to_statistic_unit_converter(
adjustment_unit, statistic_unit
)
sum_adjustment = convert(sum_adjustment) sum_adjustment = convert(sum_adjustment)
_adjust_sum_statistics( _adjust_sum_statistics(

6
homeassistant/components/recorder/tasks.py
View File

@ -163,7 +163,7 @@ class AdjustStatisticsTask(RecorderTask):
statistic_id: str statistic_id: str
start_time: datetime start_time: datetime
sum_adjustment: float sum_adjustment: float
display_unit: str adjustment_unit: str
def run(self, instance: Recorder) -> None: def run(self, instance: Recorder) -> None:
"""Run statistics task.""" """Run statistics task."""
@ -172,7 +172,7 @@ class AdjustStatisticsTask(RecorderTask):
self.statistic_id, self.statistic_id,
self.start_time, self.start_time,
self.sum_adjustment, self.sum_adjustment,
self.display_unit, self.adjustment_unit,
): ):
return return
# Schedule a new adjust statistics task if this one didn't finish # Schedule a new adjust statistics task if this one didn't finish
@ -181,7 +181,7 @@ class AdjustStatisticsTask(RecorderTask):
self.statistic_id, self.statistic_id,
self.start_time, self.start_time,
self.sum_adjustment, self.sum_adjustment,
self.display_unit, self.adjustment_unit,
) )
) )

15
homeassistant/components/recorder/websocket_api.py
View File

@ -291,7 +291,7 @@ def ws_change_statistics_unit(
vol.Required("statistic_id"): str, vol.Required("statistic_id"): str,
vol.Required("start_time"): str, vol.Required("start_time"): str,
vol.Required("adjustment"): vol.Any(float, int), vol.Required("adjustment"): vol.Any(float, int),
vol.Required("display_unit"): vol.Any(str, None), vol.Required("adjustment_unit_of_measurement"): vol.Any(str, None),
} }
) )
@websocket_api.async_response @websocket_api.async_response
@ -320,25 +320,26 @@ async def ws_adjust_sum_statistics(
return return
metadata = metadatas[0] metadata = metadatas[0]
def valid_units(statistics_unit: str | None, display_unit: str | None) -> bool: def valid_units(statistics_unit: str | None, adjustment_unit: str | None) -> bool:
if statistics_unit == display_unit: if statistics_unit == adjustment_unit:
return True return True
converter = STATISTIC_UNIT_TO_UNIT_CONVERTER.get(statistics_unit) converter = STATISTIC_UNIT_TO_UNIT_CONVERTER.get(statistics_unit)
if converter is not None and display_unit in converter.VALID_UNITS: if converter is not None and adjustment_unit in converter.VALID_UNITS:
return True return True
return False return False
stat_unit = metadata["statistics_unit_of_measurement"] stat_unit = metadata["statistics_unit_of_measurement"]
if not valid_units(stat_unit, msg["display_unit"]): adjustment_unit = msg["adjustment_unit_of_measurement"]
if not valid_units(stat_unit, adjustment_unit):
connection.send_error( connection.send_error(
msg["id"], msg["id"],
"invalid_units", "invalid_units",
f"Can't convert {stat_unit} to {msg['display_unit']}", f"Can't convert {stat_unit} to {adjustment_unit}",
) )
return return
get_instance(hass).async_adjust_statistics( get_instance(hass).async_adjust_statistics(
msg["statistic_id"], start_time, msg["adjustment"], msg["display_unit"] msg["statistic_id"], start_time, msg["adjustment"], adjustment_unit
) )
connection.send_result(msg["id"]) connection.send_result(msg["id"])

4
tests/components/demo/test_init.py
View File

@ -63,21 +63,21 @@ async def test_demo_statistics(hass, recorder_mock):
list_statistic_ids, hass list_statistic_ids, hass
) )
assert { assert {
"display_unit_of_measurement": "°C",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": "Outdoor temperature", "name": "Outdoor temperature",
"source": "demo", "source": "demo",
"state_unit_of_measurement": "°C",
"statistic_id": "demo:temperature_outdoor", "statistic_id": "demo:temperature_outdoor",
"statistics_unit_of_measurement": "°C", "statistics_unit_of_measurement": "°C",
"unit_class": "temperature", "unit_class": "temperature",
} in statistic_ids } in statistic_ids
assert { assert {
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": "Energy consumption 1", "name": "Energy consumption 1",
"source": "demo", "source": "demo",
"state_unit_of_measurement": "kWh",
"statistic_id": "demo:energy_consumption_kwh", "statistic_id": "demo:energy_consumption_kwh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",

6
tests/components/recorder/test_statistics.py
View File

@ -525,12 +525,12 @@ async def test_import_statistics(
statistic_ids = list_statistic_ids(hass) statistic_ids = list_statistic_ids(hass)
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy", "name": "Total imported energy",
"source": source, "source": source,
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
} }
@ -621,12 +621,12 @@ async def test_import_statistics(
statistic_ids = list_statistic_ids(hass) statistic_ids = list_statistic_ids(hass)
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": "MWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy renamed", "name": "Total imported energy renamed",
"source": source, "source": source,
"state_unit_of_measurement": "MWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
} }
@ -682,7 +682,7 @@ async def test_import_statistics(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": "MWh", "adjustment_unit_of_measurement": "MWh",
} }
) )
response = await client.receive_json() response = await client.receive_json()

46
tests/components/recorder/test_websocket_api.py
View File

@ -651,7 +651,7 @@ async def test_list_statistic_ids(
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"display_unit_of_measurement": display_unit, "state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -673,7 +673,7 @@ async def test_list_statistic_ids(
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"display_unit_of_measurement": display_unit, "state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -698,7 +698,7 @@ async def test_list_statistic_ids(
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"display_unit_of_measurement": display_unit, "state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -719,7 +719,7 @@ async def test_list_statistic_ids(
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"display_unit_of_measurement": display_unit, "state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -903,11 +903,11 @@ async def test_update_statistics_metadata(
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": "kW",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kW",
"statistics_unit_of_measurement": "kW", "statistics_unit_of_measurement": "kW",
"unit_class": None, "unit_class": None,
} }
@ -931,11 +931,11 @@ async def test_update_statistics_metadata(
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": "kW",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kW",
"statistics_unit_of_measurement": new_unit, "statistics_unit_of_measurement": new_unit,
"unit_class": new_unit_class, "unit_class": new_unit_class,
} }
@ -995,11 +995,11 @@ async def test_change_statistics_unit(hass, hass_ws_client, recorder_mock):
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": "kW",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kW",
"statistics_unit_of_measurement": "kW", "statistics_unit_of_measurement": "kW",
"unit_class": None, "unit_class": None,
} }
@ -1051,11 +1051,11 @@ async def test_change_statistics_unit(hass, hass_ws_client, recorder_mock):
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": "kW",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kW",
"statistics_unit_of_measurement": "W", "statistics_unit_of_measurement": "W",
"unit_class": "power", "unit_class": "power",
} }
@ -1104,11 +1104,11 @@ async def test_change_statistics_unit_errors(
expected_statistic_ids = [ expected_statistic_ids = [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": "kW",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kW",
"statistics_unit_of_measurement": "kW", "statistics_unit_of_measurement": "kW",
"unit_class": None, "unit_class": None,
} }
@ -1483,11 +1483,11 @@ async def test_get_statistics_metadata(
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "test:total_gas", "statistic_id": "test:total_gas",
"display_unit_of_measurement": unit,
"has_mean": has_mean, "has_mean": has_mean,
"has_sum": has_sum, "has_sum": has_sum,
"name": "Total imported energy", "name": "Total imported energy",
"source": "test", "source": "test",
"state_unit_of_measurement": unit,
"statistics_unit_of_measurement": unit, "statistics_unit_of_measurement": unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1511,11 +1511,11 @@ async def test_get_statistics_metadata(
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": attributes["unit_of_measurement"],
"has_mean": has_mean, "has_mean": has_mean,
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": attributes["unit_of_measurement"],
"statistics_unit_of_measurement": unit, "statistics_unit_of_measurement": unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1539,11 +1539,11 @@ async def test_get_statistics_metadata(
assert response["result"] == [ assert response["result"] == [
{ {
"statistic_id": "sensor.test", "statistic_id": "sensor.test",
"display_unit_of_measurement": attributes["unit_of_measurement"],
"has_mean": has_mean, "has_mean": has_mean,
"has_sum": has_sum, "has_sum": has_sum,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": attributes["unit_of_measurement"],
"statistics_unit_of_measurement": unit, "statistics_unit_of_measurement": unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1635,12 +1635,12 @@ async def test_import_statistics(
statistic_ids = list_statistic_ids(hass) # TODO statistic_ids = list_statistic_ids(hass) # TODO
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy", "name": "Total imported energy",
"source": source, "source": source,
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
} }
@ -1864,12 +1864,12 @@ async def test_adjust_sum_statistics_energy(
statistic_ids = list_statistic_ids(hass) # TODO statistic_ids = list_statistic_ids(hass) # TODO
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy", "name": "Total imported energy",
"source": source, "source": source,
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
} }
@ -1898,7 +1898,7 @@ async def test_adjust_sum_statistics_energy(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": "kWh", "adjustment_unit_of_measurement": "kWh",
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -1941,7 +1941,7 @@ async def test_adjust_sum_statistics_energy(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 2.0, "adjustment": 2.0,
"display_unit": "MWh", "adjustment_unit_of_measurement": "MWh",
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -2062,12 +2062,12 @@ async def test_adjust_sum_statistics_gas(
statistic_ids = list_statistic_ids(hass) # TODO statistic_ids = list_statistic_ids(hass) # TODO
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": "m³",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy", "name": "Total imported energy",
"source": source, "source": source,
"state_unit_of_measurement": "m³",
"statistics_unit_of_measurement": "m³", "statistics_unit_of_measurement": "m³",
"unit_class": "volume", "unit_class": "volume",
} }
@ -2096,7 +2096,7 @@ async def test_adjust_sum_statistics_gas(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": "m³", "adjustment_unit_of_measurement": "m³",
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -2139,7 +2139,7 @@ async def test_adjust_sum_statistics_gas(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 35.3147, # ~1 m³ "adjustment": 35.3147, # ~1 m³
"display_unit": "ft³", "adjustment_unit_of_measurement": "ft³",
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -2276,12 +2276,12 @@ async def test_adjust_sum_statistics_errors(
statistic_ids = list_statistic_ids(hass) statistic_ids = list_statistic_ids(hass)
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": state_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"statistic_id": statistic_id, "statistic_id": statistic_id,
"name": "Total imported energy", "name": "Total imported energy",
"source": source, "source": source,
"state_unit_of_measurement": state_unit,
"statistics_unit_of_measurement": statistic_unit, "statistics_unit_of_measurement": statistic_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -2311,7 +2311,7 @@ async def test_adjust_sum_statistics_errors(
"statistic_id": "sensor.does_not_exist", "statistic_id": "sensor.does_not_exist",
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": statistic_unit, "adjustment_unit_of_measurement": statistic_unit,
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -2331,7 +2331,7 @@ async def test_adjust_sum_statistics_errors(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": unit, "adjustment_unit_of_measurement": unit,
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -2351,7 +2351,7 @@ async def test_adjust_sum_statistics_errors(
"statistic_id": statistic_id, "statistic_id": statistic_id,
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": 1000.0, "adjustment": 1000.0,
"display_unit": unit, "adjustment_unit_of_measurement": unit,
} }
) )
response = await client.receive_json() response = await client.receive_json()

76
tests/components/sensor/test_recorder.py
View File

@ -136,11 +136,11 @@ def test_compile_hourly_statistics(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -210,12 +210,12 @@ def test_compile_hourly_statistics_purged_state_changes(
statistic_ids = list_statistic_ids(hass) statistic_ids = list_statistic_ids(hass)
assert statistic_ids == [ assert statistic_ids == [
{ {
"display_unit_of_measurement": display_unit,
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -281,31 +281,31 @@ def test_compile_hourly_statistics_unsupported(hass_recorder, caplog, attributes
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": "°C",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "°C",
"statistics_unit_of_measurement": "°C", "statistics_unit_of_measurement": "°C",
"unit_class": "temperature", "unit_class": "temperature",
}, },
{ {
"statistic_id": "sensor.test6", "statistic_id": "sensor.test6",
"display_unit_of_measurement": "°C",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "°C",
"statistics_unit_of_measurement": "°C", "statistics_unit_of_measurement": "°C",
"unit_class": "temperature", "unit_class": "temperature",
}, },
{ {
"statistic_id": "sensor.test7", "statistic_id": "sensor.test7",
"display_unit_of_measurement": "°C",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "°C",
"statistics_unit_of_measurement": "°C", "statistics_unit_of_measurement": "°C",
"unit_class": "temperature", "unit_class": "temperature",
}, },
@ -436,11 +436,11 @@ async def test_compile_hourly_sum_statistics_amount(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -516,7 +516,7 @@ async def test_compile_hourly_sum_statistics_amount(
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"start_time": period1.isoformat(), "start_time": period1.isoformat(),
"adjustment": 100.0, "adjustment": 100.0,
"display_unit": display_unit, "adjustment_unit_of_measurement": display_unit,
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -536,7 +536,7 @@ async def test_compile_hourly_sum_statistics_amount(
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"start_time": period2.isoformat(), "start_time": period2.isoformat(),
"adjustment": -400.0, "adjustment": -400.0,
"display_unit": display_unit, "adjustment_unit_of_measurement": display_unit,
} }
) )
response = await client.receive_json() response = await client.receive_json()
@ -629,11 +629,11 @@ def test_compile_hourly_sum_statistics_amount_reset_every_state_change(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -730,11 +730,11 @@ def test_compile_hourly_sum_statistics_amount_invalid_last_reset(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -815,11 +815,11 @@ def test_compile_hourly_sum_statistics_nan_inf_state(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -929,11 +929,11 @@ def test_compile_hourly_sum_statistics_negative_state(
wait_recording_done(hass) wait_recording_done(hass)
statistic_ids = list_statistic_ids(hass) statistic_ids = list_statistic_ids(hass)
assert { assert {
"name": None,
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistic_id": entity_id, "statistic_id": entity_id,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
@ -1018,11 +1018,11 @@ def test_compile_hourly_sum_statistics_total_no_reset(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1121,11 +1121,11 @@ def test_compile_hourly_sum_statistics_total_increasing(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1235,11 +1235,11 @@ def test_compile_hourly_sum_statistics_total_increasing_small_dip(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
} }
@ -1330,11 +1330,11 @@ def test_compile_hourly_energy_statistics_unsupported(hass_recorder, caplog):
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
} }
@ -1423,31 +1423,31 @@ def test_compile_hourly_energy_statistics_multiple(hass_recorder, caplog):
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
}, },
{ {
"statistic_id": "sensor.test2", "statistic_id": "sensor.test2",
"display_unit_of_measurement": "kWh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "kWh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
}, },
{ {
"statistic_id": "sensor.test3", "statistic_id": "sensor.test3",
"display_unit_of_measurement": "Wh",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "Wh",
"statistics_unit_of_measurement": "kWh", "statistics_unit_of_measurement": "kWh",
"unit_class": "energy", "unit_class": "energy",
}, },
@ -1807,11 +1807,11 @@ def test_list_statistic_ids(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": statistic_type == "mean", "has_mean": statistic_type == "mean",
"has_sum": statistic_type == "sum", "has_sum": statistic_type == "sum",
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -1822,11 +1822,11 @@ def test_list_statistic_ids(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": statistic_type == "mean", "has_mean": statistic_type == "mean",
"has_sum": statistic_type == "sum", "has_sum": statistic_type == "sum",
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -1913,11 +1913,11 @@ def test_compile_hourly_statistics_changing_units_1(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -1949,11 +1949,11 @@ def test_compile_hourly_statistics_changing_units_1(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2025,11 +2025,11 @@ def test_compile_hourly_statistics_changing_units_2(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": "cats",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "cats",
"statistics_unit_of_measurement": "cats", "statistics_unit_of_measurement": "cats",
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2091,11 +2091,11 @@ def test_compile_hourly_statistics_changing_units_3(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2127,11 +2127,11 @@ def test_compile_hourly_statistics_changing_units_3(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistics_unit, "statistics_unit_of_measurement": statistics_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2193,11 +2193,11 @@ def test_compile_hourly_statistics_changing_device_class_1(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": state_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": state_unit,
"statistics_unit_of_measurement": state_unit, "statistics_unit_of_measurement": state_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2239,11 +2239,11 @@ def test_compile_hourly_statistics_changing_device_class_1(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": state_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": state_unit,
"statistics_unit_of_measurement": state_unit, "statistics_unit_of_measurement": state_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2302,11 +2302,11 @@ def test_compile_hourly_statistics_changing_device_class_1(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": state_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": state_unit,
"statistics_unit_of_measurement": state_unit, "statistics_unit_of_measurement": state_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2382,11 +2382,11 @@ def test_compile_hourly_statistics_changing_device_class_2(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistic_unit, "statistics_unit_of_measurement": statistic_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2432,11 +2432,11 @@ def test_compile_hourly_statistics_changing_device_class_2(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": display_unit,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": display_unit,
"statistics_unit_of_measurement": statistic_unit, "statistics_unit_of_measurement": statistic_unit,
"unit_class": unit_class, "unit_class": unit_class,
}, },
@ -2502,11 +2502,11 @@ def test_compile_hourly_statistics_changing_statistics(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": None,
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": None,
"statistics_unit_of_measurement": None, "statistics_unit_of_measurement": None,
"unit_class": None, "unit_class": None,
}, },
@ -2539,11 +2539,11 @@ def test_compile_hourly_statistics_changing_statistics(
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": None,
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": None,
"statistics_unit_of_measurement": None, "statistics_unit_of_measurement": None,
"unit_class": None, "unit_class": None,
}, },
@ -2734,41 +2734,41 @@ def test_compile_statistics_hourly_daily_monthly_summary(hass_recorder, caplog):
assert statistic_ids == [ assert statistic_ids == [
{ {
"statistic_id": "sensor.test1", "statistic_id": "sensor.test1",
"display_unit_of_measurement": "%",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "%",
"statistics_unit_of_measurement": "%", "statistics_unit_of_measurement": "%",
"unit_class": None, "unit_class": None,
}, },
{ {
"statistic_id": "sensor.test2", "statistic_id": "sensor.test2",
"display_unit_of_measurement": "%",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "%",
"statistics_unit_of_measurement": "%", "statistics_unit_of_measurement": "%",
"unit_class": None, "unit_class": None,
}, },
{ {
"statistic_id": "sensor.test3", "statistic_id": "sensor.test3",
"display_unit_of_measurement": "%",
"has_mean": True, "has_mean": True,
"has_sum": False, "has_sum": False,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "%",
"statistics_unit_of_measurement": "%", "statistics_unit_of_measurement": "%",
"unit_class": None, "unit_class": None,
}, },
{ {
"statistic_id": "sensor.test4", "statistic_id": "sensor.test4",
"display_unit_of_measurement": "EUR",
"has_mean": False, "has_mean": False,
"has_sum": True, "has_sum": True,
"name": None, "name": None,
"source": "recorder", "source": "recorder",
"state_unit_of_measurement": "EUR",
"statistics_unit_of_measurement": "EUR", "statistics_unit_of_measurement": "EUR",
"unit_class": None, "unit_class": None,
}, },