diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java index 096ccc1f3..681bc8342 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfiguration.java @@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.experimental.ai.chroma.ChromaApi; -import org.springframework.experimental.ai.vectorsore.ChromaVectorStore; +import org.springframework.ai.chroma.ChromaApi; +import org.springframework.ai.vectorsore.ChromaVectorStore; import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreProperties.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreProperties.java index 1d6b5525f..e73cc1dad 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreProperties.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreProperties.java @@ -17,7 +17,7 @@ package org.springframework.ai.autoconfigure.vectorstore.chroma; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.experimental.ai.vectorsore.ChromaVectorStore; +import org.springframework.ai.vectorsore.ChromaVectorStore; /** * @author Christian Tzolov diff --git a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/chroma/ChromaApi.java b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/chroma/ChromaApi.java similarity index 98% rename from vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/chroma/ChromaApi.java rename to vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/chroma/ChromaApi.java index d0a2aa31c..17798a929 100644 --- a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/chroma/ChromaApi.java +++ b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/chroma/ChromaApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.chroma; +package org.springframework.ai.chroma; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.experimental.ai.chroma.ChromaApi.QueryRequest.Include; +import org.springframework.ai.chroma.ChromaApi.QueryRequest.Include; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/ChromaVectorStore.java b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/ChromaVectorStore.java similarity index 94% rename from vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/ChromaVectorStore.java rename to vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/ChromaVectorStore.java index 872819c0b..97d5ba088 100644 --- a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/ChromaVectorStore.java +++ b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/ChromaVectorStore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.vectorsore; +package org.springframework.ai.vectorsore; import java.util.ArrayList; import java.util.HashMap; @@ -29,10 +29,10 @@ import org.springframework.ai.vectorstore.VectorStore; import org.springframework.ai.vectorstore.filter.converter.ChromaFilterExpressionConverter; import org.springframework.ai.vectorstore.filter.converter.FilterExpressionConverter; import org.springframework.beans.factory.InitializingBean; -import org.springframework.experimental.ai.chroma.ChromaApi; -import org.springframework.experimental.ai.chroma.ChromaApi.AddEmbeddingsRequest; -import org.springframework.experimental.ai.chroma.ChromaApi.DeleteEmbeddingsRequest; -import org.springframework.experimental.ai.chroma.ChromaApi.Embedding; +import org.springframework.ai.chroma.ChromaApi; +import org.springframework.ai.chroma.ChromaApi.AddEmbeddingsRequest; +import org.springframework.ai.chroma.ChromaApi.DeleteEmbeddingsRequest; +import org.springframework.ai.chroma.ChromaApi.Embedding; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/JsonUtils.java b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/JsonUtils.java similarity index 97% rename from vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/JsonUtils.java rename to vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/JsonUtils.java index 0e624b1bc..9ccd0f0b0 100644 --- a/vector-stores/spring-ai-chroma/src/main/java/org/springframework/experimental/ai/vectorsore/JsonUtils.java +++ b/vector-stores/spring-ai-chroma/src/main/java/org/springframework/ai/vectorsore/JsonUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.vectorsore; +package org.springframework.ai.vectorsore; import java.util.List; import java.util.Map; diff --git a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/chroma/ChromaApiIT.java b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/chroma/ChromaApiIT.java similarity index 94% rename from vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/chroma/ChromaApiIT.java rename to vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/chroma/ChromaApiIT.java index 125a6959d..928a50f6d 100644 --- a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/chroma/ChromaApiIT.java +++ b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/chroma/ChromaApiIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.chroma; +package org.springframework.ai.chroma; import java.util.List; import java.util.Map; @@ -29,10 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; -import org.springframework.experimental.ai.chroma.ChromaApi.AddEmbeddingsRequest; -import org.springframework.experimental.ai.chroma.ChromaApi.Collection; -import org.springframework.experimental.ai.chroma.ChromaApi.GetEmbeddingsRequest; -import org.springframework.experimental.ai.chroma.ChromaApi.QueryRequest; +import org.springframework.ai.chroma.ChromaApi.AddEmbeddingsRequest; +import org.springframework.ai.chroma.ChromaApi.Collection; +import org.springframework.ai.chroma.ChromaApi.GetEmbeddingsRequest; +import org.springframework.ai.chroma.ChromaApi.QueryRequest; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; diff --git a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/BasicAuthChromaWhereIT.java b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/BasicAuthChromaWhereIT.java similarity index 93% rename from vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/BasicAuthChromaWhereIT.java rename to vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/BasicAuthChromaWhereIT.java index c57c5739a..2256fabf3 100644 --- a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/BasicAuthChromaWhereIT.java +++ b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/BasicAuthChromaWhereIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.vectorstore; +package org.springframework.ai.vectorstore; import java.time.Duration; import java.util.List; @@ -34,14 +34,11 @@ import retrofit2.converter.jackson.JacksonConverterFactory; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; import org.springframework.ai.openai.embedding.OpenAiEmbeddingClient; -import org.springframework.ai.vectorstore.SearchRequest; -import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; -import org.springframework.experimental.ai.chroma.ChromaApi; -import org.springframework.experimental.ai.vectorsore.ChromaVectorStore; +import org.springframework.ai.chroma.ChromaApi; +import org.springframework.ai.vectorsore.ChromaVectorStore; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; diff --git a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/ChromaVectorStoreIT.java b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreIT.java similarity index 96% rename from vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/ChromaVectorStoreIT.java rename to vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreIT.java index 12f00cf17..45f9576a8 100644 --- a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/ChromaVectorStoreIT.java +++ b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/ChromaVectorStoreIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.vectorstore; +package org.springframework.ai.vectorstore; import java.time.Duration; import java.util.Collections; @@ -35,13 +35,11 @@ import retrofit2.converter.jackson.JacksonConverterFactory; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; import org.springframework.ai.openai.embedding.OpenAiEmbeddingClient; -import org.springframework.ai.vectorstore.SearchRequest; -import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; -import org.springframework.experimental.ai.chroma.ChromaApi; -import org.springframework.experimental.ai.vectorsore.ChromaVectorStore; +import org.springframework.ai.chroma.ChromaApi; +import org.springframework.ai.vectorsore.ChromaVectorStore; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; diff --git a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/TokenSecuredChromaWhereIT.java b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/TokenSecuredChromaWhereIT.java similarity index 95% rename from vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/TokenSecuredChromaWhereIT.java rename to vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/TokenSecuredChromaWhereIT.java index 0c28a85e0..c6134b479 100644 --- a/vector-stores/spring-ai-chroma/src/test/java/org/springframework/experimental/ai/vectorstore/TokenSecuredChromaWhereIT.java +++ b/vector-stores/spring-ai-chroma/src/test/java/org/springframework/ai/vectorstore/TokenSecuredChromaWhereIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.experimental.ai.vectorstore; +package org.springframework.ai.vectorstore; import java.time.Duration; import java.util.List; @@ -33,13 +33,11 @@ import retrofit2.converter.jackson.JacksonConverterFactory; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; import org.springframework.ai.openai.embedding.OpenAiEmbeddingClient; -import org.springframework.ai.vectorstore.SearchRequest; -import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; -import org.springframework.experimental.ai.chroma.ChromaApi; -import org.springframework.experimental.ai.vectorsore.ChromaVectorStore; +import org.springframework.ai.chroma.ChromaApi; +import org.springframework.ai.vectorsore.ChromaVectorStore; import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat;