Merge pull request #142 from biggraph/darabos-errors

lynxkite-app/src/lynxkite_app/crdt.py

@@ -99,8 +99,8 @@ class CodeWebsocketServer(WorkspaceWebsocketServer):
             pass
         if len(text) == 0:
             if os.path.exists(name):
-                with open(name) as f:
-                    text += f.read()
+                with open(name, encoding="utf-8") as f:
+                    text += f.read().replace("\r\n", "\n")
         room = pycrdt_websocket.YRoom(
             ystore=ystore, ydoc=ydoc, exception_handler=ws_exception_handler
         )
@@ -279,9 +279,9 @@ async def execute(name: str, ws_crdt: pycrdt.Map, ws_pyd: workspace.Workspace, d
 
 
 async def code_changed(name: str, changes: pycrdt.TextEvent, text: pycrdt.Text):
-    # TODO: Make this more fancy?
-    with open(name, "w") as f:
-        f.write(str(text).strip() + "\n")
+    contents = str(text).strip() + "\n"
+    with open(name, "w", encoding="utf-8") as f:
+        f.write(contents)
 
 
 @contextlib.asynccontextmanager

lynxkite-app/web/package-lock.json

@@ -27,6 +27,7 @@
         "monaco-editor": "^0.52.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
+        "react-error-boundary": "^5.0.0",
         "react-markdown": "^9.0.1",
         "react-router-dom": "^7.0.2",
         "swr": "^2.2.5",
@@ -310,6 +311,18 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
+      "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/template": {
       "version": "7.26.9",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
@@ -6155,6 +6168,18 @@
         "react": "^18.3.1"
       }
     },
+    "node_modules/react-error-boundary": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-5.0.0.tgz",
+      "integrity": "sha512-tnjAxG+IkpLephNcePNA7v6F/QpWLH8He65+DmedchDwg162JZqx4NmbXj0mlAYVVEd81OW7aFhmbsScYfiAFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "peerDependencies": {
+        "react": ">=16.13.1"
+      }
+    },
     "node_modules/react-markdown": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-9.0.1.tgz",
@@ -6259,6 +6284,12 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
     "node_modules/remark-parse": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",

lynxkite-app/web/package.json

@@ -30,6 +30,7 @@
     "monaco-editor": "^0.52.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-error-boundary": "^5.0.0",
     "react-markdown": "^9.0.1",
     "react-router-dom": "^7.0.2",
     "swr": "^2.2.5",

lynxkite-app/web/src/Code.tsx

@@ -54,6 +54,7 @@ export default function Code() {
       path!,
       yDocRef.current,
     );
+    editorRef.current.getModel()!.setEOL(0); // https://github.com/yjs/y-monaco/issues/6
     monacoBindingRef.current = new yMonacoRef.current.MonacoBinding(
       text,
       editorRef.current.getModel()!,

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

@@ -49,7 +49,7 @@ function relationsToDict(relations: any[]) {
 
 export type UpdateOptions = { delay?: number };
 
-export default function NodeWithGraphCreationView(props: any) {
+function NodeWithGraphCreationView(props: any) {
   const reactFlow = useReactFlow();
   const [open, setOpen] = useState({} as { [name: string]: boolean });
   const display = props.data.display?.value;
@@ -229,68 +229,68 @@ export default function NodeWithGraphCreationView(props: any) {
   }
 
   return (
-    <LynxKiteNode {...props}>
-      <div className="graph-creation-view">
-        <div className="graph-tables">
-          <div className="graph-table-header">Node Tables</div>
-          {display && [
-            Object.entries(tables).map(([name, df]: [string, any]) => (
-              <React.Fragment key={name}>
-                {!singleTable && (
-                  <div
-                    key={`${name}-header`}
-                    className="df-head"
-                    onClick={() => setOpen({ ...open, [name]: !open[name] })}
-                  >
-                    {name}
-                  </div>
-                )}
-                {(singleTable || open[name]) && displayTable(name, df)}
-              </React.Fragment>
-            )),
-            Object.entries(display.others || {}).map(([name, o]) => (
-              <>
-                <div
-                  key={name}
-                  className="df-head"
-                  onClick={() => setOpen({ ...open, [name]: !open[name] })}
-                >
-                  {name}
-                </div>
-                {open[name] && <pre>{(o as any).toString()}</pre>}
-              </>
-            )),
-          ]}
-        </div>
-        <div className="graph-relations">
-          <div className="graph-table-header">
-            Relationships
-            <button className="add-relationship-button" onClick={(_) => addRelation()}>
-              +
-            </button>
-          </div>
-          {relations &&
-            Object.entries(relations).map(([name, relation]: [string, any]) => (
-              <React.Fragment key={name}>
+    <div className="graph-creation-view">
+      <div className="graph-tables">
+        <div className="graph-table-header">Node Tables</div>
+        {display && [
+          Object.entries(tables).map(([name, df]: [string, any]) => (
+            <React.Fragment key={name}>
+              {!singleTable && (
                 <div
                   key={`${name}-header`}
                   className="df-head"
                   onClick={() => setOpen({ ...open, [name]: !open[name] })}
                 >
                   {name}
-                  <button
-                    onClick={() => {
-                      deleteRelation(relation);
-                    }}
-                  >
-                    <Trash />
-                  </button>
                 </div>
-                {(singleRelation || open[name]) && displayRelation(relation)}
-              </React.Fragment>
-            ))}
+              )}
+              {(singleTable || open[name]) && displayTable(name, df)}
+            </React.Fragment>
+          )),
+          Object.entries(display.others || {}).map(([name, o]) => (
+            <>
+              <div
+                key={name}
+                className="df-head"
+                onClick={() => setOpen({ ...open, [name]: !open[name] })}
+              >
+                {name}
+              </div>
+              {open[name] && <pre>{(o as any).toString()}</pre>}
+            </>
+          )),
+        ]}
+      </div>
+      <div className="graph-relations">
+        <div className="graph-table-header">
+          Relationships
+          <button className="add-relationship-button" onClick={(_) => addRelation()}>
+            +
+          </button>
         </div>
+        {relations &&
+          Object.entries(relations).map(([name, relation]: [string, any]) => (
+            <React.Fragment key={name}>
+              <div
+                key={`${name}-header`}
+                className="df-head"
+                onClick={() => setOpen({ ...open, [name]: !open[name] })}
+              >
+                {name}
+                <button
+                  onClick={() => {
+                    deleteRelation(relation);
+                  }}
+                >
+                  <Trash />
+                </button>
+              </div>
+              {(singleRelation || open[name]) && displayRelation(relation)}
+            </React.Fragment>
+          ))}
       </div>
-    </LynxKiteNode>
+    </div>
   );
 }
+
+export default LynxKiteNode(NodeWithGraphCreationView);

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

@@ -1,6 +1,9 @@
 import { Handle, NodeResizeControl, type Position, useReactFlow } from "@xyflow/react";
+import { ErrorBoundary } from "react-error-boundary";
 // @ts-ignore
 import ChevronDownRight from "~icons/tabler/chevron-down-right.jsx";
+// @ts-ignore
+import Skull from "~icons/tabler/skull.jsx";
 
 interface LynxKiteNodeProps {
   id: string;
@@ -40,7 +43,7 @@ function getHandles(inputs: object, outputs: object) {
   return handles;
 }
 
-export default function LynxKiteNode(props: LynxKiteNodeProps) {
+function LynxKiteNodeComponent(props: LynxKiteNodeProps) {
   const reactFlow = useReactFlow();
   const data = props.data;
   const expanded = !data.collapsed;
@@ -72,7 +75,16 @@ export default function LynxKiteNode(props: LynxKiteNodeProps) {
         {expanded && (
           <>
             {data.error && <div className="error">{data.error}</div>}
-            {props.children}
+            <ErrorBoundary
+              fallback={
+                <p className="error" style={{ display: "flex", alignItems: "center", gap: 8 }}>
+                  <Skull style={{ fontSize: 20 }} />
+                  Failed to display this node.
+                </p>
+              }
+            >
+              {props.children}
+            </ErrorBoundary>
             <NodeResizeControl
               minWidth={100}
               minHeight={50}
@@ -101,3 +113,13 @@ export default function LynxKiteNode(props: LynxKiteNodeProps) {
     </div>
   );
 }
+
+export default function LynxKiteNode(Component: React.ComponentType<any>) {
+  return (props: any) => {
+    return (
+      <LynxKiteNodeComponent {...props}>
+        <Component {...props} />
+      </LynxKiteNodeComponent>
+    );
+  };
+}

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

@@ -1,4 +1,5 @@
-import NodeWithParams from "./NodeWithParams";
+import LynxKiteNode from "./LynxKiteNode";
+import { NodeWithParams } from "./NodeWithParams";
 
 const NodeWithImage = (props: any) => {
   return (
@@ -8,4 +9,4 @@ const NodeWithImage = (props: any) => {
   );
 };
 
-export default NodeWithImage;
+export default LynxKiteNode(NodeWithImage);

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

@@ -1,5 +1,6 @@
 import React, { useEffect, type CSSProperties } from "react";
-import NodeWithParams from "./NodeWithParams";
+import LynxKiteNode from "./LynxKiteNode";
+import { NodeWithParams } from "./NodeWithParams";
 
 const NodeWithMolecule = (props: any) => {
   const containerRef = React.useRef<HTMLDivElement>(null);
@@ -70,4 +71,4 @@ const NodeWithMolecule = (props: any) => {
   );
 };
 
-export default NodeWithMolecule;
+export default LynxKiteNode(NodeWithMolecule);

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

@@ -8,7 +8,7 @@ import NodeParameter from "./NodeParameter";
 
 export type UpdateOptions = { delay?: number };
 
-function NodeWithParams(props: any) {
+export function NodeWithParams(props: any) {
   const reactFlow = useReactFlow();
   const metaParams = props.data.meta?.params;
   const [collapsed, setCollapsed] = React.useState(props.collapsed);
@@ -34,7 +34,7 @@ function NodeWithParams(props: any) {
   const params = props.data?.params ? Object.entries(props.data.params) : [];
 
   return (
-    <LynxKiteNode {...props}>
+    <>
       {props.collapsed && params.length > 0 && (
         <div className="params-expander" onClick={() => setCollapsed(!collapsed)}>
           <Triangle className={`flippy ${collapsed ? "flippy-90" : ""}`} />
@@ -65,8 +65,8 @@ function NodeWithParams(props: any) {
           ),
         )}
       {props.children}
-    </LynxKiteNode>
+    </>
   );
 }
 
-export default NodeWithParams;
+export default LynxKiteNode(NodeWithParams);

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

@@ -17,7 +17,7 @@ function toMD(v: any): string {
 
 type OpenState = { [name: string]: boolean };
 
-export default function NodeWithTableView(props: any) {
+function NodeWithTableView(props: any) {
   const reactFlow = useReactFlow();
   const [open, setOpen] = useState((props.data?.params?._tables_open ?? {}) as OpenState);
   const display = props.data.display?.value;
@@ -38,7 +38,7 @@ export default function NodeWithTableView(props: any) {
     });
   }
   return (
-    <LynxKiteNode {...props}>
+    <>
       {display && [
         dfs.map(([name, df]: [string, any]) => (
           <React.Fragment key={name}>
@@ -75,6 +75,8 @@ export default function NodeWithTableView(props: any) {
           </>
         )),
       ]}
-    </LynxKiteNode>
+    </>
   );
 }
+
+export default LynxKiteNode(NodeWithTableView);

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

@@ -1,8 +1,9 @@
 import React, { useEffect } from "react";
-import NodeWithParams from "./NodeWithParams";
+import LynxKiteNode from "./LynxKiteNode";
+import { NodeWithParams } from "./NodeWithParams";
 const echarts = await import("echarts");
 
-const NodeWithVisualization = (props: any) => {
+function NodeWithVisualization(props: any) {
   const chartsRef = React.useRef<HTMLDivElement>(null);
   const chartsInstanceRef = React.useRef<echarts.ECharts>();
   useEffect(() => {
@@ -38,6 +39,6 @@ const NodeWithVisualization = (props: any) => {
       <div style={vizStyle} ref={chartsRef} />
     </NodeWithParams>
   );
-};
+}
 
-export default NodeWithVisualization;
+export default LynxKiteNode(NodeWithVisualization);

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

@@ -366,7 +366,6 @@ def load_user_scripts(workspace: str):
     path = cwd / workspace
     assert path.is_relative_to(cwd), "Provided workspace path is invalid"
     for p in path.parents:
-        print("checking user scripts in", p)
         req = p / "requirements.txt"
         if req.exists():
             try:

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

@@ -111,7 +111,9 @@ def save(ws: Workspace, path: str):
     if dirname:
         os.makedirs(dirname, exist_ok=True)
     # Create temp file in the same directory to make sure it's on the same filesystem.
-    with tempfile.NamedTemporaryFile("w", prefix=f".{basename}.", dir=dirname, delete=False) as f:
+    with tempfile.NamedTemporaryFile(
+        "w", encoding="utf-8", prefix=f".{basename}.", dir=dirname, delete=False
+    ) as f:
         temp_name = f.name
         f.write(j)
     os.replace(temp_name, path)
@@ -128,7 +130,7 @@ def load(path: str) -> Workspace:
     Returns:
         Workspace: The loaded workspace object, with updated metadata.
     """
-    with open(path) as f:
+    with open(path, encoding="utf-8") as f:
         j = f.read()
     ws = Workspace.model_validate_json(j)
     # Metadata is added after loading. This way code changes take effect on old boxes too.

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

@@ -214,7 +214,7 @@ async def _execute_node(node, ws, catalog, outputs):
                 x = Bundle.from_df(x)
             inputs.append(x)
     except Exception as e:
-        if os.environ.get("LYNXKITE_LOG_OP_ERRORS"):
+        if not os.environ.get("LYNXKITE_SUPPRESS_OP_ERRORS"):
             traceback.print_exc()
         node.publish_error(e)
         return
@@ -223,7 +223,7 @@ async def _execute_node(node, ws, catalog, outputs):
         result = op(*inputs, **params)
         result.output = await await_if_needed(result.output)
     except Exception as e:
-        if os.environ.get("LYNXKITE_LOG_OP_ERRORS"):
+        if not os.environ.get("LYNXKITE_SUPPRESS_OP_ERRORS"):
             traceback.print_exc()
         result = ops.Result(error=str(e))
     result.input_metadata = [_get_metadata(i) for i in inputs]