@dxos/react-ui-canvas-compute 0.8.3-main.7f5a14c → 0.8.3-staging.0fa589b

package/dist/lib/browser/index.mjs

@@ -1,10 +1,9 @@
 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 { Effect, Either, Exit, Scope } from "effect";
 import { Event, synchronized } from "@dxos/async";
-import { isNotExecuted, makeValueBag, EventLogger, GptService, GraphExecutor, MockGpt, QueueService, SpaceService, FunctionCallService } from "@dxos/conductor";
+import { GraphExecutor, isNotExecuted, ValueBag } from "@dxos/conductor";
 import { Resource } from "@dxos/context";
 import { log } from "@dxos/log";
 
@@ -356,20 +355,19 @@ var AUTO_TRIGGER_NODES = [
   "switch",
   "constant"
 ];
-var createComputeGraphController = (graph, services) => {
+var createComputeGraphController = (graph, serviceContainer) => {
   const computeGraph = createComputeGraph(graph);
-  const controller = new ComputeGraphController(computeGraph);
-  controller.setServices(services ?? {});
+  const controller = new ComputeGraphController(serviceContainer, computeGraph);
   return {
     controller,
     graph
   };
 };
 var ComputeGraphController = class extends Resource {
-  constructor(_graph) {
-    super(), this._graph = _graph, this._executor = new GraphExecutor({
+  constructor(_serviceContainer, _graph) {
+    super(), this._serviceContainer = _serviceContainer, this._graph = _graph, this._executor = new GraphExecutor({
       computeNodeResolver: (node) => resolveComputeNode(node)
-    }), this._diagnostics = [], this._services = {}, this._forcedOutputs = {}, this._runtimeStateInputs = {}, this._runtimeStateOutputs = {}, this.update = new Event(), this.output = new Event(), this.events = new Event();
+    }), this._diagnostics = [], this._forcedOutputs = {}, this._runtimeStateInputs = {}, this._runtimeStateOutputs = {}, this.update = new Event(), this.output = new Event(), this.events = new Event();
   }
   toJSON() {
     return {
@@ -381,17 +379,6 @@ var ComputeGraphController = class extends Resource {
       forcedOutputs: this._forcedOutputs
     };
   }
-  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() {
     return this._graph;
   }
@@ -450,7 +437,7 @@ var ComputeGraphController = class extends Resource {
       } catch (err) {
         log.catch(err, void 0, {
           F: __dxlog_file4,
-          L: 218,
+          L: 199,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -470,14 +457,14 @@ var ComputeGraphController = class extends Resource {
     const executor = this._executor.clone();
     await executor.load(this._graph);
     for (const [nodeId2, outputs] of Object.entries(this._forcedOutputs)) {
-      executor.setOutputs(nodeId2, Effect.succeed(makeValueBag(outputs)));
+      executor.setOutputs(nodeId2, Effect.succeed(ValueBag.make(outputs)));
     }
-    const services = this._createServiceLayer();
+    const serviceLayer = this._serviceContainer.createLayer();
     await Effect.runPromise(Effect.gen(this, function* () {
       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"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(services), 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(serviceLayer), Effect.withSpan("test"), Effect.tap((values) => {
         for (const [key, value] of Object.entries(values)) {
           if (computingOutputs) {
             this._onOutputComputed(nodeId, key, value);
@@ -501,7 +488,7 @@ var ComputeGraphController = class extends Resource {
     const executor = this._executor.clone();
     await executor.load(this._graph);
     for (const [nodeId, outputs] of Object.entries(this._forcedOutputs)) {
-      executor.setOutputs(nodeId, Effect.succeed(makeValueBag(outputs)));
+      executor.setOutputs(nodeId, Effect.succeed(ValueBag.make(outputs)));
     }
     const triggerNodes = startFromNode != null ? [
       this._graph.getNode(startFromNode)
@@ -509,14 +496,13 @@ var ComputeGraphController = class extends Resource {
     const allAffectedNodes = [
       ...new Set(triggerNodes.flatMap((node) => executor.getAllDependantNodes(node.id)))
     ];
-    const services = this._createServiceLayer();
     await Effect.runPromise(Effect.gen(this, function* () {
       const scope = yield* Scope.make();
       const tasks = [];
       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"), Scope.extend(scope), Effect.flatMap(computeValueBag), Effect.provide(services), 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(this._serviceContainer.createLayer()), Effect.withSpan("test"), Effect.tap((values) => {
           for (const [key, value] of Object.entries(values)) {
             if (computingOutputs) {
               this._onOutputComputed(node, key, value);
@@ -532,18 +518,6 @@ var ComputeGraphController = class extends Resource {
     }));
     this.update.emit();
   }
-  _createServiceLayer() {
-    const services = {
-      ...DEFAULT_SERVICES,
-      ...this._services
-    };
-    const logLayer = Layer.succeed(EventLogger, this._createLogger());
-    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;
-    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 {
       log: (event) => {
@@ -557,7 +531,7 @@ var ComputeGraphController = class extends Resource {
       event
     }, {
       F: __dxlog_file4,
-      L: 376,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -599,9 +573,6 @@ _ts_decorate([
 _ts_decorate([
   synchronized
 ], ComputeGraphController.prototype, "exec", null);
-var DEFAULT_SERVICES = {
-  gpt: new MockGpt()
-};
 var computeValueBag = (bag) => {
   return Effect.all(Object.entries(bag.values).map(([key, eff]) => Effect.either(eff).pipe(Effect.map((value) => {
     if (Either.isLeft(value)) {
@@ -2521,8 +2492,8 @@ var GptRealtimeComponent = ({ shape }) => {
         }));
         const offer = await peerConnection.createOffer();
         await peerConnection.setLocalDescription(offer);
-        const aiServiceUrl = new URL("/rtc-connect", config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL);
-        const response = await fetch(aiServiceUrl, {
+        const AiServiceUrl = new URL("/rtc-connect", config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL);
+        const response = await fetch(AiServiceUrl, {
           method: "POST",
           body: offer.sdp,
           headers: {