Replace Merge with merge for constructing and Merger for typing

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

Author: shsms

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

@@ -10,8 +10,7 @@
 from collections import abc
 from datetime import timedelta
 
-from frequenz.channels import Broadcast, Receiver, Sender
-from frequenz.channels.util import Merge
+from frequenz.channels import Broadcast, Merger, Receiver, Sender, merge
 
 from ..._internal._asyncio import cancel_and_await
 from ._component_status import (
@@ -88,7 +87,7 @@ async def stop(self) -> None:
 
     def _make_merged_status_receiver(
         self,
-    ) -> Merge[ComponentStatus]:
+    ) -> Merger[ComponentStatus]:
         status_receivers: list[Receiver[ComponentStatus]] = []
 
         for component_id in self._component_ids:
@@ -104,7 +103,7 @@ def _make_merged_status_receiver(
             )
             self._component_status_trackers.append(tracker)
             status_receivers.append(channel.new_receiver())
-        return Merge(*status_receivers)
+        return merge(*status_receivers)
 
     async def _run(self) -> None:
         """Start tracking component status."""

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

@@ -8,8 +8,7 @@
 import asyncio
 from enum import Enum
 
-from frequenz.channels import Receiver
-from frequenz.channels.util import Merge
+from frequenz.channels import Merger, Receiver, merge
 from frequenz.client.microgrid import (
     EVChargerCableState,
     EVChargerComponentState,
@@ -87,7 +86,7 @@ def __init__(self, component_ids: set[int]) -> None:
         """
         self._component_ids = component_ids
         self._task: asyncio.Task[None] = asyncio.create_task(self._run())
-        self._merged_stream: Merge[EVChargerData] | None = None
+        self._merged_stream: Merger[EVChargerData] | None = None
 
         # Initialize all components to the `MISSING` state.  This will change as data
         # starts arriving from the individual components.
@@ -124,7 +123,7 @@ async def _run(self) -> None:
         streams: list[Receiver[EVChargerData]] = await asyncio.gather(
             *[api_client.ev_charger_data(cid) for cid in self._component_ids]
         )
-        self._merged_stream = Merge(*streams)
+        self._merged_stream = merge(*streams)
         async for data in self._merged_stream:
             self._update(data)