Skip to content

Commit 994f657

Browse files
committed
Move the resampling actor to the microgrid module
Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 4ea8e88 commit 994f657

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

src/frequenz/sdk/actor/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,15 +600,13 @@ async def main() -> None: # (6)!
600600
from ._actor import Actor
601601
from ._background_service import BackgroundService
602602
from ._data_sourcing import ComponentMetricId, ComponentMetricRequest, DataSourcingActor
603-
from ._resampling import ComponentMetricsResamplingActor
604603
from ._run_utils import run
605604

606605
__all__ = [
607606
"Actor",
608607
"BackgroundService",
609608
"ComponentMetricId",
610609
"ComponentMetricRequest",
611-
"ComponentMetricsResamplingActor",
612610
"DataSourcingActor",
613611
"ResamplerConfig",
614612
"run",

src/frequenz/sdk/microgrid/_data_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ def _resampling_request_sender(self) -> Sender[ComponentMetricRequest]:
470470
Returns:
471471
A Sender for sending requests to the resampling actor.
472472
"""
473-
from ..actor import ComponentMetricsResamplingActor
473+
from ._resampling import ComponentMetricsResamplingActor
474474

475475
if self._resampling_actor is None:
476476
channel: Broadcast[ComponentMetricRequest] = Broadcast(
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
from .._internal._asyncio import cancel_and_await
1414
from .._internal._channels import ChannelRegistry
15+
from ..actor import Actor
16+
from ..actor._data_sourcing import ComponentMetricRequest
1517
from ..timeseries import Sample
1618
from ..timeseries._quantities import Quantity
1719
from ..timeseries._resampling import Resampler, ResamplerConfig, ResamplingError
18-
from ._actor import Actor
19-
from ._data_sourcing import ComponentMetricRequest
2020

2121
_logger = logging.getLogger(__name__)
2222

tests/actor/test_resampling.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@
1313
from frequenz.client.microgrid import ComponentMetricId
1414

1515
from frequenz.sdk._internal._channels import ChannelRegistry
16-
from frequenz.sdk.actor import (
17-
ComponentMetricRequest,
18-
ComponentMetricsResamplingActor,
19-
ResamplerConfig,
20-
)
21-
from frequenz.sdk.timeseries import Sample
16+
from frequenz.sdk.actor import ComponentMetricRequest
17+
from frequenz.sdk.microgrid._resampling import ComponentMetricsResamplingActor
18+
from frequenz.sdk.timeseries import ResamplerConfig, Sample
2219
from frequenz.sdk.timeseries._quantities import Quantity
2320

2421

0 commit comments

Comments
 (0)