update imagen model config

Author: hugoaguirre

go/plugins/googlegenai/gemini.go

@@ -88,14 +88,27 @@ func configToMap(config any) map[string]any {
 	r := jsonschema.Reflector{
 		DoNotReference: true, // Prevent $ref usage
 		ExpandedStruct: true, // Include all fields directly
-		// Prevent stack overflow panic due type traversal recursion (circular references)
-		// [genai.Schema] should not be used at this point since Schema is provided later
 		// NOTE: keep track of updated fields in [genai.GenerateContentConfig] since
 		// they could create runtime panics when parsing fields with type recursion
-		IgnoredTypes: []any{genai.Schema{}},
+		IgnoredTypes: []any{
+			genai.Schema{},
+			genai.Tool{},
+			genai.ToolConfig{},
+			genai.HTTPOptions{},
+		},
 	}
+
 	schema := r.Reflect(config)
 	result := base.SchemaAsMap(schema)
+
+	// prevent users to override Genkit primitive features
+	if propertiesMap, ok := result["properties"].(map[string]any); ok {
+		delete(propertiesMap, "cachedContent")
+		delete(propertiesMap, "systemInstruction")
+		delete(propertiesMap, "responseMimeType")
+		delete(propertiesMap, "responseJsonSchema")
+		delete(propertiesMap, "candidateCount")
+	}
 	return result
 }
 
@@ -140,9 +153,8 @@ func newModel(client *genai.Client, name string, opts ai.ModelOptions) ai.Model
 
 	var config any
 	config = &genai.GenerateContentConfig{}
-	if imageOpts, found := supportedImagenModels[name]; found {
+	if strings.Contains(name, "imagen") {
 		config = &genai.GenerateImagesConfig{}
-		opts = imageOpts
 	}
 	meta := &ai.ModelOptions{
 		Label:        opts.Label,

go/plugins/googlegenai/googlegenai.go

@@ -346,7 +346,7 @@ func (ga *GoogleAI) ListActions(ctx context.Context) []core.ActionDesc {
 			"model": map[string]any{
 				"supports": map[string]any{
 					"media":       true,
-					"multiturn":   false,
+					"multiturn":   true,
 					"systemRole":  false,
 					"tools":       false,
 					"toolChoice":  false,

go/plugins/googlegenai/models.go

@@ -406,7 +406,6 @@ type genaiModels struct {
 func listGenaiModels(ctx context.Context, client *genai.Client) (genaiModels, error) {
 	models := genaiModels{}
 	allowedModels := []string{"gemini", "gemma"}
-	allowedImagenModels := []string{"imagen"}
 
 	for item, err := range client.Models.All(ctx) {
 		var name string
@@ -428,26 +427,20 @@ func listGenaiModels(ctx context.Context, client *genai.Client) (genaiModels, er
 			continue
 		}
 
-		if !slices.Contains(item.SupportedActions, "generateContent") {
-			continue
-		}
-
-		found := slices.ContainsFunc(allowedModels, func(s string) bool {
-			return strings.Contains(name, s)
-		})
-		// filter out: Aqa, Text-bison, Chat, learnlm
-		if found {
-			models.gemini = append(models.gemini, name)
+		if slices.Contains(item.SupportedActions, "predict") && strings.Contains(name, "imagen") {
+			models.imagen = append(models.imagen, name)
 			continue
 		}
 
-		found = slices.ContainsFunc(allowedImagenModels, func(s string) bool {
-			return strings.Contains(name, s)
-		})
-		// filter out: Aqa, Text-bison, Chat, learnlm
-		if found {
-			models.imagen = append(models.imagen, name)
-			continue
+		if slices.Contains(item.SupportedActions, "generateContent") {
+			found := slices.ContainsFunc(allowedModels, func(s string) bool {
+				return strings.Contains(name, s)
+			})
+			// filter out: Aqa, Text-bison, Chat, learnlm
+			if found {
+				models.gemini = append(models.gemini, name)
+				continue
+			}
 		}
 	}