Implement a new "Daily reset" solution

inverter/__init__.py

@@ -3,5 +3,5 @@
     Get information from Deye Microinverter
 """
 
-__version__ = '0.10.3'
+__version__ = '0.11.0'
 __author__ = 'Jens Diemer <[email protected]>'

inverter/cli/cli_app.py

@@ -577,6 +577,7 @@ def publish_loop(ip, port, inverter, verbosity: int):
 
     config = make_config(
         user_settings=user_settings,
+        config_path=toml_settings.file_path.parent,  # e.g.: ~/.config/inverter-connect/
         verbosity=verbosity,
         ip=ip,
         port=port,

inverter/daily_reset.py

@@ -1,35 +1,85 @@
+from __future__ import annotations
+
 import logging
-from datetime import datetime
+from datetime import date
+from pathlib import Path
 
 from inverter.api import Inverter, set_current_time
-from inverter.data_types import Config, InverterValue, ResetState
+from inverter.data_types import Config, InverterValue
+
 
 logger = logging.getLogger(__name__)
 
 
+class DailyProductionResetState:
+    """
+    Persistent state for "Daily reset"
+    """
+
+    def __init__(self, config_path: Path):
+        # config_path = toml_settings.file_path.parent  # FIXME: Get this information on a nicer way ;)
+        self.state_file_path = config_path / 'daily_reset_state.txt'
+
+        self.last_reset = self.read_last_reset()
+        if not self.last_reset:
+            logger.warning('Assume daily reset is done for today')
+            self.reset_done()
+
+    @property
+    def reset_done_today(self) -> bool:
+        return date.today() == self.last_reset
+
+    def reset_done(self) -> None:
+        # Reset was successfully done -> Store current date
+        today = date.today()
+        if self.last_reset is None or today > self.last_reset:
+            logger.info('Store today date %s to state file', today)
+            self.state_file_path.write_text(today.isoformat())
+            self.last_reset = today
+        else:
+            logger.info('Reset already done today: Skip touch the disk')
+
+    def read_last_reset(self) -> date | None:
+        try:
+            raw_date_str = self.state_file_path.read_text()
+        except OSError as err:
+            logger.info('Can not read last reset date from %s: %s', self.state_file_path, err)
+            return None
+
+        try:
+            last_reset_date = date.fromisoformat(raw_date_str)
+        except ValueError as err:
+            logger.error('Can not parse last reset date: %s', err)
+            return None
+
+        logger.info('Read last reset date: %s', last_reset_date)
+        return last_reset_date
+
+    def __str__(self):
+        return f'{self.last_reset=} {self.reset_done_today=}'
+
+    def __repr__(self):
+        return f'<DailyProductionResetState {self}>'
+
+
 class DailyProductionReset:
     """
     Deye SUN600 will not automatically reset the "Daily Production" counter.
-    Ro reset this counter it's needed to set the current time
+    To reset this counter it's needed to set the current time
     """
 
-    def __init__(self, reset_state: ResetState, inverter: Inverter, config: Config):
+    def __init__(self, reset_state: DailyProductionResetState, inverter: Inverter, config: Config):
         self.reset_state = reset_state
         self.inverter = inverter
         self.config = config
 
     def __enter__(self):
-        now = datetime.now()
-        now_time = now.time()
-        if self.config.reset_needed_start <= now_time <= self.config.reset_needed_end:
-            self.reset_state.reset_needed = True
-
         return self
 
     def __call__(self, value: InverterValue):
         assert self.inverter is not None
 
-        if not self.reset_state.reset_needed:
+        if self.reset_state.reset_done_today:
             logger.debug('Not needed: %s', self.reset_state)
             return
 
@@ -38,14 +88,13 @@ def __call__(self, value: InverterValue):
             return
 
         if value.value != 0:
-            self.reset_state.set_time_count += 1
             logger.info('set current time to reset counter %s', self.reset_state)
             set_current_time(inv_sock=self.inverter.inv_sock)
         else:
-            self.reset_state.reset_needed = False
-            self.reset_state.last_success_dt = datetime.now()
-            self.reset_state.successful_count += 1
+            self.reset_state.reset_done()
             logger.info('Successfully reset counter. %s', self.reset_state)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.inverter = None
+        if exc_type:
+            return False

inverter/data_types.py

@@ -2,7 +2,6 @@
 
 import dataclasses
 import logging
-from datetime import datetime, time
 from enum import Enum
 from pathlib import Path
 from typing import Callable
@@ -75,8 +74,7 @@ class Config:
     init_cmd: bytes = b'WIFIKIT-214028-READ'
 
     daily_production_name: str = 'Daily Production'  # Must be the same as in yaml config!
-    reset_needed_start: time = time(hour=1)
-    reset_needed_end: time = time(hour=3)
+    config_path: Path = None  # e.g.: ~/.config/inverter-connect/
 
     # Will be set by post init:
     definition_file_path: Path = None
@@ -102,15 +100,6 @@ def __post_init__(self):
             print(self)
 
 
-@dataclasses.dataclass
-class ResetState:
-    started: datetime
-    set_time_count: int = 0
-    successful_count: int = 0
-    last_success_dt: datetime = None
-    reset_needed: bool = False
-
-
 @dataclasses.dataclass
 class Parameter:
     start_register: int

inverter/publish_loop.py

@@ -1,6 +1,5 @@
 import logging
 import time
-from datetime import datetime
 
 from ha_services.cli_tools.rich_utils import human_error
 from ha_services.mqtt4homeassistant.converter import values2mqtt_payload
@@ -11,8 +10,8 @@
 
 from inverter.api import Inverter
 from inverter.constants import ERROR_STR_NO_DATA
-from inverter.daily_reset import DailyProductionReset
-from inverter.data_types import Config, InverterInfo, InverterValue, ResetState
+from inverter.daily_reset import DailyProductionReset, DailyProductionResetState
+from inverter.data_types import Config, InverterInfo, InverterValue
 from inverter.exceptions import ReadInverterError, ReadTimeout, ValidationError
 
 
@@ -28,7 +27,7 @@ def publish_forever(*, config: Config, verbosity):
     except Exception as err:
         human_error(message='given {mqtt_settings!r} is wrong?!?', exception=err)
 
-    reset_state = ResetState(started=datetime.now())
+    reset_state = DailyProductionResetState(config_path=config.config_path)
 
     while True:
         try: