@dxos/react-ui-canvas-compute 0.8.4-main.3f58842 → 0.8.4-main.5acf9ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.4-main.3f58842",
+  "version": "0.8.4-main.5acf9ea",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -11,7 +11,8 @@
     ".": {
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "source": "./src/index.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -28,34 +29,34 @@
     "@effect/platform": "0.89.0",
     "@preact-signals/safe-react": "^0.9.0",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.3f58842",
-    "@dxos/assistant": "0.8.4-main.3f58842",
-    "@dxos/app-framework": "0.8.4-main.3f58842",
-    "@dxos/blueprints": "0.8.4-main.3f58842",
-    "@dxos/conductor": "0.8.4-main.3f58842",
-    "@dxos/async": "0.8.4-main.3f58842",
-    "@dxos/debug": "0.8.4-main.3f58842",
-    "@dxos/echo-schema": "0.8.4-main.3f58842",
-    "@dxos/context": "0.8.4-main.3f58842",
-    "@dxos/functions": "0.8.4-main.3f58842",
-    "@dxos/edge-client": "0.8.4-main.3f58842",
-    "@dxos/graph": "0.8.4-main.3f58842",
-    "@dxos/keys": "0.8.4-main.3f58842",
-    "@dxos/invariant": "0.8.4-main.3f58842",
-    "@dxos/live-object": "0.8.4-main.3f58842",
-    "@dxos/log": "0.8.4-main.3f58842",
-    "@dxos/react-client": "0.8.4-main.3f58842",
-    "@dxos/react-ui-attention": "0.8.4-main.3f58842",
-    "@dxos/react-edge-client": "0.8.4-main.3f58842",
-    "@dxos/react-ui-canvas": "0.8.4-main.3f58842",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.3f58842",
-    "@dxos/react-ui-editor": "0.8.4-main.3f58842",
-    "@dxos/react-ui-form": "0.8.4-main.3f58842",
-    "@dxos/react-ui-sfx": "0.8.4-main.3f58842",
-    "@dxos/react-ui-stack": "0.8.4-main.3f58842",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3f58842",
-    "@dxos/util": "0.8.4-main.3f58842",
-    "@dxos/schema": "0.8.4-main.3f58842"
+    "@dxos/ai": "0.8.4-main.5acf9ea",
+    "@dxos/app-framework": "0.8.4-main.5acf9ea",
+    "@dxos/assistant": "0.8.4-main.5acf9ea",
+    "@dxos/async": "0.8.4-main.5acf9ea",
+    "@dxos/blueprints": "0.8.4-main.5acf9ea",
+    "@dxos/conductor": "0.8.4-main.5acf9ea",
+    "@dxos/context": "0.8.4-main.5acf9ea",
+    "@dxos/debug": "0.8.4-main.5acf9ea",
+    "@dxos/functions": "0.8.4-main.5acf9ea",
+    "@dxos/echo-schema": "0.8.4-main.5acf9ea",
+    "@dxos/edge-client": "0.8.4-main.5acf9ea",
+    "@dxos/invariant": "0.8.4-main.5acf9ea",
+    "@dxos/graph": "0.8.4-main.5acf9ea",
+    "@dxos/keys": "0.8.4-main.5acf9ea",
+    "@dxos/live-object": "0.8.4-main.5acf9ea",
+    "@dxos/log": "0.8.4-main.5acf9ea",
+    "@dxos/react-client": "0.8.4-main.5acf9ea",
+    "@dxos/react-edge-client": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-attention": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-canvas": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-form": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-sfx": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-stack": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-editor": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5acf9ea",
+    "@dxos/schema": "0.8.4-main.5acf9ea",
+    "@dxos/util": "0.8.4-main.5acf9ea"
   },
   "devDependencies": {
     "@effect/ai": "0.23.0",
@@ -67,21 +68,21 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/app-framework": "0.8.4-main.3f58842",
-    "@dxos/assistant-testing": "0.8.4-main.3f58842",
-    "@dxos/compute": "0.8.4-main.3f58842",
-    "@dxos/echo-signals": "0.8.4-main.3f58842",
-    "@dxos/react-ui": "0.8.4-main.3f58842",
-    "@dxos/random": "0.8.4-main.3f58842",
-    "@dxos/react-ui-theme": "0.8.4-main.3f58842",
-    "@dxos/storybook-utils": "0.8.4-main.3f58842"
+    "@dxos/app-framework": "0.8.4-main.5acf9ea",
+    "@dxos/compute": "0.8.4-main.5acf9ea",
+    "@dxos/assistant-testing": "0.8.4-main.5acf9ea",
+    "@dxos/random": "0.8.4-main.5acf9ea",
+    "@dxos/echo-signals": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea",
+    "@dxos/storybook-utils": "0.8.4-main.5acf9ea"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.3f58842",
-    "@dxos/react-ui-theme": "0.8.4-main.3f58842"
+    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui": "0.8.4-main.5acf9ea"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -7,10 +7,8 @@ import '@dxos-theme';
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 
-import { EdgeAiServiceClient, AiService } from '@dxos/ai';
-import { createTestAiServiceClient } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities, localServiceEndpoints } from '@dxos/assistant-testing';
+import { capabilities } from '@dxos/assistant-testing';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
 import { ServiceContainer } from '@dxos/functions';
 import { withClientProvider } from '@dxos/react-client/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);
@@ -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(createTestAiServiceClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -350,7 +338,7 @@ export const Audio: Story = {
     ...createComputeGraphController(
       createAudioCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestAiServiceClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -365,7 +353,7 @@ export const Voice: Story = {
     ...createComputeGraphController(
       createGPTRealtimeCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestAiServiceClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },

package/src/graph/controller.ts

@@ -8,11 +8,9 @@ import { type ImageContentBlock } from '@dxos/ai';
 import { Event, synchronized } from '@dxos/async';
 import {
   type ComputeEdge,
-  type ComputeEvent,
   type ComputeGraphModel,
   type ComputeMeta,
   type ComputeNode,
-  type EventLogger,
   type GptInput,
   type GptOutput,
   type GraphDiagnostic,
@@ -21,6 +19,7 @@ import {
   isNotExecuted,
 } from '@dxos/conductor';
 import { Resource } from '@dxos/context';
+import { type ComputeEventPayload, type ComputeEventLogger } from '@dxos/functions';
 import { type ServiceContainer } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type CanvasGraphModel } from '@dxos/react-ui-canvas-editor';
@@ -110,7 +109,7 @@ export class ComputeGraphController extends Resource {
   /** Computed result. */
   public readonly output = new Event<ComputeOutputEvent>();
 
-  public readonly events = new Event<ComputeEvent>();
+  public readonly events = new Event<ComputeEventPayload>();
 
   constructor(
     private readonly _serviceContainer: ServiceContainer,
@@ -322,7 +321,7 @@ export class ComputeGraphController extends Resource {
     this.update.emit();
   }
 
-  private _createLogger(): Context.Tag.Service<EventLogger> {
+  private _createLogger(): Context.Tag.Service<ComputeEventLogger> {
     return {
       log: (event) => {
         this._handleEvent(event);
@@ -331,7 +330,7 @@ export class ComputeGraphController extends Resource {
     };
   }
 
-  private _handleEvent(event: ComputeEvent): void {
+  private _handleEvent(event: ComputeEventPayload): void {
     log('handleEvent', { event });
     switch (event.type) {
       case 'compute-input': {

package/src/hooks/useComputeNodeState.ts

@@ -5,7 +5,8 @@
 import { Schema } from 'effect';
 import { useCallback, useEffect, useState } from 'react';
 
-import type { ComputeNode, ComputeMeta, ComputeEvent } from '@dxos/conductor';
+import type { ComputeNode, ComputeMeta } from '@dxos/conductor';
+import type { ComputeEventPayload } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 
 import { useComputeContext } from './compute-context';
@@ -20,7 +21,7 @@ export type ComputeNodeState = {
     outputs: Record<string, RuntimeValue>;
     setOutput: (property: string, value: any) => void;
     evalNode: () => void;
-    subscribeToEventLog: (cb: (event: ComputeEvent) => void) => void;
+    subscribeToEventLog: (cb: (event: ComputeEventPayload) => void) => void;
   };
 };
 
@@ -54,7 +55,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
   }, [shape.node]);
 
   const subscribeToEventLog = useCallback(
-    (cb: (event: ComputeEvent) => void) => {
+    (cb: (event: ComputeEventPayload) => void) => {
       return controller.events.on((ev) => {
         if (ev.nodeId === shape.node) {
           cb(ev);