Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions js/plugins/googleai/src/gemini.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export const gemini15Pro = modelRef({
tools: true,
systemRole: true,
},
versions: ['gemini-1.5-pro-001'],
},
configSchema: GeminiConfigSchema,
});
Expand All @@ -127,6 +128,7 @@ export const gemini15Flash = modelRef({
tools: true,
systemRole: true,
},
versions: ['gemini-1.5-flash-001'],
},
configSchema: GeminiConfigSchema,
});
Expand Down
3 changes: 3 additions & 0 deletions js/plugins/googleai/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ export const googleAI: Plugin<[PluginOptions] | []> = genkitPlugin(
...Object.keys(SUPPORTED_V1_MODELS).map((name) =>
googleAIModel(name, options?.apiKey, undefined, options?.baseUrl)
),
...Object.keys(SUPPORTED_V15_MODELS).map((name) =>
googleAIModel(name, options?.apiKey, 'v1beta', options?.baseUrl)
),
];
embedders = [
...Object.keys(EMBEDDER_MODELS).map((name) =>
Expand Down
32 changes: 32 additions & 0 deletions js/plugins/vertexai/src/gemini.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,21 @@ export const geminiProVision = modelRef({
configSchema: GeminiConfigSchema,
});

export const gemini15Pro = modelRef({
name: 'vertexai/gemini-1.5-pro',
info: {
label: 'Vertex AI - Gemini 1.5 Pro',
versions: ['gemini-1.0-pro-001'],
supports: {
multiturn: true,
media: true,
tools: true,
systemRole: true,
},
},
configSchema: GeminiConfigSchema,
});

export const gemini15ProPreview = modelRef({
name: 'vertexai/gemini-1.5-pro-preview',
info: {
Expand Down Expand Up @@ -119,13 +134,30 @@ export const gemini15FlashPreview = modelRef({
version: 'gemini-1.5-flash-preview-0514',
});

export const gemini15Flash = modelRef({
name: 'vertexai/gemini-1.5-flash',
info: {
label: 'Vertex AI - Gemini 1.5 Flash',
versions: ['gemini-1.5-flash-001'],
supports: {
multiturn: true,
media: true,
tools: true,
systemRole: true,
},
},
configSchema: GeminiConfigSchema,
});

export const SUPPORTED_V1_MODELS = {
'gemini-1.0-pro': geminiPro,
'gemini-1.0-pro-vision': geminiProVision,
// 'gemini-ultra': geminiUltra,
};

export const SUPPORTED_V15_MODELS = {
'gemini-1.5-pro': gemini15Pro,
'gemini-1.5-flash': gemini15Flash,
'gemini-1.5-pro-preview': gemini15ProPreview,
'gemini-1.5-flash-preview': gemini15FlashPreview,
};
Expand Down
4 changes: 4 additions & 0 deletions js/plugins/vertexai/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ import {
vertexEvaluators,
} from './evaluation.js';
import {
gemini15Flash,
gemini15FlashPreview,
gemini15Pro,
gemini15ProPreview,
geminiModel,
geminiPro,
Expand All @@ -49,7 +51,9 @@ export {
claude3Haiku,
claude3Opus,
claude3Sonnet,
gemini15Flash,
gemini15FlashPreview,
gemini15Pro,
gemini15ProPreview,
geminiPro,
geminiProVision,
Expand Down
2 changes: 1 addition & 1 deletion js/testapps/rag/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default configureGenkit({
plugins: [
dotprompt(),
firebase(),
googleAI({ apiVersion: ['v1', 'v1beta'] }),
googleAI({ apiVersion: ['v1'] }),
genkitEval({
judge: geminiPro,
judgeConfig: {
Expand Down