Merge pull request #123 from biggraph/darabos-small-stuff

examples/Model definition

@@ -235,7 +235,7 @@
       "id": "Input: tensor 3",
       "position": {
         "x": 485.8840220312055,
-        "y": -149.86223034126274
+        "y": -268.0485936515193
       },
       "type": "basic",
       "width": 200.0
@@ -285,8 +285,8 @@
       "height": 200.0,
       "id": "MSE loss 2",
       "position": {
-        "x": 362.77557479979805,
-        "y": -1287.1056805642488
+        "x": 384.54674698852955,
+        "y": -1184.4701545316577
       },
       "type": "basic",
       "width": 200.0
@@ -389,10 +389,6 @@
               }
             }
           },
-          "position": {
-            "x": 667.0,
-            "y": 432.0
-          },
           "type": "basic"
         },
         "params": {
@@ -439,10 +435,6 @@
               }
             }
           },
-          "position": {
-            "x": 675.0,
-            "y": 499.0
-          },
           "type": "basic"
         },
         "params": {
@@ -496,10 +488,6 @@
               }
             }
           },
-          "position": {
-            "x": 1061.0,
-            "y": 239.0
-          },
           "type": "basic"
         },
         "params": {
@@ -513,8 +501,8 @@
       "height": 258.0,
       "id": "Constant vector 1",
       "position": {
-        "x": 983.1241140187901,
-        "y": -562.803650462906
+        "x": 886.708922897265,
+        "y": -298.4394167425953
       },
       "type": "basic",
       "width": 238.0
@@ -554,10 +542,6 @@
             }
           },
           "params": {},
-          "position": {
-            "x": 1077.0,
-            "y": 334.0
-          },
           "type": "basic"
         },
         "params": {},
@@ -568,8 +552,8 @@
       "height": 200.0,
       "id": "Add 1",
       "position": {
-        "x": 818.5444381090571,
-        "y": -955.5157374399466
+        "x": 722.1292469875319,
+        "y": -762.6853551968964
       },
       "type": "basic",
       "width": 200.0
@@ -601,10 +585,14 @@
               }
             }
           },
-          "params": {},
-          "position": {
-            "x": 544.0,
-            "y": 306.0
+          "params": {
+            "name": {
+              "default": null,
+              "name": "name",
+              "type": {
+                "type": "None"
+              }
+            }
           },
           "type": "basic"
         },

lynxkite-app/src/lynxkite_app/crdt.py

@@ -91,6 +91,9 @@ def clean_input(ws_pyd):
         node.data.input_metadata = None
         node.data.error = None
         node.data.status = workspace.NodeStatus.done
+        for p in list(node.data.params):
+            if p.startswith("_"):
+                del node.data.params[p]
         node.position.x = 0
         node.position.y = 0
         if node.model_extra:

lynxkite-app/web/src/workspace/nodes/NodeParameter.tsx

@@ -25,7 +25,7 @@ function Input({
     <input
       className="input input-bordered w-full"
       ref={inputRef}
-      value={value || ""}
+      value={value ?? ""}
       onChange={(evt) => onChange(evt.currentTarget.value, { delay: 2 })}
       onBlur={(evt) => onChange(evt.currentTarget.value, { delay: 0 })}
       onKeyDown={(evt) => evt.code === "Enter" && onChange(evt.currentTarget.value, { delay: 0 })}

lynxkite-app/web/src/workspace/nodes/NodeWithParams.tsx

@@ -35,7 +35,7 @@ function NodeWithParams(props: any) {
 
   return (
     <LynxKiteNode {...props}>
-      {props.collapsed && (
+      {props.collapsed && params.length > 0 && (
         <div className="params-expander" onClick={() => setCollapsed(!collapsed)}>
           <Triangle className={`flippy ${collapsed ? "flippy-90" : ""}`} />
         </div>

lynxkite-app/web/src/workspace/nodes/NodeWithTableView.tsx

@@ -1,3 +1,4 @@
+import { useReactFlow } from "@xyflow/react";
 import { useState } from "react";
 import React from "react";
 import Markdown from "react-markdown";
@@ -14,23 +15,35 @@ function toMD(v: any): string {
   return JSON.stringify(v);
 }
 
+type OpenState = { [name: string]: boolean };
+
 export default function NodeWithTableView(props: any) {
-  const [open, setOpen] = useState({} as { [name: string]: boolean });
+  const reactFlow = useReactFlow();
+  const [open, setOpen] = useState((props.data?.params?._tables_open ?? {}) as OpenState);
   const display = props.data.display?.value;
   const single = display?.dataframes && Object.keys(display?.dataframes).length === 1;
   const dfs = Object.entries(display?.dataframes || {});
   dfs.sort();
+  function setParam(name: string, newValue: any) {
+    reactFlow.updateNodeData(props.id, (prevData: any) => ({
+      ...prevData,
+      params: { ...prevData.data.params, [name]: newValue },
+    }));
+  }
+  function toggleTable(name: string) {
+    setOpen((prevOpen: OpenState) => {
+      const newOpen = { ...prevOpen, [name]: !prevOpen[name] };
+      setParam("_tables_open", newOpen);
+      return newOpen;
+    });
+  }
   return (
     <LynxKiteNode {...props}>
       {display && [
         dfs.map(([name, df]: [string, any]) => (
           <React.Fragment key={name}>
             {!single && (
-              <div
-                key={`${name}-header`}
-                className="df-head"
-                onClick={() => setOpen({ ...open, [name]: !open[name] })}
-              >
+              <div key={`${name}-header`} className="df-head" onClick={() => toggleTable(name)}>
                 {name}
               </div>
             )}
@@ -55,11 +68,7 @@ export default function NodeWithTableView(props: any) {
         )),
         Object.entries(display.others || {}).map(([name, o]) => (
           <>
-            <div
-              key={`${name}-header`}
-              className="df-head"
-              onClick={() => setOpen({ ...open, [name]: !open[name] })}
-            >
+            <div key={`${name}-header`} className="df-head" onClick={() => toggleTable(name)}>
               {name}
             </div>
             {open[name] && <pre>{(o as any).toString()}</pre>}

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

@@ -291,7 +291,8 @@ def visualize_graph(
 
 
 @op("View tables", view="table_view")
-def view_tables(bundle: core.Bundle, *, limit: int = 100):
+def view_tables(bundle: core.Bundle, *, _tables_open: str = "", limit: int = 100):
+    _tables_open = _tables_open  # The frontend uses this parameter to track which tables are open.
     return bundle.to_dict(limit=limit)
 
 
@@ -389,6 +390,7 @@ def train_model(
         losses.append(loss)
     m.trained = True
     bundle = bundle.copy()
+    bundle.dfs["training"] = pd.DataFrame({"training_loss": losses})
     bundle.other[model_name] = m
     return bundle
 
@@ -431,3 +433,17 @@ def train_test_split(bundle: core.Bundle, *, table_name: str, test_ratio: float
     bundle.dfs[f"{table_name}_train"] = train
     bundle.dfs[f"{table_name}_test"] = test
     return bundle
+
+
+@op("View loss", view="visualization")
+def view_loss(
+    bundle: core.Bundle,
+):
+    loss = bundle.dfs["training"].training_loss.tolist()
+    v = {
+        "title": {"text": "Training loss"},
+        "xAxis": {"type": "category"},
+        "yAxis": {"type": "value"},
+        "series": [{"data": loss, "type": "line"}],
+    }
+    return v