get_historic_data

tibber/home.py

@@ -11,7 +11,7 @@
 
 from gql import gql
 
-from .const import RESOLUTION_HOURLY
+from .const import RESOLUTION_HOURLY, RESOLUTION_MONTHLY, RESOLUTION_WEEKLY, RESOLUTION_DAILY, RESOLUTION_ANNUAL
 from .gql_queries import (
     HISTORIC_DATA,
     HISTORIC_DATA_DATE,
@@ -519,6 +519,7 @@
         n_data: int,
         resolution: str = RESOLUTION_HOURLY,
         production: bool = False,
+        cursor: str = "",
     ) -> list[dict[str, Any]]:
         """Get historic data.
 
@@ -529,21 +530,39 @@
         :param production: True to get production data instead of consumption
         """
         cons_or_prod_str = "production" if production else "consumption"
-        query = HISTORIC_DATA.format(
-            self.home_id,
-            cons_or_prod_str,
-            resolution,
-            n_data,
-            "profit" if production else "totalCost cost",
-            "",
-        )
-        if not (data := await self._tibber_control.execute(query, timeout=30)):
-            _LOGGER.error("Could not get the data.")
-            return []
-        data = data["viewer"]["home"][cons_or_prod_str]
-        if data is None:
-            return []
-        return data["nodes"]
+        res = []
+        if resolution == RESOLUTION_HOURLY:
+            max_n_data = 24 * 30
+        elif resolution == RESOLUTION_DAILY:
+            max_n_data = 30
+        elif resolution == RESOLUTION_WEEKLY:
+            max_n_data = 52
+        elif resolution == RESOLUTION_MONTHLY:
+            max_n_data = 12
+        else:
+            max_n_data = 1
+        for k in range(n_data // max_n_data + 1):
+            _n_data = min(max_n_data, n_data)
+            _n_data = min(_n_data, n_data - len(res))
+            query = HISTORIC_DATA.format(
+                self.home_id,
+                cons_or_prod_str,
+                resolution,
+                _n_data,
+                "profit" if production else "totalCost cost",
+                cursor,
+            )
+            if not (data := await self._tibber_control.execute(query)):
+                _LOGGER.error("Could not get the data.")
+                continue
+            data = data["viewer"]["home"][cons_or_prod_str]
+            if data is None:
+                continue
+            res.extend(data["nodes"])
+            if len(res) >= n_data:
+                break
+            cursor = data["pageInfo"]["startCursor"]
+        return res
 
     async def get_historic_data_date(
         self,
@@ -568,27 +587,13 @@
             # Calculate the number of days to the end of the month from the given date
             n_data = (date_from.replace(day=1, month=date_from.month + 1) - date_from).days
 
-        cons_or_prod_str = "production" if production else "consumption"
-        query = HISTORIC_DATA_DATE.format(
-            self.home_id,
-            cons_or_prod_str,
-            resolution,
+        return await self.get_historic_data(
             n_data,
+            resolution,
+            production,
             date_from_base64,
-            "profit production productionUnit" if production else "cost consumption consumptionUnit",
         )
 
-        if not (data := await self._tibber_control.execute(query, timeout=30)):
-            _LOGGER.error("Could not get the data.")
-            return []
-
-        data = data["viewer"]["home"][cons_or_prod_str]
-
-        if data is None:
-            return []
-
-        return data["nodes"]
-
     async def get_historic_price_data(
         self,
         resolution: str = RESOLUTION_HOURLY,