@alpic80/rivet-cli 1.24.2-aidon.16 → 1.24.2-aidon.17

package/bin/commands/serve.js

@@ -4,7 +4,7 @@ import { readdir, stat } from 'node:fs/promises';
 import * as path from 'path';
 import { extname, isAbsolute, join } from 'node:path';
 import didYouMean from 'didyoumean2';
-import { createProcessor, loadProjectFromFile, getSingleNodeStream, } from '@alpic80/rivet-node';
+import { createProcessor, loadProjectFromFile, NodeDatasetProvider, getSingleNodeStream, } from '@alpic80/rivet-node';
 import chalk from 'chalk';
 import { configDotenv } from 'dotenv';
 import * as Rivet from '@ironclad/rivet-node';
@@ -134,7 +134,7 @@ export async function serve(cliArgs = {}) {
         if (args.logRequests) {
             app.use('*', conditionalLogger());
         }
-        let projectFilePath = '';
+        let projectPath = '';
         let initialProject = null;
         if (args.projectsRootDir) {
             if (!(await validateProjectRootDirectory(args.projectsRootDir))) {
@@ -142,9 +142,9 @@ export async function serve(cliArgs = {}) {
             }
         }
         else {
-            projectFilePath = await getProjectFile(args.projectFile);
-            initialProject = await loadProjectFromFile(projectFilePath);
-            throwIfNoMainGraph(initialProject, args.graph, projectFilePath);
+            projectPath = await getProjectFile(args.projectFile);
+            initialProject = await loadProjectFromFile(projectPath);
+            throwIfNoMainGraph(initialProject, args.graph, projectPath);
             throwIfInvalidGraph(initialProject, args.graph);
         }
         console.log(chalk.green('Server running version 11'));
@@ -175,9 +175,9 @@ export async function serve(cliArgs = {}) {
             c.req.raw.headers.forEach((value, key) => {
                 headers[key] = value;
             });
-            const project = args.dev ? await loadProjectFromFile(projectFilePath) : initialProject;
+            const project = args.dev ? await loadProjectFromFile(projectPath) : initialProject;
             const inputText = await c.req.text();
-            return await processGraph({ project, headers, inputText });
+            return await processGraph({ project, projectPath, headers, inputText });
         });
         if (args.allowSpecifyingGraphId || args.projectsRootDir) {
             app.post('/*', async (c) => {
@@ -204,6 +204,7 @@ export async function serve(cliArgs = {}) {
                     graphFile = parts.join('/');
                 }
                 let project;
+                let projectPath = '';
                 if (args.projectsRootDir) {
                     if (!graphFile) {
                         if (args.logActivity) {
@@ -218,13 +219,14 @@ export async function serve(cliArgs = {}) {
                         }
                         return c.text(`GraphFile ${graphFile} not found in root directory (${args.projectsRootDir})`, 400);
                     }
-                    project = await loadProjectFromFile(path.join(args.projectsRootDir, graphFile));
+                    projectPath = path.join(args.projectsRootDir, graphFile);
+                    project = await loadProjectFromFile(projectPath);
                 }
                 else {
-                    project = args.dev || args.projectsRootDir ? await loadProjectFromFile(projectFilePath) : initialProject;
+                    project = args.dev || args.projectsRootDir ? await loadProjectFromFile(projectPath) : initialProject;
                 }
                 const inputText = await c.req.text();
-                return await processGraph({ project, headers, inputText, graphId });
+                return await processGraph({ project, projectPath, headers, inputText, graphId });
             });
         }
         const server = serveHono({
@@ -245,7 +247,7 @@ export async function serve(cliArgs = {}) {
                 const graph = Object.values(initialProject.graphs).find((g) => g.metadata.id === initialProject.metadata.mainGraphId);
                 servedGraphName = graph.metadata.name;
             }
-            console.log(chalk.green(`Serving project file ${chalk.bold.white(projectFilePath)} on port ${chalk.bold.white(args.port)}.\nServing graph "${chalk.bold.white(servedGraphName)}".`));
+            console.log(chalk.green(`Serving project file ${chalk.bold.white(projectPath)} on port ${chalk.bold.white(args.port)}.\nServing graph "${chalk.bold.white(servedGraphName)}".`));
         }
         else {
             console.log(chalk.red(`Misconfiguration, not serving from directory and have no initialProject`));
@@ -354,11 +356,15 @@ const parseStream = (stream) => {
     }
     return { start, finish, delta };
 };
-async function streamGraph({ project, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logActivity, logTrace, stream, streamNode, events }) {
+async function streamGraph({ project, projectPath, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logActivity, logTrace, stream, streamNode, events }) {
+    const NDSOptions = { save: true };
+    const datasetProvider = await NodeDatasetProvider.fromProjectFile(projectPath, NDSOptions);
     const { run, processor, getSSEStream } = createProcessor(project, {
         inputs,
         graph: graphId,
         pluginSettings,
+        projectPath,
+        datasetProvider,
         openAiKey: openaiApiKey,
         openAiEndpoint: openaiEndpoint,
         openAiOrganization: openaiOrganization,
@@ -414,11 +420,15 @@ async function streamGraph({ project, inputs, graphId, pluginSettings, openaiApi
         return sseStream;
     }
 }
-async function runGraph({ project, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logTrace }) {
+async function runGraph({ project, projectPath, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logTrace }) {
+    const NDSOptions = { save: true };
+    const datasetProvider = await NodeDatasetProvider.fromProjectFile(projectPath, NDSOptions);
     const { run } = createProcessor(project, {
         inputs,
         graph: graphId,
         pluginSettings,
+        projectPath,
+        datasetProvider,
         openAiKey: openaiApiKey,
         openAiEndpoint: openaiEndpoint,
         openAiOrganization: openaiOrganization,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@alpic80/rivet-cli",
   "license": "MIT",
   "repository": "https://github.com/castortech/rivet",
-  "version": "1.24.2-aidon.16",
+  "version": "1.24.2-aidon.17",
   "src": "bin/cli.ts",
   "bin": {
     "rivet": "bin/cli.js"