Merge branch 'main' into sample/live-part2

Author: gericdong

genai/test/ctrlgen-with-enum-class-schema.test.js

@@ -19,11 +19,14 @@ const {describe, it} = require('mocha');
 
 const projectId = process.env.CAIP_PROJECT_ID;
 const sample = require('../controlled-generation/ctrlgen-with-enum-class-schema.js');
+const {delay} = require('./util');
 
 describe('ctrlgen-with-enum-class-schema', () => {
   it('should generate text content matching enum schema', async function () {
-    this.timeout(10000);
+    this.timeout(100000);
+    this.retries(4);
+    await delay(this.test);
     const output = await sample.generateEnumClassSchema(projectId);
-    assert(output.length > 0 && output.includes('String'));
+    assert(output.length > 0);
   });
 });

genai/test/ctrlgen-with-nullable-schema.test.js

@@ -22,7 +22,7 @@ const sample = require('../controlled-generation/ctrlgen-with-nullable-schema.js
 
 describe('ctrlgen-with-nullable-schema', () => {
   it('should generate text content using nullable schema', async function () {
-    this.timeout(10000);
+    this.timeout(100000);
     const output = await sample.generateNullableSchema(projectId);
     assert(output.length > 0);
   });

genai/test/test-data/640px-Monty_open_door.svg.png

@@ -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('../tools/tools-code-exec-with-txt-local-img.js');
+
+describe('tools-code-exec-with-txt-local-img', () => {
+  it('should generate a function definition', async function () {
+    this.timeout(100000);
+    const output = await sample.generateAndExecuteMultimodalCode(projectId);
+    assert(output.length > 0);
+  });
+});

genai/test/tools-code-exec-with-txt-local-img.test.js

@@ -26,7 +26,7 @@ describe('tools-code-exec-with-txt', async () => {
     this.timeout(180000);
     this.retries(4);
     await delay(this.test);
-    const output = await sample.generateContent(projectId);
+    const output = await sample.generateAndExecuteCode(projectId);
     assert(output.length > 0);
   });
 });

genai/test/tools-code-exec-with-txt.test.js

@@ -25,6 +25,6 @@ describe('tools-func-desc-with-txt', async () => {
     this.timeout(180000);
     this.retries(4);
     await delay(this.test);
-    await sample.generateContent(projectId);
+    await sample.generateFunctionDesc(projectId);
   });
 });

genai/test/tools-func-desc-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 {describe, it} = require('mocha');
+
+const projectId = process.env.CAIP_PROJECT_ID;
+const sample = require('../tools/tools-google-maps-coordinates-with-txt');
+const {delay} = require('./util');
+const {assert} = require('chai');
+
+describe('tools-google-maps-coordinates-with-txt', () => {
+  it('should use google maps coordinates', async function () {
+    this.timeout(180000);
+    this.retries(4);
+    await delay(this.test);
+    const output = await sample.generateContent(projectId);
+    assert(output.length > 0);
+  });
+});

genai/test/tools-google-maps-coordinates-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 {describe, it} = require('mocha');
+
+const projectId = process.env.CAIP_PROJECT_ID;
+const sample = require('../tools/tools-google-search-and-urlcontext-with-txt');
+const {delay} = require('./util');
+const {assert} = require('chai');
+
+describe('tools-google-search-and-urlcontext-with-txt', () => {
+  it('should create urlcontext and google search', async function () {
+    this.timeout(180000);
+    this.retries(4);
+    await delay(this.test);
+    const output = await sample.generateContent(projectId);
+    assert(output.length > 0);
+  });
+});

genai/test/tools-google-search-and-urlcontext-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('../tools/tools-google-search-with-txt.js');
+
+describe('tools-google-search-with-txt', () => {
+  it('should generate answer to a question in prompt using google search', async function () {
+    this.timeout(10000);
+    const output = await sample.generateGoogleSearch(projectId);
+    assert(output.length > 0);
+  });
+});

genai/test/tools-google-search-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 {describe, it} = require('mocha');
+
+const projectId = process.env.CAIP_PROJECT_ID;
+const sample = require('../tools/tools-urlcontext-with-txt');
+const {delay} = require('./util');
+const {assert} = require('chai');
+
+describe('tools-urlcontext-with-txt', () => {
+  it('should create urlcontext with txt', async function () {
+    this.timeout(180000);
+    this.retries(4);
+    await delay(this.test);
+    const output = await sample.generateContent(projectId);
+    assert(output.length > 0);
+  });
+});