fix(go/plugins): update gemini models and modelgarden provider

go/plugins/googlegenai/models.go

@@ -27,8 +27,10 @@ const (
 	gemini20FlashThinkingExp0121 = "gemini-2.0-flash-thinking-exp-01-21"
 	gemini20FlashPrevImageGen    = "gemini-2.0-flash-preview-image-generation"
 
+	gemini25Flash            = "gemini-2.5-flash"
 	gemini25FlashPreview0417 = "gemini-2.5-flash-preview-04-17"
 
+	gemini25Pro            = "gemini-2.5-pro"
 	gemini25ProExp0325     = "gemini-2.5-pro-exp-03-25"
 	gemini25ProPreview0325 = "gemini-2.5-pro-preview-03-25"
 	gemini25ProPreview0506 = "gemini-2.5-pro-preview-05-06"
@@ -50,6 +52,8 @@ var (
 		gemini20ProExp0205,
 		gemini20FlashThinkingExp0121,
 		gemini20FlashPrevImageGen,
+		gemini25Flash,
+		gemini25Pro,
 		gemini25FlashPreview0417,
 		gemini25ProExp0325,
 		gemini25ProPreview0325,
@@ -70,6 +74,8 @@ var (
 		gemini20ProExp0205,
 		gemini20FlashThinkingExp0121,
 		gemini20FlashPrevImageGen,
+		gemini25Flash,
+		gemini25Pro,
 		gemini25FlashPreview0417,
 		gemini25ProExp0325,
 		gemini25ProPreview0325,
@@ -159,6 +165,18 @@ var (
 			Supports: &Multimodal,
 			Stage:    ai.ModelStageUnstable,
 		},
+		gemini25Flash: {
+			Label:    "Gemini 2.5 Flash",
+			Versions: []string{},
+			Supports: &Multimodal,
+			Stage:    ai.ModelStageStable,
+		},
+		gemini25Pro: {
+			Label:    "Gemini 2.5 Pro",
+			Versions: []string{},
+			Supports: &Multimodal,
+			Stage:    ai.ModelStageStable,
+		},
 		gemini25FlashPreview0417: {
 			Label:    "Gemini 2.5 Flash Preview 04-17",
 			Versions: []string{},

go/plugins/vertexai/modelgarden/anthropic.go

@@ -36,7 +36,6 @@ import (
 )
 
 const (
-	anthropicProvider = "anthropic"
 	MaxNumberOfTokens = 8192
 	ToolNameRegex     = `^[a-zA-Z0-9_-]{1,64}$`
 )
@@ -51,7 +50,7 @@ type Anthropic struct {
 }
 
 func (a *Anthropic) Name() string {
-	return anthropicProvider
+	return provider
 }
 
 func (a *Anthropic) Init(ctx context.Context, g *genkit.Genkit) (err error) {
@@ -106,7 +105,7 @@ func (a *Anthropic) Init(ctx context.Context, g *genkit.Genkit) (err error) {
 // AnthropicModel returns the [ai.Model] with the given name.
 // It returns nil if the model was not defined
 func AnthropicModel(g *genkit.Genkit, name string) ai.Model {
-	return genkit.LookupModel(g, anthropicProvider, name)
+	return genkit.LookupModel(g, provider, name)
 }
 
 // DefineModel adds the model to the registry
@@ -116,7 +115,7 @@ func (a *Anthropic) DefineModel(g *genkit.Genkit, name string, info *ai.ModelInf
 		var ok bool
 		mi, ok = anthropicModels[name]
 		if !ok {
-			return nil, fmt.Errorf("%s.DefineModel: called with unknown model %q and nil ModelInfo", anthropicProvider, name)
+			return nil, fmt.Errorf("%s.DefineModel: called with unknown model %q and nil ModelInfo", provider, name)
 		}
 	} else {
 		mi = *info
@@ -126,11 +125,11 @@ func (a *Anthropic) DefineModel(g *genkit.Genkit, name string, info *ai.ModelInf
 
 func defineAnthropicModel(g *genkit.Genkit, client anthropic.Client, name string, info ai.ModelInfo) ai.Model {
 	meta := &ai.ModelInfo{
-		Label:    anthropicProvider + "-" + name,
+		Label:    provider + "-" + name,
 		Supports: info.Supports,
 		Versions: info.Versions,
 	}
-	return genkit.DefineModel(g, anthropicProvider, name, meta, func(
+	return genkit.DefineModel(g, provider, name, meta, func(
 		ctx context.Context,
 		input *ai.ModelRequest,
 		cb func(context.Context, *ai.ModelResponseChunk) error,

go/plugins/vertexai/modelgarden/models.go

@@ -21,6 +21,8 @@ import (
 	"github.com/firebase/genkit/go/plugins/internal"
 )
 
+const provider = "vertexai"
+
 // supported anthropic models
 var anthropicModels = map[string]ai.ModelInfo{
 	"claude-3-5-sonnet-v2": {