Home Assistant Git Exporter

config/custom_components/irrigation_unlimited/history.py

@@ -1,10 +1,15 @@
 """History access and caching. This module runs asynchronously collecting
 and caching history data"""
+
 from datetime import datetime, timedelta
 from typing import Callable, OrderedDict, Any
 from homeassistant.core import HomeAssistant, State, CALLBACK_TYPE
 from homeassistant.util import dt
-from homeassistant.components.recorder.const import DATA_INSTANCE as RECORDER_INSTANCE
+
+try:
+    from homeassistant.helpers.recorder import DATA_INSTANCE
+except ImportError:
+    from homeassistant.components.recorder.const import DATA_INSTANCE
 from homeassistant.components.recorder import get_instance
 from homeassistant.helpers.event import (
     async_track_point_in_utc_time,
@@ -15,6 +20,7 @@ from homeassistant.const import STATE_ON
 from .const import (
     ATTR_CURRENT_ADJUSTMENT,
     ATTR_CURRENT_NAME,
+    ATTR_CURRENT_SCHEDULE,
     CONF_ENABLED,
     CONF_HISTORY,
     CONF_HISTORY_REFRESH,
@@ -22,6 +28,7 @@ from .const import (
     CONF_REFRESH_INTERVAL,
     CONF_SPAN,
     TIMELINE_ADJUSTMENT,
+    TIMELINE_SCHEDULE,
     TIMELINE_SCHEDULE_NAME,
     TIMELINE_START,
     TIMELINE_END,
@@ -166,6 +173,7 @@ class IUHistory:
             result = OrderedDict()
             result[TIMELINE_START] = round_seconds_dt(item.last_changed)
             result[TIMELINE_END] = round_seconds_dt(end)
+            result[TIMELINE_SCHEDULE] = item.attributes.get(ATTR_CURRENT_SCHEDULE)
             result[TIMELINE_SCHEDULE_NAME] = item.attributes.get(ATTR_CURRENT_NAME)
             result[TIMELINE_ADJUSTMENT] = item.attributes.get(
                 ATTR_CURRENT_ADJUSTMENT, ""
@@ -197,7 +205,7 @@ class IUHistory:
             return
 
         start = self._stime - self._history_span
-        if RECORDER_INSTANCE in self._hass.data:
+        if DATA_INSTANCE in self._hass.data:
             data = await get_instance(self._hass).async_add_executor_job(
                 history.get_significant_states,
                 self._hass,