Merge branch 'main' into feat/planner-support

Author: leweii

CHANGELOG.md

@@ -81,6 +81,11 @@
       <artifactId>auto-value-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>33.0.0-jre</version>
+    </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>

core/pom.xml

@@ -16,7 +16,6 @@
 
 package com.google.adk.agents;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
 /**
@@ -32,50 +31,23 @@ public class BaseAgentConfig {
 
   /**
    * Configuration for referencing other agents (subagents). Supports both config-based references
-   * (YAML files) and programmatic references (Java classes).
+   * (YAML files) and programmatic references (via code registry).
    */
   public static class AgentRefConfig {
-    private String name;
     private String configPath;
-    private String className;
-    private String staticField;
+    private String code;
 
     public AgentRefConfig() {}
 
     /**
      * Constructor for config-based agent reference.
      *
-     * @param name The name of the subagent
      * @param configPath The path to the subagent's config file
      */
-    public AgentRefConfig(String name, String configPath) {
-      this.name = name;
+    public AgentRefConfig(String configPath) {
       this.configPath = configPath;
     }
 
-    /**
-     * Constructor for programmatic agent reference.
-     *
-     * @param name The name of the subagent
-     * @param className The Java class name
-     * @param staticField Optional static field name
-     */
-    public AgentRefConfig(String name, String className, String staticField) {
-      this.name = name;
-      this.className = className;
-      this.staticField = staticField;
-    }
-
-    @JsonProperty("name")
-    public String name() {
-      return name;
-    }
-
-    public void setName(String name) {
-      this.name = name;
-    }
-
-    @JsonProperty("config_path")
     public String configPath() {
       return configPath;
     }
@@ -84,37 +56,12 @@ public void setConfigPath(String configPath) {
       this.configPath = configPath;
     }
 
-    @JsonProperty("class_name")
-    public String className() {
-      return className;
-    }
-
-    public void setClassName(String className) {
-      this.className = className;
-    }
-
-    @JsonProperty("static_field")
-    public String staticField() {
-      return staticField;
-    }
-
-    public void setStaticField(String staticField) {
-      this.staticField = staticField;
+    public String code() {
+      return code;
     }
 
-    @Override
-    public String toString() {
-      if (configPath != null) {
-        return "AgentRefConfig{name='" + name + "', configPath='" + configPath + "'}";
-      } else {
-        return "AgentRefConfig{name='"
-            + name
-            + "', className='"
-            + className
-            + "', staticField='"
-            + staticField
-            + "'}";
-      }
+    public void setCode(String code) {
+      this.code = code;
     }
   }
 
@@ -133,7 +80,6 @@ public BaseAgentConfig(String name, String description, String agentClass) {
     this.agentClass = agentClass;
   }
 
-  @JsonProperty(value = "name", required = true)
   public String name() {
     return name;
   }
@@ -142,7 +88,6 @@ public void setName(String name) {
     this.name = name;
   }
 
-  @JsonProperty("description")
   public String description() {
     return description;
   }
@@ -151,7 +96,6 @@ public void setDescription(String description) {
     this.description = description;
   }
 
-  @JsonProperty("agent_class")
   public String agentClass() {
     return agentClass;
   }
@@ -160,7 +104,6 @@ public void setAgentClass(String agentClass) {
     this.agentClass = agentClass;
   }
 
-  @JsonProperty("sub_agents")
   public List<AgentRefConfig> subAgents() {
     return subAgents;
   }

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

@@ -36,10 +36,10 @@ public interface BeforeModelCallback extends BeforeModelCallbackBase {
      * Async callback before LLM invocation.
      *
      * @param callbackContext Callback context.
-     * @param llmRequest LLM request.
+     * @param llmRequestBuilder LLM request builder.
      * @return response override, or empty to continue.
      */
-    Maybe<LlmResponse> call(CallbackContext callbackContext, LlmRequest llmRequest);
+    Maybe<LlmResponse> call(CallbackContext callbackContext, LlmRequest.Builder llmRequestBuilder);
   }
 
   /**
@@ -48,7 +48,8 @@ public interface BeforeModelCallback extends BeforeModelCallbackBase {
    */
   @FunctionalInterface
   public interface BeforeModelCallbackSync extends BeforeModelCallbackBase {
-    Optional<LlmResponse> call(CallbackContext callbackContext, LlmRequest llmRequest);
+    Optional<LlmResponse> call(
+        CallbackContext callbackContext, LlmRequest.Builder llmRequestBuilder);
   }
 
   interface AfterModelCallbackBase {}

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

@@ -17,14 +17,15 @@
 package com.google.adk.agents;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.google.adk.utils.ComponentRegistry;
 import com.google.common.collect.ImmutableList;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -110,9 +111,7 @@ public static ImmutableList<BaseAgent> resolveSubAgents(
         resolvedSubAgents.add(subAgent);
         logger.debug("Successfully resolved subagent: {}", subAgent.name());
       } catch (Exception e) {
-        String errorMsg =
-            "Failed to resolve subagent: "
-                + (subAgentConfig.name() != null ? subAgentConfig.name() : "unnamed");
+        String errorMsg = "Failed to resolve subagent";
         logger.error(errorMsg, e);
         throw new ConfigurationException(errorMsg, e);
       }
@@ -136,19 +135,18 @@ private static BaseAgent resolveSubAgent(
       return resolveSubAgentFromConfigPath(subAgentConfig, configDir);
     }
 
-    // TODO: Add support for programmatic subagent resolution (className/staticField).
-    if (subAgentConfig.className() != null || subAgentConfig.staticField() != null) {
-      throw new ConfigurationException(
-          "Programmatic subagent resolution (className/staticField) is not yet supported for"
-              + " subagent: "
-              + subAgentConfig.name());
+    // Check for programmatic references (only 'code' is supported)
+    if (subAgentConfig.code() != null && !subAgentConfig.code().trim().isEmpty()) {
+      String registryKey = subAgentConfig.code().trim();
+      return ComponentRegistry.resolveAgentInstance(registryKey)
+          .orElseThrow(
+              () ->
+                  new ConfigurationException(
+                      "Failed to resolve subagent from registry with code key: " + registryKey));
     }
 
     throw new ConfigurationException(
-        "Subagent configuration for '"
-            + subAgentConfig.name()
-            + "' must specify 'configPath'."
-            + " Programmatic references (className/staticField) are not yet supported.");
+        "Subagent configuration must specify either 'configPath' or 'code'.");
   }
 
   /** Resolves a subagent from a configuration file path. */
@@ -187,11 +185,18 @@ private static BaseAgent resolveSubAgentFromConfigPath(
    */
   private static <T extends BaseAgentConfig> T loadConfigAsType(
       String configPath, Class<T> configClass) throws ConfigurationException {
-    try (InputStream inputStream = new FileInputStream(configPath)) {
-      ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-      mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-      mapper.enable(com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
-      return mapper.readValue(inputStream, configClass);
+    try {
+      String yamlContent = Files.readString(Paths.get(configPath), StandardCharsets.UTF_8);
+
+      // Preprocess YAML to convert snake_case to camelCase
+      String processedYaml = YamlPreprocessor.preprocessYaml(yamlContent);
+
+      ObjectMapper mapper =
+          JsonMapper.builder(new YAMLFactory())
+              .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+              .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+              .build();
+      return mapper.readValue(processedYaml, configClass);
     } catch (IOException e) {
       throw new ConfigurationException("Failed to load or parse config file: " + configPath, e);
     }