Merge branch 'main' into sample/thinking

Author: Guiners

.github/workflows/ai-platform-snippets.yaml

@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}

.github/workflows/dialogflow-cx.yaml

@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}

.github/workflows/functions-slack.yaml

@@ -62,7 +62,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
       id: npm-cache
       with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}

.github/workflows/iam-deny.yaml

@@ -60,7 +60,7 @@ jobs:
          id: npm-cache-dir
          shell: bash
          run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-       - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+       - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
          id: npm-cache
          with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}

.github/workflows/storagetransfer.yaml

@@ -65,7 +65,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}

.github/workflows/test.yaml

@@ -47,7 +47,7 @@ jobs:
       id: npm-cache-dir
       shell: bash
       run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
-    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+    - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
       id: npm-cache
       with:
         path: ${{ steps.npm-cache-dir.outputs.dir }}

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.'],
   });