Skip to content

fix virtual counter, unified battery value store #2355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Apr 25, 2025
Merged

fix virtual counter, unified battery value store #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b82fcbd
fix virtual counter, unified battery value store
LKuemmel Apr 25, 2025
a10e29c
fix pytest mock types
LKuemmel Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions packages/modules/common/store/_battery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,18 @@ def update(self):
raise FaultState.from_exception(e)


class PurgeBatteryState:
def __init__(self, delegate: LoggingValueStore) -> None:
self.delegate = delegate

def set(self, state: BatState) -> None:
self.delegate.set(state)

def update(self) -> None:
self.delegate.update()


def get_bat_value_store(component_num: int) -> ValueStore[BatState]:
return LoggingValueStore(
return PurgeBatteryState(LoggingValueStore(
(BatteryValueStoreRamdisk if compatibility.is_ramdisk_in_use() else BatteryValueStoreBroker)(component_num)
)
))
6 changes: 3 additions & 3 deletions packages/modules/common/store/_counter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ def add_exported(element):
self.imported += chargepoint_state.imported
else:
component = get_component_obj_by_id(element['id'])
add_current_power(component.store.delegate.state)
add_current_power(component.store.delegate.delegate.state)
if element["type"] == ComponentType.INVERTER.value:
add_exported(component.store.delegate.state)
add_exported(component.store.delegate.delegate.state)
else:
add_imported_exported(component.store.delegate.state)
add_imported_exported(component.store.delegate.delegate.state)
except Exception:
log.exception(f"Fehler beim Hinzufügen der Werte für Element {element}")

Expand Down
48 changes: 27 additions & 21 deletions packages/modules/common/store/_counter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
from modules.common.component_state import BatState, ChargepointState, CounterState, InverterState
from modules.common.store import _counter
from modules.common.store._api import LoggingValueStore
from modules.common.store._battery import BatteryValueStoreBroker, PurgeBatteryState
from modules.common.store._counter import PurgeCounterState
from modules.common.store._inverter import InverterValueStoreBroker, PurgeInverterState
from modules.devices.generic.mqtt.bat import MqttBat
from modules.devices.generic.mqtt.counter import MqttCounter
from modules.devices.generic.mqtt.inverter import MqttInverter
Expand Down Expand Up @@ -71,36 +73,40 @@ def mock_data_nested():

mock_comp_obj_inv_bat = [
Mock(spec=MqttBat,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeBatteryState,
delegate=Mock(spec=LoggingValueStore,
state=BatState(power=223,
exported=200,
imported=100)))),
delegate=Mock(spec=BatteryValueStoreBroker,
state=BatState(power=223,
exported=200,
imported=100))))),
Mock(spec=MqttInverter,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeInverterState,
delegate=Mock(spec=LoggingValueStore,
state=InverterState(power=5786,
exported=2000))))]
delegate=Mock(spec=InverterValueStoreBroker,
state=InverterState(power=5786,
exported=2000)))))]

mock_comp_obj_counter_inv_bat = [Mock(spec=MqttCounter,
store=Mock(spec=LoggingValueStore,
delegate=Mock(
spec=LoggingValueStore,
state=CounterState(power=13359,
exported=0,
imported=0,
currents=[19.36]*3)))),
store=Mock(spec=_counter.PurgeCounterState,
delegate=Mock(spec=LoggingValueStore,
delegate=Mock(spec=_counter.CounterValueStoreBroker,
state=CounterState(power=13359,
exported=0,
imported=0,
currents=[19.36]*3))))),
Mock(spec=MqttBat,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeBatteryState,
delegate=Mock(spec=LoggingValueStore,
state=BatState(power=223,
exported=200,
imported=100)))),
delegate=Mock(spec=BatteryValueStoreBroker,
state=BatState(power=223,
exported=200,
imported=100))))),
Mock(spec=MqttInverter,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeInverterState,
delegate=Mock(spec=LoggingValueStore,
state=InverterState(power=5786,
exported=2000))))
delegate=Mock(spec=InverterValueStoreBroker,
state=InverterState(power=5786,
exported=2000)))))
]

Params = NamedTuple("Params", [("name", str), ("mock_comp", Mock),
Expand Down
45 changes: 26 additions & 19 deletions packages/modules/devices/generic/virtual/counter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
from modules.common.component_state import BatState, ChargepointState, CounterState, InverterState
from modules.common.store import _counter
from modules.common.store._api import LoggingValueStore
from modules.common.store._battery import BatteryValueStoreBroker, PurgeBatteryState
from modules.common.store._inverter import InverterValueStoreBroker, PurgeInverterState
from modules.devices.generic.mqtt.bat import MqttBat
from modules.devices.generic.mqtt.counter import MqttCounter
from modules.devices.generic.mqtt.inverter import MqttInverter
Expand Down Expand Up @@ -81,35 +83,40 @@ def test_virtual_counter(mock_pub: Mock, params):


mock_comp_obj_inv_bat = [Mock(spec=MqttInverter,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeInverterState,
delegate=Mock(spec=LoggingValueStore,
state=InverterState(power=-10000,
exported=27000)))),
delegate=Mock(spec=InverterValueStoreBroker,
state=InverterState(power=-10000,
exported=27000))))),
Mock(spec=MqttBat,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeBatteryState,
delegate=Mock(spec=LoggingValueStore,
state=BatState(power=-5000,
imported=12000,
exported=10000))))
delegate=Mock(spec=BatteryValueStoreBroker,
state=BatState(power=-5000,
imported=12000,
exported=10000)))))
]
mock_comp_obj_counter_inv_bat = [Mock(spec=MqttCounter,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=_counter.PurgeCounterState,
delegate=Mock(spec=LoggingValueStore,
state=CounterState(currents=[25, 10, 25],
power=13800,
imported=14000,
exported=18000)))),
delegate=Mock(spec=_counter.CounterValueStoreBroker,
state=CounterState(currents=[25, 10, 25],
power=13800,
imported=14000,
exported=18000))))),
Mock(spec=MqttInverter,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeInverterState,
delegate=Mock(spec=LoggingValueStore,
state=InverterState(power=-10000,
exported=27000)))),
delegate=Mock(spec=InverterValueStoreBroker,
state=InverterState(power=-10000,
exported=27000))))),
Mock(spec=MqttBat,
store=Mock(spec=LoggingValueStore,
store=Mock(spec=PurgeBatteryState,
delegate=Mock(spec=LoggingValueStore,
state=BatState(power=-5000,
imported=12000,
exported=10000))))]
delegate=Mock(spec=BatteryValueStoreBroker,
state=BatState(power=-5000,
imported=12000,
exported=10000)))))]


@pytest.mark.parametrize("mock, counter_all",
Expand Down