Remove support for passing request_timeout with each power proposal

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

Author: shsms

src/frequenz/sdk/actor/_power_managing/_base_classes.py

@@ -7,7 +7,6 @@
 
 import abc
 import dataclasses
-import datetime
 import enum
 import typing
 
@@ -164,9 +163,6 @@ class Proposal:
     This is used by the power manager to determine the age of the proposal.
     """
 
-    request_timeout: datetime.timedelta = datetime.timedelta(seconds=5.0)
-    """The maximum amount of time to wait for the request to be fulfilled."""
-
     set_operating_point: bool
     """Whether this proposal sets the operating point power or the normal power."""
 

src/frequenz/sdk/actor/_power_managing/_power_managing_actor.py

@@ -330,15 +330,11 @@ async def _send_updated_target_power(
             proposal,
             must_send,
         )
-        request_timeout = (
-            proposal.request_timeout if proposal else timedelta(seconds=5.0)
-        )
         if target_power is not None:
             await self._power_distributing_requests_sender.send(
                 power_distributing.Request(
                     power=target_power,
                     component_ids=component_ids,
-                    request_timeout=request_timeout,
                     adjust_power=True,
                 )
             )

src/frequenz/sdk/actor/power_distributing/request.py

@@ -5,7 +5,6 @@
 
 import dataclasses
 from collections import abc
-from datetime import timedelta
 
 from ...timeseries._quantities import Power
 
@@ -20,9 +19,6 @@ class Request:
     component_ids: abc.Set[int]
     """The component ids of the components to be used for this request."""
 
-    request_timeout: timedelta = timedelta(seconds=5.0)
-    """The maximum amount of time to wait for the request to be fulfilled."""
-
     adjust_power: bool = True
     """Whether to adjust the power to match the bounds.
 

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

@@ -11,7 +11,6 @@
 import asyncio
 import uuid
 from collections import abc
-from datetime import timedelta
 
 from ... import timeseries
 from ..._internal._channels import ReceiverFetcher
@@ -85,7 +84,6 @@ async def propose_power(
         self,
         power: Power | None,
         *,
-        request_timeout: timedelta = timedelta(seconds=5.0),
         bounds: timeseries.Bounds[Power | None] = timeseries.Bounds(None, None),
     ) -> None:
         """Send a proposal to the power manager for the pool's set of batteries.
@@ -117,7 +115,6 @@ async def propose_power(
                 proposal will not have any effect on the target power, unless bounds are
                 specified.  If both are `None`, it is equivalent to not having a
                 proposal or withdrawing a previous one.
-            request_timeout: The timeout for the request.
             bounds: The power bounds for the proposal.  These bounds will apply to
                 actors with a lower priority, and can be overridden by bounds from
                 actors with a higher priority.  If None, the power bounds will be set
@@ -132,17 +129,11 @@ async def propose_power(
                 component_ids=self._pool_ref_store._batteries,
                 priority=self._priority,
                 creation_time=asyncio.get_running_loop().time(),
-                request_timeout=request_timeout,
                 set_operating_point=self._set_operating_point,
             )
         )
 
-    async def propose_charge(
-        self,
-        power: Power | None,
-        *,
-        request_timeout: timedelta = timedelta(seconds=5.0),
-    ) -> None:
+    async def propose_charge(self, power: Power | None) -> None:
         """Set the given charge power for the batteries in the pool.
 
         Power values need to be positive values, indicating charge power.
@@ -164,7 +155,6 @@ async def propose_charge(
             power: The unsigned charge power to propose for the batteries in the pool.
                 If None, the proposed power of higher priority actors will take
                 precedence as the target power.
-            request_timeout: The timeout for the request.
 
         Raises:
             ValueError: If the given power is negative.
@@ -179,17 +169,11 @@ async def propose_charge(
                 component_ids=self._pool_ref_store._batteries,
                 priority=self._priority,
                 creation_time=asyncio.get_running_loop().time(),
-                request_timeout=request_timeout,
                 set_operating_point=self._set_operating_point,
             )
         )
 
-    async def propose_discharge(
-        self,
-        power: Power | None,
-        *,
-        request_timeout: timedelta = timedelta(seconds=5.0),
-    ) -> None:
+    async def propose_discharge(self, power: Power | None) -> None:
         """Set the given discharge power for the batteries in the pool.
 
         Power values need to be positive values, indicating discharge power.
@@ -211,7 +195,6 @@ async def propose_discharge(
             power: The unsigned discharge power to propose for the batteries in the
                 pool.  If None, the proposed power of higher priority actors will take
                 precedence as the target power.
-            request_timeout: The timeout for the request.
 
         Raises:
             ValueError: If the given power is negative.
@@ -228,7 +211,6 @@ async def propose_discharge(
                 component_ids=self._pool_ref_store._batteries,
                 priority=self._priority,
                 creation_time=asyncio.get_running_loop().time(),
-                request_timeout=request_timeout,
                 set_operating_point=self._set_operating_point,
             )
         )

src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py

@@ -7,7 +7,6 @@
 import asyncio
 import uuid
 from collections import abc
-from datetime import timedelta
 
 from ..._internal._channels import ReceiverFetcher
 from ...actor import _power_managing
@@ -73,7 +72,6 @@ async def propose_power(
         self,
         power: Power | None,
         *,
-        request_timeout: timedelta = timedelta(seconds=5.0),
         bounds: Bounds[Power | None] = Bounds(None, None),
     ) -> None:
         """Send a proposal to the power manager for the pool's set of EV chargers.
@@ -110,7 +108,6 @@ async def propose_power(
                 this proposal will not have any effect on the target power, unless
                 bounds are specified.  If both are `None`, it is equivalent to not
                 having a proposal or withdrawing a previous one.
-            request_timeout: The timeout for the request.
             bounds: The power bounds for the proposal.  These bounds will apply to
                 actors with a lower priority, and can be overridden by bounds from
                 actors with a higher priority.  If None, the power bounds will be set to
@@ -132,7 +129,6 @@ async def propose_power(
                 component_ids=self._pool_ref_store.component_ids,
                 priority=self._priority,
                 creation_time=asyncio.get_running_loop().time(),
-                request_timeout=request_timeout,
                 set_operating_point=self._set_operating_point,
             )
         )

src/frequenz/sdk/timeseries/pv_pool/_pv_pool.py

@@ -6,7 +6,6 @@
 import asyncio
 import uuid
 from collections import abc
-from datetime import timedelta
 
 from ..._internal._channels import ReceiverFetcher
 from ...actor import _power_managing
@@ -63,7 +62,6 @@ async def propose_power(
         self,
         power: Power | None,
         *,
-        request_timeout: timedelta = timedelta(seconds=5.0),
         bounds: Bounds[Power | None] = Bounds(None, None),
     ) -> None:
         """Send a proposal to the power manager for the pool's set of PV inverters.
@@ -99,7 +97,6 @@ async def propose_power(
                 this proposal will not have any effect on the target power, unless
                 bounds are specified.  If both are `None`, it is equivalent to not
                 having a proposal or withdrawing a previous one.
-            request_timeout: The timeout for the request.
             bounds: The power bounds for the proposal.  These bounds will apply to
                 actors with a lower priority, and can be overridden by bounds from
                 actors with a higher priority.  If None, the power bounds will be set to
@@ -119,7 +116,6 @@ async def propose_power(
                 component_ids=self._pool_ref_store.component_ids,
                 priority=self._priority,
                 creation_time=asyncio.get_running_loop().time(),
-                request_timeout=request_timeout,
                 set_operating_point=self._set_operating_point,
             )
         )

tests/actor/power_distributing/test_power_distributing.py

@@ -197,7 +197,6 @@ async def test_power_distributor_one_user(self, mocker: MockerFixture) -> None:
         request = Request(
             power=Power.from_kilowatts(1.2),
             component_ids={9, 19},
-            request_timeout=SAFETY_TIMEOUT,
         )
 
         await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -281,7 +280,6 @@ async def test_power_distributor_exclusion_bounds(
                 request = Request(
                     power=Power.zero(),
                     component_ids={9, 19},
-                    request_timeout=SAFETY_TIMEOUT,
                 )
 
                 await requests_channel.new_sender().send(request)
@@ -306,7 +304,6 @@ async def test_power_distributor_exclusion_bounds(
                 request = Request(
                     power=Power.from_watts(300.0),
                     component_ids={9, 19},
-                    request_timeout=SAFETY_TIMEOUT,
                 )
 
                 await requests_channel.new_sender().send(request)
@@ -363,7 +360,6 @@ async def test_two_batteries_one_inverters(self, mocker: MockerFixture) -> None:
                     bat_component1.component_id,
                     bat_component2.component_id,
                 },
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -446,7 +442,6 @@ async def test_two_batteries_one_broken_one_inverters(
             request = Request(
                 power=Power.from_watts(1200.0),
                 component_ids=set(battery.component_id for battery in bat_components),
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -502,7 +497,6 @@ async def test_battery_two_inverters(self, mocker: MockerFixture) -> None:
             request = Request(
                 power=Power.from_watts(1200.0),
                 component_ids={bat_component.component_id},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -556,7 +550,6 @@ async def test_two_batteries_three_inverters(self, mocker: MockerFixture) -> Non
             request = Request(
                 power=Power.from_watts(1700.0),
                 component_ids={batteries[0].component_id, batteries[1].component_id},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -644,7 +637,6 @@ async def test_two_batteries_one_inverter_different_exclusion_bounds_2(
             request = Request(
                 power=Power.from_watts(300.0),
                 component_ids={batteries[0].component_id, batteries[1].component_id},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -733,7 +725,6 @@ async def test_two_batteries_one_inverter_different_exclusion_bounds(
             request = Request(
                 power=Power.from_watts(300.0),
                 component_ids={batteries[0].component_id, batteries[1].component_id},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -801,7 +792,6 @@ async def test_connected_but_not_requested_batteries(
             request = Request(
                 power=Power.from_watts(600.0),
                 component_ids={batteries[0].component_id},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -860,7 +850,6 @@ async def test_battery_soc_nan(self, mocker: MockerFixture) -> None:
             request = Request(
                 power=Power.from_kilowatts(1.2),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -916,7 +905,6 @@ async def test_battery_capacity_nan(self, mocker: MockerFixture) -> None:
             request = Request(
                 power=Power.from_kilowatts(1.2),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -992,7 +980,6 @@ async def test_battery_power_bounds_nan(self, mocker: MockerFixture) -> None:
             request = Request(
                 power=Power.from_kilowatts(1.2),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -1040,7 +1027,6 @@ async def test_power_distributor_invalid_battery_id(
             request = Request(
                 power=Power.from_kilowatts(1.2),
                 component_ids={9, 100},
-                request_timeout=SAFETY_TIMEOUT,
             )
 
             await self._patch_battery_pool_status(mocks, mocker, request.component_ids)
@@ -1084,7 +1070,6 @@ async def test_power_distributor_one_user_adjust_power_consume(
             request = Request(
                 power=Power.from_kilowatts(1.2),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
                 adjust_power=False,
             )
 
@@ -1133,7 +1118,6 @@ async def test_power_distributor_one_user_adjust_power_supply(
             request = Request(
                 power=-Power.from_kilowatts(1.2),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
                 adjust_power=False,
             )
 
@@ -1182,7 +1166,6 @@ async def test_power_distributor_one_user_adjust_power_success(
             request = Request(
                 power=Power.from_kilowatts(1.0),
                 component_ids={9, 19},
-                request_timeout=SAFETY_TIMEOUT,
                 adjust_power=False,
             )
 
@@ -1246,7 +1229,6 @@ async def test_not_all_batteries_are_working(self, mocker: MockerFixture) -> Non
                 request = Request(
                     power=Power.from_kilowatts(1.2),
                     component_ids=batteries,
-                    request_timeout=SAFETY_TIMEOUT,
                 )
 
                 await requests_channel.new_sender().send(request)
@@ -1302,7 +1284,6 @@ async def test_partial_failure_result(self, mocker: MockerFixture) -> None:
                 request = Request(
                     power=Power.from_kilowatts(1.70),
                     component_ids=batteries,
-                    request_timeout=SAFETY_TIMEOUT,
                 )
 
                 await requests_channel.new_sender().send(request)

tests/timeseries/_battery_pool/test_battery_pool_control_methods.py

@@ -230,9 +230,7 @@ async def side_effect(inv_id: int, _: float) -> None:
                 await asyncio.sleep(1000.0)
 
         set_power.side_effect = side_effect
-        await battery_pool.propose_power(
-            Power.from_watts(100.0), request_timeout=timedelta(seconds=0.1)
-        )
+        await battery_pool.propose_power(Power.from_watts(100.0))
         self._assert_report(
             await bounds_rx.receive(),
             power=100.0,