refactor: VertexAiSearchTool: Unwrap List from Optional

PiperOrigin-RevId: 860144181

Author: google-genai-bot

core/src/main/java/com/google/adk/tools/VertexAiSearchTool.java

@@ -39,7 +39,7 @@
 public abstract class VertexAiSearchTool extends BaseTool {
   public abstract Optional<String> dataStoreId();
 
-  public abstract Optional<List<VertexAISearchDataStoreSpec>> dataStoreSpecs();
+  public abstract ImmutableList<VertexAISearchDataStoreSpec> dataStoreSpecs();
 
   public abstract Optional<String> searchEngineId();
 
@@ -54,7 +54,7 @@ public abstract class VertexAiSearchTool extends BaseTool {
   public abstract Optional<String> dataStore();
 
   public static Builder builder() {
-    return new AutoValue_VertexAiSearchTool.Builder();
+    return new AutoValue_VertexAiSearchTool.Builder().dataStoreSpecs(ImmutableList.of());
   }
 
   VertexAiSearchTool() {
@@ -80,14 +80,16 @@ public Completable processLlmRequest(
     searchEngineId().ifPresent(vertexAiSearchBuilder::engine);
     filter().ifPresent(vertexAiSearchBuilder::filter);
     maxResults().ifPresent(vertexAiSearchBuilder::maxResults);
-    dataStoreSpecs().ifPresent(vertexAiSearchBuilder::dataStoreSpecs);
+    if (!dataStoreSpecs().isEmpty()) {
+      vertexAiSearchBuilder.dataStoreSpecs(dataStoreSpecs());
+    }
 
     Tool retrievalTool =
         Tool.builder()
             .retrieval(Retrieval.builder().vertexAiSearch(vertexAiSearchBuilder.build()).build())
             .build();
 
-    List<Tool> currentTools =
+    ArrayList<Tool> currentTools =
         new ArrayList<>(
             llmRequest.config().flatMap(GenerateContentConfig::tools).orElse(ImmutableList.of()));
     currentTools.add(retrievalTool);
@@ -126,14 +128,18 @@ public abstract static class Builder {
 
     public final VertexAiSearchTool build() {
       VertexAiSearchTool tool = autoBuild();
-      if ((tool.dataStoreId().isEmpty() && tool.searchEngineId().isEmpty())
-          || (tool.dataStoreId().isPresent() && tool.searchEngineId().isPresent())) {
+      boolean hasDataStoreId =
+          tool.dataStoreId().isPresent() && !tool.dataStoreId().get().isEmpty();
+      boolean hasSearchEngineId =
+          tool.searchEngineId().isPresent() && !tool.searchEngineId().get().isEmpty();
+      boolean hasDataStoreSpecs = !tool.dataStoreSpecs().isEmpty();
+      if (hasDataStoreId == hasSearchEngineId) {
         throw new IllegalArgumentException(
-            "Either dataStoreId or searchEngineId must be specified.");
+            "One and only one of dataStoreId or searchEngineId must not be empty.");
       }
-      if (tool.dataStoreSpecs().isPresent() && tool.searchEngineId().isEmpty()) {
+      if (hasDataStoreSpecs && !hasSearchEngineId) {
         throw new IllegalArgumentException(
-            "searchEngineId must be specified if dataStoreSpecs is specified.");
+            "searchEngineId must not be empty if dataStoreSpecs is not empty.");
       }
       return tool;
     }

core/src/test/java/com/google/adk/tools/VertexAiSearchToolTest.java

@@ -41,7 +41,7 @@ public void build_noDataStoreIdOrSearchEngineId_throwsException() {
         assertThrows(IllegalArgumentException.class, () -> VertexAiSearchTool.builder().build());
     assertThat(exception)
         .hasMessageThat()
-        .isEqualTo("Either dataStoreId or searchEngineId must be specified.");
+        .isEqualTo("One and only one of dataStoreId or searchEngineId must not be empty.");
   }
 
   @Test
@@ -52,22 +52,24 @@ public void build_bothDataStoreIdAndSearchEngineId_throwsException() {
             () -> VertexAiSearchTool.builder().dataStoreId("ds1").searchEngineId("se1").build());
     assertThat(exception)
         .hasMessageThat()
-        .isEqualTo("Either dataStoreId or searchEngineId must be specified.");
+        .isEqualTo("One and only one of dataStoreId or searchEngineId must not be empty.");
   }
 
   @Test
   public void build_dataStoreSpecsWithoutSearchEngineId_throwsException() {
+    VertexAISearchDataStoreSpec spec =
+        VertexAISearchDataStoreSpec.builder().dataStore("ds1").build();
     IllegalArgumentException exception =
         assertThrows(
             IllegalArgumentException.class,
             () ->
                 VertexAiSearchTool.builder()
                     .dataStoreId("ds1")
-                    .dataStoreSpecs(ImmutableList.of())
+                    .dataStoreSpecs(ImmutableList.of(spec))
                     .build());
     assertThat(exception)
         .hasMessageThat()
-        .isEqualTo("searchEngineId must be specified if dataStoreSpecs is specified.");
+        .isEqualTo("searchEngineId must not be empty if dataStoreSpecs is not empty.");
   }
 
   @Test
@@ -82,6 +84,19 @@ public void build_withSearchEngineId_succeeds() {
     assertThat(tool.searchEngineId()).hasValue("se1");
   }
 
+  @Test
+  public void build_withSearchEngineIdAndDataStoreSpecs_succeeds() {
+    VertexAISearchDataStoreSpec spec =
+        VertexAISearchDataStoreSpec.builder().dataStore("ds1").build();
+    VertexAiSearchTool tool =
+        VertexAiSearchTool.builder()
+            .searchEngineId("se1")
+            .dataStoreSpecs(ImmutableList.of(spec))
+            .build();
+    assertThat(tool.searchEngineId()).hasValue("se1");
+    assertThat(tool.dataStoreSpecs()).containsExactly(spec);
+  }
+
   @Test
   public void processLlmRequest_addsRetrievalTool() {
     VertexAiSearchTool tool =
@@ -135,4 +150,18 @@ public void processLlmRequest_withDataStoreSpecs_addsRetrievalTool() {
                 .get())
         .containsExactly(spec);
   }
+
+  @Test
+  public void processLlmRequest_nonGeminiModel_throwsException() {
+    VertexAiSearchTool tool = VertexAiSearchTool.builder().searchEngineId("se1").build();
+    LlmRequest.Builder llmRequestBuilder = LlmRequest.builder().model("other-model");
+    tool.processLlmRequest(llmRequestBuilder, ToolContext.builder(invocationContext).build())
+        .test()
+        .assertError(
+            throwable ->
+                throwable instanceof IllegalArgumentException
+                    && throwable
+                        .getMessage()
+                        .equals("Vertex AI Search tool is only supported for Gemini models."));
+  }
 }