From 46bb21b402c6ecc4ef81625375aadc0dd5675e37 Mon Sep 17 00:00:00 2001 From: chgill Date: Wed, 11 Dec 2024 19:38:02 +0000 Subject: [PATCH 1/5] Added Gemini 2.0 Flash Experimental to Google AI plugin --- js/plugins/googleai/src/gemini.ts | 16 ++++++++++++++++ js/plugins/googleai/src/index.ts | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/js/plugins/googleai/src/gemini.ts b/js/plugins/googleai/src/gemini.ts index 81a6809e5..7d73b47e4 100644 --- a/js/plugins/googleai/src/gemini.ts +++ b/js/plugins/googleai/src/gemini.ts @@ -157,6 +157,21 @@ export const gemini15Flash8b = modelRef({ configSchema: GeminiConfigSchema, }); +export const gemini20FlashExperimental = modelRef({ + name: 'googleai/gemini-2.0-flash-exp', + info: { + label: 'Google AI - Gemini 2.0 Flash (Experimental)', + versions: [], + supports: { + multiturn: true, + media: false, + tools: true, + systemRole: true, + }, + }, + configSchema: GeminiConfigSchema, +}); + export const SUPPORTED_V1_MODELS = { 'gemini-1.0-pro': gemini10Pro, }; @@ -165,6 +180,7 @@ export const SUPPORTED_V15_MODELS = { 'gemini-1.5-pro': gemini15Pro, 'gemini-1.5-flash': gemini15Flash, 'gemini-1.5-flash-8b': gemini15Flash8b, + 'gemini-2.0-flash-exp': gemini20FlashExperimental, }; export const SUPPORTED_GEMINI_MODELS: Record< diff --git a/js/plugins/googleai/src/index.ts b/js/plugins/googleai/src/index.ts index abb731426..7eedb6b10 100644 --- a/js/plugins/googleai/src/index.ts +++ b/js/plugins/googleai/src/index.ts @@ -28,8 +28,10 @@ import { gemini10Pro, gemini15Flash, gemini15Pro, + gemini20FlashExperimental, + gemini15Flash8b, } from './gemini.js'; -export { gemini10Pro, gemini15Flash, gemini15Pro, textEmbeddingGecko001 }; +export { gemini10Pro, gemini15Flash, gemini15Pro, gemini20FlashExperimental, gemini15Flash8b, textEmbeddingGecko001 }; export interface PluginOptions { apiKey?: string; From f4327d422cbc0422d9b356598aced1079b7e9afb Mon Sep 17 00:00:00 2001 From: chgill Date: Wed, 11 Dec 2024 19:45:47 +0000 Subject: [PATCH 2/5] Added Gemini 2.0 Flash to Vertex AI plugin --- js/plugins/vertexai/src/gemini.ts | 16 ++++++++++++++++ js/plugins/vertexai/src/index.ts | 2 ++ 2 files changed, 18 insertions(+) diff --git a/js/plugins/vertexai/src/gemini.ts b/js/plugins/vertexai/src/gemini.ts index 574698763..c9da569fa 100644 --- a/js/plugins/vertexai/src/gemini.ts +++ b/js/plugins/vertexai/src/gemini.ts @@ -126,6 +126,21 @@ export const gemini15Flash = modelRef({ configSchema: GeminiConfigSchema, }); +export const gemini20FlashExperimental = modelRef({ + name: 'googleai/gemini-2.0-flash-exp', + info: { + label: 'Google AI - Gemini 2.0 Flash (Experimental)', + versions: [], + supports: { + multiturn: true, + media: false, + tools: true, + systemRole: true, + }, + }, + configSchema: GeminiConfigSchema, +}); + export const SUPPORTED_V1_MODELS = { 'gemini-1.0-pro': gemini10Pro, }; @@ -133,6 +148,7 @@ export const SUPPORTED_V1_MODELS = { export const SUPPORTED_V15_MODELS = { 'gemini-1.5-pro': gemini15Pro, 'gemini-1.5-flash': gemini15Flash, + 'gemini-2.0-flash-exp': gemini20FlashExperimental, }; export const SUPPORTED_GEMINI_MODELS = { diff --git a/js/plugins/vertexai/src/index.ts b/js/plugins/vertexai/src/index.ts index 688be3f82..27bb3bb00 100644 --- a/js/plugins/vertexai/src/index.ts +++ b/js/plugins/vertexai/src/index.ts @@ -32,6 +32,7 @@ import { gemini10Pro, gemini15Flash, gemini15Pro, + gemini20FlashExperimental, } from './gemini.js'; import { SUPPORTED_IMAGEN_MODELS, @@ -45,6 +46,7 @@ export { gemini10Pro, gemini15Flash, gemini15Pro, + gemini20FlashExperimental, imagen2, imagen3, imagen3Fast, From 97ff2b90bb9590fbed12fe83007cc29a1c1beeec Mon Sep 17 00:00:00 2001 From: chgill Date: Wed, 11 Dec 2024 21:38:49 +0000 Subject: [PATCH 3/5] Shortened model name --- js/core/src/logging.ts | 2 +- js/plugins/googleai/src/gemini.ts | 4 ++-- js/plugins/googleai/src/index.ts | 13 ++++++++++--- js/plugins/vertexai/src/gemini.ts | 4 ++-- js/plugins/vertexai/src/index.ts | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/js/core/src/logging.ts b/js/core/src/logging.ts index dd15e05ed..c1d49f7e1 100644 --- a/js/core/src/logging.ts +++ b/js/core/src/logging.ts @@ -81,4 +81,4 @@ class Logger { } } -export const logger = new Logger(); \ No newline at end of file +export const logger = new Logger(); diff --git a/js/plugins/googleai/src/gemini.ts b/js/plugins/googleai/src/gemini.ts index 7d73b47e4..1564405d9 100644 --- a/js/plugins/googleai/src/gemini.ts +++ b/js/plugins/googleai/src/gemini.ts @@ -157,7 +157,7 @@ export const gemini15Flash8b = modelRef({ configSchema: GeminiConfigSchema, }); -export const gemini20FlashExperimental = modelRef({ +export const gemini20FlashExp = modelRef({ name: 'googleai/gemini-2.0-flash-exp', info: { label: 'Google AI - Gemini 2.0 Flash (Experimental)', @@ -180,7 +180,7 @@ export const SUPPORTED_V15_MODELS = { 'gemini-1.5-pro': gemini15Pro, 'gemini-1.5-flash': gemini15Flash, 'gemini-1.5-flash-8b': gemini15Flash8b, - 'gemini-2.0-flash-exp': gemini20FlashExperimental, + 'gemini-2.0-flash-exp': gemini20FlashExp, }; export const SUPPORTED_GEMINI_MODELS: Record< diff --git a/js/plugins/googleai/src/index.ts b/js/plugins/googleai/src/index.ts index 7eedb6b10..be1de65f1 100644 --- a/js/plugins/googleai/src/index.ts +++ b/js/plugins/googleai/src/index.ts @@ -27,11 +27,18 @@ import { defineGoogleAIModel, gemini10Pro, gemini15Flash, - gemini15Pro, - gemini20FlashExperimental, gemini15Flash8b, + gemini15Pro, + gemini20FlashExp, } from './gemini.js'; -export { gemini10Pro, gemini15Flash, gemini15Pro, gemini20FlashExperimental, gemini15Flash8b, textEmbeddingGecko001 }; +export { + gemini10Pro, + gemini15Flash, + gemini15Flash8b, + gemini15Pro, + gemini20FlashExp, + textEmbeddingGecko001, +}; export interface PluginOptions { apiKey?: string; diff --git a/js/plugins/vertexai/src/gemini.ts b/js/plugins/vertexai/src/gemini.ts index c9da569fa..d2b7305cf 100644 --- a/js/plugins/vertexai/src/gemini.ts +++ b/js/plugins/vertexai/src/gemini.ts @@ -126,7 +126,7 @@ export const gemini15Flash = modelRef({ configSchema: GeminiConfigSchema, }); -export const gemini20FlashExperimental = modelRef({ +export const gemini20FlashExp = modelRef({ name: 'googleai/gemini-2.0-flash-exp', info: { label: 'Google AI - Gemini 2.0 Flash (Experimental)', @@ -148,7 +148,7 @@ export const SUPPORTED_V1_MODELS = { export const SUPPORTED_V15_MODELS = { 'gemini-1.5-pro': gemini15Pro, 'gemini-1.5-flash': gemini15Flash, - 'gemini-2.0-flash-exp': gemini20FlashExperimental, + 'gemini-2.0-flash-exp': gemini20FlashExp, }; export const SUPPORTED_GEMINI_MODELS = { diff --git a/js/plugins/vertexai/src/index.ts b/js/plugins/vertexai/src/index.ts index 27bb3bb00..6648ca686 100644 --- a/js/plugins/vertexai/src/index.ts +++ b/js/plugins/vertexai/src/index.ts @@ -32,7 +32,7 @@ import { gemini10Pro, gemini15Flash, gemini15Pro, - gemini20FlashExperimental, + gemini20FlashExp, } from './gemini.js'; import { SUPPORTED_IMAGEN_MODELS, @@ -46,7 +46,7 @@ export { gemini10Pro, gemini15Flash, gemini15Pro, - gemini20FlashExperimental, + gemini20FlashExp, imagen2, imagen3, imagen3Fast, From aa307e7468ac75a389d409ccd17cd384dd7ca002 Mon Sep 17 00:00:00 2001 From: Chris Ray Gill Date: Wed, 11 Dec 2024 17:12:37 -0500 Subject: [PATCH 4/5] Update js/plugins/vertexai/src/gemini.ts Co-authored-by: Pavel Jbanov --- js/plugins/vertexai/src/gemini.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/plugins/vertexai/src/gemini.ts b/js/plugins/vertexai/src/gemini.ts index d2b7305cf..fa17b5e1e 100644 --- a/js/plugins/vertexai/src/gemini.ts +++ b/js/plugins/vertexai/src/gemini.ts @@ -127,7 +127,7 @@ export const gemini15Flash = modelRef({ }); export const gemini20FlashExp = modelRef({ - name: 'googleai/gemini-2.0-flash-exp', + name: 'vertexai/gemini-2.0-flash-exp', info: { label: 'Google AI - Gemini 2.0 Flash (Experimental)', versions: [], From 2960b638a1b164900f6c44c20af3898aef7050e3 Mon Sep 17 00:00:00 2001 From: Chris Ray Gill Date: Wed, 11 Dec 2024 17:14:46 -0500 Subject: [PATCH 5/5] Some fixes --- js/plugins/googleai/src/gemini.ts | 2 +- js/plugins/vertexai/src/gemini.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/plugins/googleai/src/gemini.ts b/js/plugins/googleai/src/gemini.ts index 1564405d9..a734acac3 100644 --- a/js/plugins/googleai/src/gemini.ts +++ b/js/plugins/googleai/src/gemini.ts @@ -164,7 +164,7 @@ export const gemini20FlashExp = modelRef({ versions: [], supports: { multiturn: true, - media: false, + media: true, tools: true, systemRole: true, }, diff --git a/js/plugins/vertexai/src/gemini.ts b/js/plugins/vertexai/src/gemini.ts index fa17b5e1e..12caa1bbc 100644 --- a/js/plugins/vertexai/src/gemini.ts +++ b/js/plugins/vertexai/src/gemini.ts @@ -129,11 +129,11 @@ export const gemini15Flash = modelRef({ export const gemini20FlashExp = modelRef({ name: 'vertexai/gemini-2.0-flash-exp', info: { - label: 'Google AI - Gemini 2.0 Flash (Experimental)', + label: 'Vertex AI - Gemini 2.0 Flash (Experimental)', versions: [], supports: { multiturn: true, - media: false, + media: true, tools: true, systemRole: true, },