move to perspective react, resolve remaining issues

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

csp_gateway/server/demo/omnibus.py

@@ -16,7 +16,6 @@
 import numpy as np
 from csp import Enum, ts
 from csp.typing import Numpy1DArray
-from perspective import Server as PerspectiveServer, Table as PerspectiveTable
 from pydantic import AfterValidator, Field, field_validator
 
 from csp_gateway import (
@@ -37,6 +36,7 @@
     State,
 )
 from csp_gateway.server.config import load_gateway
+from perspective import Server as PerspectiveServer, Table as PerspectiveTable
 
 SPEED = timedelta(seconds=1)
 SCALE = 10

csp_gateway/server/modules/web/perspective.py

@@ -20,7 +20,6 @@
 import uvloop
 from csp import ts
 from fastapi import APIRouter, WebSocket
-from perspective import Client, Server, Table
 from perspective.handlers.starlette import PerspectiveStarletteHandler
 from pydantic import Field, PrivateAttr, field_validator
 from starlette.websockets import WebSocketDisconnect
@@ -29,6 +28,7 @@
 from csp_gateway.server import ChannelSelection, GatewayChannels, GatewayModule
 from csp_gateway.server.web import GatewayWebApp, get_default_responses
 from csp_gateway.utils import PickleableQueue, get_args, get_origin, get_thread
+from perspective import Client, Server, Table
 
 __all__ = (
     "psp_schema_to_arrow_schema",

csp_gateway/tests/server/modules/web/test_perspective.py

@@ -8,7 +8,6 @@
 import pytest
 from csp import Enum, ts
 from csp.typing import Numpy1DArray
-from perspective import Server
 from pydantic import Field
 
 from csp_gateway import (
@@ -22,6 +21,7 @@
 )
 from csp_gateway.testing.harness import GatewayTestHarness
 from csp_gateway.utils.struct import GatewayStructMixins
+from perspective import Server
 
 
 class MyTestEnum(Enum):

js/build.mjs

@@ -4,6 +4,18 @@ import { BuildCss } from "@prospective.co/procss/target/cjs/procss.js";
 import cpy from "cpy";
 import fs from "fs";
 import { createRequire } from "node:module";
+import path from "node:path";
+
+const require = createRequire(import.meta.url);
+
+// Force all react imports to resolve to the same copy to avoid
+// duplicate-React errors when dependencies (e.g. @perspective-dev/react)
+// list a different React version.
+const REACT_ALIAS = {
+  react: path.dirname(require.resolve("react/package.json")),
+  "react-dom": path.dirname(require.resolve("react-dom/package.json")),
+  "react/jsx-runtime": require.resolve("react/jsx-runtime"),
+};
 
 const BUILD = [
   {
@@ -31,6 +43,7 @@ const BUILD = [
     bundle: true,
     plugins: [],
     format: "esm",
+    alias: REACT_ALIAS,
     loader: {
       ".css": "text",
       ".html": "text",
@@ -44,7 +57,6 @@ const BUILD = [
   },
 ];
 
-const require = createRequire(import.meta.url);
 function add(builder, path, path2) {
   builder.add(path, fs.readFileSync(require.resolve(path2 || path)).toString());
 }

js/package.json

@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@perspective-dev/client": "~4.2.0",
+    "@perspective-dev/react": "~4.2.0",
     "@perspective-dev/server": "~4.2.0",
     "@perspective-dev/viewer": "~4.2.0",
     "@perspective-dev/viewer-d3fc": "~4.2.0",