@alpic80/rivet-cli 1.24.0-aidon.5 → 1.24.0-aidon.6

package/bin/commands/pluginConfiguration.js

@@ -1,32 +1,5 @@
 import { plugins } from '@ironclad/rivet-core';
 const pluginConfigurations = [
-    {
-        envVar: 'CHROMADB_PLUGIN',
-        importPath: 'rivet-plugin-chromadb',
-        isBuiltIn: false,
-        registerFunction: (plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugin(Rivet)),
-        settings: {
-            envVarPrefix: 'CHROMA',
-            settingsKey: 'chroma',
-            settingsStructure: {
-                databaseUri: 'DATABASE_URI',
-            },
-        },
-    },
-    {
-        envVar: 'GOOGLE_PLUGIN',
-        isBuiltIn: true,
-        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.google),
-        settings: {
-            envVarPrefix: 'GOOGLE',
-            settingsKey: 'google',
-            settingsStructure: {
-                googleProjectId: 'PROJECT_ID',
-                googleRegion: 'REGION',
-                googleApplicationCredentials: 'APPLICATION_CREDENTIALS',
-            },
-        },
-    },
     {
         envVar: 'AIDON_PLUGIN',
         isBuiltIn: true,
@@ -45,6 +18,7 @@ const pluginConfigurations = [
             settingsKey: 'anthropic',
             settingsStructure: {
                 anthropicApiKey: 'API_KEY',
+                anthropicApiEndpoint: 'API_ENDPOINT',
             },
         },
     },
@@ -70,35 +44,54 @@ const pluginConfigurations = [
         },
     },
     {
-        envVar: 'HUGGINGFACE_PLUGIN',
+        envVar: 'CHROMA_PLUGIN',
+        importPath: 'rivet-plugin-chromadb',
+        isBuiltIn: false,
+        registerFunction: (plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugin(Rivet)),
+        settings: {
+            envVarPrefix: 'CHROMA',
+            settingsKey: 'chroma',
+            settingsStructure: {
+                databaseUri: 'DATABASE_URI',
+            },
+        },
+    },
+    {
+        envVar: 'GENTRACE_PLUGIN',
         isBuiltIn: true,
-        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.huggingFace),
+        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.gentrace),
         settings: {
-            envVarPrefix: 'HUGGINGFACE',
-            settingsKey: 'huggingface',
+            envVarPrefix: 'GENTRACE',
+            settingsKey: 'gentrace',
             settingsStructure: {
-                huggingFaceAccessToken: 'ACCESS_TOKEN',
+                gentraceApiKey: 'API_KEY',
             },
         },
     },
     {
-        envVar: 'OPENAI_PLUGIN',
+        envVar: 'GOOGLE_PLUGIN',
         isBuiltIn: true,
-        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.openai),
+        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.google),
         settings: {
-            envVarPrefix: 'OPENAI',
-            settingsKey: 'openai',
+            envVarPrefix: 'GOOGLE',
+            settingsKey: 'google',
+            settingsStructure: {
+                googleApiKey: 'API_KEY',
+                googleProjectId: 'PROJECT_ID',
+                googleRegion: 'REGION',
+                googleApplicationCredentials: 'APPLICATION_CREDENTIALS',
+            },
         },
     },
     {
-        envVar: 'PINECONE_PLUGIN',
+        envVar: 'HUGGINGFACE_PLUGIN',
         isBuiltIn: true,
-        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.pinecone),
+        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.huggingFace),
         settings: {
-            envVarPrefix: 'PINECONE',
-            settingsKey: 'pinecone',
+            envVarPrefix: 'HUGGINGFACE',
+            settingsKey: 'huggingface',
             settingsStructure: {
-                pineconeApiKey: 'API_KEY',
+                huggingFaceAccessToken: 'ACCESS_TOKEN',
             },
         },
     },
@@ -128,6 +121,15 @@ const pluginConfigurations = [
             },
         },
     },
+    {
+        envVar: 'OPENAI_PLUGIN',
+        isBuiltIn: true,
+        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.openai),
+        settings: {
+            envVarPrefix: 'OPENAI',
+            settingsKey: 'openai',
+        },
+    },
     {
         envVar: 'PDF2MD_PLUGIN',
         importPath: 'rivet-plugin-pdf2md',
@@ -138,6 +140,32 @@ const pluginConfigurations = [
             settingsKey: 'pdf2md',
         },
     },
+    {
+        envVar: 'PINECONE_PLUGIN',
+        isBuiltIn: true,
+        registerFunction: (_plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugins.pinecone),
+        settings: {
+            envVarPrefix: 'PINECONE',
+            settingsKey: 'pinecone',
+            settingsStructure: {
+                pineconeApiKey: 'API_KEY',
+            },
+        },
+    },
+    {
+        envVar: 'QDRANT_PLUGIN',
+        importPath: 'rivet-plugin-qdrant',
+        isBuiltIn: false,
+        registerFunction: (plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugin(Rivet)),
+        settings: {
+            envVarPrefix: 'QDRANT',
+            settingsKey: 'qdrant',
+            settingsStructure: {
+                qdrantApiKey: 'API_KEY',
+                qdrantUrl: 'URL',
+            },
+        },
+    },
     {
         envVar: 'TRANSFORMERLAB_PLUGIN',
         importPath: 'rivet-plugin-transformerlab',
@@ -151,6 +179,16 @@ const pluginConfigurations = [
             },
         },
     },
+    {
+        envVar: 'UTILITIES_PLUGIN',
+        importPath: 'rivet-utilities-plugin',
+        isBuiltIn: false,
+        registerFunction: (plugin, Rivet) => Rivet.globalRivetNodeRegistry.registerPlugin(plugin(Rivet)),
+        settings: {
+            envVarPrefix: 'UTILITIES',
+            settingsKey: 'utilities',
+        },
+    },
 ];
 const registeredPlugins = {};
 export async function setupPlugins(Rivet) {

package/bin/commands/serve.js

@@ -1,6 +1,5 @@
 import { Hono } from 'hono';
 import { serve as serveHono } from '@hono/node-server';
-import { logger } from 'hono/logger';
 import { readdir, stat } from 'node:fs/promises';
 import * as path from 'path';
 import { extname, isAbsolute, join } from 'node:path';
@@ -10,6 +9,7 @@ import chalk from 'chalk';
 import { configDotenv } from 'dotenv';
 import * as Rivet from '@ironclad/rivet-node';
 import { setupPlugins, logAvailablePluginsInfo } from './pluginConfiguration.js';
+import { combinedLogger } from '../lib/logger.js';
 export function makeCommand(y) {
     return y
         .option('port', {
@@ -51,6 +51,11 @@ export function makeCommand(y) {
         describe: 'Expose the cost of the graph run in the response',
         type: 'boolean',
         default: false,
+    })
+        .option('expose-usage', {
+        describe: 'Expose the token usage of the graph run in the response',
+        type: 'boolean',
+        default: false,
     })
         .option('stream', {
         describe: 'Turns on streaming mode. Rivet events will be sent to the client using SSE (Server-Sent Events). If this is set to a Node ID or node title, only events for that node will be sent.',
@@ -83,16 +88,16 @@ export function makeCommand(y) {
         demandOption: false,
     })
         .positional('projectFile', {
-        describe: 'The project file to serve. If omitted, the project file in the current directory is used. There cannot be multiple project files in the current directory.',
+        describe: 'The project file to serve. If omitted, the project file in the current directory is used. There cannot be multiple project files in the current directory unless projects-root-dir is set.',
         type: 'string',
         demandOption: false,
     });
 }
 const conditionalLogger = () => {
-    const baseLogger = logger();
     return async (c, next) => {
         if (c.req.path !== '/health') {
-            return baseLogger(c, next);
+            await combinedLogger(c, next);
+            return;
         }
         await next();
     };
@@ -112,6 +117,7 @@ export async function serve(cliArgs = {}) {
             openaiEndpoint: cliArgs.openaiEndpoint ?? process.env.OPENAI_ENDPOINT,
             openaiOrganization: cliArgs.openaiOrganization ?? process.env.OPENAI_ORGANIZATION,
             exposeCost: cliArgs.exposeCost ?? process.env.EXPOSE_COST === 'true',
+            exposeUsage: cliArgs.exposeUsage ?? process.env.EXPOSE_USAGE === 'true',
             logRequests: cliArgs.logRequests ?? process.env.LOG_REQUESTS === 'true',
             logActivity: cliArgs.logActivity ?? process.env.LOG_ACTIVITY === 'true',
             logTrace: cliArgs.logTrace ?? process.env.LOG_TRACE === 'true',
@@ -138,11 +144,16 @@ export async function serve(cliArgs = {}) {
             throwIfNoMainGraph(initialProject, args.graph, projectFilePath);
             throwIfInvalidGraph(initialProject, args.graph);
         }
-        if (args.stream != null) {
-            console.log('Streaming is enabled');
-        }
-        if (args.streamNode != null) {
-            console.log(`Streaming node ${chalk.bold(args.streamNode)}`);
+        if (args.logActivity) {
+            const logInfo = [
+                args.port && `Port:${chalk.bold.white(args.port)}`,
+                args.projectFile && `ProjectFile:${chalk.bold.white(args.projectFile)}`,
+                args.dev && `Dev:${chalk.bold.white(args.dev)}`,
+                args.graph && `Graph:${chalk.bold.white(args.graph)}`,
+                args.allowSpecifyingGraphId && `AllowSpecifyingGraphId:${chalk.bold.white(args.allowSpecifyingGraphId)}`,
+                args.logRequests && `LogRequests:${chalk.bold.white(args.logRequests)}`
+            ].filter(Boolean).join(', ');
+            console.log(chalk.green('Server config,', logInfo));
         }
         app.get('/health', async (c) => c.text('Healthy like Popeye'));
         app.post('/', async (c) => {
@@ -233,19 +244,41 @@ export async function serve(cliArgs = {}) {
 }
 function createProcessGraph(ctx) {
     return async (opts) => {
+        let localCtx = { ...ctx };
         let inputs = {};
+        let runParams = {};
         if (opts.inputText.trim()) {
-            inputs = JSON.parse(opts.inputText);
-            if (typeof inputs !== 'object') {
+            const parsed = JSON.parse(opts.inputText);
+            if (typeof parsed !== 'object') {
                 throw new Error('Inputs must be an object');
             }
+            if ('runParams' in parsed) {
+                runParams = parsed['runParams'];
+                delete parsed['runParams'];
+                localCtx = {
+                    ...localCtx,
+                    ...runParams
+                };
+            }
+            inputs = parsed;
+        }
+        if (localCtx.logActivity) {
+            const logInfo = [
+                `Input:${JSON.stringify(inputs)}`,
+                localCtx.stream && `Stream:${chalk.bold.white(localCtx.stream)}`,
+                localCtx.streamNode && `StreamNode:${chalk.bold.white(localCtx.streamNode)}`,
+                localCtx.exposeCost && `ExposeCost:${chalk.bold.white(localCtx.exposeCost)}`,
+                localCtx.exposeUsage && `ExposeUsage:${chalk.bold.white(localCtx.exposeUsage)}`,
+                localCtx.logTrace && `LogTrace:${chalk.bold.white(localCtx.logTrace)}`
+            ].filter(Boolean).join(', ');
+            console.log(chalk.green('Processing request,', logInfo));
         }
         const execOpts = {
-            ...ctx,
+            ...localCtx,
             ...opts,
             inputs
         };
-        if (ctx.streamNode != null) {
+        if (localCtx.stream != null) {
             const stream = await streamGraph(execOpts);
             return new Response(stream, {
                 headers: {
@@ -263,45 +296,107 @@ function createProcessGraph(ctx) {
         });
     };
 }
-async function streamGraph({ project, inputs, graphId, openaiApiKey, openaiEndpoint, openaiOrganization, streamNode, }) {
+const parseStream = (stream) => {
+    if (!stream.trim())
+        return true;
+    const start = [];
+    const finish = [];
+    const delta = [];
+    const pattern = /^([^[\]]+)(\[([SFD]+)\])?/;
+    for (const raw of stream.split(',')) {
+        const match = pattern.exec(raw);
+        if (!match)
+            continue;
+        const name = match[1]?.trim();
+        const flags = match[2];
+        if (!name)
+            continue;
+        if (!flags || flags.includes('S'))
+            start.push(name);
+        if (!flags || flags.includes('F'))
+            finish.push(name);
+        if (!flags || flags.includes('D'))
+            delta.push(name);
+    }
+    return { start, finish, delta };
+};
+async function streamGraph({ project, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logActivity, logTrace, stream, streamNode, }) {
     const { run, processor, getSSEStream } = createProcessor(project, {
         inputs,
         graph: graphId,
+        pluginSettings,
         openAiKey: openaiApiKey,
         openAiEndpoint: openaiEndpoint,
         openAiOrganization: openaiOrganization,
+        includeTrace: logTrace
     });
     if (streamNode) {
-        const stream = getSingleNodeStream(processor, streamNode);
+        let sseStream;
+        if (exposeCost || exposeUsage) {
+            const baseOptions = {
+                exposeCost,
+                exposeUsage,
+                done: exposeCost || exposeUsage,
+                removeFinalOutput: exposeCost || exposeUsage,
+                error: logActivity
+            };
+            const spec = {
+                ...baseOptions,
+                partialOutputs: [streamNode],
+                nodeFinish: [streamNode],
+            };
+            sseStream = getSingleNodeStream(processor, spec);
+        }
+        else {
+            sseStream = getSingleNodeStream(processor, streamNode);
+        }
         run().catch((err) => {
             console.error(err);
         });
-        return stream;
+        return sseStream;
     }
     else {
-        const stream = getSSEStream({
-            nodeStart: streamNode ? [streamNode] : true,
-            nodeFinish: streamNode ? [streamNode] : true,
-            partialOutputs: streamNode ? [streamNode] : true,
-        });
+        const parsed = parseStream(stream);
+        const baseOptions = {
+            exposeCost,
+            exposeUsage,
+            done: exposeCost || exposeUsage,
+            removeFinalOutput: exposeCost || exposeUsage,
+            error: logActivity
+        };
+        const sseStream = getSSEStream(parsed === true
+            ? { ...baseOptions, nodeStart: true, nodeFinish: true, partialOutputs: true }
+            : {
+                ...baseOptions,
+                nodeStart: parsed.start,
+                nodeFinish: parsed.finish,
+                partialOutputs: parsed.delta
+            });
         run().catch((err) => {
             console.error(err);
         });
-        return stream;
+        return sseStream;
     }
 }
-async function runGraph({ project, inputs, graphId, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, }) {
+async function runGraph({ project, inputs, graphId, pluginSettings, openaiApiKey, openaiEndpoint, openaiOrganization, exposeCost, exposeUsage, logTrace }) {
     const { run } = createProcessor(project, {
         inputs,
         graph: graphId,
+        pluginSettings,
         openAiKey: openaiApiKey,
         openAiEndpoint: openaiEndpoint,
         openAiOrganization: openaiOrganization,
+        includeTrace: logTrace
     });
     const outputs = await run();
     if (!exposeCost) {
         delete outputs.cost;
     }
+    if (!exposeUsage) {
+        delete outputs.usage;
+        delete outputs.requestTokens;
+        delete outputs.responseTokens;
+    }
     return outputs;
 }
 function throwIfNoMainGraph(project, graph, projectFilePath) {

package/bin/lib/logger.js

@@ -0,0 +1,20 @@
+export const combinedLogger = async (c, next) => {
+    const start = Date.now();
+    await next();
+    const ms = Date.now() - start;
+    // ...rest as before
+    const req = c.req;
+    const res = c.res;
+    const remoteAddr = req.header('x-forwarded-for') ?? req.header('x-real-ip') ?? '::1';
+    const userAgent = req.header('user-agent') ?? '-';
+    const referer = req.header('referer') ?? '-';
+    const now = new Date();
+    const date = now.toISOString().replace('T', ' ').replace('Z', '');
+    const method = req.method;
+    const url = req.url;
+    const httpVersion = '1.1';
+    const status = res.status;
+    const contentLength = res.headers.get('content-length') ?? '-';
+    const log = `${remoteAddr} - - [${date}] "${method} ${url} HTTP/${httpVersion}" ${status} ${contentLength} "${referer}" "${userAgent}" ${ms}ms`;
+    console.log(log);
+};

package/dist/types/commands/run.d.ts

@@ -8,9 +8,9 @@ export declare function makeCommand<T>(y: yargs.Argv<T>): yargs.Argv<T & {
 } & {
     "include-cost": boolean;
 } & {
-    context: never[] | string[];
+    context: string[] | never[];
 } & {
-    input: never[] | string[];
+    input: string[] | never[];
 }>;
 export declare function run(args: {
     projectFile: string;

package/dist/types/commands/serve.d.ts

@@ -15,6 +15,8 @@ export declare function makeCommand<T>(y: yargs.Argv<T>): yargs.Argv<T & {
     "openai-organization": string | undefined;
 } & {
     "expose-cost": boolean;
+} & {
+    "expose-usage": boolean;
 } & {
     stream: string | undefined;
 } & {
@@ -40,6 +42,7 @@ type ServerContext = {
     openaiEndpoint: string | undefined;
     openaiOrganization: string | undefined;
     exposeCost: boolean;
+    exposeUsage: boolean;
     logRequests: boolean;
     logActivity: boolean;
     logTrace: boolean;

package/dist/types/lib/logger.d.ts

@@ -0,0 +1,2 @@
+import type { Context, Next } from 'hono';
+export declare const combinedLogger: (c: Context, next: Next) => Promise<void>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@alpic80/rivet-cli",
   "license": "MIT",
   "repository": "https://github.com/castortech/rivet",
-  "version": "1.24.0-aidon.5",
+  "version": "1.24.0-aidon.6",
   "src": "bin/cli.ts",
   "bin": {
     "rivet": "bin/cli.js"
@@ -24,10 +24,10 @@
     "dev:serve": "tsx src/cli.ts serve --projects-root-dir C:/temp/aidon/Rivet_Files"
   },
   "dependencies": {
-    "@alpic80/rivet-core": "^1.24.0-aidon.3",
+    "@alpic80/rivet-core": "^1.24.0-aidon.4",
     "@alpic80/rivet-node": "^1.24.0-aidon.3",
     "@hono/node-server": "^1.13.8",
-    "@ironclad/rivet-core": "npm:@alpic80/rivet-core@1.24.0-aidon.3",
+    "@ironclad/rivet-core": "npm:@alpic80/rivet-core@1.24.0-aidon.4",
     "@ironclad/rivet-node": "npm:@alpic80/rivet-node@1.24.0-aidon.3",
     "@types/dotenv": "^8.2.3",
     "chalk": "^5.4.1",