Skip to content

feat: drop gemini-1 support in GoogleSearchTool #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −32
Open

feat: drop gemini-1 support in GoogleSearchTool #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions core/src/main/java/com/google/adk/tools/GoogleSearchTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
20 changes: 0 additions & 20 deletions core/src/test/java/com/google/adk/tools/BaseToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down