Merge branch 'main' into samples/october-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/image-generation/imggen-mmflash-with-txt.js

@@ -26,14 +26,14 @@ 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,
   });
 
-  const response = await ai.models.generateContentStream({
-    model: 'gemini-2.0-flash-exp',
+  const response = await client.models.generateContentStream({
+    model: 'gemini-2.5-flash-image',
     contents:
       'Generate an image of the Eiffel tower with fireworks in the background.',
     config: {

genai/package.json

@@ -13,7 +13,7 @@
     "test": "c8 mocha -p -j 2 --timeout 2400000 test/*.test.js test/**/*.test.js"
   },
   "dependencies": {
-    "@google/genai": "1.12.0",
+    "@google/genai": "1.20.0",
     "axios": "^1.6.2",
     "luxon": "^3.7.1",
     "supertest": "^7.0.0"
@@ -23,6 +23,7 @@
     "chai": "^4.5.0",
     "mocha": "^10.0.0",
     "sinon": "^18.0.0",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "proxyquire": "^2.1.3"
   }
 }

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

@@ -18,16 +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(10);
+    this.retries(5);
     await delay(this.test);
-    const generatedFileNames = await sample.generateContent(projectId);
-    assert(Array.isArray(generatedFileNames));
+    const generatedFileNames = await sample.generateContent(
+      projectId,
+      location
+    );
     assert(generatedFileNames.length > 0);
   });
 });

genai/test/tuning-job-create.test.js

@@ -0,0 +1,56 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+const {assert} = require('chai');
+const {describe, it} = require('mocha');
+const proxyquire = require('proxyquire').noCallThru();
+
+const projectId = process.env.CAIP_PROJECT_ID;
+
+describe('tuning-job-create', () => {
+  it('should create tuning job and return job name', async function () {
+    this.timeout(1000000);
+    const mockTuningJob = {
+      name: 'test-tuning-job',
+      experiment: 'test-experiment',
+      tunedModel: {
+        model: 'test-model',
+        endpoint: 'test-endpoint',
+      },
+    };
+
+    class MockTunings {
+      async tune() {
+        return mockTuningJob;
+      }
+      async get() {}
+    }
+
+    class MockGoogleGenAI {
+      constructor() {
+        this.tunings = new MockTunings();
+      }
+    }
+
+    const sample = proxyquire('../tuning/tuning-job-create.js', {
+      '@google/genai': {GoogleGenAI: MockGoogleGenAI},
+    });
+
+    const response = await sample.createTuningJob(projectId);
+
+    assert.strictEqual(response, 'test-tuning-job');
+  });
+});

genai/test/tuning-job-get.test.js

@@ -0,0 +1,58 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+const {assert} = require('chai');
+const {describe, it} = require('mocha');
+const proxyquire = require('proxyquire').noCallThru();
+
+const projectId = process.env.GOOGLE_CLOUD_PROJECT || 'test-project';
+
+describe('tuning-job-get', () => {
+  it('should get tuning job and return job name', async function () {
+    this.timeout(1000000);
+
+    const mockTuningJob = {
+      name: 'test-tuning-job',
+      experiment: 'test-experiment',
+      tunedModel: {
+        model: 'test-model',
+        endpoint: 'test-endpoint',
+      },
+    };
+
+    class MockTunings {
+      async get({name}) {
+        if (name !== 'TestJobName')
+          throw new Error('Unexpected tuning job name');
+        return mockTuningJob;
+      }
+    }
+
+    class MockGoogleGenAI {
+      constructor() {
+        this.tunings = new MockTunings();
+      }
+    }
+
+    const sample = proxyquire('../tuning/tuning-job-get.js', {
+      '@google/genai': {GoogleGenAI: MockGoogleGenAI},
+    });
+
+    const response = await sample.getTuningJob('TestJobName', projectId);
+
+    assert.strictEqual(response, 'test-tuning-job');
+  });
+});

genai/test/tuning-job-list.test.js

@@ -0,0 +1,28 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+const {assert} = require('chai');
+const {describe, it} = require('mocha');
+
+const projectId = process.env.CAIP_PROJECT_ID;
+const sample = require('../tuning/tuning-job-list.js');
+
+describe('tuning-job-list', () => {
+  it('should return tuning job list', async () => {
+    const output = await sample.listTuningJobs(projectId);
+    assert(output);
+  });
+});