Bedrock,GoogleGenAi: support toolExecutionMaxIterations

Signed-off-by: lambochen <[email protected]>

Author: lambochen

.github/workflows/new-maven-central-release.yml

@@ -27,8 +27,8 @@ jobs:
 
       - name: Release to Sonatype OSSRH
         env:
-          SONATYPE_USER: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-          SONATYPE_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
+          CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: |
           ./mvnw -B clean install -DskipTests

.gitignore

@@ -43,6 +43,7 @@ shell.log
 /spring-ai-spring-boot-autoconfigure/nbproject/
 /vector-stores/spring-ai-cassandra-store/nbproject/
 
+CLAUDE.md
 **/.claude/settings.local.json
 .devcontainer
 

CONTRIBUTING.adoc

@@ -32,7 +32,7 @@ For additional details, please refer to the blog post https://spring.io/blog/202
 
 1. Go to https://github.com/spring-projects/spring-ai[https://github.com/spring-projects/spring-ai]
 2. Hit the "fork" button and choose your own GitHub account as the target
-3. For more detail see https://help.github.com/fork-a-repo/[Fork A Repo].
+3. For more detail see https://help.github.com/articles/fork-a-repo/[Fork A Repo].
 
 == Setup your Local Development Environment
 
@@ -140,16 +140,17 @@ However, we encourage all PR contributors to run checkstyles by enabling them be
 
 You can enable them by doing the following:
 
-```shell
+[source,shell]
+----
 ./mvnw clean package -DskipTests -Ddisable.checks=false
-```
+----
 
 === Source Code Style
 
 Spring AI source code checkstyle tries to follow the checkstyle guidelines used by the core Spring Framework project with some exceptions.
 The wiki pages
-[Code Style](https://github.com/spring-projects/spring-framework/wiki/Code-Style) and
-[IntelliJ IDEA Editor Settings](https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings)
+https://github.com/spring-projects/spring-framework/wiki/Code-Style[Code Style] and
+https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings[IntelliJ IDEA Editor Settings]
 define the source file coding standards we use along with some IDEA editor settings we customize.
 
 == Mind the whitespace

advisors/spring-ai-advisors-vector-store/src/test/java/org/springframework/ai/chat/client/advisor/vectorstore/VectorStoreChatMemoryAdvisorTests.java

@@ -19,8 +19,11 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.vectorstore.VectorStore;
+import reactor.core.scheduler.Scheduler;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
@@ -91,4 +94,116 @@ void whenDefaultTopKIsNegativeThenThrow() {
 			.hasMessageContaining("topK must be greater than 0");
 	}
 
+	@Test
+	void whenBuilderWithValidVectorStoreThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore).build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderWithAllValidParametersThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+		Scheduler scheduler = Mockito.mock(Scheduler.class);
+		PromptTemplate systemPromptTemplate = Mockito.mock(PromptTemplate.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.conversationId("test-conversation")
+			.scheduler(scheduler)
+			.systemPromptTemplate(systemPromptTemplate)
+			.defaultTopK(5)
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenDefaultConversationIdIsBlankThenThrow() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		assertThatThrownBy(() -> VectorStoreChatMemoryAdvisor.builder(vectorStore).conversationId("   ").build())
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessageContaining("defaultConversationId cannot be null or empty");
+	}
+
+	@Test
+	void whenBuilderWithValidConversationIdThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.conversationId("valid-id")
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderWithValidTopKThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.defaultTopK(10)
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderWithMinimumTopKThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore).defaultTopK(1).build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderWithLargeTopKThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.defaultTopK(1000)
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderCalledMultipleTimesWithSameVectorStoreThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+
+		VectorStoreChatMemoryAdvisor advisor1 = VectorStoreChatMemoryAdvisor.builder(vectorStore).build();
+		VectorStoreChatMemoryAdvisor advisor2 = VectorStoreChatMemoryAdvisor.builder(vectorStore).build();
+
+		assertThat(advisor1).isNotNull();
+		assertThat(advisor2).isNotNull();
+		assertThat(advisor1).isNotSameAs(advisor2);
+	}
+
+	@Test
+	void whenBuilderWithCustomSchedulerThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+		Scheduler customScheduler = Mockito.mock(Scheduler.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.scheduler(customScheduler)
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
+	@Test
+	void whenBuilderWithCustomSystemPromptTemplateThenSuccess() {
+		VectorStore vectorStore = Mockito.mock(VectorStore.class);
+		PromptTemplate customTemplate = Mockito.mock(PromptTemplate.class);
+
+		VectorStoreChatMemoryAdvisor advisor = VectorStoreChatMemoryAdvisor.builder(vectorStore)
+			.systemPromptTemplate(customTemplate)
+			.build();
+
+		assertThat(advisor).isNotNull();
+	}
+
 }

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/pom.xml renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/pom.xml

@@ -9,10 +9,10 @@
 		<version>1.1.0-SNAPSHOT</version>
 		<relativePath>../../../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
+	<artifactId>spring-ai-autoconfigure-mcp-client-common</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI MCP Client Auto Configuration</name>
-	<description>Spring AI MCP Client Auto Configuration</description>
+	<name>Spring AI MCP Client Common Auto Configuration</name>
+	<description>Spring AI MCP Client Common Auto Configuration</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>
@@ -35,11 +35,11 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
+		<!-- <dependency>
 			<groupId>io.modelcontextprotocol.sdk</groupId>
 			<artifactId>mcp-spring-webflux</artifactId>
 			<optional>true</optional>
-		</dependency>
+		</dependency> -->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -53,15 +53,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- NOTE: Currently the webmvc doesn't implement client transport. 
-			We will add it in the future based on ResrtClient.
-		-->
-		<!-- <dependency>
-			<groupId>io.modelcontextprotocol.sdk</groupId>
-			<artifactId>mcp-spring-webmvc</artifactId>
-			<optional>true</optional>
-		</dependency> -->
-
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/McpClientAutoConfiguration.java renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpClientAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.mcp.client.autoconfigure;
+package org.springframework.ai.mcp.client.common.autoconfigure;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@
 import io.modelcontextprotocol.client.McpSyncClient;
 import io.modelcontextprotocol.spec.McpSchema;
 
-import org.springframework.ai.mcp.client.autoconfigure.configurer.McpAsyncClientConfigurer;
-import org.springframework.ai.mcp.client.autoconfigure.configurer.McpSyncClientConfigurer;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
+import org.springframework.ai.mcp.client.common.autoconfigure.configurer.McpAsyncClientConfigurer;
+import org.springframework.ai.mcp.client.common.autoconfigure.configurer.McpSyncClientConfigurer;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
 import org.springframework.ai.mcp.customizer.McpAsyncClientCustomizer;
 import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
 import org.springframework.beans.factory.ObjectProvider;
@@ -98,8 +98,14 @@
  * @see SseHttpClientTransportAutoConfiguration
  * @see SseWebFluxTransportAutoConfiguration
  */
-@AutoConfiguration(after = { StdioTransportAutoConfiguration.class, SseHttpClientTransportAutoConfiguration.class,
-		SseWebFluxTransportAutoConfiguration.class })
+@AutoConfiguration(afterName = {
+		"org.springframework.ai.mcp.client.common.autoconfigure.StdioTransportAutoConfiguration",
+		"org.springframework.ai.mcp.client.httpclient.autoconfigure.SseHttpClientTransportAutoConfiguration",
+		"org.springframework.ai.mcp.client.httpclient.autoconfigure.StreamableHttpHttpClientTransportAutoConfiguration",
+		"org.springframework.ai.mcp.client.webflux.autoconfigure.SseWebFluxTransportAutoConfiguration",
+		"org.springframework.ai.mcp.client.webflux.autoconfigure.StreamableHttpWebFluxTransportAutoConfiguration" })
+
+// @AutoConfiguration
 @ConditionalOnClass({ McpSchema.class })
 @EnableConfigurationProperties(McpClientCommonProperties.class)
 @ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/McpToolCallbackAutoConfiguration.java renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/McpToolCallbackAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.mcp.client.autoconfigure;
+package org.springframework.ai.mcp.client.common.autoconfigure;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@
 
 import org.springframework.ai.mcp.AsyncMcpToolCallbackProvider;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.AllNestedConditions;

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/NamedClientMcpTransport.java renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/NamedClientMcpTransport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.mcp.client.autoconfigure;
+package org.springframework.ai.mcp.client.common.autoconfigure;
 
 import io.modelcontextprotocol.spec.McpClientTransport;
 

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/src/main/java/org/springframework/ai/mcp/client/autoconfigure/StdioTransportAutoConfiguration.java renamed to auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/StdioTransportAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.mcp.client.autoconfigure;
+package org.springframework.ai.mcp.client.common.autoconfigure;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,8 +24,8 @@
 import io.modelcontextprotocol.client.transport.StdioClientTransport;
 import io.modelcontextprotocol.spec.McpSchema;
 
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpClientCommonProperties;
-import org.springframework.ai.mcp.client.autoconfigure.properties.McpStdioClientProperties;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpStdioClientProperties;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/aot/McpClientAutoConfigurationRuntimeHints.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * 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
+ *
+ *      https://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 org.springframework.ai.mcp.client.common.autoconfigure.aot;
+
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+
+import static org.springframework.ai.aot.AiRuntimeHints.findJsonAnnotatedClassesInPackage;
+
+/**
+ * @author Josh Long
+ * @author Soby Chacko
+ * @author Christian Tzolov
+ */
+public class McpClientAutoConfigurationRuntimeHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+		hints.resources().registerPattern("**.json");
+
+		var mcs = MemberCategory.values();
+		for (var tr : findJsonAnnotatedClassesInPackage("org.springframework.ai.mcp.client.common.autoconfigure")) {
+			hints.reflection().registerType(tr, mcs);
+		}
+	}
+
+}