Skip to content

Commit 87cbe71

Browse files
linarkoulinarkou
committed
Merge branch 'main' into chat-memory-jdbc-fix-message-order
# Conflicts: # auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializerPostgresqlTests.java
2 parents c90fc3b + acd986e commit 87cbe71

File tree

288 files changed

+5184
-14724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+5184
-14724
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,21 @@ public class StdioTransportAutoConfiguration {
6767
* <li>Server-specific parameters from properties
6868
* <li>Unique connection name for identification
6969
* </ul>
70-
* @param sdioProperties the stdio client properties containing server configurations
70+
* @param stdioProperties the stdio client properties containing server configurations
7171
* @return list of named MCP transports
7272
*/
7373
@Bean
74-
public List<NamedClientMcpTransport> stdioTransports(McpStdioClientProperties sdioProperties) {
74+
public List<NamedClientMcpTransport> stdioTransports(McpStdioClientProperties stdioProperties) {
7575

76-
List<NamedClientMcpTransport> stdoiTransports = new ArrayList<>();
76+
List<NamedClientMcpTransport> stdioTransports = new ArrayList<>();
7777

78-
for (Map.Entry<String, ServerParameters> serverParameters : sdioProperties.toServerParameters().entrySet()) {
78+
for (Map.Entry<String, ServerParameters> serverParameters : stdioProperties.toServerParameters().entrySet()) {
7979
var transport = new StdioClientTransport(serverParameters.getValue());
80-
stdoiTransports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
80+
stdioTransports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
8181

8282
}
8383

84-
return stdoiTransports;
84+
return stdioTransports;
8585
}
8686

8787
}

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebFluxServerAutoConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public class McpWebFluxServerAutoConfiguration {
7777
public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
7878
McpServerProperties serverProperties) {
7979
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
80-
return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
80+
return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint(),
81+
serverProperties.getSseEndpoint());
8182
}
8283

8384
// Router function for SSE transport used by Spring WebFlux to start an HTTP server.

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public class McpWebMvcServerAutoConfiguration {
7272
public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
7373
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerProperties serverProperties) {
7474
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
75-
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
75+
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint(),
76+
serverProperties.getSseEndpoint());
7677
}
7778

7879
@Bean

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<version>${project.parent.version}</version>
3131
</dependency>
3232

33+
<dependency>
34+
<groupId>org.springframework.ai</groupId>
35+
<artifactId>spring-ai-autoconfigure-model-chat-memory</artifactId>
36+
<version>${project.parent.version}</version>
37+
</dependency>
38+
3339
<!-- Boot dependencies -->
3440
<dependency>
3541
<groupId>org.springframework.boot</groupId>

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemory;
2222
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryConfig;
23+
import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
2324
import org.springframework.boot.autoconfigure.AutoConfiguration;
2425
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -34,7 +35,7 @@
3435
* @author Jihoon Kim
3536
* @since 1.0.0
3637
*/
37-
@AutoConfiguration(after = CassandraAutoConfiguration.class)
38+
@AutoConfiguration(after = CassandraAutoConfiguration.class, before = ChatMemoryAutoConfiguration.class)
3839
@ConditionalOnClass({ CassandraChatMemory.class, CqlSession.class })
3940
@EnableConfigurationProperties(CassandraChatMemoryProperties.class)
4041
public class CassandraChatMemoryAutoConfiguration {

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<version>${project.parent.version}</version>
3030
</dependency>
3131

32+
<dependency>
33+
<groupId>org.springframework.ai</groupId>
34+
<artifactId>spring-ai-autoconfigure-model-chat-memory</artifactId>
35+
<version>${project.parent.version}</version>
36+
</dependency>
37+
3238
<!-- Boot dependencies -->
3339
<dependency>
3440
<groupId>org.springframework.boot</groupId>

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryAutoConfiguration.java‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,93 @@
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

24+
import org.springframework.ai.chat.memory.ChatMemory;
25+
import org.springframework.ai.chat.memory.MessageWindowChatMemory;
2426
import org.springframework.ai.chat.memory.jdbc.JdbcChatMemory;
2527
import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryConfig;
28+
import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository;
29+
import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
2630
import org.springframework.boot.autoconfigure.AutoConfiguration;
2731
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2832
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
29-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
33+
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
34+
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
35+
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
3036
import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
3137
import org.springframework.boot.context.properties.EnableConfigurationProperties;
32-
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
3338
import org.springframework.context.annotation.Bean;
39+
import org.springframework.context.annotation.ConditionContext;
40+
import org.springframework.context.annotation.Conditional;
41+
import org.springframework.core.type.AnnotatedTypeMetadata;
3442
import org.springframework.jdbc.core.JdbcTemplate;
3543

3644
/**
3745
* @author Jonathan Leijendekker
46+
* @author Thomas Vitale
3847
* @since 1.0.0
3948
*/
40-
@AutoConfiguration(after = JdbcTemplateAutoConfiguration.class)
41-
@ConditionalOnClass({ JdbcChatMemory.class, DataSource.class, JdbcTemplate.class })
49+
@AutoConfiguration(after = JdbcTemplateAutoConfiguration.class, before = ChatMemoryAutoConfiguration.class)
50+
@ConditionalOnClass({ JdbcChatMemoryRepository.class, DataSource.class, JdbcTemplate.class })
4251
@EnableConfigurationProperties(JdbcChatMemoryProperties.class)
4352
public class JdbcChatMemoryAutoConfiguration {
4453

4554
private static final Logger logger = LoggerFactory.getLogger(JdbcChatMemoryAutoConfiguration.class);
4655

4756
@Bean
4857
@ConditionalOnMissingBean
49-
public JdbcChatMemory chatMemory(JdbcTemplate jdbcTemplate) {
50-
var config = JdbcChatMemoryConfig.builder().jdbcTemplate(jdbcTemplate).build();
58+
JdbcChatMemoryRepository chatMemoryRepository(JdbcTemplate jdbcTemplate) {
59+
return JdbcChatMemoryRepository.builder().jdbcTemplate(jdbcTemplate).build();
60+
}
5161

62+
/**
63+
* @deprecated in favor of building a {@link MessageWindowChatMemory} (or other
64+
* {@link ChatMemory} implementations) with a {@link JdbcChatMemoryRepository}
65+
* instance.
66+
*/
67+
@Bean
68+
@ConditionalOnMissingBean
69+
@Deprecated
70+
JdbcChatMemory chatMemory(JdbcTemplate jdbcTemplate) {
71+
var config = JdbcChatMemoryConfig.builder().jdbcTemplate(jdbcTemplate).build();
5272
return JdbcChatMemory.create(config);
5373
}
5474

5575
@Bean
5676
@ConditionalOnMissingBean
57-
@ConditionalOnProperty(value = "spring.ai.chat.memory.jdbc.initialize-schema", havingValue = "true",
58-
matchIfMissing = true)
59-
public DataSourceScriptDatabaseInitializer jdbcChatMemoryScriptDatabaseInitializer(DataSource dataSource) {
60-
logger.debug("Initializing JdbcChatMemory schema");
61-
77+
@Conditional(OnSchemaInitializationEnabledCondition.class)
78+
JdbcChatMemoryDataSourceScriptDatabaseInitializer jdbcChatMemoryScriptDatabaseInitializer(DataSource dataSource) {
79+
logger.debug("Initializing schema for JdbcChatMemoryRepository");
6280
return new JdbcChatMemoryDataSourceScriptDatabaseInitializer(dataSource);
6381
}
6482

83+
/**
84+
* Condition to check if the schema initialization is enabled, supporting both
85+
* deprecated and new property.
86+
*
87+
* @deprecated to be removed in 1.0.0-RC1.
88+
*/
89+
@Deprecated
90+
static class OnSchemaInitializationEnabledCondition extends SpringBootCondition {
91+
92+
@Override
93+
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
94+
Boolean initializeSchemaEnabled = context.getEnvironment()
95+
.getProperty("spring.ai.chat.memory.jdbc.initialize-schema", Boolean.class);
96+
97+
if (initializeSchemaEnabled != null) {
98+
return new ConditionOutcome(initializeSchemaEnabled,
99+
ConditionMessage.forCondition("Enable JDBC Chat Memory Schema Initialization")
100+
.because("spring.ai.chat.memory.jdbc.initialize-schema is " + initializeSchemaEnabled));
101+
}
102+
103+
initializeSchemaEnabled = context.getEnvironment()
104+
.getProperty(JdbcChatMemoryProperties.CONFIG_PREFIX + ".initialize-schema", Boolean.class, true);
105+
106+
return new ConditionOutcome(initializeSchemaEnabled, ConditionMessage
107+
.forCondition("Enable JDBC Chat Memory Schema Initialization")
108+
.because(JdbcChatMemoryProperties.CONFIG_PREFIX + ".initialize-schema is " + initializeSchemaEnabled));
109+
}
110+
111+
}
112+
65113
}

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializer.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
import org.springframework.boot.sql.init.DatabaseInitializationMode;
2626
import org.springframework.boot.sql.init.DatabaseInitializationSettings;
2727

28+
/**
29+
* Performs database initialization for the JDBC Chat Memory Repository.
30+
*
31+
* @since 1.0.0
32+
*/
2833
class JdbcChatMemoryDataSourceScriptDatabaseInitializer extends DataSourceScriptDatabaseInitializer {
2934

3035
private static final String SCHEMA_LOCATION = "classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql";

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryProperties.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020

2121
/**
2222
* @author Jonathan Leijendekker
23+
* @author Thomas Vitale
2324
* @since 1.0.0
2425
*/
2526
@ConfigurationProperties(JdbcChatMemoryProperties.CONFIG_PREFIX)
2627
public class JdbcChatMemoryProperties {
2728

28-
public static final String CONFIG_PREFIX = "spring.ai.chat.memory.jdbc";
29+
public static final String CONFIG_PREFIX = "spring.ai.chat.memory.repository.jdbc";
2930

31+
/**
32+
* Whether to initialize the schema on startup.
33+
*/
3034
private boolean initializeSchema = true;
3135

3236
public boolean isInitializeSchema() {

‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"groups": [],
3+
"properties": [
4+
{
5+
"name": "spring.ai.chat.memory.jdbc.initialize-schema",
6+
"type": "java.lang.Boolean",
7+
"description": "Whether to initialize the schema on startup.",
8+
"deprecation": {
9+
"replacement": "spring.ai.chat.memory.repository.jdbc.initialize-schema"
10+
}
11+
}
12+
],
13+
"hints": []
14+
}

0 commit comments

Comments
 (0)