REFACT(pipe): NULL_OP inherrit base Op (not FnOp) to break ...

import-time dependency pipeline.py --> op.py.

Author: ankostis

graphtik/network.py

@@ -634,12 +634,10 @@ def proc_op(op, parent=None):
         """clone FuncOperation with certain props changed"""
         from .op import FunctionalOperation
 
-        assert isinstance(op, FunctionalOperation), op
-
         ## Convey any node-props specified in the pipeline here
         #  to all sub-operations.
         #
-        if kw:
+        if kw and isinstance(op, FunctionalOperation):
             if node_props:
                 kw["node_props"] = {**op.node_props, **node_props}
 
@@ -650,7 +648,7 @@ def parent_wrapper(ren_args: RenArgs) -> str:
                     return renamer(ren_args._replace(parent=parent))
 
                 kw["renamer"] = parent_wrapper
-            op = op = op.withset(**kw)
+            op = op.withset(**kw)
 
         return op
 

graphtik/pipeline.py

@@ -16,23 +16,34 @@
 
 from .base import UNSET, Items, Operation, PlotArgs, Plottable, RenArgs, aslist, jetsam
 from .modifiers import dep_renamed
-from .op import FunctionalOperation, reparse_operation_data
 
 log = logging.getLogger(__name__)
 
 
-class NULL_OP(FunctionalOperation):
+class NULL_OP(Operation):
     """
     Eliminates same-named operations added later during term:`operation merging`.
 
     :seealso: :ref:`operation-merging`
     """
 
     def __init__(self, name):
-        super().__init__(name=name)
+        self.name = name
+
+    def __hash__(self):
+        return hash(self.name)
+
+    def __eq__(self, o):
+        return self.name == o.name
+
+    def __repr__(self):
+        return f"{type(self).__name__}({self.name})"
 
     def compute(self, *args, **kw):
-        raise AssertionError("Should have been eliminated!")
+        raise AssertionError(f"{self} should have been eliminated!")
+
+    def prepare_plot_args(self, *args, **kw):
+        raise AssertionError(f"{self} should have been eliminated!")
 
 
 def _id_bool(b):
@@ -85,6 +96,7 @@ def __init__(
                 *Operations may only be added once, ...*
         """
         from .network import build_network
+        from .op import reparse_operation_data
 
         ## Set data asap, for debugging, although `net.withset()` will reset them.
         self.name = name