Graphs and nodes are labelled, save for the Node Protocol

src/causalprog/graph/graph.py

@@ -2,21 +2,23 @@
 
 import networkx as nx
 
+from causalprog._abc.labelled import Labelled
+
 from .node import Node
 
 
-class Graph:
+class Graph(Labelled):
     """A directed acyclic graph that represents a causality tree."""
 
     def __init__(self, graph: nx.Graph, label: str) -> None:
         """Initialise a graph from a NetworkX graph."""
+        super().__init__(label=label)
+
         for node in graph.nodes:
             if not isinstance(node, Node):
                 msg = f"Invalid node: {node}"
                 raise TypeError(msg)
 
-        self._label = label
-
         self._graph = graph.copy()
         self._nodes = list(graph.nodes())
         self._depth_first_nodes = list(nx.algorithms.dfs_postorder_nodes(graph))
@@ -29,8 +31,3 @@ def __init__(self, graph: nx.Graph, label: str) -> None:
             msg = "Cannot yet create graph with multiple outcome nodes"
             raise ValueError(msg)
         self._outcome = outcomes[0]
-
-    @property
-    def label(self) -> str:
-        """The label of the graph."""
-        return self._label

src/causalprog/graph/node.py

@@ -5,6 +5,8 @@
 from abc import abstractmethod
 from typing import Protocol, runtime_checkable
 
+from causalprog._abc.labelled import Labelled
+
 
 class DistributionFamily:
     """Placeholder class."""
@@ -34,7 +36,7 @@ def is_outcome(self) -> bool:
         """Identify if the node is an outcome."""
 
 
-class RootDistributionNode:
+class RootDistributionNode(Labelled):
     """A root node containing a distribution family."""
 
     def __init__(
@@ -45,19 +47,15 @@ def __init__(
         is_outcome: bool = False,
     ) -> None:
         """Initialise the node."""
+        super().__init__(label=label)
+
         self._dfamily = family
-        self._label = label
         self._outcome = is_outcome
 
     def __repr__(self) -> str:
         """Representation."""
         return f'RootDistributionNode("{self._label}")'
 
-    @property
-    def label(self) -> str:
-        """The label of the node."""
-        return self._label
-
     @property
     def is_root(self) -> bool:
         """Identify if the node is a root."""
@@ -69,7 +67,7 @@ def is_outcome(self) -> bool:
         return self._outcome
 
 
-class DistributionNode:
+class DistributionNode(Labelled):
     """A node containing a distribution family that depends on its parents."""
 
     def __init__(
@@ -80,19 +78,15 @@ def __init__(
         is_outcome: bool = False,
     ) -> None:
         """Initialise the node."""
+        super().__init__(label=label)
+
         self._dfamily = family
-        self._label = label
         self._outcome = is_outcome
 
     def __repr__(self) -> str:
         """Representation."""
         return f'DistributionNode("{self._label}")'
 
-    @property
-    def label(self) -> str:
-        """The label of the node."""
-        return self._label
-
     @property
     def is_root(self) -> bool:
         """Identify if the node is a root."""