stdio

Author: pavelgj

genkit-tools/cli/package.json

@@ -32,7 +32,6 @@
     "axios": "^1.7.7",
     "colorette": "^2.0.20",
     "commander": "^11.1.0",
-    "express": "^4.21.2",
     "extract-zip": "^2.0.1",
     "get-port": "5.1.1",
     "inquirer": "^8.2.0",
@@ -41,7 +40,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/express": "^5.0.3",
     "@types/inquirer": "^8.1.3",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.19",

genkit-tools/cli/src/cli.ts

@@ -28,6 +28,7 @@ import { evalFlow } from './commands/eval-flow';
 import { evalRun } from './commands/eval-run';
 import { flowBatchRun } from './commands/flow-batch-run';
 import { flowRun } from './commands/flow-run';
+import { mcp } from './commands/mcp';
 import { getPluginCommands, getPluginSubCommand } from './commands/plugins';
 import { start } from './commands/start';
 import { uiStart } from './commands/ui-start';
@@ -50,6 +51,7 @@ const commands: Command[] = [
   evalFlow,
   config,
   start,
+  mcp,
 ];
 
 /** Main entry point for CLI. */

genkit-tools/cli/src/commands/eval-extract-data.ts

@@ -20,6 +20,7 @@ import type {
   TraceData,
 } from '@genkit-ai/tools-common';
 import {
+  findProjectRoot,
   generateTestCaseId,
   getEvalExtractors,
   logger,
@@ -45,7 +46,7 @@ export const evalExtractData = new Command('eval:extractData')
   .option('--maxRows <maxRows>', 'maximum number of rows', '100')
   .option('--label [label]', 'label flow run in this batch')
   .action(async (flowName: string, options: EvalDatasetOptions) => {
-    await runWithManager(async (manager) => {
+    await runWithManager(await findProjectRoot(), async (manager) => {
       const extractors = await getEvalExtractors(`/flow/${flowName}`);
 
       logger.info(`Extracting trace data '/flow/${flowName}'...`);

genkit-tools/cli/src/commands/eval-flow.ts

@@ -31,6 +31,7 @@ import {
 } from '@genkit-ai/tools-common/eval';
 import {
   confirmLlmUse,
+  findProjectRoot,
   hasAction,
   loadInferenceDatasetFile,
   logger,
@@ -90,7 +91,7 @@ export const evalFlow = new Command('eval:flow')
   .option('-f, --force', 'Automatically accept all interactive prompts')
   .action(
     async (flowName: string, data: string, options: EvalFlowRunCliOptions) => {
-      await runWithManager(async (manager) => {
+      await runWithManager(await findProjectRoot(), async (manager) => {
         const actionRef = `/flow/${flowName}`;
         if (!data && !options.input) {
           throw new Error(

genkit-tools/cli/src/commands/eval-run.ts

@@ -24,6 +24,7 @@ import {
 } from '@genkit-ai/tools-common/eval';
 import {
   confirmLlmUse,
+  findProjectRoot,
   loadEvaluationDatasetFile,
   logger,
 } from '@genkit-ai/tools-common/utils';
@@ -66,7 +67,7 @@ export const evalRun = new Command('eval:run')
   )
   .option('--force', 'Automatically accept all interactive prompts')
   .action(async (dataset: string, options: EvalRunCliOptions) => {
-    await runWithManager(async (manager) => {
+    await runWithManager(await findProjectRoot(), async (manager) => {
       if (!dataset) {
         throw new Error(
           'No input data passed. Specify input data using [data] argument'

genkit-tools/cli/src/commands/flow-batch-run.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { logger } from '@genkit-ai/tools-common/utils';
+import { findProjectRoot, logger } from '@genkit-ai/tools-common/utils';
 import { Command } from 'commander';
 import { readFile, writeFile } from 'fs/promises';
 import { runWithManager } from '../utils/manager-utils';
@@ -43,7 +43,7 @@ export const flowBatchRun = new Command('flow:batchRun')
       fileName: string,
       options: FlowBatchRunOptions
     ) => {
-      await runWithManager(async (manager) => {
+      await runWithManager(await findProjectRoot(), async (manager) => {
         const inputData = JSON.parse(await readFile(fileName, 'utf8')) as any[];
         let input = inputData;
         if (inputData.length === 0) {

genkit-tools/cli/src/commands/flow-run.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { logger } from '@genkit-ai/tools-common/utils';
+import { findProjectRoot, logger } from '@genkit-ai/tools-common/utils';
 import { Command } from 'commander';
 import { writeFile } from 'fs/promises';
 import { runWithManager } from '../utils/manager-utils';
@@ -39,7 +39,7 @@ export const flowRun = new Command('flow:run')
     'name of the output file to store the extracted data'
   )
   .action(async (flowName: string, data: string, options: FlowRunOptions) => {
-    await runWithManager(async (manager) => {
+    await runWithManager(await findProjectRoot(), async (manager) => {
       logger.info(`Running '/flow/${flowName}' (stream=${options.stream})...`);
       const result = (
         await manager.runAction(

genkit-tools/cli/src/commands/mcp.ts

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { findProjectRoot } from '@genkit-ai/tools-common/utils';
+import { Command } from 'commander';
+import { startMcpServer } from '../mcp/server';
+import { startManager } from '../utils/manager-utils';
+
+interface McpOptions {
+  projectRoot?: string;
+}
+
+/** Command to run MCP server. */
+export const mcp = new Command('mcp')
+  .option('--project-root [projectRoot]', 'Project root')
+  .description('run MCP stdio server')
+  .action(async (options: McpOptions) => {
+    const manager = await startManager(
+      options.projectRoot ?? (await findProjectRoot()),
+      true
+    );
+    await startMcpServer(manager);
+  });

genkit-tools/cli/src/commands/start.ts

@@ -16,20 +16,17 @@
 
 import type { RuntimeManager } from '@genkit-ai/tools-common/manager';
 import { startServer } from '@genkit-ai/tools-common/server';
-import { logger } from '@genkit-ai/tools-common/utils';
+import { findProjectRoot, logger } from '@genkit-ai/tools-common/utils';
 import { spawn } from 'child_process';
 import { Command } from 'commander';
 import getPort, { makeRange } from 'get-port';
 import open from 'open';
-import { startMcpServer } from '../mcp/server';
 import { startManager } from '../utils/manager-utils';
 
 interface RunOptions {
   noui?: boolean;
   port?: string;
   open?: boolean;
-  mcpExperimental?: boolean;
-  mcpPort?: string;
 }
 
 /** Command to run code in dev mode and/or the Dev UI. */
@@ -38,11 +35,12 @@ export const start = new Command('start')
   .option('-n, --noui', 'do not start the Dev UI', false)
   .option('-p, --port <port>', 'port for the Dev UI')
   .option('-o, --open', 'Open the browser on UI start up')
-  .option('--mcp-experimental', 'start MCP server (Experimental)')
-  .option('--mcp-port', 'MCP server port')
   .action(async (options: RunOptions) => {
     // Always start the manager.
-    let managerPromise: Promise<RuntimeManager> = startManager(true);
+    let managerPromise: Promise<RuntimeManager> = startManager(
+      await findProjectRoot(),
+      true
+    );
     if (!options.noui) {
       let port: number;
       if (options.port) {
@@ -64,11 +62,7 @@ export const start = new Command('start')
     }
     await managerPromise.then((manager: RuntimeManager) => {
       const telemetryServerUrl = manager?.telemetryServerUrl;
-      const promises = [startRuntime(telemetryServerUrl)];
-      if (options.mcpExperimental) {
-        promises.push(startMcpServer(options.mcpPort, manager));
-      }
-      return Promise.all(promises);
+      return startRuntime(telemetryServerUrl);
     });
   });
 

genkit-tools/cli/src/commands/ui-start.ts

@@ -15,6 +15,7 @@
  */
 
 import {
+  findProjectRoot,
   findServersDir,
   isValidDevToolsInfo,
   logger,
@@ -53,7 +54,7 @@ export const uiStart = new Command('ui:start')
     } else {
       port = await getPort({ port: makeRange(4000, 4099) });
     }
-    const serversDir = await findServersDir();
+    const serversDir = await findServersDir(await findProjectRoot());
     const toolsJsonPath = path.join(serversDir, 'tools.json');
     try {
       const toolsJsonContent = await fs.readFile(toolsJsonPath, 'utf-8');