Implement TimeHandler.get_timezone() for getting timezone information

Author: felixschndr

source/abscence_handler.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 
-from dateutil.tz import tz
 from energy_amount import EnergyAmount, Power
 from environment_variable_getter import EnvironmentVariableGetter
 from logger import LoggerMixin
+from time_handler import TimeHandler
 
 
 class AbsenceHandler(LoggerMixin):
@@ -12,8 +12,6 @@ class AbsenceHandler(LoggerMixin):
     def __init__(self):
         super().__init__()
 
-        self.timezone = tz.gettz()
-
     def check_for_current_absence(self) -> bool:
         absence_input = ""
         try:
@@ -42,7 +40,7 @@ def _check_for_current_absence(self, absence_input: str) -> bool:
             if timestamp.tzinfo is None:
                 raise ValueError(f'"{absence_start_raw}" has no timezone information')
 
-        if absence_start < datetime.now(tz=self.timezone) < absence_end:
+        if absence_start < datetime.now(tz=TimeHandler.get_timezone()) < absence_end:
             return True
 
         return False

source/inverter_charge_controller.py

@@ -3,7 +3,6 @@
 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
@@ -13,6 +12,7 @@
 from sems_portal_api_handler import SemsPortalApiHandler
 from sun_forecast_handler import SunForecastHandler
 from tibber_api_handler import TibberAPIHandler
+from time_handler import TimeHandler
 
 
 class InverterChargeController(LoggerMixin):
@@ -21,8 +21,7 @@ def __init__(self):
 
         self.log.info("Starting application")
 
-        self.timezone = tz.gettz()
-
+        self.timezone = TimeHandler.get_timezone()
         self.sems_portal_api_handler = SemsPortalApiHandler()
         self.sun_forecast_handler = SunForecastHandler()
         self.inverter = Inverter()

source/tibber_api_handler.py

@@ -1,11 +1,11 @@
 from datetime import datetime, timedelta
 
-from dateutil import tz
 from energy_amount import EnergyRate
 from environment_variable_getter import EnvironmentVariableGetter
 from gql import Client, gql
 from gql.transport.aiohttp import AIOHTTPTransport
 from logger import LoggerMixin
+from time_handler import TimeHandler
 
 
 class TibberAPIHandler(LoggerMixin):
@@ -244,8 +244,9 @@ def _check_if_minimum_is_at_end_of_day_and_energy_rates_of_tomorrow_are_unavaila
         """
 
         # We use 00:01 instead of 00:00 since the software runs just a few (milli)seconds after the start of the hour
-        timezone = tz.gettz()
-        end_of_day = (datetime.now(tz=timezone) + timedelta(days=1)).replace(hour=0, minute=1, second=0, microsecond=0)
+        end_of_day = (datetime.now(tz=TimeHandler.get_timezone()) + timedelta(days=1)).replace(
+            hour=0, minute=1, second=0, microsecond=0
+        )
         three_hours_before_end_of_day = end_of_day - timedelta(hours=3)
 
         is_price_minimum_near_end_of_day = price_minimum.timestamp >= three_hours_before_end_of_day

source/time_handler.py

@@ -1,6 +1,6 @@
 from datetime import datetime, time, timedelta
 
-from dateutil.tz import tz
+from dateutil.tz import tz, tzfile
 
 
 class TimeHandler:
@@ -63,7 +63,7 @@ def calculate_day_night_duration(
         duration_day = timedelta(seconds=0)
         duration_night = timedelta(seconds=0)
 
-        timezone = tz.gettz()
+        timezone = TimeHandler.get_timezone()
 
         current_time = timestamp_start
 
@@ -91,3 +91,7 @@ def calculate_day_night_duration(
                 current_time = day_end
 
         return duration_day, duration_night
+
+    @staticmethod
+    def get_timezone() -> tzfile:
+        return tz.gettz()