Simplify creation of Gemini instances.

google-genai-bot · copybara-github · commit fca01e769692 · 2025-06-16T10:21:23.000-07:00
PiperOrigin-RevId: 772078582
diff --git a/core/src/main/java/com/google/adk/models/Gemini.java b/core/src/main/java/com/google/adk/models/Gemini.java
@@ -110,24 +110,9 @@ public Gemini(String modelName, VertexCredentials vertexCredentials) {
     Objects.requireNonNull(vertexCredentials, "vertexCredentials cannot be null");
     Client.Builder apiClientBuilder =
         Client.builder().httpOptions(HttpOptions.builder().headers(TRACKING_HEADERS).build());
-    vertexCredentials
-        .project()
-        .ifPresent(
-            project -> {
-              var unused = apiClientBuilder.project(project);
-            });
-    vertexCredentials
-        .location()
-        .ifPresent(
-            location -> {
-              var unused = apiClientBuilder.location(location);
-            });
-    vertexCredentials
-        .credentials()
-        .ifPresent(
-            credentials -> {
-              var unused = apiClientBuilder.credentials(credentials);
-            });
+    vertexCredentials.project().ifPresent(apiClientBuilder::project);
+    vertexCredentials.location().ifPresent(apiClientBuilder::location);
+    vertexCredentials.credentials().ifPresent(apiClientBuilder::credentials);
     this.apiClient = apiClientBuilder.build();
   }
 
diff --git a/core/src/main/java/com/google/adk/models/LlmRegistry.java b/core/src/main/java/com/google/adk/models/LlmRegistry.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+/** Registry for LLM models. */
 public final class LlmRegistry {
 
   // A thread-safe cache mapping model names to LLM instances.
@@ -42,7 +43,9 @@ private static Client getGeminiApiClient() {
   }
 
   static {
-    registerLlm("gemini-.*", modelName -> new Gemini(modelName, getGeminiApiClient()));
+    registerLlm(
+        "gemini-.*",
+        modelName -> Gemini.builder().modelName(modelName).apiClient(getGeminiApiClient()).build());
   }
 
   public static void registerLlm(String modelNamePattern, LlmFactory factory) {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import java.util.Map;`
`21`	`21`	`import java.util.concurrent.ConcurrentHashMap;`
`22`	`22`
	`23`	`+/** Registry for LLM models. */`
`23`	`24`	`public final class LlmRegistry {`
`24`	`25`
`25`	`26`	`// A thread-safe cache mapping model names to LLM instances.`
`@@ -42,7 +43,9 @@ private static Client getGeminiApiClient() {`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`static {`
`45`		`- registerLlm("gemini-.*", modelName -> new Gemini(modelName, getGeminiApiClient()));`
	`46`	`+ registerLlm(`
	`47`	`+ "gemini-.*",`
	`48`	`+ modelName -> Gemini.builder().modelName(modelName).apiClient(getGeminiApiClient()).build());`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`public static void registerLlm(String modelNamePattern, LlmFactory factory) {`