Disable week statistics, don't update production-statistics when no production

Author: bouwew

plugwise_usb/nodes/helpers/counter.py

@@ -30,8 +30,8 @@ class EnergyType(Enum):
     EnergyType.PRODUCTION_HOUR,
     EnergyType.CONSUMPTION_DAY,
     EnergyType.PRODUCTION_DAY,
-    EnergyType.CONSUMPTION_WEEK,
-    EnergyType.PRODUCTION_WEEK,
+    # EnergyType.CONSUMPTION_WEEK,
+    # EnergyType.PRODUCTION_WEEK,
 )
 ENERGY_HOUR_COUNTERS: Final = (
     EnergyType.CONSUMPTION_HOUR,
@@ -49,12 +49,12 @@ class EnergyType(Enum):
 ENERGY_CONSUMPTION_COUNTERS: Final = (
     EnergyType.CONSUMPTION_HOUR,
     EnergyType.CONSUMPTION_DAY,
-    EnergyType.CONSUMPTION_WEEK,
+    # EnergyType.CONSUMPTION_WEEK,
 )
 ENERGY_PRODUCTION_COUNTERS: Final = (
     EnergyType.PRODUCTION_HOUR,
     EnergyType.PRODUCTION_DAY,
-    EnergyType.PRODUCTION_WEEK,
+    # EnergyType.PRODUCTION_WEEK,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -154,12 +154,10 @@ def update(self) -> None:
         self._pulse_collection.recalculate_missing_log_addresses()
         if self._calibration is None:
             return
+
         self._energy_statistics.log_interval_consumption = (
             self._pulse_collection.log_interval_consumption
         )
-        self._energy_statistics.log_interval_production = (
-            self._pulse_collection.log_interval_production
-        )
         (
             self._energy_statistics.hour_consumption,
             self._energy_statistics.hour_consumption_reset,
@@ -168,23 +166,27 @@ def update(self) -> None:
             self._energy_statistics.day_consumption,
             self._energy_statistics.day_consumption_reset,
         ) = self._counters[EnergyType.CONSUMPTION_DAY].update(self._pulse_collection)
-        (
-            self._energy_statistics.week_consumption,
-            self._energy_statistics.week_consumption_reset,
-        ) = self._counters[EnergyType.CONSUMPTION_WEEK].update(self._pulse_collection)
-
-        (
-            self._energy_statistics.hour_production,
-            self._energy_statistics.hour_production_reset,
-        ) = self._counters[EnergyType.PRODUCTION_HOUR].update(self._pulse_collection)
-        (
-            self._energy_statistics.day_production,
-            self._energy_statistics.day_production_reset,
-        ) = self._counters[EnergyType.PRODUCTION_DAY].update(self._pulse_collection)
-        (
-            self._energy_statistics.week_production,
-            self._energy_statistics.week_production_reset,
-        ) = self._counters[EnergyType.PRODUCTION_WEEK].update(self._pulse_collection)
+        # (
+        #     self._energy_statistics.week_consumption,
+        #     self._energy_statistics.week_consumption_reset,
+        # ) = self._counters[EnergyType.CONSUMPTION_WEEK].update(self._pulse_collection)
+
+        if self.pulse_collection._log_production:
+            self._energy_statistics.log_interval_production = (
+                self._pulse_collection.log_interval_production
+            )
+            (
+                self._energy_statistics.hour_production,
+                self._energy_statistics.hour_production_reset,
+            ) = self._counters[EnergyType.PRODUCTION_HOUR].update(self._pulse_collection)
+            (
+                self._energy_statistics.day_production,
+                self._energy_statistics.day_production_reset,
+            ) = self._counters[EnergyType.PRODUCTION_DAY].update(self._pulse_collection)
+            # (
+            #     self._energy_statistics.week_production,
+            #     self._energy_statistics.week_production_reset,
+            # ) = self._counters[EnergyType.PRODUCTION_WEEK].update(self._pulse_collection)
 
     @property
     def timestamp(self) -> datetime | None:
@@ -214,8 +216,8 @@ def __init__(
         self._duration = "hour"
         if energy_id in ENERGY_DAY_COUNTERS:
             self._duration = "day"
-        elif energy_id in ENERGY_WEEK_COUNTERS:
-            self._duration = "week"
+        #elif energy_id in ENERGY_WEEK_COUNTERS:
+        #    self._duration = "week"
         self._energy_id: EnergyType = energy_id
         self._is_consumption = True
         self._direction = "consumption"
@@ -301,14 +303,14 @@ def update(
             last_reset = last_reset.replace(minute=0, second=0, microsecond=0)
         elif self._energy_id in ENERGY_DAY_COUNTERS:
             last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
-        elif self._energy_id in ENERGY_WEEK_COUNTERS:
-            last_reset = last_reset - timedelta(days=last_reset.weekday())
-            last_reset = last_reset.replace(
-                hour=0,
-                minute=0,
-                second=0,
-                microsecond=0,
-            )
+        # elif self._energy_id in ENERGY_WEEK_COUNTERS:
+        #     last_reset = last_reset - timedelta(days=last_reset.weekday())
+        #     last_reset = last_reset.replace(
+        #         hour=0,
+        #         minute=0,
+        #         second=0,
+        #         microsecond=0,
+        #     )
 
         pulses, last_update = pulse_collection.collected_pulses(
             last_reset, self._is_consumption