fix(js/plugins/google-genai): Fix streaming aggregation of inlineData (#3794)

Author: ifielker

js/plugins/google-genai/src/common/utils.ts

@@ -491,6 +491,9 @@ function aggregateResponses(
           if (part.codeExecutionResult) {
             newPart.codeExecutionResult = part.codeExecutionResult;
           }
+          if (part.inlineData) {
+            newPart.inlineData = part.inlineData;
+          }
           if (Object.keys(newPart).length === 0) {
             newPart.text = '';
           }

js/plugins/google-genai/src/googleai/gemini.ts

@@ -370,9 +370,6 @@ const KNOWN_GEMINI_MODELS = {
   'gemini-2.5-flash-image-preview': commonRef('gemini-2.5-flash-image-preview'),
   'gemini-2.5-flash-image': commonRef('gemini-2.5-flash-image'),
   'gemini-2.0-flash': commonRef('gemini-2.0-flash'),
-  'gemini-2.0-flash-preview-image-generation': commonRef(
-    'gemini-2.0-flash-preview-image-generation'
-  ),
   'gemini-2.0-flash-lite': commonRef('gemini-2.0-flash-lite'),
 };
 export type KnownGeminiModels = keyof typeof KNOWN_GEMINI_MODELS;

js/plugins/google-genai/src/googleai/imagen.ts

@@ -116,7 +116,6 @@ const GENERIC_MODEL = commonRef('imagen', {
 });
 
 const KNOWN_MODELS = {
-  'imagen-3.0-generate-002': commonRef('imagen-3.0-generate-002'),
   'imagen-4.0-fast-generate-001': commonRef('imagen-4.0-fast-generate-001'),
   'imagen-4.0-generate-001': commonRef('imagen-4.0-generate-001'),
   'imagen-4.0-ultra-generate-001': commonRef('imagen-4.0-ultra-generate-001'),

js/plugins/google-genai/src/vertexai/veo.ts

@@ -150,8 +150,6 @@ const KNOWN_MODELS = {
   'veo-2.0-generate-001': commonRef('veo-2.0-generate-001'),
   'veo-3.0-generate-001': commonRef('veo-3.0-generate-001'),
   'veo-3.0-fast-generate-001': commonRef('veo-3.0-fast-generate-001'),
-  'veo-3.0-generate-preview': commonRef('veo-3.0-generate-preview'),
-  'veo-3.0-fast-generate-preview': commonRef('veo-3.0-fast-generate-preview'),
   'veo-3.1-fast-generate-001': commonRef('veo-3.1-fast-generate-001'),
   'veo-3.1-fast-generate-preview': commonRef('veo-3.1-fast-generate-preview'),
   'veo-3.1-generate-001': commonRef('veo-3.1-generate-001'),

js/plugins/vertexai/src/modelgarden/v2/anthropic.ts

@@ -83,9 +83,9 @@ function commonRef(
 export const GENERIC_MODEL = commonRef('anthropic');
 
 export const KNOWN_MODELS = {
+  'claude-haiku-4-5@20251001': commonRef('claude-haiku-4-5@20251001'),
   'claude-sonnet-4-5@20250929': commonRef('claude-sonnet-4-5@20250929'),
   'claude-sonnet-4@20250514': commonRef('claude-sonnet-4@20250514'),
-  'claude-3-7-sonnet@20250219': commonRef('claude-3-7-sonnet@20250219'),
   'claude-opus-4-1@20250805': commonRef('claude-opus-4-1@20250805'),
   'claude-opus-4@20250514': commonRef('claude-opus-4@20250514'),
   'claude-3-5-haiku@20241022': commonRef('claude-3-5-haiku@20241022'),

js/plugins/vertexai/src/modelgarden/v2/mistral.ts

@@ -98,6 +98,7 @@ export const KNOWN_MODELS = {
   'mistral-large-2411': commonRef('mistral-large-2411'),
   'mistral-ocr-2505': commonRef('mistral-ocr-2505'),
   'mistral-small-2503': commonRef('mistral-small-2503'),
+  'codestral-2': commonRef('codestral-2'),
   'codestral-2501': commonRef('codestral-2501'),
 };
 export type KnownModels = keyof typeof KNOWN_MODELS;

js/pnpm-lock.yaml

@@ -19,8 +19,7 @@
     "@genkit-ai/evaluator": "workspace:*",
     "@genkit-ai/firebase": "workspace:*",
     "@genkit-ai/google-cloud": "workspace:*",
-    "@genkit-ai/googleai": "workspace:*",
-    "@genkit-ai/vertexai": "workspace:*",
+    "@genkit-ai/google-genai": "workspace:*",
     "@google/generative-ai": "^0.15.0",
     "@opentelemetry/sdk-trace-base": "~1.25.0",
     "body-parser": "^1.20.3",

js/testapps/flow-simple-ai/package.json

@@ -17,8 +17,7 @@
 import { GenkitMetric, genkitEval } from '@genkit-ai/evaluator';
 import { defineFirestoreRetriever } from '@genkit-ai/firebase';
 import { enableGoogleCloudTelemetry } from '@genkit-ai/google-cloud';
-import { googleAI } from '@genkit-ai/googleai';
-import { vertexAI } from '@genkit-ai/vertexai';
+import { googleAI, vertexAI } from '@genkit-ai/google-genai';
 import { GoogleAIFileManager } from '@google/generative-ai/server';
 import { AlwaysOnSampler } from '@opentelemetry/sdk-trace-base';
 import { initializeApp } from 'firebase-admin/app';
@@ -255,17 +254,14 @@ export const jokeWithToolsFlow = ai.defineFlow(
   {
     name: 'jokeWithToolsFlow',
     inputSchema: z.object({
-      modelName: z.enum([
-        googleAI.model('gemini-2.5-flash').name,
-        googleAI.model('gemini-2.5-pro').name,
-      ]),
+      modelName: z.enum(['gemini-2.5-flash', 'gemini-2.5-pro']),
       subject: z.string(),
     }),
     outputSchema: z.object({ model: z.string(), joke: z.string() }),
   },
   async (input) => {
     const llmResponse = await ai.generate({
-      model: input.modelName as string,
+      model: googleAI.model(input.modelName as string),
       tools,
       output: { schema: z.object({ joke: z.string() }) },
       prompt: `Tell a joke about ${input.subject}.`,
@@ -282,14 +278,14 @@ export const jokeWithOutputFlow = ai.defineFlow(
   {
     name: 'jokeWithOutputFlow',
     inputSchema: z.object({
-      modelName: z.enum([googleAI.model('gemini-2.5-flash').name]),
+      modelName: z.enum(['gemini-2.5-flash']),
       subject: z.string(),
     }),
     outputSchema,
   },
   async (input, { sendChunk }) => {
     const llmResponse = await ai.generate({
-      model: input.modelName,
+      model: googleAI.model(input.modelName),
       output: {
         format: 'json',
         schema: outputSchema,
@@ -914,7 +910,7 @@ ai.defineFlow(
 
 ai.defineFlow('geminiImages', async (_, { sendChunk }) => {
   const { response, stream } = ai.generateStream({
-    model: googleAI.model('gemini-2.0-flash-preview-image-generation'),
+    model: googleAI.model('gemini-2.5-flash-image'),
     prompt: `generate an image of a banana riding a bicycle`,
     config: {
       responseModalities: ['TEXT', 'IMAGE'],