Update .component_id -> .id

The new `Component` class renamed `component_id` with `id`, so we need
to update all our references.

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

Author: llucax

benchmarks/power_distribution/power_distributor.py

@@ -146,7 +146,7 @@ async def run() -> None:
     all_batteries: set[Component] = connection_manager.get().component_graph.components(
         component_categories={ComponentCategory.BATTERY}
     )
-    batteries_ids = {c.component_id for c in all_batteries}
+    batteries_ids = {c.id for c in all_batteries}
     # Take some time to get data from components
     await asyncio.sleep(4)
     with open("/dev/stdout", "w", encoding="utf-8") as csvfile:

src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py

@@ -170,7 +170,7 @@ async def _get_component_category(
 
         api = connection_manager.get().api_client
         for comp in await api.list_components():
-            self._comp_categories_cache[comp.component_id] = comp.category
+            self._comp_categories_cache[comp.id] = comp.category
 
         if comp_id in self._comp_categories_cache:
             return self._comp_categories_cache[comp_id]

src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py

@@ -83,7 +83,7 @@ def _get_battery_inverter_mappings(
 
     for battery_id in battery_ids:
         inverters: set[ComponentId] = set(
-            component.component_id
+            component.id
             for component in component_graph.predecessors(battery_id)
             if component.category == ComponentCategory.INVERTER
         )
@@ -96,7 +96,7 @@ def _get_battery_inverter_mappings(
         if bat_bats_map is not None:
             bat_bats_map.setdefault(battery_id, set()).update(
                 set(
-                    component.component_id
+                    component.id
                     for inverter in inverters
                     for component in component_graph.successors(inverter)
                 )
@@ -149,7 +149,7 @@ def __init__(
         self._batteries = connection_manager.get().component_graph.components(
             component_categories={ComponentCategory.BATTERY}
         )
-        self._battery_ids = {battery.component_id for battery in self._batteries}
+        self._battery_ids = {battery.id for battery in self._batteries}
 
         maps = _get_battery_inverter_mappings(self._battery_ids)
 

src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py

@@ -113,7 +113,7 @@ async def stop(self) -> None:
     def _get_ev_charger_ids(self) -> collections.abc.Set[ComponentId]:
         """Return the IDs of all EV chargers present in the component graph."""
         return {
-            evc.component_id
+            evc.id
             for evc in connection_manager.get().component_graph.components(
                 component_categories={ComponentCategory.EV_CHARGER}
             )

src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py

@@ -256,7 +256,7 @@ async def _set_api_power(  # pylint: disable=too-many-locals
     def _get_pv_inverter_ids(self) -> collections.abc.Set[ComponentId]:
         """Return the IDs of all PV inverters present in the component graph."""
         return {
-            inv.component_id
+            inv.id
             for inv in connection_manager.get().component_graph.components(
                 component_categories={ComponentCategory.INVERTER}
             )

src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py

@@ -484,7 +484,7 @@ def _find_adjacent_inverter_id(self, battery_id: ComponentId) -> ComponentId | N
         graph = connection_manager.get().component_graph
         return next(
             (
-                comp.component_id
+                comp.id
                 for comp in graph.predecessors(battery_id)
                 if comp.category == ComponentCategory.INVERTER
             ),

src/frequenz/sdk/microgrid/component_graph.py

@@ -512,7 +512,7 @@ def refresh_from(
 
         new_graph = nx.DiGraph()
         for component in components:
-            new_graph.add_node(component.component_id, **{_DATA_KEY: component})
+            new_graph.add_node(component.id, **{_DATA_KEY: component})
 
         # Store the original connection object in the edge data (third item in the
         # tuple) so that we can retrieve it later.
@@ -588,15 +588,15 @@ def is_grid_meter(self, component: Component) -> bool:
         if component.category != ComponentCategory.METER:
             return False
 
-        predecessors = self.predecessors(component.component_id)
+        predecessors = self.predecessors(component.id)
         if len(predecessors) != 1:
             return False
 
         predecessor = next(iter(predecessors))
         if predecessor.category != ComponentCategory.GRID:
             return False
 
-        grid_successors = self.successors(predecessor.component_id)
+        grid_successors = self.successors(predecessor.id)
         return len(grid_successors) == 1
 
     @override
@@ -627,14 +627,14 @@ def is_pv_meter(self, component: Component) -> bool:
         Returns:
             Whether the specified component is a PV meter.
         """
-        successors = self.successors(component.component_id)
+        successors = self.successors(component.id)
         return (
             component.category == ComponentCategory.METER
             and not self.is_grid_meter(component)
             and len(successors) > 0
             and all(
                 self.is_pv_inverter(successor)
-                for successor in self.successors(component.component_id)
+                for successor in self.successors(component.id)
             )
         )
 
@@ -678,7 +678,7 @@ def is_ev_charger_meter(self, component: Component) -> bool:
         Returns:
             Whether the specified component is an EV charger meter.
         """
-        successors = self.successors(component.component_id)
+        successors = self.successors(component.id)
         return (
             component.category == ComponentCategory.METER
             and not self.is_grid_meter(component)
@@ -729,7 +729,7 @@ def is_battery_meter(self, component: Component) -> bool:
         Returns:
             Whether the specified component is a battery meter.
         """
-        successors = self.successors(component.component_id)
+        successors = self.successors(component.id)
         return (
             component.category == ComponentCategory.METER
             and not self.is_grid_meter(component)
@@ -777,7 +777,7 @@ def is_chp_meter(self, component: Component) -> bool:
         Returns:
             Whether the specified component is a CHP meter.
         """
-        successors = self.successors(component.component_id)
+        successors = self.successors(component.id)
         return (
             component.category == ComponentCategory.METER
             and not self.is_grid_meter(component)
@@ -830,7 +830,7 @@ def dfs(
 
         component: set[Component] = set()
 
-        for successor in self.successors(current_node.component_id):
+        for successor in self.successors(current_node.id):
             component.update(self.dfs(successor, visited, condition))
 
         return component
@@ -876,8 +876,8 @@ def find_first_descendant_component(
 
         # Sort by component ID to ensure consistent results.
         successors = sorted(
-            self.successors(root_component.component_id),
-            key=lambda comp: comp.component_id,
+            self.successors(root_component.id),
+            key=lambda comp: comp.id,
         )
 
         def find_component(component_category: ComponentCategory) -> Component | None:
@@ -933,9 +933,7 @@ def _validate_graph(self) -> None:
 
         # should be true as a consequence of the tree property:
         # there should be no unconnected components
-        unconnected = filter(
-            lambda c: self._graph.degree(c.component_id) == 0, self.components()
-        )
+        unconnected = filter(lambda c: self._graph.degree(c.id) == 0, self.components())
         if sum(1 for _ in unconnected) != 0:
             raise InvalidGraphError(
                 "Every component must have at least one connection!"
@@ -949,7 +947,7 @@ def _validate_graph_root(self) -> None:
                 or if there is a single such node that is not one of NONE or GRID.
         """
         no_predecessors = filter(
-            lambda c: self._graph.in_degree(c.component_id) == 0,
+            lambda c: self._graph.in_degree(c.id) == 0,
             self.components(),
         )
 
@@ -969,7 +967,7 @@ def _validate_graph_root(self) -> None:
             raise InvalidGraphError(f"Multiple potential root nodes: {valid_roots}")
 
         root = valid_roots[0]
-        if self._graph.out_degree(root.component_id) == 0:
+        if self._graph.out_degree(root.id) == 0:
             raise InvalidGraphError(f"Graph root {root} has no successors!")
 
     def _validate_grid_endpoint(self) -> None:
@@ -994,7 +992,7 @@ def _validate_grid_endpoint(self) -> None:
                 f"Multiple grid endpoints in component graph: {grid}"
             )
 
-        grid_id = grid[0].component_id
+        grid_id = grid[0].id
         if self._graph.in_degree(grid_id) > 0:
             grid_predecessors = list(self.predecessors(grid_id))
             raise InvalidGraphError(
@@ -1022,7 +1020,7 @@ def _validate_intermediary_components(self) -> None:
 
         missing_predecessors = list(
             filter(
-                lambda c: sum(1 for _ in self.predecessors(c.component_id)) == 0,
+                lambda c: sum(1 for _ in self.predecessors(c.id)) == 0,
                 intermediary_components,
             )
         )
@@ -1054,7 +1052,7 @@ def _validate_leaf_components(self) -> None:
 
         missing_predecessors = list(
             filter(
-                lambda c: sum(1 for _ in self.predecessors(c.component_id)) == 0,
+                lambda c: sum(1 for _ in self.predecessors(c.id)) == 0,
                 leaf_components,
             )
         )
@@ -1065,7 +1063,7 @@ def _validate_leaf_components(self) -> None:
 
         with_successors = list(
             filter(
-                lambda c: sum(1 for _ in self.successors(c.component_id)) > 0,
+                lambda c: sum(1 for _ in self.successors(c.id)) > 0,
                 leaf_components,
             )
         )

src/frequenz/sdk/timeseries/_grid_frequency.py

@@ -68,7 +68,7 @@ def __init__(
         self._channel_registry: ChannelRegistry = channel_registry
         self._source_component: Component = source
         self._component_metric_request: ComponentMetricRequest = create_request(
-            self._source_component.component_id
+            self._source_component.id
         )
 
         self._task: None | asyncio.Task[None] = None

src/frequenz/sdk/timeseries/_voltage_streamer.py

@@ -146,7 +146,7 @@ async def _send_request(self) -> None:
         phases_rx: list[Receiver[Sample[Quantity]]] = []
         for metric in metrics:
             req = ComponentMetricRequest(
-                self._namespace, self._source_component.component_id, metric, None
+                self._namespace, self._source_component.id, metric, None
             )
 
             await self._resampler_subscription_sender.send(req)

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

@@ -142,12 +142,10 @@ def _get_all_batteries(self) -> frozenset[ComponentId]:
         """
         graph = connection_manager.get().component_graph
         return frozenset(
-            {
-                battery.component_id
-                for battery in graph.components(
-                    component_categories={ComponentCategory.BATTERY}
-                )
-            }
+            battery.id
+            for battery in graph.components(
+                component_categories={ComponentCategory.BATTERY}
+            )
         )
 
     async def _update_battery_status(