component-wise error handling

docs/samples/sample_modbus/sample_modbus/device.py

@@ -3,6 +3,7 @@
 from typing import Iterable,  Union
 
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.sample_modbus.sample_modbus.bat import SampleBat
@@ -31,7 +32,8 @@ def create_inverter_component(component_config: SampleInverterSetup):
     def update_components(components: Iterable[Union[SampleBat, SampleCounter, SampleInverter]]):
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

docs/samples/sample_request_by_device/sample_request_by_device/device.py

@@ -4,6 +4,7 @@
 
 from modules.common import req
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.devices.sample_request_by_device.sample_request_by_device.bat import SampleBat
 from modules.devices.sample_request_by_device.sample_request_by_device.config import Sample, SampleBatSetup, SampleCounterSetup, SampleInverterSetup
@@ -26,7 +27,8 @@ def create_inverter_component(component_config: SampleInverterSetup):
     def update_components(components: Iterable[Union[SampleBat, SampleCounter, SampleInverter]]):
         response = req.get_http_session().get(device_config.configuration.ip_address, timeout=5).json()
         for component in components:
-            component.update(response)
+            with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                component.update(response)
 
     return ConfigurableDevice(
         device_config=device_config,

packages/modules/devices/algodue/algodue/device.py

@@ -23,7 +23,7 @@ def create_counter_component(component_config: AlgodueCounterSetup):
     def update_components(components: Iterable[counter.AlgodueCounter]):
         with client:
             for component in components:
-                with SingleComponentUpdateContext(component.fault_state):
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
                     component.update()
 
     def initializer():

packages/modules/devices/alpha_ess/alpha_ess/device.py

@@ -4,6 +4,7 @@
 from typing import Iterable, Union
 
 from helpermodules.utils.run_command import run_command
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.alpha_ess.alpha_ess.config import (
     AlphaEss, AlphaEssBatSetup, AlphaEssCounterSetup, AlphaEssInverterSetup)
@@ -48,7 +49,8 @@ def update_components(components: Iterable[Union[alpha_ess_component_classes]]):
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/ampere/ampere/device.py

@@ -3,6 +3,7 @@
 from typing import Iterable, Union
 
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.ampere.ampere.bat import AmpereBat
@@ -40,7 +41,8 @@ def create_inverter_component(component_config: AmpereInverterSetup):
     def update_components(components: Iterable[Union[AmpereBat, AmpereCounter, AmpereInverter]]):
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/avm/avm/device.py

@@ -9,6 +9,7 @@
 from helpermodules.pub import Pub
 from modules.common import req
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.devices.avm.avm.config import Avm, AvmCounterSetup
 from modules.devices.avm.avm.counter import AvmCounter
@@ -36,7 +37,8 @@ def update_components(components: Iterable[AvmCounter]):
         deviceListElementTree = ET.fromstring(response.text.strip())
 
         for component in components:
-            component.update(deviceListElementTree)
+            with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                component.update(deviceListElementTree)
 
     def get_session_id():
         # checking existing sessionID

packages/modules/devices/azzurro_zcs/azzurro_zcs/device.py

@@ -3,6 +3,7 @@
 from typing import Iterable, Union
 
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.azzurro_zcs.azzurro_zcs.bat import ZCSBat
@@ -36,7 +37,8 @@ def update_components(components: Iterable[Union[ZCSBat, ZCSCounter, ZCSInverter
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/batterx/batterx/device.py

@@ -4,7 +4,7 @@
 
 from helpermodules.cli import run_using_positional_cli_args
 from modules.common.abstract_device import DeviceDescriptor
-from modules.common.component_context import MultiComponentUpdateContext
+from modules.common.component_context import MultiComponentUpdateContext, SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.common.store import get_inverter_value_store
 from modules.devices.batterx.batterx import bat, external_inverter
@@ -39,7 +39,8 @@ def update_components(components: Iterable[batterx_component_classes]):
             'http://' + device_config.configuration.ip_address + '/api.php?get=currentstate',
             timeout=5).json()
         for component in components:
-            component.update(resp_json)
+            with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                component.update(resp_json)
 
     return ConfigurableDevice(
         device_config=device_config,

packages/modules/devices/carlo_gavazzi/carlo_gavazzi/device.py

@@ -2,6 +2,7 @@
 import logging
 from typing import Iterable
 
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.carlo_gavazzi.carlo_gavazzi import counter
 from modules.devices.carlo_gavazzi.carlo_gavazzi.config import CarloGavazzi, CarloGavazziCounterSetup
@@ -23,7 +24,8 @@ def update_components(components: Iterable[counter.CarloGavazziCounter]):
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/deye/deye/device.py

@@ -4,6 +4,7 @@
 
 from helpermodules.cli import run_using_positional_cli_args
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.deye.deye.bat import DeyeBat
@@ -34,7 +35,8 @@ def update_components(components: Iterable[Union[DeyeBat, DeyeCounter, DeyeInver
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/e3dc/e3dc/device.py

@@ -4,6 +4,7 @@
 
 from helpermodules.cli import run_using_positional_cli_args
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common import modbus
 from modules.devices.e3dc.e3dc.bat import E3dcBat, read_bat
@@ -59,7 +60,8 @@ def update_components(components: Iterable[Union[E3dcBat, E3dcCounter, E3dcInver
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/enphase/enphase/device.py

@@ -8,6 +8,7 @@
 from helpermodules.pub import Pub
 from modules.common import req
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.enphase.enphase.bat import EnphaseBat
 from modules.devices.enphase.enphase.config import (EnphaseVersion,
@@ -143,7 +144,8 @@ def update_components(components: Iterable[Union[EnphaseBat, EnphaseCounter, Enp
                 log.error(f"unknown version: {device_config.configuration.version}")
                 return
             for component in components:
-                component.update(json_response, json_live_data)
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update(json_response, json_live_data)
 
     read_live_data = False
     token_tries = 0

packages/modules/devices/fox_ess/fox_ess/device.py

@@ -3,6 +3,7 @@
 from typing import Iterable, Union
 
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.fox_ess.fox_ess.bat import FoxEssBat
@@ -32,7 +33,8 @@ def update_components(components: Iterable[Union[FoxEssBat, FoxEssCounter, FoxEs
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/generic/json/device.py

@@ -5,6 +5,7 @@
 from helpermodules.cli import run_using_positional_cli_args
 from modules.common import req
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.devices.generic.json import bat, counter, inverter
 from modules.devices.generic.json.bat import JsonBat
@@ -36,7 +37,8 @@ def create_inverter(component_config: JsonInverterSetup) -> JsonInverter:
     def update_components(components: Iterable[JsonComponent]):
         response = req.get_http_session().get(device_config.configuration.url, timeout=5).json()
         for component in components:
-            component.update(response)
+            with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                component.update(response)
 
     return ConfigurableDevice(
         device_config,

packages/modules/devices/generic/mqtt/bat.py

@@ -26,9 +26,10 @@ def initialize(self) -> None:
         self.store = get_bat_value_store(self.component_config.id)
 
     def update(self, received_topics: Dict) -> None:
+        # [] für erforderliche Topics, .get() für optionale Topics
         currents = received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/currents")
-        power = received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/power")
-        soc = received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/soc")
+        power = received_topics[f"openWB/mqtt/bat/{self.component_config.id}/get/power"]
+        soc = received_topics[f"openWB/mqtt/bat/{self.component_config.id}/get/soc"]
         if (received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/imported") and
                 received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/exported")):
             imported = received_topics.get(f"openWB/mqtt/bat/{self.component_config.id}/get/imported")

packages/modules/devices/generic/mqtt/counter.py

@@ -25,8 +25,9 @@ def initialize(self) -> None:
         self.store = get_counter_value_store(self.component_config.id)
 
     def update(self, received_topics: Dict) -> None:
+        # [] für erforderliche Topics, .get() für optionale Topics
         currents = received_topics.get(f"openWB/mqtt/counter/{self.component_config.id}/get/currents")
-        power = received_topics.get(f"openWB/mqtt/counter/{self.component_config.id}/get/power")
+        power = received_topics[f"openWB/mqtt/counter/{self.component_config.id}/get/power"]
         frequency = received_topics.get(f"openWB/mqtt/counter/{self.component_config.id}/get/frequency")
         power_factors = received_topics.get(f"openWB/mqtt/counter/{self.component_config.id}/get/power_factors")
         powers = received_topics.get(f"openWB/mqtt/counter/{self.component_config.id}/get/powers")

packages/modules/devices/generic/mqtt/device.py

@@ -5,6 +5,7 @@
 from helpermodules.broker import BrokerClient
 from helpermodules.utils.topic_parser import decode_payload
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.component_type import type_to_topic_mapping
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.generic.mqtt import bat, counter, inverter
@@ -38,7 +39,14 @@ def on_message(client, userdata, message):
         if received_topics:
             log.debug(f"Empfange MQTT Daten für Gerät {device_config.id}: {received_topics}")
             for component in components:
-                component.update(received_topics)
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    try:
+                        component.update(received_topics)
+                    except KeyError:
+                        raise KeyError(
+                            "Fehlende MQTT-Daten: Stelle sicher, dass Du Werte an die erforderlichen Topics "
+                            "(beschrieben in den Komponenten-Einstellungen) veröffentlichst (Publish)."
+                        )
         else:
             for component in components:
                 component.fault_state.warning(

packages/modules/devices/generic/mqtt/inverter.py

@@ -25,7 +25,8 @@ def initialize(self) -> None:
         self.store = get_inverter_value_store(self.component_config.id)
 
     def update(self, received_topics: Dict) -> None:
-        power = received_topics.get(f"openWB/mqtt/pv/{self.component_config.id}/get/power")
+        # [] für erforderliche Topics, .get() für optionale Topics
+        power = received_topics[f"openWB/mqtt/pv/{self.component_config.id}/get/power"]
         if received_topics.get(f"openWB/mqtt/pv/{self.component_config.id}/get/exported"):
             exported = received_topics.get(f"openWB/mqtt/pv/{self.component_config.id}/get/exported")
         else:

packages/modules/devices/good_we/good_we/device.py

@@ -4,6 +4,7 @@
 
 from modules.common import modbus
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.good_we.good_we import bat
 from modules.devices.good_we.good_we import counter
@@ -49,8 +50,8 @@ def update_components(components: Iterable[good_we_component_classes]):
         nonlocal client
         with client:
             for component in components:
-
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/growatt/growatt/device.py

@@ -5,6 +5,7 @@
 
 from helpermodules.utils.run_command import run_command
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.growatt.growatt.bat import GrowattBat
@@ -44,7 +45,8 @@ def update_components(components: Iterable[Union[GrowattBat, GrowattCounter, Gro
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/huawei/huawei/device.py

@@ -5,6 +5,7 @@
 
 from helpermodules.utils.run_command import run_command
 from modules.common.abstract_device import DeviceDescriptor
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.common.modbus import ModbusTcpClient_
 from modules.devices.huawei.huawei.bat import HuaweiBat
@@ -47,7 +48,8 @@ def update_components(components: Iterable[Union[HuaweiBat, HuaweiCounter, Huawe
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/huawei/huawei_smartlogger/device.py

@@ -4,6 +4,7 @@
 
 from modules.common.abstract_device import DeviceDescriptor
 from modules.common import modbus
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.devices.huawei.huawei_smartlogger import counter
 from modules.devices.huawei.huawei_smartlogger import inverter
@@ -40,7 +41,8 @@ def update_components(components: Iterable[huawei_smartlogger_component_classes]
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client

packages/modules/devices/janitza/janitza/device.py

@@ -2,6 +2,7 @@
 import logging
 from typing import Iterable, Union
 
+from modules.common.component_context import SingleComponentUpdateContext
 from modules.common.configurable_device import ComponentFactoryByType, ConfigurableDevice, MultiComponentUpdater
 from modules.common import modbus
 from modules.common.abstract_device import DeviceDescriptor
@@ -34,7 +35,8 @@ def update_components(components: Iterable[Union[counter.JanitzaCounter, inverte
         nonlocal client
         with client:
             for component in components:
-                component.update()
+                with SingleComponentUpdateContext(component.fault_state, update_always=False):
+                    component.update()
 
     def initializer():
         nonlocal client