@dxos/react-ui-canvas-compute 0.8.3 → 0.8.4-main.2e9d522

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.3",
+  "version": "0.8.4-main.2e9d522",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -15,6 +15,9 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
+  "typesVersions": {
+    "*": {}
+  },
   "files": [
     "dist",
     "src"
@@ -22,64 +25,63 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "0.89.0",
     "@preact-signals/safe-react": "^0.9.0",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.3",
-    "@dxos/artifact": "0.8.3",
-    "@dxos/assistant": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/conductor": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/graph": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-edge-client": "0.8.3",
-    "@dxos/react-ui-canvas": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/react-ui-canvas-editor": "0.8.3",
-    "@dxos/react-ui-editor": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/react-ui-sfx": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/ai": "0.8.4-main.2e9d522",
+    "@dxos/app-framework": "0.8.4-main.2e9d522",
+    "@dxos/assistant": "0.8.4-main.2e9d522",
+    "@dxos/async": "0.8.4-main.2e9d522",
+    "@dxos/blueprints": "0.8.4-main.2e9d522",
+    "@dxos/conductor": "0.8.4-main.2e9d522",
+    "@dxos/context": "0.8.4-main.2e9d522",
+    "@dxos/debug": "0.8.4-main.2e9d522",
+    "@dxos/echo-schema": "0.8.4-main.2e9d522",
+    "@dxos/edge-client": "0.8.4-main.2e9d522",
+    "@dxos/functions": "0.8.4-main.2e9d522",
+    "@dxos/graph": "0.8.4-main.2e9d522",
+    "@dxos/invariant": "0.8.4-main.2e9d522",
+    "@dxos/keys": "0.8.4-main.2e9d522",
+    "@dxos/live-object": "0.8.4-main.2e9d522",
+    "@dxos/log": "0.8.4-main.2e9d522",
+    "@dxos/react-client": "0.8.4-main.2e9d522",
+    "@dxos/react-edge-client": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-attention": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-canvas": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-editor": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-form": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-sfx": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-stack": "0.8.4-main.2e9d522",
+    "@dxos/schema": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2e9d522",
+    "@dxos/util": "0.8.4-main.2e9d522"
   },
   "devDependencies": {
-    "@effect/ai": "0.8.0",
-    "@effect/platform": "^0.72.1",
+    "@effect/ai": "0.23.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.0",
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/artifact-testing": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/echo-signals": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/app-framework": "0.8.4-main.2e9d522",
+    "@dxos/assistant-testing": "0.8.4-main.2e9d522",
+    "@dxos/compute": "0.8.4-main.2e9d522",
+    "@dxos/echo-signals": "0.8.4-main.2e9d522",
+    "@dxos/random": "0.8.4-main.2e9d522",
+    "@dxos/react-ui": "0.8.4-main.2e9d522",
+    "@dxos/storybook-utils": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
   },
   "peerDependencies": {
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.2e9d522",
+    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -4,15 +4,13 @@
 
 import '@dxos-theme';
 
-import type { Meta, StoryObj } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react-vite';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 
-import { EdgeAiServiceClient } from '@dxos/ai';
-import { createTestOllamaClient } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities, localServiceEndpoints } from '@dxos/artifact-testing';
+import { capabilities } from '@dxos/assistant-testing';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
-import { AiService, ServiceContainer } from '@dxos/functions';
+import { ServiceContainer } from '@dxos/functions';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Select, Toolbar } from '@dxos/react-ui';
 import { withAttention } from '@dxos/react-ui-attention/testing';
@@ -34,16 +32,16 @@ import { ComputeContext, useComputeGraphController, useGraphMonitor } from './ho
 import { computeShapes } from './registry';
 import { type ComputeShape } from './shapes';
 import {
+  createArtifactCircuit,
+  createAudioCircuit,
+  createBasicCircuit,
+  createComputeGraphController,
   createControlCircuit,
+  createGptCircuit,
   createGPTRealtimeCircuit,
   createLogicCircuit,
-  createComputeGraphController,
-  createBasicCircuit,
-  createGptCircuit,
-  createAudioCircuit,
-  createTransformCircuit,
   createTemplateCircuit,
-  createArtifactCircuit,
+  createTransformCircuit,
 } from './testing';
 
 // const FormSchema = Schema.omit<any, any, ['subgraph']>('subgraph')(ComputeNode);
@@ -182,9 +180,9 @@ const meta: Meta<RenderProps> = {
   component: Editor.Root,
   render: DefaultStory,
   decorators: [
-    withClientProvider({ createIdentity: true, createSpace: true }),
     withTheme,
     withAttention,
+    withClientProvider({ createIdentity: true, createSpace: true }),
     withLayout({ fullscreen: true }),
     withPluginManager({ capabilities }),
   ],
@@ -249,16 +247,6 @@ export const Control: Story = {
   },
 };
 
-// export const Ollama: Story = {
-//   args: {
-//     // debug: true,
-//     showGrid: false,
-//     snapToGrid: false,
-//     registry: new ShapeRegistry(computeShapes),
-//     ...createComputeGraphController(createTest3(), createEdgeServices()),
-//   },
-// };
-
 export const Template: Story = {
   args: {
     showGrid: false,
@@ -268,7 +256,7 @@ export const Template: Story = {
     ...createComputeGraphController(
       createTemplateCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -285,7 +273,7 @@ export const GPT: Story = {
     ...createComputeGraphController(
       createGptCircuit({ history: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -301,7 +289,7 @@ export const Plugins: Story = {
     ...createComputeGraphController(
       createGptCircuit({ history: true, image: true, artifact: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -317,7 +305,7 @@ export const Artifact: Story = {
     ...createComputeGraphController(
       createArtifactCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -334,7 +322,7 @@ export const ImageGen: Story = {
     ...createComputeGraphController(
       createGptCircuit({ image: true, artifact: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -350,7 +338,7 @@ export const Audio: Story = {
     ...createComputeGraphController(
       createAudioCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -365,7 +353,7 @@ export const Voice: Story = {
     ...createComputeGraphController(
       createGPTRealtimeCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },

package/src/graph/controller.ts

@@ -17,11 +17,11 @@ import {
   type GptOutput,
   type GraphDiagnostic,
   GraphExecutor,
-  isNotExecuted,
   ValueBag,
+  isNotExecuted,
 } from '@dxos/conductor';
 import { Resource } from '@dxos/context';
-import type { ServiceContainer } from '@dxos/functions';
+import { type ServiceContainer } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type CanvasGraphModel } from '@dxos/react-ui-canvas-editor';
 

package/src/graph/node-defs.ts

@@ -49,6 +49,7 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
     createNode('constant', {
       value: (shape as ConstantShape).value,
     }),
+  ['make-queue' as const]: () => createNode('make-queue'),
   ['database' as const]: () => createNode('database'),
   ['gpt' as const]: () => createNode('gpt'),
   ['gpt-realtime' as const]: () => createNode('gpt-realtime'),

package/src/shapes/Beacon.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 import { DEFAULT_INPUT, isTruthy } from '@dxos/conductor';
 import { Icon } from '@dxos/react-ui';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
 
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
@@ -36,7 +35,7 @@ export const BeaconComponent = ({ shape }: ShapeComponentProps<BeaconShape>) =>
     <div className='flex w-full justify-center items-center'>
       <Icon
         icon='ph--sun--regular'
-        classNames={mx('transition opacity-20 duration-1000', isTruthy(value) && 'opacity-100 text-yellow-500')}
+        classNames={['transition opacity-20 duration-1000', isTruthy(value) && 'opacity-100 text-yellow-500']}
         size={8}
       />
     </div>

package/src/shapes/Function.tsx

@@ -9,7 +9,7 @@ import { AnyOutput, FunctionInput } from '@dxos/conductor';
 import { getSnapshot, isInstanceOf, Ref } from '@dxos/echo-schema';
 import { FunctionType, ScriptType } from '@dxos/functions';
 import { useClient } from '@dxos/react-client';
-import { Filter, makeRef, parseId } from '@dxos/react-client/echo';
+import { Filter, parseId } from '@dxos/react-client/echo';
 import {
   TextBox,
   type TextBoxControl,
@@ -69,7 +69,7 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
       }
 
       node.value = value;
-      node.function = makeRef(fn);
+      node.function = Ref.make(fn);
       node.inputSchema = getSnapshot(fn.inputSchema);
       node.outputSchema = getSnapshot(fn.outputSchema);
     },

package/src/shapes/RNG.tsx

@@ -8,7 +8,6 @@ import React, { useEffect, useState } from 'react';
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
 import { Icon, type IconProps } from '@dxos/react-ui';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
 
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
@@ -69,7 +68,7 @@ export const RandomComponent = ({ shape }: ShapeComponentProps<RandomShape>) =>
 
   return (
     <div className='flex grow items-center justify-center'>
-      <Icon icon={icon} classNames={mx(spin && 'animate-[spin_1s]')} size={10} onClick={handleClick} />
+      <Icon icon={icon} classNames={spin && 'animate-[spin_1s]'} size={10} onClick={handleClick} />
     </div>
   );
 };

package/src/shapes/Surface.tsx

@@ -41,7 +41,7 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
 
   return (
     <Box shape={shape} onAction={handleAction}>
-      {value !== null && <Surface role='canvas-node' data={{ value }} limit={1} />}
+      {value !== null && <Surface role='card--extrinsic' data={{ value }} limit={1} />}
     </Box>
   );
 };

package/src/shapes/Table.tsx

@@ -5,14 +5,15 @@
 import { Schema } from 'effect';
 import React from 'react';
 
-import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
+import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
+import { DataType } from '@dxos/schema';
 
 import { createFunctionAnchors, Box } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
-const InputSchema = createInputSchema(GptMessage);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(GptMessage)));
+const InputSchema = createInputSchema(DataType.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
 
 export const TableShape = Schema.extend(
   ComputeShape,

package/src/shapes/Thread.tsx

@@ -5,16 +5,17 @@
 import { Schema } from 'effect';
 import React, { useEffect, useRef } from 'react';
 
-import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
+import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/react-ui-theme';
+import { DataType } from '@dxos/schema';
 
 import { createFunctionAnchors, Box } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
-const InputSchema = createInputSchema(GptMessage);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(GptMessage)));
+const InputSchema = createInputSchema(DataType.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,

package/src/shapes/Trigger.tsx

@@ -9,21 +9,21 @@ import { VoidInput } from '@dxos/conductor';
 import { ObjectId, Ref } from '@dxos/echo-schema';
 import {
   type EmailTrigger,
+  EmailTriggerOutput,
   FunctionTrigger,
   type QueueTrigger,
+  QueueTriggerOutput,
   type SubscriptionTrigger,
   type TimerTrigger,
   TriggerKind,
   type TriggerType,
-  type WebhookTrigger,
-  EmailTriggerOutput,
-  QueueTriggerOutput,
   SubscriptionTriggerOutput,
   TimerTriggerOutput,
+  type WebhookTrigger,
   WebhookTriggerOutput,
 } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
-import { live, makeRef, useSpace } from '@dxos/react-client/echo';
+import { live, useSpace } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
@@ -51,7 +51,7 @@ export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
   });
   return createShape<TriggerShape>({
     type: 'trigger',
-    functionTrigger: makeRef(functionTrigger),
+    functionTrigger: Ref.make(functionTrigger),
     size: { width: 192, height: getHeight(EmailTriggerOutput) },
     ...props,
   });

package/src/shapes/common/Box.tsx

@@ -35,7 +35,7 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
       <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
         <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-hoverSurface'>
           <Icon icon={icon} classNames='mx-2' />
-          <div className='grow text-sm truncate'>{debug ? shape.type : name ?? shape.text ?? title}</div>
+          <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
             classNames='p-1 text-green-500'
             variant='ghost'

package/src/testing/circuits.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { createSystemPrompt } from '@dxos/artifact';
+import { createSystemPrompt } from '@dxos/assistant';
 import { ObjectId } from '@dxos/echo-schema';
-import type { ServiceContainer } from '@dxos/functions';
+import { type ServiceContainer } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
 import { type Dimension, type Point } from '@dxos/react-ui-canvas';
 import { CanvasGraphModel, createNote, pointMultiply, pointsToRect, rectToPoints } from '@dxos/react-ui-canvas-editor';
@@ -207,7 +207,7 @@ export const createArtifactCircuit = () => {
   model.builder.call((builder) => {
     const prompt = model.createNode(
       createTemplate({
-        text: createSystemPrompt(),
+        text: createSystemPrompt({}),
         ...position({ x: -10, y: -5, width: 8, height: 18 }),
       }),
     );
@@ -262,7 +262,7 @@ export const createGptCircuit = (options: {
     if (options.instructions) {
       const prompt = model.createNode(
         createTemplate({
-          text: createSystemPrompt(),
+          text: createSystemPrompt({}),
           ...position({ x: -18, y: -12, width: 8, height: 10 }),
         }),
       );