Merge branch 'main' into sample/september-samples

Author: Guiners

genai/count-tokens/counttoken-compute-with-txt.js

@@ -24,14 +24,14 @@ async function countTokens(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
     httpOptions: {apiVersion: 'v1'},
   });
 
-  const response = await ai.models.computeTokens({
+  const response = await client.models.computeTokens({
     model: 'gemini-2.5-flash',
     contents: "What's the longest word in the English language?",
   });

genai/count-tokens/counttoken-resp-with-txt.js

@@ -24,14 +24,14 @@ async function countTokens(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
     httpOptions: {apiVersion: 'v1'},
   });
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: 'Why is the sky blue?',
   });

genai/count-tokens/counttoken-with-txt-vid.js

@@ -24,7 +24,7 @@ async function countTokens(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -37,7 +37,7 @@ async function countTokens(
     },
   };
 
-  const response = await ai.models.countTokens({
+  const response = await client.models.countTokens({
     model: 'gemini-2.5-flash',
     contents: [video, 'Provide a description of the video.'],
   });

genai/count-tokens/counttoken-with-txt.js

@@ -24,13 +24,13 @@ async function countTokens(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
   });
 
-  const response = await ai.models.countTokens({
+  const response = await client.models.countTokens({
     model: 'gemini-2.5-flash',
     contents: 'What is the highest mountain in Africa?',
   });

genai/test/imggen-mmflash-with-txt.test.js

@@ -18,15 +18,20 @@ const {assert} = require('chai');
 const {describe, it} = require('mocha');
 
 const projectId = process.env.CAIP_PROJECT_ID;
+const location = 'global';
+
 const sample = require('../image-generation/imggen-mmflash-with-txt.js');
 const {delay} = require('./util');
 
 describe('imggen-mmflash-with-txt', async () => {
   it('should generate images from a text prompt', async function () {
     this.timeout(180000);
-    this.retries(4);
+    this.retries(5);
     await delay(this.test);
-    const generatedFileNames = await sample.generateImage(projectId);
+    const generatedFileNames = await sample.generateContent(
+      projectId,
+      location
+    );
     assert(generatedFileNames.length > 0);
   });
 });

genai/text-generation/textgen-code-with-pdf.js

@@ -24,7 +24,7 @@ async function generateText(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -46,7 +46,7 @@ async function generateText(
     },
   ];
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: contents,
   });

genai/text-generation/textgen-sys-instr-with-txt.js

@@ -24,7 +24,7 @@ async function generateContent(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -35,7 +35,7 @@ async function generateContent(
   Answer:
   `;
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: prompt,
     config: {

genai/text-generation/textgen-with-multi-img.js

@@ -24,7 +24,7 @@ async function generateContent(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -44,7 +44,7 @@ async function generateContent(
     },
   };
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: [
       image1,

genai/text-generation/textgen-with-multi-local-img.js

@@ -32,7 +32,7 @@ async function generateContent(
   imagePath1,
   imagePath2
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -42,7 +42,7 @@ async function generateContent(
   const image1 = loadImageAsBase64(imagePath1);
   const image2 = loadImageAsBase64(imagePath2);
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: [
       {

genai/text-generation/textgen-with-txt-img.js

@@ -24,7 +24,7 @@ async function generateContent(
   projectId = GOOGLE_CLOUD_PROJECT,
   location = GOOGLE_CLOUD_LOCATION
 ) {
-  const ai = new GoogleGenAI({
+  const client = new GoogleGenAI({
     vertexai: true,
     project: projectId,
     location: location,
@@ -37,7 +37,7 @@ async function generateContent(
     },
   };
 
-  const response = await ai.models.generateContent({
+  const response = await client.models.generateContent({
     model: 'gemini-2.5-flash',
     contents: [image, 'What is shown in this image?'],
   });