Add data fetching wrapper - #305
Open
Mohammad-Tayyab-Frequenz wants to merge 2 commits into
Open
Conversation
cwasicki
reviewed
May 11, 2026
Mohammad-Tayyab-Frequenz
force-pushed
the
add-data-fetching-wrapper
branch
2 times, most recently
from
May 21, 2026 19:28
cad7ae1 to
8ebeeeb
Compare
Contributor
Author
|
@cwasicki Can you please have a look at this PR again? |
Mohammad-Tayyab-Frequenz
force-pushed
the
add-data-fetching-wrapper
branch
2 times, most recently
from
July 2, 2026 14:36
c7d2f46 to
f4cbd38
Compare
Mohammad-Tayyab-Frequenz
force-pushed
the
add-data-fetching-wrapper
branch
from
July 8, 2026 09:51
f4cbd38 to
ffb1298
Compare
cwasicki
reviewed
Jul 22, 2026
|
|
||
| # pylint: disable=too-many-locals | ||
| async def metric_data( # pylint: disable=too-many-arguments | ||
| async def _fetch_metric_data( # pylint: disable=too-many-arguments |
Contributor
There was a problem hiding this comment.
Why is it made private? This can be used downstream to fetch arbitrary metrics. The docstring was wrong though.
| splits: bool = False, | ||
| data_fetch_mode: Literal["power", "energy"] = "power", | ||
| ) -> pd.DataFrame | None: | ||
| """Return power data for component types of a microgrid. |
Contributor
There was a problem hiding this comment.
If it's returning ac active power it should go into the ac_active_power function.
| keep_components=keep_components, | ||
| splits=splits, | ||
| ) | ||
|
|
Contributor
There was a problem hiding this comment.
Can't we just use the ac_active_energy_net method instead of the code from here onward?
| df: pd.DataFrame, *, resampling_period: timedelta | ||
| ) -> pd.DataFrame: | ||
| """Convert cumulative energy meter readings into power values.""" | ||
| return df.diff().shift(-1) * (timedelta(hours=1) / resampling_period) |
Contributor
There was a problem hiding this comment.
This might need more care in case the cumulative energy contains zeroes (e.g. on meter restarts).
Signed-off-by: Mohammad Tayyab <Mohammad.Tayyab@neustrom.de>
Signed-off-by: Mohammad Tayyab <Mohammad.Tayyab@neustrom.de>
Mohammad-Tayyab-Frequenz
force-pushed
the
add-data-fetching-wrapper
branch
from
July 23, 2026 14:25
ffb1298 to
65c72eb
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
metric_datafunction has been extended from a direct power-only fetcher into a more flexible entry point that can now work in two modes: fetching active power directly or deriving power from cumulative energy data. With the new data_fetch_mode parameter, we can either keep the existingAC_POWER_ACTIVEpath or fetchAC_ENERGY_ACTIVE_CONSUMEDandAC_ENERGY_ACTIVE_DELIVEREDin parallel.The original functionality of metric_data is shifted to
_fetch_metric_datafunction now.