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

Small cleanups to recorder history (#89774)

Browse Source 
* Small cleanups to recorder history

* Small cleanups to recorder history

* fixes

* flake8 cannot figure it out
This commit is contained in:
J. Nick Koston 2023-03-15 17:44:33 -10:00 committed by GitHub
parent 99d6b1fa57
commit ed27dae173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
homeassistant/components/recorder/history/modern.py
View File

@ -5,7 +5,6 @@ from collections import defaultdict
from collections.abc import Callable, Iterable, Iterator, MutableMapping from collections.abc import Callable, Iterable, Iterator, MutableMapping
from datetime import datetime from datetime import datetime
from itertools import groupby from itertools import groupby
import logging
from operator import itemgetter from operator import itemgetter
from typing import Any, cast from typing import Any, cast
@ -24,12 +23,7 @@ import homeassistant.util.dt as dt_util
from ... import recorder from ... import recorder
from ..db_schema import RecorderRuns, StateAttributes, States, StatesMeta from ..db_schema import RecorderRuns, StateAttributes, States, StatesMeta
from ..filters import Filters from ..filters import Filters
from ..models import ( from ..models import LazyState, process_timestamp, row_to_compressed_state
LazyState,
process_timestamp,
process_timestamp_to_utc_isoformat,
row_to_compressed_state,
)
from ..util import execute_stmt_lambda_element, session_scope from ..util import execute_stmt_lambda_element, session_scope
from .const import ( from .const import (
IGNORE_DOMAINS_ENTITY_ID_LIKE, IGNORE_DOMAINS_ENTITY_ID_LIKE,
@ -40,9 +34,6 @@ from .const import (
STATE_KEY, STATE_KEY,
) )
_LOGGER = logging.getLogger(__name__)
_BASE_STATES = ( _BASE_STATES = (
States.metadata_id, States.metadata_id,
States.state, States.state,
@ -710,7 +701,7 @@ def _sorted_states_to_dict(
# Append all changes to it # Append all changes to it
for metadata_id, group in states_iter: for metadata_id, group in states_iter:
attr_cache: dict[str, dict[str, Any]] = {} attr_cache: dict[str, dict[str, Any]] = {}
prev_state: Column | str prev_state: Column | str | None = None
if not (entity_id := metadata_id_to_entity_id.get(metadata_id)): if not (entity_id := metadata_id_to_entity_id.get(metadata_id)):
continue continue
ent_results = result[entity_id] ent_results = result[entity_id]
@ -741,6 +732,7 @@ def _sorted_states_to_dict(
) )
state_idx = field_map["state"] state_idx = field_map["state"]
last_updated_ts_idx = field_map["last_updated_ts"]
# #
# minimal_response only makes sense with last_updated == last_updated # minimal_response only makes sense with last_updated == last_updated
@ -749,29 +741,28 @@ def _sorted_states_to_dict(
# #
# With minimal response we do not care about attribute # With minimal response we do not care about attribute
# changes so we can filter out duplicate states # changes so we can filter out duplicate states
last_updated_ts_idx = field_map["last_updated_ts"]
if compressed_state_format: if compressed_state_format:
for row in group: # Compressed state format uses the timestamp directly
if (state := row[state_idx]) != prev_state: ent_results.extend(
ent_results.append( {
{ attr_state: (prev_state := state),
attr_state: state, attr_time: row[last_updated_ts_idx],
attr_time: row[last_updated_ts_idx], }
} for row in group
) if (state := row[state_idx]) != prev_state
prev_state = state )
continue
for row in group: # Non-compressed state format returns an ISO formatted string
if (state := row[state_idx]) != prev_state: _utc_from_timestamp = dt_util.utc_from_timestamp
ent_results.append( ent_results.extend(
{ {
attr_state: state, attr_state: (prev_state := state), # noqa: F841
attr_time: process_timestamp_to_utc_isoformat( attr_time: _utc_from_timestamp(row[last_updated_ts_idx]).isoformat(),
dt_util.utc_from_timestamp(row[last_updated_ts_idx]) }
), for row in group
} if (state := row[state_idx]) != prev_state
) )
prev_state = state
# If there are no states beyond the initial state, # If there are no states beyond the initial state,
# the state a was never popped from initial_states # the state a was never popped from initial_states