Merge branch '@invertase/migrate-googlegenai-plugin' of https://github.com/firebase/genkit into @invertase/migrate-googlegenai-plugin

Author: CorieW

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

@@ -90,7 +90,7 @@ const KNOWN_MODELS = {
 };
 export type KnownModels = keyof typeof KNOWN_MODELS; // For autocomplete
 
-export function createModelRef(
+export function createEmbedderRef(
   version: string,
   config: EmbeddingConfig = {}
 ): EmbedderReference<ConfigSchemaType> {
@@ -112,7 +112,7 @@ export function listActions(models: Model[]): ActionMetadata[] {
       // Filter out deprecated
       .filter((m) => !m.description || !m.description.includes('deprecated'))
       .map((m) => {
-        const ref = createModelRef(m.name);
+        const ref = createEmbedderRef(m.name);
         return embedderActionMetadata({
           name: ref.name,
           info: ref.info,
@@ -133,7 +133,7 @@ export function defineEmbedder(
   pluginOptions?: GoogleAIPluginOptions
 ): EmbedderAction {
   checkApiKey(pluginOptions?.apiKey);
-  const ref = createModelRef(name);
+  const ref = createEmbedderRef(name);
 
   return embedder(
     {

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

@@ -126,7 +126,7 @@ const KNOWN_MODELS = {
 } as const;
 export type KnownModels = keyof typeof KNOWN_MODELS; // For autocomplete
 
-// For conditional types in index.ts model
+// For conditional types in index.ts model()
 export type ImagenModelName = `imagen-${string}`;
 export function isImagenModelName(value?: string): value is ImagenModelName {
   return !!value?.startsWith('imagen-');

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

@@ -172,7 +172,7 @@ googleAI.embedder = (
   name: string,
   config?: embedder.EmbeddingConfig
 ): EmbedderReference<embedder.EmbeddingConfigSchemaType> => {
-  return embedder.createModelRef(name, config);
+  return embedder.createEmbedderRef(name, config);
 };
 
 export default googleAI;

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

@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ActionMetadata,
-  embedderActionMetadata,
-  z,
-  type Document,
-} from 'genkit';
+import { z, type Document } from 'genkit';
 import {
   EmbedderInfo,
   embedderRef,
@@ -34,7 +29,6 @@ import {
   EmbeddingInstance,
   EmbeddingPrediction,
   EmbeddingResult,
-  Model,
   TaskTypeSchema,
   VertexPluginOptions,
   isMultimodalEmbeddingPrediction,
@@ -122,7 +116,7 @@ export function isEmbedderModelName(
   return !!value?.includes('embedding');
 }
 
-export function createModelRef(
+export function createEmbedderRef(
   version: string,
   config: EmbeddingConfig = {}
 ): EmbedderReference<ConfigSchemaType> {
@@ -159,21 +153,6 @@ export function createModelRef(
   });
 }
 
-// Takes a full list of models, filters for current Veo models only
-// and returns a modelActionMetadata for each.
-export function listActions(models: Model[]): ActionMetadata[] {
-  return models
-    .filter((m: Model) => isEmbedderModelName(m.name))
-    .map((m: Model) => {
-      const ref = createModelRef(m.name);
-      return embedderActionMetadata({
-        name: ref.name,
-        info: ref.info,
-        configSchema: ref.configSchema,
-      });
-    });
-}
-
 export function defineKnownModels(
   clientOptions: ClientOptions,
   pluginOptions?: VertexPluginOptions
@@ -188,7 +167,7 @@ export function defineEmbedder(
   clientOptions: ClientOptions,
   pluginOptions?: VertexPluginOptions
 ): EmbedderAction<any> {
-  const ref = createModelRef(name);
+  const ref = createEmbedderRef(name);
 
   return embedder(
     {

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

@@ -156,7 +156,7 @@ vertexAI.embedder = (
   name: string,
   config?: embedder.EmbeddingConfig
 ): EmbedderReference<embedder.EmbeddingConfigSchemaType> => {
-  return embedder.createModelRef(name, config);
+  return embedder.createEmbedderRef(name, config);
 };
 
 export default vertexAI;