-
Notifications
You must be signed in to change notification settings - Fork 6
Implement merge strategy based on TYPE+TARGET #98
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e58f012
Rewrite merging strategy design
Marenz 4d229f1
Set min. amount of receiver queue to 30
Marenz 163acc5
Move log output to relevant function
Marenz 4f02bca
Avoid reconstructing the `Dispatch` object
Marenz 93683e2
Fix stray `)` in comment
Marenz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# License: MIT | ||
# Copyright © 2025 Frequenz Energy-as-a-Service GmbH | ||
|
||
"""Different merge strategies for dispatch running state events.""" | ||
|
||
import logging | ||
from abc import abstractmethod | ||
from collections.abc import Mapping | ||
|
||
from typing_extensions import override | ||
|
||
from ._bg_service import MergeStrategy | ||
from ._dispatch import Dispatch | ||
|
||
|
||
class MergeByIdentity(MergeStrategy): | ||
"""Merge running intervals based on a dispatch configuration.""" | ||
|
||
@abstractmethod | ||
def identity(self, dispatch: Dispatch) -> int: | ||
"""Identity function for the merge criteria.""" | ||
|
||
@override | ||
def filter(self, dispatches: Mapping[int, Dispatch], dispatch: Dispatch) -> bool: | ||
"""Filter dispatches based on the merge strategy. | ||
|
||
Keeps start events. | ||
Keeps stop events only if no other dispatches matching the | ||
strategy's criteria are running. | ||
""" | ||
if dispatch.started: | ||
logging.debug("Keeping start event %s", dispatch.id) | ||
return True | ||
|
||
other_dispatches_running = any( | ||
existing_dispatch.started | ||
for existing_dispatch in dispatches.values() | ||
if ( | ||
self.identity(existing_dispatch) == self.identity(dispatch) | ||
and existing_dispatch.id != dispatch.id | ||
) | ||
) | ||
|
||
logging.debug( | ||
"stop event %s because other_dispatches_running=%s", | ||
dispatch.id, | ||
other_dispatches_running, | ||
) | ||
return not other_dispatches_running | ||
|
||
|
||
class MergeByType(MergeByIdentity): | ||
"""Merge running intervals based on the dispatch type.""" | ||
|
||
@override | ||
def identity(self, dispatch: Dispatch) -> int: | ||
"""Identity function for the merge criteria.""" | ||
return hash(dispatch.type) | ||
|
||
|
||
class MergeByTypeTarget(MergeByType): | ||
"""Merge running intervals based on the dispatch type and target.""" | ||
|
||
@override | ||
def identity(self, dispatch: Dispatch) -> int: | ||
"""Identity function for the merge criteria.""" | ||
return hash((dispatch.type, dispatch.target)) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.