Refactor, get price (#18)

* Refactor, get price

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

* Refactor, get price

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

* Refactor, get price

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

Author: Danielhiversen

custom_components/tibber_data/data_coordinator.py

@@ -1,7 +1,7 @@
 """Data coordinator for Tibber."""
 import datetime
 import logging
-from typing import List
+from typing import List, Set
 
 import tibber
 from homeassistant.components.sensor import (
@@ -44,6 +44,7 @@ def __init__(self, hass, tibber_home: tibber.TibberHome, email: str, password: s
         self._password = password
         self._token = None
         self._chargers: List[str] = []
+        self._month_consumption: Set[Consumption] = set()
 
         _next_update = dt_util.now() - datetime.timedelta(minutes=1)
         self._update_functions = {
@@ -55,6 +56,14 @@ def __init__(self, hass, tibber_home: tibber.TibberHome, email: str, password: s
         if self.tibber_home.has_production:
             self._update_functions[self._get_production_data] = _next_update
 
+    def get_price_at(self, timestamp: datetime.datetime):
+        """Get price at a specific time."""
+        timestamp = timestamp.replace(minute=0, second=0, microsecond=0)
+        for consumption in self._month_consumption:
+            if dt_util.as_local(consumption.timestamp) == dt_util.as_local(timestamp):
+                return consumption.price
+        return None
+
     async def _async_update_data(self):
         """Update data via API."""
         now = dt_util.now(dt_util.DEFAULT_TIME_ZONE)
@@ -282,6 +291,7 @@ async def _get_data(self, data, now):
         self.hass.data[DOMAIN][
             f"month_consumption_{self.tibber_home.home_id}"
         ] = month_consumption
+        self._month_consumption = month_consumption
 
         if prices_tomorrow_available:
             next_update = min(

custom_components/tibber_data/sensor.py

@@ -87,8 +87,8 @@ def _attr_name(self):
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
         if self.entity_description.key == "est_current_price_with_subsidy":
-            price_data = self.coordinator.tibber_home.current_price_data()
-            native_value = price_data[0] - self.coordinator.data.get("est_subsidy", 0)
+            price = self.coordinator.get_price_at(dt_util.now())
+            native_value = price - self.coordinator.data.get("est_subsidy", 0)
         elif self.entity_description.key == "grid_price":
             native_value = self.coordinator.data.get(
                 self.entity_description.key, {}
@@ -97,9 +97,9 @@ def _handle_coordinator_update(self) -> None:
             grid_price = self.coordinator.data.get("grid_price", {}).get(
                 dt_util.now().replace(minute=0, second=0, microsecond=0)
             )
-            price_data = self.coordinator.tibber_home.current_price_data()
+            price = self.coordinator.get_price_at(dt_util.now())
             native_value = (
-                grid_price + price_data[0] - self.coordinator.data.get("est_subsidy", 0)
+                grid_price + price - self.coordinator.data.get("est_subsidy", 0)
             )
         else:
             native_value = self.coordinator.data.get(self.entity_description.key)