Merge branch 'firebase:main' into main

Author: neokn

.github/ISSUE_TEMPLATE/py-runtime-bug-report.md

@@ -20,11 +20,11 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Runtime (please complete the following information):**
- - OS: [e.g. Linux, MacOS]
- - Genkit Version [e.g. 0.3.1]
+ - OS: [e.g. Linux, macOS]
+ - Genkit Version: [e.g. 0.3.1]
 
-** Node version
- -  run `python3 --version` at paste here
+**Python version**
+ - Run `python3 --version` at paste here
 
 **Additional context**
 Add any other context about the problem here.

bin/setup

@@ -222,7 +222,7 @@ function genkit::install_go_cli_tools_ci() {
 # Install all the required tools that have been written in Go.
 function genkit::install_go_cli_tools_eng() {
   go install github.com/Gelio/go-global-update@latest
-  go install github.com/captainhook-go/captainhook/cmd/captainhook@latest
+  go install github.com/captainhook-git/captainhook-bin/cmd/captainhook@latest
   go install github.com/google/addlicense@latest
   go install github.com/google/go-licenses@latest
   go install github.com/jesseduffield/lazygit@latest

genkit-tools/cli/context/GENKIT.go.md

@@ -1,4 +1,4 @@
-# Genkit Go API Rules (v1.0.0)
+# Genkit Go API Rules (v1.20.0)
 
 This document provides rules and examples for building with the Genkit API in Go.
 

genkit-tools/cli/context/GENKIT.js.md

@@ -1,4 +1,4 @@
-# Genkit Node.js API Rules (v1.17.1)
+# Genkit Node.js API Rules (v1.20.0)
 
 This document provides rules and examples for building with the Genkit API in Node.js.
 
@@ -102,41 +102,6 @@ export const basicInferenceFlow = ai.defineFlow(
 
 ### Text-to-Speech (TTS) Generation
 
-This helper function converts PCM audio data from the TTS model into a WAV-formatted data URI.
-
-```ts
-import { Buffer } from 'buffer';
-import { PassThrough } from 'stream';
-import { Writer as WavWriter } from 'wav';
-
-...
-
-async function pcmToWavDataUri(
-  pcmData: Buffer,
-  channels = 1,
-  sampleRate = 24000,
-  bitDepth = 16
-): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = [];
-    const passThrough = new PassThrough();
-
-    passThrough.on('data', (chunk) => chunks.push(chunk as Buffer));
-    passThrough.on('end', () => {
-      const wavBuffer = Buffer.concat(chunks);
-      const dataUri = `data:audio/wav;base64,${wavBuffer.toString('base64')}`;
-      resolve(dataUri);
-    });
-    passThrough.on('error', reject);
-
-    const writer = new WavWriter({ channels, sampleRate, bitDepth });
-    writer.pipe(passThrough);
-    writer.write(pcmData);
-    writer.end();
-  });
-}
-```
-
 #### Single-Speaker TTS
 
 ```ts
@@ -147,17 +112,12 @@ const TextToSpeechInputSchema = z.object({
     .optional()
     .describe('The voice name to use. Defaults to Algenib if not specified.'),
 });
-const TextToSpeechOutputSchema = z.object({
-  audioDataUri: z
-    .string()
-    .describe('The generated speech in WAV format as a base64 data URI.'),
-});
 
 export const textToSpeechFlow = ai.defineFlow(
   {
     name: 'textToSpeechFlow',
     inputSchema: TextToSpeechInputSchema,
-    outputSchema: TextToSpeechOutputSchema,
+    outputSchema: z.string().optional().describe('The generated audio URI'),
   },
   async (input) => {
     const response = await ai.generate({
@@ -175,16 +135,7 @@ export const textToSpeechFlow = ai.defineFlow(
       },
     });
 
-    const audioUrl = response.media?.url;
-    if (!audioUrl)
-      throw new Error('Audio generation failed: No media URL in response.');
-
-    const base64 = audioUrl.split(';base64,')[1];
-    if (!base64) throw new Error('Invalid audio data URI format from Genkit.');
-
-    const pcmBuffer = Buffer.from(base64, 'base64');
-    const audioDataUri = await pcmToWavDataUri(pcmBuffer);
-    return { audioDataUri };
+    return response.media?.url;
   }
 );
 ```
@@ -204,7 +155,7 @@ export const multiSpeakerTextToSpeechFlow = ai.defineFlow(
   {
     name: 'multiSpeakerTextToSpeechFlow',
     inputSchema: MultiSpeakerInputSchema,
-    outputSchema: TextToSpeechOutputSchema,
+    outputSchema: z.string().optional().describe('The generated audio URI'),
   },
   async (input) => {
     const response = await ai.generate({
@@ -233,16 +184,7 @@ export const multiSpeakerTextToSpeechFlow = ai.defineFlow(
       },
     });
 
-    const audioUrl = response.media?.url;
-    if (!audioUrl)
-      throw new Error('Audio generation failed: No media URL in response.');
-
-    const base64 = audioUrl.split(';base64,')[1];
-    if (!base64) throw new Error('Invalid audio data URI format from Genkit.');
-
-    const pcmBuffer = Buffer.from(base64, 'base64');
-    const audioDataUri = await pcmToWavDataUri(pcmBuffer);
-    return { audioDataUri };
+    return response.media?.url;
   }
 );
 ```
@@ -254,18 +196,13 @@ export const multiSpeakerTextToSpeechFlow = ai.defineFlow(
 ### Image Generation
 
 ```ts
-import * as fs from 'fs/promises';
-import parseDataURL from 'data-urls';
-
-...
-
 export const imageGenerationFlow = ai.defineFlow(
   {
     name: 'imageGenerationFlow',
     inputSchema: z
       .string()
       .describe('A detailed description of the image to generate'),
-    outputSchema: z.string().describe('Path to the generated .png image file'),
+    outputSchema: z.string().optional().describe('The generated image as URI'),
   },
   async (prompt) => {
     const response = await ai.generate({
@@ -274,18 +211,7 @@ export const imageGenerationFlow = ai.defineFlow(
       output: { format: 'media' },
     });
 
-    if (!response.media?.url) {
-      throw new Error('Image generation failed to produce media.');
-    }
-
-    const parsed = parseDataURL(response.media.url);
-    if (!parsed) {
-      throw new Error('Could not parse image data URL.');
-    }
-
-    const outputPath = './output.png';
-    await fs.writeFile(outputPath, parsed.body);
-    return outputPath;
+    return response.media?.url;
   }
 );
 ```

genkit-tools/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genkit-cli",
-  "version": "1.20.0",
+  "version": "1.22.0-rc.0",
   "description": "CLI for interacting with the Google Genkit AI framework",
   "license": "Apache-2.0",
   "keywords": [

genkit-tools/cli/src/cli.ts

@@ -138,10 +138,11 @@ export async function startCLI(): Promise<void> {
       logger.info(program.help());
     })
   );
-  // Default action to catch unknown commands.
-  program.action(() => {
-    // print help
+  // Handle unknown commands.
+  program.on('command:*', (operands) => {
+    logger.error(`error: unknown command '${operands[0]}'`);
     logger.info(program.help());
+    process.exit(1);
   });
 
   await program.parseAsync();

genkit-tools/cli/src/utils/updates.ts

@@ -232,7 +232,7 @@ export async function showUpdateNotification(): Promise<void> {
       ? 'installer script'
       : 'your package manager';
     const updateCommand = isCompiledBinary
-      ? 'curl -sL cli.genkit.dev | uninstall=true bash'
+      ? 'curl -sL cli.genkit.dev | upgrade=true bash'
       : 'npm install -g genkit-cli';
 
     const updateNotificationMessage =

genkit-tools/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genkit-ai/tools-common",
-  "version": "1.20.0",
+  "version": "1.22.0-rc.0",
   "scripts": {
     "compile": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json ./tsconfig.types.json",
     "build:clean": "rimraf ./lib",