Merge branch 'main' into main

Signed-off-by: Senrey_Song <25841017+SenreySong@users.noreply.github.com>

Author: SenreySong

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

@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+import java.util.Map;
+
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties;
+import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
+
+/**
+ * Connection details for an MCP client.
+ *
+ * @author Eddú Meléndez
+ */
+public interface McpSseClientConnectionDetails extends ConnectionDetails {
+
+	Map<String, McpSseClientProperties.SseParameters> getConnections();
+
+}

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

@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import java.util.Map;
+
+import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties;
+
+public class PropertiesMcpSseClientConnectionDetails implements McpSseClientConnectionDetails {
+
+	private final McpSseClientProperties properties;
+
+	public PropertiesMcpSseClientConnectionDetails(McpSseClientProperties properties) {
+		this.properties = properties;
+	}
+
+	@Override
+	public Map<String, McpSseClientProperties.SseParameters> getConnections() {
+		return this.properties.getConnections();
+	}
+
+}

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-httpclient/src/main/java/org/springframework/ai/mcp/client/httpclient/autoconfigure/SseHttpClientTransportAutoConfiguration.java

@@ -28,7 +28,9 @@
 import io.modelcontextprotocol.client.transport.customizer.McpSyncHttpClientRequestCustomizer;
 import io.modelcontextprotocol.spec.McpSchema;
 
+import org.springframework.ai.mcp.client.common.autoconfigure.McpSseClientConnectionDetails;
 import org.springframework.ai.mcp.client.common.autoconfigure.NamedClientMcpTransport;
+import org.springframework.ai.mcp.client.common.autoconfigure.PropertiesMcpSseClientConnectionDetails;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties.SseParameters;
@@ -73,6 +75,11 @@ public class SseHttpClientTransportAutoConfiguration {
 
 	private static final LogAccessor logger = new LogAccessor(SseHttpClientTransportAutoConfiguration.class);
 
+	@Bean
+	PropertiesMcpSseClientConnectionDetails mcpSseClientConnectionDetails(McpSseClientProperties sseProperties) {
+		return new PropertiesMcpSseClientConnectionDetails(sseProperties);
+	}
+
 	/**
 	 * Creates a list of HTTP client-based SSE transports for MCP communication.
 	 *
@@ -84,7 +91,8 @@ public class SseHttpClientTransportAutoConfiguration {
 	 * <li>ObjectMapper for JSON processing
 	 * <li>A sync or async HTTP request customizer. Sync takes precedence.
 	 * </ul>
-	 * @param sseProperties the SSE client properties containing server configurations
+	 * @param connectionDetails the SSE client connection details containing server
+	 * configurations
 	 * @param objectMapperProvider the provider for ObjectMapper or a new instance if not
 	 * available
 	 * @param syncHttpRequestCustomizer provider for
@@ -94,7 +102,7 @@ public class SseHttpClientTransportAutoConfiguration {
 	 * @return list of named MCP transports
 	 */
 	@Bean
-	public List<NamedClientMcpTransport> sseHttpClientTransports(McpSseClientProperties sseProperties,
+	public List<NamedClientMcpTransport> sseHttpClientTransports(McpSseClientConnectionDetails connectionDetails,
 			ObjectProvider<ObjectMapper> objectMapperProvider,
 			ObjectProvider<McpSyncHttpClientRequestCustomizer> syncHttpRequestCustomizer,
 			ObjectProvider<McpAsyncHttpClientRequestCustomizer> asyncHttpRequestCustomizer) {
@@ -103,7 +111,7 @@ public List<NamedClientMcpTransport> sseHttpClientTransports(McpSseClientPropert
 
 		List<NamedClientMcpTransport> sseTransports = new ArrayList<>();
 
-		for (Map.Entry<String, SseParameters> serverParameters : sseProperties.getConnections().entrySet()) {
+		for (Map.Entry<String, SseParameters> serverParameters : connectionDetails.getConnections().entrySet()) {
 
 			String baseUrl = serverParameters.getValue().url();
 			String sseEndpoint = serverParameters.getValue().sseEndpoint() != null

auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-webflux/src/main/java/org/springframework/ai/mcp/client/webflux/autoconfigure/SseWebFluxTransportAutoConfiguration.java

@@ -23,7 +23,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.modelcontextprotocol.client.transport.WebFluxSseClientTransport;
 
+import org.springframework.ai.mcp.client.common.autoconfigure.McpSseClientConnectionDetails;
 import org.springframework.ai.mcp.client.common.autoconfigure.NamedClientMcpTransport;
+import org.springframework.ai.mcp.client.common.autoconfigure.PropertiesMcpSseClientConnectionDetails;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpClientCommonProperties;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties;
 import org.springframework.ai.mcp.client.common.autoconfigure.properties.McpSseClientProperties.SseParameters;
@@ -63,6 +65,11 @@
 		matchIfMissing = true)
 public class SseWebFluxTransportAutoConfiguration {
 
+	@Bean
+	PropertiesMcpSseClientConnectionDetails mcpSseClientConnectionDetails(McpSseClientProperties sseProperties) {
+		return new PropertiesMcpSseClientConnectionDetails(sseProperties);
+	}
+
 	/**
 	 * Creates a list of WebFlux-based SSE transports for MCP communication.
 	 *
@@ -73,14 +80,14 @@ public class SseWebFluxTransportAutoConfiguration {
 	 * <li>ObjectMapper for JSON processing
 	 * <li>Server connection parameters from properties
 	 * </ul>
-	 * @param sseProperties the SSE client properties containing server configurations
+	 * @param connectionDetails the SSE client properties containing server configurations
 	 * @param webClientBuilderProvider the provider for WebClient.Builder
 	 * @param objectMapperProvider the provider for ObjectMapper or a new instance if not
 	 * available
 	 * @return list of named MCP transports
 	 */
 	@Bean
-	public List<NamedClientMcpTransport> sseWebFluxClientTransports(McpSseClientProperties sseProperties,
+	public List<NamedClientMcpTransport> sseWebFluxClientTransports(McpSseClientConnectionDetails connectionDetails,
 			ObjectProvider<WebClient.Builder> webClientBuilderProvider,
 			ObjectProvider<ObjectMapper> objectMapperProvider) {
 
@@ -89,7 +96,7 @@ public List<NamedClientMcpTransport> sseWebFluxClientTransports(McpSseClientProp
 		var webClientBuilderTemplate = webClientBuilderProvider.getIfAvailable(WebClient::builder);
 		var objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
 
-		for (Map.Entry<String, SseParameters> serverParameters : sseProperties.getConnections().entrySet()) {
+		for (Map.Entry<String, SseParameters> serverParameters : connectionDetails.getConnections().entrySet()) {
 			var webClientBuilder = webClientBuilderTemplate.clone().baseUrl(serverParameters.getValue().url());
 			String sseEndpoint = serverParameters.getValue().sseEndpoint() != null
 					? serverParameters.getValue().sseEndpoint() : "/sse";

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-neo4j/src/test/java/org/springframework/ai/model/chat/memory/repository/neo4j/autoconfigure/Neo4jChatMemoryRepositoryAutoConfigurationIT.java

@@ -83,8 +83,11 @@ void addAndGet() {
 			memory.deleteByConversationId(sessionId);
 			assertThat(memory.findByConversationId(sessionId)).isEmpty();
 
-			AssistantMessage assistantMessage = new AssistantMessage("test answer", Map.of(),
-					List.of(new AssistantMessage.ToolCall("id", "type", "name", "arguments")));
+			AssistantMessage assistantMessage = AssistantMessage.builder()
+				.content("test answer")
+				.properties(Map.of())
+				.toolCalls(List.of(new AssistantMessage.ToolCall("id", "type", "name", "arguments")))
+				.build();
 
 			memory.saveAll(sessionId, List.of(userMessage, assistantMessage));
 			messages = memory.findByConversationId(sessionId);

auto-configurations/models/spring-ai-autoconfigure-model-zhipuai/src/test/java/org/springframework/ai/model/zhipuai/autoconfigure/ZhiPuAiPropertiesTests.java

@@ -37,6 +37,7 @@
  * {@link ZhiPuAiEmbeddingProperties}.
  *
  * @author Geng Rong
+ * @author YunKui Lu
  */
 public class ZhiPuAiPropertiesTests {
 
@@ -243,7 +244,9 @@ public void chatOptionsTest() {
 						"required": ["location", "lat", "lon", "unit"]
 					}
 					""",
-					"spring.ai.zhipuai.chat.options.user=userXYZ"
+					"spring.ai.zhipuai.chat.options.user=userXYZ",
+					"spring.ai.zhipuai.chat.options.response-format.type=json_object",
+					"spring.ai.zhipuai.chat.options.thinking.type=disabled"
 				)
 			// @formatter:on
 			.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
@@ -262,6 +265,8 @@ public void chatOptionsTest() {
 				assertThat(chatProperties.getOptions().getTopP()).isEqualTo(0.56);
 				assertThat(chatProperties.getOptions().getRequestId()).isEqualTo("RequestId");
 				assertThat(chatProperties.getOptions().getDoSample()).isEqualTo(Boolean.TRUE);
+				assertThat(chatProperties.getOptions().getResponseFormat().type()).isEqualTo("json_object");
+				assertThat(chatProperties.getOptions().getThinking().type()).isEqualTo("disabled");
 
 				JSONAssert.assertEquals("{\"type\":\"function\",\"function\":{\"name\":\"toolChoiceFunctionName\"}}",
 						chatProperties.getOptions().getToolChoice(), JSONCompareMode.LENIENT);

auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-chroma/src/test/java/org/springframework/ai/vectorstore/chroma/autoconfigure/ChromaVectorStoreAutoConfigurationIT.java

@@ -95,8 +95,10 @@ public void verifyThatChromaCanHandleComplexMetadataValues() {
 
 			var response = ChatClientResponse.builder()
 				.chatResponse(ChatResponse.builder()
-					.generations(List
-						.of(new Generation(new AssistantMessage("AssistantMessage", Map.of("annotations", List.of())))))
+					.generations(List.of(new Generation(AssistantMessage.builder()
+						.content("AssistantMessage")
+						.properties(Map.of("annotations", List.of()))
+						.build())))
 					.build())
 				.build();
 			var res2 = advisor.after(response, null);

mcp/common/src/main/java/org/springframework/ai/mcp/McpToolUtils.java

@@ -433,7 +433,7 @@ public static List<ToolCallback> getToolCallbacksFromAsyncClients(List<McpAsyncC
 		if (CollectionUtils.isEmpty(asyncMcpClients)) {
 			return List.of();
 		}
-		return List.of((new AsyncMcpToolCallbackProvider(asyncMcpClients).getToolCallbacks()));
+		return List.of((AsyncMcpToolCallbackProvider.builder().mcpClients(asyncMcpClients).build().getToolCallbacks()));
 	}
 
 	@JsonIgnoreProperties(ignoreUnknown = true)

memory/repository/spring-ai-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/chat/memory/repository/cassandra/CassandraChatMemoryRepository.java

@@ -209,7 +209,7 @@ private Message getMessage(UdtValue udt) {
 		Map<String, Object> props = Map.of(CONVERSATION_TS, udt.getInstant(this.conf.messageUdtTimestampColumn));
 		switch (MessageType.valueOf(udt.getString(this.conf.messageUdtTypeColumn))) {
 			case ASSISTANT:
-				return new AssistantMessage(content, props);
+				return AssistantMessage.builder().content(content).properties(props).build();
 			case USER:
 				return UserMessage.builder().text(content).metadata(props).build();
 			case SYSTEM:

memory/repository/spring-ai-model-chat-memory-repository-neo4j/src/main/java/org/springframework/ai/chat/memory/repository/neo4j/Neo4jChatMemoryRepository.java

@@ -183,14 +183,16 @@ private Message buildToolMessage(org.neo4j.driver.Record record) {
 
 	private Message buildAssistantMessage(org.neo4j.driver.Record record, Map<String, Object> messageMap,
 			List<Media> mediaList) {
-		Message message;
-		message = new AssistantMessage(messageMap.get(MessageAttributes.TEXT_CONTENT.getValue()).toString(),
-				record.get("metadata").asMap(Map.of()), record.get("toolCalls").asList(v -> {
-					var toolCallMap = v.asMap();
-					return new AssistantMessage.ToolCall((String) toolCallMap.get("id"),
-							(String) toolCallMap.get("type"), (String) toolCallMap.get("name"),
-							(String) toolCallMap.get("arguments"));
-				}), mediaList);
+		Message message = AssistantMessage.builder()
+			.content(messageMap.get(MessageAttributes.TEXT_CONTENT.getValue()).toString())
+			.properties(record.get("metadata").asMap(Map.of()))
+			.toolCalls(record.get("toolCalls").asList(v -> {
+				var toolCallMap = v.asMap();
+				return new AssistantMessage.ToolCall((String) toolCallMap.get("id"), (String) toolCallMap.get("type"),
+						(String) toolCallMap.get("name"), (String) toolCallMap.get("arguments"));
+			}))
+			.media(mediaList)
+			.build();
 		return message;
 	}