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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (119) hide show
  1. package/dist/lib/browser/index.mjs +938 -1074
  2. package/dist/lib/browser/index.mjs.map +4 -4
  3. package/dist/lib/browser/meta.json +1 -1
  4. package/dist/lib/node-esm/index.mjs +938 -1074
  5. package/dist/lib/node-esm/index.mjs.map +4 -4
  6. package/dist/lib/node-esm/meta.json +1 -1
  7. package/dist/types/src/compute.stories.d.ts +33 -5
  8. package/dist/types/src/compute.stories.d.ts.map +1 -1
  9. package/dist/types/src/graph/controller.d.ts +40 -27
  10. package/dist/types/src/graph/controller.d.ts.map +1 -1
  11. package/dist/types/src/graph/node-defs.d.ts.map +1 -1
  12. package/dist/types/src/hooks/useComputeGraphController.d.ts +2 -2
  13. package/dist/types/src/hooks/useComputeGraphController.d.ts.map +1 -1
  14. package/dist/types/src/hooks/useComputeNodeState.d.ts +4 -3
  15. package/dist/types/src/hooks/useComputeNodeState.d.ts.map +1 -1
  16. package/dist/types/src/hooks/useGraphMonitor.d.ts +2 -2
  17. package/dist/types/src/hooks/useGraphMonitor.d.ts.map +1 -1
  18. package/dist/types/src/json.test.d.ts +1 -1
  19. package/dist/types/src/json.test.d.ts.map +1 -1
  20. package/dist/types/src/shapes/Append.d.ts +1 -1
  21. package/dist/types/src/shapes/Append.d.ts.map +1 -1
  22. package/dist/types/src/shapes/Array.d.ts +1 -1
  23. package/dist/types/src/shapes/Array.d.ts.map +1 -1
  24. package/dist/types/src/shapes/Audio.d.ts +1 -1
  25. package/dist/types/src/shapes/Audio.d.ts.map +1 -1
  26. package/dist/types/src/shapes/Beacon.d.ts +1 -1
  27. package/dist/types/src/shapes/Beacon.d.ts.map +1 -1
  28. package/dist/types/src/shapes/Boolean.d.ts +1 -1
  29. package/dist/types/src/shapes/Boolean.d.ts.map +1 -1
  30. package/dist/types/src/shapes/Chat.d.ts +1 -1
  31. package/dist/types/src/shapes/Chat.d.ts.map +1 -1
  32. package/dist/types/src/shapes/Constant.d.ts +1 -1
  33. package/dist/types/src/shapes/Constant.d.ts.map +1 -1
  34. package/dist/types/src/shapes/Database.d.ts +1 -1
  35. package/dist/types/src/shapes/Database.d.ts.map +1 -1
  36. package/dist/types/src/shapes/Function.d.ts +1 -1
  37. package/dist/types/src/shapes/Function.d.ts.map +1 -1
  38. package/dist/types/src/shapes/Gpt.d.ts +1 -1
  39. package/dist/types/src/shapes/Gpt.d.ts.map +1 -1
  40. package/dist/types/src/shapes/GptRealtime.d.ts +1 -1
  41. package/dist/types/src/shapes/GptRealtime.d.ts.map +1 -1
  42. package/dist/types/src/shapes/Json.d.ts +1 -1
  43. package/dist/types/src/shapes/Json.d.ts.map +1 -1
  44. package/dist/types/src/shapes/Logic.d.ts +1 -1
  45. package/dist/types/src/shapes/Logic.d.ts.map +1 -1
  46. package/dist/types/src/shapes/Queue.d.ts +1 -1
  47. package/dist/types/src/shapes/Queue.d.ts.map +1 -1
  48. package/dist/types/src/shapes/RNG.d.ts +1 -1
  49. package/dist/types/src/shapes/RNG.d.ts.map +1 -1
  50. package/dist/types/src/shapes/Scope.d.ts +1 -1
  51. package/dist/types/src/shapes/Scope.d.ts.map +1 -1
  52. package/dist/types/src/shapes/Surface.d.ts +1 -1
  53. package/dist/types/src/shapes/Surface.d.ts.map +1 -1
  54. package/dist/types/src/shapes/Switch.d.ts +1 -1
  55. package/dist/types/src/shapes/Switch.d.ts.map +1 -1
  56. package/dist/types/src/shapes/Table.d.ts +1 -1
  57. package/dist/types/src/shapes/Table.d.ts.map +1 -1
  58. package/dist/types/src/shapes/Template.d.ts +1 -1
  59. package/dist/types/src/shapes/Template.d.ts.map +1 -1
  60. package/dist/types/src/shapes/Text.d.ts +1 -1
  61. package/dist/types/src/shapes/Text.d.ts.map +1 -1
  62. package/dist/types/src/shapes/TextToImage.d.ts +1 -1
  63. package/dist/types/src/shapes/TextToImage.d.ts.map +1 -1
  64. package/dist/types/src/shapes/Thread.d.ts +1 -1
  65. package/dist/types/src/shapes/Thread.d.ts.map +1 -1
  66. package/dist/types/src/shapes/Trigger.d.ts +6 -34
  67. package/dist/types/src/shapes/Trigger.d.ts.map +1 -1
  68. package/dist/types/src/shapes/common/Box.d.ts +4 -4
  69. package/dist/types/src/shapes/common/Box.d.ts.map +1 -1
  70. package/dist/types/src/shapes/common/FunctionBody.d.ts +3 -3
  71. package/dist/types/src/shapes/common/FunctionBody.d.ts.map +1 -1
  72. package/dist/types/src/shapes/defs.d.ts +2 -1
  73. package/dist/types/src/shapes/defs.d.ts.map +1 -1
  74. package/dist/types/src/testing/circuits.d.ts +18 -24
  75. package/dist/types/src/testing/circuits.d.ts.map +1 -1
  76. package/dist/types/tsconfig.tsbuildinfo +1 -1
  77. package/package.json +60 -52
  78. package/src/compute-layout.ts +1 -1
  79. package/src/compute.stories.tsx +84 -139
  80. package/src/graph/controller.ts +121 -80
  81. package/src/graph/node-defs.ts +7 -6
  82. package/src/hooks/useComputeGraphController.ts +2 -2
  83. package/src/hooks/useComputeNodeState.ts +10 -7
  84. package/src/hooks/useGraphMonitor.ts +11 -10
  85. package/src/json.test.ts +4 -4
  86. package/src/registry.ts +2 -2
  87. package/src/schema.test.ts +13 -13
  88. package/src/shapes/Append.tsx +3 -3
  89. package/src/shapes/Array.tsx +3 -3
  90. package/src/shapes/Audio.tsx +5 -4
  91. package/src/shapes/Beacon.tsx +6 -6
  92. package/src/shapes/Boolean.tsx +5 -5
  93. package/src/shapes/Chat.tsx +4 -3
  94. package/src/shapes/Constant.tsx +4 -3
  95. package/src/shapes/Database.tsx +2 -2
  96. package/src/shapes/Function.tsx +19 -16
  97. package/src/shapes/Gpt.tsx +13 -6
  98. package/src/shapes/GptRealtime.tsx +3 -3
  99. package/src/shapes/Json.tsx +4 -3
  100. package/src/shapes/Logic.tsx +3 -3
  101. package/src/shapes/Queue.tsx +18 -11
  102. package/src/shapes/RNG.tsx +10 -6
  103. package/src/shapes/Scope.tsx +6 -5
  104. package/src/shapes/Surface.tsx +11 -6
  105. package/src/shapes/Switch.tsx +5 -4
  106. package/src/shapes/Table.tsx +7 -6
  107. package/src/shapes/Template.tsx +6 -5
  108. package/src/shapes/Text.tsx +5 -4
  109. package/src/shapes/TextToImage.tsx +2 -2
  110. package/src/shapes/Thread.tsx +22 -15
  111. package/src/shapes/Trigger.tsx +51 -58
  112. package/src/shapes/common/Box.tsx +10 -11
  113. package/src/shapes/common/FunctionBody.tsx +7 -6
  114. package/src/shapes/common/TypeSelect.tsx +1 -1
  115. package/src/shapes/defs.ts +5 -4
  116. package/src/testing/circuits.ts +8 -17
  117. package/dist/lib/node/index.cjs +0 -2896
  118. package/dist/lib/node/index.cjs.map +0 -7
  119. package/dist/lib/node/meta.json +0 -1
@@ -2,33 +2,48 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { type Context, Effect, Either, Exit, Scope } from 'effect';
6
-
7
- import { type ImageContentBlock } from '@dxos/ai';
5
+ import type * as Context from 'effect/Context';
6
+ import * as Effect from 'effect/Effect';
7
+ import * as Either from 'effect/Either';
8
+ import * as Exit from 'effect/Exit';
9
+ import * as Layer from 'effect/Layer';
10
+ import type * as ManagedRuntime from 'effect/ManagedRuntime';
11
+ import * as Scope from 'effect/Scope';
12
+
13
+ import type { AiService } from '@dxos/ai';
8
14
  import { Event, synchronized } from '@dxos/async';
9
15
  import {
10
16
  type ComputeEdge,
11
- type ComputeEvent,
12
17
  type ComputeGraphModel,
13
- type ComputeMeta,
14
18
  type ComputeNode,
15
- type EventLogger,
19
+ type ComputeNodeMeta,
16
20
  type GptInput,
17
21
  type GptOutput,
18
22
  type GraphDiagnostic,
19
23
  GraphExecutor,
20
- isNotExecuted,
21
24
  ValueBag,
25
+ isNotExecuted,
22
26
  } from '@dxos/conductor';
23
27
  import { Resource } from '@dxos/context';
24
- import type { ServiceContainer } from '@dxos/functions';
28
+ import type { Database } from '@dxos/echo';
29
+ import { unwrapExit } from '@dxos/effect';
30
+ import {
31
+ ComputeEventLogger,
32
+ type ComputeEventPayload,
33
+ type CredentialsService,
34
+ type FunctionInvocationService,
35
+ type QueueService,
36
+ TracingService,
37
+ } from '@dxos/functions';
25
38
  import { log } from '@dxos/log';
26
39
  import { type CanvasGraphModel } from '@dxos/react-ui-canvas-editor';
40
+ import { type ContentBlock } from '@dxos/types';
27
41
 
28
- import { resolveComputeNode } from './node-defs';
29
42
  import { createComputeGraph } from '../hooks';
30
43
  import { type ComputeShape } from '../shapes';
31
44
 
45
+ import { resolveComputeNode } from './node-defs';
46
+
32
47
  // TODO(burdon): API package for conductor.
33
48
  export const InvalidStateError = Error;
34
49
 
@@ -43,7 +58,7 @@ export interface GptExecutor {
43
58
  invoke: FunctionCallback<GptInput, GptOutput>;
44
59
 
45
60
  // TODO(dmaretskyi): A hack to get image artifacts working. Rework into querying images from the ai-service store.
46
- imageCache: Map<string, ImageContentBlock>;
61
+ imageCache: Map<string, ContentBlock.Image>;
47
62
  }
48
63
 
49
64
  export type RuntimeValue =
@@ -68,6 +83,14 @@ type ComputeOutputEvent = {
68
83
  value: RuntimeValue;
69
84
  };
70
85
 
86
+ // TODO(dmaretskyi): Re-use function servies definition.
87
+ export type ComputeServices =
88
+ | AiService.AiService
89
+ | Database.Service
90
+ | QueueService
91
+ | CredentialsService
92
+ | FunctionInvocationService;
93
+
71
94
  /**
72
95
  * Nodes that will automatically trigger the execution of the graph on startup.
73
96
  */
@@ -75,10 +98,10 @@ const AUTO_TRIGGER_NODES = ['chat', 'switch', 'constant'];
75
98
 
76
99
  export const createComputeGraphController = (
77
100
  graph: CanvasGraphModel<ComputeShape>,
78
- serviceContainer: ServiceContainer,
101
+ computeRuntime: ManagedRuntime.ManagedRuntime<ComputeServices, never>,
79
102
  ) => {
80
103
  const computeGraph = createComputeGraph(graph);
81
- const controller = new ComputeGraphController(serviceContainer, computeGraph);
104
+ const controller = new ComputeGraphController(computeRuntime, computeGraph);
82
105
  return { controller, graph };
83
106
  };
84
107
 
@@ -110,10 +133,10 @@ export class ComputeGraphController extends Resource {
110
133
  /** Computed result. */
111
134
  public readonly output = new Event<ComputeOutputEvent>();
112
135
 
113
- public readonly events = new Event<ComputeEvent>();
136
+ public readonly events = new Event<ComputeEventPayload>();
114
137
 
115
138
  constructor(
116
- private readonly _serviceContainer: ServiceContainer,
139
+ private readonly _computeRuntime: ManagedRuntime.ManagedRuntime<ComputeServices, never>,
117
140
  /** Persistent compute graph. */
118
141
  private readonly _graph: ComputeGraphModel,
119
142
  ) {
@@ -154,7 +177,14 @@ export class ComputeGraphController extends Resource {
154
177
  /**
155
178
  * Inputs and outputs for all nodes.
156
179
  */
157
- get state() {
180
+ get state(): Record<
181
+ string,
182
+ {
183
+ node: ComputeNode;
184
+ input: Record<string, RuntimeValue>;
185
+ output: Record<string, RuntimeValue>;
186
+ }
187
+ > {
158
188
  const ids = [...new Set([...Object.keys(this._runtimeStateInputs), ...Object.keys(this._runtimeStateOutputs)])];
159
189
  return Object.fromEntries(
160
190
  ids.map((id) => [
@@ -201,7 +231,7 @@ export class ComputeGraphController extends Resource {
201
231
  });
202
232
  }
203
233
 
204
- async getMeta(node: ComputeNode): Promise<ComputeMeta> {
234
+ async getMeta(node: ComputeNode): Promise<ComputeNodeMeta> {
205
235
  const { meta } = await resolveComputeNode(node);
206
236
  return meta;
207
237
  }
@@ -221,37 +251,41 @@ export class ComputeGraphController extends Resource {
221
251
  executor.setOutputs(nodeId, Effect.succeed(ValueBag.make(outputs)));
222
252
  }
223
253
 
224
- const serviceLayer = this._serviceContainer.createLayer();
225
- await Effect.runPromise(
226
- Effect.gen(this, function* () {
227
- const scope = yield* Scope.make();
228
-
229
- // TODO(dmaretskyi): Code duplication.
230
- const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(nodeId)));
231
- const computingOutputs = executable.exec != null;
232
- // TODO(dmaretskyi): Check if the node has a compute function and run computeOutputs if it does.
233
- const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(
234
- Effect.withSpan('runGraph'),
235
- Scope.extend(scope),
236
-
237
- Effect.flatMap(computeValueBag),
238
- Effect.provide(serviceLayer),
239
- Effect.withSpan('test'),
240
- Effect.tap((values) => {
241
- for (const [key, value] of Object.entries(values)) {
242
- if (computingOutputs) {
243
- this._onOutputComputed(nodeId, key, value);
244
- } else {
245
- this._onInputComputed(nodeId, key, value);
254
+ unwrapExit(
255
+ await this._computeRuntime.runPromiseExit(
256
+ Effect.gen(this, function* () {
257
+ const scope = yield* Scope.make();
258
+
259
+ // TODO(dmaretskyi): Code duplication.
260
+ const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(nodeId)));
261
+ const computingOutputs = executable.exec != null;
262
+ // TODO(dmaretskyi): Check if the node has a compute function and run computeOutputs if it does.
263
+ const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(
264
+ Effect.withSpan('runGraph'),
265
+ Scope.extend(scope),
266
+ Effect.provide(
267
+ ComputeEventLogger.layerFromTracing.pipe(
268
+ Layer.provideMerge(TracingService.layerNoop), // TODO(dmaretskyi): Plug-in tracing events to visual feedback in the compute graph editor.
269
+ ),
270
+ ),
271
+ Effect.flatMap(computeValueBag),
272
+ Effect.withSpan('test'),
273
+ Effect.tap((values) => {
274
+ for (const [key, value] of Object.entries(values)) {
275
+ if (computingOutputs) {
276
+ this._onOutputComputed(nodeId, key, value);
277
+ } else {
278
+ this._onInputComputed(nodeId, key, value);
279
+ }
246
280
  }
247
- }
248
- }),
249
- );
281
+ }),
282
+ );
250
283
 
251
- yield* effect;
284
+ yield* effect;
252
285
 
253
- yield* Scope.close(scope, Exit.void);
254
- }),
286
+ yield* Scope.close(scope, Exit.void);
287
+ }),
288
+ ),
255
289
  );
256
290
 
257
291
  this.update.emit();
@@ -279,50 +313,57 @@ export class ComputeGraphController extends Resource {
279
313
  : this._graph.nodes.filter((node) => node.type != null && AUTO_TRIGGER_NODES.includes(node.type));
280
314
  const allAffectedNodes = [...new Set(triggerNodes.flatMap((node) => executor.getAllDependantNodes(node.id)))];
281
315
 
282
- await Effect.runPromise(
283
- Effect.gen(this, function* () {
284
- const scope = yield* Scope.make();
285
-
286
- // TODO(burdon): Return map?
287
- const tasks: Effect.Effect<unknown, any, never>[] = [];
288
- for (const node of allAffectedNodes) {
289
- // TODO(dmaretskyi): Code duplication.
290
- const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(node)));
291
- const computingOutputs = executable.exec != null;
292
-
293
- // TODO(dmaretskyi): Check if the node has a compute function and run computeOutputs if it does.
294
- const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(
295
- Effect.withSpan('runGraph'),
296
- Scope.extend(scope),
297
- Effect.flatMap(computeValueBag),
298
- Effect.provide(this._serviceContainer.createLayer()),
299
- Effect.withSpan('test'),
300
- Effect.tap((values) => {
301
- for (const [key, value] of Object.entries(values)) {
302
- if (computingOutputs) {
303
- this._onOutputComputed(node, key, value);
304
- } else {
305
- this._onInputComputed(node, key, value);
316
+ unwrapExit(
317
+ await this._computeRuntime.runPromiseExit(
318
+ Effect.gen(this, function* () {
319
+ const scope = yield* Scope.make();
320
+
321
+ // TODO(burdon): Return map?
322
+ const tasks: Effect.Effect<unknown, any, ComputeServices>[] = [];
323
+ for (const node of allAffectedNodes) {
324
+ // TODO(dmaretskyi): Code duplication.
325
+ const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(node)));
326
+ const computingOutputs = executable.exec != null;
327
+
328
+ // TODO(dmaretskyi): Check if the node has a compute function and run computeOutputs if it does.
329
+ const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(
330
+ Effect.withSpan('runGraph'),
331
+ Scope.extend(scope),
332
+ Effect.flatMap(computeValueBag),
333
+ Effect.provide(
334
+ ComputeEventLogger.layerFromTracing.pipe(
335
+ Layer.provideMerge(TracingService.layerNoop), // TODO(dmaretskyi): Plug-in tracing events to visual feedback in the compute graph editor.
336
+ ),
337
+ ),
338
+
339
+ Effect.withSpan('test'),
340
+ Effect.tap((values) => {
341
+ for (const [key, value] of Object.entries(values)) {
342
+ if (computingOutputs) {
343
+ this._onOutputComputed(node, key, value);
344
+ } else {
345
+ this._onInputComputed(node, key, value);
346
+ }
306
347
  }
307
- }
308
- }),
309
- );
348
+ }),
349
+ );
310
350
 
311
- tasks.push(effect);
312
- }
351
+ tasks.push(effect);
352
+ }
313
353
 
314
- //
315
- yield* Effect.all(tasks);
354
+ //
355
+ yield* Effect.all(tasks);
316
356
 
317
- //
318
- yield* Scope.close(scope, Exit.void);
319
- }),
357
+ //
358
+ yield* Scope.close(scope, Exit.void);
359
+ }),
360
+ ),
320
361
  );
321
362
 
322
363
  this.update.emit();
323
364
  }
324
365
 
325
- private _createLogger(): Context.Tag.Service<EventLogger> {
366
+ private _createLogger(): Context.Tag.Service<ComputeEventLogger> {
326
367
  return {
327
368
  log: (event) => {
328
369
  this._handleEvent(event);
@@ -331,7 +372,7 @@ export class ComputeGraphController extends Resource {
331
372
  };
332
373
  }
333
374
 
334
- private _handleEvent(event: ComputeEvent): void {
375
+ private _handleEvent(event: ComputeEventPayload): void {
335
376
  log('handleEvent', { event });
336
377
  switch (event.type) {
337
378
  case 'compute-input': {
@@ -3,16 +3,16 @@
3
3
  //
4
4
 
5
5
  import {
6
- NODE_INPUT,
7
- NODE_OUTPUT,
8
6
  type ComputeNode,
9
7
  type Executable,
8
+ NODE_INPUT,
9
+ NODE_OUTPUT,
10
10
  type NodeType,
11
- registry,
12
11
  getTemplateInputSchema,
12
+ registry,
13
13
  } from '@dxos/conductor';
14
14
  import { raise } from '@dxos/debug';
15
- import { ObjectId, toJsonSchema } from '@dxos/echo-schema';
15
+ import { JsonSchema, Obj } from '@dxos/echo';
16
16
  import { invariant } from '@dxos/invariant';
17
17
 
18
18
  import { type ComputeShape, type ConstantShape, type TemplateShape } from '../shapes';
@@ -49,6 +49,7 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
49
49
  createNode('constant', {
50
50
  value: (shape as ConstantShape).value,
51
51
  }),
52
+ ['make-queue' as const]: () => createNode('make-queue'),
52
53
  ['database' as const]: () => createNode('database'),
53
54
  ['gpt' as const]: () => createNode('gpt'),
54
55
  ['gpt-realtime' as const]: () => createNode('gpt-realtime'),
@@ -67,7 +68,7 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
67
68
  ['switch' as const]: () => createNode('switch'),
68
69
  ['template' as const]: (shape) => {
69
70
  const node = createNode('template', { valueType: (shape as TemplateShape).valueType, value: shape.text });
70
- node.inputSchema = toJsonSchema(getTemplateInputSchema(node));
71
+ node.inputSchema = JsonSchema.toJsonSchema(getTemplateInputSchema(node));
71
72
  return node;
72
73
  },
73
74
  ['text' as const]: () => createNode('text'),
@@ -76,7 +77,7 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
76
77
  };
77
78
 
78
79
  const createNode = (type: string, props?: Partial<ComputeNode>): ComputeNode => ({
79
- id: ObjectId.random(),
80
+ id: Obj.ID.random(),
80
81
  type,
81
82
  ...props,
82
83
  });
@@ -5,7 +5,7 @@
5
5
  import { type RefObject, useEffect, useState } from 'react';
6
6
 
7
7
  import { type CleanupFn } from '@dxos/async';
8
- import { type EditorRootProps, type EditorController } from '@dxos/react-ui-canvas-editor';
8
+ import { type EditorController, type EditorRootProps } from '@dxos/react-ui-canvas-editor';
9
9
 
10
10
  import { type ComputeGraphController } from '../graph';
11
11
  import { type ComputeShape } from '../shapes';
@@ -21,7 +21,7 @@ const combine = (...cbs: CleanupFn[]) => {
21
21
 
22
22
  export type UseComputeGraphControllerOptions = Pick<EditorRootProps<ComputeShape>, 'graph'> & {
23
23
  controller: ComputeGraphController | null;
24
- editorRef: RefObject<EditorController>;
24
+ editorRef: RefObject<EditorController | null>;
25
25
  };
26
26
 
27
27
  export const useComputeGraphController = ({ controller, graph, editorRef }: UseComputeGraphControllerOptions) => {
@@ -2,25 +2,27 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import { useCallback, useEffect, useState } from 'react';
7
7
 
8
- import type { ComputeNode, ComputeMeta, ComputeEvent } from '@dxos/conductor';
8
+ import type { ComputeNode, ComputeNodeMeta } from '@dxos/conductor';
9
+ import type { ComputeEventPayload } from '@dxos/functions';
9
10
  import { invariant } from '@dxos/invariant';
10
11
 
11
- import { useComputeContext } from './compute-context';
12
12
  import { type RuntimeValue } from '../graph';
13
13
  import { type ComputeShape } from '../shapes';
14
14
 
15
+ import { useComputeContext } from './compute-context';
16
+
15
17
  export type ComputeNodeState = {
16
18
  node: ComputeNode;
17
- meta: ComputeMeta;
19
+ meta: ComputeNodeMeta;
18
20
  runtime: {
19
21
  inputs: Record<string, RuntimeValue>;
20
22
  outputs: Record<string, RuntimeValue>;
21
23
  setOutput: (property: string, value: any) => void;
22
24
  evalNode: () => void;
23
- subscribeToEventLog: (cb: (event: ComputeEvent) => void) => void;
25
+ subscribeToEventLog: (cb: (event: ComputeEventPayload) => void) => void;
24
26
  };
25
27
  };
26
28
 
@@ -31,7 +33,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
31
33
  const { controller } = useComputeContext();
32
34
  invariant(controller);
33
35
 
34
- const [meta, setMeta] = useState<ComputeMeta>();
36
+ const [meta, setMeta] = useState<ComputeNodeMeta>();
35
37
  useEffect(() => {
36
38
  let disposed = false;
37
39
  queueMicrotask(async () => {
@@ -41,6 +43,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
41
43
  if (disposed) {
42
44
  return;
43
45
  }
46
+
44
47
  setMeta(meta);
45
48
  });
46
49
 
@@ -54,7 +57,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
54
57
  }, [shape.node]);
55
58
 
56
59
  const subscribeToEventLog = useCallback(
57
- (cb: (event: ComputeEvent) => void) => {
60
+ (cb: (event: ComputeEventPayload) => void) => {
58
61
  return controller.events.on((ev) => {
59
62
  if (ev.nodeId === shape.node) {
60
63
  cb(ev);
@@ -5,10 +5,9 @@
5
5
  import { useMemo } from 'react';
6
6
 
7
7
  import { type ComputeEdge, ComputeGraphModel, type ComputeNode, DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
8
- import { ObjectId, Ref } from '@dxos/echo-schema';
8
+ import { Obj, Ref } from '@dxos/echo';
9
9
  import { invariant } from '@dxos/invariant';
10
- import { getSpace } from '@dxos/react-client/echo';
11
- import { type GraphMonitor, type CanvasGraphModel, type Connection } from '@dxos/react-ui-canvas-editor';
10
+ import { type CanvasBoard, type CanvasGraphModel, type GraphMonitor } from '@dxos/react-ui-canvas-editor';
12
11
  import { isNonNullable } from '@dxos/util';
13
12
 
14
13
  import { createComputeNode, isValidComputeNode } from '../graph';
@@ -19,7 +18,7 @@ import { type ComputeShape, type TriggerShape } from '../shapes';
19
18
  */
20
19
  export const mapEdge = (
21
20
  graph: CanvasGraphModel,
22
- { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }: Connection,
21
+ { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }: CanvasBoard.Connection,
23
22
  ): ComputeEdge => {
24
23
  const sourceNode = graph.findNode(source) as ComputeShape;
25
24
  const targetNode = graph.findNode(target) as ComputeShape;
@@ -27,7 +26,7 @@ export const mapEdge = (
27
26
  invariant(targetNode?.node);
28
27
 
29
28
  return {
30
- id: ObjectId.random(),
29
+ id: Obj.ID.random(),
31
30
  source: sourceNode.node,
32
31
  target: targetNode.node,
33
32
  output,
@@ -113,19 +112,21 @@ export const createComputeGraph = (graph?: CanvasGraphModel<ComputeShape>) => {
113
112
  const linkTriggerToCompute = (graph: ComputeGraphModel, computeNode: ComputeNode, triggerData: TriggerShape) => {
114
113
  const functionTrigger = triggerData.functionTrigger?.target;
115
114
  invariant(functionTrigger);
116
- functionTrigger.function = Ref.make(graph.root);
117
- functionTrigger.inputNodeId = computeNode.id;
115
+ Obj.change(functionTrigger, (t) => {
116
+ t.function = Ref.make(graph.root);
117
+ t.inputNodeId = computeNode.id;
118
+ });
118
119
  };
119
120
 
120
121
  const deleteTriggerObjects = (computeGraph: ComputeGraphModel, deleted: CanvasGraphModel) => {
121
- const space = getSpace(computeGraph.root);
122
- if (!space) {
122
+ const db = Obj.getDatabase(computeGraph.root);
123
+ if (!db) {
123
124
  return;
124
125
  }
125
126
  for (const node of deleted.nodes) {
126
127
  if (node.type === 'trigger') {
127
128
  const trigger = node as TriggerShape;
128
- space.db.remove(trigger.functionTrigger!.target!);
129
+ db.remove(trigger.functionTrigger!.target!);
129
130
  }
130
131
  }
131
132
  };
package/src/json.test.ts CHANGED
@@ -2,15 +2,15 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import { describe, test } from 'vitest';
7
7
 
8
- import { BaseGraphEdge, BaseGraphNode } from '@dxos/graph';
8
+ import { Graph } from '@dxos/graph';
9
9
 
10
10
  import { createGptCircuit } from './testing';
11
11
 
12
12
  export const Shape = Schema.extend(
13
- BaseGraphNode,
13
+ Graph.Node,
14
14
  Schema.Struct({
15
15
  text: Schema.optional(Schema.String),
16
16
  guide: Schema.optional(Schema.Boolean),
@@ -19,7 +19,7 @@ export const Shape = Schema.extend(
19
19
  );
20
20
 
21
21
  export const Connection = Schema.extend(
22
- BaseGraphEdge,
22
+ Graph.Edge,
23
23
  Schema.Struct({
24
24
  input: Schema.optional(Schema.String),
25
25
  output: Schema.optional(Schema.String),
package/src/registry.ts CHANGED
@@ -29,10 +29,10 @@ import {
29
29
  surfaceShape,
30
30
  switchShape,
31
31
  templateShape,
32
- threadShape,
32
+ textShape,
33
33
  textToImageShape,
34
+ threadShape,
34
35
  triggerShape,
35
- textShape,
36
36
  } from './shapes';
37
37
 
38
38
  /**
@@ -2,44 +2,44 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import { describe, test } from 'vitest';
7
7
 
8
- import { live } from '@dxos/client/echo';
9
- import { BaseGraphNode, Graph } from '@dxos/graph';
8
+ import { Graph } from '@dxos/graph';
10
9
  import {
10
+ CanvasBoard,
11
+ CanvasGraphModel,
11
12
  Polygon,
12
13
  createEllipse,
13
14
  createPath,
14
15
  createRectangle,
15
16
  isPath,
16
17
  isPolygon,
17
- Shape,
18
18
  } from '@dxos/react-ui-canvas-editor';
19
19
 
20
- import { createSwitch, ComputeShape, createFunction } from './shapes';
20
+ import { ComputeShape, createFunction, createSwitch } from './shapes';
21
21
 
22
22
  describe('compute', () => {
23
23
  test('model', ({ expect }) => {
24
- // const model = CanvasGraphModel.create<ComputeShape>();
24
+ const model = CanvasGraphModel.create<ComputeShape>();
25
25
  const node = createSwitch({ id: 'x', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } });
26
26
  console.log(JSON.stringify(node, null, 2));
27
27
  expect(Schema.is(ComputeShape)(node)).toBe(true);
28
28
  expect(Schema.is(Polygon)(node)).toBe(true);
29
- expect(Schema.is(Shape)(node)).toBe(true);
30
- expect(Schema.is(BaseGraphNode)(node)).toBe(true);
29
+ expect(Schema.is(CanvasBoard.Shape)(node)).toBe(true);
30
+ expect(Schema.is(Graph.Node)(node)).toBe(true);
31
31
 
32
- const graph = live(Graph, { nodes: [], edges: [] });
33
- graph.nodes.push(node); // Throws.
32
+ const graph: Graph.Any = { nodes: [], edges: [] };
33
+ graph.nodes.push(node);
34
34
 
35
- // model.createNode(node);
36
- // console.log(JSON.stringify(model, null, 2));
35
+ model.createNode(node);
36
+ console.log(JSON.stringify(model, null, 2));
37
37
  });
38
38
  });
39
39
 
40
40
  describe('schema', () => {
41
41
  test('basic types', ({ expect }) => {
42
- const shapes: Shape[] = [];
42
+ const shapes: CanvasBoard.Shape[] = [];
43
43
  shapes.push(createRectangle({ id: 'shape-1', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } }));
44
44
  shapes.push(createEllipse({ id: 'shape-2', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } }));
45
45
  shapes.push(createFunction({ id: 'shape-3', center: { x: 0, y: 0 } }));
@@ -2,14 +2,14 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import React from 'react';
7
7
 
8
8
  import { AppendInput } from '@dxos/conductor';
9
9
  import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
10
10
 
11
- import { createFunctionAnchors, FunctionBody, getHeight } from './common';
12
- import { ComputeShape, createShape, type CreateShapeProps } from './defs';
11
+ import { FunctionBody, createFunctionAnchors, getHeight } from './common';
12
+ import { ComputeShape, type CreateShapeProps, createShape } from './defs';
13
13
 
14
14
  export const AppendShape = Schema.extend(
15
15
  ComputeShape,
@@ -2,14 +2,14 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import React from 'react';
7
7
 
8
8
  import { ReducerInput, ReducerOutput } from '@dxos/conductor';
9
9
  import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
10
10
 
11
- import { createFunctionAnchors, FunctionBody, getHeight } from './common';
12
- import { ComputeShape, createShape, type CreateShapeProps } from './defs';
11
+ import { FunctionBody, createFunctionAnchors, getHeight } from './common';
12
+ import { ComputeShape, type CreateShapeProps, createShape } from './defs';
13
13
 
14
14
  //
15
15
  // Data
@@ -2,15 +2,16 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
  import React, { useEffect, useState } from 'react';
7
7
 
8
8
  import { Icon } from '@dxos/react-ui';
9
- import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
9
+ import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
10
10
 
11
- import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
12
11
  import { useComputeNodeState } from '../hooks';
13
12
 
13
+ import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
14
+
14
15
  export const AudioShape = Schema.extend(
15
16
  ComputeShape,
16
17
  Schema.Struct({
@@ -34,7 +35,7 @@ export const AudioComponent = ({ shape }: ShapeComponentProps<AudioShape>) => {
34
35
 
35
36
  // https://docs.pmnd.rs/react-three-fiber/api/canvas#render-props
36
37
  return (
37
- <div className='flex w-full justify-center items-center'>
38
+ <div className='flex is-full justify-center items-center'>
38
39
  <Icon
39
40
  icon={active ? 'ph--microphone--regular' : 'ph--microphone-slash--regular'}
40
41
  classNames={['transition opacity-20 duration-1000', active && 'opacity-100 text-red-500']}