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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.3",
+  "version": "0.8.4-main.f9ba587",
   "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.88.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.f9ba587",
+    "@dxos/app-framework": "0.8.4-main.f9ba587",
+    "@dxos/assistant": "0.8.4-main.f9ba587",
+    "@dxos/artifact": "0.8.4-main.f9ba587",
+    "@dxos/async": "0.8.4-main.f9ba587",
+    "@dxos/conductor": "0.8.4-main.f9ba587",
+    "@dxos/context": "0.8.4-main.f9ba587",
+    "@dxos/debug": "0.8.4-main.f9ba587",
+    "@dxos/edge-client": "0.8.4-main.f9ba587",
+    "@dxos/functions": "0.8.4-main.f9ba587",
+    "@dxos/echo-schema": "0.8.4-main.f9ba587",
+    "@dxos/graph": "0.8.4-main.f9ba587",
+    "@dxos/invariant": "0.8.4-main.f9ba587",
+    "@dxos/keys": "0.8.4-main.f9ba587",
+    "@dxos/log": "0.8.4-main.f9ba587",
+    "@dxos/live-object": "0.8.4-main.f9ba587",
+    "@dxos/react-client": "0.8.4-main.f9ba587",
+    "@dxos/react-edge-client": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-canvas": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-editor": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-sfx": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
+    "@dxos/schema": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
+    "@dxos/util": "0.8.4-main.f9ba587"
   },
   "devDependencies": {
-    "@effect/ai": "0.8.0",
-    "@effect/platform": "^0.72.1",
+    "@effect/ai": "0.22.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.16.13",
     "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.f9ba587",
+    "@dxos/artifact-testing": "0.8.4-main.f9ba587",
+    "@dxos/compute": "0.8.4-main.f9ba587",
+    "@dxos/echo-signals": "0.8.4-main.f9ba587",
+    "@dxos/random": "0.8.4-main.f9ba587",
+    "@dxos/react-ui": "0.8.4-main.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
+    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
   },
   "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.f9ba587",
+    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -4,11 +4,11 @@
 
 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 { createTestAiServiceClient } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities, localServiceEndpoints } from '@dxos/artifact-testing';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
@@ -182,9 +182,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 }),
   ],
@@ -334,7 +334,7 @@ export const ImageGen: Story = {
     ...createComputeGraphController(
       createGptCircuit({ image: true, artifact: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -350,7 +350,7 @@ export const Audio: Story = {
     ...createComputeGraphController(
       createAudioCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -365,7 +365,7 @@ export const Voice: Story = {
     ...createComputeGraphController(
       createGPTRealtimeCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },

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/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/Table.tsx

@@ -5,14 +5,15 @@
 import { Schema } from 'effect';
 import React from 'react';
 
-import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
+import { Message } from '@dxos/ai';
+import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 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(Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message)));
 
 export const TableShape = Schema.extend(
   ComputeShape,

package/src/shapes/Thread.tsx

@@ -5,7 +5,8 @@
 import { Schema } from 'effect';
 import React, { useEffect, useRef } from 'react';
 
-import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
+import { Message } from '@dxos/ai';
+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';
@@ -13,8 +14,8 @@ import { mx } from '@dxos/react-ui-theme';
 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(Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(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,
   });