Merge branch 'main' into feature/async-tool-support

Author: JGoP-L

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioSpeechProperties.java

@@ -36,7 +36,7 @@ public class OpenAiAudioSpeechProperties extends OpenAiParentProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.openai.audio.speech";
 
-	public static final String DEFAULT_SPEECH_MODEL = OpenAiAudioApi.TtsModel.TTS_1.getValue();
+	public static final String DEFAULT_SPEECH_MODEL = OpenAiAudioApi.TtsModel.GPT_4_O_MINI_TTS.getValue();
 
 	private static final Float SPEED = 1.0f;
 

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioTranscriptionProperties.java

@@ -26,7 +26,7 @@ public class OpenAiAudioTranscriptionProperties extends OpenAiParentProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.openai.audio.transcription";
 
-	public static final String DEFAULT_TRANSCRIPTION_MODEL = OpenAiAudioApi.WhisperModel.WHISPER_1.getValue();
+	public static final String DEFAULT_TRANSCRIPTION_MODEL = OpenAiAudioApi.TranscriptionModels.WHISPER_1.getValue();
 
 	private static final Double DEFAULT_TEMPERATURE = 0.7;
 

memory/repository/spring-ai-model-chat-memory-repository-jdbc/pom.xml

@@ -85,6 +85,20 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/H2ChatMemoryRepositoryDialect.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024-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.chat.memory.repository.jdbc;
+
+/**
+ * H2-specific SQL dialect for chat memory repository.
+ *
+ * @author Yanming Zhou
+ */
+public class H2ChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
+
+	@Override
+	public String getSelectMessagesSql() {
+		return "SELECT content, type FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ? ORDER BY timestamp ASC";
+	}
+
+	@Override
+	public String getInsertMessageSql() {
+		return "INSERT INTO SPRING_AI_CHAT_MEMORY (conversation_id, content, type, timestamp) VALUES (?, ?, ?, ?)";
+	}
+
+	@Override
+	public String getDeleteMessagesSql() {
+		return "DELETE FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ?";
+	}
+
+	@Override
+	public String getSelectConversationIdsSql() {
+		return "SELECT DISTINCT conversation_id FROM SPRING_AI_CHAT_MEMORY";
+	}
+
+}

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepository.java

@@ -111,10 +111,13 @@ public static Builder builder() {
 	}
 
 	private record AddBatchPreparedStatement(String conversationId, List<Message> messages,
-			AtomicLong instantSeq) implements BatchPreparedStatementSetter {
+			AtomicLong sequenceId) implements BatchPreparedStatementSetter {
 
 		private AddBatchPreparedStatement(String conversationId, List<Message> messages) {
-			this(conversationId, messages, new AtomicLong(Instant.now().toEpochMilli()));
+			// Use second-level granularity to ensure compatibility with all database
+			// timestamp precisions. The timestamp serves as a sequence number for
+			// message ordering, not as a precise temporal record.
+			this(conversationId, messages, new AtomicLong(Instant.now().getEpochSecond()));
 		}
 
 		@Override
@@ -124,7 +127,9 @@ public void setValues(PreparedStatement ps, int i) throws SQLException {
 			ps.setString(1, this.conversationId);
 			ps.setString(2, message.getText());
 			ps.setString(3, message.getMessageType().name());
-			ps.setTimestamp(4, new Timestamp(this.instantSeq.getAndIncrement()));
+			// Convert seconds to milliseconds for Timestamp constructor.
+			// Each message gets a unique second value, ensuring proper ordering.
+			ps.setTimestamp(4, new Timestamp(this.sequenceId.getAndIncrement() * 1000L));
 		}
 
 		@Override

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java

@@ -53,10 +53,6 @@ public interface JdbcChatMemoryRepositoryDialect {
 	 */
 	String getDeleteMessagesSql();
 
-	/**
-	 * Optionally, dialect can provide more advanced SQL as needed.
-	 */
-
 	/**
 	 * Detects the dialect from the DataSource.
 	 */
@@ -78,6 +74,8 @@ static JdbcChatMemoryRepositoryDialect from(DataSource dataSource) {
 			case "MySQL", "MariaDB" -> new MysqlChatMemoryRepositoryDialect();
 			case "Microsoft SQL Server" -> new SqlServerChatMemoryRepositoryDialect();
 			case "HSQL Database Engine" -> new HsqldbChatMemoryRepositoryDialect();
+			case "SQLite" -> new SqliteChatMemoryRepositoryDialect();
+			case "H2" -> new H2ChatMemoryRepositoryDialect();
 			default -> // Add more as needed
 				new PostgresChatMemoryRepositoryDialect();
 		};

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/SqliteChatMemoryRepositoryDialect.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024-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.chat.memory.repository.jdbc;
+
+/**
+ * Sqlite dialect for chat memory repository.
+ *
+ * @author guan xu
+ * @since 1.1.0
+ */
+public class SqliteChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
+
+	@Override
+	public String getSelectMessagesSql() {
+		return "SELECT content, type FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ? ORDER BY timestamp";
+	}
+
+	@Override
+	public String getInsertMessageSql() {
+		return "INSERT INTO SPRING_AI_CHAT_MEMORY (conversation_id, content, type, timestamp) VALUES (?, ?, ?, ?)";
+	}
+
+	@Override
+	public String getSelectConversationIdsSql() {
+		return "SELECT DISTINCT conversation_id FROM SPRING_AI_CHAT_MEMORY";
+	}
+
+	@Override
+	public String getDeleteMessagesSql() {
+		return "DELETE FROM SPRING_AI_CHAT_MEMORY WHERE conversation_id = ?";
+	}
+
+}

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-h2.sql

@@ -0,0 +1,10 @@
+CREATE TABLE SPRING_AI_CHAT_MEMORY (
+    conversation_id VARCHAR(36) NOT NULL,
+    content LONGVARCHAR NOT NULL,
+    type VARCHAR(10) NOT NULL,
+    timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+
+CREATE INDEX SPRING_AI_CHAT_MEMORY_CONVERSATION_ID_TIMESTAMP_IDX ON SPRING_AI_CHAT_MEMORY(conversation_id, timestamp DESC);
+
+ALTER TABLE SPRING_AI_CHAT_MEMORY ADD CONSTRAINT TYPE_CHECK CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL'));

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/resources/org/springframework/ai/chat/memory/repository/jdbc/schema-sqlite.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS SPRING_AI_CHAT_MEMORY (
+    conversation_id TEXT NOT NULL,
+    content TEXT NOT NULL,
+    type TEXT NOT NULL,
+    timestamp INTEGER NOT NULL,
+    CHECK (type IN ('USER', 'ASSISTANT', 'SYSTEM', 'TOOL'))
+);
+
+CREATE INDEX IF NOT EXISTS SPRING_AI_CHAT_MEMORY_CONVERSATION_ID_TIMESTAMP_IDX
+ON SPRING_AI_CHAT_MEMORY(conversation_id, timestamp);

memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/AbstractJdbcChatMemoryRepositoryIT.java

@@ -16,7 +16,6 @@
 
 package org.springframework.ai.chat.memory.repository.jdbc;
 
-import java.sql.Timestamp;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -84,7 +83,7 @@ void saveMessagesSingleMessage(String content, MessageType messageType) {
 		assertThat(result.get("conversation_id")).isEqualTo(conversationId);
 		assertThat(result.get("content")).isEqualTo(message.getText());
 		assertThat(result.get("type")).isEqualTo(messageType.name());
-		assertThat(result.get("timestamp")).isInstanceOf(Timestamp.class);
+		assertThat(result.get("timestamp")).isNotNull();
 	}
 
 	@Test
@@ -114,7 +113,7 @@ void saveMessagesMultipleMessages() {
 			assertThat(result.get("conversation_id")).isEqualTo(conversationId);
 			assertThat(result.get("content")).isEqualTo(message.getText());
 			assertThat(result.get("type")).isEqualTo(message.getMessageType().name());
-			assertThat(result.get("timestamp")).isInstanceOf(Timestamp.class);
+			assertThat(result.get("timestamp")).isNotNull();
 		}
 
 		var count = this.chatMemoryRepository.findByConversationId(conversationId).size();
@@ -186,6 +185,30 @@ void testMessageOrder() {
 				"4-Fourth message");
 	}
 
+	@Test
+	void testMessageOrderWithLargeBatch() {
+		var conversationId = UUID.randomUUID().toString();
+
+		// Create a large batch of 50 messages to ensure timestamp ordering issues
+		// are detected. With the old millisecond-precision code, MySQL/MariaDB's
+		// second-precision TIMESTAMP columns would truncate all timestamps to the
+		// same value, causing random ordering. This test validates the fix.
+		List<Message> messages = new java.util.ArrayList<>();
+		for (int i = 0; i < 50; i++) {
+			messages.add(new UserMessage("Message " + i));
+		}
+
+		this.chatMemoryRepository.saveAll(conversationId, messages);
+
+		List<Message> retrievedMessages = this.chatMemoryRepository.findByConversationId(conversationId);
+
+		// Verify we got all messages back in the exact order they were saved
+		assertThat(retrievedMessages).hasSize(50);
+		for (int i = 0; i < 50; i++) {
+			assertThat(retrievedMessages.get(i).getText()).isEqualTo("Message " + i);
+		}
+	}
+
 	/**
 	 * Base configuration for all integration tests.
 	 */