@dxos/react-ui-canvas-compute 0.7.5-labs.8a82073 → 0.7.5-labs.c0e040f

package/dist/lib/browser/index.mjs

@@ -1,9 +1,10 @@
 import "@dxos/node-std/globals";
 
 // packages/ui/react-ui-canvas-compute/src/graph/controller.ts
+import { FetchHttpClient } from "@effect/platform";
 import { Effect, Either, Exit, Layer, Scope } from "effect";
 import { Event, synchronized } from "@dxos/async";
-import { isNotExecuted, makeValueBag, EventLogger, GptService, GraphExecutor, MockGpt, QueueService, SpaceService } from "@dxos/conductor";
+import { isNotExecuted, makeValueBag, EventLogger, GptService, GraphExecutor, MockGpt, QueueService, SpaceService, FunctionCallService } from "@dxos/conductor";
 import { Resource } from "@dxos/context";
 import { log } from "@dxos/log";
 
@@ -171,7 +172,7 @@ import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { DXN } from "@dxos/keys";
 import { getSpace } from "@dxos/react-client/echo";
-import { nonNullable } from "@dxos/util";
+import { isNonNullable } from "@dxos/util";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useGraphMonitor.ts";
 var mapEdge = (graph, { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }) => {
   const sourceNode = graph.findNode(source);
@@ -238,7 +239,7 @@ var useGraphMonitor = (model) => {
           const nodeIds = subgraph.nodes.map((shape) => shape.node);
           const edgeIds = subgraph.edges.map(({ source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }) => {
             return model.edges.find((computeEdge) => computeEdge.input === input && computeEdge.output === output)?.id;
-          }).filter(nonNullable);
+          }).filter(isNonNullable);
           model.removeNodes(nodeIds);
           model.removeEdges(edgeIds);
           deleteTriggerObjects(model, subgraph);
@@ -343,6 +344,14 @@ var ComputeGraphController = class extends Resource {
     };
   }
   setServices(services) {
+    log.info("setServices", {
+      services
+    }, {
+      F: __dxlog_file4,
+      L: 149,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     Object.assign(this._services, services);
   }
   get graph() {
@@ -403,7 +412,7 @@ var ComputeGraphController = class extends Resource {
       } catch (err) {
         log.catch(err, void 0, {
           F: __dxlog_file4,
-          L: 215,
+          L: 218,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -430,7 +439,7 @@ var ComputeGraphController = class extends Resource {
       const scope = yield* Scope.make();
       const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(nodeId)));
       const computingOutputs = executable.exec != null;
-      const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(Effect.withSpan("runGraph"), Effect.provide(services), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.withSpan("test"), Effect.tap((values) => {
+      const effect = (computingOutputs ? executor.computeOutputs(nodeId) : executor.computeInputs(nodeId)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(services), Effect.withSpan("test"), Effect.tap((values) => {
         for (const [key, value] of Object.entries(values)) {
           if (computingOutputs) {
             this._onOutputComputed(nodeId, key, value);
@@ -469,7 +478,7 @@ var ComputeGraphController = class extends Resource {
       for (const node of allAffectedNodes) {
         const executable = yield* Effect.promise(() => resolveComputeNode(this._graph.getNode(node)));
         const computingOutputs = executable.exec != null;
-        const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(Effect.withSpan("runGraph"), Effect.provide(services), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.withSpan("test"), Effect.tap((values) => {
+        const effect = (computingOutputs ? executor.computeOutputs(node) : executor.computeInputs(node)).pipe(Effect.withSpan("runGraph"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(services), Effect.withSpan("test"), Effect.tap((values) => {
           for (const [key, value] of Object.entries(values)) {
             if (computingOutputs) {
               this._onOutputComputed(node, key, value);
@@ -494,7 +503,8 @@ var ComputeGraphController = class extends Resource {
     const gptLayer = Layer.succeed(GptService, services.gpt);
     const queueLayer = services.edgeHttpClient != null ? QueueService.fromClient(services.edgeHttpClient) : QueueService.notAvailable;
     const spaceLayer = services.spaceService != null ? Layer.succeed(SpaceService, services.spaceService) : SpaceService.empty;
-    return Layer.mergeAll(logLayer, gptLayer, queueLayer, spaceLayer);
+    const functionCallServiceLayer = services.edgeHttpClient != null && services.spaceService != null ? Layer.succeed(FunctionCallService, FunctionCallService.fromClient(services.edgeHttpClient.baseUrl, services.spaceService.spaceId)) : Layer.succeed(FunctionCallService, FunctionCallService.mock());
+    return Layer.mergeAll(logLayer, gptLayer, queueLayer, spaceLayer, functionCallServiceLayer, FetchHttpClient.layer);
   }
   _createLogger() {
     return {
@@ -509,7 +519,7 @@ var ComputeGraphController = class extends Resource {
       event
     }, {
       F: __dxlog_file4,
-      L: 365,
+      L: 376,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1304,34 +1314,80 @@ var databaseShape = {
 };
 
 // packages/ui/react-ui-canvas-compute/src/shapes/Function.tsx
-import React12 from "react";
+import React12, { useCallback as useCallback3, useRef as useRef4 } from "react";
 import { AnyOutput, FunctionInput } from "@dxos/conductor";
-import { S as S11 } from "@dxos/echo-schema";
+import { getSnapshot, S as S11 } 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 { TextBox as TextBox3 } from "@dxos/react-ui-canvas-editor";
 var FunctionShape = S11.extend(ComputeShape, S11.Struct({
   type: S11.Literal("function")
 }));
 var createFunction = (props) => createShape({
   type: "function",
   size: {
-    width: 192,
-    height: getHeight(FunctionInput)
+    width: 256,
+    height: 192
   },
   ...props
 });
-var FunctionComponent = ({ shape }) => {
-  return /* @__PURE__ */ React12.createElement(FunctionBody, {
+var TextInputComponent2 = ({ shape, title, ...props }) => {
+  const client = useClient();
+  const { node, runtime } = useComputeNodeState(shape);
+  const inputRef = useRef4(null);
+  const handleEnter = useCallback3(async (text) => {
+    const value = text.trim();
+    const { spaceId, objectId } = parseId(value);
+    if (!spaceId || !objectId) {
+      return;
+    }
+    const space = client.spaces.get(spaceId);
+    const object = space?.db.getObjectById(objectId);
+    if (!space || !(object instanceof ScriptType)) {
+      return;
+    }
+    const { objects: [fn] } = await space.db.query(Filter.schema(FunctionType, {
+      source: object
+    })).run();
+    if (!fn) {
+      return;
+    }
+    node.value = value;
+    node.function = makeRef(fn);
+    node.inputSchema = getSnapshot(fn.inputSchema);
+    node.outputSchema = getSnapshot(fn.outputSchema);
+  }, [
+    client,
+    node
+  ]);
+  const handleAction = useCallback3((action) => {
+    if (action !== "run") {
+      return;
+    }
+    runtime.evalNode();
+  }, [
+    runtime
+  ]);
+  return /* @__PURE__ */ React12.createElement(Box, {
     shape,
-    inputSchema: FunctionInput,
-    outputSchema: AnyOutput
-  });
+    title: "Function",
+    onAction: handleAction
+  }, /* @__PURE__ */ React12.createElement(TextBox3, {
+    ...props,
+    ref: inputRef,
+    value: node.value,
+    language: node.valueType === "object" ? "json" : void 0,
+    onBlur: handleEnter,
+    onEnter: handleEnter
+  }));
 };
 var functionShape = {
   type: "function",
   name: "Function",
   icon: "ph--function--regular",
-  component: FunctionComponent,
+  component: TextInputComponent2,
   createShape: createFunction,
-  // TODO(burdon): Get dynamic schema.
   getAnchors: (shape) => createFunctionAnchors(shape, FunctionInput, AnyOutput)
 };
 
@@ -1852,19 +1908,19 @@ var tableShape = {
 };
 
 // packages/ui/react-ui-canvas-compute/src/shapes/Template.tsx
-import React22, { useRef as useRef4 } from "react";
+import React22, { useRef as useRef5 } from "react";
 import { ComputeValueType as ComputeValueType3, getTemplateInputSchema as getTemplateInputSchema2, TemplateOutput, VoidInput as VoidInput2 } from "@dxos/conductor";
 import { S as S21, toJsonSchema as toJsonSchema2 } from "@dxos/echo-schema";
 import { invariant as invariant5 } from "@dxos/invariant";
-import { TextBox as TextBox3 } from "@dxos/react-ui-canvas-editor";
+import { TextBox as TextBox4 } from "@dxos/react-ui-canvas-editor";
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-canvas-compute/src/shapes/Template.tsx";
 var TemplateShape = S21.extend(ComputeShape, S21.Struct({
   type: S21.Literal("template"),
   valueType: S21.optional(ComputeValueType3)
 }));
-var TextInputComponent2 = ({ shape, title, ...props }) => {
+var TextInputComponent3 = ({ shape, title, ...props }) => {
   const { node } = useComputeNodeState(shape);
-  const inputRef = useRef4(null);
+  const inputRef = useRef5(null);
   const handleEnter = (text) => {
     const value = text.trim();
     if (value.length) {
@@ -1893,7 +1949,7 @@ var TextInputComponent2 = ({ shape, title, ...props }) => {
       value: node.valueType ?? "string",
       onValueChange: handleTypeChange
     })
-  }, /* @__PURE__ */ React22.createElement(TextBox3, {
+  }, /* @__PURE__ */ React22.createElement(TextBox4, {
     ...props,
     ref: inputRef,
     value: node.value,
@@ -1914,7 +1970,7 @@ var templateShape = {
   type: "template",
   name: "Template",
   icon: "ph--article--regular",
-  component: (props) => /* @__PURE__ */ React22.createElement(TextInputComponent2, {
+  component: (props) => /* @__PURE__ */ React22.createElement(TextInputComponent3, {
     ...props,
     placeholder: "Prompt"
   }),
@@ -1927,7 +1983,7 @@ var templateShape = {
 import React23 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT7 } from "@dxos/conductor";
 import { S as S22 } from "@dxos/echo-schema";
-import { TextBox as TextBox4 } from "@dxos/react-ui-canvas-editor";
+import { TextBox as TextBox5 } from "@dxos/react-ui-canvas-editor";
 import { createAnchorMap as createAnchorMap11 } from "@dxos/react-ui-canvas-editor";
 var TextShape = S22.extend(ComputeShape, S22.Struct({
   type: S22.Literal("text")
@@ -1952,7 +2008,7 @@ var TextComponent = ({ shape }) => {
   return /* @__PURE__ */ React23.createElement(Box, {
     shape,
     onAction: handleAction
-  }, /* @__PURE__ */ React23.createElement(TextBox4, {
+  }, /* @__PURE__ */ React23.createElement(TextBox5, {
     value
   }));
 };
@@ -1972,7 +2028,7 @@ var textShape = {
 };
 
 // packages/ui/react-ui-canvas-compute/src/shapes/Thread.tsx
-import React24, { useEffect as useEffect6, useRef as useRef5 } from "react";
+import React24, { useEffect as useEffect6, useRef as useRef6 } from "react";
 import { createInputSchema as createInputSchema2, createOutputSchema as createOutputSchema2, GptMessage as GptMessage2 } from "@dxos/conductor";
 import { S as S23 } from "@dxos/echo-schema";
 import { mx as mx5 } from "@dxos/react-ui-theme";
@@ -1991,7 +2047,7 @@ var createThread = (props) => createShape({
 });
 var ThreadComponent = ({ shape }) => {
   const items = [];
-  const scrollRef = useRef5(null);
+  const scrollRef = useRef6(null);
   useEffect6(() => {
     if (scrollRef.current) {
       scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
@@ -2074,7 +2130,7 @@ import { EmailTriggerOutput, SubscriptionTriggerOutput, TimerTriggerOutput, Void
 import { ObjectId as ObjectId4, Ref, S as S25 } from "@dxos/echo-schema";
 import { FunctionTrigger, TriggerKind } from "@dxos/functions";
 import { DXN as DXN2, SpaceId } from "@dxos/keys";
-import { create, makeRef } from "@dxos/react-client/echo";
+import { create, makeRef as makeRef2 } from "@dxos/react-client/echo";
 import { Select as Select2 } from "@dxos/react-ui";
 var TriggerShape = S25.extend(ComputeShape, S25.Struct({
   type: S25.Literal("trigger"),
@@ -2087,7 +2143,7 @@ var createTrigger = (props) => {
   });
   return createShape({
     type: "trigger",
-    functionTrigger: makeRef(functionTrigger),
+    functionTrigger: makeRef2(functionTrigger),
     size: {
       width: 192,
       height: getHeight(EmailTriggerOutput)
@@ -2426,7 +2482,6 @@ export {
   DatabaseComponent,
   DatabaseShape,
   FunctionBody,
-  FunctionComponent,
   FunctionShape,
   GptComponent,
   GptRealtimeComponent,