Remove validation code for JUNCTIONs from the component graph

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

Author: shsms

src/frequenz/sdk/microgrid/_graph.py

@@ -502,7 +502,6 @@ def validate(self) -> None:
         self._validate_graph_root()
         self._validate_grid_endpoint()
         self._validate_intermediary_components()
-        self._validate_junctions()
         self._validate_leaf_components()
 
     def is_pv_inverter(self, component: Component) -> bool:
@@ -747,7 +746,6 @@ def _validate_graph_root(self) -> None:
         valid_root_types = {
             ComponentCategory.NONE,
             ComponentCategory.GRID,
-            ComponentCategory.JUNCTION,
         }
 
         valid_roots = list(
@@ -822,24 +820,6 @@ def _validate_intermediary_components(self) -> None:
                 f"{missing_predecessors}"
             )
 
-    def _validate_junctions(self) -> None:
-        """Check that junctions are configured correctly in the graph.
-
-        Raises:
-            InvalidGraphError: if any junction has no successors (it is allowed
-                for a single junction to be the root of the component graph, in
-                which case it will have no predecessors: this is taken care of
-                by the `_validate_graph_root` check)
-        """
-        junctions = self.components(component_category={ComponentCategory.JUNCTION})
-        no_successors = list(
-            filter(lambda c: self._graph.out_degree(c.component_id) == 0, junctions)
-        )
-        if len(no_successors) > 0:
-            raise InvalidGraphError(
-                f"Junctions missing graph successors: {no_successors}"
-            )
-
     def _validate_leaf_components(self) -> None:
         """Check that leaf components (e.g. batteries) are configured correctly.
 

tests/microgrid/test_graph.py

@@ -804,21 +804,6 @@ def test_validate(self) -> None:
         ):
             graph.validate()
 
-        # junctions are not set up correctly: a junction has no
-        # successors in the graph
-        graph._graph.clear()
-        graph._graph.add_nodes_from(
-            [
-                (1, asdict(Component(1, ComponentCategory.GRID))),
-                (2, asdict(Component(2, ComponentCategory.JUNCTION))),
-            ]
-        )
-        graph._graph.add_edges_from([(1, 2)])
-        with pytest.raises(
-            gr.InvalidGraphError, match="Junctions missing graph successors"
-        ):
-            graph.validate()
-
         # leaf components are not set up correctly: a battery has
         # a successor in the graph
         graph._graph.clear()
@@ -1129,47 +1114,6 @@ def test__validate_intermediary_components(self) -> None:
         graph._graph.add_edges_from([(1, 2), (2, 3), (3, 4)])
         graph._validate_intermediary_components()
 
-    def test__validate_junctions(self) -> None:
-        graph = gr._MicrogridComponentGraph()
-        assert set(graph.components()) == set()
-        assert list(graph.connections()) == []
-
-        # successors missing for at least one junction
-        graph._graph.clear()
-        graph._graph.add_nodes_from(
-            [(1, asdict(Component(1, ComponentCategory.JUNCTION)))]
-        )
-        with pytest.raises(
-            gr.InvalidGraphError, match="Junctions missing graph successors"
-        ):
-            graph._validate_junctions()
-
-        graph._graph.clear()
-        graph._graph.add_nodes_from(
-            [
-                (1, asdict(Component(1, ComponentCategory.JUNCTION))),
-                (2, asdict(Component(2, ComponentCategory.JUNCTION))),
-            ]
-        )
-        graph._graph.add_edges_from([(1, 2)])
-        with pytest.raises(
-            gr.InvalidGraphError, match="Junctions missing graph successors"
-        ):
-            graph._validate_junctions()
-
-        # all junctions have at least one successor
-        graph._graph.clear()
-        graph._graph.add_nodes_from(
-            [
-                (1, asdict(Component(1, ComponentCategory.JUNCTION))),
-                (2, asdict(Component(2, ComponentCategory.JUNCTION))),
-                (3, asdict(Component(3, ComponentCategory.METER))),
-            ]
-        )
-
-        graph._graph.add_edges_from([(1, 2), (2, 3)])
-        graph._validate_junctions()
-
     def test__validate_leaf_components(self) -> None:
         # to ensure clean testing of the individual method,
         # we cheat by setting underlying graph data directly