Component error handler (#2317)

* component  error handler

* fixes

* fix test

* fix janitza

Author: LKuemmel

docs/samples/sample_modbus/__init__.py docs/samples/sample_modbus/__init__ .pydocs/samples/sample_modbus/__init__.py renamed to docs/samples/sample_modbus/__init__ .py

@@ -1,27 +1,36 @@
 #!/usr/bin/env python3
-from typing import Optional
-from dataclass_utils import dataclass_from_dict
+from typing import Optional, TypedDict, Any
 from modules.common.abstract_device import AbstractBat
 from modules.common.component_state import BatState
 from modules.common.component_type import ComponentDescriptor
 from modules.common.fault_state import ComponentInfo, FaultState
 from modules.common.modbus import ModbusDataType, ModbusTcpClient_
 from modules.common.simcount import SimCounter
 from modules.common.store import get_bat_value_store
-from modules.devices.sample_modbus.config import SampleBatSetup
+from modules.devices.sample_modbus.sample_modbus.config import SampleBatSetup
+
+
+class KwargsDict(TypedDict):
+    device_id: int
+    client: ModbusTcpClient_
 
 
 class SampleBat(AbstractBat):
-    def __init__(self, device_id: int, component_config: SampleBatSetup, client: ModbusTcpClient_) -> None:
-        self.__device_id = device_id
-        self.component_config = dataclass_from_dict(SampleBatSetup, component_config)
+    def __init__(self, component_config: SampleBatSetup, **kwargs: Any) -> None:
+        self.component_config = component_config
+        self.kwargs: KwargsDict = kwargs
+
+    def initialize(self) -> None:
+        self.__device_id: int = self.kwargs['device_id']
+        self.client: ModbusTcpClient_ = self.kwargs['client']
         self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher")
         self.store = get_bat_value_store(self.component_config.id)
         self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config))
-        self.client = client
 
     def update(self) -> None:
+        unit = self.component_config.configuration.modbus_id
         power = self.client.read_holding_registers(reg, ModbusDataType.INT_32, unit=unit)
+        soc = self.client.read_holding_registers(reg, ModbusDataType.INT_32, unit=unit)
         imported, exported = self.sim_counter.sim_count(power)
 
         bat_state = BatState(

docs/samples/sample_modbus/device.py

@@ -5,8 +5,9 @@
 
 @auto_str
 class SampleConfiguration:
-    def __init__(self, ip_address: Optional[str] = None):
+    def __init__(self, ip_address: Optional[str] = None, port: int = 502):
         self.ip_address = ip_address
+        self.port = port
 
 
 @auto_str
@@ -24,8 +25,8 @@ def __init__(self,
 
 @auto_str
 class SampleBatConfiguration:
-    def __init__(self):
-        pass
+    def __init__(self, modbus_id: int = 1):
+        self.modbus_id = modbus_id
 
 
 @auto_str
@@ -40,8 +41,8 @@ def __init__(self,
 
 @auto_str
 class SampleCounterConfiguration:
-    def __init__(self):
-        pass
+    def __init__(self, modbus_id: int = 1):
+        self.modbus_id = modbus_id
 
 
 @auto_str
@@ -56,8 +57,8 @@ def __init__(self,
 
 @auto_str
 class SampleInverterConfiguration:
-    def __init__(self):
-        pass
+    def __init__(self, modbus_id: int = 1):
+        self.modbus_id = modbus_id
 
 
 @auto_str

…/sample_request_by_component/__init__.py …/sample_modbus/sample_modbus/__init__.pydocs/samples/sample_request_by_component/__init__.py renamed to docs/samples/sample_modbus/sample_modbus/__init__.py docs/samples/sample_request_by_component/__init__.py renamed to docs/samples/sample_modbus/sample_modbus/__init__.py

@@ -1,23 +1,31 @@
 #!/usr/bin/env python3
-from dataclass_utils import dataclass_from_dict
+from typing import TypedDict, Any
 from modules.common.abstract_device import AbstractCounter
 from modules.common.component_state import CounterState
 from modules.common.component_type import ComponentDescriptor
 from modules.common.fault_state import ComponentInfo, FaultState
 from modules.common.modbus import ModbusDataType, ModbusTcpClient_
 from modules.common.simcount import SimCounter
 from modules.common.store import get_counter_value_store
-from modules.devices.sample_modbus.config import SampleCounterSetup
+from modules.devices.sample_modbus.sample_modbus.config import SampleCounterSetup
+
+
+class KwargsDict(TypedDict):
+    device_id: int
+    client: ModbusTcpClient_
 
 
 class SampleCounter(AbstractCounter):
-    def __init__(self, device_id: int, component_config: SampleCounterSetup, client: ModbusTcpClient_) -> None:
-        self.__device_id = device_id
-        self.component_config = dataclass_from_dict(SampleCounterSetup, component_config)
+    def __init__(self, component_config: SampleCounterSetup, **kwargs: Any) -> None:
+        self.component_config = component_config
+        self.kwargs: KwargsDict = kwargs
+
+    def initialize(self) -> None:
+        self.__device_id: int = self.kwargs['device_id']
+        self.client: ModbusTcpClient_ = self.kwargs['client']
         self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug")
         self.store = get_counter_value_store(self.component_config.id)
         self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config))
-        self.client = client
 
     def update(self):
         power = self.client.read_holding_registers(reg, ModbusDataType.INT_32, unit=unit)

docs/samples/sample_modbus/bat.py …mples/sample_modbus/sample_modbus/bat.pydocs/samples/sample_modbus/bat.py renamed to docs/samples/sample_modbus/sample_modbus/bat.py docs/samples/sample_modbus/bat.py renamed to docs/samples/sample_modbus/sample_modbus/bat.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+import logging
+from typing import Iterable,  Union
+
+from modules.common.abstract_device import DeviceDescriptor
+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
+from modules.devices.sample_modbus.sample_modbus.config import Sample, SampleBatSetup, SampleCounterSetup, SampleInverterSetup
+from modules.devices.sample_modbus.sample_modbus.counter import SampleCounter
+from modules.devices.sample_modbus.sample_modbus.inverter import SampleInverter
+
+log = logging.getLogger(__name__)
+
+
+def create_device(device_config: Sample):
+    client = None
+
+    def create_bat_component(component_config: SampleBatSetup):
+        nonlocal client
+        return SampleBat(component_config, device_id=device_config.id, client=client)
+
+    def create_counter_component(component_config: SampleCounterSetup):
+        nonlocal client
+        return SampleCounter(component_config, device_id=device_config.id, client=client)
+
+    def create_inverter_component(component_config: SampleInverterSetup):
+        nonlocal client
+        return SampleInverter(component_config, device_id=device_config.id, client=client)
+
+    def update_components(components: Iterable[Union[SampleBat, SampleCounter, SampleInverter]]):
+        with client:
+            for component in components:
+                component.update()
+
+    def initializer():
+        nonlocal client
+        client = ModbusTcpClient_(device_config.configuration.ip_address, device_config.configuration.port)
+
+    return ConfigurableDevice(
+        device_config=device_config,
+        initializer=initializer,
+        component_factory=ComponentFactoryByType(
+            bat=create_bat_component,
+            counter=create_counter_component,
+            inverter=create_inverter_component,
+        ),
+        component_updater=MultiComponentUpdater(update_components)
+    )
+
+
+device_descriptor = DeviceDescriptor(configuration_factory=Sample)

…mples/sample_request_by_device/config.py …es/sample_modbus/sample_modbus/config.pydocs/samples/sample_request_by_device/config.py renamed to docs/samples/sample_modbus/sample_modbus/config.py docs/samples/sample_request_by_device/config.py renamed to docs/samples/sample_modbus/sample_modbus/config.py

@@ -1,23 +1,31 @@
 #!/usr/bin/env python3
-from dataclass_utils import dataclass_from_dict
+from typing import TypedDict, Any
 from modules.common.abstract_device import AbstractInverter
 from modules.common.component_state import InverterState
 from modules.common.component_type import ComponentDescriptor
 from modules.common.fault_state import ComponentInfo, FaultState
 from modules.common.modbus import ModbusDataType, ModbusTcpClient_
 from modules.common.simcount import SimCounter
 from modules.common.store import get_inverter_value_store
-from modules.devices.sample_modbus.config import SampleInverterSetup
+from modules.devices.sample_modbus.sample_modbus.config import SampleInverterSetup
+
+
+class KwargsDict(TypedDict):
+    device_id: int
+    client: ModbusTcpClient_
 
 
 class SampleInverter(AbstractInverter):
-    def __init__(self, device_id: int, component_config: SampleInverterSetup, client: ModbusTcpClient_) -> None:
-        self.__device_id = device_id
-        self.component_config = dataclass_from_dict(SampleInverterSetup, component_config)
+    def __init__(self, component_config: SampleInverterSetup, **kwargs: Any) -> None:
+        self.component_config = component_config
+        self.kwargs: KwargsDict = kwargs
+
+    def initialize(self) -> None:
+        self.__device_id: int = self.kwargs['device_id']
+        self.client: ModbusTcpClient_ = self.kwargs['client']
         self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv")
         self.store = get_inverter_value_store(self.component_config.id)
         self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config))
-        self.client = client
 
     def update(self) -> None:
         power = self.client.read_holding_registers(reg, ModbusDataType.INT_32, unit=unit)

docs/samples/sample_modbus/counter.py …s/sample_modbus/sample_modbus/counter.pydocs/samples/sample_modbus/counter.py renamed to docs/samples/sample_modbus/sample_modbus/counter.py docs/samples/sample_modbus/counter.py renamed to docs/samples/sample_modbus/sample_modbus/counter.py

@@ -0,0 +1,14 @@
+from pathlib import Path
+
+from modules.common.abstract_device import DeviceDescriptor
+from modules.devices.vendors import VendorGroup
+
+
+class Vendor:
+    def __init__(self):
+        self.type = Path(__file__).parent.name
+        self.vendor = "Sample"
+        self.group = VendorGroup.VENDORS.value
+
+
+vendor_descriptor = DeviceDescriptor(configuration_factory=Vendor)