From 843e682fb7683af592e358d9738c1a7a57332276 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 21 Apr 2026 15:21:06 +0200 Subject: [PATCH] simcount: use component type --- packages/control/counter_all.py | 2 +- .../modules/common/configurable_device.py | 6 +- packages/modules/common/simcount/_simcount.py | 20 ++-- .../modules/common/simcount/_simcounter.py | 12 ++- .../common/simcount/_simcounter_store.py | 53 +++------- packages/modules/common/store/__init__.py | 1 + .../modules/common/store/_counter_test.py | 5 +- packages/modules/common/store/_factory.py | 18 ++++ .../modules/devices/algodue/algodue/bat.py | 6 +- .../devices/algodue/algodue/counter.py | 6 +- .../devices/algodue/algodue/inverter.py | 6 +- .../devices/alpha_ess/alpha_ess/bat.py | 6 +- .../devices/alpha_ess/alpha_ess/counter.py | 4 +- .../devices/alpha_ess/alpha_ess/inverter.py | 6 +- packages/modules/devices/ampere/ampere/bat.py | 6 +- .../modules/devices/ampere/ampere/counter.py | 6 +- .../modules/devices/ampere/ampere/inverter.py | 6 +- packages/modules/devices/avm/avm/counter.py | 4 +- .../devices/azzurro_zcs/azzurro_zcs/bat.py | 4 +- .../azzurro_zcs/azzurro_zcs/counter.py | 4 +- .../azzurro_zcs/azzurro_zcs/inverter.py | 4 +- .../azzurro_zcs/azzurro_zcs_3p/pv_inverter.py | 4 +- .../modules/devices/batterx/batterx/bat.py | 6 +- .../devices/batterx/batterx/batterx_test.py | 6 +- .../devices/batterx/batterx/counter.py | 6 +- .../modules/devices/batterx/batterx/device.py | 69 +------------ .../batterx/batterx/external_inverter.py | 6 +- .../devices/batterx/batterx/inverter.py | 6 +- packages/modules/devices/byd/byd/bat.py | 6 +- .../carlo_gavazzi/carlo_gavazzi/counter.py | 6 +- .../modules/devices/chint/chint/counter.py | 4 +- packages/modules/devices/deye/deye/bat.py | 12 +-- packages/modules/devices/deye/deye/counter.py | 6 +- .../modules/devices/deye/deye/inverter.py | 6 +- .../devices/discovergy/discovergy/counter.py | 4 +- .../discovergy/discovergy/device test.py | 4 +- .../devices/discovergy/discovergy/inverter.py | 4 +- packages/modules/devices/e3dc/e3dc/bat.py | 6 +- packages/modules/devices/e3dc/e3dc/counter.py | 6 +- packages/modules/devices/e3dc/e3dc/device.py | 99 ++----------------- .../devices/e3dc/e3dc/external_inverter.py | 6 +- .../modules/devices/e3dc/e3dc/inverter.py | 6 +- packages/modules/devices/elgris/elgris/bat.py | 4 +- .../modules/devices/elgris/elgris/counter.py | 4 +- .../modules/devices/elgris/elgris/inverter.py | 4 +- .../modules/devices/enphase/enphase/bat.py | 6 +- .../devices/enphase/enphase/counter.py | 4 +- .../devices/enphase/enphase/inverter.py | 4 +- packages/modules/devices/fems/fems/bat.py | 4 +- .../modules/devices/fems/fems/bat_test.py | 2 +- packages/modules/devices/fems/fems/counter.py | 4 +- .../modules/devices/fems/fems/counter_test.py | 2 +- .../modules/devices/fems/fems/device test.py | 4 +- .../modules/devices/fems/fems/inverter.py | 4 +- .../devices/fems/fems/inverter_test.py | 2 +- .../modules/devices/fox_ess/fox_ess/bat.py | 4 +- .../devices/fox_ess/fox_ess/counter.py | 4 +- .../devices/fox_ess/fox_ess/inverter.py | 4 +- .../modules/devices/fronius/fronius/bat.py | 6 +- .../devices/fronius/fronius/counter_s0.py | 6 +- .../devices/fronius/fronius/counter_sm.py | 6 +- .../devices/fronius/fronius/inverter.py | 6 +- .../fronius/inverter_production_meter.py | 6 +- .../fronius/inverter_production_meter_test.py | 4 +- .../fronius/fronius/inverter_secondary.py | 6 +- packages/modules/devices/generic/http/api.py | 9 ++ packages/modules/devices/generic/http/bat.py | 6 +- .../modules/devices/generic/http/counter.py | 6 +- .../modules/devices/generic/http/inverter.py | 6 +- packages/modules/devices/generic/json/bat.py | 6 +- .../modules/devices/generic/json/counter.py | 6 +- .../devices/generic/json/device_test.py | 6 +- .../modules/devices/generic/json/inverter.py | 6 +- packages/modules/devices/generic/mqtt/bat.py | 6 +- .../modules/devices/generic/mqtt/counter.py | 6 +- .../modules/devices/generic/mqtt/inverter.py | 6 +- .../devices/generic/virtual/counter.py | 10 +- .../modules/devices/good_we/good_we/bat.py | 6 +- .../devices/good_we/good_we/counter.py | 6 +- .../devices/good_we/good_we/inverter.py | 4 +- .../modules/devices/growatt/growatt/bat.py | 4 +- .../devices/growatt/growatt/counter.py | 4 +- .../devices/growatt/growatt/inverter.py | 4 +- packages/modules/devices/huawei/huawei/bat.py | 6 +- .../modules/devices/huawei/huawei/counter.py | 6 +- .../modules/devices/huawei/huawei/inverter.py | 6 +- .../modules/devices/huawei/huawei_emma/bat.py | 6 +- .../devices/huawei/huawei_emma/counter.py | 6 +- .../devices/huawei/huawei_emma/inverter.py | 6 +- .../devices/huawei/huawei_smartlogger/bat.py | 6 +- .../huawei/huawei_smartlogger/counter.py | 6 +- .../huawei/huawei_smartlogger/inverter.py | 6 +- packages/modules/devices/idm/idm/counter.py | 6 +- .../modules/devices/janitza/janitza/bat.py | 6 +- .../devices/janitza/janitza/counter.py | 6 +- .../devices/janitza/janitza/inverter.py | 6 +- packages/modules/devices/kaco/kaco_nh/bat.py | 6 +- .../modules/devices/kaco/kaco_nh/counter.py | 4 +- .../modules/devices/kaco/kaco_nh/inverter.py | 4 +- .../modules/devices/kaco/kaco_tx/inverter.py | 4 +- .../devices/kostal/kostal_piko/counter.py | 6 +- .../devices/kostal/kostal_piko/inverter.py | 4 +- .../devices/kostal/kostal_piko_ci/counter.py | 6 +- .../devices/kostal/kostal_piko_ci/inverter.py | 4 +- .../kostal/kostal_piko_old/inverter.py | 6 +- .../kostal/kostal_piko_old/inverter_test.py | 2 +- .../devices/kostal/kostal_plenticore/bat.py | 11 ++- .../kostal/kostal_plenticore/counter.py | 6 +- .../kostal/kostal_plenticore/inverter.py | 4 +- .../devices/kostal/kostal_sem/counter.py | 4 +- .../devices/kostal/kostal_steca/inverter.py | 4 +- packages/modules/devices/lg/lg/bat.py | 6 +- packages/modules/devices/lg/lg/counter.py | 6 +- packages/modules/devices/lg/lg/inverter.py | 6 +- packages/modules/devices/lg/lg/lg_test.py | 12 +-- .../modules/devices/marstek/venus_c_e/bat.py | 6 +- packages/modules/devices/mtec/mtec/bat.py | 6 +- packages/modules/devices/mtec/mtec/counter.py | 6 +- .../modules/devices/mtec/mtec/inverter.py | 6 +- .../devices/mystrom/mystrom/counter.py | 6 +- packages/modules/devices/nibe/nibe/counter.py | 6 +- .../modules/devices/openwb/openwb_flex/bat.py | 6 +- .../openwb/openwb_flex/consumption_counter.py | 6 +- .../devices/openwb/openwb_flex/counter.py | 6 +- .../devices/openwb/openwb_flex/inverter.py | 6 +- packages/modules/devices/orno/orno/counter.py | 4 +- .../devices/powerdog/powerdog/counter.py | 6 +- .../devices/powerdog/powerdog/inverter.py | 6 +- .../devices/powerfox/powerfox/counter.py | 4 +- .../devices/powerfox/powerfox/inverter.py | 4 +- packages/modules/devices/qcells/qcells/bat.py | 4 +- .../modules/devices/qcells/qcells/counter.py | 4 +- .../modules/devices/qcells/qcells/inverter.py | 4 +- packages/modules/devices/rct/rct/bat.py | 4 +- packages/modules/devices/rct/rct/counter.py | 4 +- packages/modules/devices/rct/rct/inverter.py | 4 +- .../modules/devices/saxpower/saxpower/bat.py | 6 +- .../devices/saxpower/saxpower/counter.py | 6 +- packages/modules/devices/shelly/shelly/bat.py | 6 +- .../modules/devices/shelly/shelly/counter.py | 6 +- .../modules/devices/shelly/shelly/inverter.py | 6 +- .../devices/shelly/shelly/shelly_test.py | 14 +-- .../modules/devices/siemens/siemens/bat.py | 6 +- .../devices/siemens/siemens/counter.py | 6 +- .../devices/siemens/siemens/inverter.py | 6 +- .../devices/siemens/siemens_sentron/bat.py | 4 +- .../siemens/siemens_sentron/counter.py | 4 +- .../siemens/siemens_sentron/inverter.py | 4 +- .../devices/sigenergy/sigenergy/bat.py | 6 +- .../devices/sigenergy/sigenergy/counter.py | 6 +- .../devices/sigenergy/sigenergy/inverter.py | 6 +- .../modules/devices/sma/sma_shm/counter.py | 4 +- .../modules/devices/sma/sma_shm/inverter.py | 4 +- packages/modules/devices/sma/sma_shm/utils.py | 2 +- .../modules/devices/sma/sma_sunny_boy/bat.py | 4 +- .../sma/sma_sunny_boy/bat_smart_energy.py | 4 +- .../devices/sma/sma_sunny_boy/bat_tesvolt.py | 6 +- .../devices/sma/sma_sunny_boy/counter.py | 6 +- .../devices/sma/sma_sunny_boy/inverter.py | 4 +- .../devices/sma/sma_sunny_island/bat.py | 4 +- .../devices/sma/sma_webbox/inverter.py | 4 +- .../devices/smart_me/smart_me/counter.py | 4 +- .../devices/smart_me/smart_me/inverter.py | 4 +- .../devices/smartfox/smartfox/counter.py | 4 +- packages/modules/devices/sofar/sofar/bat.py | 4 +- .../modules/devices/sofar/sofar/counter.py | 4 +- .../modules/devices/sofar/sofar/inverter.py | 4 +- .../devices/solakon/solakon_one/bat.py | 4 +- .../devices/solakon/solakon_one/inverter.py | 4 +- .../devices/solar_log/solar_log/counter.py | 6 +- .../devices/solar_log/solar_log/inverter.py | 4 +- .../devices/solar_view/solar_view/counter.py | 4 +- .../devices/solar_view/solar_view/inverter.py | 4 +- .../devices/solar_watt/solar_watt/bat.py | 6 +- .../devices/solar_watt/solar_watt/counter.py | 6 +- .../devices/solar_watt/solar_watt/inverter.py | 6 +- .../solar_world/solar_world/counter.py | 6 +- .../solar_world/solar_world/inverter.py | 6 +- .../devices/solaredge/solaredge/bat.py | 6 +- .../devices/solaredge/solaredge/counter.py | 4 +- .../solaredge/solaredge/external_inverter.py | 4 +- .../devices/solaredge/solaredge/inverter.py | 6 +- .../modules/devices/solarmax/solarmax/bat.py | 6 +- .../solarmax/solarmax/counter_maxstorage.py | 6 +- .../devices/solarmax/solarmax/inverter.py | 6 +- .../solarmax/solarmax/inverter_maxstorage.py | 6 +- packages/modules/devices/solax/solax/bat.py | 6 +- .../modules/devices/solax/solax/counter.py | 4 +- .../modules/devices/solax/solax/inverter.py | 4 +- packages/modules/devices/solis/solis/bat.py | 4 +- .../modules/devices/solis/solis/counter.py | 4 +- .../modules/devices/solis/solis/inverter.py | 4 +- .../devices/sonnen/sonnenbatterie/bat.py | 6 +- .../devices/sonnen/sonnenbatterie/counter.py | 6 +- .../sonnenbatterie/counter_consumption.py | 4 +- .../devices/sonnen/sonnenbatterie/inverter.py | 6 +- packages/modules/devices/studer/studer/bat.py | 4 +- .../modules/devices/studer/studer/inverter.py | 4 +- .../modules/devices/sungrow/sungrow_sh/bat.py | 6 +- .../devices/sungrow/sungrow_sh/counter.py | 4 +- .../devices/sunways/sunways/inverter.py | 4 +- .../modules/devices/tasmota/tasmota/bat.py | 6 +- .../devices/tasmota/tasmota/counter.py | 6 +- .../devices/tasmota/tasmota/inverter.py | 6 +- packages/modules/devices/tesla/tesla/bat.py | 4 +- .../modules/devices/tesla/tesla/counter.py | 4 +- .../modules/devices/tesla/tesla/inverter.py | 4 +- .../modules/devices/tesla/tesla/tesla_test.py | 2 +- .../devices/thermia/thermia/counter.py | 6 +- packages/modules/devices/upower/upower/bat.py | 6 +- .../modules/devices/upower/upower/counter.py | 6 +- .../modules/devices/upower/upower/inverter.py | 4 +- .../modules/devices/varta/varta/bat_api.py | 6 +- .../modules/devices/varta/varta/bat_modbus.py | 6 +- .../modules/devices/varta/varta/counter.py | 6 +- .../modules/devices/varta/varta/inverter.py | 6 +- .../modules/devices/victron/victron/bat.py | 6 +- .../devices/victron/victron/counter.py | 6 +- .../devices/victron/victron/inverter.py | 6 +- .../devices/vzlogger/vzlogger/counter.py | 6 +- .../devices/vzlogger/vzlogger/counter_test.py | 2 +- .../devices/vzlogger/vzlogger/inverter.py | 6 +- .../devices/youless/youless/inverter.py | 4 +- 223 files changed, 635 insertions(+), 768 deletions(-) create mode 100644 packages/modules/common/store/_factory.py diff --git a/packages/control/counter_all.py b/packages/control/counter_all.py index 2eeb156d18..53525f8238 100644 --- a/packages/control/counter_all.py +++ b/packages/control/counter_all.py @@ -78,7 +78,7 @@ def __init__(self): self.connected_counters = [] self.connected_chargepoints = [] self.childless = [] - self.sim_counter = SimCounter("", "", prefix="bezug") + self.sim_counter = SimCounter("", "", ComponentType.COUNTER) self.sim_counter.topic = "openWB/set/counter/set/" def get_evu_counter(self) -> Counter: diff --git a/packages/modules/common/configurable_device.py b/packages/modules/common/configurable_device.py index 97ceb6e70f..02ddc96b66 100644 --- a/packages/modules/common/configurable_device.py +++ b/packages/modules/common/configurable_device.py @@ -107,13 +107,17 @@ def error_handler(self) -> None: self.error_timestamp = None Pub().pub(error_timestamp_topic, self.error_timestamp) - def add_component(self, component_config: T_COMPONENT_CONFIG) -> None: + def add_component(self, + component_config: T_COMPONENT_CONFIG, + component_dependency_injection: Optional[Callable] = None) -> None: with SingleComponentUpdateContext(FaultState(ComponentInfo.from_component_config(component_config))): component = self.__component_factory(component_config) component.initialized = False self.components["component" + str(component_config.id)] = component component.initialize() component.initialized = True + if component_dependency_injection is not None: + component = component_dependency_injection(component) def update(self): initialized_components = [] diff --git a/packages/modules/common/simcount/_simcount.py b/packages/modules/common/simcount/_simcount.py index 5c07af4a44..a44b35d630 100644 --- a/packages/modules/common/simcount/_simcount.py +++ b/packages/modules/common/simcount/_simcount.py @@ -4,16 +4,21 @@ import logging import math import time +from typing import Optional from control import data as data_module +from modules.common.component_type import ComponentType from modules.common.simcount._calculate import calculate_import_export from modules.common.simcount.simcounter_state import SimCounterState -from modules.common.simcount._simcounter_store import get_sim_counter_store, restore_last_energy +from modules.common.simcount._simcounter_store import SimCounterStoreBroker, restore_last_energy log = logging.getLogger(__name__) -def sim_count(power_present: float, topic: str = "", data: SimCounterState = None, prefix: str = "") -> SimCounterState: +def sim_count(power_present: float, + topic: str = "", + previous_state: SimCounterState = None, + component_type: Optional[ComponentType] = None) -> SimCounterState: """ emulate import export Parameters @@ -27,9 +32,8 @@ def sim_count(power_present: float, topic: str = "", data: SimCounterState = Non ------ neuer state """ - store = get_sim_counter_store() + store = SimCounterStoreBroker() timestamp_present = time.time() - previous_state = store.load(prefix, topic) if data is None else data if math.isnan(power_present): raise ValueError("power_present is NaN.") @@ -37,15 +41,15 @@ def sim_count(power_present: float, topic: str = "", data: SimCounterState = Non if isinstance(power_present, (int, float)): if previous_state is None: log.debug("No previous state found. Starting new simulation.") - return store.initialize(prefix, topic, power_present, timestamp_present) + return store.initialize(component_type, topic, power_present, timestamp_present) else: log.debug("Previous state: %s", previous_state) if math.isnan(previous_state.imported): log.error("imported is NaN. Reset simcount state.") - previous_state.imported = restore_last_energy(topic, "imported") + previous_state.imported = restore_last_energy(topic, "imported", component_type) if math.isnan(previous_state.exported): log.error("exported is NaN. Reset simcount state.") - previous_state.exported = restore_last_energy(topic, "exported") + previous_state.exported = restore_last_energy(topic, "exported", component_type) control_interval = data_module.data.general_data.data.control_interval if 2 * control_interval < timestamp_present - previous_state.timestamp: log.warning("Time difference between previous state and current state is too large. " @@ -63,5 +67,5 @@ def sim_count(power_present: float, topic: str = "", data: SimCounterState = Non previous_state.exported + exported ) log.debug("imported: %g Wh, exported: %g Wh, new state: %s", imported, exported, current_state) - store.save(prefix, topic, current_state) + store.save(topic, current_state) return current_state diff --git a/packages/modules/common/simcount/_simcounter.py b/packages/modules/common/simcount/_simcounter.py index 956a131123..09b74e5866 100644 --- a/packages/modules/common/simcount/_simcounter.py +++ b/packages/modules/common/simcount/_simcounter.py @@ -1,19 +1,21 @@ from typing import Tuple, Optional +from modules.common.component_type import ComponentType, special_to_general_type_mapping from modules.common.simcount._simcount import sim_count from modules.common.simcount.simcounter_state import SimCounterState class SimCounter: - def __init__(self, device_id: int, component_id: int, prefix: str): + def __init__(self, device_id: int, component_id: int, component_type: str): self.topic = "openWB/set/system/device/{}/component/{}/".format(device_id, component_id) - self.prefix = "pv2" if prefix == "pv" and component_id != 1 else prefix + self.component_type = special_to_general_type_mapping( + component_type.value if isinstance(component_type, ComponentType) else component_type) self.data: Optional[SimCounterState] = None def sim_count(self, power: float, dc_power: Optional[float] = None) -> Tuple[float, float]: - if (self.prefix == "pv" or self.prefix == "pv2") and dc_power is not None and dc_power == 0: + if self.component_type != ComponentType.INVERTER and dc_power is not None and dc_power == 0: power = 0 - self.data = sim_count(power, self.topic, self.data, self.prefix) + self.data = sim_count(power, self.topic, self.data, self.component_type) return self.data.imported, self.data.exported @@ -23,5 +25,5 @@ def __init__(self, chargepoint_id: int): self.data = None # type: Optional[SimCounterState] def sim_count(self, power: float) -> Tuple[float, float]: - self.data = sim_count(power, self.topic, self.data, "") + self.data = sim_count(power, self.topic, self.data, None) return self.data.imported, self.data.exported diff --git a/packages/modules/common/simcount/_simcounter_store.py b/packages/modules/common/simcount/_simcounter_store.py index 9f5700c287..0ff8946b3e 100644 --- a/packages/modules/common/simcount/_simcounter_store.py +++ b/packages/modules/common/simcount/_simcounter_store.py @@ -1,12 +1,10 @@ import logging -from abc import abstractmethod -from typing import Optional from control import data from helpermodules import pub -from helpermodules.utils.topic_parser import get_index, get_second_index -from modules.common.component_type import type_to_topic_mapping +from helpermodules.utils.topic_parser import get_second_index +from modules.common.component_type import ComponentType, type_to_topic_mapping from modules.common.simcount.simcounter_state import SimCounterState POSTFIX_EXPORT = "watt0neg" @@ -15,46 +13,27 @@ log = logging.getLogger(__name__) -class SimCounterStore: - @abstractmethod - def load(self, prefix: str, topic: str) -> Optional[SimCounterState]: - pass - - @abstractmethod - def save(self, prefix: str, topic: str, state: SimCounterState): - pass - - @abstractmethod - def initialize(self, prefix: str, topic: str, power: float, timestamp: float) -> SimCounterState: - pass - - -class SimCounterStoreBroker(SimCounterStore): - def initialize(self, prefix: str, topic: str, power: float, timestamp: float) -> SimCounterState: - state = SimCounterState(timestamp, power, imported=restore_last_energy( - topic, "imported") if "pv" not in prefix else 0, exported=restore_last_energy(topic, "exported")) - self.save(prefix, topic, state) +class SimCounterStoreBroker: + def initialize(self, component_type: ComponentType, topic: str, power: float, timestamp: float) -> SimCounterState: + state = SimCounterState( + timestamp, power, + imported=restore_last_energy( + topic, "imported", component_type) if component_type != ComponentType.INVERTER else 0, + exported=restore_last_energy(topic, "exported", component_type)) + self.save(topic, state) return state - def load(self, prefix: str, topic: str) -> Optional[SimCounterState]: - return None - - def save(self, prefix: str, topic: str, state: SimCounterState): + def save(self, topic: str, state: SimCounterState): pub.Pub().pub(topic + "simulation", vars(state)) -def restore_last_energy(topic: str, value: str): +def restore_last_energy(topic: str, value: str, component_type: ComponentType): try: - device_id = get_index(topic) - component_id = get_second_index(topic) - module_type = type_to_topic_mapping( - data.data.system_data[f"device{device_id}"].components[f"component{component_id}"].component_config.type) + module_type = type_to_topic_mapping(component_type) module = getattr(data.data, f"{module_type}_data")[f"{module_type}{get_second_index(topic)}"].data.get return getattr(module, value) except AttributeError: - if (value == "imported" and - "inverter" in data.data.system_data[f"device{device_id}"].components[ - f"component{component_id}"].component_config.type): + if (value == "imported" and component_type == ComponentType.INVERTER): return 0 except ValueError: # Wenn kein Index enthalten, ist es Hausverbrauch. @@ -63,7 +42,3 @@ def restore_last_energy(topic: str, value: str): return 0 elif value == "imported": return data.data.counter_all_data.data.set.imported_home_consumption - - -def get_sim_counter_store() -> SimCounterStore: - return SimCounterStoreBroker() diff --git a/packages/modules/common/store/__init__.py b/packages/modules/common/store/__init__.py index 4c76f0c1fd..940bd9b9d2 100644 --- a/packages/modules/common/store/__init__.py +++ b/packages/modules/common/store/__init__.py @@ -4,6 +4,7 @@ from modules.common.store._chargepoint import get_chargepoint_value_store from modules.common.store._chargepoint_internal import get_internal_chargepoint_value_store from modules.common.store._counter import get_counter_value_store +from modules.common.store._factory import get_component_value_store from modules.common.store._inverter import get_inverter_value_store from modules.common.store._io import get_io_value_store from modules.common.store._tariff import get_flexible_tariff_value_store, get_grid_fee_value_store diff --git a/packages/modules/common/store/_counter_test.py b/packages/modules/common/store/_counter_test.py index b9c8c292d8..989e177c12 100644 --- a/packages/modules/common/store/_counter_test.py +++ b/packages/modules/common/store/_counter_test.py @@ -12,6 +12,7 @@ from control.counter_all import CounterAll from modules.chargepoints.mqtt.chargepoint_module import ChargepointModule from modules.common.component_state import BatState, ChargepointState, CounterState, InverterState +from modules.common.component_type import ComponentType from modules.common.simcount._simcounter import SimCounter from modules.common.store import _counter from modules.common.store._api import LoggingValueStore @@ -129,7 +130,7 @@ def test_calc_virtual(params: Params, monkeypatch): params.mock_data() purge = PurgeCounterState(delegate=Mock(delegate=Mock(num=0)), add_child_values=True, - simcounter=SimCounter(0, 0, prefix="bezug")) + simcounter=SimCounter(0, 0, ComponentType.COUNTER)) mock_comp_obj = Mock(side_effect=params.mock_comp) monkeypatch.setattr(_counter, "get_component_obj_by_id", mock_comp_obj) @@ -239,7 +240,7 @@ def mock_get_component_obj_by_id(component_id): virtual_counter_purge = PurgeCounterState( delegate=Mock(delegate=Mock(num=3)), add_child_values=True, - simcounter=SimCounter(0, 0, prefix="virtual") + simcounter=SimCounter(0, 0, "counter") ) # execution diff --git a/packages/modules/common/store/_factory.py b/packages/modules/common/store/_factory.py new file mode 100644 index 0000000000..89bace3c4b --- /dev/null +++ b/packages/modules/common/store/_factory.py @@ -0,0 +1,18 @@ +from typing import Optional +from modules.common.component_type import ComponentType +from modules.common.simcount._simcounter import SimCounter +from modules.common.store._battery import get_bat_value_store +from modules.common.store._counter import get_counter_value_store +from modules.common.store._inverter import get_inverter_value_store + + +def get_component_value_store(component_type: str, + component_num: int, + add_child_values: bool = False, + simcounter: Optional[SimCounter] = None): + if ComponentType.BAT.value in component_type: + return get_bat_value_store(component_num) + elif ComponentType.COUNTER.value in component_type: + return get_counter_value_store(component_num, add_child_values, simcounter) + elif ComponentType.INVERTER.value in component_type: + return get_inverter_value_store(component_num) diff --git a/packages/modules/devices/algodue/algodue/bat.py b/packages/modules/devices/algodue/algodue/bat.py index 5ceee007e5..24434bbadc 100644 --- a/packages/modules/devices/algodue/algodue/bat.py +++ b/packages/modules/devices/algodue/algodue/bat.py @@ -9,9 +9,9 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/algodue/algodue/counter.py b/packages/modules/devices/algodue/algodue/counter.py index 805410400f..37632702a4 100644 --- a/packages/modules/devices/algodue/algodue/counter.py +++ b/packages/modules/devices/algodue/algodue/counter.py @@ -9,9 +9,9 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/algodue/algodue/inverter.py b/packages/modules/devices/algodue/algodue/inverter.py index b8cd036822..eaa50ef14a 100644 --- a/packages/modules/devices/algodue/algodue/inverter.py +++ b/packages/modules/devices/algodue/algodue/inverter.py @@ -9,9 +9,9 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/alpha_ess/alpha_ess/bat.py b/packages/modules/devices/alpha_ess/alpha_ess/bat.py index 8663913cc5..3604c27608 100644 --- a/packages/modules/devices/alpha_ess/alpha_ess/bat.py +++ b/packages/modules/devices/alpha_ess/alpha_ess/bat.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.alpha_ess.alpha_ess.config import AlphaEssBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, component_config: AlphaEssBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__tcp_client: ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) self.last_mode = 'Undefined' diff --git a/packages/modules/devices/alpha_ess/alpha_ess/counter.py b/packages/modules/devices/alpha_ess/alpha_ess/counter.py index ea184ee888..2990450bb9 100644 --- a/packages/modules/devices/alpha_ess/alpha_ess/counter.py +++ b/packages/modules/devices/alpha_ess/alpha_ess/counter.py @@ -9,9 +9,9 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -29,7 +29,7 @@ def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__device_config: AlphaEssConfiguration = self.kwargs['device_config'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/alpha_ess/alpha_ess/inverter.py b/packages/modules/devices/alpha_ess/alpha_ess/inverter.py index d38a28bdda..290a5c2097 100644 --- a/packages/modules/devices/alpha_ess/alpha_ess/inverter.py +++ b/packages/modules/devices/alpha_ess/alpha_ess/inverter.py @@ -9,9 +9,9 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType, Number from modules.common.simcount._simcounter import SimCounter -from modules.common.store import get_inverter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -31,8 +31,8 @@ def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__device_config: AlphaEssConfiguration = self.kwargs['device_config'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/ampere/ampere/bat.py b/packages/modules/devices/ampere/ampere/bat.py index 1ee8a9269c..30e2582e84 100644 --- a/packages/modules/devices/ampere/ampere/bat.py +++ b/packages/modules/devices/ampere/ampere/bat.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.ampere.ampere.config import AmpereBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, def initialize(self) -> None: device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) self.client = self.kwargs['client'] diff --git a/packages/modules/devices/ampere/ampere/counter.py b/packages/modules/devices/ampere/ampere/counter.py index 5ecc06f901..3a5b757bfe 100644 --- a/packages/modules/devices/ampere/ampere/counter.py +++ b/packages/modules/devices/ampere/ampere/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.ampere.ampere.config import AmpereCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/ampere/ampere/inverter.py b/packages/modules/devices/ampere/ampere/inverter.py index 8fcbc47ed0..b3fcbb04b3 100644 --- a/packages/modules/devices/ampere/ampere/inverter.py +++ b/packages/modules/devices/ampere/ampere/inverter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.ampere.ampere.config import AmpereInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/avm/avm/counter.py b/packages/modules/devices/avm/avm/counter.py index 0f6a08a273..51673559b8 100644 --- a/packages/modules/devices/avm/avm/counter.py +++ b/packages/modules/devices/avm/avm/counter.py @@ -5,7 +5,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.avm.avm.config import AvmCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -16,7 +16,7 @@ def __init__(self, component_config: AvmCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs/bat.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs/bat.py index f13cd5b59a..c5c125a08a 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs/bat.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.azzurro_zcs.azzurro_zcs.config import ZCSBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: ZCSBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs/counter.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs/counter.py index 25ab9f48e8..6b09841281 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs/counter.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs/counter.py @@ -7,7 +7,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.azzurro_zcs.azzurro_zcs.config import ZCSCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def __init__(self, def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs/inverter.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs/inverter.py index 2d7b7de42d..e8a95f2ad4 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs/inverter.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs/inverter.py @@ -7,7 +7,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.azzurro_zcs.azzurro_zcs.config import ZCSInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: ZCSInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/pv_inverter.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/pv_inverter.py index cb792c7dc4..e736448565 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/pv_inverter.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/pv_inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.azzurro_zcs.azzurro_zcs_3p.config import ZCSPvInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,7 +27,7 @@ def __init__(self, component_config: ZCSPvInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/batterx/batterx/bat.py b/packages/modules/devices/batterx/batterx/bat.py index 345f4ead52..f3918adf72 100644 --- a/packages/modules/devices/batterx/batterx/bat.py +++ b/packages/modules/devices/batterx/batterx/bat.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common import req from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, component_config: BatterXBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) self.last_mode = 'Undefined' diff --git a/packages/modules/devices/batterx/batterx/batterx_test.py b/packages/modules/devices/batterx/batterx/batterx_test.py index 5c542ae467..4494f88281 100644 --- a/packages/modules/devices/batterx/batterx/batterx_test.py +++ b/packages/modules/devices/batterx/batterx/batterx_test.py @@ -16,9 +16,9 @@ def test_batterx(monkeypatch, requests_mock: requests_mock.mock): mock_bat_value_store = Mock() mock_counter_value_store = Mock() mock_inverter_value_store = Mock() - monkeypatch.setattr(bat, 'get_bat_value_store', Mock(return_value=mock_bat_value_store)) - monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=mock_counter_value_store)) - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(bat, 'get_component_value_store', Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(counter, 'get_component_value_store', Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(inverter, 'get_component_value_store', Mock(return_value=mock_inverter_value_store)) requests_mock.get("http://1.1.1.1/api.php?get=currentstate", json=SAMPLE) dev = create_device(BatterX(configuration=BatterXConfiguration(ip_address="1.1.1.1"))) diff --git a/packages/modules/devices/batterx/batterx/counter.py b/packages/modules/devices/batterx/batterx/counter.py index 6cbbe2ea06..410023e5c7 100644 --- a/packages/modules/devices/batterx/batterx/counter.py +++ b/packages/modules/devices/batterx/batterx/counter.py @@ -8,9 +8,9 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store log = logging.getLogger(__name__) @@ -26,8 +26,8 @@ def __init__(self, component_config: BatterXCounterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/batterx/batterx/device.py b/packages/modules/devices/batterx/batterx/device.py index adde58e310..409ea3c325 100644 --- a/packages/modules/devices/batterx/batterx/device.py +++ b/packages/modules/devices/batterx/batterx/device.py @@ -1,12 +1,10 @@ #!/usr/bin/env python3 import logging -from typing import Iterable, Optional, Union, List +from typing import Iterable, Union -from helpermodules.cli import run_using_positional_cli_args from modules.common.abstract_device import DeviceDescriptor -from modules.common.component_context import MultiComponentUpdateContext, SingleComponentUpdateContext +from modules.common.component_context import 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 from modules.devices.batterx.batterx import counter from modules.devices.batterx.batterx import inverter @@ -56,67 +54,4 @@ def update_components(components: Iterable[batterx_component_classes]): ) -COMPONENT_TYPE_TO_MODULE = { - "bat": bat, - "counter": counter, - "inverter": inverter, - "external_inverter": external_inverter -} - - -def read_legacy( - component_type: str, - ip_address: str, - num: Optional[int] = None, - evu_counter: Optional[str] = None, - bat_module: Optional[str] = None, - ext_inverter: int = 0) -> None: - - device_config = BatterX() - device_config.configuration.ip_address = ip_address - dev = create_device(device_config) - dev = _add_component(dev, component_type, num) - if evu_counter == "bezug_batterx": - dev = _add_component(dev, "counter", 0) - if bat_module == "speicher_batterx": - dev = _add_component(dev, "bat", 3) - - log.debug('BatterX IP-Adresse: ' + ip_address) - log.debug('BatterX externer WR: ' + str(ext_inverter)) - - with MultiComponentUpdateContext(dev.components): - resp_json = req.get_http_session().get( - 'http://' + ip_address + '/api.php?get=currentstate', - timeout=5).json() - for component in dev.components.values(): - if isinstance(component, (bat.BatterXBat, counter.BatterXCounter)): - component.update(resp_json) - elif isinstance(component, inverter.BatterXInverter): - if ext_inverter == 0: - component.update(resp_json) - else: - dev = _add_component(dev, "external_inverter", 4) - power = component.get_power(resp_json) - power_ext = dev.components["component4"].get_power(resp_json) - state = component.get_inverter_state(power+power_ext) - get_inverter_value_store(num).set(state) - - -def _add_component(dev: ConfigurableDevice, component_type: str, num: Optional[int]) -> ConfigurableDevice: - if component_type in COMPONENT_TYPE_TO_MODULE: - component_config = COMPONENT_TYPE_TO_MODULE[component_type].component_descriptor.configuration_factory() - else: - raise Exception( - "illegal component type " + component_type + ". Allowed values: " + - ','.join(COMPONENT_TYPE_TO_MODULE.keys()) - ) - component_config.id = num - dev.add_component(component_config) - return dev - - -def main(argv: List[str]) -> None: - run_using_positional_cli_args(read_legacy, argv) - - device_descriptor = DeviceDescriptor(configuration_factory=BatterX) diff --git a/packages/modules/devices/batterx/batterx/external_inverter.py b/packages/modules/devices/batterx/batterx/external_inverter.py index c252e4275f..eca06d442a 100644 --- a/packages/modules/devices/batterx/batterx/external_inverter.py +++ b/packages/modules/devices/batterx/batterx/external_inverter.py @@ -7,9 +7,9 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -23,8 +23,8 @@ def __init__(self, component_config: BatterXExternalInverterSetup, **kwargs: Any def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/batterx/batterx/inverter.py b/packages/modules/devices/batterx/batterx/inverter.py index 35396def8a..7a9d4ad171 100644 --- a/packages/modules/devices/batterx/batterx/inverter.py +++ b/packages/modules/devices/batterx/batterx/inverter.py @@ -7,9 +7,9 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -23,8 +23,8 @@ def __init__(self, component_config: BatterXInverterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/byd/byd/bat.py b/packages/modules/devices/byd/byd/bat.py index 0b7275af75..3a80189999 100644 --- a/packages/modules/devices/byd/byd/bat.py +++ b/packages/modules/devices/byd/byd/bat.py @@ -10,9 +10,9 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store log = logging.getLogger(__name__) @@ -28,8 +28,8 @@ def __init__(self, component_config: BYDBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.device_config: BYD = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/counter.py b/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/counter.py index 18ff88a5f4..d8684a1732 100644 --- a/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/counter.py +++ b/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/counter.py @@ -11,9 +11,9 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -31,8 +31,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/chint/chint/counter.py b/packages/modules/devices/chint/chint/counter.py index 9654cdfb2a..c60e86a90b 100644 --- a/packages/modules/devices/chint/chint/counter.py +++ b/packages/modules/devices/chint/chint/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.chint.chint.config import CHINTCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: CHINTCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.__modbus_id = self.component_config.configuration.modbus_id self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/deye/deye/bat.py b/packages/modules/devices/deye/deye/bat.py index f6677ce765..84719dc7f4 100644 --- a/packages/modules/devices/deye/deye/bat.py +++ b/packages/modules/devices/deye/deye/bat.py @@ -1,16 +1,16 @@ import logging -from typing import TypedDict, Any +from typing import Any, TypedDict + from modules.common.abstract_device import AbstractBat from modules.common.component_state import BatState -from modules.common.component_type import ComponentDescriptor +from modules.common.component_type import ComponentDescriptor, ComponentType 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_component_value_store from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_bat_value_store from modules.devices.deye.deye.config import DeyeBatSetup from modules.devices.deye.deye.device_type import DeviceType -from modules.common.component_type import ComponentType log = logging.getLogger(__name__) @@ -28,10 +28,10 @@ def __init__(self, component_config: DeyeBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.device_type = DeviceType(self.client.read_holding_registers( 0, ModbusDataType.INT_16, unit=self.component_config.configuration.modbus_id)) diff --git a/packages/modules/devices/deye/deye/counter.py b/packages/modules/devices/deye/deye/counter.py index cc9c002dc9..1b6dfb9253 100644 --- a/packages/modules/devices/deye/deye/counter.py +++ b/packages/modules/devices/deye/deye/counter.py @@ -8,7 +8,7 @@ from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.deye.deye.config import DeyeCounterSetup from modules.devices.deye.deye.device_type import DeviceType from modules.common.component_type import ComponentType @@ -27,10 +27,10 @@ def __init__(self, component_config: DeyeCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.device_type = DeviceType(self.client.read_holding_registers( 0, ModbusDataType.INT_16, unit=self.component_config.configuration.modbus_id)) diff --git a/packages/modules/devices/deye/deye/inverter.py b/packages/modules/devices/deye/deye/inverter.py index 13eeb467be..fb34c7738f 100644 --- a/packages/modules/devices/deye/deye/inverter.py +++ b/packages/modules/devices/deye/deye/inverter.py @@ -8,7 +8,7 @@ from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.deye.deye.config import DeyeInverterSetup from modules.devices.deye.deye.device_type import DeviceType from modules.common.component_type import ComponentType @@ -27,10 +27,10 @@ def __init__(self, component_config: DeyeInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.device_type = DeviceType(self.client.read_holding_registers( 0, ModbusDataType.INT_16, unit=self.component_config.configuration.modbus_id)) diff --git a/packages/modules/devices/discovergy/discovergy/counter.py b/packages/modules/devices/discovergy/discovergy/counter.py index 1de14450f4..a8ec9cc5c7 100644 --- a/packages/modules/devices/discovergy/discovergy/counter.py +++ b/packages/modules/devices/discovergy/discovergy/counter.py @@ -3,8 +3,8 @@ from modules.common.abstract_device import AbstractCounter from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_counter_value_store from modules.common.utils.peak_filter import PeakFilter +from modules.common.store import get_component_value_store from modules.devices.discovergy.discovergy import api from modules.devices.discovergy.discovergy.config import DiscovergyCounterSetup from modules.common.component_state import CounterState @@ -16,7 +16,7 @@ def __init__(self, component_config: DiscovergyCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/discovergy/discovergy/device test.py b/packages/modules/devices/discovergy/discovergy/device test.py index eefe1576fb..eb4a86e4b6 100644 --- a/packages/modules/devices/discovergy/discovergy/device test.py +++ b/packages/modules/devices/discovergy/discovergy/device test.py @@ -32,8 +32,8 @@ def setup(self, monkeypatch): self.mock_counter_value_store = Mock() self.mock_inverter_value_store = Mock() self.mock_get_last_reading = Mock(return_value=SAMPLE_COUNTER_STATE) - monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=self.mock_counter_value_store)) - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=self.mock_inverter_value_store)) + monkeypatch.setattr(counter, 'get_component_value_store', Mock(return_value=self.mock_counter_value_store)) + monkeypatch.setattr(inverter, 'get_component_value_store', Mock(return_value=self.mock_inverter_value_store)) monkeypatch.setattr(api, 'get_last_reading', self.mock_get_last_reading) def test_read_legacy_reads_counter(self, monkeypatch): diff --git a/packages/modules/devices/discovergy/discovergy/inverter.py b/packages/modules/devices/discovergy/discovergy/inverter.py index 82a3253493..d7919e29b6 100644 --- a/packages/modules/devices/discovergy/discovergy/inverter.py +++ b/packages/modules/devices/discovergy/discovergy/inverter.py @@ -4,8 +4,8 @@ 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.store import get_inverter_value_store from modules.common.utils.peak_filter import PeakFilter +from modules.common.store import get_component_value_store from modules.devices.discovergy.discovergy import api from modules.devices.discovergy.discovergy.config import DiscovergyInverterSetup from modules.common.component_type import ComponentType @@ -16,7 +16,7 @@ def __init__(self, component_config: DiscovergyInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/e3dc/e3dc/bat.py b/packages/modules/devices/e3dc/e3dc/bat.py index 18d290671c..4c05411ccb 100644 --- a/packages/modules/devices/e3dc/e3dc/bat.py +++ b/packages/modules/devices/e3dc/e3dc/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.modbus import ModbusDataType, Endian from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.common.utils.peak_filter import PeakFilter from modules.devices.e3dc.e3dc.config import E3dcBatSetup @@ -39,10 +39,10 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_id'] self.client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") def update(self) -> None: soc, power = read_bat(self.client, self.__modbus_id) diff --git a/packages/modules/devices/e3dc/e3dc/counter.py b/packages/modules/devices/e3dc/e3dc/counter.py index f58ff196dd..1c2d127c74 100644 --- a/packages/modules/devices/e3dc/e3dc/counter.py +++ b/packages/modules/devices/e3dc/e3dc/counter.py @@ -10,7 +10,7 @@ from modules.common.simcount._simcounter import SimCounter from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.e3dc.e3dc.config import E3dcCounterSetup from modules.common.component_type import ComponentType @@ -57,10 +57,10 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_id'] self.client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") def update(self) -> None: power, powers = read_counter(self.client, self.__modbus_id) diff --git a/packages/modules/devices/e3dc/e3dc/device.py b/packages/modules/devices/e3dc/e3dc/device.py index 1e1992e658..15c4bcf89a 100644 --- a/packages/modules/devices/e3dc/e3dc/device.py +++ b/packages/modules/devices/e3dc/e3dc/device.py @@ -1,24 +1,19 @@ #!/usr/bin/env python3 import logging -from typing import List, Union, Iterable +from typing import Union, Iterable -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 -from modules.devices.e3dc.e3dc.inverter import E3dcInverter, read_inverter -from modules.devices.e3dc.e3dc.external_inverter import E3dcExternalInverter, read_external_inverter +from modules.devices.e3dc.e3dc.bat import E3dcBat +from modules.devices.e3dc.e3dc.inverter import E3dcInverter +from modules.devices.e3dc.e3dc.external_inverter import E3dcExternalInverter from modules.devices.e3dc.e3dc.counter import E3dcCounter -from modules.devices.e3dc.e3dc.config import E3dc, E3dcConfiguration +from modules.devices.e3dc.e3dc.config import E3dc from modules.devices.e3dc.e3dc.config import E3dcBatSetup -from modules.devices.e3dc.e3dc.config import E3dcCounterSetup, E3dcCounterConfiguration +from modules.devices.e3dc.e3dc.config import E3dcCounterSetup from modules.devices.e3dc.e3dc.config import E3dcInverterSetup, E3dcExternalInverterSetup -from modules.common.store.ramdisk import files -from modules.common.simcount import sim_count -from modules.common.store import get_inverter_value_store, get_bat_value_store -from modules.common.component_state import InverterState, BatState log = logging.getLogger(__name__) @@ -79,86 +74,4 @@ def initializer(): ) -def run_device_legacy(device_config: E3dc, - component_config: Union[E3dcBatSetup, E3dcCounterSetup, E3dcInverterSetup]) -> None: - device = create_device(device_config) - device.add_component(component_config) - # do not log complete config objects as these will contain german umlauts and logging will fail in Version 1.9 - log.debug("E3dc Configuration: %s, Component Configuration: %s", - device_config.configuration, component_config.configuration) - device.update() - - -def create_legacy_device_config(address: str, - num: int) -> E3dc: - device_config = E3dc(configuration=E3dcConfiguration(address=address), - id=num) - log.debug("Config: %s", device_config) - return device_config - - -def read_legacy_counter(address1: str, num: int) -> None: - component_config = E3dcCounterSetup(configuration=E3dcCounterConfiguration()) - component_config.id = num - run_device_legacy(create_legacy_device_config(address1, - num), component_config) - - -def read_legacy_bat(address1: str, - address2: str, read_ext_input: int, - pv_module: str, - num: int) -> None: - # für Openwb Version 1.9 können mit der bisherigen Parametrisierung zwei IP-Adressen ausgelesen werden - # ebenso wird bei Speicheraufruf Speicher und PV ausgelesen - # in openwb v2.0 geht nur noch eine IP Adresse und die Pv muss separat ausgelesen werden - addresses = [address for address in [address1, address2] if address != "none"] - read_ext = (read_ext_input == 1) - log.debug('e3dc IP-Adresse1: %s', address1) - log.debug('e3dc IP-Adresse2: %s', address2) - log.debug('e3dc read_ext: %s', read_ext) - log.debug('e3dc pv_module: %s', pv_module) - log.debug('e3dc id: %d', num) - soc = 0 # type: Union[int, float] - power = 0 - pv_external = 0 - pv = 0 - pv_other = pv_module != "none" - for address in addresses: - log.debug("Ip: %s, read_external %s pv_other %s", address, read_ext, pv_other) - with modbus.ModbusTcpClient_(address, port=502) as client: - soc_tmp, power_tmp = read_bat(client, 1) - soc += soc_tmp - power += power_tmp - pv_tmp = read_inverter(client, 1) - if read_ext: - pv_external_tmp = read_external_inverter(client, 1) - else: - pv_external_tmp = 0 - pv += pv_tmp - pv_external += pv_external_tmp - soc /= len(addresses) - log.debug("Soc %d power %d pv %d pv_external %d", - soc, power, pv, pv_external) - counter_import, counter_export = sim_count(power, prefix="speicher") - get_bat_value_store(1).set(BatState(power=power, soc=soc, imported=counter_import, exported=counter_export)) - # pv_other sagt aus, ob WR definiert ist, und dessen PV Leistung auch gilt - # wenn 0 gilt nur PV und pv_external aus e3dc - pv_total = pv + pv_external - # Wenn wr1 nicht definiert ist, gilt nur die PV Leistung die hier im Modul ermittelt wurde - # als gesamte PV Leistung für wr1 - # Wenn wr1 definiert ist, gilt die bestehende PV Leistung aus Wr1 und das was hier im Modul ermittelt wurde - # als gesamte PV Leistung für wr1 - if pv_other: - pv_total = pv_total + files.pv[0].power.read() - log.debug("wr update pv_other %s pv_total %d", pv_other, pv_total) - _, exported_pv = sim_count(pv_total, prefix="pv") - get_inverter_value_store(num).set(InverterState(exported=exported_pv, power=pv_total)) - - -def main(argv: List[str]) -> None: - run_using_positional_cli_args( - {"bat": read_legacy_bat, "counter": read_legacy_counter}, argv - ) - - device_descriptor = DeviceDescriptor(configuration_factory=E3dc) diff --git a/packages/modules/devices/e3dc/e3dc/external_inverter.py b/packages/modules/devices/e3dc/e3dc/external_inverter.py index 93c8955271..bfde27706a 100644 --- a/packages/modules/devices/e3dc/e3dc/external_inverter.py +++ b/packages/modules/devices/e3dc/e3dc/external_inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.modbus import ModbusDataType, Endian from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.devices.e3dc.e3dc.config import E3dcExternalInverterSetup from modules.common.utils.peak_filter import PeakFilter @@ -38,8 +38,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_id'] self.client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/e3dc/e3dc/inverter.py b/packages/modules/devices/e3dc/e3dc/inverter.py index 25249f49ca..7e461b0ec9 100644 --- a/packages/modules/devices/e3dc/e3dc/inverter.py +++ b/packages/modules/devices/e3dc/e3dc/inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.modbus import ModbusDataType, Endian from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.common.utils.peak_filter import PeakFilter from modules.devices.e3dc.e3dc.config import E3dcInverterSetup @@ -37,10 +37,10 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_id'] self.client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") def update(self) -> None: pv = read_inverter(self.client, self.__modbus_id) diff --git a/packages/modules/devices/elgris/elgris/bat.py b/packages/modules/devices/elgris/elgris/bat.py index 08eb4f47c7..bda6df93a7 100644 --- a/packages/modules/devices/elgris/elgris/bat.py +++ b/packages/modules/devices/elgris/elgris/bat.py @@ -8,9 +8,9 @@ from modules.common.abstract_device import AbstractBat from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_bat_value_store from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -29,7 +29,7 @@ def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) self.elgris = Elgris(self.__modbus_id, self.__tcp_client, self.fault_state) - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self): counter_state = self.elgris.get_counter_state() diff --git a/packages/modules/devices/elgris/elgris/counter.py b/packages/modules/devices/elgris/elgris/counter.py index e6c38d885c..dbfa0aea7a 100644 --- a/packages/modules/devices/elgris/elgris/counter.py +++ b/packages/modules/devices/elgris/elgris/counter.py @@ -8,8 +8,8 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_counter_value_store from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -28,7 +28,7 @@ def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) self.elgris = Elgris(self.__modbus_id, self.__tcp_client, self.fault_state) - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self): counter_state = self.elgris.get_counter_state() diff --git a/packages/modules/devices/elgris/elgris/inverter.py b/packages/modules/devices/elgris/elgris/inverter.py index f9fc0198e9..228efb4e9b 100644 --- a/packages/modules/devices/elgris/elgris/inverter.py +++ b/packages/modules/devices/elgris/elgris/inverter.py @@ -3,7 +3,7 @@ from modules.common.component_state import InverterState from modules.devices.elgris.elgris.elgris import Elgris -from modules.common.store._inverter import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.elgris.elgris.config import ElgrisInverterSetup from modules.common import modbus from modules.common.abstract_device import AbstractInverter @@ -29,7 +29,7 @@ def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) self.elgris = Elgris(self.__modbus_id, self.__tcp_client, self.fault_state) - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self): counter_state = self.elgris.get_counter_state() diff --git a/packages/modules/devices/enphase/enphase/bat.py b/packages/modules/devices/enphase/enphase/bat.py index aa37480d1d..9bb4836b57 100644 --- a/packages/modules/devices/enphase/enphase/bat.py +++ b/packages/modules/devices/enphase/enphase/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common.simcount import SimCounter from modules.common.utils.peak_filter import PeakFilter from modules.devices.enphase.enphase.config import EnphaseBatSetup @@ -26,10 +26,10 @@ def __init__(self, component_config: EnphaseBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self, response, live_data: Optional[Dict[str, Any]] = None) -> None: if live_data is None: diff --git a/packages/modules/devices/enphase/enphase/counter.py b/packages/modules/devices/enphase/enphase/counter.py index 29262e649b..bd7b3748d2 100644 --- a/packages/modules/devices/enphase/enphase/counter.py +++ b/packages/modules/devices/enphase/enphase/counter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.enphase.enphase.config import EnphaseCounterSetup from modules.common.component_type import ComponentType @@ -19,7 +19,7 @@ def __init__(self, component_config: EnphaseCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/enphase/enphase/inverter.py b/packages/modules/devices/enphase/enphase/inverter.py index 1db73f7e0e..0d975c8db1 100644 --- a/packages/modules/devices/enphase/enphase/inverter.py +++ b/packages/modules/devices/enphase/enphase/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.enphase.enphase.config import EnphaseInverterSetup from modules.common.component_type import ComponentType @@ -19,7 +19,7 @@ def __init__(self, component_config: EnphaseInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fems/fems/bat.py b/packages/modules/devices/fems/fems/bat.py index f768b42efd..af5cf646e0 100644 --- a/packages/modules/devices/fems/fems/bat.py +++ b/packages/modules/devices/fems/fems/bat.py @@ -6,8 +6,8 @@ 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.store import get_bat_value_store from modules.common.utils.peak_filter import PeakFilter +from modules.common.store import get_component_value_store from modules.devices.fems.fems.version import FemsVersion, get_version from helpermodules.scale_metric import scale_metric from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def __init__(self, component_config: FemsBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] self.session: Session = self.kwargs['session'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) if self.component_config.configuration.num == 1: diff --git a/packages/modules/devices/fems/fems/bat_test.py b/packages/modules/devices/fems/fems/bat_test.py index 2b899476ab..0f4822af7c 100644 --- a/packages/modules/devices/fems/fems/bat_test.py +++ b/packages/modules/devices/fems/fems/bat_test.py @@ -11,7 +11,7 @@ def test_fems_bat(monkeypatch, requests_mock: requests_mock.mock): # setup mock_bat_value_store = Mock() - monkeypatch.setattr(bat, 'get_bat_value_store', Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, 'get_component_value_store', Mock(return_value=mock_bat_value_store)) requests_mock.get('http://1.1.1.1:8084/rest/channel/(ess0|_sum)/(Soc|DcChargeEnergy|DcDischargeEnergy|' + 'GridActivePower|ProductionActivePower|ConsumptionActivePower)', json=SAMPLE_RESPONSE) diff --git a/packages/modules/devices/fems/fems/counter.py b/packages/modules/devices/fems/fems/counter.py index 6828f61b9f..e239d3e761 100644 --- a/packages/modules/devices/fems/fems/counter.py +++ b/packages/modules/devices/fems/fems/counter.py @@ -9,7 +9,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.fems.fems.version import FemsVersion, get_version from modules.common.component_type import ComponentType @@ -29,7 +29,7 @@ def __init__(self, component_config: FemsCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] self.session: Session = self.kwargs['session'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) self.version = get_version(self.get_data_by_multiple_segement_regex_query) diff --git a/packages/modules/devices/fems/fems/counter_test.py b/packages/modules/devices/fems/fems/counter_test.py index aa4b2a7999..e7c51f6de6 100644 --- a/packages/modules/devices/fems/fems/counter_test.py +++ b/packages/modules/devices/fems/fems/counter_test.py @@ -11,7 +11,7 @@ def test_fems_counter(monkeypatch, requests_mock: requests_mock.mock): # setup mock_counter_value_store = Mock() - monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, 'get_component_value_store', Mock(return_value=mock_counter_value_store)) requests_mock.get('http://1.1.1.1:8084/rest/channel/(meter0|_sum)/(ActivePower.*|VoltageL.|Frequency|Grid.+' + 'ActiveEnergy)', json=SAMPLE_RESPONSE) diff --git a/packages/modules/devices/fems/fems/device test.py b/packages/modules/devices/fems/fems/device test.py index eefe1576fb..eb4a86e4b6 100644 --- a/packages/modules/devices/fems/fems/device test.py +++ b/packages/modules/devices/fems/fems/device test.py @@ -32,8 +32,8 @@ def setup(self, monkeypatch): self.mock_counter_value_store = Mock() self.mock_inverter_value_store = Mock() self.mock_get_last_reading = Mock(return_value=SAMPLE_COUNTER_STATE) - monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=self.mock_counter_value_store)) - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=self.mock_inverter_value_store)) + monkeypatch.setattr(counter, 'get_component_value_store', Mock(return_value=self.mock_counter_value_store)) + monkeypatch.setattr(inverter, 'get_component_value_store', Mock(return_value=self.mock_inverter_value_store)) monkeypatch.setattr(api, 'get_last_reading', self.mock_get_last_reading) def test_read_legacy_reads_counter(self, monkeypatch): diff --git a/packages/modules/devices/fems/fems/inverter.py b/packages/modules/devices/fems/fems/inverter.py index a875ef6cf9..91674bcf54 100644 --- a/packages/modules/devices/fems/fems/inverter.py +++ b/packages/modules/devices/fems/fems/inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.fems.fems.version import FemsVersion, get_version from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def __init__(self, component_config: FemsInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] self.session: Session = self.kwargs['session'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) self.version = get_version(self.get_data_by_multiple_segement_regex_query) diff --git a/packages/modules/devices/fems/fems/inverter_test.py b/packages/modules/devices/fems/fems/inverter_test.py index e0e6fa5a4b..d8170ad2f8 100644 --- a/packages/modules/devices/fems/fems/inverter_test.py +++ b/packages/modules/devices/fems/fems/inverter_test.py @@ -11,7 +11,7 @@ def test_fems_inverter(monkeypatch, requests_mock: requests_mock.mock): # setup mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, 'get_component_value_store', Mock(return_value=mock_inverter_value_store)) requests_mock.get('http://1.1.1.1:8084/rest/channel/_sum/(ProductionActivePower|ProductionActiveEnergy)', json=SAMPLE_RESPONSE) diff --git a/packages/modules/devices/fox_ess/fox_ess/bat.py b/packages/modules/devices/fox_ess/fox_ess/bat.py index 408fa44e44..40170674e4 100644 --- a/packages/modules/devices/fox_ess/fox_ess/bat.py +++ b/packages/modules/devices/fox_ess/fox_ess/bat.py @@ -6,8 +6,8 @@ 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.store import get_bat_value_store from modules.common.utils.peak_filter import PeakFilter +from modules.common.store import get_component_value_store from modules.devices.fox_ess.fox_ess.config import FoxEssBatSetup from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: FoxEssBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fox_ess/fox_ess/counter.py b/packages/modules/devices/fox_ess/fox_ess/counter.py index e600ce8f13..5f314f3333 100644 --- a/packages/modules/devices/fox_ess/fox_ess/counter.py +++ b/packages/modules/devices/fox_ess/fox_ess/counter.py @@ -1,7 +1,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.fox_ess.fox_ess.config import FoxEssCounterSetup from modules.common.abstract_device import AbstractCounter from modules.common.component_state import CounterState @@ -21,7 +21,7 @@ def __init__(self, component_config: FoxEssCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fox_ess/fox_ess/inverter.py b/packages/modules/devices/fox_ess/fox_ess/inverter.py index d64265aed4..d4ab521773 100644 --- a/packages/modules/devices/fox_ess/fox_ess/inverter.py +++ b/packages/modules/devices/fox_ess/fox_ess/inverter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.fox_ess.fox_ess.config import FoxEssInverterSetup from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: FoxEssInverterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/bat.py b/packages/modules/devices/fronius/fronius/bat.py index 64a8307cc9..685ba3cf4f 100644 --- a/packages/modules/devices/fronius/fronius/bat.py +++ b/packages/modules/devices/fronius/fronius/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusBatSetup from modules.devices.fronius.fronius.config import FroniusConfiguration from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: FroniusBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.device_config: FroniusConfiguration = self.kwargs['device_config'] self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/counter_s0.py b/packages/modules/devices/fronius/fronius/counter_s0.py index aced285762..349bb48029 100644 --- a/packages/modules/devices/fronius/fronius/counter_s0.py +++ b/packages/modules/devices/fronius/fronius/counter_s0.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusConfiguration, FroniusS0CounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,8 +26,8 @@ def __init__(self, component_config: FroniusS0CounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.device_config: FroniusConfiguration = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/counter_sm.py b/packages/modules/devices/fronius/fronius/counter_sm.py index bd868175c7..ff5cb67afe 100644 --- a/packages/modules/devices/fronius/fronius/counter_sm.py +++ b/packages/modules/devices/fronius/fronius/counter_sm.py @@ -10,7 +10,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusConfiguration, MeterLocation from modules.devices.fronius.fronius.config import FroniusSmCounterSetup from modules.common.utils.peak_filter import PeakFilter @@ -32,8 +32,8 @@ def __init__(self, component_config: FroniusSmCounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.device_config: FroniusConfiguration = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/inverter.py b/packages/modules/devices/fronius/fronius/inverter.py index 731a2d2aed..03723bad21 100644 --- a/packages/modules/devices/fronius/fronius/inverter.py +++ b/packages/modules/devices/fronius/fronius/inverter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: FroniusInverterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/inverter_production_meter.py b/packages/modules/devices/fronius/fronius/inverter_production_meter.py index 85ec52203d..fe7b0d86ba 100644 --- a/packages/modules/devices/fronius/fronius/inverter_production_meter.py +++ b/packages/modules/devices/fronius/fronius/inverter_production_meter.py @@ -10,7 +10,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusConfiguration, MeterLocation from modules.devices.fronius.fronius.config import FroniusProductionMeterSetup from modules.common.utils.peak_filter import PeakFilter @@ -32,8 +32,8 @@ def __init__(self, component_config: FroniusProductionMeterSetup, **kwargs: Any) def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.device_config: FroniusConfiguration = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/fronius/fronius/inverter_production_meter_test.py b/packages/modules/devices/fronius/fronius/inverter_production_meter_test.py index 8fddaafb65..a52346637c 100644 --- a/packages/modules/devices/fronius/fronius/inverter_production_meter_test.py +++ b/packages/modules/devices/fronius/fronius/inverter_production_meter_test.py @@ -20,11 +20,11 @@ def mock_ramdisk(monkeypatch): def test_production_count(monkeypatch, requests_mock: requests_mock.mock): mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter_production_meter, "get_inverter_value_store", + monkeypatch.setattr(inverter_production_meter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) requests_mock.get(f"http://{SAMPLE_IP}/solar_api/v1/GetMeterRealtimeData.cgi", json=json_ext_var2) mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter_production_meter, "get_inverter_value_store", + monkeypatch.setattr(inverter_production_meter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) component_config = FroniusProductionMeterSetup() diff --git a/packages/modules/devices/fronius/fronius/inverter_secondary.py b/packages/modules/devices/fronius/fronius/inverter_secondary.py index 38ea51385b..53a82e6373 100644 --- a/packages/modules/devices/fronius/fronius/inverter_secondary.py +++ b/packages/modules/devices/fronius/fronius/inverter_secondary.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.fronius.fronius.config import FroniusSecondaryInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: FroniusSecondaryInverterSetup, **kwargs: An def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/http/api.py b/packages/modules/devices/generic/http/api.py index ac3e7526bb..78aa664445 100644 --- a/packages/modules/devices/generic/http/api.py +++ b/packages/modules/devices/generic/http/api.py @@ -20,6 +20,15 @@ def create_request_function(url: str, path: Optional[str]) -> RequestFunction[Op return functools.partial(_request_value, url + path) +def create_post_function(url: str, path: Optional[str]) -> Callable[[Session, dict], None]: + if path is None: + return lambda _: None + else: + def post_function(session: Session, params: dict): + session.post(url + path, params=params, timeout=5) + return post_function + + def create_request_function_array(url: str, paths: Iterable[Optional[str]]) -> RequestFunction[Optional[List[float]]]: functions = [] # type: List[RequestFunction[float]] for path in paths: diff --git a/packages/modules/devices/generic/http/bat.py b/packages/modules/devices/generic/http/bat.py index 72b4343f66..123b11712e 100644 --- a/packages/modules/devices/generic/http/bat.py +++ b/packages/modules/devices/generic/http/bat.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.http.api import create_request_function, create_request_function_array from modules.devices.generic.http.config import HttpBatSetup from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: HttpBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/http/counter.py b/packages/modules/devices/generic/http/counter.py index 45633ec0cc..ceae4c6048 100644 --- a/packages/modules/devices/generic/http/counter.py +++ b/packages/modules/devices/generic/http/counter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.http.api import create_request_function, create_request_function_array from modules.devices.generic.http.config import HttpCounterSetup from modules.common.utils.peak_filter import PeakFilter @@ -28,8 +28,8 @@ def __init__(self, component_config: HttpCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.url: str = self.kwargs['url'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/http/inverter.py b/packages/modules/devices/generic/http/inverter.py index b54734d824..4de05a3c8d 100644 --- a/packages/modules/devices/generic/http/inverter.py +++ b/packages/modules/devices/generic/http/inverter.py @@ -9,7 +9,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.http.api import create_request_function from modules.devices.generic.http.config import HttpInverterSetup from modules.common.utils.peak_filter import PeakFilter @@ -29,8 +29,8 @@ def __init__(self, component_config: HttpInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.url: str = self.kwargs['url'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/json/bat.py b/packages/modules/devices/generic/json/bat.py index 4f92820ae0..66900326f1 100644 --- a/packages/modules/devices/generic/json/bat.py +++ b/packages/modules/devices/generic/json/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.json.config import JsonBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def _compile_jq_filters(self) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self._compile_jq_filters() self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/json/counter.py b/packages/modules/devices/generic/json/counter.py index 1966d107f6..16e138ce68 100644 --- a/packages/modules/devices/generic/json/counter.py +++ b/packages/modules/devices/generic/json/counter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount._simcounter import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.json.config import JsonCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -35,8 +35,8 @@ def _compile_jq_filters(self) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self._compile_jq_filters() self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/json/device_test.py b/packages/modules/devices/generic/json/device_test.py index 93b5a5f635..b61c7e3718 100644 --- a/packages/modules/devices/generic/json/device_test.py +++ b/packages/modules/devices/generic/json/device_test.py @@ -14,9 +14,9 @@ def mock_value_store(monkeypatch): mock_value_store = Mock() mock_value_store_factory = Mock(return_value=mock_value_store) - monkeypatch.setattr(bat, "get_bat_value_store", mock_value_store_factory) - monkeypatch.setattr(counter, "get_counter_value_store", mock_value_store_factory) - monkeypatch.setattr(inverter, "get_inverter_value_store", mock_value_store_factory) + monkeypatch.setattr(bat, "get_component_value_store", mock_value_store_factory) + monkeypatch.setattr(counter, "get_component_value_store", mock_value_store_factory) + monkeypatch.setattr(inverter, "get_component_value_store", mock_value_store_factory) return mock_value_store diff --git a/packages/modules/devices/generic/json/inverter.py b/packages/modules/devices/generic/json/inverter.py index 0f8bffe7a1..3d920d90a6 100644 --- a/packages/modules/devices/generic/json/inverter.py +++ b/packages/modules/devices/generic/json/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.json.config import JsonInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def _compile_jq_filters(self) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self._compile_jq_filters() self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/generic/mqtt/bat.py b/packages/modules/devices/generic/mqtt/bat.py index c4df5073af..61368a2b7f 100644 --- a/packages/modules/devices/generic/mqtt/bat.py +++ b/packages/modules/devices/generic/mqtt/bat.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.component_type import ComponentDescriptor from modules.common.simcount._simcounter import SimCounter -from modules.common.store._battery import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.mqtt.config import MqttBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,9 +25,9 @@ def __init__(self, component_config: MqttBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="bat") self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self, received_topics: Dict) -> None: def parse_received_topics(value: str): diff --git a/packages/modules/devices/generic/mqtt/counter.py b/packages/modules/devices/generic/mqtt/counter.py index 813b2358d1..04d3a7eabe 100644 --- a/packages/modules/devices/generic/mqtt/counter.py +++ b/packages/modules/devices/generic/mqtt/counter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.component_type import ComponentDescriptor from modules.common.simcount._simcounter import SimCounter -from modules.common.store._counter import get_counter_value_store +from modules.common.store._factory import get_component_value_store from modules.devices.generic.mqtt.config import MqttCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -24,9 +24,9 @@ def __init__(self, component_config: MqttCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self, received_topics: Dict) -> None: def parse_received_topics(value: str): diff --git a/packages/modules/devices/generic/mqtt/inverter.py b/packages/modules/devices/generic/mqtt/inverter.py index c17ce5e59a..850ea64eb1 100644 --- a/packages/modules/devices/generic/mqtt/inverter.py +++ b/packages/modules/devices/generic/mqtt/inverter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.component_type import ComponentDescriptor from modules.common.simcount._simcounter import SimCounter -from modules.common.store._inverter import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.mqtt.config import MqttInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -24,9 +24,9 @@ def __init__(self, component_config: MqttInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="pv") self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self, received_topics: Dict) -> None: def parse_received_topics(value: str): diff --git a/packages/modules/devices/generic/virtual/counter.py b/packages/modules/devices/generic/virtual/counter.py index 295483a25c..212098fb9b 100644 --- a/packages/modules/devices/generic/virtual/counter.py +++ b/packages/modules/devices/generic/virtual/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.generic.virtual.config import VirtualCounterSetup @@ -21,9 +21,11 @@ def __init__(self, component_config: VirtualCounterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store( - self.component_config.id, add_child_values=True, simcounter=self.sim_counter) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, + self.component_config.id, + add_child_values=True, + simcounter=self.sim_counter) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self): diff --git a/packages/modules/devices/good_we/good_we/bat.py b/packages/modules/devices/good_we/good_we/bat.py index de31002305..b222867b82 100644 --- a/packages/modules/devices/good_we/good_we/bat.py +++ b/packages/modules/devices/good_we/good_we/bat.py @@ -9,7 +9,7 @@ from modules.common.modbus import ModbusDataType from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.good_we.good_we.config import GoodWeBatSetup from modules.devices.good_we.good_we.version import GoodWeVersion from modules.common.utils.peak_filter import PeakFilter @@ -37,8 +37,8 @@ def initialize(self) -> None: self.version: GoodWeVersion = self.kwargs['version'] self.firmware: int = self.kwargs['firmware'] self.__tcp_client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) self.last_mode = 'Undefined' diff --git a/packages/modules/devices/good_we/good_we/counter.py b/packages/modules/devices/good_we/good_we/counter.py index f8fa2f4691..3d841685ba 100644 --- a/packages/modules/devices/good_we/good_we/counter.py +++ b/packages/modules/devices/good_we/good_we/counter.py @@ -9,7 +9,7 @@ from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter from modules.common.utils.peak_filter import PeakFilter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.good_we.good_we.config import GoodWeCounterSetup from modules.devices.good_we.good_we.version import GoodWeVersion from modules.common.component_type import ComponentType @@ -33,8 +33,8 @@ def initialize(self) -> None: self.version: GoodWeVersion = self.kwargs['version'] self.firmware: int = self.kwargs['firmware'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/good_we/good_we/inverter.py b/packages/modules/devices/good_we/good_we/inverter.py index 2f77bc943c..1310f9b741 100644 --- a/packages/modules/devices/good_we/good_we/inverter.py +++ b/packages/modules/devices/good_we/good_we/inverter.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.good_we.good_we.config import GoodWeInverterSetup from modules.devices.good_we.good_we.version import GoodWeVersion from modules.common.component_type import ComponentType @@ -31,7 +31,7 @@ def initialize(self) -> None: self.version: GoodWeVersion = self.kwargs['version'] self.firmware: int = self.kwargs['firmware'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/growatt/growatt/bat.py b/packages/modules/devices/growatt/growatt/bat.py index 6bbf5530ac..2edf6eddf9 100644 --- a/packages/modules/devices/growatt/growatt/bat.py +++ b/packages/modules/devices/growatt/growatt/bat.py @@ -7,7 +7,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.growatt.growatt.config import GrowattBatSetup from modules.devices.growatt.growatt.version import GrowattVersion from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.version: GrowattVersion = self.kwargs['version'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/growatt/growatt/counter.py b/packages/modules/devices/growatt/growatt/counter.py index ea18aef915..c03763e0fc 100644 --- a/packages/modules/devices/growatt/growatt/counter.py +++ b/packages/modules/devices/growatt/growatt/counter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.growatt.growatt.config import GrowattCounterSetup from modules.devices.growatt.growatt.version import GrowattVersion from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.version: GrowattVersion = self.kwargs['version'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/growatt/growatt/inverter.py b/packages/modules/devices/growatt/growatt/inverter.py index bc6da22ace..da8edc87d4 100644 --- a/packages/modules/devices/growatt/growatt/inverter.py +++ b/packages/modules/devices/growatt/growatt/inverter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.growatt.growatt.config import GrowattInverterSetup from modules.devices.growatt.growatt.version import GrowattVersion from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.version: GrowattVersion = self.kwargs['version'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei/bat.py b/packages/modules/devices/huawei/huawei/bat.py index 9de263ec72..dbd04a1bdd 100644 --- a/packages/modules/devices/huawei/huawei/bat.py +++ b/packages/modules/devices/huawei/huawei/bat.py @@ -9,7 +9,7 @@ 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.common.store import get_component_value_store from modules.devices.huawei.huawei.config import HuaweiBatSetup from modules.devices.huawei.huawei.type import HuaweiType from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.type: HuaweiType = self.kwargs['type'] 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei/counter.py b/packages/modules/devices/huawei/huawei/counter.py index 6b6196c9bf..e7e5e336e1 100644 --- a/packages/modules/devices/huawei/huawei/counter.py +++ b/packages/modules/devices/huawei/huawei/counter.py @@ -9,7 +9,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei.config import HuaweiCounterSetup from modules.devices.huawei.huawei.type import HuaweiType from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.type: HuaweiType = self.kwargs['type'] 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei/inverter.py b/packages/modules/devices/huawei/huawei/inverter.py index d788b50397..6f3c1852eb 100644 --- a/packages/modules/devices/huawei/huawei/inverter.py +++ b/packages/modules/devices/huawei/huawei/inverter.py @@ -9,7 +9,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei.config import HuaweiInverterSetup from modules.devices.huawei.huawei.type import HuaweiType from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.type: HuaweiType = self.kwargs['type'] 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_emma/bat.py b/packages/modules/devices/huawei/huawei_emma/bat.py index 9f98c8e6bd..0a64f3d09e 100644 --- a/packages/modules/devices/huawei/huawei_emma/bat.py +++ b/packages/modules/devices/huawei/huawei_emma/bat.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.huawei.huawei_emma.config import Huawei_EmmaBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_emma/counter.py b/packages/modules/devices/huawei/huawei_emma/counter.py index f7f3e6bd40..a4e7e08fe6 100644 --- a/packages/modules/devices/huawei/huawei_emma/counter.py +++ b/packages/modules/devices/huawei/huawei_emma/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.huawei.huawei_emma.config import Huawei_EmmaCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_emma/inverter.py b/packages/modules/devices/huawei/huawei_emma/inverter.py index 11324f7dc5..06420cee98 100644 --- a/packages/modules/devices/huawei/huawei_emma/inverter.py +++ b/packages/modules/devices/huawei/huawei_emma/inverter.py @@ -6,7 +6,8 @@ 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.store import get_inverter_value_store +from modules.common.simcount import SimCounter +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei_emma.config import Huawei_EmmaInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,7 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_smartlogger/bat.py b/packages/modules/devices/huawei/huawei_smartlogger/bat.py index 4d82b598cf..d2faab252b 100644 --- a/packages/modules/devices/huawei/huawei_smartlogger/bat.py +++ b/packages/modules/devices/huawei/huawei_smartlogger/bat.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei_smartlogger.config import Huawei_SmartloggerBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def __init__(self, component_config: Huawei_SmartloggerBatSetup, **kwargs: Any) def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_smartlogger/counter.py b/packages/modules/devices/huawei/huawei_smartlogger/counter.py index 80b7ae5a53..71596048e7 100644 --- a/packages/modules/devices/huawei/huawei_smartlogger/counter.py +++ b/packages/modules/devices/huawei/huawei_smartlogger/counter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei_smartlogger.config import Huawei_SmartloggerCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,8 +26,8 @@ def __init__(self, component_config: Huawei_SmartloggerCounterSetup, **kwargs: A def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: modbus.ModbusTcpClient_ = self.kwargs['tcp_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/huawei/huawei_smartlogger/inverter.py b/packages/modules/devices/huawei/huawei_smartlogger/inverter.py index efe5604051..d2c48059a8 100644 --- a/packages/modules/devices/huawei/huawei_smartlogger/inverter.py +++ b/packages/modules/devices/huawei/huawei_smartlogger/inverter.py @@ -9,7 +9,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.huawei.huawei_smartlogger.config import Huawei_SmartloggerInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def __init__(self, component_config: Huawei_SmartloggerInverterSetup, **kwargs: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: modbus.ModbusTcpClient_ = self.kwargs['tcp_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/idm/idm/counter.py b/packages/modules/devices/idm/idm/counter.py index 6712dc1580..1cc7c8e1c9 100644 --- a/packages/modules/devices/idm/idm/counter.py +++ b/packages/modules/devices/idm/idm/counter.py @@ -9,7 +9,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.idm.idm.config import IDMCounterSetup from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] self.modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/janitza/janitza/bat.py b/packages/modules/devices/janitza/janitza/bat.py index 73d927a81d..7b379f723a 100644 --- a/packages/modules/devices/janitza/janitza/bat.py +++ b/packages/modules/devices/janitza/janitza/bat.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.janitza.janitza.config import JanitzaBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/janitza/janitza/counter.py b/packages/modules/devices/janitza/janitza/counter.py index 72e054cd23..5719bf95ed 100644 --- a/packages/modules/devices/janitza/janitza/counter.py +++ b/packages/modules/devices/janitza/janitza/counter.py @@ -9,7 +9,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.janitza.janitza.config import JanitzaCounterSetup from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/janitza/janitza/inverter.py b/packages/modules/devices/janitza/janitza/inverter.py index d3637eaed7..6d748027d2 100644 --- a/packages/modules/devices/janitza/janitza/inverter.py +++ b/packages/modules/devices/janitza/janitza/inverter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.janitza.janitza.config import JanitzaInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['tcp_client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kaco/kaco_nh/bat.py b/packages/modules/devices/kaco/kaco_nh/bat.py index f0a24d3e77..e6b1a3b1f1 100644 --- a/packages/modules/devices/kaco/kaco_nh/bat.py +++ b/packages/modules/devices/kaco/kaco_nh/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.kaco.kaco_nh.config import KacoNHBatSetup from modules.devices.kaco.kaco_nh.config import KacoNHConfiguration from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: KacoNHBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.device_config: KacoNHConfiguration = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kaco/kaco_nh/counter.py b/packages/modules/devices/kaco/kaco_nh/counter.py index 797af0c5d4..d831bd1e5e 100644 --- a/packages/modules/devices/kaco/kaco_nh/counter.py +++ b/packages/modules/devices/kaco/kaco_nh/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.kaco.kaco_nh.config import KacoNHConfiguration, KacoNHCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: KacoNHCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.device_config: KacoNHConfiguration = self.kwargs['device_config'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kaco/kaco_nh/inverter.py b/packages/modules/devices/kaco/kaco_nh/inverter.py index 9ac302091a..23773bea8d 100644 --- a/packages/modules/devices/kaco/kaco_nh/inverter.py +++ b/packages/modules/devices/kaco/kaco_nh/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.kaco.kaco_nh.config import KacoNHInverterSetup from modules.devices.kaco.kaco_nh.config import KacoNHConfiguration from modules.common.utils.peak_filter import PeakFilter @@ -24,7 +24,7 @@ def __init__(self, component_config: KacoNHInverterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.device_config: KacoNHConfiguration = self.kwargs['device_config'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kaco/kaco_tx/inverter.py b/packages/modules/devices/kaco/kaco_tx/inverter.py index 59148aa256..6bab0c02d2 100644 --- a/packages/modules/devices/kaco/kaco_tx/inverter.py +++ b/packages/modules/devices/kaco/kaco_tx/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.kaco.kaco_tx.config import KacoInverterSetup from modules.devices.kaco.kaco_tx.scale import create_scaled_reader from modules.common.utils.peak_filter import PeakFilter @@ -27,7 +27,7 @@ def __init__(self, def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self._read_scaled_int16 = create_scaled_reader( self.__tcp_client, self.component_config.configuration.modbus_id, ModbusDataType.INT_16 diff --git a/packages/modules/devices/kostal/kostal_piko/counter.py b/packages/modules/devices/kostal/kostal_piko/counter.py index 257d525275..9549fabeb9 100644 --- a/packages/modules/devices/kostal/kostal_piko/counter.py +++ b/packages/modules/devices/kostal/kostal_piko/counter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.kostal.kostal_piko.config import KostalPikoCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, component_config: KostalPikoCounterSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kostal/kostal_piko/inverter.py b/packages/modules/devices/kostal/kostal_piko/inverter.py index 22aeff64a9..2ab609a948 100644 --- a/packages/modules/devices/kostal/kostal_piko/inverter.py +++ b/packages/modules/devices/kostal/kostal_piko/inverter.py @@ -5,7 +5,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common import req from modules.devices.kostal.kostal_piko.config import KostalPikoInverterSetup from modules.common.utils.peak_filter import PeakFilter @@ -23,7 +23,7 @@ def __init__(self, component_config: KostalPikoInverterSetup, **kwargs: Any) -> def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kostal/kostal_piko_ci/counter.py b/packages/modules/devices/kostal/kostal_piko_ci/counter.py index d8003c2c29..0a0bf4731e 100644 --- a/packages/modules/devices/kostal/kostal_piko_ci/counter.py +++ b/packages/modules/devices/kostal/kostal_piko_ci/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.kostal.kostal_piko_ci.config import KostalPikoCiCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,10 +26,10 @@ def __init__(self, component_config: KostalPikoCiCounterSetup, **kwargs: Any) -> def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/kostal/kostal_piko_ci/inverter.py b/packages/modules/devices/kostal/kostal_piko_ci/inverter.py index a9851ac454..47ee35212b 100644 --- a/packages/modules/devices/kostal/kostal_piko_ci/inverter.py +++ b/packages/modules/devices/kostal/kostal_piko_ci/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.kostal.kostal_piko_ci.config import KostalPikoCiInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: KostalPikoCiInverterSetup, **kwargs: Any) - def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kostal/kostal_piko_old/inverter.py b/packages/modules/devices/kostal/kostal_piko_old/inverter.py index a9206e2497..42d21d8f44 100644 --- a/packages/modules/devices/kostal/kostal_piko_old/inverter.py +++ b/packages/modules/devices/kostal/kostal_piko_old/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.kostal.kostal_piko_old.config import KostalPikoOldInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,8 +26,8 @@ def __init__(self, component_config: KostalPikoOldInverterSetup, **kwargs: Any) def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kostal/kostal_piko_old/inverter_test.py b/packages/modules/devices/kostal/kostal_piko_old/inverter_test.py index 3a6655bea9..e3ba50cd96 100644 --- a/packages/modules/devices/kostal/kostal_piko_old/inverter_test.py +++ b/packages/modules/devices/kostal/kostal_piko_old/inverter_test.py @@ -17,7 +17,7 @@ def test_parse_html(sample_file_name, expected_inverter_state, monkeypatch): # setup sample = (Path(__file__).parent / sample_file_name).read_text() mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, 'get_component_value_store', Mock(return_value=mock_inverter_value_store)) inv = inverter.KostalPikoOldInverter(KostalPikoOldInverterSetup(), device_id=0) inv.initialize() diff --git a/packages/modules/devices/kostal/kostal_plenticore/bat.py b/packages/modules/devices/kostal/kostal_plenticore/bat.py index 4c10ce66cc..7d71554a35 100644 --- a/packages/modules/devices/kostal/kostal_plenticore/bat.py +++ b/packages/modules/devices/kostal/kostal_plenticore/bat.py @@ -9,7 +9,7 @@ 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.common.store import get_component_value_store from modules.devices.kostal.kostal_plenticore.config import KostalPlenticoreBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -34,10 +34,10 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.endianess: Endian = self.kwargs['endianess'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: power = self.client.read_holding_registers( @@ -89,8 +89,9 @@ def set_power_limit(self, power_limit: Optional[int]) -> None: self.client.write_register(1034, power_value, data_type=ModbusDataType.FLOAT_32, wordorder=self.endianess, unit=unit) - def power_limit_controllable(self) -> bool: - return True + +def power_limit_controllable(self) -> bool: + return True component_descriptor = ComponentDescriptor(configuration_factory=KostalPlenticoreBatSetup) diff --git a/packages/modules/devices/kostal/kostal_plenticore/counter.py b/packages/modules/devices/kostal/kostal_plenticore/counter.py index d12db3eecf..46bdf6260c 100644 --- a/packages/modules/devices/kostal/kostal_plenticore/counter.py +++ b/packages/modules/devices/kostal/kostal_plenticore/counter.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.kostal.kostal_plenticore.config import KostalPlenticoreCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -31,10 +31,10 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.endianess: Endian = self.kwargs['endianess'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: power = self.client.read_holding_registers( diff --git a/packages/modules/devices/kostal/kostal_plenticore/inverter.py b/packages/modules/devices/kostal/kostal_plenticore/inverter.py index 8712ba8ba2..6555aaa3e0 100644 --- a/packages/modules/devices/kostal/kostal_plenticore/inverter.py +++ b/packages/modules/devices/kostal/kostal_plenticore/inverter.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.kostal.kostal_plenticore.config import KostalPlenticoreInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -31,7 +31,7 @@ def initialize(self) -> None: self.modbus_id: int = self.kwargs['modbus_id'] self.endianess: Endian = self.kwargs['endianess'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="Wechselrichter") self.fault_text = ( diff --git a/packages/modules/devices/kostal/kostal_sem/counter.py b/packages/modules/devices/kostal/kostal_sem/counter.py index a14fa66820..afb393689f 100644 --- a/packages/modules/devices/kostal/kostal_sem/counter.py +++ b/packages/modules/devices/kostal/kostal_sem/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.kostal.kostal_sem.config import KostalSemCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: KostalSemCounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/kostal/kostal_steca/inverter.py b/packages/modules/devices/kostal/kostal_steca/inverter.py index b2158a2edd..254ffa875d 100644 --- a/packages/modules/devices/kostal/kostal_steca/inverter.py +++ b/packages/modules/devices/kostal/kostal_steca/inverter.py @@ -10,7 +10,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.kostal.kostal_steca.config import KostalStecaInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,7 +29,7 @@ def __init__(self, component_config: KostalStecaInverterSetup, **kwargs: Any) -> def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/lg/lg/bat.py b/packages/modules/devices/lg/lg/bat.py index b4bf586e2f..92c34b222c 100644 --- a/packages/modules/devices/lg/lg/bat.py +++ b/packages/modules/devices/lg/lg/bat.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.lg.lg.config import LgBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: LgBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/lg/lg/counter.py b/packages/modules/devices/lg/lg/counter.py index 624cb32415..8291096a7e 100644 --- a/packages/modules/devices/lg/lg/counter.py +++ b/packages/modules/devices/lg/lg/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.lg.lg.config import LgCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: LgCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/lg/lg/inverter.py b/packages/modules/devices/lg/lg/inverter.py index 9a39f72298..beb20802fa 100644 --- a/packages/modules/devices/lg/lg/inverter.py +++ b/packages/modules/devices/lg/lg/inverter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.lg.lg.config import LgInverterSetup from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: LgInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/lg/lg/lg_test.py b/packages/modules/devices/lg/lg/lg_test.py index 91605ccfcc..3a0d6354b6 100644 --- a/packages/modules/devices/lg/lg/lg_test.py +++ b/packages/modules/devices/lg/lg/lg_test.py @@ -45,11 +45,11 @@ def assert_inverter_state_correct(state: InverterState): def test_valid_login(monkeypatch, dev: ConfigurableDevice): # setup mock_bat_value_store = Mock() - monkeypatch.setattr(bat, "get_bat_value_store", Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, "get_component_value_store", Mock(return_value=mock_bat_value_store)) mock_counter_value_store = Mock() - monkeypatch.setattr(counter, "get_counter_value_store", Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, "get_component_value_store", Mock(return_value=mock_counter_value_store)) mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, "get_inverter_value_store", Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) monkeypatch.setattr(device, "_request_data", Mock(return_value=sample_auth_key_valid)) component_config = bat.component_descriptor.configuration_factory() component_config.id = None @@ -73,11 +73,11 @@ def test_valid_login(monkeypatch, dev: ConfigurableDevice): def test_update_session_key(monkeypatch, dev: ConfigurableDevice): # setup mock_bat_value_store = Mock() - monkeypatch.setattr(bat, "get_bat_value_store", Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, "get_component_value_store", Mock(return_value=mock_bat_value_store)) mock_counter_value_store = Mock() - monkeypatch.setattr(counter, "get_counter_value_store", Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, "get_component_value_store", Mock(return_value=mock_counter_value_store)) mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, "get_inverter_value_store", Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) monkeypatch.setattr(device, "_request_data", Mock( side_effect=[HTTPError, sample_auth_key_valid])) component_config = bat.component_descriptor.configuration_factory() diff --git a/packages/modules/devices/marstek/venus_c_e/bat.py b/packages/modules/devices/marstek/venus_c_e/bat.py index 2c848e23a1..0e22812173 100644 --- a/packages/modules/devices/marstek/venus_c_e/bat.py +++ b/packages/modules/devices/marstek/venus_c_e/bat.py @@ -6,7 +6,7 @@ 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.common.store import get_component_value_store from modules.devices.marstek.venus_c_e.config import VenusCEBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,8 +25,8 @@ def __init__(self, component_config: VenusCEBatSetup, **kwargs: Any) -> None: 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/mtec/mtec/bat.py b/packages/modules/devices/mtec/mtec/bat.py index ffe652a905..dc47349b02 100644 --- a/packages/modules/devices/mtec/mtec/bat.py +++ b/packages/modules/devices/mtec/mtec/bat.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.mtec.mtec.config import MTecBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,10 +29,10 @@ def __init__(self, component_config: MTecBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/mtec/mtec/counter.py b/packages/modules/devices/mtec/mtec/counter.py index cdbec9fb68..134950f1fd 100644 --- a/packages/modules/devices/mtec/mtec/counter.py +++ b/packages/modules/devices/mtec/mtec/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.mtec.mtec.config import MTecCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,10 +26,10 @@ def __init__(self, component_config: MTecCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/mtec/mtec/inverter.py b/packages/modules/devices/mtec/mtec/inverter.py index fbd5975359..5db56cd123 100644 --- a/packages/modules/devices/mtec/mtec/inverter.py +++ b/packages/modules/devices/mtec/mtec/inverter.py @@ -8,7 +8,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.mtec.mtec.config import MTecInverterSetup from modules.common.component_type import ComponentType @@ -26,10 +26,10 @@ def __init__(self, component_config: MTecInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/mystrom/mystrom/counter.py b/packages/modules/devices/mystrom/mystrom/counter.py index ff53539a6f..18b799d684 100644 --- a/packages/modules/devices/mystrom/mystrom/counter.py +++ b/packages/modules/devices/mystrom/mystrom/counter.py @@ -7,7 +7,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.utils.peak_filter import PeakFilter from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.mystrom.mystrom.config import MystromCounterSetup from modules.common.component_type import ComponentType @@ -25,8 +25,8 @@ def __init__(self, component_config: MystromCounterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/nibe/nibe/counter.py b/packages/modules/devices/nibe/nibe/counter.py index b20830a29c..e23a830b13 100644 --- a/packages/modules/devices/nibe/nibe/counter.py +++ b/packages/modules/devices/nibe/nibe/counter.py @@ -9,7 +9,7 @@ from modules.common.utils.peak_filter import PeakFilter from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.nibe.nibe.config import NibeCounterSetup from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def __init__(self, component_config: NibeCounterSetup, **kwargs: Any) -> None: 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/openwb/openwb_flex/bat.py b/packages/modules/devices/openwb/openwb_flex/bat.py index d88965189f..3f5f2e9a1b 100644 --- a/packages/modules/devices/openwb/openwb_flex/bat.py +++ b/packages/modules/devices/openwb/openwb_flex/bat.py @@ -10,7 +10,7 @@ from modules.common.mpm3pm import Mpm3pm from modules.common.sdm import Sdm120 from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.openwb.openwb_flex.config import BatKitFlexSetup from modules.devices.openwb.openwb_flex.versions import kit_bat_version_factory from modules.common.utils.peak_filter import PeakFilter @@ -33,9 +33,9 @@ def initialize(self) -> None: factory = kit_bat_version_factory(self.component_config.configuration.version) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.__client = factory(self.component_config.configuration.id, self.__tcp_client, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self): # TCP-Verbindung schließen möglichst bevor etwas anderes gemacht wird, um im Fehlerfall zu verhindern, diff --git a/packages/modules/devices/openwb/openwb_flex/consumption_counter.py b/packages/modules/devices/openwb/openwb_flex/consumption_counter.py index aa0327a120..dc3455e19e 100644 --- a/packages/modules/devices/openwb/openwb_flex/consumption_counter.py +++ b/packages/modules/devices/openwb/openwb_flex/consumption_counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.openwb.openwb_flex.config import ConsumptionCounterFlexSetup from modules.devices.openwb.openwb_flex.versions import consumption_counter_factory @@ -27,8 +27,8 @@ def initialize(self) -> None: factory = consumption_counter_factory(self.component_config.configuration.type) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.__client = factory(self.component_config.configuration.id, self.__tcp_client, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self) -> None: diff --git a/packages/modules/devices/openwb/openwb_flex/counter.py b/packages/modules/devices/openwb/openwb_flex/counter.py index 12cc2ccbcd..2501ebf2a9 100644 --- a/packages/modules/devices/openwb/openwb_flex/counter.py +++ b/packages/modules/devices/openwb/openwb_flex/counter.py @@ -8,7 +8,7 @@ from modules.common.mpm3pm import Mpm3pm from modules.common.b23 import B23 from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.openwb.openwb_flex.config import EvuKitFlexSetup from modules.devices.openwb.openwb_flex.versions import kit_counter_version_factory from modules.common.utils.peak_filter import PeakFilter @@ -31,9 +31,9 @@ def initialize(self) -> None: factory = kit_counter_version_factory(self.component_config.configuration.version) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.__client = factory(self.component_config.configuration.id, self.__tcp_client, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self): # TCP-Verbindung schließen möglichst bevor etwas anderes gemacht wird, um im Fehlerfall zu verhindern, diff --git a/packages/modules/devices/openwb/openwb_flex/inverter.py b/packages/modules/devices/openwb/openwb_flex/inverter.py index e09987d798..f5d886367a 100644 --- a/packages/modules/devices/openwb/openwb_flex/inverter.py +++ b/packages/modules/devices/openwb/openwb_flex/inverter.py @@ -9,7 +9,7 @@ from modules.common.lovato import Lovato from modules.common.sdm import Sdm120 from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.openwb.openwb_flex.config import PvKitFlexSetup from modules.devices.openwb.openwb_flex.versions import kit_inverter_version_factory from modules.common.utils.peak_filter import PeakFilter @@ -32,10 +32,10 @@ def initialize(self) -> None: factory = kit_inverter_version_factory(self.component_config.configuration.version) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.__client = factory(self.component_config.configuration.id, self.__tcp_client, self.fault_state) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.simulation = {} - self.store = get_inverter_value_store(self.component_config.id) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) def update(self) -> None: """ liest die Werte des Moduls aus. diff --git a/packages/modules/devices/orno/orno/counter.py b/packages/modules/devices/orno/orno/counter.py index 2b5c19ed62..1b3b5496c8 100644 --- a/packages/modules/devices/orno/orno/counter.py +++ b/packages/modules/devices/orno/orno/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.orno.orno.config import OrnoCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: OrnoCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/powerdog/powerdog/counter.py b/packages/modules/devices/powerdog/powerdog/counter.py index 9319da99e3..b25126a208 100644 --- a/packages/modules/devices/powerdog/powerdog/counter.py +++ b/packages/modules/devices/powerdog/powerdog/counter.py @@ -9,7 +9,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.powerdog.powerdog.config import PowerdogCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/powerdog/powerdog/inverter.py b/packages/modules/devices/powerdog/powerdog/inverter.py index 241cdf01ae..08dc3a4ef9 100644 --- a/packages/modules/devices/powerdog/powerdog/inverter.py +++ b/packages/modules/devices/powerdog/powerdog/inverter.py @@ -9,7 +9,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.powerdog.powerdog.config import PowerdogInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -32,8 +32,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/powerfox/powerfox/counter.py b/packages/modules/devices/powerfox/powerfox/counter.py index 98d3617918..8c158a934a 100644 --- a/packages/modules/devices/powerfox/powerfox/counter.py +++ b/packages/modules/devices/powerfox/powerfox/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.powerfox.powerfox.config import PowerfoxCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -19,7 +19,7 @@ def __init__(self, component_config: PowerfoxCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/powerfox/powerfox/inverter.py b/packages/modules/devices/powerfox/powerfox/inverter.py index 48b5b5ebe2..0bd8296a6f 100644 --- a/packages/modules/devices/powerfox/powerfox/inverter.py +++ b/packages/modules/devices/powerfox/powerfox/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.powerfox.powerfox.config import PowerfoxInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -19,7 +19,7 @@ def __init__(self, component_config: PowerfoxInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/qcells/qcells/bat.py b/packages/modules/devices/qcells/qcells/bat.py index 3a68bd58cd..0983da0476 100644 --- a/packages/modules/devices/qcells/qcells/bat.py +++ b/packages/modules/devices/qcells/qcells/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.qcells.qcells.config import QCellsBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: QCellsBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/qcells/qcells/counter.py b/packages/modules/devices/qcells/qcells/counter.py index 3102cf7f45..fdb107645e 100644 --- a/packages/modules/devices/qcells/qcells/counter.py +++ b/packages/modules/devices/qcells/qcells/counter.py @@ -7,7 +7,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.qcells.qcells.config import QCellsCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: QCellsCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/qcells/qcells/inverter.py b/packages/modules/devices/qcells/qcells/inverter.py index 4f147027d4..2b0481b7cd 100644 --- a/packages/modules/devices/qcells/qcells/inverter.py +++ b/packages/modules/devices/qcells/qcells/inverter.py @@ -7,7 +7,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.qcells.qcells.config import QCellsInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: QCellsInverterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__modbus_id: int = self.kwargs['modbus_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/rct/rct/bat.py b/packages/modules/devices/rct/rct/bat.py index 54e83ebc35..5cc9a6a975 100644 --- a/packages/modules/devices/rct/rct/bat.py +++ b/packages/modules/devices/rct/rct/bat.py @@ -5,7 +5,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.rct.rct.config import RctBatSetup from modules.devices.rct.rct.rct_lib import RCT from modules.common.utils.peak_filter import PeakFilter @@ -19,7 +19,7 @@ def __init__(self, component_config: RctBatSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/rct/rct/counter.py b/packages/modules/devices/rct/rct/counter.py index d43487ba5a..da2b6b9c95 100644 --- a/packages/modules/devices/rct/rct/counter.py +++ b/packages/modules/devices/rct/rct/counter.py @@ -5,7 +5,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.rct.rct.config import RctCounterSetup from modules.devices.rct.rct.rct_lib import RCT from modules.common.utils.peak_filter import PeakFilter @@ -19,7 +19,7 @@ def __init__(self, component_config: RctCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/rct/rct/inverter.py b/packages/modules/devices/rct/rct/inverter.py index d8e6efb608..13f67e5982 100644 --- a/packages/modules/devices/rct/rct/inverter.py +++ b/packages/modules/devices/rct/rct/inverter.py @@ -3,7 +3,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.rct.rct.config import RctInverterSetup from modules.devices.rct.rct.rct_lib import RCT from modules.common.utils.peak_filter import PeakFilter @@ -15,7 +15,7 @@ def __init__(self, component_config: RctInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/saxpower/saxpower/bat.py b/packages/modules/devices/saxpower/saxpower/bat.py index 6149d2b52a..f7d7bd4761 100644 --- a/packages/modules/devices/saxpower/saxpower/bat.py +++ b/packages/modules/devices/saxpower/saxpower/bat.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.saxpower.saxpower.config import SaxpowerBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/saxpower/saxpower/counter.py b/packages/modules/devices/saxpower/saxpower/counter.py index bc6ace7263..b9765d8df3 100644 --- a/packages/modules/devices/saxpower/saxpower/counter.py +++ b/packages/modules/devices/saxpower/saxpower/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.saxpower.saxpower.config import SaxpowerCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,10 +28,10 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: power = self.client.read_holding_registers(48, ModbusDataType.INT_16, unit=self.__modbus_id) diff --git a/packages/modules/devices/shelly/shelly/bat.py b/packages/modules/devices/shelly/shelly/bat.py index 617d50bddf..3e48506b90 100644 --- a/packages/modules/devices/shelly/shelly/bat.py +++ b/packages/modules/devices/shelly/shelly/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.devices.shelly.shelly.config import ShellyBatSetup from modules.devices.shelly.shelly.constants import ALPHABETICAL_INDEX @@ -35,8 +35,8 @@ def initialize(self) -> None: self.factor: int = self.kwargs['factor'] self.phase: int = self.kwargs['phase'] self.generation: Optional[int] = self.kwargs['generation'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/shelly/shelly/counter.py b/packages/modules/devices/shelly/shelly/counter.py index 7a6e96f785..855420784f 100644 --- a/packages/modules/devices/shelly/shelly/counter.py +++ b/packages/modules/devices/shelly/shelly/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.devices.shelly.shelly.config import ShellyCounterSetup from modules.devices.shelly.shelly.constants import ALPHABETICAL_INDEX @@ -35,8 +35,8 @@ def initialize(self) -> None: self.factor: int = self.kwargs['factor'] self.phase: int = self.kwargs['phase'] self.generation: Optional[int] = self.kwargs['generation'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/shelly/shelly/inverter.py b/packages/modules/devices/shelly/shelly/inverter.py index 1cc9f4faad..3b27e03cce 100644 --- a/packages/modules/devices/shelly/shelly/inverter.py +++ b/packages/modules/devices/shelly/shelly/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount._simcounter import SimCounter from modules.devices.shelly.shelly.config import ShellyInverterSetup from modules.devices.shelly.shelly.constants import ALPHABETICAL_INDEX @@ -35,8 +35,8 @@ def initialize(self) -> None: self.factor: int = self.kwargs['factor'] self.phase: int = self.kwargs['phase'] self.generation: Optional[int] = self.kwargs['generation'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/shelly/shelly/shelly_test.py b/packages/modules/devices/shelly/shelly/shelly_test.py index 9721957ade..f94708d691 100644 --- a/packages/modules/devices/shelly/shelly/shelly_test.py +++ b/packages/modules/devices/shelly/shelly/shelly_test.py @@ -225,13 +225,13 @@ class CounterParams: @pytest.mark.parametrize("params", cases, ids=[c.name for c in cases]) def test_counter(params: CounterParams, monkeypatch, requests_mock: requests_mock.mock): mock_counter_value_store = Mock() - monkeypatch.setattr(counter, "get_counter_value_store", Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, "get_component_value_store", Mock(return_value=mock_counter_value_store)) if params.generation == 1: requests_mock.get(f"http://{SAMPLE_IP}/status", json=params.json_data) else: requests_mock.get(f"http://{SAMPLE_IP}/rpc/Shelly.GetStatus", json=params.json_data) mock_counter_value_store = Mock() - monkeypatch.setattr(counter, "get_counter_value_store", Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, "get_component_value_store", Mock(return_value=mock_counter_value_store)) c = counter.ShellyCounter( ShellyCounterSetup(), device_id=0, ip_address=SAMPLE_IP, factor=params.factor, phase=params.phase, generation=params.generation) @@ -266,7 +266,7 @@ class InverterParams: InverterParams(name="G1 - Shelly EM3 Inverter - Phase 2, Faktor -1", json_data=DATA_EM_3_G1, factor=-1, phase=2, generation=1, expected_inverter_state=InverterState( - power=-2990.00, currents=[-1.0, -10.0, -2.0], exported=200)), + power=-2990.00, currents=[-1.0, -10.0, -2.0], exported=200)), InverterParams(name="G3 - Shelly Mini PM Inverter - Phase 1, Faktor -1", json_data=DATA_MINPM_G3, factor=-1, phase=1, generation=3, expected_inverter_state=InverterState( @@ -285,13 +285,13 @@ class InverterParams: @pytest.mark.parametrize("params", cases, ids=[c.name for c in cases]) def test_inverter(params: InverterParams, monkeypatch, requests_mock: requests_mock.mock): mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, "get_inverter_value_store", Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) if params.generation == 1: requests_mock.get(f"http://{SAMPLE_IP}/status", json=params.json_data) else: requests_mock.get(f"http://{SAMPLE_IP}/rpc/Shelly.GetStatus", json=params.json_data) mock_inverter_value_store = Mock() - monkeypatch.setattr(inverter, "get_inverter_value_store", Mock(return_value=mock_inverter_value_store)) + monkeypatch.setattr(inverter, "get_component_value_store", Mock(return_value=mock_inverter_value_store)) c = inverter.ShellyInverter( ShellyInverterSetup(), device_id=0, ip_address=SAMPLE_IP, factor=params.factor, phase=params.phase, generation=params.generation) @@ -345,13 +345,13 @@ class BatParams: @pytest.mark.parametrize("params", cases, ids=[c.name for c in cases]) def test_bat(params: BatParams, monkeypatch, requests_mock: requests_mock.mock): mock_bat_value_store = Mock() - monkeypatch.setattr(bat, "get_bat_value_store", Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, "get_component_value_store", Mock(return_value=mock_bat_value_store)) if params.generation == 1: requests_mock.get(f"http://{SAMPLE_IP}/status", json=params.json_data) else: requests_mock.get(f"http://{SAMPLE_IP}/rpc/Shelly.GetStatus", json=params.json_data) mock_bat_value_store = Mock() - monkeypatch.setattr(bat, "get_bat_value_store", Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, "get_component_value_store", Mock(return_value=mock_bat_value_store)) c = bat.ShellyBat( ShellyBatSetup(), device_id=0, ip_address=SAMPLE_IP, factor=params.factor, phase=params.phase, generation=params.generation) diff --git a/packages/modules/devices/siemens/siemens/bat.py b/packages/modules/devices/siemens/siemens/bat.py index 3200fffb58..aa3234a9e2 100644 --- a/packages/modules/devices/siemens/siemens/bat.py +++ b/packages/modules/devices/siemens/siemens/bat.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens.config import SiemensBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/siemens/siemens/counter.py b/packages/modules/devices/siemens/siemens/counter.py index 6f694febdb..8206ca49f1 100644 --- a/packages/modules/devices/siemens/siemens/counter.py +++ b/packages/modules/devices/siemens/siemens/counter.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens.config import SiemensCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/siemens/siemens/inverter.py b/packages/modules/devices/siemens/siemens/inverter.py index c190ee7230..52309c8002 100644 --- a/packages/modules/devices/siemens/siemens/inverter.py +++ b/packages/modules/devices/siemens/siemens/inverter.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens.config import SiemensInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/siemens/siemens_sentron/bat.py b/packages/modules/devices/siemens/siemens_sentron/bat.py index fa25f09b03..0019015cca 100644 --- a/packages/modules/devices/siemens/siemens_sentron/bat.py +++ b/packages/modules/devices/siemens/siemens_sentron/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens_sentron.config import SiemensSentronBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: SiemensSentronBatSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/siemens/siemens_sentron/counter.py b/packages/modules/devices/siemens/siemens_sentron/counter.py index b3e2e25f52..912582802c 100644 --- a/packages/modules/devices/siemens/siemens_sentron/counter.py +++ b/packages/modules/devices/siemens/siemens_sentron/counter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens_sentron.config import SiemensSentronCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: SiemensSentronCounterSetup, **kwargs: Any) def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/siemens/siemens_sentron/inverter.py b/packages/modules/devices/siemens/siemens_sentron/inverter.py index 6a54107a25..7aa5d70e57 100644 --- a/packages/modules/devices/siemens/siemens_sentron/inverter.py +++ b/packages/modules/devices/siemens/siemens_sentron/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.siemens.siemens_sentron.config import SiemensSentronInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: SiemensSentronInverterSetup, **kwargs: Any) def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sigenergy/sigenergy/bat.py b/packages/modules/devices/sigenergy/sigenergy/bat.py index 26cb612de7..6ce460b415 100644 --- a/packages/modules/devices/sigenergy/sigenergy/bat.py +++ b/packages/modules/devices/sigenergy/sigenergy/bat.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.sigenergy.sigenergy.config import SigenergyBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,10 +28,10 @@ def __init__(self, component_config: SigenergyBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.last_mode = 'Undefined' def update(self) -> None: diff --git a/packages/modules/devices/sigenergy/sigenergy/counter.py b/packages/modules/devices/sigenergy/sigenergy/counter.py index f8d4e2b7c7..227e5653a1 100644 --- a/packages/modules/devices/sigenergy/sigenergy/counter.py +++ b/packages/modules/devices/sigenergy/sigenergy/counter.py @@ -5,7 +5,7 @@ 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.common.store import get_component_value_store from modules.devices.sigenergy.sigenergy.config import SigenergyCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -24,10 +24,10 @@ def __init__(self, component_config: SigenergyCounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self): unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/sigenergy/sigenergy/inverter.py b/packages/modules/devices/sigenergy/sigenergy/inverter.py index 06c1d824d4..2495ef72a4 100644 --- a/packages/modules/devices/sigenergy/sigenergy/inverter.py +++ b/packages/modules/devices/sigenergy/sigenergy/inverter.py @@ -6,7 +6,7 @@ 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.common.store import get_component_value_store from modules.devices.sigenergy.sigenergy.config import SigenergyInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,10 +25,10 @@ def __init__(self, component_config: SigenergyInverterSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) def update(self) -> None: unit = self.component_config.configuration.modbus_id diff --git a/packages/modules/devices/sma/sma_shm/counter.py b/packages/modules/devices/sma/sma_shm/counter.py index 8683e8faef..d051a8e1bc 100644 --- a/packages/modules/devices/sma/sma_shm/counter.py +++ b/packages/modules/devices/sma/sma_shm/counter.py @@ -2,8 +2,8 @@ from math import copysign from modules.common.component_state import CounterState -from modules.common.store import get_counter_value_store from modules.common.component_type import ComponentDescriptor +from modules.common.store._factory import get_component_value_store from modules.devices.sma.sma_shm.config import SmaHomeManagerCounterSetup from modules.devices.sma.sma_shm.utils import SpeedwireComponent @@ -34,7 +34,7 @@ def get_power(phase_str: str = ""): def create_component(component_config: SmaHomeManagerCounterSetup): - return SpeedwireComponent(component_config, value_store_factory=get_counter_value_store, parser=parse_datagram) + return SpeedwireComponent(component_config, value_store_factory=get_component_value_store, parser=parse_datagram) component_descriptor = ComponentDescriptor(configuration_factory=SmaHomeManagerCounterSetup) diff --git a/packages/modules/devices/sma/sma_shm/inverter.py b/packages/modules/devices/sma/sma_shm/inverter.py index 3467e8988d..f7961bf23f 100644 --- a/packages/modules/devices/sma/sma_shm/inverter.py +++ b/packages/modules/devices/sma/sma_shm/inverter.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 from modules.common.component_state import InverterState -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common.component_type import ComponentDescriptor from modules.devices.sma.sma_shm.config import SmaHomeManagerInverterSetup from modules.devices.sma.sma_shm.utils import SpeedwireComponent @@ -15,7 +15,7 @@ def parse_datagram(sma_data: dict): def create_component(component_config: SmaHomeManagerInverterSetup): - return SpeedwireComponent(component_config, value_store_factory=get_inverter_value_store, parser=parse_datagram) + return SpeedwireComponent(component_config, value_store_factory=get_component_value_store, parser=parse_datagram) component_descriptor = ComponentDescriptor(configuration_factory=SmaHomeManagerInverterSetup) diff --git a/packages/modules/devices/sma/sma_shm/utils.py b/packages/modules/devices/sma/sma_shm/utils.py index 31b81f3785..4d7a208e84 100644 --- a/packages/modules/devices/sma/sma_shm/utils.py +++ b/packages/modules/devices/sma/sma_shm/utils.py @@ -31,7 +31,7 @@ def __init__(self, self.component_config = component_config def initialize(self) -> None: - self.store = self.kwargs['value_store_factory'](self.component_config.id) + self.store = self.kwargs['value_store_factory'](self.component_config.type, self.component_config.id) self.__parser = self.kwargs['parser'] self.__serial_matcher = _create_serial_matcher(self.component_config.configuration.serials) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) diff --git a/packages/modules/devices/sma/sma_sunny_boy/bat.py b/packages/modules/devices/sma/sma_sunny_boy/bat.py index b405760df1..c469bddfc9 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/bat.py +++ b/packages/modules/devices/sma/sma_sunny_boy/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusTcpClient_, ModbusDataType -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_sunny_boy.config import SmaSunnyBoyBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,7 +28,7 @@ def __init__(self, component_config: SmaSunnyBoyBatSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sma/sma_sunny_boy/bat_smart_energy.py b/packages/modules/devices/sma/sma_sunny_boy/bat_smart_energy.py index 8e320ea5be..34ed987896 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/bat_smart_energy.py +++ b/packages/modules/devices/sma/sma_sunny_boy/bat_smart_energy.py @@ -3,7 +3,7 @@ import logging from modules.devices.sma.sma_sunny_boy.config import SmaSunnyBoySmartEnergyBatSetup -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common.modbus import ModbusTcpClient_, ModbusDataType from modules.common.fault_state import ComponentInfo, FaultState from modules.common.component_type import ComponentDescriptor @@ -42,7 +42,7 @@ def __init__(self, component_config: SmaSunnyBoySmartEnergyBatSetup, **kwargs: A def initialize(self) -> None: self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.last_mode = 'Undefined' self.inverter_type = None diff --git a/packages/modules/devices/sma/sma_sunny_boy/bat_tesvolt.py b/packages/modules/devices/sma/sma_sunny_boy/bat_tesvolt.py index 166898839e..210b0ed482 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/bat_tesvolt.py +++ b/packages/modules/devices/sma/sma_sunny_boy/bat_tesvolt.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusTcpClient_, ModbusDataType from modules.common.simcount._simcounter import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_sunny_boy.config import SmaTesvoltBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, component_config: SmaTesvoltBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sma/sma_sunny_boy/counter.py b/packages/modules/devices/sma/sma_sunny_boy/counter.py index 5f14524d63..356c6667e7 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/counter.py +++ b/packages/modules/devices/sma/sma_sunny_boy/counter.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_sunny_boy.config import SmaSunnyBoyCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def __init__(self, component_config: SmaSunnyBoyCounterSetup, **kwargs: Any) -> def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sma/sma_sunny_boy/inverter.py b/packages/modules/devices/sma/sma_sunny_boy/inverter.py index 39db80d84a..573e498712 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/inverter.py +++ b/packages/modules/devices/sma/sma_sunny_boy/inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_sunny_boy.config import SmaSunnyBoyInverterSetup from modules.devices.sma.sma_sunny_boy.inv_version import SmaInverterVersion from modules.common.simcount import SimCounter @@ -37,7 +37,7 @@ def __init__(self, def initialize(self) -> None: self.tcp_client = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="Wechselrichter") self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sma/sma_sunny_island/bat.py b/packages/modules/devices/sma/sma_sunny_island/bat.py index 7d866b303d..6c3303fcfc 100644 --- a/packages/modules/devices/sma/sma_sunny_island/bat.py +++ b/packages/modules/devices/sma/sma_sunny_island/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_sunny_island.config import SmaSunnyIslandBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -24,7 +24,7 @@ def __init__(self, component_config: SmaSunnyIslandBatSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sma/sma_webbox/inverter.py b/packages/modules/devices/sma/sma_webbox/inverter.py index ff487f8788..d6c5f182a4 100644 --- a/packages/modules/devices/sma/sma_webbox/inverter.py +++ b/packages/modules/devices/sma/sma_webbox/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.sma.sma_webbox.config import SmaWebboxInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: Union[Dict, SmaWebboxInverterSetup], **kwar def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/smart_me/smart_me/counter.py b/packages/modules/devices/smart_me/smart_me/counter.py index 5a9be50ebf..5c537d95f1 100644 --- a/packages/modules/devices/smart_me/smart_me/counter.py +++ b/packages/modules/devices/smart_me/smart_me/counter.py @@ -7,7 +7,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.smart_me.smart_me.config import SmartMeCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -20,7 +20,7 @@ def __init__(self, component_config: SmartMeCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/smart_me/smart_me/inverter.py b/packages/modules/devices/smart_me/smart_me/inverter.py index 47eb34d90c..c9b9b42a18 100644 --- a/packages/modules/devices/smart_me/smart_me/inverter.py +++ b/packages/modules/devices/smart_me/smart_me/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.smart_me.smart_me.config import SmartMeInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -19,7 +19,7 @@ def __init__(self, component_config: SmartMeInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/smartfox/smartfox/counter.py b/packages/modules/devices/smartfox/smartfox/counter.py index 40ab8b147a..46e1942df7 100644 --- a/packages/modules/devices/smartfox/smartfox/counter.py +++ b/packages/modules/devices/smartfox/smartfox/counter.py @@ -8,7 +8,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.smartfox.smartfox.config import SmartfoxCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,7 +27,7 @@ def __init__(self, component_config: SmartfoxCounterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.ip_address: int = self.kwargs['ip_address'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sofar/sofar/bat.py b/packages/modules/devices/sofar/sofar/bat.py index c06c9ec0be..91cfdc94b0 100644 --- a/packages/modules/devices/sofar/sofar/bat.py +++ b/packages/modules/devices/sofar/sofar/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.sofar.sofar.config import SofarBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: SofarBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sofar/sofar/counter.py b/packages/modules/devices/sofar/sofar/counter.py index bed82dc32c..762701f9bf 100644 --- a/packages/modules/devices/sofar/sofar/counter.py +++ b/packages/modules/devices/sofar/sofar/counter.py @@ -2,7 +2,7 @@ from typing import Any, TypedDict from modules.devices.sofar.sofar.config import SofarCounterSetup -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.common.modbus import ModbusDataType, ModbusTcpClient_ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.component_type import ComponentDescriptor @@ -25,7 +25,7 @@ def __init__(self, component_config: SofarCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sofar/sofar/inverter.py b/packages/modules/devices/sofar/sofar/inverter.py index 253c066349..02bf38ebd8 100644 --- a/packages/modules/devices/sofar/sofar/inverter.py +++ b/packages/modules/devices/sofar/sofar/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.sofar.sofar.config import SofarInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: SofarInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] self.__modbus_id: int = self.kwargs['modbus_id'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solakon/solakon_one/bat.py b/packages/modules/devices/solakon/solakon_one/bat.py index 933c0bd339..305c7328d5 100644 --- a/packages/modules/devices/solakon/solakon_one/bat.py +++ b/packages/modules/devices/solakon/solakon_one/bat.py @@ -6,7 +6,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.solakon.solakon_one.config import SolakonOneBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -25,7 +25,7 @@ def __init__(self, component_config: SolakonOneBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solakon/solakon_one/inverter.py b/packages/modules/devices/solakon/solakon_one/inverter.py index 72e60b53f9..01e2629072 100644 --- a/packages/modules/devices/solakon/solakon_one/inverter.py +++ b/packages/modules/devices/solakon/solakon_one/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solakon.solakon_one.config import SolakonOneInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: SolakonOneInverterSetup, **kwargs: Any) -> def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_log/solar_log/counter.py b/packages/modules/devices/solar_log/solar_log/counter.py index f6a579a8d5..814c5aada1 100644 --- a/packages/modules/devices/solar_log/solar_log/counter.py +++ b/packages/modules/devices/solar_log/solar_log/counter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_log.solar_log.config import SolarLogCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,8 +26,8 @@ def __init__(self, component_config: SolarLogCounterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_log/solar_log/inverter.py b/packages/modules/devices/solar_log/solar_log/inverter.py index 3be7553a8d..492ce87b80 100644 --- a/packages/modules/devices/solar_log/solar_log/inverter.py +++ b/packages/modules/devices/solar_log/solar_log/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_log.solar_log.config import SolarLogInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -20,7 +20,7 @@ def __init__(self, self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_view/solar_view/counter.py b/packages/modules/devices/solar_view/solar_view/counter.py index fa550e98cb..839286619f 100644 --- a/packages/modules/devices/solar_view/solar_view/counter.py +++ b/packages/modules/devices/solar_view/solar_view/counter.py @@ -5,7 +5,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_view.solar_view.api import request from modules.devices.solar_view.solar_view.config import SolarViewCounterSetup from modules.common.utils.peak_filter import PeakFilter @@ -19,7 +19,7 @@ def __init__(self, component_config: SolarViewCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_view/solar_view/inverter.py b/packages/modules/devices/solar_view/solar_view/inverter.py index 3de5290ced..9e5c22abc7 100644 --- a/packages/modules/devices/solar_view/solar_view/inverter.py +++ b/packages/modules/devices/solar_view/solar_view/inverter.py @@ -5,7 +5,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_view.solar_view.api import request from modules.devices.solar_view.solar_view.config import SolarViewInverterSetup from modules.common.utils.peak_filter import PeakFilter @@ -19,7 +19,7 @@ def __init__(self, component_config: SolarViewInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_watt/solar_watt/bat.py b/packages/modules/devices/solar_watt/solar_watt/bat.py index c8ea85e889..60f4dbbfba 100644 --- a/packages/modules/devices/solar_watt/solar_watt/bat.py +++ b/packages/modules/devices/solar_watt/solar_watt/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_watt.solar_watt.api import parse_value from modules.devices.solar_watt.solar_watt.config import SolarWattBatSetup from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: SolarWattBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_watt/solar_watt/counter.py b/packages/modules/devices/solar_watt/solar_watt/counter.py index 8b7371e4eb..4b993ab273 100644 --- a/packages/modules/devices/solar_watt/solar_watt/counter.py +++ b/packages/modules/devices/solar_watt/solar_watt/counter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_watt.solar_watt.api import parse_value from modules.devices.solar_watt.solar_watt.config import SolarWattCounterSetup from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: SolarWattCounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_watt/solar_watt/inverter.py b/packages/modules/devices/solar_watt/solar_watt/inverter.py index dfe57453a7..791eca50f9 100644 --- a/packages/modules/devices/solar_watt/solar_watt/inverter.py +++ b/packages/modules/devices/solar_watt/solar_watt/inverter.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_watt.solar_watt.api import parse_value from modules.devices.solar_watt.solar_watt.config import SolarWattInverterSetup from modules.common.utils.peak_filter import PeakFilter @@ -27,8 +27,8 @@ def __init__(self, component_config: SolarWattInverterSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_world/solar_world/counter.py b/packages/modules/devices/solar_world/solar_world/counter.py index 5c832ad7b5..5cdc9aa423 100644 --- a/packages/modules/devices/solar_world/solar_world/counter.py +++ b/packages/modules/devices/solar_world/solar_world/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_world.solar_world.config import SolarWorldCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: SolarWorldCounterSetup, **kwargs: Any) -> N def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solar_world/solar_world/inverter.py b/packages/modules/devices/solar_world/solar_world/inverter.py index 4b139efbee..7f5f1a566b 100644 --- a/packages/modules/devices/solar_world/solar_world/inverter.py +++ b/packages/modules/devices/solar_world/solar_world/inverter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solar_world.solar_world.config import SolarWorldInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,8 +23,8 @@ def __init__(self, component_config: SolarWorldInverterSetup, **kwargs: Any) -> def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solaredge/solaredge/bat.py b/packages/modules/devices/solaredge/solaredge/bat.py index ec88b4fe96..c66736c470 100644 --- a/packages/modules/devices/solaredge/solaredge/bat.py +++ b/packages/modules/devices/solaredge/solaredge/bat.py @@ -15,7 +15,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.solaredge.solaredge.config import SolaredgeBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -58,8 +58,8 @@ def __init__(self, component_config: SolaredgeBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solaredge/solaredge/counter.py b/packages/modules/devices/solaredge/solaredge/counter.py index 8ae83e2e33..2cdd992f14 100644 --- a/packages/modules/devices/solaredge/solaredge/counter.py +++ b/packages/modules/devices/solaredge/solaredge/counter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solaredge.solaredge.config import SolaredgeCounterSetup from modules.devices.solaredge.solaredge.scale import scale_registers from modules.devices.solaredge.solaredge.meter import SolaredgeMeterRegisters, set_component_registers @@ -31,7 +31,7 @@ def __init__(self, component_config: SolaredgeCounterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] self.registers = SolaredgeMeterRegisters() - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solaredge/solaredge/external_inverter.py b/packages/modules/devices/solaredge/solaredge/external_inverter.py index 3fd7deafc9..3dc69f492b 100644 --- a/packages/modules/devices/solaredge/solaredge/external_inverter.py +++ b/packages/modules/devices/solaredge/solaredge/external_inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solaredge.solaredge.config import SolaredgeExternalInverterSetup from modules.devices.solaredge.solaredge.scale import scale_registers from modules.devices.solaredge.solaredge.meter import SolaredgeMeterRegisters, set_component_registers @@ -33,7 +33,7 @@ def __init__(self, def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] self.registers = SolaredgeMeterRegisters(self.component_config.configuration.meter_id) - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solaredge/solaredge/inverter.py b/packages/modules/devices/solaredge/solaredge/inverter.py index 45170cbc70..f22e4071ec 100644 --- a/packages/modules/devices/solaredge/solaredge/inverter.py +++ b/packages/modules/devices/solaredge/solaredge/inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solaredge.solaredge.config import SolaredgeInverterSetup from modules.devices.solaredge.solaredge.scale import scale_registers from modules.common.simcount import SimCounter @@ -52,10 +52,10 @@ def __init__(self, def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, prefix="Wechselrichter") self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(self.kwargs['device_id'], self.component_config.id, self.component_config.type) def update(self) -> None: self.store.set(self.read_state()) diff --git a/packages/modules/devices/solarmax/solarmax/bat.py b/packages/modules/devices/solarmax/solarmax/bat.py index 0e39869f40..e643bfc587 100644 --- a/packages/modules/devices/solarmax/solarmax/bat.py +++ b/packages/modules/devices/solarmax/solarmax/bat.py @@ -9,7 +9,7 @@ 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.common.store import get_component_value_store from modules.devices.solarmax.solarmax.config import SolarmaxBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def __init__(self, component_config: SolarmaxBatSetup, **kwargs: Any) -> None: 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solarmax/solarmax/counter_maxstorage.py b/packages/modules/devices/solarmax/solarmax/counter_maxstorage.py index 58805fef26..3c74d6f29b 100644 --- a/packages/modules/devices/solarmax/solarmax/counter_maxstorage.py +++ b/packages/modules/devices/solarmax/solarmax/counter_maxstorage.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.solarmax.solarmax.config import SolarmaxMsCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solarmax/solarmax/inverter.py b/packages/modules/devices/solarmax/solarmax/inverter.py index a77c2766fe..4a2ceee912 100644 --- a/packages/modules/devices/solarmax/solarmax/inverter.py +++ b/packages/modules/devices/solarmax/solarmax/inverter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.solarmax.solarmax.config import SolarmaxInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def __init__(self, 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solarmax/solarmax/inverter_maxstorage.py b/packages/modules/devices/solarmax/solarmax/inverter_maxstorage.py index d380ade120..310e09122b 100644 --- a/packages/modules/devices/solarmax/solarmax/inverter_maxstorage.py +++ b/packages/modules/devices/solarmax/solarmax/inverter_maxstorage.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.solarmax.solarmax.config import SolarmaxMsInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -29,8 +29,8 @@ def __init__(self, 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solax/solax/bat.py b/packages/modules/devices/solax/solax/bat.py index c1cd62a371..92f180b387 100644 --- a/packages/modules/devices/solax/solax/bat.py +++ b/packages/modules/devices/solax/solax/bat.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.solax.solax.config import SolaxBatSetup, Solax from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def __init__(self, component_config: SolaxBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] self.device_config = self.kwargs['device_config'] - self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solax/solax/counter.py b/packages/modules/devices/solax/solax/counter.py index f42f6d2fc5..ba24fd17ec 100644 --- a/packages/modules/devices/solax/solax/counter.py +++ b/packages/modules/devices/solax/solax/counter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solax.solax.config import SolaxCounterSetup, Solax from modules.devices.solax.solax.version import SolaxVersion from modules.common.utils.peak_filter import PeakFilter @@ -28,7 +28,7 @@ def __init__(self, component_config: SolaxCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] self.device_config = self.kwargs['device_config'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solax/solax/inverter.py b/packages/modules/devices/solax/solax/inverter.py index b84abce03c..0a79c94445 100644 --- a/packages/modules/devices/solax/solax/inverter.py +++ b/packages/modules/devices/solax/solax/inverter.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solax.solax.config import SolaxInverterSetup, Solax from modules.devices.solax.solax.version import SolaxVersion from modules.common.utils.peak_filter import PeakFilter @@ -28,7 +28,7 @@ def __init__(self, component_config: SolaxInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__tcp_client = self.kwargs['client'] self.device_config = self.kwargs['device_config'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solis/solis/bat.py b/packages/modules/devices/solis/solis/bat.py index 490fc6a8f5..b67585a388 100644 --- a/packages/modules/devices/solis/solis/bat.py +++ b/packages/modules/devices/solis/solis/bat.py @@ -7,7 +7,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.solis.solis.config import SolisBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -26,7 +26,7 @@ def __init__(self, component_config: SolisBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/solis/solis/counter.py b/packages/modules/devices/solis/solis/counter.py index e5a17bf559..adf46bc586 100644 --- a/packages/modules/devices/solis/solis/counter.py +++ b/packages/modules/devices/solis/solis/counter.py @@ -4,7 +4,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.solis.solis.config import SolisCounterSetup from modules.devices.solis.solis.version import SolisVersion from modules.common.utils.peak_filter import PeakFilter @@ -24,7 +24,7 @@ def __init__(self, component_config: SolisCounterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] self.version: SolisVersion = self.kwargs['version'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.version = self.kwargs['version'] self.client = self.kwargs['client'] diff --git a/packages/modules/devices/solis/solis/inverter.py b/packages/modules/devices/solis/solis/inverter.py index 749829a57f..3d68e8da43 100644 --- a/packages/modules/devices/solis/solis/inverter.py +++ b/packages/modules/devices/solis/solis/inverter.py @@ -5,7 +5,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.solis.solis.config import SolisInverterSetup from modules.devices.solis.solis.version import SolisVersion from modules.common.utils.peak_filter import PeakFilter @@ -25,7 +25,7 @@ def __init__(self, component_config: SolisInverterSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.client: ModbusTcpClient_ = self.kwargs['client'] self.version: SolisVersion = self.kwargs['version'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sonnen/sonnenbatterie/bat.py b/packages/modules/devices/sonnen/sonnenbatterie/bat.py index ab8e7caf4b..84853bc04e 100644 --- a/packages/modules/devices/sonnen/sonnenbatterie/bat.py +++ b/packages/modules/devices/sonnen/sonnenbatterie/bat.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.sonnen.sonnenbatterie.api import JsonApi, JsonApiVersion, RestApi1, RestApi2 from modules.devices.sonnen.sonnenbatterie.config import SonnenbatterieBatSetup @@ -36,8 +36,8 @@ def initialize(self) -> None: self.__api_v2_token: Optional[str] = self.kwargs['device_api_v2_token'] if self.__device_variant not in [0, 1, 2, 3]: raise ValueError("Unbekannte API: " + str(self.__device_variant)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) if self.__device_variant == 0: self.api = RestApi1(host=self.__device_address) diff --git a/packages/modules/devices/sonnen/sonnenbatterie/counter.py b/packages/modules/devices/sonnen/sonnenbatterie/counter.py index b7ef688124..b9bb4cf27f 100644 --- a/packages/modules/devices/sonnen/sonnenbatterie/counter.py +++ b/packages/modules/devices/sonnen/sonnenbatterie/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.sonnen.sonnenbatterie.api import JsonApi, RestApi2, JsonApiVersion from modules.devices.sonnen.sonnenbatterie.config import SonnenbatterieCounterSetup @@ -37,8 +37,8 @@ def initialize(self) -> None: raise ValueError("Die API 'Rest-API 1' bietet keine EVU Daten!") if self.__device_variant not in [1, 2, 3]: raise ValueError("Unbekannte API: " + str(self.__device_variant)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) if self.__device_variant == 2: self.api = RestApi2(host=self.__device_address) diff --git a/packages/modules/devices/sonnen/sonnenbatterie/counter_consumption.py b/packages/modules/devices/sonnen/sonnenbatterie/counter_consumption.py index b4876edefa..b848505c70 100644 --- a/packages/modules/devices/sonnen/sonnenbatterie/counter_consumption.py +++ b/packages/modules/devices/sonnen/sonnenbatterie/counter_consumption.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.sonnen.sonnenbatterie.api import JsonApi, JsonApiVersion from modules.devices.sonnen.sonnenbatterie.config import SonnenbatterieConsumptionCounterSetup @@ -37,7 +37,7 @@ def initialize(self) -> None: if self.__device_variant != 3: raise ValueError("Unbekannte API: " + str(self.__device_variant)) self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="consumption") - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.api = JsonApi(host=self.__device_address, api_version=JsonApiVersion.V2, diff --git a/packages/modules/devices/sonnen/sonnenbatterie/inverter.py b/packages/modules/devices/sonnen/sonnenbatterie/inverter.py index 7325dcbac0..832b605268 100644 --- a/packages/modules/devices/sonnen/sonnenbatterie/inverter.py +++ b/packages/modules/devices/sonnen/sonnenbatterie/inverter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.sonnen.sonnenbatterie.api import JsonApi, RestApi2, JsonApiVersion from modules.devices.sonnen.sonnenbatterie.config import SonnenbatterieInverterSetup @@ -37,8 +37,8 @@ def initialize(self) -> None: raise ValueError("Die Variante '0' bietet keine PV Daten!") if self.__device_variant not in [1, 2, 3]: raise ValueError("Unbekannte API: " + str(self.__device_variant)) - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) if self.__device_variant == 2: diff --git a/packages/modules/devices/studer/studer/bat.py b/packages/modules/devices/studer/studer/bat.py index a49cf4e1a9..7903f7f4e7 100644 --- a/packages/modules/devices/studer/studer/bat.py +++ b/packages/modules/devices/studer/studer/bat.py @@ -7,7 +7,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.modbus import ModbusDataType from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.studer.studer.config import StuderBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -24,7 +24,7 @@ def __init__(self, component_config: StuderBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__tcp_client: modbus.ModbusTcpClient_ = self.kwargs['client'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/studer/studer/inverter.py b/packages/modules/devices/studer/studer/inverter.py index 131b9f0a97..7aed468f28 100644 --- a/packages/modules/devices/studer/studer/inverter.py +++ b/packages/modules/devices/studer/studer/inverter.py @@ -6,7 +6,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.studer.studer.config import StuderInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -23,7 +23,7 @@ def __init__(self, component_config: StuderInverterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/sungrow/sungrow_sh/bat.py b/packages/modules/devices/sungrow/sungrow_sh/bat.py index c04eaefdde..cb2f64d3f5 100644 --- a/packages/modules/devices/sungrow/sungrow_sh/bat.py +++ b/packages/modules/devices/sungrow/sungrow_sh/bat.py @@ -8,11 +8,11 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType, Endian, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store from modules.devices.sungrow.sungrow_sh.config import SungrowSHBatSetup, SungrowSH from modules.devices.sungrow.sungrow_sh.registers import RegMode from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store log = logging.getLogger(__name__) @@ -30,8 +30,8 @@ def __init__(self, component_config: SungrowSHBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.device_config: SungrowSH = self.kwargs['device_config'] self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] - self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.last_mode = 'Undefined' self.register_check = self.detect_register_check() diff --git a/packages/modules/devices/sungrow/sungrow_sh/counter.py b/packages/modules/devices/sungrow/sungrow_sh/counter.py index f7b37254a3..cf13f63a4f 100644 --- a/packages/modules/devices/sungrow/sungrow_sh/counter.py +++ b/packages/modules/devices/sungrow/sungrow_sh/counter.py @@ -7,11 +7,11 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType, Endian, ModbusTcpClient_ from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store from modules.devices.sungrow.sungrow_sh.config import SungrowSH, SungrowSHCounterSetup from modules.devices.sungrow.sungrow_sh.version import Version from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType +from modules.common.store import get_component_value_store class KwargsDict(TypedDict): @@ -28,7 +28,7 @@ def initialize(self) -> None: self.device_config: SungrowSH = self.kwargs['device_config'] self.__tcp_client: ModbusTcpClient_ = self.kwargs['client'] self.sim_counter = SimCounter(self.device_config.id, self.component_config.id, prefix="evu") - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.fault_text = "Dieser Sungrow Zähler liefert von Werk aus (entgegen der Dokumentation) "\ "keine Leistung der einzelnen Phasen. "\ diff --git a/packages/modules/devices/sunways/sunways/inverter.py b/packages/modules/devices/sunways/sunways/inverter.py index 69109cb794..0014b2c52b 100644 --- a/packages/modules/devices/sunways/sunways/inverter.py +++ b/packages/modules/devices/sunways/sunways/inverter.py @@ -7,7 +7,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.sunways.sunways.config import SunwaysInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -32,7 +32,7 @@ def __init__(self, component_config: SunwaysInverterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.ip_address: str = self.kwargs['ip_address'] self.password: str = self.kwargs['password'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/tasmota/tasmota/bat.py b/packages/modules/devices/tasmota/tasmota/bat.py index 72bd620c94..9d7ccbd2c1 100644 --- a/packages/modules/devices/tasmota/tasmota/bat.py +++ b/packages/modules/devices/tasmota/tasmota/bat.py @@ -6,7 +6,7 @@ from modules.common.abstract_device import AbstractBat from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.common.simcount import SimCounter from modules.common import req from modules.common.component_state import BatState @@ -30,9 +30,9 @@ def __init__(self, component_config: TasmotaBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.__phase: int = self.kwargs['phase'] - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/tasmota/tasmota/counter.py b/packages/modules/devices/tasmota/tasmota/counter.py index 3c4a940ef4..40350b689d 100644 --- a/packages/modules/devices/tasmota/tasmota/counter.py +++ b/packages/modules/devices/tasmota/tasmota/counter.py @@ -6,7 +6,7 @@ from modules.common.abstract_device import AbstractCounter from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount import SimCounter from modules.common import req from modules.common.component_state import CounterState @@ -30,9 +30,9 @@ def __init__(self, component_config: TasmotaCounterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.__phase: int = self.kwargs['phase'] - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/tasmota/tasmota/inverter.py b/packages/modules/devices/tasmota/tasmota/inverter.py index 0ab3e2ad8f..ca68dae4f7 100644 --- a/packages/modules/devices/tasmota/tasmota/inverter.py +++ b/packages/modules/devices/tasmota/tasmota/inverter.py @@ -6,7 +6,7 @@ from modules.common.abstract_device import AbstractInverter from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.common.simcount import SimCounter from modules.common import req from modules.common.component_state import InverterState @@ -30,9 +30,9 @@ def __init__(self, component_config: TasmotaInverterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) self.__phase: int = self.kwargs['phase'] - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/tesla/tesla/bat.py b/packages/modules/devices/tesla/tesla/bat.py index 01f32b5153..f08e6540f6 100644 --- a/packages/modules/devices/tesla/tesla/bat.py +++ b/packages/modules/devices/tesla/tesla/bat.py @@ -4,7 +4,7 @@ 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.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.tesla.tesla.http_client import PowerwallHttpClient from modules.devices.tesla.tesla.config import TeslaBatSetup @@ -14,7 +14,7 @@ def __init__(self, component_config: TeslaBatSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self, client: PowerwallHttpClient, aggregate) -> None: diff --git a/packages/modules/devices/tesla/tesla/counter.py b/packages/modules/devices/tesla/tesla/counter.py index 277048c5ca..8840d2e70b 100644 --- a/packages/modules/devices/tesla/tesla/counter.py +++ b/packages/modules/devices/tesla/tesla/counter.py @@ -6,7 +6,7 @@ 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.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.tesla.tesla.config import TeslaCounterSetup from modules.devices.tesla.tesla.http_client import PowerwallHttpClient @@ -18,7 +18,7 @@ def __init__(self, component_config: TeslaCounterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self, client: PowerwallHttpClient, aggregate): diff --git a/packages/modules/devices/tesla/tesla/inverter.py b/packages/modules/devices/tesla/tesla/inverter.py index 7aea4b24b8..26763342fd 100644 --- a/packages/modules/devices/tesla/tesla/inverter.py +++ b/packages/modules/devices/tesla/tesla/inverter.py @@ -3,7 +3,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.tesla.tesla.http_client import PowerwallHttpClient from modules.devices.tesla.tesla.config import TeslaInverterSetup @@ -13,7 +13,7 @@ def __init__(self, component_config: TeslaInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self, client: PowerwallHttpClient, aggregate) -> None: diff --git a/packages/modules/devices/tesla/tesla/tesla_test.py b/packages/modules/devices/tesla/tesla/tesla_test.py index 249c3a923d..5b4036118f 100644 --- a/packages/modules/devices/tesla/tesla/tesla_test.py +++ b/packages/modules/devices/tesla/tesla/tesla_test.py @@ -147,7 +147,7 @@ def assert_battery_state_correct(state: BatState): def test_powerwall_update_if_cookie_cached(monkeypatch, requests_mock: requests_mock.Mocker): # setup mock_bat_value_store = Mock() - monkeypatch.setattr(bat, "get_bat_value_store", Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(bat, "get_component_value_store", Mock(return_value=mock_bat_value_store)) requests_mock.get("https://sample-address/api/meters/aggregates", text=sample_aggregates_json, additional_matcher=match_cookie_ok) requests_mock.get("https://sample-address/api/system_status/soe", text=sample_soe_json, diff --git a/packages/modules/devices/thermia/thermia/counter.py b/packages/modules/devices/thermia/thermia/counter.py index 47dbf6cc56..45bbac9423 100644 --- a/packages/modules/devices/thermia/thermia/counter.py +++ b/packages/modules/devices/thermia/thermia/counter.py @@ -6,7 +6,7 @@ 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.common.store import get_component_value_store from modules.devices.thermia.thermia.config import ThermiaCounterSetup from pymodbus.constants import Endian from modules.common.utils.peak_filter import PeakFilter @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.client: ModbusTcpClient_ = self.kwargs['client'] self.modbus_id: int = self.kwargs['modbus_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/upower/upower/bat.py b/packages/modules/devices/upower/upower/bat.py index 304cbf7bd9..daaab36704 100644 --- a/packages/modules/devices/upower/upower/bat.py +++ b/packages/modules/devices/upower/upower/bat.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.upower.upower.config import UPowerBatSetup from modules.devices.upower.upower.version import UPowerVersion from modules.common.utils.peak_filter import PeakFilter @@ -26,10 +26,10 @@ def __init__(self, self.__modbus_id = modbus_id self.version = version self.client = client - self.store = get_bat_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="speicher") self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(device_id, self.component_config.id, self.component_config.type) def update(self) -> None: if self.version == UPowerVersion.GEN_1: diff --git a/packages/modules/devices/upower/upower/counter.py b/packages/modules/devices/upower/upower/counter.py index 818b62f50a..dc329f8cff 100644 --- a/packages/modules/devices/upower/upower/counter.py +++ b/packages/modules/devices/upower/upower/counter.py @@ -8,7 +8,7 @@ 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.common.store import get_component_value_store from modules.devices.upower.upower.config import UPowerCounterSetup from modules.devices.upower.upower.version import UPowerVersion from modules.common.utils.peak_filter import PeakFilter @@ -26,10 +26,10 @@ def __init__(self, self.__modbus_id = modbus_id self.version = version self.client = client - self.store = get_counter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) - self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="bezug") self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) + self.sim_counter = SimCounter(device_id, self.component_config.id, self.component_config.type) def update(self): if self.version == UPowerVersion.GEN_1: diff --git a/packages/modules/devices/upower/upower/inverter.py b/packages/modules/devices/upower/upower/inverter.py index d09ef2fa92..a02a427d02 100644 --- a/packages/modules/devices/upower/upower/inverter.py +++ b/packages/modules/devices/upower/upower/inverter.py @@ -7,7 +7,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.upower.upower.config import UPowerInverterSetup from modules.devices.upower.upower.version import UPowerVersion from modules.common.utils.peak_filter import PeakFilter @@ -24,7 +24,7 @@ def __init__(self, self.__modbus_id = modbus_id self.version = version self.client = client - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/varta/varta/bat_api.py b/packages/modules/devices/varta/varta/bat_api.py index a7475d8bf1..fe7f0ce874 100644 --- a/packages/modules/devices/varta/varta/bat_api.py +++ b/packages/modules/devices/varta/varta/bat_api.py @@ -8,7 +8,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.varta.varta.config import VartaBatApiSetup @@ -25,8 +25,8 @@ def __init__(self, component_config: VartaBatApiSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.ip_address: str = self.kwargs['ip_address'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) def update(self) -> None: diff --git a/packages/modules/devices/varta/varta/bat_modbus.py b/packages/modules/devices/varta/varta/bat_modbus.py index 2ac4cab323..433a5afc10 100644 --- a/packages/modules/devices/varta/varta/bat_modbus.py +++ b/packages/modules/devices/varta/varta/bat_modbus.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.varta.varta.config import VartaBatModbusSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/varta/varta/counter.py b/packages/modules/devices/varta/varta/counter.py index 3dd321010a..8867935363 100644 --- a/packages/modules/devices/varta/varta/counter.py +++ b/packages/modules/devices/varta/varta/counter.py @@ -7,7 +7,7 @@ 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.common.store import get_component_value_store from modules.devices.varta.varta.config import VartaCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -28,8 +28,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/varta/varta/inverter.py b/packages/modules/devices/varta/varta/inverter.py index 5bba140ea2..a7ceeba65c 100644 --- a/packages/modules/devices/varta/varta/inverter.py +++ b/packages/modules/devices/varta/varta/inverter.py @@ -6,7 +6,7 @@ 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.common.store import get_component_value_store from modules.devices.varta.varta.config import VartaInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__modbus_id: int = self.kwargs['modbus_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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/victron/victron/bat.py b/packages/modules/devices/victron/victron/bat.py index f49dfc4f40..6671ba978c 100644 --- a/packages/modules/devices/victron/victron/bat.py +++ b/packages/modules/devices/victron/victron/bat.py @@ -9,7 +9,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_bat_value_store +from modules.common.store import get_component_value_store from modules.devices.victron.victron.config import VictronBatSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -31,8 +31,8 @@ def __init__(self, component_config: VictronBatSetup, **kwargs: Any) -> None: def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.last_mode = 'Undefined' self.peak_filter = PeakFilter(ComponentType.BAT, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/victron/victron/counter.py b/packages/modules/devices/victron/victron/counter.py index 11da27e6ce..2287676f24 100644 --- a/packages/modules/devices/victron/victron/counter.py +++ b/packages/modules/devices/victron/victron/counter.py @@ -8,7 +8,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.victron.victron.config import VictronCounterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -27,8 +27,8 @@ def __init__(self, component_config: VictronCounterSetup, **kwargs: Any) -> None def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client = 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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/victron/victron/inverter.py b/packages/modules/devices/victron/victron/inverter.py index 2b11b17f81..439255bbbd 100644 --- a/packages/modules/devices/victron/victron/inverter.py +++ b/packages/modules/devices/victron/victron/inverter.py @@ -9,7 +9,7 @@ from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusDataType from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.victron.victron.config import VictronInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -30,8 +30,8 @@ def __init__(self, component_config: VictronInverterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] self.__tcp_client: modbus.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.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/vzlogger/vzlogger/counter.py b/packages/modules/devices/vzlogger/vzlogger/counter.py index 0ca9238777..876c2c535a 100644 --- a/packages/modules/devices/vzlogger/vzlogger/counter.py +++ b/packages/modules/devices/vzlogger/vzlogger/counter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_counter_value_store +from modules.common.store import get_component_value_store from modules.devices.vzlogger.vzlogger.config import VZLoggerCounterSetup from modules.devices.vzlogger.vzlogger.utils import parse_line from modules.common.utils.peak_filter import PeakFilter @@ -24,8 +24,8 @@ def __init__(self, component_config: VZLoggerCounterSetup, **kwargs: Any) -> Non def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.COUNTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/vzlogger/vzlogger/counter_test.py b/packages/modules/devices/vzlogger/vzlogger/counter_test.py index c62e210e67..002dae90d6 100644 --- a/packages/modules/devices/vzlogger/vzlogger/counter_test.py +++ b/packages/modules/devices/vzlogger/vzlogger/counter_test.py @@ -13,7 +13,7 @@ def test_vzlogger_counter_update(monkeypatch, requests_mock: requests_mock.mock): # setup mock_counter_value_store = Mock() - monkeypatch.setattr(counter, "get_counter_value_store", Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(counter, "get_component_value_store", Mock(return_value=mock_counter_value_store)) requests_mock.get(f"http://{SAMPLE_IP}", json=SAMPLE) device = create_device(VZLogger(configuration=VZLoggerConfiguration(ip_address=f"http://{SAMPLE_IP}"))) device.add_component(VZLoggerCounterSetup( diff --git a/packages/modules/devices/vzlogger/vzlogger/inverter.py b/packages/modules/devices/vzlogger/vzlogger/inverter.py index f8b81b9515..52c14fef70 100644 --- a/packages/modules/devices/vzlogger/vzlogger/inverter.py +++ b/packages/modules/devices/vzlogger/vzlogger/inverter.py @@ -6,7 +6,7 @@ from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo, FaultState from modules.common.simcount import SimCounter -from modules.common.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.vzlogger.vzlogger.config import VZLoggerInverterSetup from modules.devices.vzlogger.vzlogger.utils import parse_line from modules.common.utils.peak_filter import PeakFilter @@ -24,8 +24,8 @@ def __init__(self, component_config: VZLoggerInverterSetup, **kwargs: Any) -> No def initialize(self) -> None: self.__device_id: int = self.kwargs['device_id'] - self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, self.component_config.type) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state) diff --git a/packages/modules/devices/youless/youless/inverter.py b/packages/modules/devices/youless/youless/inverter.py index 3e7eb1e21e..ee49c84034 100644 --- a/packages/modules/devices/youless/youless/inverter.py +++ b/packages/modules/devices/youless/youless/inverter.py @@ -3,7 +3,7 @@ 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.store import get_inverter_value_store +from modules.common.store import get_component_value_store from modules.devices.youless.youless.config import YoulessInverterSetup from modules.common.utils.peak_filter import PeakFilter from modules.common.component_type import ComponentType @@ -14,7 +14,7 @@ def __init__(self, component_config: YoulessInverterSetup) -> None: self.component_config = component_config def initialize(self) -> None: - self.store = get_inverter_value_store(self.component_config.id) + self.store = get_component_value_store(self.component_config.type, self.component_config.id) self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) self.peak_filter = PeakFilter(ComponentType.INVERTER, self.component_config.id, self.fault_state)