Skip to content

Log power allocations per actor in the PowerManager #1196

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 2 commits into from
Apr 15, 2025
Merged

Log power allocations per actor in the PowerManager #1196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fe50f7
Pass component_ids to _calc_targets instead of proposals
shsms Apr 14, 2025
3e402b5
Log power allocations per actor in the PowerManager
shsms Apr 14, 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
25 changes: 17 additions & 8 deletions src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,21 @@ def __init__(self, max_proposal_age: timedelta) -> None:

def _calc_targets(
self,
proposals: set[Proposal],
component_ids: frozenset[int],
system_bounds: SystemBounds,
priority: int | None = None,
) -> tuple[Power | None, Bounds[Power]]:
"""Calculate the target power and bounds for the given components.

Args:
proposals: The proposals for the given components.
component_ids: The component IDs to calculate the target power for.
system_bounds: The system bounds for the components in the proposal.
priority: The priority of the actor for which the target power is calculated.

Returns:
The new target power and bounds for the components.
"""
proposals = self._component_buckets.get(component_ids, set())
lower_bound = (
system_bounds.inclusion_bounds.lower
if system_bounds.inclusion_bounds
Expand All @@ -98,6 +99,9 @@ def _calc_targets(
top_pri_bounds: Bounds[Power] | None = None

target_power = Power.zero()

allocations: dict[str, str] = {}

for next_proposal in sorted(proposals, reverse=True):
# if a priority is given, the bounds calculated until that priority is
# reached will be the bounds available to an actor with the given priority.
Expand Down Expand Up @@ -152,6 +156,8 @@ def _calc_targets(
# Add the proposal power to the target power (aka shift in the opposite direction).
target_power += proposal_power

allocations[next_proposal.source_id] = str(proposal_power)

# The `top_pri_bounds` is to ensure that when applying the exclusion bounds to
# the target power at the end, we respect the bounds that were set by the first
# power-proposing actor.
Expand All @@ -166,6 +172,13 @@ def _calc_targets(
system_bounds.exclusion_bounds,
)

if allocations:
_logger.info(
"PowerManager allocations for component IDs: %s: %s",
sorted(component_ids),
allocations,
)

return target_power, Bounds[Power](lower=lower_bound, upper=upper_bound)

def _validate_component_ids(
Expand Down Expand Up @@ -242,9 +255,7 @@ def calculate_target_power(
del self._component_buckets[component_ids]
_ = self._target_power.pop(component_ids, None)

target_power, _ = self._calc_targets(
self._component_buckets.get(component_ids, set()), system_bounds
)
target_power, _ = self._calc_targets(component_ids, system_bounds)

if target_power is not None and (
must_return_power
Expand Down Expand Up @@ -274,9 +285,7 @@ def get_status( # pylint: disable=too-many-locals
the given priority.
"""
target_power = self._target_power.get(component_ids)
_, bounds = self._calc_targets(
self._component_buckets.get(component_ids, set()), system_bounds, priority
)
_, bounds = self._calc_targets(component_ids, system_bounds, priority)
return _Report(
target_power=target_power,
_inclusion_bounds=timeseries.Bounds[Power](
Expand Down
Loading