Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor PgVector to package org.springframework.ai.vectorstore.pgvector

Browse Source
This commit is contained in:
Mark Pollack
2024-12-14 16:45:06 -05:00
parent fc1f92d11c
commit 03a9379bb7
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/client/advisor/RetrievalAugmentationAdvisorIT.java
View File

@@ -38,7 +38,7 @@ import org.springframework.ai.rag.preretrieval.query.transformation.TranslationQ
import org.springframework.ai.rag.retrieval.search.VectorStoreDocumentRetriever;
import org.springframework.ai.reader.markdown.MarkdownDocumentReader;
import org.springframework.ai.reader.markdown.config.MarkdownDocumentReaderConfig;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;

2
spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/rag/retrieval/search/VectorStoreDocumentRetrieverIT.java
View File

@@ -29,7 +29,7 @@ import org.springframework.ai.integration.tests.TestApplication;
import org.springframework.ai.rag.Query;
import org.springframework.ai.rag.retrieval.search.DocumentRetriever;
import org.springframework.ai.rag.retrieval.search.VectorStoreDocumentRetriever;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.ai.vectorstore.filter.Filter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

2
spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfiguration.java
View File

@@ -23,7 +23,7 @@ import io.micrometer.observation.ObservationRegistry;
import org.springframework.ai.embedding.BatchingStrategy;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.embedding.TokenCountBatchingStrategy;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.ai.vectorstore.observation.VectorStoreObservationConvention;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;

6
spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreProperties.java
View File

@@ -17,9 +17,9 @@
package org.springframework.ai.autoconfigure.vectorstore.pgvector;
import org.springframework.ai.autoconfigure.vectorstore.CommonVectorStoreProperties;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgDistanceType;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgDistanceType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgIndexType;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**

2
spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStoreAutoConfigurationIT.java
View File

@@ -33,7 +33,7 @@ import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.observation.conventions.VectorStoreProvider;
import org.springframework.ai.transformers.TransformersEmbeddingModel;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.ai.vectorstore.SearchRequest;
import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext;
import org.springframework.boot.autoconfigure.AutoConfigurations;

6
spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/pgvector/PgVectorStorePropertiesTests.java
View File

@@ -18,9 +18,9 @@ package org.springframework.ai.autoconfigure.vectorstore.pgvector;
import org.junit.jupiter.api.Test;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgDistanceType;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgDistanceType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgIndexType;
import static org.assertj.core.api.Assertions.assertThat;

2
vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/pgvector/vectorstore/PgVectorFilterExpressionConverter.java → vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverter.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.List;

2
vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/pgvector/vectorstore/PgVectorSchemaValidator.java → vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorSchemaValidator.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.ArrayList;
import java.util.List;

2
vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/pgvector/vectorstore/PgVectorStore.java → vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorStore.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

2
vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/pgvector/vectorstore/package-info.java → vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/package-info.java
View File

@@ -19,7 +19,7 @@
*/
@NonNullApi
@NonNullFields
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import org.springframework.lang.NonNullApi;
import org.springframework.lang.NonNullFields;

2
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorEmbeddingDimensionsTests.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorEmbeddingDimensionsTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

2
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorFilterExpressionConverterTests.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverterTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.List;

2
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorImage.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorImage.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import org.testcontainers.utility.DockerImageName;

4
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorStoreCustomNamesIT.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreCustomNamesIT.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.Random;
@@ -30,7 +30,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.openai.OpenAiEmbeddingModel;
import org.springframework.ai.openai.api.OpenAiApi;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.VectorStore;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringBootConfiguration;

4
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorStoreIT.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreIT.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -43,7 +43,7 @@ import org.springframework.ai.document.Document;
import org.springframework.ai.embedding.EmbeddingModel;
import org.springframework.ai.openai.OpenAiEmbeddingModel;
import org.springframework.ai.openai.api.OpenAiApi;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.SearchRequest;
import org.springframework.ai.vectorstore.VectorStore;
import org.springframework.ai.vectorstore.filter.FilterExpressionTextParser.FilterExpressionParseException;

4
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorStoreObservationIT.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreObservationIT.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -41,7 +41,7 @@ import org.springframework.ai.observation.conventions.VectorStoreSimilarityMetri
import org.springframework.ai.openai.OpenAiChatModel;
import org.springframework.ai.openai.OpenAiEmbeddingModel;
import org.springframework.ai.openai.api.OpenAiApi;
import org.springframework.ai.pgvector.vectorstore.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.pgvector.PgVectorStore.PgIndexType;
import org.springframework.ai.vectorstore.SearchRequest;
import org.springframework.ai.vectorstore.VectorStore;
import org.springframework.ai.vectorstore.observation.DefaultVectorStoreObservationConvention;

2
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorStoreTests.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.Collections;

2
vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/pgvector/vectorstore/PgVectorStoreWithChatMemoryAdvisorIT.java → vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreWithChatMemoryAdvisorIT.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ai.pgvector.vectorstore;
package org.springframework.ai.vectorstore.pgvector;
import java.util.List;
import java.util.Map;