home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-16 11:01:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

reduce

Browse Source
This commit is contained in:
J. Nick Koston
2023-04-10 12:08:58 -10:00
parent 0b5a9f0cf0
commit c77e55557a
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ from homeassistant.core import HomeAssistant, State, split_entity_id
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from ... import recorder from ... import recorder
from ..db_schema import RecorderRuns, StateAttributes, States from ..db_schema import StateAttributes, States
from ..filters import Filters from ..filters import Filters
from ..models import ( from ..models import (
LazyState, LazyState,
@@ -237,14 +237,10 @@ def get_significant_states_with_session(
and split_entity_id(entity_id)[0] in SIGNIFICANT_DOMAINS and split_entity_id(entity_id)[0] in SIGNIFICANT_DOMAINS
] ]
run_start_ts: float | None = None run_start_ts: float | None = None
if include_start_time_state: if include_start_time_state and not (
run = recorder.get_instance(hass).recorder_runs_manager.get(start_time) run_start_ts := _get_run_start_ts_for_utc_point_in_time(hass, start_time)
if not ( ):
run_start_ts := _get_run_start_ts_from_run_for_utc_point_in_time( include_start_time_state = False
run, start_time
)
):
include_start_time_state = False
start_time_ts = dt_util.utc_to_timestamp(start_time) start_time_ts = dt_util.utc_to_timestamp(start_time)
end_time_ts = datetime_to_timestamp_or_none(end_time) end_time_ts = datetime_to_timestamp_or_none(end_time)
single_metadata_id = metadata_ids[0] if len(metadata_ids) == 1 else None single_metadata_id = metadata_ids[0] if len(metadata_ids) == 1 else None
@@ -268,9 +264,8 @@ def get_significant_states_with_session(
include_start_time_state, include_start_time_state,
], ],
) )
states = execute_stmt_lambda_element(session, stmt, None, end_time)
return _sorted_states_to_dict( return _sorted_states_to_dict(
states, execute_stmt_lambda_element(session, stmt, None, end_time),
entity_ids, entity_ids,
entity_id_to_metadata_id, entity_id_to_metadata_id,
minimal_response, minimal_response,
@@ -388,14 +383,10 @@ def state_changes_during_period(
entity_id: single_metadata_id entity_id: single_metadata_id
} }
run_start_ts: float | None = None run_start_ts: float | None = None
if include_start_time_state: if include_start_time_state and not (
run = recorder.get_instance(hass).recorder_runs_manager.get(start_time) run_start_ts := _get_run_start_ts_for_utc_point_in_time(hass, start_time)
if not ( ):
run_start_ts := _get_run_start_ts_from_run_for_utc_point_in_time( include_start_time_state = False
run, start_time
)
):
include_start_time_state = False
start_time_ts = dt_util.utc_to_timestamp(start_time) start_time_ts = dt_util.utc_to_timestamp(start_time)
end_time_ts = datetime_to_timestamp_or_none(end_time) end_time_ts = datetime_to_timestamp_or_none(end_time)
stmt = lambda_stmt( stmt = lambda_stmt(
@@ -417,11 +408,10 @@ def state_changes_during_period(
include_start_time_state, include_start_time_state,
], ],
) )
states = execute_stmt_lambda_element(session, stmt, None, end_time)
return cast( return cast(
MutableMapping[str, list[State]], MutableMapping[str, list[State]],
_sorted_states_to_dict( _sorted_states_to_dict(
states, execute_stmt_lambda_element(session, stmt, None, end_time),
entity_ids, entity_ids,
entity_id_to_metadata_id, entity_id_to_metadata_id,
), ),
@@ -545,10 +535,11 @@ def _get_states_for_entities_stmt(
) )
def _get_run_start_ts_from_run_for_utc_point_in_time( def _get_run_start_ts_for_utc_point_in_time(
run: RecorderRuns | None, utc_point_in_time: datetime hass: HomeAssistant, utc_point_in_time: datetime
) -> float | None: ) -> float | None:
"""Return the start time of a run.""" """Return the start time of a run."""
run = recorder.get_instance(hass).recorder_runs_manager.get(utc_point_in_time)
if ( if (
run is not None run is not None
and (run_start := process_timestamp(run.start)) < utc_point_in_time and (run_start := process_timestamp(run.start)) < utc_point_in_time