Merge branch 'main' into AdkWebServerTest-UI

vorburger · web-flow · commit 976ae72c5b53 · 2025-08-21T01:42:42.000+02:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "redhat.java",
+    "vscjava.vscode-java-pack",
+    "josevseb.google-java-format-for-vs-code"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,31 @@
+{
+  // formatOnType and formatOnPaste is a very bad idea for slow formatters
+  // (such as an external Google Java Format invocation exec), so just on Save:
+  "editor.formatOnSave": true,
+  "editor.formatOnType": false,
+  "editor.formatOnPaste": false,
+
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+
+  "[java]": {
+    "editor.tabSize": 2,
+    // Format Java using https://github.com/google/google-java-format,
+    // via https://github.com/JoseVSeb/google-java-format-for-vs-code
+    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code",
+    "editor.codeActionsOnSave": {
+      // Used by at least JS as well as Java, so only overridden for [java]
+      "source.organizeImports": "always",
+      "source.addMissingImports": "never"
+    }
+  },
+  // Keep this version in sync with the same version in pom.xml
+  // NB: Changes to this are only taken into account on start-up, so need to restart.
+  "java.format.settings.google.version": "1.27.0",
+  // TODO https://github.com/eclipse-jdtls/eclipse.jdt.ls/issues/3050
+  "java.compile.nullAnalysis.mode": "automatic",
+  "java.completion.importOrder": ["#", "", "javax", "java"], //# is static
+  "java.completion.favoriteStaticMembers": ["com.google.common.truth.Truth.*"],
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.import.maven.enabled": true
+}
diff --git a/contrib/langchain4j/pom.xml b/contrib/langchain4j/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <mcp-schema.version>0.10.0</mcp-schema.version>
-        <google.genai.version>1.0.0</google.genai.version>
+        <google.genai.version>1.8.0</google.genai.version>
         <junit.version>5.11.4</junit.version>
         <mockito.version>5.17.0</mockito.version>
         <langchain4j.version>1.1.0</langchain4j.version>
@@ -136,4 +136,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java b/contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
@@ -224,13 +224,11 @@ private ChatRequest toChatRequest(LlmRequest llmRequest) {
                       .mode()
                       .ifPresent(
                           functionMode -> {
-                            if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.AUTO)) {
+                            if (FunctionCallingConfigMode.Known.AUTO.equals(
+                                functionMode.knownEnum())) {
                               requestBuilder.toolChoice(ToolChoice.AUTO);
-                            } else if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.ANY)) {
+                            } else if (FunctionCallingConfigMode.Known.ANY.equals(
+                                functionMode.knownEnum())) {
                               // TODO check if it's the correct
                               // mapping
                               requestBuilder.toolChoice(ToolChoice.REQUIRED);
@@ -246,9 +244,8 @@ private ChatRequest toChatRequest(LlmRequest llmRequest) {
                                                             toolSpecification.name()))
                                                 .toList());
                                       });
-                            } else if (functionMode
-                                .knownEnum()
-                                .equals(FunctionCallingConfigMode.Known.NONE)) {
+                            } else if (FunctionCallingConfigMode.Known.NONE.equals(
+                                functionMode.knownEnum())) {
                               requestBuilder.toolSpecifications(List.of());
                             }
                           });
@@ -349,7 +346,7 @@ private List<ChatMessage> toUserOrToolResultMessage(Content content) {
                       .mimeType(mimeType)
                       .build());
         } else if (mimeType.startsWith("text/")
-            || mimeType.equals("application/json")
+            || "application/json".equals(mimeType)
             || mimeType.endsWith("+json")
             || mimeType.endsWith("+xml")) {
           // TODO are there missing text based mime types?
@@ -454,7 +451,7 @@ private List<ToolSpecification> toToolSpecifications(LlmRequest llmRequest) {
   }
 
   private JsonObjectSchema toParameters(Schema schema) {
-    if (schema.type().isPresent() && schema.type().get().knownEnum().equals(Type.Known.OBJECT)) {
+    if (schema.type().isPresent() && Type.Known.OBJECT.equals(schema.type().get().knownEnum())) {
       return JsonObjectSchema.builder()
           .addProperties(toProperties(schema))
           .required(schema.required().orElse(List.of()))
@@ -490,7 +487,7 @@ private JsonSchemaElement toJsonSchemaElement(Schema schema) {
                 .items(toJsonSchemaElement(schema.items().orElseThrow()))
                 .build();
         case OBJECT -> toParameters(schema);
-        case TYPE_UNSPECIFIED ->
+        default ->
             throw new UnsupportedFeatureException(
                 "LangChain4jLlm does not support schema of type: " + type);
       };
diff --git a/core/src/main/java/com/google/adk/agents/InvocationContext.java b/core/src/main/java/com/google/adk/agents/InvocationContext.java
@@ -17,8 +17,8 @@
 package com.google.adk.agents;
 
 import com.google.adk.artifacts.BaseArtifactService;
-import com.google.adk.exceptions.LlmCallsLimitExceededException;
 import com.google.adk.memory.BaseMemoryService;
+import com.google.adk.models.LlmCallsLimitExceededException;
 import com.google.adk.sessions.BaseSessionService;
 import com.google.adk.sessions.Session;
 import com.google.errorprone.annotations.InlineMe;
diff --git a/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java b/core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java
@@ -28,12 +28,12 @@
 import com.google.adk.agents.ReadonlyContext;
 import com.google.adk.agents.RunConfig.StreamingMode;
 import com.google.adk.events.Event;
-import com.google.adk.exceptions.LlmCallsLimitExceededException;
 import com.google.adk.flows.BaseFlow;
 import com.google.adk.flows.llmflows.RequestProcessor.RequestProcessingResult;
 import com.google.adk.flows.llmflows.ResponseProcessor.ResponseProcessingResult;
 import com.google.adk.models.BaseLlm;
 import com.google.adk.models.BaseLlmConnection;
+import com.google.adk.models.LlmCallsLimitExceededException;
 import com.google.adk.models.LlmRegistry;
 import com.google.adk.models.LlmRequest;
 import com.google.adk.models.LlmResponse;
diff --git a/core/src/main/java/com/google/adk/models/LlmCallsLimitExceededException.java b/core/src/main/java/com/google/adk/models/LlmCallsLimitExceededException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.adk.exceptions;
+package com.google.adk.models;
 
 /** An error indicating that the limit for calls to the LLM has been exceeded. */
 public final class LlmCallsLimitExceededException extends Exception {
diff --git a/core/src/main/java/com/google/adk/tools/mcp/AbstractMcpTool.java b/core/src/main/java/com/google/adk/tools/mcp/AbstractMcpTool.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.adk.tools.BaseTool;
+import com.google.adk.tools.mcp.McpToolException.McpToolDeclarationException;
 import com.google.common.collect.ImmutableMap;
 import com.google.genai.types.FunctionDeclaration;
 import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
@@ -77,14 +78,20 @@ public T getMcpSession() {
   @Override
   public Optional<FunctionDeclaration> declaration() {
     JsonSchema schema = this.mcpTool.inputSchema();
-    return Optional.ofNullable(schema)
-        .map(
-            value ->
-                FunctionDeclaration.builder()
-                    .name(this.name())
-                    .description(this.description())
-                    .parametersJsonSchema(value)
-                    .build());
+    try {
+      return Optional.ofNullable(schema)
+          .map(
+              value ->
+                  FunctionDeclaration.builder()
+                      .name(this.name())
+                      .description(this.description())
+                      .parametersJsonSchema(value)
+                      .build());
+    } catch (Exception e) {
+      throw new McpToolDeclarationException(
+          String.format("MCP tool:%s failed to get declaration, schema:%s.", this.name(), schema),
+          e);
+    }
   }
 
   @SuppressWarnings("PreferredInterfaceType") // BaseTool.runAsync() returns Map<String, Object>
diff --git a/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java b/core/src/main/java/com/google/adk/tools/mcp/DefaultMcpTransportBuilder.java
@@ -21,7 +21,8 @@ public McpClientTransport build(Object connectionParams) {
       return new StdioClientTransport(serverParameters);
     } else if (connectionParams instanceof SseServerParameters sseServerParams) {
       return HttpClientSseClientTransport.builder(sseServerParams.url())
-          .sseEndpoint("sse")
+          .sseEndpoint(
+              sseServerParams.sseEndpoint() == null ? "sse" : sseServerParams.sseEndpoint())
           .customizeRequest(
               builder ->
                   Optional.ofNullable(sseServerParams.headers())
diff --git a/core/src/main/java/com/google/adk/tools/mcp/McpServerLogConsumer.java b/core/src/main/java/com/google/adk/tools/mcp/McpServerLogConsumer.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.adk.tools.mcp;
+
+import io.modelcontextprotocol.spec.McpSchema;
+import io.modelcontextprotocol.spec.McpSchema.LoggingMessageNotification;
+import java.util.function.Consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
+
+class McpServerLogConsumer implements Consumer<LoggingMessageNotification> {
+
+  @Override
+  public void accept(LoggingMessageNotification notif) {
+    Logger log = LoggerFactory.getLogger(notif.logger());
+    log.atLevel(convert(notif.level())).log("{}", notif.data());
+  }
+
+  private Level convert(McpSchema.LoggingLevel level) {
+    return switch (level) {
+      case DEBUG -> Level.DEBUG;
+      case INFO, NOTICE -> Level.INFO;
+      case WARNING -> Level.WARN;
+      case ERROR, CRITICAL, ALERT, EMERGENCY -> Level.ERROR;
+    };
+  }
+}
diff --git a/core/src/main/java/com/google/adk/tools/mcp/McpSessionManager.java b/core/src/main/java/com/google/adk/tools/mcp/McpSessionManager.java
@@ -71,6 +71,7 @@ public static McpSyncClient initializeSession(
             .initializationTimeout(
                 Optional.ofNullable(initializationTimeout).orElse(Duration.ofSeconds(10)))
             .requestTimeout(Optional.ofNullable(requestTimeout).orElse(Duration.ofSeconds(10)))
+            .loggingConsumer(new McpServerLogConsumer())
             .capabilities(ClientCapabilities.builder().build())
             .build();
     InitializeResult initResult = client.initialize();
diff --git a/core/src/main/java/com/google/adk/tools/mcp/McpToolException.java b/core/src/main/java/com/google/adk/tools/mcp/McpToolException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.adk.tools.mcp;
+
+/** Base exception for all errors originating from {@code AbstractMcpTool} and its subclasses. */
+public class McpToolException extends RuntimeException {
+
+  public McpToolException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  /** Exception thrown when there's an error during MCP tool declaration generated. */
+  public static class McpToolDeclarationException extends McpToolException {
+    public McpToolDeclarationException(String message, Throwable cause) {
+      super(message, cause);
+    }
+  }
+}
diff --git a/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java b/core/src/main/java/com/google/adk/tools/mcp/SseServerParameters.java
@@ -29,6 +29,10 @@ public abstract class SseServerParameters {
   /** The URL of the SSE server. */
   public abstract String url();
 
+  /** The endpoint to connect to on the SSE server. */
+  @Nullable
+  public abstract String sseEndpoint();
+
   /** Optional headers to include in the SSE connection request. */
   @Nullable
   public abstract ImmutableMap<String, Object> headers();
@@ -52,6 +56,9 @@ public abstract static class Builder {
     /** Sets the URL of the SSE server. */
     public abstract Builder url(String url);
 
+    /** Sets the endpoint to connect to on the SSE server. */
+    public abstract Builder sseEndpoint(String sseEndpoint);
+
     /** Sets the headers for the SSE connection request. */
     public abstract Builder headers(@Nullable Map<String, Object> headers);
 
diff --git a/dev/src/main/java/com/google/adk/web/AdkWebServer.java b/dev/src/main/java/com/google/adk/web/AdkWebServer.java
@@ -125,6 +125,8 @@
 @ComponentScan(basePackages = {"com.google.adk.web", "com.google.adk.web.config"})
 public class AdkWebServer implements WebMvcConfigurer {
 
+  private static AgentLoader AGENT_LOADER;
+
   private static final Logger log = LoggerFactory.getLogger(AdkWebServer.class);
 
   @Value("${adk.web.ui.dir:#{null}}")
@@ -175,23 +177,33 @@ public Map<String, BaseAgent> loadedAgentRegistry(
     }
 
     try {
+      // If AGENT_LOADER is set (by start()), use it
+      if (AGENT_LOADER != null) {
+        var staticAgents = AGENT_LOADER.loadAgents();
+        agents.putAll(staticAgents);
+        log.info("Loaded {} static agents: {}", staticAgents.size(), staticAgents.keySet());
+      }
+
       // Create and use compiler loader
       AgentCompilerLoader compilerLoader = new AgentCompilerLoader(props);
       Map<String, BaseAgent> compiledAgents = compilerLoader.loadAgents();
       agents.putAll(compiledAgents);
-      log.info("Loaded {} compiled agents: {}", compiledAgents.size(), compiledAgents.keySet());
+      if (!compiledAgents.isEmpty())
+        log.info("Loaded {} compiled agents: {}", compiledAgents.size(), compiledAgents.keySet());
 
       // Create and use YAML hot loader
       AgentYamlHotLoader yamlLoader =
           new AgentYamlHotLoader(props, agents, runnerService, hotReloadingEnabled);
       Map<String, BaseAgent> yamlAgents = yamlLoader.loadAgents();
       agents.putAll(yamlAgents);
-      log.info("Loaded {} YAML agents: {}", yamlAgents.size(), yamlAgents.keySet());
+      if (!yamlAgents.isEmpty()) {
+        log.info("Loaded {} YAML agents: {}", yamlAgents.size(), yamlAgents.keySet());
 
-      // Start hot-reloading
-      if (yamlLoader.supportsHotReloading()) {
-        yamlLoader.start();
-        log.info("Started hot-reloading for YAML agents");
+        // Start hot-reloading
+        if (yamlLoader.supportsHotReloading()) {
+          yamlLoader.start();
+          log.info("Started hot-reloading for YAML agents");
+        }
       }
 
       return agents;
@@ -653,7 +665,7 @@ public AgentController(
       this.apiServerSpanExporter = apiServerSpanExporter;
       this.runnerService = runnerService;
       log.info(
-          "AgentController initialized with {} dynamic agents: {}",
+          "AgentController initialized with {} agents: {}",
           agentRegistry.size(),
           agentRegistry.keySet());
       if (agentRegistry.isEmpty()) {
@@ -718,7 +730,7 @@ private Session findSessionOrThrow(String appName, String userId, String session
      */
     @GetMapping("/list-apps")
     public List<String> listApps() {
-      log.info("Listing apps from dynamic registry. Found: {}", agentRegistry.keySet());
+      log.info("Listing apps from registry. Found: {}", agentRegistry.keySet());
       List<String> appNames = new ArrayList<>(agentRegistry.keySet());
       Collections.sort(appNames);
       return appNames;
@@ -1871,4 +1883,13 @@ public static void main(String[] args) {
     SpringApplication.run(AdkWebServer.class, args);
     log.info("AdkWebServer application started successfully.");
   }
+
+  // TODO(vorburger): #later return Closeable, which can stop the server (and resets static)
+  public static synchronized void start(BaseAgent... agents) {
+    if (AGENT_LOADER != null) {
+      throw new IllegalStateException("AdkWebServer can only be started once.");
+    }
+    AGENT_LOADER = new AgentStaticLoader(agents);
+    main(new String[0]);
+  }
 }
diff --git a/dev/src/main/java/com/google/adk/web/AgentLoader.java b/dev/src/main/java/com/google/adk/web/AgentLoader.java
@@ -69,5 +69,7 @@ default boolean supportsHotReloading() {
    *
    * @return A string description of the loader type
    */
-  String getLoaderType();
+  default String getLoaderType() {
+    return getClass().getSimpleName();
+  }
 }
diff --git a/dev/src/main/java/com/google/adk/web/AgentStaticLoader.java b/dev/src/main/java/com/google/adk/web/AgentStaticLoader.java
diff --git a/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java b/dev/src/test/java/com/google/adk/web/AdkWebServerTest.java
