Skip to content

refactor(plugins/googleai): migrate to v2 #3749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+143 −136
Draft

refactor(plugins/googleai): migrate to v2 #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35e2318
refactor(plugins/googleai): migrate to v2
CorieW Oct 27, 2025
c79c78b
chore: format
CorieW Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions js/plugins/googleai/src/embedder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import {
z,
type EmbedderAction,
type EmbedderReference,
type Genkit,
} from 'genkit';
import { embedderRef } from 'genkit/embedder';
import { embedderRef as createEmbedderRef } from 'genkit/embedder';
import { embedder } from 'genkit/plugin';
import { getApiKeyFromEnvVar } from './common.js';
import type { PluginOptions } from './index.js';

Expand Down Expand Up @@ -60,7 +60,7 @@ export const GeminiEmbeddingConfigSchema = z.object({

export type GeminiEmbeddingConfig = z.infer<typeof GeminiEmbeddingConfigSchema>;

export const textEmbeddingGecko001 = embedderRef({
export const textEmbeddingGecko001 = createEmbedderRef({
name: 'googleai/embedding-001',
configSchema: GeminiEmbeddingConfigSchema,
info: {
Expand All @@ -72,7 +72,7 @@ export const textEmbeddingGecko001 = embedderRef({
},
});

export const textEmbedding004 = embedderRef({
export const textEmbedding004 = createEmbedderRef({
name: 'googleai/text-embedding-004',
configSchema: GeminiEmbeddingConfigSchema,
info: {
Expand All @@ -84,7 +84,7 @@ export const textEmbedding004 = embedderRef({
},
});

export const geminiEmbedding001 = embedderRef({
export const geminiEmbedding001 = createEmbedderRef({
name: 'googleai/gemini-embedding-001',
configSchema: GeminiEmbeddingConfigSchema,
info: {
Expand All @@ -103,7 +103,6 @@ export const SUPPORTED_MODELS = {
};

export function defineGoogleAIEmbedder(
ai: Genkit,
name: string,
pluginOptions: PluginOptions
): EmbedderAction<any> {
Expand All @@ -117,9 +116,9 @@ export function defineGoogleAIEmbedder(
'For more details see https://genkit.dev/docs/plugins/google-genai'
);
}
const embedder: EmbedderReference =
const embedderRef: EmbedderReference =
SUPPORTED_MODELS[name] ??
embedderRef({
createEmbedderRef({
name: name,
configSchema: GeminiEmbeddingConfigSchema,
info: {
Expand All @@ -130,16 +129,16 @@ export function defineGoogleAIEmbedder(
},
},
});
const apiModelName = embedder.name.startsWith('googleai/')
? embedder.name.substring('googleai/'.length)
: embedder.name;
return ai.defineEmbedder(
const apiModelName = embedderRef.name.startsWith('googleai/')
? embedderRef.name.substring('googleai/'.length)
: embedderRef.name;
return embedder(
{
name: embedder.name,
name: embedderRef.name,
configSchema: GeminiEmbeddingConfigSchema,
info: embedder.info!,
info: embedderRef.info!,
},
async (input, options) => {
async ({ input, options }) => {
if (pluginOptions.apiKey === false && !options?.apiKey) {
throw new GenkitError({
status: 'INVALID_ARGUMENT',
Expand All @@ -152,8 +151,8 @@ export function defineGoogleAIEmbedder(
).getGenerativeModel({
model:
options?.version ||
embedder.config?.version ||
embedder.version ||
embedderRef.config?.version ||
embedderRef.version ||
apiModelName,
});
const embeddings = await Promise.all(
Expand Down
Loading