Merge pull request #177 from biggraph/darabos-workspace-error-handling

lynxkite-app/src/lynxkite_app/crdt.py

@@ -34,7 +34,7 @@ class WorkspaceWebsocketServer(pycrdt_websocket.WebsocketServer):
         """
         crdt_path = pathlib.Path(".crdt")
         path = crdt_path / f"{name}.crdt"
-        assert path.is_relative_to(crdt_path)
+        assert path.is_relative_to(crdt_path), f"Path '{path}' is invalid"
         ystore = pycrdt_websocket.ystore.FileYStore(path)
         ydoc = pycrdt.Doc()
         ydoc["workspace"] = ws = pycrdt.Map()
@@ -87,7 +87,7 @@ class CodeWebsocketServer(WorkspaceWebsocketServer):
         """Initialize a room for a text document with the given name."""
         crdt_path = pathlib.Path(".crdt")
         path = crdt_path / f"{name}.crdt"
-        assert path.is_relative_to(crdt_path)
+        assert path.is_relative_to(crdt_path), f"Path '{path}' is invalid"
         ystore = pycrdt_websocket.ystore.FileYStore(path)
         ydoc = pycrdt.Doc()
         ydoc["text"] = text = pycrdt.Text()
@@ -261,7 +261,7 @@ async def execute(name: str, ws_crdt: pycrdt.Map, ws_pyd: workspace.Workspace, d
     print(f"Running {name} in {ws_pyd.env}...")
     cwd = pathlib.Path()
     path = cwd / name
-    assert path.is_relative_to(cwd), "Provided workspace path is invalid"
+    assert path.is_relative_to(cwd), f"Path '{path}' is invalid"
     # Save user changes before executing, in case the execution fails.
     ws_pyd.save(path)
     ops.load_user_scripts(name)

lynxkite-app/src/lynxkite_app/main.py

@@ -49,7 +49,7 @@ data_path = pathlib.Path()
 
 def save(req: SaveRequest):
     path = data_path / req.path
-    assert path.is_relative_to(data_path)
+    assert path.is_relative_to(data_path), f"Path '{path}' is invalid"
     req.ws.save(path)
 
 
@@ -66,7 +66,7 @@ async def save_and_execute(req: SaveRequest):
 async def delete_workspace(req: dict):
     json_path: pathlib.Path = data_path / req["path"]
     crdt_path: pathlib.Path = data_path / ".crdt" / f"{req['path']}.crdt"
-    assert json_path.is_relative_to(data_path)
+    assert json_path.is_relative_to(data_path), f"Path '{json_path}' is invalid"
     json_path.unlink()
     crdt_path.unlink()
 
@@ -74,7 +74,7 @@ async def delete_workspace(req: dict):
 @app.get("/api/load")
 def load(path: str):
     path = data_path / path
-    assert path.is_relative_to(data_path)
+    assert path.is_relative_to(data_path), f"Path '{path}' is invalid"
     if not path.exists():
         return workspace.Workspace()
     return workspace.Workspace.load(path)
@@ -97,7 +97,7 @@ def _get_path_type(path: pathlib.Path) -> str:
 @app.get("/api/dir/list")
 def list_dir(path: str):
     path = data_path / path
-    assert path.is_relative_to(data_path)
+    assert path.is_relative_to(data_path), f"Path '{path}' is invalid"
     return sorted(
         [
             DirectoryEntry(
@@ -114,7 +114,7 @@ def list_dir(path: str):
 @app.post("/api/dir/mkdir")
 def make_dir(req: dict):
     path = data_path / req["path"]
-    assert path.is_relative_to(data_path)
+    assert path.is_relative_to(data_path), f"Path '{path}' is invalid"
     assert not path.exists(), f"{path} already exists"
     path.mkdir()
 
@@ -122,7 +122,9 @@ def make_dir(req: dict):
 @app.post("/api/dir/delete")
 def delete_dir(req: dict):
     path: pathlib.Path = data_path / req["path"]
-    assert all([path.is_relative_to(data_path), path.exists(), path.is_dir()])
+    assert all([path.is_relative_to(data_path), path.exists(), path.is_dir()]), (
+        f"Path '{path}' is invalid"
+    )
     shutil.rmtree(path)
 
 
@@ -146,7 +148,7 @@ async def upload(req: fastapi.Request):
     form = await req.form()
     for file in form.values():
         file_path = data_path / "uploads" / file.filename
-        assert file_path.is_relative_to(data_path), "Invalid file path"
+        assert file_path.is_relative_to(data_path), f"Path '{file_path}' is invalid"
         with file_path.open("wb") as buffer:
             shutil.copyfileobj(file.file, buffer)
     return {"status": "ok"}

lynxkite-app/web/src/main.tsx

@@ -2,21 +2,52 @@ import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import "@xyflow/react/dist/style.css";
 import "./index.css";
-import { BrowserRouter, Route, Routes } from "react-router";
+import {
+  Link,
+  Route,
+  RouterProvider,
+  createBrowserRouter,
+  createRoutesFromElements,
+  useRouteError,
+} from "react-router";
 import Code from "./Code.tsx";
 import Directory from "./Directory.tsx";
 import Workspace from "./workspace/Workspace.tsx";
 
+function WorkspaceError() {
+  const error = useRouteError();
+  const stack = error instanceof Error ? error.stack : null;
+  return (
+    <div className="hero min-h-screen">
+      <div className="card bg-base-100 shadow-sm">
+        <div className="card-body">
+          <h2 className="card-title">Something went wrong...</h2>
+          <pre>{stack || "Unknown error."}</pre>
+          <div className="card-actions justify-end">
+            <Link to="/" className="btn btn-primary">
+              Close workspace
+            </Link>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const router = createBrowserRouter(
+  createRoutesFromElements(
+    <>
+      <Route path="/" element={<Directory />} />
+      <Route path="/dir" element={<Directory />} />
+      <Route path="/dir/*" element={<Directory />} />
+      <Route path="/edit/*" element={<Workspace />} errorElement={<WorkspaceError />} />
+      <Route path="/code/*" element={<Code />} />
+    </>,
+  ),
+);
+
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
-    <BrowserRouter>
-      <Routes>
-        <Route path="/" element={<Directory />} />
-        <Route path="/dir" element={<Directory />} />
-        <Route path="/dir/*" element={<Directory />} />
-        <Route path="/edit/*" element={<Workspace />} />
-        <Route path="/code/*" element={<Code />} />
-      </Routes>
-    </BrowserRouter>
+    <RouterProvider router={router} />
   </StrictMode>,
 );

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

@@ -404,7 +404,7 @@ def load_user_scripts(workspace: str):
         load_catalogs("plugins loaded")
     cwd = pathlib.Path()
     path = cwd / workspace
-    assert path.is_relative_to(cwd), "Provided workspace path is invalid"
+    assert path.is_relative_to(cwd), f"Path '{path}' is invalid"
     for p in path.parents:
         req = p / "requirements.txt"
         if req.exists():

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

@@ -20,7 +20,7 @@ op = ops.op_registration(core.ENV)
 def load_ws(model_workspace: str):
     cwd = pathlib.Path()
     path = cwd / model_workspace
-    assert path.is_relative_to(cwd)
+    assert path.is_relative_to(cwd), f"Path '{path}' is invalid"
     assert path.exists(), f"Workspace {path} does not exist"
     ws = workspace.Workspace.load(path)
     return ws

lynxkite-lynxscribe/src/lynxkite_lynxscribe/lynxscribe_ops.py

@@ -873,7 +873,7 @@ async def get_chat_api(ws: str):
 
     cwd = pathlib.Path()
     path = cwd / ws
-    assert path.is_relative_to(cwd)
+    assert path.is_relative_to(cwd), f"Path '{path}' is invalid"
     assert path.exists(), f"Workspace {path} does not exist"
     ws = workspace.Workspace.load(path)
     contexts = await ops.EXECUTORS[ENV](ws)