Skip to content

Fix log when multiple batteries are attached to an inverter #1262

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
merged 3 commits into from
Aug 29, 2025
Merged

Fix log when multiple batteries are attached to an inverter #1262

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16887b1
Replace non-logging uses of `battery_distribution` with `battery_ids`
shsms Aug 29, 2025
ddca86b
Fix log when multiple batteries are attached to an inverter
shsms Aug 29, 2025
6ad1cd8
Update release notes
shsms Aug 29, 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
31 changes: 20 additions & 11 deletions src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,25 +266,34 @@ async def _distribute_power(
Result from the microgrid API.
"""
distributed_power_value = request.power - distribution.remaining_power
battery_distribution: dict[ComponentId, Power] = {}
battery_distribution: dict[frozenset[ComponentId], Power] = {}
battery_ids: set[ComponentId] = set()
for inverter_id, dist in distribution.distribution.items():
for battery_id in self._inv_bats_map[inverter_id]:
battery_distribution[battery_id] = (
battery_distribution.get(battery_id, Power.zero()) + dist
)
_logger.debug(
"Distributing power %s between the batteries %s",
distributed_power_value,
str(battery_distribution),
)
battery_ids.add(battery_id)
battery_distribution[self._inv_bats_map[inverter_id]] = dist
if _logger.isEnabledFor(logging.DEBUG):
_logger.debug(
"Distributing power %s between the batteries: %s",
distributed_power_value,
", ".join(
(
str(next(iter(cids)))
if len(cids) == 1
else f"({', '.join(str(cid) for cid in cids)})"
)
+ f": {power}"
for cids, power in battery_distribution.items()
),
)

failed_power, failed_batteries = await self._set_distributed_power(
distribution, self._api_power_request_timeout
)

response: Success | PartialFailure
if len(failed_batteries) > 0:
succeed_batteries = set(battery_distribution.keys()) - failed_batteries
succeed_batteries = battery_ids - failed_batteries
response = PartialFailure(
request=request,
succeeded_power=distributed_power_value - failed_power,
Expand All @@ -294,7 +303,7 @@ async def _distribute_power(
excess_power=distribution.remaining_power,
)
else:
succeed_batteries = set(battery_distribution.keys())
succeed_batteries = battery_ids
response = Success(
request=request,
succeeded_power=distributed_power_value,
Expand Down
Loading