Separate op_id from title.

lynxkite-app/src/lynxkite_app/crdt.py

@@ -128,7 +128,7 @@ def clean_input(ws_pyd):
         for p in list(node.data.params):
             if p.startswith("_"):
                 del node.data.params[p]
-        if node.data.title == "Comment":
+        if node.data.op_id == "Comment":
             node.data.params = {}
         node.position.x = 0
         node.position.y = 0

lynxkite-app/web/src/workspace/NodeSearch.tsx

@@ -3,6 +3,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
 
 export type OpsOp = {
   name: string;
+  id: string;
   categories: string[];
   type: string;
   position: { x: number; y: number };

lynxkite-app/web/src/workspace/Workspace.tsx

@@ -316,6 +316,7 @@ function LynxKiteFlow() {
       data: {
         meta: { value: meta },
         title: meta.name,
+        op_id: meta.id,
         params: Object.fromEntries(meta.params.map((p) => [p.name, p.default])),
       },
     };

lynxkite-core/src/lynxkite/core/executors/one_by_one.py

@@ -64,7 +64,7 @@ def _get_stages(ws, catalog: ops.Catalog):
     for edge in ws.edges:
         inputs.setdefault(edge.target, []).append(edge.source)
         node = nodes[edge.target]
-        op = catalog[node.data.title]
+        op = catalog[node.data.op_id]
         if op.get_input(edge.targetHandle).position.is_vertical():
             batch_inputs.setdefault(edge.target, []).append(edge.source)
     stages = []
@@ -111,9 +111,9 @@ async def _execute(ws: workspace.Workspace, catalog: ops.Catalog, cache=None):
     tasks = {}
     NO_INPUT = object()  # Marker for initial tasks.
     for node in ws.nodes:
-        op = catalog.get(node.data.title)
+        op = catalog.get(node.data.op_id)
         if op is None:
-            node.publish_error(f'Operation "{node.data.title}" not found.')
+            node.publish_error(f'Operation "{node.data.op_id}" not found.')
             continue
         node.publish_error(None)
         # Start tasks for nodes that have no non-batch inputs.
@@ -130,7 +130,7 @@ async def _execute(ws: workspace.Workspace, catalog: ops.Catalog, cache=None):
                 next_stage.setdefault(n, []).extend(ts)
                 continue
             node = nodes[n]
-            op = catalog[node.data.title]
+            op = catalog[node.data.op_id]
             params = {**node.data.params}
             if _has_ctx(op):
                 params["_ctx"] = contexts[node.id]
@@ -181,7 +181,7 @@ async def _execute(ws: workspace.Workspace, catalog: ops.Catalog, cache=None):
                     result.display = await _await_if_needed(result.display)
                 for edge in edges[node.id]:
                     t = nodes[edge.target]
-                    op = catalog[t.data.title]
+                    op = catalog[t.data.op_id]
                     if op.get_input(edge.targetHandle).position.is_vertical():
                         batch_inputs.setdefault((edge.target, edge.targetHandle), []).extend(
                             results

lynxkite-core/src/lynxkite/core/executors/simple.py

@@ -37,7 +37,7 @@ async def execute(ws: workspace.Workspace, catalog: ops.Catalog):
     ts = graphlib.TopologicalSorter(dependencies)
     for node_id in ts.static_order():
         node = nodes[node_id]
-        op = catalog[node.data.title]
+        op = catalog[node.data.op_id]
         params = {**node.data.params}
         node.publish_started()
         try:

lynxkite-core/src/lynxkite/core/ops.py

@@ -193,6 +193,8 @@ class Op(BaseConfig):
     type: str = "basic"  # The UI to use for this operation.
     color: str = "orange"  # The color of the operation in the UI.
     doc: object = None
+    # ID is automatically set from the name and categories.
+    id: str = pydantic.Field(default=None)
 
     def __call__(self, *inputs, **params):
         # Convert parameters.
@@ -235,10 +237,10 @@ class Op(BaseConfig):
                 res[p.name] = _param_to_type(p.name, params[p.name], p.type)
         return res
 
-    @property
-    def id(self) -> str:
-        """The name and categories of the operation."""
-        return " > ".join(self.categories + [self.name])
+    @pydantic.model_validator(mode="after")
+    def compute_id(self):
+        self.id = " > ".join(self.categories + [self.name])
+        return self
 
 
 def op(
@@ -384,7 +386,7 @@ def register_passive_op(env: str, *names: str, inputs=[], outputs=["output"], pa
         **kwargs,
     )
     CATALOGS.setdefault(env, {})
-    CATALOGS[env][name] = op
+    CATALOGS[env][op.id] = op
     return op
 
 

lynxkite-core/src/lynxkite/core/workspace.py

@@ -30,6 +30,7 @@ class NodeStatus(str, enum.Enum):
 
 class WorkspaceNodeData(BaseConfig):
     title: str
+    op_id: str
     params: dict
     display: Optional[object] = None
     input_metadata: Optional[object] = None
@@ -106,7 +107,7 @@ class Workspace(BaseConfig):
         if self.env not in ops.CATALOGS:
             return self
         catalog = ops.CATALOGS[self.env]
-        _ops = {n.id: catalog[n.data.title] for n in self.nodes if n.data.title in catalog}
+        _ops = {n.id: catalog[n.data.op_id] for n in self.nodes if n.data.op_id in catalog}
         valid_targets = set()
         valid_sources = set()
         for n in self.nodes:
@@ -174,7 +175,7 @@ class Workspace(BaseConfig):
         catalog = ops.CATALOGS[self.env]
         for node in self.nodes:
             data = node.data
-            op = catalog.get(data.title)
+            op = catalog.get(data.op_id)
             if op:
                 if getattr(data, "meta", None) != op:
                     data.meta = op
@@ -208,7 +209,9 @@ class Workspace(BaseConfig):
         random_string = os.urandom(4).hex()
         if func:
             kwargs["type"] = func.__op__.type
-            kwargs["data"] = WorkspaceNodeData(title=func.__op__.name, params={})
+            kwargs["data"] = WorkspaceNodeData(
+                title=func.__op__.name, op_id=func.__op__.id, params={}
+            )
         kwargs.setdefault("type", "basic")
         kwargs.setdefault("id", f"{kwargs['data'].title} {random_string}")
         kwargs.setdefault("position", Position(x=0, y=0))

lynxkite-core/tests/test_workspace.py

@@ -42,6 +42,7 @@ def test_save_load():
             assert node.id == loaded_node.id
             assert node.type == loaded_node.type
             assert node.data.title == loaded_node.data.title
+            assert node.data.op_id == loaded_node.data.op_id
             assert node.data.params == loaded_node.data.params
             assert node.position.x == loaded_node.position.x
             assert node.position.y == loaded_node.position.y

lynxkite-graph-analytics/src/lynxkite_graph_analytics/core.py

@@ -173,7 +173,7 @@ def disambiguate_edges(ws: workspace.Workspace):
     seen = set()
     for edge in reversed(ws.edges):
         dst_node = nodes[edge.target]
-        op = catalog.get(dst_node.data.title)
+        op = catalog.get(dst_node.data.op_id)
         if op.get_input(edge.targetHandle).type == list[Bundle]:
             # Takes multiple bundles as an input. No need to disambiguate.
             continue
@@ -224,7 +224,7 @@ async def _execute_node(
     node: workspace.WorkspaceNode, ws: workspace.Workspace, catalog: ops.Catalog, outputs: Outputs
 ):
     params = {**node.data.params}
-    op = catalog.get(node.data.title)
+    op = catalog.get(node.data.op_id)
     if not op:
         node.publish_error("Operation not found in catalog")
         return

lynxkite-graph-analytics/src/lynxkite_graph_analytics/networkx_ops.py

@@ -301,7 +301,7 @@ def register_networkx(env: str):
                 outputs=[ops.Output(name="output", type=nx.Graph)],
                 type="basic",
             )
-            cat[nicename] = op
+            cat[op.id] = op
             counter += 1
     print(f"Registered {counter} NetworkX operations.")
 

lynxkite-graph-analytics/src/lynxkite_graph_analytics/pytorch/pytorch_core.py

@@ -231,11 +231,11 @@ class ModelBuilder:
         # Clean up disconnected nodes.
         to_delete = set()
         for node_id in self.nodes:
-            title = self.nodes[node_id].data.title
-            if title not in self.catalog:  # Groups and comments, for example.
+            op_id = self.nodes[node_id].data.op_id
+            if op_id not in self.catalog:  # Groups and comments, for example.
                 to_delete.add(node_id)
                 continue
-            op = self.catalog[title]
+            op = self.catalog[op_id]
             if len(self.in_edges[node_id]) != len(op.inputs):  # Unconnected inputs.
                 to_delete.add(node_id)
                 to_delete |= self.all_upstream(node_id)
@@ -266,7 +266,7 @@ class ModelBuilder:
         """Adds the layer(s) produced by this node to self.layers."""
         node = self.nodes[node_id]
         t = node.data.title
-        op = self.catalog[t]
+        op = self.catalog[node.data.op_id]
         p = op.convert_params(node.data.params)
         match t:
             case "Repeat":
@@ -375,9 +375,8 @@ class ModelBuilder:
         names = {}
         for i in ids:
             for node in self.nodes.values():
-                title = node.data.title
-                op = self.catalog[title]
-                name = node.data.params.get("name") or title
+                op = self.catalog[node.data.op_id]
+                name = node.data.params.get("name") or node.data.title
                 for output in op.outputs:
                     i2 = _to_id(node.id, output.name)
                     if i2 == i: