refactor(plugins/googleai): revert adding prefixes

Author: cabljac

js/plugins/googleai/src/embedder.ts

@@ -97,9 +97,9 @@ export const geminiEmbedding001 = embedderRef({
 });
 
 export const SUPPORTED_MODELS = {
-  'googleai/embedding-001': textEmbeddingGecko001,
-  'googleai/text-embedding-004': textEmbedding004,
-  'googleai/gemini-embedding-001': geminiEmbedding001,
+  'embedding-001': textEmbeddingGecko001,
+  'text-embedding-004': textEmbedding004,
+  'gemini-embedding-001': geminiEmbedding001,
 };
 
 export function defineGoogleAIEmbedder(
@@ -116,22 +116,24 @@ export function defineGoogleAIEmbedder(
           'For more details see https://genkit.dev/docs/plugins/google-genai'
       );
   }
+  // Extract the bare model name for lookup and API calls
+  const apiModelName = name.startsWith('googleai/')
+    ? name.substring('googleai/'.length)
+    : name;
+
   const embedderReference: EmbedderReference =
-    SUPPORTED_MODELS[name] ??
+    SUPPORTED_MODELS[apiModelName] ??
     embedderRef({
       name: name,
       configSchema: GeminiEmbeddingConfigSchema,
       info: {
         dimensions: 768,
-        label: `Google AI - ${name}`,
+        label: `Google AI - ${apiModelName}`,
         supports: {
           input: ['text', 'image', 'video'],
         },
       },
     });
-  const apiModelName = embedderReference.name.startsWith('googleai/')
-    ? embedderReference.name.substring('googleai/'.length)
-    : embedderReference.name;
   return embedder(
     {
       name: embedderReference.name,

js/plugins/googleai/src/gemini.ts

@@ -59,7 +59,7 @@ import {
 import { downloadRequestMedia } from 'genkit/model/middleware';
 import { model } from 'genkit/plugin';
 import { runInNewSpan } from 'genkit/tracing';
-import { getApiKeyFromEnvVar, getGenkitClientHeader } from './common.js';
+import { getApiKeyFromEnvVar, getGenkitClientHeader } from './common';
 import { handleCacheIfNeeded } from './context-caching';
 import { extractCacheConfig } from './context-caching/utils';
 
@@ -645,26 +645,26 @@ export const gemma3ne4bit = modelRef({
 });
 
 export const SUPPORTED_GEMINI_MODELS = {
-  'googleai/gemini-1.5-pro': gemini15Pro,
-  'googleai/gemini-1.5-flash': gemini15Flash,
-  'googleai/gemini-1.5-flash-8b': gemini15Flash8b,
-  'googleai/gemini-2.0-pro-exp-02-05': gemini20ProExp0205,
-  'googleai/gemini-2.0-flash': gemini20Flash,
-  'googleai/gemini-2.0-flash-lite': gemini20FlashLite,
-  'googleai/gemini-2.0-flash-exp': gemini20FlashExp,
-  'googleai/gemini-2.5-pro-exp-03-25': gemini25ProExp0325,
-  'googleai/gemini-2.5-pro-preview-03-25': gemini25ProPreview0325,
-  'googleai/gemini-2.5-pro-preview-tts': gemini25ProPreviewTts,
-  'googleai/gemini-2.5-flash-preview-04-17': gemini25FlashPreview0417,
-  'googleai/gemini-2.5-flash-preview-tts': gemini25FlashPreviewTts,
-  'googleai/gemini-2.5-flash': gemini25Flash,
-  'googleai/gemini-2.5-flash-lite': gemini25FlashLite,
-  'googleai/gemini-2.5-pro': gemini25Pro,
-  'googleai/gemma-3-12b-it': gemma312bit,
-  'googleai/gemma-3-1b-it': gemma31bit,
-  'googleai/gemma-3-27b-it': gemma327bit,
-  'googleai/gemma-3-4b-it': gemma34bit,
-  'googleai/gemma-3n-e4b-it': gemma3ne4bit,
+  'gemini-1.5-pro': gemini15Pro,
+  'gemini-1.5-flash': gemini15Flash,
+  'gemini-1.5-flash-8b': gemini15Flash8b,
+  'gemini-2.0-pro-exp-02-05': gemini20ProExp0205,
+  'gemini-2.0-flash': gemini20Flash,
+  'gemini-2.0-flash-lite': gemini20FlashLite,
+  'gemini-2.0-flash-exp': gemini20FlashExp,
+  'gemini-2.5-pro-exp-03-25': gemini25ProExp0325,
+  'gemini-2.5-pro-preview-03-25': gemini25ProPreview0325,
+  'gemini-2.5-pro-preview-tts': gemini25ProPreviewTts,
+  'gemini-2.5-flash-preview-04-17': gemini25FlashPreview0417,
+  'gemini-2.5-flash-preview-tts': gemini25FlashPreviewTts,
+  'gemini-2.5-flash': gemini25Flash,
+  'gemini-2.5-flash-lite': gemini25FlashLite,
+  'gemini-2.5-pro': gemini25Pro,
+  'gemma-3-12b-it': gemma312bit,
+  'gemma-3-1b-it': gemma31bit,
+  'gemma-3-27b-it': gemma327bit,
+  'gemma-3-4b-it': gemma34bit,
+  'gemma-3n-e4b-it': gemma3ne4bit,
 };
 
 export const GENERIC_GEMINI_MODEL = modelRef({
@@ -1149,6 +1149,7 @@ export function defineGoogleAIModel({
     }
   }
 
+  // Extract the API model name for lookup and API calls
   const apiModelName = name.startsWith('googleai/')
     ? name.substring('googleai/'.length)
     : name;

js/plugins/googleai/src/index.ts

@@ -227,7 +227,7 @@ export function googleAIPlugin(options?: PluginOptions): GenkitPluginV2 {
         Object.keys(SUPPORTED_GEMINI_MODELS).forEach((name) => {
           actions.push(
             defineGoogleAIModel({
-              name,
+              name: `googleai/${name}`,
               apiKey: options?.apiKey,
               apiVersion: 'v1beta',
               baseUrl: options?.baseUrl,
@@ -241,7 +241,7 @@ export function googleAIPlugin(options?: PluginOptions): GenkitPluginV2 {
         Object.keys(SUPPORTED_GEMINI_MODELS).forEach((name) => {
           actions.push(
             defineGoogleAIModel({
-              name,
+              name: `googleai/${name}`,
               apiKey: options?.apiKey,
               baseUrl: options?.baseUrl,
               debugTraces: options?.experimental_debugTraces,
@@ -250,7 +250,9 @@ export function googleAIPlugin(options?: PluginOptions): GenkitPluginV2 {
         });
         Object.keys(EMBEDDER_MODELS).forEach((name) => {
           actions.push(
-            defineGoogleAIEmbedder(name, { apiKey: options?.apiKey })
+            defineGoogleAIEmbedder(`googleai/${name}`, {
+              apiKey: options?.apiKey,
+            })
           );
         });
       }
@@ -278,18 +280,20 @@ export function googleAIPlugin(options?: PluginOptions): GenkitPluginV2 {
     },
     async resolve(actionType: ActionType, actionName: string) {
       if (actionType === 'embedder') {
-        return defineGoogleAIEmbedder(actionName, { apiKey: options?.apiKey });
+        return defineGoogleAIEmbedder(`googleai/${actionName}`, {
+          apiKey: options?.apiKey,
+        });
       } else if (actionName.startsWith('veo')) {
         if (actionType === 'background-model') {
-          return defineVeoModel(actionName, options?.apiKey);
+          return defineVeoModel(`googleai/${actionName}`, options?.apiKey);
         }
       } else if (actionType === 'model') {
         if (actionName.startsWith('imagen')) {
-          return defineImagenModel(actionName, options?.apiKey);
+          return defineImagenModel(`googleai/${actionName}`, options?.apiKey);
         }
         // Fallback dynamic Gemini model
         return defineGoogleAIModel({
-          name: actionName,
+          name: `googleai/${actionName}`,
           apiKey: options?.apiKey,
           baseUrl: options?.baseUrl,
           debugTraces: options?.experimental_debugTraces,

js/plugins/googleai/tests/gemini_test.ts

@@ -619,6 +619,7 @@ describe('plugin', () => {
         toolChoice: true,
         systemRole: true,
         constrained: 'no-tools',
+        contextCache: true,
       });
 
       const bananaRef = gemini('gemini-4.0-banana');