Merge branch 'main' into google_dev_mcp_sse_param

Author: vorburger

CONTRIBUTING.md

@@ -34,6 +34,35 @@ information on using pull requests.
 
 ## PR policy
 
+### Format
+
+Code must be formatted according to the
+[Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
+
+The Maven build will automagically run
+[`google-java-format`](https://github.com/google/google-java-format) when you
+locally build this project.
+
+Pull requests will fail to build if you forget to commit reformatted code, and
+cannot be merged until you fix this.
+
+### Single Commit
+
+Pull Requests must contain only a **single commit.**
+
+This is due to how Google replicates this Git repository both into and from its
+internal _monorepo_ (see [Wikipedia](https://en.wikipedia.org/wiki/Monorepo) and
+[Paper](https://research.google/pubs/why-google-stores-billions-of-lines-of-code-in-a-single-repository/))
+with [🦛 Copybara](https://github.com/google/copybara).
+
+When adjusting a PR to code review feedback, please use `git commit --amend`.
+
+You can use `git rebase -i main` to _meld/squash_ existing commits into one.
+
+Then use `git push --force-with-lease` to update the branch of your PR.
+
+We cannot merge your PR until you fix this.
+
 ### AI Generated code
 
 It's ok to generate the first draft using AI but we would like code which has

core/pom.xml

@@ -41,6 +41,7 @@
     <java-websocket.version>1.6.0</java-websocket.version>
     <jackson.version>2.19.0</jackson.version>
     <okhttp.version>4.12.0</okhttp.version>
+    <docker-java.version>3.3.6</docker-java.version>
   </properties>
 
   <dependencies>
@@ -62,6 +63,16 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-aiplatform</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java</artifactId>
+      <version>${docker-java.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.docker-java</groupId>
+      <artifactId>docker-java-transport-httpclient5</artifactId>
+      <version>${docker-java.version}</version>
+    </dependency>
     <dependency>
       <groupId> io.modelcontextprotocol.sdk</groupId>
       <artifactId>mcp</artifactId>
@@ -178,6 +189,11 @@
       <artifactId>rxjava</artifactId>
       <version>3.1.5</version>
     </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+      <version>3.7.0</version>
+    </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8</artifactId>

core/src/main/java/com/google/adk/agents/ConfigAgentUtils.java

@@ -16,11 +16,10 @@
 
 package com.google.adk.agents;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.google.adk.utils.ComponentRegistry;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -59,7 +58,8 @@ public static BaseAgent fromConfig(String configPath) throws ConfigurationExcept
     try {
       // Load the base config to determine the agent class
       BaseAgentConfig baseConfig = loadConfigAsType(absolutePath, BaseAgentConfig.class);
-      Class<? extends BaseAgent> agentClass = resolveAgentClass(baseConfig.agentClass());
+      Class<? extends BaseAgent> agentClass =
+          ComponentRegistry.resolveAgentClass(baseConfig.agentClass());
 
       // Load the config file with the specific config class
       Class<? extends BaseAgentConfig> configClass = getConfigClassForAgent(agentClass);
@@ -97,32 +97,6 @@ private static <T extends BaseAgentConfig> T loadConfigAsType(
     }
   }
 
-  /**
-   * Resolves the agent class based on the agent class name from the configuration.
-   *
-   * @param agentClassName the name of the agent class from the config
-   * @return the corresponding agent class
-   * @throws ConfigurationException if the agent class is not supported
-   */
-  private static Class<? extends BaseAgent> resolveAgentClass(String agentClassName)
-      throws ConfigurationException {
-    // If no agent_class is specified in the yaml file, it will default to LlmAgent.
-    if (isNullOrEmpty(agentClassName) || agentClassName.equals("LlmAgent")) {
-      return LlmAgent.class;
-    }
-
-    // TODO: Support more agent classes
-    // Example for future extensions:
-    // if (agentClassName.equals("CustomAgent")) {
-    //   return CustomAgent.class;
-    // }
-
-    throw new ConfigurationException(
-        "agentClass '"
-            + agentClassName
-            + "' is not supported. It must be a subclass of BaseAgent.");
-  }
-
   /**
    * Maps agent classes to their corresponding config classes.
    *

core/src/main/java/com/google/adk/agents/InvocationContext.java

@@ -18,8 +18,10 @@
 
 import com.google.adk.artifacts.BaseArtifactService;
 import com.google.adk.exceptions.LlmCallsLimitExceededException;
+import com.google.adk.memory.BaseMemoryService;
 import com.google.adk.sessions.BaseSessionService;
 import com.google.adk.sessions.Session;
+import com.google.errorprone.annotations.InlineMe;
 import com.google.genai.types.Content;
 import java.util.Map;
 import java.util.Objects;
@@ -33,6 +35,7 @@ public class InvocationContext {
 
   private final BaseSessionService sessionService;
   private final BaseArtifactService artifactService;
+  private final BaseMemoryService memoryService;
   private final Optional<LiveRequestQueue> liveRequestQueue;
   private final Map<String, ActiveStreamingTool> activeStreamingTools = new ConcurrentHashMap<>();
 
@@ -46,9 +49,10 @@ public class InvocationContext {
   private boolean endInvocation;
   private final InvocationCostManager invocationCostManager = new InvocationCostManager();
 
-  private InvocationContext(
+  public InvocationContext(
       BaseSessionService sessionService,
       BaseArtifactService artifactService,
+      BaseMemoryService memoryService,
       Optional<LiveRequestQueue> liveRequestQueue,
       Optional<String> branch,
       String invocationId,
@@ -59,6 +63,7 @@ private InvocationContext(
       boolean endInvocation) {
     this.sessionService = sessionService;
     this.artifactService = artifactService;
+    this.memoryService = memoryService;
     this.liveRequestQueue = liveRequestQueue;
     this.branch = branch;
     this.invocationId = invocationId;
@@ -69,6 +74,16 @@ private InvocationContext(
     this.endInvocation = endInvocation;
   }
 
+  /**
+   * @deprecated Use the {@link #InvocationContext} constructor directly instead
+   */
+  @InlineMe(
+      replacement =
+          "new InvocationContext(sessionService, artifactService, null, Optional.empty(),"
+              + " Optional.empty(), invocationId, agent, session, Optional.ofNullable(userContent),"
+              + " runConfig, false)",
+      imports = {"com.google.adk.agents.InvocationContext", "java.util.Optional"})
+  @Deprecated
   public static InvocationContext create(
       BaseSessionService sessionService,
       BaseArtifactService artifactService,
@@ -80,7 +95,8 @@ public static InvocationContext create(
     return new InvocationContext(
         sessionService,
         artifactService,
-        Optional.empty(),
+        /* memoryService= */ null,
+        /* liveRequestQueue= */ Optional.empty(),
         /* branch= */ Optional.empty(),
         invocationId,
         agent,
@@ -90,6 +106,17 @@ public static InvocationContext create(
         false);
   }
 
+  /**
+   * @deprecated Use the {@link #InvocationContext} constructor directly instead
+   */
+  @InlineMe(
+      replacement =
+          "new InvocationContext(sessionService, artifactService, null,"
+              + " Optional.ofNullable(liveRequestQueue), Optional.empty(),"
+              + " InvocationContext.newInvocationContextId(), agent, session, Optional.empty(),"
+              + " runConfig, false)",
+      imports = {"com.google.adk.agents.InvocationContext", "java.util.Optional"})
+  @Deprecated
   public static InvocationContext create(
       BaseSessionService sessionService,
       BaseArtifactService artifactService,
@@ -100,6 +127,7 @@ public static InvocationContext create(
     return new InvocationContext(
         sessionService,
         artifactService,
+        /* memoryService= */ null,
         Optional.ofNullable(liveRequestQueue),
         /* branch= */ Optional.empty(),
         InvocationContext.newInvocationContextId(),
@@ -115,6 +143,7 @@ public static InvocationContext copyOf(InvocationContext other) {
         new InvocationContext(
             other.sessionService,
             other.artifactService,
+            other.memoryService,
             other.liveRequestQueue,
             other.branch,
             other.invocationId,
@@ -135,6 +164,10 @@ public BaseArtifactService artifactService() {
     return artifactService;
   }
 
+  public BaseMemoryService memoryService() {
+    return memoryService;
+  }
+
   public Map<String, ActiveStreamingTool> activeStreamingTools() {
     return activeStreamingTools;
   }
@@ -226,6 +259,7 @@ public boolean equals(Object o) {
     return endInvocation == that.endInvocation
         && Objects.equals(sessionService, that.sessionService)
         && Objects.equals(artifactService, that.artifactService)
+        && Objects.equals(memoryService, that.memoryService)
         && Objects.equals(liveRequestQueue, that.liveRequestQueue)
         && Objects.equals(activeStreamingTools, that.activeStreamingTools)
         && Objects.equals(branch, that.branch)
@@ -241,6 +275,7 @@ public int hashCode() {
     return Objects.hash(
         sessionService,
         artifactService,
+        memoryService,
         liveRequestQueue,
         activeStreamingTools,
         branch,

core/src/main/java/com/google/adk/agents/LlmAgent.java

@@ -16,6 +16,7 @@
 
 package com.google.adk.agents;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.base.Strings.nullToEmpty;
 import static java.util.stream.Collectors.joining;
 
@@ -53,7 +54,7 @@
 import com.google.adk.tools.BaseTool;
 import com.google.adk.tools.BaseTool.ToolConfig;
 import com.google.adk.tools.BaseToolset;
-import com.google.common.base.CaseFormat;
+import com.google.adk.utils.ComponentRegistry;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -63,7 +64,6 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Single;
-import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -950,23 +950,21 @@ private static ImmutableList<BaseTool> resolveTools(
 
     for (ToolConfig toolConfig : toolConfigs) {
       try {
-        String toolName = toolConfig.name();
-        if (toolName == null || toolName.trim().isEmpty()) {
+        if (isNullOrEmpty(toolConfig.name())) {
           throw new ConfigurationException("Tool name cannot be empty");
         }
 
-        toolName = toolName.trim();
-        BaseTool tool;
-
-        if (!toolName.contains(".")) {
-          tool = resolveBuiltInTool(toolName, toolConfig);
+        String toolName = toolConfig.name().trim();
+        Optional<BaseTool> toolOpt = ComponentRegistry.resolveToolInstance(toolName);
+        if (toolOpt.isPresent()) {
+          resolvedTools.add(toolOpt.get());
         } else {
           // TODO: Support user-defined tools
+          // TODO: Support using tool class via ComponentRegistry.resolveToolClass
           logger.debug("configAbsPath is: {}", configAbsPath);
-          throw new ConfigurationException("User-defined tools are not yet supported");
+          throw new ConfigurationException("Tool not found: " + toolName);
         }
 
-        resolvedTools.add(tool);
         logger.debug("Successfully resolved tool: {}", toolConfig.name());
       } catch (Exception e) {
         String errorMsg = "Failed to resolve tool: " + toolConfig.name();
@@ -977,77 +975,4 @@ private static ImmutableList<BaseTool> resolveTools(
 
     return ImmutableList.copyOf(resolvedTools);
   }
-
-  private static BaseTool resolveBuiltInTool(String toolName, ToolConfig toolConfig)
-      throws ConfigurationException {
-    try {
-      logger.debug("Resolving built-in tool: {}", toolName);
-      // TODO: Handle built-in tool name end with Tool while config yaml file does not.
-      // e.g.google_search in config yaml file and GoogleSearchTool in tool class name.
-      String pascalCaseToolName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, toolName);
-      String className = "com.google.adk.tools." + pascalCaseToolName;
-      Class<?> toolClass;
-      try {
-        toolClass = Class.forName(className);
-        logger.debug("Successfully loaded tool class: {}", className);
-      } catch (ClassNotFoundException e) {
-        String fallbackClassName = "com.google.adk.tools." + toolName;
-        try {
-          toolClass = Class.forName(fallbackClassName);
-        } catch (ClassNotFoundException e2) {
-          throw new ConfigurationException(
-              "Built-in tool not found: "
-                  + toolName
-                  + ". Expected class: "
-                  + className
-                  + " or "
-                  + fallbackClassName,
-              e2);
-        }
-      }
-
-      if (!BaseTool.class.isAssignableFrom(toolClass)) {
-        throw new ConfigurationException(
-            "Built-in tool class " + toolClass.getName() + " does not extend BaseTool");
-      }
-
-      @SuppressWarnings("unchecked")
-      Class<? extends BaseTool> baseToolClass = (Class<? extends BaseTool>) toolClass;
-
-      BaseTool tool = createToolInstance(baseToolClass, toolConfig);
-      logger.info(
-          "Successfully created built-in tool: {} (class: {})", toolName, toolClass.getName());
-
-      return tool;
-
-    } catch (Exception e) {
-      logger.error("Failed to create built-in tool: {}", toolName, e);
-      throw new ConfigurationException("Failed to create built-in tool: " + toolName, e);
-    }
-  }
-
-  private static BaseTool createToolInstance(
-      Class<? extends BaseTool> toolClass, ToolConfig toolConfig)
-      throws ConfigAgentUtils.ConfigurationException {
-
-    try {
-      // TODO:implement constructor with ToolArgsConfig
-      logger.debug("ToolConfig is: {}", toolConfig);
-
-      // Try default constructor
-      try {
-        Constructor<? extends BaseTool> constructor = toolClass.getConstructor();
-        return constructor.newInstance();
-      } catch (NoSuchMethodException e) {
-        // Continue
-      }
-
-      throw new ConfigAgentUtils.ConfigurationException(
-          "No suitable constructor found for tool class: " + toolClass.getName());
-
-    } catch (Exception e) {
-      throw new ConfigAgentUtils.ConfigurationException(
-          "Failed to instantiate tool class: " + toolClass.getName(), e);
-    }
-  }
 }