Skip to content

feat: add support for gemini models in VertexAiRagRetrieval #916

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
+23 −4
Open

feat: add support for gemini models in VertexAiRagRetrieval #916

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
19 changes: 19 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,29 @@
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<!-- run all tests with standard env -->
<id>basic</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<environmentVariables>
<GOOGLE_GENAI_USE_VERTEXAI>false</GOOGLE_GENAI_USE_VERTEXAI>
</environmentVariables>
</configuration>
</execution>
<execution>
<id>vertex-ai-rag-retrieval</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<environmentVariables>
<GOOGLE_GENAI_USE_VERTEXAI>true</GOOGLE_GENAI_USE_VERTEXAI>
</environmentVariables>
<!-- run a second variant of the following tests -->
<test>VertexAiRagRetrievalTest#processLlmRequest_gemini2Model_addVertexRagStoreToConfig, VertexAiRagRetrievalTest#processLlmRequest_otherModel_doNotAddVertexRagStoreToConfig</test>
</configuration>
</execution>
<execution>
<id>apigee-llm</id>
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/google/adk/tools/retrieval/VertexAiRagRetrieval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.adk.models.LlmRequest;
import com.google.adk.tools.ToolContext;
import com.google.adk.utils.ModelNameUtils;
import com.google.cloud.aiplatform.v1.RagContexts;
import com.google.cloud.aiplatform.v1.RagQuery;
import com.google.cloud.aiplatform.v1.RetrieveContextsRequest;
Expand Down Expand Up @@ -105,10 +106,9 @@ public VertexAiRagRetrieval(
public Completable processLlmRequest(
LlmRequest.Builder llmRequestBuilder, ToolContext toolContext) {
LlmRequest llmRequest = llmRequestBuilder.build();
// Use Gemini built-in Vertex AI RAG tool for Gemini 2 models or when using Vertex AI API Model
// Use Gemini built-in Vertex AI RAG tool for Gemini models when using Vertex AI API Model
boolean useVertexAi = Boolean.parseBoolean(System.getenv("GOOGLE_GENAI_USE_VERTEXAI"));
if (useVertexAi
&& (llmRequest.model().isPresent() && llmRequest.model().get().startsWith("gemini-2"))) {
if (useVertexAi && llmRequest.model().filter(ModelNameUtils::isGeminiModel).isPresent()) {
GenerateContentConfig config =
llmRequest.config().orElseGet(() -> GenerateContentConfig.builder().build());
ImmutableList.Builder<Tool> toolsBuilder = ImmutableList.builder();
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/com/google/adk/tools/retrieval/VertexAiRagRetrievalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void processLlmRequest_otherModel_doNotAddVertexRagStoreToConfig() {
"projects/test-project/locations/us-central1",
ragResources,
vectorDistanceThreshold);
LlmRequest.Builder llmRequestBuilder = LlmRequest.builder().model("gemini-1-pro");
LlmRequest.Builder llmRequestBuilder = LlmRequest.builder().model("other-model");
ToolContext toolContext = buildToolContext();
GenerateContentConfig initialConfig = GenerateContentConfig.builder().build();
llmRequestBuilder.config(initialConfig);
Expand Down