diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/pom.xml b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml similarity index 92% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/pom.xml rename to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml index 31f7a6dbe..08172e974 100644 --- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/pom.xml +++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml @@ -9,10 +9,10 @@ 1.0.0-SNAPSHOT ../../../../../pom.xml - spring-ai-autoconfigure-model-chat-memory + spring-ai-autoconfigure-model-chat-memory-cassandra jar - Spring AI Chat Memory Auto Configuration - Spring AI Chat Memory Auto Configuration + Spring AI Cassandra Chat Memory Auto Configuration + Spring AI Cassandra Chat Memory Auto Configuration https://github.com/spring-projects/spring-ai diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfiguration.java b/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 similarity index 100% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfiguration.java rename to 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 diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java similarity index 90% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java rename to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java index e9d7e7dbf..59575abf5 100644 --- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java +++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryProperties.java @@ -21,7 +21,6 @@ import java.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.ai.model.chat.memory.autoconfigure.CommonChatMemoryProperties; import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.lang.Nullable; @@ -34,7 +33,7 @@ import org.springframework.lang.Nullable; * @since 1.0.0 */ @ConfigurationProperties(CassandraChatMemoryProperties.CONFIG_PREFIX) -public class CassandraChatMemoryProperties extends CommonChatMemoryProperties { +public class CassandraChatMemoryProperties { public static final String CONFIG_PREFIX = "spring.ai.chat.memory.cassandra"; @@ -48,6 +47,16 @@ public class CassandraChatMemoryProperties extends CommonChatMemoryProperties { private String userColumn = CassandraChatMemoryConfig.DEFAULT_USER_COLUMN_NAME; + private boolean initializeSchema = true; + + public boolean isInitializeSchema() { + return this.initializeSchema; + } + + public void setInitializeSchema(boolean initializeSchema) { + this.initializeSchema = initializeSchema; + } + private Duration timeToLive = null; public String getKeyspace() { diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 90% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e266a06b7..e12725f95 100644 --- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -cassandra.org.springframework.ai.model.chat.memory.autoconfigure.CassandraChatMemoryAutoConfiguration +org.springframework.ai.model.chat.memory.cassandra.autoconfigure.CassandraChatMemoryAutoConfiguration diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java similarity index 100% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java rename to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/test/java/org/springframework/ai/model/chat/memory/autoconfigure/CassandraChatMemoryPropertiesTest.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryPropertiesTest.java similarity index 92% rename from auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/test/java/org/springframework/ai/model/chat/memory/autoconfigure/CassandraChatMemoryPropertiesTest.java rename to auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryPropertiesTest.java index faea4c772..982dff8ad 100644 --- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/test/java/org/springframework/ai/model/chat/memory/autoconfigure/CassandraChatMemoryPropertiesTest.java +++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/cassandra/autoconfigure/CassandraChatMemoryPropertiesTest.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.ai.model.chat.memory.autoconfigure; +package org.springframework.ai.model.chat.memory.cassandra.autoconfigure; import java.time.Duration; import org.junit.jupiter.api.Test; -import org.springframework.ai.model.chat.memory.cassandra.autoconfigure.CassandraChatMemoryProperties; import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryConfig; import static org.assertj.core.api.Assertions.assertThat; diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/autoconfigure/CommonChatMemoryProperties.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/autoconfigure/CommonChatMemoryProperties.java deleted file mode 100644 index 00ea424c4..000000000 --- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/autoconfigure/CommonChatMemoryProperties.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2023-2024 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.model.chat.memory.autoconfigure; - -/** - * Configuration properties for the common chat memory. - * - * @author Mick Semb Wever - * @since 1.0.0 - */ -public class CommonChatMemoryProperties { - - private boolean initializeSchema = true; - - public boolean isInitializeSchema() { - return this.initializeSchema; - } - - public void setInitializeSchema(boolean initializeSchema) { - this.initializeSchema = initializeSchema; - } - -} diff --git a/pom.xml b/pom.xml index 3a8ec87fd..8dfc01c0d 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client - auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory + auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation