@alpic80/rivet-cli 1.24.0-aidon.10 → 1.24.0-aidon.12

package/bin/commands/serve.js

@@ -19,13 +19,11 @@ export function makeCommand(y) {
     })
         .option('port', {
         describe: 'The port to serve on',
-        type: 'number',
-        default: 3000,
+        type: 'number'
     })
         .option('dev', {
         describe: 'Run in development mode: rereads the project file on each request',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('graph', {
         describe: 'The ID or name of the graph to run. If omitted, the main graph is used.',
@@ -34,8 +32,7 @@ export function makeCommand(y) {
     })
         .option('allow-specifying-graph-id', {
         describe: 'Allow specifying the graph ID in the URL path',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('openai-api-key', {
         describe: 'The OpenAI API key to use for the project. If omitted, the environment variable OPENAI_API_KEY is used.',
@@ -54,13 +51,11 @@ export function makeCommand(y) {
     })
         .option('expose-cost', {
         describe: 'Expose the cost of the graph run in the response',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('expose-usage', {
         describe: 'Expose the token usage of the graph run in the response',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .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.',
@@ -74,18 +69,15 @@ export function makeCommand(y) {
     })
         .option('log-requests', {
         describe: 'Determines if all requests (except health checks) will be logged via Hono logger',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('log-activity', {
         describe: 'Determines if basic activity should be logging during processing',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('log-trace', {
         describe: 'Determines if includeTrace should be turned on during graph processing',
-        type: 'boolean',
-        default: false,
+        type: 'boolean'
     })
         .option('projects-root-dir', {
         describe: 'Specifies the root directory where project files are located. If specified, a projectFile argument will be a relative path to this directory',
@@ -113,8 +105,8 @@ export async function serve(cliArgs = {}) {
         debugger;
         const pluginSettings = await setupPlugins(Rivet);
         const args = {
-            hostname: cliArgs.hostname ?? process.env.HOSTNAME ?? '127.0.0.1',
-            port: Number(cliArgs.port ?? process.env.PORT ?? 3000),
+            hostname: cliArgs.hostname ?? process.env.SERVE_HOSTNAME ?? '127.0.0.1',
+            port: Number(cliArgs.port ?? process.env.SERVE_PORT ?? 3000),
             projectFile: cliArgs.projectFile ?? process.env.PROJECT_FILE,
             dev: cliArgs.dev ?? process.env.NODE_ENV === 'development',
             graph: cliArgs.graph ?? process.env.GRAPH,
@@ -150,7 +142,7 @@ export async function serve(cliArgs = {}) {
             throwIfNoMainGraph(initialProject, args.graph, projectFilePath);
             throwIfInvalidGraph(initialProject, args.graph);
         }
-        console.log(chalk.green('Server running version 10'));
+        console.log(chalk.green('Server running version 11'));
         if (args.logActivity) {
             const logInfo = [
                 args.hostname && `Hostname:${chalk.bold.white(args.hostname)}`,
@@ -166,6 +158,9 @@ export async function serve(cliArgs = {}) {
         app.get('/health', async (c) => c.text('Healthy like Popeye'));
         app.post('/', async (c) => {
             if (args.projectsRootDir) {
+                if (args.logActivity) {
+                    console.error(chalk.red('Status 400 - Configured with projects-root-dir which requires a project file to be specified in URL,'));
+                }
                 return c.text('Configured with projects-root-dir which requires a project file to be specified in URL', 400);
             }
             const project = args.dev ? await loadProjectFromFile(projectFilePath) : initialProject;
@@ -194,10 +189,16 @@ export async function serve(cliArgs = {}) {
                 let project;
                 if (args.projectsRootDir) {
                     if (!graphFile) {
+                        if (args.logActivity) {
+                            console.error(chalk.red('Status 400 - A graphFile is required when specifying projects-root-dir,'));
+                        }
                         return c.text('A graphFile is required when specifying projects-root-dir', 400);
                     }
                     const fileMissing = await testIfMissingFile(path.join(args.projectsRootDir, graphFile));
                     if (fileMissing) {
+                        if (args.logActivity) {
+                            console.error(chalk.red(`GraphFile ${graphFile} not found in root directory (${args.projectsRootDir})`));
+                        }
                         return c.text(`GraphFile ${graphFile} not found in root directory (${args.projectsRootDir})`, 400);
                     }
                     project = await loadProjectFromFile(path.join(args.projectsRootDir, graphFile));

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

@@ -2,13 +2,13 @@ import type * as yargs from 'yargs';
 export declare function makeCommand<T>(y: yargs.Argv<T>): yargs.Argv<T & {
     hostname: string | undefined;
 } & {
-    port: number;
+    port: number | undefined;
 } & {
-    dev: boolean;
+    dev: boolean | undefined;
 } & {
     graph: string | undefined;
 } & {
-    "allow-specifying-graph-id": boolean;
+    "allow-specifying-graph-id": boolean | undefined;
 } & {
     "openai-api-key": string | undefined;
 } & {
@@ -16,19 +16,19 @@ export declare function makeCommand<T>(y: yargs.Argv<T>): yargs.Argv<T & {
 } & {
     "openai-organization": string | undefined;
 } & {
-    "expose-cost": boolean;
+    "expose-cost": boolean | undefined;
 } & {
-    "expose-usage": boolean;
+    "expose-usage": boolean | undefined;
 } & {
     stream: string | undefined;
 } & {
     "stream-node": string | undefined;
 } & {
-    "log-requests": boolean;
+    "log-requests": boolean | undefined;
 } & {
-    "log-activity": boolean;
+    "log-activity": boolean | undefined;
 } & {
-    "log-trace": boolean;
+    "log-trace": boolean | undefined;
 } & {
     "projects-root-dir": string | undefined;
 } & {

package/package.json

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