Skip to content

Updating all model used to be the 2.5 ones. #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updating all model used to be the 2.5 ones. #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_text_gen_text_only_prompt(self):

client = genai.Client()
response = client.models.generate_content(
model="gemini-2.0-flash", contents="Write a story about a magic backpack."
model="gemini-2.5-flash", contents="Write a story about a magic backpack."
)
print(response.text)
# [END text_gen_text_only_prompt]
Expand Down
14 changes: 7 additions & 7 deletions go/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func CacheCreate() (*genai.GenerateContentResponse, error) {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down Expand Up @@ -82,7 +82,7 @@ func CacheCreateFromName() (*genai.GenerateContentResponse, error) {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down Expand Up @@ -146,7 +146,7 @@ func CacheCreateFromChat() (*genai.GenerateContentResponse, error) {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
systemInstruction := "You are an expert analyzing transcripts."

// Create initial chat with a system instruction.
Expand Down Expand Up @@ -243,7 +243,7 @@ func CacheDelete() error {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down Expand Up @@ -291,7 +291,7 @@ func CacheGet() error {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down Expand Up @@ -343,7 +343,7 @@ func CacheList() error {
}

// For demonstration, create a cache first.
modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down Expand Up @@ -410,7 +410,7 @@ func CacheUpdate() error {
log.Fatal(err)
}

modelName := "gemini-1.5-flash-001"
modelName := "gemini-2.5-flash"
document, err := client.Files.UploadFromPath(
ctx,
filepath.Join(getMedia(), "a11.txt"),
Expand Down
6 changes: 3 additions & 3 deletions go/chat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Chat() error {
genai.NewContentFromText("Great to meet you. What would you like to know?", genai.RoleModel),
}

chat, err := client.Chats.Create(ctx, "gemini-2.0-flash", nil, history)
chat, err := client.Chats.Create(ctx, "gemini-2.5-flash", nil, history)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -64,7 +64,7 @@ func ChatStreaming() error {
genai.NewContentFromText("Hello", genai.RoleUser),
genai.NewContentFromText("Great to meet you. What would you like to know?", genai.RoleModel),
}
chat, err := client.Chats.Create(ctx, "gemini-2.0-flash", nil, history)
chat, err := client.Chats.Create(ctx, "gemini-2.5-flash", nil, history)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -102,7 +102,7 @@ func ChatStreamingWithImages() error {
log.Fatal(err)
}

chat, err := client.Chats.Create(ctx, "gemini-2.0-flash", nil, nil)
chat, err := client.Chats.Create(ctx, "gemini-2.5-flash", nil, nil)
if err != nil {
log.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions go/code_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func CodeExecutionBasic() (*genai.GenerateContentResponse, error) {

response, err := client.Models.GenerateContent(
ctx,
"gemini-2.0-pro-exp-02-05",
"gemini-2.5-pro",
genai.Text(
`Write and execute code that calculates the sum of the first 50 prime numbers.
Ensure that only the executable code and its resulting output are generated.`,
Expand Down Expand Up @@ -86,7 +86,7 @@ func CodeExecutionRequestOverride() (*genai.GenerateContentResponse, error) {

response, err := client.Models.GenerateContent(
ctx,
"gemini-2.0-pro-exp-02-05",
"gemini-2.5-pro",
genai.Text(
`What is the sum of the first 50 prime numbers?
Generate and run code for the calculation, and make sure you get all 50.`,
Expand Down
2 changes: 1 addition & 1 deletion go/configure_model_parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func ConfigureModelParameters() (*genai.GenerateContentResponse, error) {

response, err := client.Models.GenerateContent(
ctx,
"gemini-2.0-flash",
"gemini-2.5-flash",
genai.Text("Tell me a story about a magic backpack."),
&genai.GenerateContentConfig{
CandidateCount: candidateCount,
Expand Down
14 changes: 7 additions & 7 deletions go/controlled_generation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func JsonControlledGeneration() (*genai.GenerateContentResponse, error) {

response, err := client.Models.GenerateContent(
ctx,
"gemini-2.0-flash",
"gemini-2.5-flash",
genai.Text("List a few popular cookie recipes."),
config,
)
Expand All @@ -68,7 +68,7 @@ func JsonNoSchema() (*genai.GenerateContentResponse, error) {
"Use this JSON schema:\n\n" +
"Recipe = {'recipe_name': str, 'ingredients': list[str]}\n" +
"Return: list[Recipe]"
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", genai.Text(prompt), nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", genai.Text(prompt), nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -134,7 +134,7 @@ func JsonEnum() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash",
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash",
contents,
config,
)
Expand Down Expand Up @@ -173,7 +173,7 @@ func EnumInJson() (*genai.GenerateContentResponse, error) {
ResponseMIMEType: "application/json",
ResponseSchema: schema,
}
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash",
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash",
genai.Text("List about 10 cookie recipes, grade them based on popularity"),
config,
)
Expand Down Expand Up @@ -223,7 +223,7 @@ func JsonEnumRaw() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash",
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash",
contents,
config,
)
Expand Down Expand Up @@ -292,7 +292,7 @@ func XEnum() (*genai.GenerateContentResponse, error) {
contents := []*genai.Content{
genai.NewContentFromParts(parts, genai.RoleUser),
}
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash",
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash",
contents,
config,
)
Expand Down Expand Up @@ -341,7 +341,7 @@ func XEnumRaw() (*genai.GenerateContentResponse, error) {
contents := []*genai.Content{
genai.NewContentFromParts(parts, genai.RoleUser),
}
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash",
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash",
contents,
config,
)
Expand Down
30 changes: 15 additions & 15 deletions go/count_tokens.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TokensContextWindow() error {
log.Fatal(err)
}

modelInfo, err := client.Models.Get(ctx, "gemini-2.0-flash", &genai.GetModelConfig{})
modelInfo, err := client.Models.Get(ctx, "gemini-2.5-flash", &genai.GetModelConfig{})
if err != nil {
log.Fatal(err)
}
Expand All @@ -49,13 +49,13 @@ func TokensTextOnly() error {
contents := []*genai.Content{
genai.NewContentFromText(prompt, genai.RoleUser),
}
countResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", contents, nil)
countResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
return err
}
fmt.Println("total_tokens:", countResp.TotalTokens)

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -84,12 +84,12 @@ func TokensChat() error {
{Role: genai.RoleUser, Parts: []*genai.Part{{Text: "Hi my name is Bob"}}},
{Role: genai.RoleModel, Parts: []*genai.Part{{Text: "Hi Bob!"}}},
}
chat, err := client.Chats.Create(ctx, "gemini-2.0-flash", nil, history)
chat, err := client.Chats.Create(ctx, "gemini-2.5-flash", nil, history)
if err != nil {
log.Fatal(err)
}

firstTokenResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", chat.History(false), nil)
firstTokenResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", chat.History(false), nil)
if err != nil {
log.Fatal(err)
}
Expand All @@ -108,7 +108,7 @@ func TokensChat() error {
hist := chat.History(false)
hist = append(hist, extra)

secondTokenResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", hist, nil)
secondTokenResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", hist, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -147,13 +147,13 @@ func TokensMultimodalImageFileApi() error {
genai.NewContentFromParts(parts, genai.RoleUser),
}

tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", contents, nil)
tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
fmt.Println("Multimodal image token count:", tokenResp.TotalTokens)

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -208,12 +208,12 @@ func TokensMultimodalVideoAudioFileApi() error {
genai.NewContentFromParts(parts, genai.RoleUser),
}

tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", contents, nil)
tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
fmt.Println("Multimodal video/audio token count:", tokenResp.TotalTokens)
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -255,12 +255,12 @@ func TokensMultimodalPdfFileApi() error {
genai.NewContentFromParts(parts, genai.RoleUser),
}

tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", contents, nil)
tokenResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
fmt.Printf("Multimodal PDF token count: %d\n", tokenResp.TotalTokens)
response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -303,22 +303,22 @@ func TokensCachedContent() error {
}

// Create cached content using a simple slice with text and a file.
cache, err := client.Caches.Create(ctx, "gemini-1.5-flash-001", &genai.CreateCachedContentConfig{
cache, err := client.Caches.Create(ctx, "gemini-2.5-flash", &genai.CreateCachedContentConfig{
Contents: contents,
})
if err != nil {
log.Fatal(err)
}

prompt := "Please give a short summary of this file."
countResp, err := client.Models.CountTokens(ctx, "gemini-2.0-flash", []*genai.Content{
countResp, err := client.Models.CountTokens(ctx, "gemini-2.5-flash", []*genai.Content{
genai.NewContentFromText(prompt, genai.RoleUser),
}, nil)
if err != nil {
log.Fatal(err)
}
fmt.Printf("%d", countResp.TotalTokens)
response, err := client.Models.GenerateContent(ctx, "gemini-1.5-flash-001", []*genai.Content{
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", []*genai.Content{
genai.NewContentFromText(prompt, genai.RoleUser),
}, &genai.GenerateContentConfig{
CachedContent: cache.Name,
Expand Down
14 changes: 7 additions & 7 deletions go/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func FilesCreateText() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -86,7 +86,7 @@ func FilesCreateImage() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func FilesCreateAudio() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -180,7 +180,7 @@ func FilesCreateVideo() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -220,7 +220,7 @@ func FilesCreatePdf() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -261,7 +261,7 @@ func FilesCreateFromIO() (*genai.GenerateContentResponse, error) {
genai.NewContentFromParts(parts, genai.RoleUser),
}

response, err := client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
response, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -359,7 +359,7 @@ func FilesDelete() error {
genai.NewContentFromParts(parts, genai.RoleUser),
}

_, err = client.Models.GenerateContent(ctx, "gemini-2.0-flash", contents, nil)
_, err = client.Models.GenerateContent(ctx, "gemini-2.5-flash", contents, nil)
// Expect an error when using a deleted file.
if err != nil {
return nil
Expand Down
2 changes: 1 addition & 1 deletion go/function_calling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func FunctionCalling() error {
if err != nil {
log.Fatal(err)
}
modelName := "gemini-2.0-flash"
modelName := "gemini-2.5-flash"

// Create the function declarations for arithmetic operations.
addDeclaration := createArithmeticToolDeclaration("addNumbers", "Return the result of adding two numbers.")
Expand Down
2 changes: 1 addition & 1 deletion go/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func ModelsGet() error {
log.Fatal(err)
}

modelInfo, err := client.Models.Get(ctx, "gemini-2.0-flash", nil)
modelInfo, err := client.Models.Get(ctx, "gemini-2.5-flash", nil)
if err != nil {
log.Fatal(err)
}
Expand Down
Loading