Update energy buy function to support past days retrieval

Author: felixschndr

source/inverter_charge_controller.py

@@ -1,9 +1,10 @@
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 
 import pause
 from abscence_handler import AbsenceHandler
 from aiohttp import ClientError
 from dateutil import tz
+from energy_amount import EnergyAmount
 from environment_variable_getter import EnvironmentVariableGetter
 from goodwe import OperationMode
 from inverter import Inverter
@@ -179,8 +180,9 @@ def _charge_inverter(self, target_state_of_charge: int) -> None:
         charging_progress_check_interval = timedelta(minutes=5)
         dry_run = EnvironmentVariableGetter.get(name_of_variable="DRY_RUN", default_value=True)
 
-        energy_buy_of_today_before_charging = self.sems_portal_api_handler.get_energy_buy_of_today()
-        self.log.debug(f"The amount of energy bought before charging is {energy_buy_of_today_before_charging}")
+        energy_bought_before_charging = self.sems_portal_api_handler.get_energy_buy()
+        date_starting_to_charge = date.today()
+        self.log.debug(f"The amount of energy bought before charging is {energy_bought_before_charging}")
 
         self.log.info("Starting to charge")
         self.inverter.set_operation_mode(OperationMode.ECO_CHARGE)
@@ -217,9 +219,24 @@ def _charge_inverter(self, target_state_of_charge: int) -> None:
                 f"Charging is still ongoing (current: {current_state_of_charge} %, target: >= {target_state_of_charge} %) --> Waiting for another {charging_progress_check_interval}..."
             )
 
-        energy_buy_of_today_after_charging = self.sems_portal_api_handler.get_energy_buy_of_today()
-        self.log.debug(f"The amount of energy bought after charging is {energy_buy_of_today_after_charging}")
+        energy_bought = self._calculate_amount_of_energy_bought(energy_bought_before_charging, date_starting_to_charge)
+        self.log.info(f"Bought {energy_bought} to charge the battery")
 
-        self.log.info(
-            f"Bought {energy_buy_of_today_after_charging - energy_buy_of_today_before_charging} to charge the battery"
+    def _calculate_amount_of_energy_bought(
+        self, energy_bought_before_charging: EnergyAmount, date_starting_to_charge: date
+    ) -> EnergyAmount:
+        date_ending_to_charge = date.today()
+
+        if date_starting_to_charge == date_ending_to_charge:
+            energy_bought_today_after_charging = self.sems_portal_api_handler.get_energy_buy()
+            self.log.debug(
+                f"It is till the same day since starting to charge, the amount of energy bought after charging is {energy_bought_today_after_charging}"
+            )
+            return energy_bought_today_after_charging - energy_bought_before_charging
+
+        energy_bought_today_after_charging = self.sems_portal_api_handler.get_energy_buy()
+        energy_bought_yesterday = self.sems_portal_api_handler.get_energy_buy(1) - energy_bought_before_charging
+        self.log.debug(
+            f"It is the next day since starting to charge, the amount of energy bought after charging (today) is {energy_bought_today_after_charging}, the amount of energy bought after charging (yesterday) is {energy_bought_yesterday}"
         )
+        return energy_bought_today_after_charging + energy_bought_yesterday

source/sems_portal_api_handler.py

@@ -131,12 +131,19 @@ def _extract_energy_usage_data_of_response(self, response_json: dict) -> list[En
 
         return last_weeks_energy_usage
 
-    def get_energy_buy_of_today(self) -> EnergyAmount:
+    def get_energy_buy(self, days_in_past: int = 0) -> EnergyAmount:
         """
-        Crawls the SEMSPORTAL API for the amount of energy bought today until this point in time.
+        Determines the amount of energy bought for a specified day in the past.
+
+        The argument days_in_past specifies how many days to look for in the past. E.g.,
+         - days_in_past = 0 --> energy bought today until this point in time
+         - days_in_past = 1 --> energy bought yesterday
+
+        Args:
+            days_in_past: The number of days in the past to retrieve data for. Default is 0, which means today.
 
         Returns:
-            EnergyAmount: The amount of energy bought today.
+            An instance of EnergyAmount representing the energy bought.
         """
         self.log.debug("Determining the amount of energy bought today")
 
@@ -146,7 +153,7 @@ def get_energy_buy_of_today(self) -> EnergyAmount:
         lines = api_response["data"]["lines"]
         buy_line = [line for line in lines if "buy" in line["label"].lower()][0]
 
-        return EnergyAmount.from_kilo_watt_hours(buy_line["xy"][-1]["y"])
+        return EnergyAmount.from_kilo_watt_hours(buy_line["xy"][-1 - days_in_past]["y"])
 
     def estimate_energy_usage_in_timeframe(self, timestamp_start: datetime, timestamp_end: datetime) -> EnergyAmount:
         """