diff --git a/core/src/main/java/com/google/adk/tools/GoogleSearchTool.java b/core/src/main/java/com/google/adk/tools/GoogleSearchTool.java index 6f89754cf..8518dc745 100644 --- a/core/src/main/java/com/google/adk/tools/GoogleSearchTool.java +++ b/core/src/main/java/com/google/adk/tools/GoogleSearchTool.java @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableList; import com.google.genai.types.GenerateContentConfig; import com.google.genai.types.GoogleSearch; -import com.google.genai.types.GoogleSearchRetrieval; import com.google.genai.types.Tool; import io.reactivex.rxjava3.core.Completable; import java.util.List; @@ -66,17 +65,7 @@ public Completable processLlmRequest( updatedToolsBuilder.addAll(existingTools); String model = llmRequestBuilder.build().model().get(); - if (model != null && model.startsWith("gemini-1")) { - if (!updatedToolsBuilder.build().isEmpty()) { - logger.error("Tools already present: {}", configBuilder.build().tools().get()); - return Completable.error( - new IllegalArgumentException( - "Google search tool cannot be used with other tools in Gemini 1.x.")); - } - updatedToolsBuilder.add( - Tool.builder().googleSearchRetrieval(GoogleSearchRetrieval.builder().build()).build()); - configBuilder.tools(updatedToolsBuilder.build()); - } else if (model != null && (model.startsWith("gemini-2") || model.startsWith("gemini-3"))) { + if (model != null && (model.startsWith("gemini-2") || model.startsWith("gemini-3"))) { updatedToolsBuilder.add(Tool.builder().googleSearch(GoogleSearch.builder().build()).build()); configBuilder.tools(updatedToolsBuilder.build()); diff --git a/core/src/test/java/com/google/adk/tools/BaseToolTest.java b/core/src/test/java/com/google/adk/tools/BaseToolTest.java index dde1d73ea..620bba5c0 100644 --- a/core/src/test/java/com/google/adk/tools/BaseToolTest.java +++ b/core/src/test/java/com/google/adk/tools/BaseToolTest.java @@ -7,7 +7,6 @@ import com.google.genai.types.FunctionDeclaration; import com.google.genai.types.GenerateContentConfig; import com.google.genai.types.GoogleSearch; -import com.google.genai.types.GoogleSearchRetrieval; import com.google.genai.types.Tool; import com.google.genai.types.ToolCodeExecution; import com.google.genai.types.UrlContext; @@ -142,25 +141,6 @@ public void processLlmRequestWithGoogleSearchToolAddsToolToConfig() { Tool.builder().googleSearch(GoogleSearch.builder().build()).build()); } - @Test - public void processLlmRequestWithGoogleSearchRetrievalToolAddsToolToConfig() { - GoogleSearchTool googleSearchTool = new GoogleSearchTool(); - LlmRequest llmRequest = - LlmRequest.builder() - .config(GenerateContentConfig.builder().build()) - .model("gemini-1") - .build(); - LlmRequest.Builder llmRequestBuilder = llmRequest.toBuilder(); - Completable unused = - googleSearchTool.processLlmRequest(llmRequestBuilder, /* toolContext= */ null); - LlmRequest updatedLlmRequest = llmRequestBuilder.build(); - assertThat(updatedLlmRequest.config()).isPresent(); - assertThat(updatedLlmRequest.config().get().tools()).isPresent(); - assertThat(updatedLlmRequest.config().get().tools().get()) - .containsExactly( - Tool.builder().googleSearchRetrieval(GoogleSearchRetrieval.builder().build()).build()); - } - @Test public void processLlmRequestWithUrlContextToolAddsToolToConfig() { FunctionDeclaration functionDeclaration =