From a48a6d96113397b2daf2b970bc64a60cb9a35b04 Mon Sep 17 00:00:00 2001 From: Mark Pollack Date: Thu, 11 Jan 2024 10:11:53 -0500 Subject: [PATCH] Change package name for PostgresML and Transformers Fixes #133 --- .../PostgresMlEmbeddingClient.java | 5 ++++- .../PostgresMlEmbeddingClientIT.java | 18 +++++++++--------- models/spring-ai-transformers/pom.xml | 2 +- .../ResourceCacheService.java | 2 +- .../TransformersEmbeddingClient.java | 5 ++++- .../ResourceCacheServiceTests.java | 2 +- .../TransformersEmbeddingClientTests.java | 3 ++- .../samples/ONNXSample.java | 2 +- ...ormersEmbeddingClientAutoConfiguration.java | 4 ++-- .../TransformersEmbeddingClientProperties.java | 6 +++--- ...oot.autoconfigure.AutoConfiguration.imports | 2 +- ...mersEmbeddingClientAutoConfigurationIT.java | 4 +--- .../AzureVectorStoreAutoConfigurationIT.java | 2 +- .../ChromaVectorStoreAutoConfigurationIT.java | 2 +- .../MilvusVectorStoreAutoConfigurationIT.java | 2 +- .../Neo4jVectorStoreAutoConfigurationIT.java | 2 +- .../PgVectorStoreAutoConfigurationIT.java | 2 +- ...PineconeVectorStoreAutoConfigurationIT.java | 2 +- .../RedisVectorStoreAutoConfigurationIT.java | 2 +- ...viateVectorStoreAutoConfigurationTests.java | 2 +- .../vectorstore/azure/AzureVectorStoreIT.java | 2 +- .../ai/vectorstore/PineconeVectorStoreIT.java | 2 +- .../ai/vectorstore/RedisVectorStoreIT.java | 2 +- .../ai/vectorstore/WeaviateVectorStoreIT.java | 2 +- 24 files changed, 42 insertions(+), 37 deletions(-) rename models/spring-ai-postgresml/src/main/java/org/springframework/ai/{embedding => postgresml}/PostgresMlEmbeddingClient.java (96%) rename models/spring-ai-postgresml/src/test/java/org/springframework/ai/{embedding => postgresml}/PostgresMlEmbeddingClientIT.java (88%) rename models/spring-ai-transformers/src/main/java/org/springframework/ai/{embedding => transformers}/ResourceCacheService.java (99%) rename models/spring-ai-transformers/src/main/java/org/springframework/ai/{embedding => transformers}/TransformersEmbeddingClient.java (98%) rename models/spring-ai-transformers/src/test/java/org/springframework/ai/{embedding => transformers}/ResourceCacheServiceTests.java (98%) rename models/spring-ai-transformers/src/test/java/org/springframework/ai/{embedding => transformers}/TransformersEmbeddingClientTests.java (97%) rename models/spring-ai-transformers/src/test/java/org/springframework/ai/{embedding => transformers}/samples/ONNXSample.java (98%) rename spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/{embedding/transformer => transformers}/TransformersEmbeddingClientAutoConfiguration.java (93%) rename spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/{embedding/transformer => transformers}/TransformersEmbeddingClientProperties.java (95%) diff --git a/models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java b/models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClient.java similarity index 96% rename from models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java rename to models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClient.java index 026ee3915..192951d1b 100644 --- a/models/spring-ai-postgresml/src/main/java/org/springframework/ai/embedding/PostgresMlEmbeddingClient.java +++ b/models/spring-ai-postgresml/src/main/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClient.java @@ -1,4 +1,4 @@ -package org.springframework.ai.embedding; +package org.springframework.ai.postgresml; import java.sql.Array; import java.sql.PreparedStatement; @@ -12,6 +12,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.ai.document.Document; import org.springframework.ai.document.MetadataMode; +import org.springframework.ai.embedding.AbstractEmbeddingClient; +import org.springframework.ai.embedding.Embedding; +import org.springframework.ai.embedding.EmbeddingResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClientIT.java similarity index 88% rename from models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java rename to models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClientIT.java index e4324a3ed..d89678b27 100644 --- a/models/spring-ai-postgresml/src/test/java/org/springframework/ai/embedding/PostgresMlEmbeddingClientIT.java +++ b/models/spring-ai-postgresml/src/test/java/org/springframework/ai/postgresml/PostgresMlEmbeddingClientIT.java @@ -1,15 +1,17 @@ -package org.springframework.ai.embedding; +package org.springframework.ai.postgresml; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Map; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.springframework.ai.embedding.EmbeddingResponse; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; import org.testcontainers.junit.jupiter.Container; @@ -18,7 +20,6 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.document.Document; import org.springframework.ai.document.MetadataMode; -import org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; @@ -27,8 +28,6 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect import org.springframework.jdbc.core.JdbcTemplate; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType.PG_ARRAY; -import static org.springframework.ai.embedding.PostgresMlEmbeddingClient.VectorType.PG_VECTOR; /** * @author Toshiaki Maki @@ -72,7 +71,7 @@ class PostgresMlEmbeddingClientIT { @Test void embedWithPgVector() { PostgresMlEmbeddingClient embeddingClient = new PostgresMlEmbeddingClient(this.jdbcTemplate, - "distilbert-base-uncased", PG_VECTOR); + "distilbert-base-uncased", PostgresMlEmbeddingClient.VectorType.PG_VECTOR); embeddingClient.afterPropertiesSet(); List embed = embeddingClient.embed(new Document("Hello World!")); assertThat(embed).hasSize(768); @@ -92,7 +91,8 @@ class PostgresMlEmbeddingClientIT { @Test void embedWithKwargs() { PostgresMlEmbeddingClient embeddingClient = new PostgresMlEmbeddingClient(this.jdbcTemplate, - "distilbert-base-uncased", PG_ARRAY, Map.of("device", "cpu"), MetadataMode.EMBED); + "distilbert-base-uncased", PostgresMlEmbeddingClient.VectorType.PG_ARRAY, Map.of("device", "cpu"), + MetadataMode.EMBED); embeddingClient.afterPropertiesSet(); List embed = embeddingClient.embed(new Document("Hello World!")); assertThat(embed).hasSize(768); @@ -103,7 +103,7 @@ class PostgresMlEmbeddingClientIT { @ValueSource(strings = { "PG_ARRAY", "PG_VECTOR" }) void embedForResponse(String vectorType) { PostgresMlEmbeddingClient embeddingClient = new PostgresMlEmbeddingClient(this.jdbcTemplate, - "distilbert-base-uncased", VectorType.valueOf(vectorType)); + "distilbert-base-uncased", PostgresMlEmbeddingClient.VectorType.valueOf(vectorType)); embeddingClient.afterPropertiesSet(); EmbeddingResponse embeddingResponse = embeddingClient .embedForResponse(List.of("Hello World!", "Spring AI!", "LLM!")); @@ -124,9 +124,9 @@ class PostgresMlEmbeddingClientIT { void dimensions() { PostgresMlEmbeddingClient embeddingClient = new PostgresMlEmbeddingClient(this.jdbcTemplate); embeddingClient.afterPropertiesSet(); - assertThat(embeddingClient.dimensions()).isEqualTo(768); + Assertions.assertThat(embeddingClient.dimensions()).isEqualTo(768); // cached - assertThat(embeddingClient.dimensions()).isEqualTo(768); + Assertions.assertThat(embeddingClient.dimensions()).isEqualTo(768); } @SpringBootApplication diff --git a/models/spring-ai-transformers/pom.xml b/models/spring-ai-transformers/pom.xml index 2374bb47f..7f7579932 100644 --- a/models/spring-ai-transformers/pom.xml +++ b/models/spring-ai-transformers/pom.xml @@ -10,7 +10,7 @@ spring-ai-transformers jar - Spring AI Transormers Embedding Client + Spring AI Transformers Embedding Client Spring AI Transformers Embedding Client https://github.com/spring-projects/spring-ai diff --git a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java b/models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/ResourceCacheService.java similarity index 99% rename from models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java rename to models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/ResourceCacheService.java index 47a281764..b8d7695fe 100644 --- a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/ResourceCacheService.java +++ b/models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/ResourceCacheService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.embedding; +package org.springframework.ai.transformers; import java.io.File; import java.io.IOException; diff --git a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java b/models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/TransformersEmbeddingClient.java similarity index 98% rename from models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java rename to models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/TransformersEmbeddingClient.java index c61d0ee25..66b1dec0f 100644 --- a/models/spring-ai-transformers/src/main/java/org/springframework/ai/embedding/TransformersEmbeddingClient.java +++ b/models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/TransformersEmbeddingClient.java @@ -1,4 +1,4 @@ -package org.springframework.ai.embedding; +package org.springframework.ai.transformers; import java.nio.FloatBuffer; import java.util.ArrayList; @@ -23,6 +23,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.ai.document.Document; import org.springframework.ai.document.MetadataMode; +import org.springframework.ai.embedding.AbstractEmbeddingClient; +import org.springframework.ai.embedding.Embedding; +import org.springframework.ai.embedding.EmbeddingResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/ResourceCacheServiceTests.java similarity index 98% rename from models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java rename to models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/ResourceCacheServiceTests.java index 9cc44f2b9..61521af07 100644 --- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/ResourceCacheServiceTests.java +++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/ResourceCacheServiceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.embedding; +package org.springframework.ai.transformers; import java.io.File; import java.io.IOException; diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingClientTests.java similarity index 97% rename from models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java rename to models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingClientTests.java index aea25226e..2c4f67436 100644 --- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/TransformersEmbeddingClientTests.java +++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/TransformersEmbeddingClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.embedding; +package org.springframework.ai.transformers; import java.text.DecimalFormat; import java.util.List; @@ -22,6 +22,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.ai.document.Document; +import org.springframework.ai.embedding.EmbeddingResponse; import static org.assertj.core.api.Assertions.assertThat; diff --git a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/samples/ONNXSample.java b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/samples/ONNXSample.java similarity index 98% rename from models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/samples/ONNXSample.java rename to models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/samples/ONNXSample.java index fe1ca90f4..26f5076e1 100644 --- a/models/spring-ai-transformers/src/test/java/org/springframework/ai/embedding/samples/ONNXSample.java +++ b/models/spring-ai-transformers/src/test/java/org/springframework/ai/transformers/samples/ONNXSample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.embedding.samples; +package org.springframework.ai.transformers.samples; import java.nio.FloatBuffer; import java.util.HashMap; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfiguration.java similarity index 93% rename from spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java rename to spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfiguration.java index e646c4d14..bd2dad4f9 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientAutoConfiguration.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.ai.autoconfigure.embedding.transformer; +package org.springframework.ai.autoconfigure.transformers; import ai.djl.huggingface.tokenizers.HuggingFaceTokenizer; import ai.onnxruntime.OrtSession; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientProperties.java b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientProperties.java similarity index 95% rename from spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientProperties.java rename to spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientProperties.java index 2266209a0..8bc236270 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/embedding/transformer/TransformersEmbeddingClientProperties.java +++ b/spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ai.autoconfigure.embedding.transformer; +package org.springframework.ai.autoconfigure.transformers; import java.io.File; import java.util.HashMap; @@ -25,10 +25,10 @@ import ai.djl.huggingface.tokenizers.HuggingFaceTokenizer; import org.springframework.ai.document.Document; import org.springframework.ai.document.MetadataMode; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.boot.context.properties.ConfigurationProperties; -import static org.springframework.ai.autoconfigure.embedding.transformer.TransformersEmbeddingClientProperties.CONFIG_PREFIX; +import static org.springframework.ai.autoconfigure.transformers.TransformersEmbeddingClientProperties.CONFIG_PREFIX; /** * @author Christian Tzolov diff --git a/spring-ai-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-ai-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index fdf807ab1..2ab930d9f 100644 --- a/spring-ai-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-ai-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,6 @@ org.springframework.ai.autoconfigure.openai.OpenAiAutoConfiguration org.springframework.ai.autoconfigure.azure.openai.AzureOpenAiAutoConfiguration -org.springframework.ai.autoconfigure.embedding.transformer.TransformersEmbeddingClientAutoConfiguration +org.springframework.ai.autoconfigure.transformers.TransformersEmbeddingClientAutoConfiguration org.springframework.ai.autoconfigure.huggingface.HuggingfaceAutoConfiguration org.springframework.ai.autoconfigure.vertexai.VertexAiAutoConfiguration org.springframework.ai.autoconfigure.bedrock.llama2.BedrockLlama2ChatAutoConfiguration diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfigurationIT.java index c44d0d6f6..67121339c 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/transformers/TransformersEmbeddingClientAutoConfigurationIT.java @@ -22,10 +22,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.springframework.ai.autoconfigure.embedding.transformer.TransformersEmbeddingClientAutoConfiguration; -import org.springframework.ai.autoconfigure.embedding.transformer.TransformersEmbeddingClientProperties; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/azure/AzureVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/azure/AzureVectorStoreAutoConfigurationIT.java index a5e7a7388..5be2e730c 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/azure/AzureVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/azure/AzureVectorStoreAutoConfigurationIT.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.azure.AzureVectorStore; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfigurationIT.java index f78d9e44d..294cfdd1b 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/chroma/ChromaVectorStoreAutoConfigurationIT.java @@ -26,7 +26,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfigurationIT.java index a267df54f..e4a7a8ca5 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfigurationIT.java @@ -33,7 +33,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.ai.ResourceUtils; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/neo4j/Neo4jVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/neo4j/Neo4jVectorStoreAutoConfigurationIT.java index 43004ab15..cfe683f67 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/neo4j/Neo4jVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/neo4j/Neo4jVectorStoreAutoConfigurationIT.java @@ -28,7 +28,7 @@ import org.testcontainers.utility.DockerImageName; import org.springframework.ai.ResourceUtils; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfigurationIT.java index 54a89c66b..48ff9059d 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfigurationIT.java @@ -28,7 +28,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfigurationIT.java index 19d21956b..bca64f5c0 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pinecone/PineconeVectorStoreAutoConfigurationIT.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfigurationIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfigurationIT.java index 1e91f2041..4071a2d02 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfigurationIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/redis/RedisVectorStoreAutoConfigurationIT.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.springframework.ai.ResourceUtils; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.boot.autoconfigure.AutoConfigurations; diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationTests.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationTests.java index a5d112099..3bc741f64 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationTests.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/weaviate/WeaviateVectorStoreAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.ai.vectorstore.WeaviateVectorStore.WeaviateVectorStoreConfig.MetadataField; diff --git a/vector-stores/spring-ai-azure/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java b/vector-stores/spring-ai-azure/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java index a99c22af6..1783d5d4b 100644 --- a/vector-stores/spring-ai-azure/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java +++ b/vector-stores/spring-ai-azure/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.ai.vectorstore.azure.AzureVectorStore.MetadataField; diff --git a/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java b/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java index 3cd9ec081..1ab2add08 100644 --- a/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java +++ b/vector-stores/spring-ai-pinecone/src/test/java/org/springframework/ai/vectorstore/PineconeVectorStoreIT.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.PineconeVectorStore.PineconeVectorStoreConfig; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java b/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java index 40ac99c97..542c5f0a0 100644 --- a/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java +++ b/vector-stores/spring-ai-redis/src/test/java/org/springframework/ai/vectorstore/RedisVectorStoreIT.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.RedisVectorStore.MetadataField; import org.springframework.ai.vectorstore.RedisVectorStore.RedisVectorStoreConfig; import org.springframework.boot.SpringBootConfiguration; diff --git a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java b/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java index ed0c6e870..2ed9423ca 100644 --- a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java +++ b/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java @@ -30,7 +30,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingClient; -import org.springframework.ai.embedding.TransformersEmbeddingClient; +import org.springframework.ai.transformers.TransformersEmbeddingClient; import org.springframework.ai.vectorstore.WeaviateVectorStore.WeaviateVectorStoreConfig; import org.springframework.ai.vectorstore.WeaviateVectorStore.WeaviateVectorStoreConfig.MetadataField; import org.springframework.boot.SpringBootConfiguration;