@alpic80/rivet-core 1.24.2-aidon.1 → 1.24.2-aidon.3

package/dist/esm/api/streaming.js

@@ -9,12 +9,14 @@ function nodeMatches(spec, event) {
 export async function* getProcessorEvents(processor, spec) {
     const previousIndexes = new Map();
     const usages = [];
+    let hasDelta = false;
     for await (const event of processor.events()) {
         if (event.type === 'partialOutput') {
             if (spec.partialOutputs === true ||
                 nodeMatches(spec.partialOutputs, event)) {
                 const currentOutput = coerceType(event.outputs['response'], 'string');
                 const delta = currentOutput.slice(previousIndexes.get(event.node.id) ?? 0);
+                hasDelta = true;
                 yield {
                     type: 'partialOutput',
                     nodeId: event.node.id,
@@ -76,8 +78,8 @@ export async function* getProcessorEvents(processor, spec) {
                     usages.push(usage);
                 }
             }
-            if (spec.nodeFinish === true ||
-                nodeMatches(spec.nodeFinish, event)) {
+            if ((spec.nodeFinish === true || nodeMatches(spec.nodeFinish, event)) &&
+                !(spec.removeFinalOutput && hasDelta)) {
                 yield {
                     type: 'nodeFinish',
                     outputs: event.outputs,
@@ -121,10 +123,11 @@ spec) {
     return new ReadableStream({
         async start(controller) {
             const userEventHandler = async (eventName, data) => {
-                sendEvent(controller, 'event', {
+                const graphEvent = {
                     name: eventName,
                     message: coerceType(data, 'string')
-                });
+                };
+                sendEvent(controller, 'event', { graphEvent });
             };
             const streamEvents = createOnStreamUserEvents(spec.userStreamEvents, userEventHandler);
             if (streamEvents) {
@@ -159,6 +162,19 @@ export function getSingleNodeStream(processor, arg) {
     return new ReadableStream({
         async start(controller) {
             try {
+                const userEventHandler = async (eventName, data) => {
+                    const payload = {
+                        name: eventName,
+                        message: coerceType(data, 'string')
+                    };
+                    controller.enqueue(`event: ${JSON.stringify(payload)}\n\n`);
+                };
+                const streamEvents = createOnStreamUserEvents(spec.userStreamEvents, userEventHandler);
+                if (streamEvents) {
+                    for (const [name, fn] of Object.entries(streamEvents)) {
+                        processor.onUserEvent(name, fn);
+                    }
+                }
                 for await (const event of getProcessorEvents(processor, spec)) {
                     if (event.type === 'partialOutput') { //nodeIdOrTitle filter managed by spec
                         controller.enqueue(`data: ${JSON.stringify(event.delta)}\n\n`);

package/dist/esm/model/GraphProcessor.js

@@ -13,7 +13,6 @@ import { coerceTypeOptional } from '../utils/coerceType.js';
 import { globalRivetNodeRegistry } from './Nodes.js';
 import { getPluginConfig } from '../utils/index.js';
 import { GptTokenizerTokenizer } from '../integrations/GptTokenizerTokenizer.js';
-// eslint-disable-next-line import/no-cycle -- There has to be a cycle because CodeRunner needs to import the entirety of Rivet
 import { IsomorphicCodeRunner } from '../integrations/CodeRunner.js';
 // CJS compatibility, gets default.default for whatever reason
 let PQueue = PQueueImport;

package/dist/types/api/streaming.d.ts

@@ -1,4 +1,4 @@
-import { type NodeId, type Inputs, type Outputs, type GraphOutputs, type GraphProcessor, type DataValue, type RunGraphOptions } from '../index.js';
+import { type NodeId, type Inputs, type Outputs, type GraphOutputs, type GraphProcessor, type DataValue, type RunGraphOptions, type GraphEvents } from '../index.js';
 export type RivetEventStreamFilterSpec = {
     /** Stream partial output deltas for the specified node IDs or node titles. */
     partialOutputs?: string[] | true;
@@ -41,8 +41,7 @@ export type RivetEventStreamEvent = {
         graphOutput: GraphOutputs;
     };
     event: {
-        name: string;
-        message: string;
+        graphEvent: GraphEvents;
     };
     error: {
         error: string;

package/dist/types/model/GraphProcessor.d.ts

@@ -126,6 +126,10 @@ export type ProcessEvent = {
 }[keyof ProcessEvents];
 export type GraphOutputs = Record<string, DataValue>;
 export type GraphInputs = Record<string, DataValue>;
+export type GraphEvents = {
+    name: string;
+    message: string;
+};
 export type NodeResults = Map<NodeId, Outputs>;
 export type Inputs = Record<PortId, DataValue | undefined>;
 export type Outputs = Record<PortId, DataValue | undefined>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@alpic80/rivet-core",
   "license": "MIT",
   "repository": "https://github.com/castortech/rivet",
-  "version": "1.24.2-aidon.1",
+  "version": "1.24.2-aidon.3",
   "packageManager": "yarn@3.5.0",
   "main": "dist/cjs/bundle.cjs",
   "module": "dist/esm/index.js",
@@ -48,7 +48,7 @@
     "@google-cloud/vertexai": "^0.1.3",
     "@google/genai": "^0.12.0",
     "@huggingface/inference": "^2.6.4",
-    "@ironclad/rivet-core": "npm:@alpic80/rivet-core@1.24.2-aidon.1",
+    "@ironclad/rivet-core": "npm:@alpic80/rivet-core@1.24.2-aidon.3",
     "assemblyai": "^4.6.0",
     "autoevals": "^0.0.26",
     "cron-parser": "^4.9.0",