feat(genai): Add generate content with routing option (#5327)

nardosalemu · telpirion · web-flow · commit df08f9fa71e2 · 2025-06-30T12:47:33.000-07:00
* feat(genai): Add generate content with routing option

* feat(genai): Add generate content with routing option

* feat(genai): Add generate content with routing option

* feat(genai): Add generate content with routing option

* feat(genai): Add generate content with routing option

---------

Co-authored-by: Eric Schmidt &lt;erschmid@google.com&gt;
diff --git a/genai/content_cache/contentcache_create_with_txt_gcs_pdf.go b/genai/content_cache/contentcache_create_with_txt_gcs_pdf.go
@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"time"
 
 	genai "google.golang.org/genai"
 )
@@ -65,7 +66,7 @@ func createContentCache(w io.Writer) (string, error) {
 			},
 		},
 		DisplayName: "example-cache",
-		TTL:         "86400s",
+		TTL:         time.Duration(time.Duration.Seconds(86400)),
 	}
 
 	res, err := client.Caches.Create(ctx, modelName, config)
diff --git a/genai/content_cache/contentcache_update.go b/genai/content_cache/contentcache_update.go
@@ -38,26 +38,26 @@ func updateContentCache(w io.Writer, cacheName string) error {
 
 	// Update expire time using TTL
 	resp, err := client.Caches.Update(ctx, cacheName, &genai.UpdateCachedContentConfig{
-		TTL: "36000s",
+		TTL: time.Duration(time.Duration.Seconds(36000)),
 	})
 	if err != nil {
 		return fmt.Errorf("failed to update content cache exp. time with TTL: %w", err)
 	}
 
-	fmt.Fprintf(w, "Cache expires in: %s\n", time.Until(*resp.ExpireTime))
+	fmt.Fprintf(w, "Cache expires in: %s\n", time.Until(resp.ExpireTime))
 	// Example response:
 	// Cache expires in: 10h0m0.005875s
 
 	// Update expire time using specific time stamp
 	inSevenDays := time.Now().Add(7 * 24 * time.Hour)
 	resp, err = client.Caches.Update(ctx, cacheName, &genai.UpdateCachedContentConfig{
-		ExpireTime: &inSevenDays,
+		ExpireTime: inSevenDays,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to update content cache expire time: %w", err)
 	}
 
-	fmt.Fprintf(w, "Cache expires in: %s\n", time.Until(*resp.ExpireTime))
+	fmt.Fprintf(w, "Cache expires in: %s\n", time.Until(resp.ExpireTime))
 	// Example response:
 	// Cache expires in: 167h59m59.80327s
 
diff --git a/genai/content_cache/contentcache_use_with_txt.go b/genai/content_cache/contentcache_use_with_txt.go
@@ -46,10 +46,8 @@ func useContentCacheWithTxt(w io.Writer, cacheName string) error {
 		return fmt.Errorf("failed to use content cache to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/controlled_generation/ctrlgen_with_enum_schema.go b/genai/controlled_generation/ctrlgen_with_enum_schema.go
@@ -39,7 +39,7 @@ func generateWithEnumSchema(w io.Writer) error {
 	contents := []*genai.Content{
 		{Parts: []*genai.Part{
 			{Text: "What type of instrument is an oboe?"},
-		}},
+		}, Role: "user"},
 	}
 	config := &genai.GenerateContentConfig{
 		ResponseMIMEType: "text/x.enum",
@@ -54,10 +54,8 @@ func generateWithEnumSchema(w io.Writer) error {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/controlled_generation/ctrlgen_with_nullable_schema.go b/genai/controlled_generation/ctrlgen_with_nullable_schema.go
@@ -49,7 +49,8 @@ Finally, Saturday rounds off the week with sunny skies, a temperature of 80°F,
 	contents := []*genai.Content{
 		{Parts: []*genai.Part{
 			{Text: prompt},
-		}},
+		},
+			Role: "user"},
 	}
 	config := &genai.GenerateContentConfig{
 		ResponseMIMEType: "application/json",
@@ -63,11 +64,11 @@ Finally, Saturday rounds off the week with sunny skies, a temperature of 80°F,
 					Items: &genai.Schema{
 						Type: "object",
 						Properties: map[string]*genai.Schema{
-							"Day":         {Type: "string", Nullable: true},
-							"Forecast":    {Type: "string", Nullable: true},
-							"Temperature": {Type: "integer", Nullable: true},
-							"Humidity":    {Type: "string", Nullable: true},
-							"Wind Speed":  {Type: "integer", Nullable: true},
+							"Day":         {Type: "string", Nullable: genai.Ptr(true)},
+							"Forecast":    {Type: "string", Nullable: genai.Ptr(true)},
+							"Temperature": {Type: "integer", Nullable: genai.Ptr(true)},
+							"Humidity":    {Type: "string", Nullable: genai.Ptr(true)},
+							"Wind Speed":  {Type: "integer", Nullable: genai.Ptr(true)},
 						},
 						Required: []string{"Day", "Temperature", "Forecast", "Wind Speed"},
 					},
@@ -81,10 +82,8 @@ Finally, Saturday rounds off the week with sunny skies, a temperature of 80°F,
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/controlled_generation/ctrlgen_with_resp_schema.go b/genai/controlled_generation/ctrlgen_with_resp_schema.go
@@ -57,7 +57,8 @@ func generateWithRespSchema(w io.Writer) error {
 	contents := []*genai.Content{
 		{Parts: []*genai.Part{
 			{Text: "List a few popular cookie recipes."},
-		}},
+		},
+			Role: "user"},
 	}
 	modelName := "gemini-2.0-flash-001"
 
@@ -66,10 +67,8 @@ func generateWithRespSchema(w io.Writer) error {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/count_tokens/counttoken_compute_with_txt.go b/genai/count_tokens/counttoken_compute_with_txt.go
@@ -40,7 +40,8 @@ func computeWithTxt(w io.Writer) error {
 	contents := []*genai.Content{
 		{Parts: []*genai.Part{
 			{Text: "What's the longest word in the English language?"},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.ComputeTokens(ctx, modelName, contents, nil)
diff --git a/genai/count_tokens/counttoken_resp_with_txt.go b/genai/count_tokens/counttoken_resp_with_txt.go
@@ -40,7 +40,8 @@ func generateTextAndCount(w io.Writer) error {
 	contents := []*genai.Content{
 		{Parts: []*genai.Part{
 			{Text: "Why is the sky blue?"},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)
diff --git a/genai/count_tokens/counttoken_with_txt_vid.go b/genai/count_tokens/counttoken_with_txt_vid.go
@@ -43,7 +43,8 @@ func countWithTxtAndVid(w io.Writer) error {
 				FileURI:  "gs://cloud-samples-data/generative-ai/video/pixel8.mp4",
 				MIMEType: "video/mp4",
 			}},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.CountTokens(ctx, modelName, contents, nil)
diff --git a/genai/go.mod b/genai/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/GoogleCloudPlatform/golang-samples v0.0.0-20250201051611-5fb145d1e974
-	google.golang.org/genai v0.4.0
+	google.golang.org/genai v1.6.0
 )
 
 require (
diff --git a/genai/go.sum b/genai/go.sum
@@ -113,8 +113,8 @@ golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
 golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 google.golang.org/api v0.217.0 h1:GYrUtD289o4zl1AhiTZL0jvQGa2RDLyC+kX1N/lfGOU=
 google.golang.org/api v0.217.0/go.mod h1:qMc2E8cBAbQlRypBTBWHklNJlaZZJBwDv81B1Iu8oSI=
-google.golang.org/genai v0.4.0 h1:nHLpFvp1i2nUGQ8CjIQ8j/6d3H79Echt1jiNLb9myDk=
-google.golang.org/genai v0.4.0/go.mod h1:yPyKKBezIg2rqZziLhHQ5CD62HWr7sLDLc2PDzdrNVs=
+google.golang.org/genai v1.6.0 h1:aG0J3QF/Ad2GsjHvY8LjRp9hiDl4hvLJN98YwkLDqFE=
+google.golang.org/genai v1.6.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=
 google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f h1:387Y+JbxF52bmesc8kq1NyYIp33dnxCw6eiA7JMsTmw=
 google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:0joYwWwLQh18AOj8zMYeZLjzuqcYTU3/nC5JdCvC3JI=
 google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=
diff --git a/genai/text_generation/text_generation_examples_test.go b/genai/text_generation/text_generation_examples_test.go
@@ -172,4 +172,18 @@ func TestTextGeneration(t *testing.T) {
 			t.Error("expected non-empty output, got empty")
 		}
 	})
+
+	t.Run("generate with routing", func(t *testing.T) {
+		buf.Reset()
+		err := generateWithRouting(buf)
+		if err != nil {
+			t.Fatalf("generateWithRouting failed: %v", err)
+		}
+
+		output := buf.String()
+		if output == "" {
+			t.Error("expected non-empty output, got empty")
+		}
+	})
+
 }
diff --git a/genai/text_generation/textgen_code_with_pdf.go b/genai/text_generation/textgen_code_with_pdf.go
@@ -43,18 +43,17 @@ func generateWithPDF(w io.Writer) error {
 				FileURI:  "https://storage.googleapis.com/cloud-samples-data/generative-ai/text/inefficient_fibonacci_series_python_code.pdf",
 				MIMEType: "application/pdf",
 			}},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)
 	if err != nil {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_config_with_txt.go b/genai/text_generation/textgen_config_with_txt.go
@@ -39,8 +39,8 @@ func generateWithConfig(w io.Writer) error {
 	contents := genai.Text("Why is the sky blue?")
 	// See the documentation: https://googleapis.github.io/python-genai/genai.html#genai.types.GenerateContentConfig
 	config := &genai.GenerateContentConfig{
-		Temperature:      genai.Ptr(0.0),
-		CandidateCount:   genai.Ptr(int64(1)),
+		Temperature:      genai.Ptr(float32(0.0)),
+		CandidateCount:   int32(1),
 		ResponseMIMEType: "application/json",
 	}
 
@@ -49,10 +49,8 @@ func generateWithConfig(w io.Writer) error {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 	// Example response:
 	// {
diff --git a/genai/text_generation/textgen_sys_instr_with_txt.go b/genai/text_generation/textgen_sys_instr_with_txt.go
@@ -50,10 +50,8 @@ func generateWithSystem(w io.Writer) error {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_transcript_with_gcs_audio.go b/genai/text_generation/textgen_transcript_with_gcs_audio.go
@@ -44,18 +44,17 @@ Use speaker A, speaker B, etc. to identify speakers.`},
 				FileURI:  "gs://cloud-samples-data/generative-ai/audio/pixel.mp3",
 				MIMEType: "audio/mpeg",
 			}},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)
 	if err != nil {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_with_gcs_audio.go b/genai/text_generation/textgen_with_gcs_audio.go
@@ -45,18 +45,17 @@ Create a chapter breakdown with timestamps for key sections or topics discussed.
 				FileURI:  "gs://cloud-samples-data/generative-ai/audio/pixel.mp3",
 				MIMEType: "audio/mpeg",
 			}},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)
 	if err != nil {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_with_multi_img.go b/genai/text_generation/textgen_with_multi_img.go
@@ -64,10 +64,8 @@ func generateWithMultiImg(w io.Writer) error {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_with_mute_video.go b/genai/text_generation/textgen_with_mute_video.go
@@ -43,18 +43,17 @@ func generateWithMuteVideo(w io.Writer) error {
 				FileURI:  "gs://cloud-samples-data/generative-ai/video/ad_copy_from_video.mp4",
 				MIMEType: "video/mp4",
 			}},
-		}},
+		},
+			Role: "user"},
 	}
 
 	resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)
 	if err != nil {
 		return fmt.Errorf("failed to generate content: %w", err)
 	}
 
-	respText, err := resp.Text()
-	if err != nil {
-		return fmt.Errorf("failed to convert model response to text: %w", err)
-	}
+	respText := resp.Text()
+
 	fmt.Fprintln(w, respText)
 
 	// Example response:
diff --git a/genai/text_generation/textgen_with_routing.go b/genai/text_generation/textgen_with_routing.go
diff --git a/genai/text_generation/textgen_with_txt.go b/genai/text_generation/textgen_with_txt.go
diff --git a/genai/text_generation/textgen_with_txt_img.go b/genai/text_generation/textgen_with_txt_img.go
diff --git a/genai/text_generation/textgen_with_txt_stream.go b/genai/text_generation/textgen_with_txt_stream.go
diff --git a/genai/text_generation/textgen_with_video.go b/genai/text_generation/textgen_with_video.go
diff --git a/genai/text_generation/textgen_with_youtube_video.go b/genai/text_generation/textgen_with_youtube_video.go
diff --git a/genai/tools/tools_code_exec_with_txt.go b/genai/tools/tools_code_exec_with_txt.go
diff --git a/genai/tools/tools_func_desc_with_txt.go b/genai/tools/tools_func_desc_with_txt.go
diff --git a/genai/tools/tools_google_search_with_txt.go b/genai/tools/tools_google_search_with_txt.go

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"encoding/json"`
`22`	`22`	`"fmt"`
`23`	`23`	`"io"`
	`24`	`+ "time"`
`24`	`25`
`25`	`26`	`genai "google.golang.org/genai"`
`26`	`27`	`)`
`@@ -65,7 +66,7 @@ func createContentCache(w io.Writer) (string, error) {`
`65`	`66`	`},`
`66`	`67`	`},`
`67`	`68`	`DisplayName: "example-cache",`
`68`		`- TTL: "86400s",`
	`69`	`+ TTL: time.Duration(time.Duration.Seconds(86400)),`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`res, err := client.Caches.Create(ctx, modelName, config)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ func computeWithTxt(w io.Writer) error {`
`40`	`40`	`contents := []*genai.Content{`
`41`	`41`	`{Parts: []*genai.Part{`
`42`	`42`	`{Text: "What's the longest word in the English language?"},`
`43`		`- }},`
	`43`	`+ },`
	`44`	`+ Role: "user"},`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`resp, err := client.Models.ComputeTokens(ctx, modelName, contents, nil)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ func generateTextAndCount(w io.Writer) error {`
`40`	`40`	`contents := []*genai.Content{`
`41`	`41`	`{Parts: []*genai.Part{`
`42`	`42`	`{Text: "Why is the sky blue?"},`
`43`		`- }},`
	`43`	`+ },`
	`44`	`+ Role: "user"},`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`resp, err := client.Models.GenerateContent(ctx, modelName, contents, nil)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ func countWithTxtAndVid(w io.Writer) error {`
`43`	`43`	`FileURI: "gs://cloud-samples-data/generative-ai/video/pixel8.mp4",`
`44`	`44`	`MIMEType: "video/mp4",`
`45`	`45`	`}},`
`46`		`- }},`
	`46`	`+ },`
	`47`	`+ Role: "user"},`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`resp, err := client.Models.CountTokens(ctx, modelName, contents, nil)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.23.0`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/GoogleCloudPlatform/golang-samples v0.0.0-20250201051611-5fb145d1e974`
`7`		`- google.golang.org/genai v0.4.0`
	`7`	`+ google.golang.org/genai v1.6.0`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`require (`