Remove power_distribution_results from the battery pool

The results from the power distributing actor would instead be used by
the power manager to provide more information through its reporting
stream.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

benchmarks/power_distribution/power_distributor.py

@@ -33,6 +33,10 @@
 PORT = 61060
 
 
+# TODO: this send_requests function uses the battery pool to # pylint: disable=fixme
+# send requests, and those no longer go directly to the power distributing actor, but
+# instead through the power managing actor.  So the below function needs to be updated
+# to use the PowerDistributingActor directly.
 async def send_requests(batteries: set[int], request_num: int) -> list[Result]:
     """Send requests to the PowerDistributingActor and wait for the response.
 
@@ -47,8 +51,8 @@ async def send_requests(batteries: set[int], request_num: int) -> list[Result]:
         List of the results from the PowerDistributingActor.
     """
     battery_pool = microgrid.battery_pool(batteries)
-    results_rx = battery_pool.power_distribution_results()
-    result: list[Result] = []
+    results_rx = battery_pool.power_bounds().new_receiver()
+    result: list[Any] = []
     for _ in range(request_num):
         await battery_pool.set_power(Power(float(random.randrange(100000, 1000000))))
         try:

src/frequenz/sdk/microgrid/_data_pipeline.py

@@ -221,9 +221,6 @@ def battery_pool(
                 power_manager_bounds_subscription_sender=(
                     self._power_manager_bounds_subscription_channel.new_sender()
                 ),
-                power_manager_results_receiver=(
-                    self._power_distribution_results_channel.new_receiver()
-                ),
                 min_update_interval=self._resampler_config.resampling_period,
                 batteries_id=battery_ids,
             )

src/frequenz/sdk/timeseries/battery_pool/battery_pool.py

@@ -16,7 +16,6 @@
 from ..._internal._channels import ReceiverFetcher
 from ...actor import ComponentMetricRequest, _channel_registry, _power_managing
 from ...actor.power_distributing._battery_pool_status import BatteryStatus
-from ...actor.power_distributing.result import Result
 from ...microgrid import connection_manager
 from ...microgrid.component import ComponentCategory
 from ...timeseries import Sample
@@ -51,7 +50,6 @@ def __init__(  # pylint: disable=too-many-arguments
         batteries_status_receiver: Receiver[BatteryStatus],
         power_manager_requests_sender: Sender[_power_managing.Proposal],
         power_manager_bounds_subscription_sender: Sender[_power_managing.ReportRequest],
-        power_manager_results_receiver: Receiver[Result],
         min_update_interval: timedelta,
         batteries_id: Set[int] | None = None,
     ) -> None:
@@ -72,8 +70,6 @@ def __init__(  # pylint: disable=too-many-arguments
                 requests to the power managing actor.
             power_manager_bounds_subscription_sender: A Channel sender for sending
                 power bounds requests to the power managing actor.
-            power_manager_results_receiver: A Channel receiver for receiving results
-                from the power managing actor.
             min_update_interval: Some metrics in BatteryPool are send only when they
                 change. For these metrics min_update_interval is the minimum time
                 interval between the following messages.
@@ -106,7 +102,6 @@ def __init__(  # pylint: disable=too-many-arguments
         self._power_manager_bounds_subscription_sender = (
             power_manager_bounds_subscription_sender
         )
-        self._power_manager_results_receiver = power_manager_results_receiver
 
         self._active_methods: dict[str, MetricAggregator[Any]] = {}
         self._power_bounds_subs: dict[str, asyncio.Task[None]] = {}
@@ -252,14 +247,6 @@ async def discharge(
             )
         )
 
-    def power_distribution_results(self) -> Receiver[Result]:
-        """Return a receiver for the power distribution results.
-
-        Returns:
-            A receiver for the power distribution results.
-        """
-        return self._power_manager_results_receiver
-
     @property
     def battery_ids(self) -> Set[int]:
         """Return ids of the batteries in the pool.