Merge branch 'main' into spec-update/grounding/support-s3-sftp

Author: rpanackal

.github/workflows/continuous-integration.yaml

@@ -72,7 +72,7 @@ jobs:
 
       - name: "Slack Notification"
         if: ${{ github.ref == 'refs/heads/main' && failure() }}
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/deploy-snapshot.yaml

@@ -40,7 +40,7 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/e2e-test.yaml

@@ -85,7 +85,7 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

.github/workflows/fosstars-report.yml

@@ -76,7 +76,7 @@ jobs:
 
       - name: "Slack Notification"
         if: failure()
-        uses: slackapi/[email protected].0
+        uses: slackapi/[email protected].1
         with:
           webhook: ${{ secrets.SLACK_WEBHOOK }}
           webhook-type: incoming-webhook

pom.xml

@@ -59,7 +59,7 @@
     <maven.compiler.proc>full</maven.compiler.proc>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.outputTimestamp>2025-04-03T13:23:00Z</project.build.outputTimestamp>
-    <cloud-sdk.version>5.20.0</cloud-sdk.version>
+    <cloud-sdk.version>5.21.0</cloud-sdk.version>
     <junit-jupiter.version>5.13.4</junit-jupiter.version>
     <wiremock.version>3.13.1</wiremock.version>
     <assertj-core.version>3.27.3</assertj-core.version>
@@ -68,7 +68,7 @@
     <system-stubs.version>2.1.3</system-stubs.version>
     <surefire.version>3.5.3</surefire.version>
     <springframework.version>6.2.9</springframework.version>
-    <spring-ai.version>1.0.0</spring-ai.version>
+    <spring-ai.version>1.0.1</spring-ai.version>
     <reactor-core.version>3.7.8</reactor-core.version>
     <dotenv-java.version>3.2.0</dotenv-java.version>
     <mockito.version>5.18.0</mockito.version>

sample-code/spring-app/README.md

@@ -27,6 +27,8 @@ Finally, you can start the sample app:
 
 Head to http://localhost:8080 in your browser to see all available endpoints.
 
+To test the MCP integration, run with `mvn spring-boot:run -Dspring-boot.run.arguments="--spring.profiles.active=mcp"`:
+
 ## Run the E2E Test
 
 Trigger the [GitHub Action](https://github.com/SAP/ai-sdk-java/actions/workflows/e2e-test.yaml).

sample-code/spring-app/pom.xml

@@ -107,6 +107,24 @@
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-client-chat</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-mcp</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ai</groupId>
+      <artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <!-- MCP brings 3.4.5 which conflicts with our version 3.5.0.
+           Since we bring the necessary Spring dependencies, we can just exclude the transitive dependency here -->
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/SpringAiOrchestrationController.java

@@ -131,6 +131,20 @@ Object toolCalling(
     return text.isEmpty() ? message.getToolCalls().toString() : text;
   }
 
+  @GetMapping("/mcp")
+  Object mcp(@Nullable @RequestParam(value = "format", required = false) final String format) {
+    val response = service.toolCallingMcp();
+
+    if ("json".equals(format)) {
+      return ((OrchestrationSpringChatResponse) response)
+          .getOrchestrationResponse()
+          .getOriginalResponse();
+    }
+    final AssistantMessage message = response.getResult().getOutput();
+    final String text = message.getText();
+    return text.isEmpty() ? message.getToolCalls().toString() : text;
+  }
+
   @GetMapping("/chatMemory")
   Object chatMemory(
       @Nullable @RequestParam(value = "format", required = false) final String format) {

sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/services/SpringAiOrchestrationService.java

@@ -1,6 +1,7 @@
 package com.sap.ai.sdk.app.services;
 
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GEMINI_1_5_FLASH;
+import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_4O;
 import static com.sap.ai.sdk.orchestration.OrchestrationAiModel.GPT_4O_MINI;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -24,11 +25,16 @@
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.memory.InMemoryChatMemoryRepository;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.support.ToolCallbacks;
+import org.springframework.ai.tool.ToolCallbackProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
@@ -40,6 +46,13 @@ public class SpringAiOrchestrationService {
       new OrchestrationModuleConfig().withLlmConfig(GPT_4O_MINI);
   private final OrchestrationChatOptions defaultOptions = new OrchestrationChatOptions(config);
 
+  @Nullable
+  @Autowired(required = false)
+  ToolCallbackProvider toolCallbackProvider;
+
+  @Value("${spring.profiles.active:}")
+  private String activeProfile;
+
   /**
    * Chat request to OpenAI through the Orchestration service with a simple prompt.
    *
@@ -172,6 +185,41 @@ public ChatResponse toolCalling(final boolean internalToolExecutionEnabled) {
     return client.call(prompt);
   }
 
+  /**
+   * Example using an MCP client to use a file system tool. Enabled via dedicated Spring profile,
+   * since it requires an actual MCP server to run.
+   *
+   * @return the assistant response object
+   */
+  @Nonnull
+  public ChatResponse toolCallingMcp() {
+    // check if spring profile is set to 'mcp'
+    if (!activeProfile.equals("mcp")) {
+      throw new IllegalStateException(
+          "The 'mcp' Spring profile is not active. Set it, e.g. by passing a JVM parameter '-Dspring.profiles.active=mcp'.");
+    }
+    if (toolCallbackProvider == null) {
+      throw new IllegalStateException(
+          "No MCP clients were found. Ensure that you configured the clients correctly in the application.yaml file.");
+    }
+    // GPT-4o-mini doesn't work too well with the file system tool, so we use 4o here
+    val options = new OrchestrationChatOptions(config.withLlmConfig(GPT_4O));
+    options.setToolCallbacks(List.of(toolCallbackProvider.getToolCallbacks()));
+    options.setInternalToolExecutionEnabled(true);
+
+    val sys =
+        new SystemMessage(
+            """
+            Please read through the markdown files in my file system.
+            Ensure to first query the allowed directories.
+            Then use any `.md` files you find to answer the user's question.
+            Do **NOT** query for `*.md` since that doesn't work, ensure to query for `.md` instead.""");
+    val usr = new UserMessage("How can I use Spring AI with the SAP AI SDK?");
+
+    val prompt = new Prompt(List.of(sys, usr), options);
+    return client.call(prompt);
+  }
+
   /**
    * Chat request to OpenAI through the Orchestration service using chat memory.
    *

sample-code/spring-app/src/main/resources/application.yml

@@ -0,0 +1,22 @@
+#---
+spring:
+  config.activate.on-profile:
+        mcp
+  ai:
+    mcp:
+      client:
+        # refer to https://docs.spring.io/spring-ai/reference/api/mcp/mcp-client-boot-starter-docs.html#_starters
+        type: SYNC
+        stdio:
+          connections:
+             # allows file system access to the current directory
+             # requires npx to run
+             # refer to https://www.npmjs.com/package/@modelcontextprotocol/server-filesystem
+             localFS:
+               command: npx
+               args:
+                   - "-y"
+                   - "@modelcontextprotocol/server-filesystem"
+                   - "."
+               env:
+                 DEBUG: "true"