Move sdk.data_pipeline to sdk.actor.data_sourcing

All the types left in `frequenz.sdk.data_pipeline(.types)` were specific
to the data sourcing actor, so they were moved to
`frequenz.sdk.data_sourcing.types` (and exported in
`frequenz.sdk.data_sourcing`).

The resampling actor for now is also forwarding requests to the data
sourcing actor, so it also re-exports those symbols.

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

examples/sdk_resampling_example.py

@@ -13,8 +13,11 @@
 
 from frequenz.sdk.actor import ChannelRegistry
 from frequenz.sdk.actor.data_sourcing import DataSourcingActor
-from frequenz.sdk.actor.resampling import ComponentMetricsResamplingActor
-from frequenz.sdk.data_pipeline import ComponentMetricId, ComponentMetricRequest
+from frequenz.sdk.actor.resampling import (
+    ComponentMetricId,
+    ComponentMetricRequest,
+    ComponentMetricsResamplingActor,
+)
 from frequenz.sdk.microgrid import ComponentCategory, microgrid_api
 
 HOST = "microgrid.sandbox.api.frequenz.io"

src/frequenz/sdk/actor/data_sourcing/__init__.py

@@ -9,7 +9,10 @@
 """
 
 from .data_sourcing import DataSourcingActor
+from .types import ComponentMetricId, ComponentMetricRequest
 
 __all__ = [
     "DataSourcingActor",
+    "ComponentMetricId",
+    "ComponentMetricRequest",
 ]

src/frequenz/sdk/actor/data_sourcing/data_sourcing.py

@@ -9,9 +9,9 @@
 
 from frequenz.channels import Receiver
 
-from ...data_pipeline import ComponentMetricRequest
 from .. import ChannelRegistry, actor
 from .microgrid_api_source import MicrogridApiSource
+from .types import ComponentMetricRequest
 
 
 @actor

src/frequenz/sdk/actor/data_sourcing/microgrid_api_source.py

@@ -13,7 +13,6 @@
 
 from frequenz.channels import Receiver, Sender
 
-from ...data_pipeline import ComponentMetricId, ComponentMetricRequest
 from ...microgrid import (
     BatteryData,
     ComponentCategory,
@@ -24,6 +23,7 @@
 )
 from ...timeseries import Sample
 from .. import ChannelRegistry
+from .types import ComponentMetricId, ComponentMetricRequest
 
 _MeterDataMethods: Dict[ComponentMetricId, Callable[[MeterData], float]] = {
     ComponentMetricId.ACTIVE_POWER: lambda msg: msg.active_power,

src/frequenz/sdk/data_pipeline/types.py …requenz/sdk/actor/data_sourcing/types.pysrc/frequenz/sdk/data_pipeline/types.py renamed to src/frequenz/sdk/actor/data_sourcing/types.py src/frequenz/sdk/data_pipeline/types.py renamed to src/frequenz/sdk/actor/data_sourcing/types.py

@@ -15,13 +15,19 @@
 
 from frequenz.channels import MergeNamed, Receiver, Select, Sender, Timer
 
-from ..data_pipeline import ComponentMetricRequest
 from ..timeseries import GroupResampler, ResamplingFunction, Sample
-from . import ChannelRegistry, actor
+from . import ChannelRegistry, actor, data_sourcing
 
 logger = logging.Logger(__name__)
 
 
+# Re-export the types from the data_sourcing actor as we use the same requests,
+# we are only forwarding them for now.
+ComponentMetricId = data_sourcing.ComponentMetricId
+
+ComponentMetricRequest = data_sourcing.ComponentMetricRequest
+
+
 # pylint: disable=unused-argument
 def average(samples: Sequence[Sample], resampling_period_s: float) -> float:
     """Calculate average of the provided values.

src/frequenz/sdk/actor/resampling.py

@@ -12,8 +12,11 @@
 from frequenz.channels import Broadcast
 
 from frequenz.sdk.actor import ChannelRegistry
-from frequenz.sdk.actor.data_sourcing import DataSourcingActor
-from frequenz.sdk.data_pipeline import ComponentMetricId, ComponentMetricRequest
+from frequenz.sdk.actor.data_sourcing import (
+    ComponentMetricId,
+    ComponentMetricRequest,
+    DataSourcingActor,
+)
 from frequenz.sdk.microgrid import microgrid_api
 from tests.test_microgrid import mock_api
 

src/frequenz/sdk/data_pipeline/__init__.py

@@ -13,8 +13,11 @@
 from frequenz.channels import Broadcast
 
 from frequenz.sdk.actor import ChannelRegistry
-from frequenz.sdk.actor.resampling import ComponentMetricsResamplingActor
-from frequenz.sdk.data_pipeline import ComponentMetricId, ComponentMetricRequest
+from frequenz.sdk.actor.resampling import (
+    ComponentMetricId,
+    ComponentMetricRequest,
+    ComponentMetricsResamplingActor,
+)
 from frequenz.sdk.timeseries import Sample