Refactor error handling configuration in DbusService to use constants and update several places accordingly to the code review

Author: 0x7878

constants.py

@@ -7,6 +7,8 @@
 DTUVARIANT_TEMPLATE = "template"
 PRODUCTNAME = "henne49_dbus-opendtu"
 CONNECTION = "TCP/IP (HTTP)"
+MODE_TIMEOUT = "timeout"
+MODE_RETRYCOUNT = "retrycount"
 
 # Status codes for the DTU
 STATUSCODE_STARTUP = 0

dbus_service.py

@@ -222,7 +222,7 @@ def _read_config_dtu(self, actual_inverter):
         self.pollinginterval = int(get_config_value(config, "ESP8266PollingIntervall", "DEFAULT", "", 10000))
         self.meter_data = 0
         self.httptimeout = get_default_config(config, "HTTPTimeout", 2.5)
-        self._get_error_handling_config(config)
+        self._load_error_handling_config(config)
 
     def _read_config_template(self, template_number):
         config = self._get_config()
@@ -276,12 +276,12 @@ def _read_config_template(self, template_number):
         self.dry_run = is_true(get_default_config(config, "DryRun", False))
         self.meter_data = 0
         self.httptimeout = get_default_config(config, "HTTPTimeout", 2.5)
-        self._get_error_handling_config(config)
+        self._load_error_handling_config(config)
 
-    def _get_error_handling_config(self, config):
+    def _load_error_handling_config(self, config):
         '''Loads error handling configuration values from the provided config object.'''
 
-        self.error_mode = get_default_config(config, "ErrorMode", "retrycount").strip()
+        self.error_mode = get_default_config(config, "ErrorMode", constants.MODE_RETRYCOUNT).strip()
         self.retry_after_seconds = int(get_default_config(config, "RetryAfterSeconds", 180))
         self.min_retries_until_fail = int(get_default_config(config, "MinRetriesUntilFail", 3))
         self.error_state_after_seconds = int(get_default_config(config, "ErrorStateAfterSeconds", 0))
@@ -588,7 +588,7 @@ def update(self):
         successful = False
         now = time.time()
         try:
-            if self.error_mode == "timeout" and self.error_state_after_seconds > 0:
+            if self.error_mode == constants.MODE_TIMEOUT and self.error_state_after_seconds > 0:
                 # Set zero values only after ErrorStateAfterSeconds has elapsed since last success
                 if (not self.last_update_successful and (now - self._last_update) >= self.error_state_after_seconds):
                     self._handle_reconnect_wait()
@@ -598,11 +598,23 @@ def update(self):
                 # In normal operation (no error), always call _refresh_data on every update
                 if self.last_update_successful:
                     successful = self._refresh_and_update()
-            elif self.error_mode == "retrycount":
+            elif self.error_mode == constants.MODE_RETRYCOUNT:
                 # Classic retry-count-based error handling
                 if self.failed_update_count >= self.min_retries_until_fail:
                     self._handle_reconnect_wait()
-                if self._should_refresh_data(now):
+                # Determine if we should refresh data based on current state and timing
+                is_last_update_successful = self.last_update_successful
+                time_since_last_update = now - self._last_update
+                is_retry_interval_elapsed = time_since_last_update >= self.retry_after_seconds
+                is_below_min_retries = self.failed_update_count < self.min_retries_until_fail
+
+                should_refresh_data = (
+                    is_last_update_successful or
+                    is_retry_interval_elapsed or
+                    is_below_min_retries
+                )
+
+                if should_refresh_data:
                     successful = self._refresh_and_update()
         except requests.exceptions.RequestException as exception:
             logging.warning(f"HTTP Error at _update for inverter "

tests/test_dbus_service.py

@@ -6,6 +6,7 @@
 import os
 import json
 import requests
+from constants import MODE_TIMEOUT
 from dbus_service import DbusService
 
 
@@ -354,7 +355,7 @@ def test_statuscode_set_on_reconnect_and_reset(self):
 
     def test_timeout_mode_no_zero_before_timeout(self):
         """If ErrorMode=timeout and error_state_after_seconds=600, before 10min no zero/StatusCode=10 is sent."""
-        self.service.error_mode = "timeout"
+        self.service.error_mode = MODE_TIMEOUT
         self.service.error_state_after_seconds = 600  # 10 minutes
         self.service.last_update_successful = False
         self.service._last_update = time.time() - 300  # 5 minutes ago
@@ -367,7 +368,7 @@ def test_timeout_mode_no_zero_before_timeout(self):
 
     def test_timeout_mode_zero_after_timeout(self):
         """If ErrorMode=timeout and error_state_after_seconds=600, after 10min zero/StatusCode=10 is sent."""
-        self.service.error_mode = "timeout"
+        self.service.error_mode = MODE_TIMEOUT
         self.service.error_state_after_seconds = 600  # 10 minutes
         self.service.last_update_successful = False
         self.service._last_update = time.time() - 601  # just over 10 minutes ago
@@ -381,7 +382,7 @@ def test_timeout_mode_zero_after_timeout(self):
 
     def test_timeout_mode_timer_resets_on_success(self):
         """If in timeout mode a successful update occurs in between, the timer is reset and no zero values are sent."""
-        self.service.error_mode = "timeout"
+        self.service.error_mode = MODE_TIMEOUT
         self.service.error_state_after_seconds = 600  # 10 Minuten
         self.service.last_update_successful = False
         self.service._last_update = time.time() - 601  # Über Timeout, würde Nullwerte senden
@@ -410,7 +411,7 @@ def test_normal_operation_successful_update(self):
 
     def test_normal_operation_successful_update_timeout_mode(self):
         """Test that in timeout mode, normal operation calls all expected methods and resets error state."""
-        self.service.error_mode = "timeout"
+        self.service.error_mode = MODE_TIMEOUT
         self.service.error_state_after_seconds = 600  # 10 minutes
         self.service.failed_update_count = 0
         self.service.last_update_successful = True