Merge branch 'main' into main

Author: glasnt

genai/controlled-generation/ctrlgen-with-enum-schema.js

@@ -36,7 +36,7 @@ async function generateContent(
   };
 
   const response = await ai.models.generateContent({
-    model: 'gemini-2.0-flash',
+    model: 'gemini-2.5-flash',
     contents: 'What type of instrument is an oboe?',
     config: {
       responseMimeType: 'text/x.enum',

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

@@ -0,0 +1,47 @@
+// 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';
+
+// [START googlegenaisdk_counttoken_compute_with_txt]
+const {GoogleGenAI} = require('@google/genai');
+
+const GOOGLE_CLOUD_PROJECT = process.env.GOOGLE_CLOUD_PROJECT;
+const GOOGLE_CLOUD_LOCATION = process.env.GOOGLE_CLOUD_LOCATION || 'global';
+
+async function countTokens(
+  projectId = GOOGLE_CLOUD_PROJECT,
+  location = GOOGLE_CLOUD_LOCATION
+) {
+  const ai = new GoogleGenAI({
+    vertexai: true,
+    project: projectId,
+    location: location,
+    httpOptions: {apiVersion: 'v1'},
+  });
+
+  const response = await ai.models.computeTokens({
+    model: 'gemini-2.5-flash',
+    contents: "What's the longest word in the English language?",
+  });
+
+  console.log(response);
+
+  return response.tokensInfo;
+}
+// [END googlegenaisdk_counttoken_compute_with_txt]
+
+module.exports = {
+  countTokens,
+};

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

@@ -0,0 +1,47 @@
+// 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';
+
+// [START googlegenaisdk_counttoken_resp_with_txt]
+const {GoogleGenAI} = require('@google/genai');
+
+const GOOGLE_CLOUD_PROJECT = process.env.GOOGLE_CLOUD_PROJECT;
+const GOOGLE_CLOUD_LOCATION = process.env.GOOGLE_CLOUD_LOCATION || 'global';
+
+async function countTokens(
+  projectId = GOOGLE_CLOUD_PROJECT,
+  location = GOOGLE_CLOUD_LOCATION
+) {
+  const ai = new GoogleGenAI({
+    vertexai: true,
+    project: projectId,
+    location: location,
+    httpOptions: {apiVersion: 'v1'},
+  });
+
+  const response = await ai.models.generateContent({
+    model: 'gemini-2.5-flash',
+    contents: 'Why is the sky blue?',
+  });
+
+  console.log(response.usageMetadata);
+
+  return response.usageMetadata;
+}
+// [END googlegenaisdk_counttoken_resp_with_txt]
+
+module.exports = {
+  countTokens,
+};

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

@@ -38,7 +38,7 @@ async function countTokens(
   };
 
   const response = await ai.models.countTokens({
-    model: 'gemini-2.0-flash',
+    model: 'gemini-2.5-flash',
     contents: [video, 'Provide a description of the video.'],
   });
 

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

@@ -31,7 +31,7 @@ async function countTokens(
   });
 
   const response = await ai.models.countTokens({
-    model: 'gemini-2.0-flash',
+    model: 'gemini-2.5-flash',
     contents: 'What is the highest mountain in Africa?',
   });
 

genai/package.json

@@ -13,7 +13,7 @@
     "test": "c8 mocha -p -j 2 --timeout 2400000 test/*.test.js test/**/*.test.js"
   },
   "dependencies": {
-    "@google/genai": "^0.13.0",
+    "@google/genai": "1.12.0",
     "axios": "^1.6.2",
     "supertest": "^7.0.0"
   },

genai/test/counttoken-compute-with-txt.test.js

@@ -0,0 +1,32 @@
+// 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('../count-tokens/counttoken-compute-with-txt.js');
+const {delay} = require('./util');
+
+describe('counttoken-compute-with-txt', () => {
+  it('should return tokensInfo from text prompt', async function () {
+    this.timeout(180000);
+    this.retries(4);
+    await delay(this.test);
+    const output = await sample.countTokens(projectId);
+    assert(output.length > 0);
+  });
+});

genai/test/counttoken-resp-with-txt.test.js

@@ -0,0 +1,29 @@
+// 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('../count-tokens/counttoken-resp-with-txt.js');
+
+describe('counttoken-resp-with-txt', () => {
+  it('should return the usageMetadata from text prompt', async function () {
+    this.timeout(50000);
+    const output = await sample.countTokens(projectId);
+    assert.notEqual(output, undefined);
+  });
+});

genai/test/counttoken-with-txt-vid.test.js

@@ -19,9 +19,13 @@ const {describe, it} = require('mocha');
 
 const projectId = process.env.CAIP_PROJECT_ID;
 const sample = require('../count-tokens/counttoken-with-txt-vid.js');
+const {delay} = require('./util');
 
 describe('counttoken-with-txt-vid', async () => {
-  it('should return the total token count for a text and video prompt', async () => {
+  it('should return the total token count for a text and video prompt', async function () {
+    this.timeout(180000);
+    this.retries(4);
+    await delay(this.test);
     const output = await sample.countTokens(projectId);
     assert(output > 0);
   });

genai/test/counttoken-with-txt.test.js

@@ -21,7 +21,8 @@ const projectId = process.env.CAIP_PROJECT_ID;
 const sample = require('../count-tokens/counttoken-with-txt.js');
 
 describe('counttoken-with-txt', async () => {
-  it('should return the total token count for a text prompt', async () => {
+  it('should return the total token count for a text prompt', async function () {
+    this.timeout(50000);
     const output = await sample.countTokens(projectId);
     assert(output > 0);
   });