Revert "Support power requests from shifting actors in the PowerManager (frequenz-floss#957)"

This reverts commit d5d74a3, reversing
changes made to 8e5d65e.

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

Author: shsms

src/frequenz/sdk/microgrid/__init__.py

@@ -185,43 +185,6 @@
 found in the documentation for any of the
 [`propose_power`][frequenz.sdk.timeseries.battery_pool.BatteryPool.propose_power]
 methods.
-
-### Shifting the target power by an offset
-
-There are cases where the target power needs to be shifted by a certain amount, for
-example, to make adjustments to the operating point.  This can be done by designating
-some actors to be part of the `shifting_group`.
-
-When creating a `*Pool` instance using the above-mentioned constructors, an optional
-`in_shifting_group` parameter can be passed to specify that this actor is special, and
-the target power of the regular actors will be shifted by the target power of all
-shifting actors together.
-
-In a location with 2 regular actors and 1 shifting actor, here's how things
-would play out:
-
-1. When only non-shifting actors have made proposals, the power bounds available
-   from the batteries are available to them exactly.
-
-   | actor priority | in shifting group? | proposed power/bounds | available bounds |
-   |----------------|--------------------|-----------------------|------------------|
-   | 3              | No                 | 1000, -4000..2500     | -3000..3000      |
-   | 2              | No                 | 2500                  | -3000..2500      |
-   | 1              | Yes                | None                  | -3000..3000      |
-
-   Power actually distributed to the batteries: 2500W
-
-2. When the shifting actor has made proposals, the bounds available to the
-   regular actors gets shifted, and the final power that actually gets
-   distributed to the batteries is also shifted.
-
-   | actor priority | in shifting group? | proposed power/bounds | available bounds |
-   |----------------|--------------------|-----------------------|------------------|
-   | 3              | No                 | 1000, -4000..2500     | -2000..4000      |
-   | 2              | No                 | 2500                  | -2000..2500      |
-   | 1              | Yes                | -1000                 | -3000..3000      |
-
-   Power actually distributed to the batteries: 1500W
 """  # noqa: D205, D400
 
 from datetime import timedelta

src/frequenz/sdk/microgrid/_data_pipeline.py

@@ -208,7 +208,6 @@ def new_ev_charger_pool(
         priority: int,
         component_ids: abc.Set[int] | None = None,
         name: str | None = None,
-        in_shifting_group: bool = False,
     ) -> EVChargerPool:
         """Return the corresponding EVChargerPool instance for the given ids.
 
@@ -221,8 +220,6 @@ def new_ev_charger_pool(
                 EVChargerPool.
             name: An optional name used to identify this instance of the pool or a
                 corresponding actor in the logs.
-            in_shifting_group: Whether the power requests get sent to the shifting group
-                in the PowerManager or not.
 
         Returns:
             An EVChargerPool instance.
@@ -279,7 +276,6 @@ def new_ev_charger_pool(
             pool_ref_store=self._ev_charger_pool_reference_stores[ref_store_key],
             name=name,
             priority=priority,
-            in_shifting_group=in_shifting_group,
         )
 
     def new_pv_pool(
@@ -288,7 +284,6 @@ def new_pv_pool(
         priority: int,
         component_ids: abc.Set[int] | None = None,
         name: str | None = None,
-        in_shifting_group: bool = False,
     ) -> PVPool:
         """Return a new `PVPool` instance for the given ids.
 
@@ -301,8 +296,6 @@ def new_pv_pool(
                 `PVPool`.
             name: An optional name used to identify this instance of the pool or a
                 corresponding actor in the logs.
-            in_shifting_group: Whether the power requests get sent to the shifting group
-                in the PowerManager or not.
 
         Returns:
             A `PVPool` instance.
@@ -356,7 +349,6 @@ def new_pv_pool(
             pool_ref_store=self._pv_pool_reference_stores[ref_store_key],
             name=name,
             priority=priority,
-            in_shifting_group=in_shifting_group,
         )
 
     def new_battery_pool(
@@ -365,7 +357,6 @@ def new_battery_pool(
         priority: int,
         component_ids: abc.Set[int] | None = None,
         name: str | None = None,
-        in_shifting_group: bool = False,
     ) -> BatteryPool:
         """Return a new `BatteryPool` instance for the given ids.
 
@@ -378,8 +369,6 @@ def new_battery_pool(
                 `BatteryPool`.
             name: An optional name used to identify this instance of the pool or a
                 corresponding actor in the logs.
-            in_shifting_group: Whether the power requests get sent to the shifting group
-                in the PowerManager or not.
 
         Returns:
             A `BatteryPool` instance.
@@ -438,7 +427,6 @@ def new_battery_pool(
             pool_ref_store=self._battery_pool_reference_stores[ref_store_key],
             name=name,
             priority=priority,
-            in_shifting_group=in_shifting_group,
         )
 
     def _data_sourcing_request_sender(self) -> Sender[ComponentMetricRequest]:
@@ -555,7 +543,6 @@ def new_ev_charger_pool(
     priority: int,
     component_ids: abc.Set[int] | None = None,
     name: str | None = None,
-    in_shifting_group: bool = False,
 ) -> EVChargerPool:
     """Return a new `EVChargerPool` instance for the given parameters.
 
@@ -581,17 +568,12 @@ def new_ev_charger_pool(
             component graph are used.
         name: An optional name used to identify this instance of the pool or a
             corresponding actor in the logs.
-        in_shifting_group: Whether the power requests get sent to the shifting group
-            in the PowerManager or not.
 
     Returns:
         An `EVChargerPool` instance.
     """
     return _get().new_ev_charger_pool(
-        priority=priority,
-        component_ids=component_ids,
-        name=name,
-        in_shifting_group=in_shifting_group,
+        priority=priority, component_ids=component_ids, name=name
     )
 
 
@@ -600,7 +582,6 @@ def new_battery_pool(
     priority: int,
     component_ids: abc.Set[int] | None = None,
     name: str | None = None,
-    in_shifting_group: bool = False,
 ) -> BatteryPool:
     """Return a new `BatteryPool` instance for the given parameters.
 
@@ -626,17 +607,12 @@ def new_battery_pool(
             graph are used.
         name: An optional name used to identify this instance of the pool or a
             corresponding actor in the logs.
-        in_shifting_group: Whether the power requests get sent to the shifting group
-            in the PowerManager or not.
 
     Returns:
         A `BatteryPool` instance.
     """
     return _get().new_battery_pool(
-        priority=priority,
-        component_ids=component_ids,
-        name=name,
-        in_shifting_group=in_shifting_group,
+        priority=priority, component_ids=component_ids, name=name
     )
 
 
@@ -645,7 +621,6 @@ def new_pv_pool(
     priority: int,
     component_ids: abc.Set[int] | None = None,
     name: str | None = None,
-    in_shifting_group: bool = False,
 ) -> PVPool:
     """Return a new `PVPool` instance for the given parameters.
 
@@ -671,18 +646,11 @@ def new_pv_pool(
             graph are used.
         name: An optional name used to identify this instance of the pool or a
             corresponding actor in the logs.
-        in_shifting_group: Whether the power requests get sent to the shifting group
-            in the PowerManager or not.
 
     Returns:
         A `PVPool` instance.
     """
-    return _get().new_pv_pool(
-        priority=priority,
-        component_ids=component_ids,
-        name=name,
-        in_shifting_group=in_shifting_group,
-    )
+    return _get().new_pv_pool(priority=priority, component_ids=component_ids, name=name)
 
 
 def grid() -> Grid:

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

@@ -32,9 +32,6 @@ class ReportRequest:
     priority: int
     """The priority of the actor ."""
 
-    in_shifting_group: bool
-    """Whether the proposal gets sent to the shifting group of the power manager."""
-
     def get_channel_name(self) -> str:
         """Get the channel name for the report request.
 
@@ -157,9 +154,6 @@ class Proposal:
     This is used by the power manager to determine the age of the proposal.
     """
 
-    in_shifting_group: bool
-    """Whether the proposal gets sent to the shifting group of the power manager."""
-
     def __lt__(self, other: Proposal) -> bool:
         """Compare two proposals by their priority.
 
@@ -237,21 +231,6 @@ def calculate_target_power(
                 didn't change.
         """
 
-    @abc.abstractmethod
-    def get_target_power(
-        self,
-        component_ids: frozenset[int],
-    ) -> Power | None:
-        """Get the target power for the given components.
-
-        Args:
-            component_ids: The component IDs to get the target power for.
-
-        Returns:
-            The target power for the given components, or `None` if there is no target
-                power.
-        """
-
     # The arguments for this method are tightly coupled to the `Matryoshka` algorithm.
     # It can be loosened up when more algorithms are added.
     @abc.abstractmethod

src/frequenz/sdk/microgrid/_power_managing/_matryoshka.py

@@ -151,21 +151,6 @@ def _validate_component_ids(
                     )
         return True
 
-    def get_target_power(
-        self,
-        component_ids: frozenset[int],
-    ) -> Power | None:
-        """Get the target power for the given components.
-
-        Args:
-            component_ids: The component IDs to get the target power for.
-
-        Returns:
-            The target power for the given components, or `None` if there is no target
-                power.
-        """
-        return self._target_power.get(component_ids)
-
     @override
     def calculate_target_power(
         self,