Skip to content

Commit 224191a

Browse files
committed
Revert "Remove UUID Enforcement for ID Column in PGVectorStore"
This reverts commit bac507c.
1 parent bac507c commit 224191a

File tree

3 files changed

+2
-22
lines changed
  • spring-ai-core/src/main/java/org/springframework/ai/document
  • vector-stores/spring-ai-pgvector-store/src

3 files changed

+2
-22
lines changed

spring-ai-core/src/main/java/org/springframework/ai/document/Document.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ public Document(String text, Map<String, Object> metadata) {
136136
this(new RandomIdGenerator().generateId(), text, null, metadata, null);
137137
}
138138

139-
public Document(String id, String text) {
140-
this(id, text, new HashMap<>());
141-
}
142-
143139
public Document(String id, String text, Map<String, Object> metadata) {
144140
this(id, text, null, metadata, null);
145141
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
* @author Thomas Vitale
153153
* @author Soby Chacko
154154
* @author Sebastien Deleuze
155-
* @author Jihoon Kim
156155
* @since 1.0.0
157156
*/
158157
public class PgVectorStore extends AbstractObservationVectorStore implements InitializingBean {
@@ -273,13 +272,13 @@ private void insertOrUpdateBatch(List<Document> batch, List<Document> documents,
273272
public void setValues(PreparedStatement ps, int i) throws SQLException {
274273

275274
var document = batch.get(i);
276-
var id = document.getId();
277275
var content = document.getText();
278276
var json = toJson(document.getMetadata());
279277
var embedding = embeddings.get(documents.indexOf(document));
280278
var pGvector = new PGvector(embedding);
281279

282-
StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, id);
280+
StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN,
281+
UUID.fromString(document.getId()));
283282
StatementCreatorUtils.setParameterValue(ps, 2, SqlTypeValue.TYPE_UNKNOWN, content);
284283
StatementCreatorUtils.setParameterValue(ps, 3, SqlTypeValue.TYPE_UNKNOWN, json);
285284
StatementCreatorUtils.setParameterValue(ps, 4, SqlTypeValue.TYPE_UNKNOWN, pGvector);

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import com.zaxxer.hikari.HikariDataSource;
3131
import org.junit.Assert;
32-
import org.junit.jupiter.api.Test;
3332
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
3433
import org.junit.jupiter.params.ParameterizedTest;
3534
import org.junit.jupiter.params.provider.Arguments;
@@ -68,7 +67,6 @@
6867
* @author Muthukumaran Navaneethakrishnan
6968
* @author Christian Tzolov
7069
* @author Thomas Vitale
71-
* @author Jihoon Kim
7270
*/
7371
@Testcontainers
7472
@EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+")
@@ -168,19 +166,6 @@ public void addAndSearch(String distanceType) {
168166
});
169167
}
170168

171-
@Test
172-
public void shouldAllowNonUuidFormat() {
173-
this.contextRunner.withPropertyValues("test.spring.ai.vectorstore.pgvector.distanceType=" + "COSINE_DISTANCE")
174-
.run(context -> {
175-
176-
VectorStore vectorStore = context.getBean(VectorStore.class);
177-
178-
vectorStore.add(List.of(new Document("NOT_UUID", "TEXT")));
179-
180-
dropTable(context);
181-
});
182-
}
183-
184169
@ParameterizedTest(name = "Filter expression {0} should return {1} records ")
185170
@MethodSource("provideFilters")
186171
public void searchWithInFilter(String expression, Integer expectedRecords) {

0 commit comments

Comments
 (0)