Fix some issues. Almost working!

server/basic_ops.py

@@ -9,7 +9,7 @@ def import_parquet(*, filename: str):
   return pd.read_parquet(filename)
 
 @ops.op("Create scale-free graph")
-def create_scale_free_graph(*, nodes: int):
+def create_scale_free_graph(*, nodes: int = 10):
   '''Creates a scale-free graph with the given number of nodes.'''
   return nx.scale_free_graph(nodes)
 
@@ -19,7 +19,7 @@ def compute_pagerank(graph, *, damping: 0.85, iterations: 3):
 
 @ops.op("Visualize graph")
 def visualize_graph(graph) -> 'graphviz':
-  return {'graph':{
+  return {
     'attributes': {
       'name': 'My Graph'
     },
@@ -39,4 +39,4 @@ def visualize_graph(graph) -> 'graphviz':
         'target': 'Eric',
       }
     ]
-  }}
+  }

server/main.py

@@ -1,6 +1,7 @@
 from typing import Optional
 import fastapi
 import pydantic
+import traceback
 from . import ops
 from . import basic_ops
 
@@ -65,9 +66,11 @@ def execute(ws):
                 try:
                   output = op(*inputs, **data.params)
                 except Exception as e:
+                  traceback.print_exc()
                   data.error = str(e)
                   failed += 1
                   continue
+                data.error = None
                 outputs[node.id] = output
                 if op.type == 'graphviz':
                     data.graph = output

server/ops.py

@@ -14,7 +14,13 @@ class Op:
   type: str
 
   def __call__(self, *inputs, **params):
-    # Do conversions here.
+    # Convert parameters.
+    sig = inspect.signature(self.func)
+    for p in params:
+      if p in self.params:
+        t = sig.parameters[p].annotation
+        if t == int:
+          params[p] = int(params[p])
     res = self.func(*inputs, **params)
     return res
 

web/src/LynxKiteFlow.svelte

@@ -113,6 +113,12 @@
 
   const graph = derived([nodes, edges], ([nodes, edges]) => ({ nodes, edges }));
   let backendWorkspace;
+  // Like JSON.stringify, but with keys sorted.
+  function orderedJSON(obj: any) {
+    const allKeys = new Set();
+    JSON.stringify(obj, (key, value) => (allKeys.add(key), value));
+    return JSON.stringify(obj, Array.from(allKeys).sort());
+  }
   graph.subscribe(async (g) => {
     const dragging = g.nodes.find((n) => n.dragging);
     if (dragging) return;
@@ -120,7 +126,7 @@
     for (const node of g.nodes) {
       delete node.computed;
     }
-    const ws = JSON.stringify(g);
+    const ws = orderedJSON(g);
     if (ws === backendWorkspace) return;
     console.log('current vs backend', '\n' + ws, '\n' + backendWorkspace);
     backendWorkspace = ws;
@@ -129,10 +135,10 @@
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify(g),
+      body: ws,
     });
     const j = await res.json();
-    backendWorkspace = JSON.stringify(j);
+    backendWorkspace = orderedJSON(j);
     nodes.set(j.nodes);
   });
 </script>