Still open: binaryvector failures in integration tests

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java

@@ -185,6 +185,10 @@ private JsonSchemaProperty computeSchemaForProperty(List<MongoPersistentProperty
 		Class<?> rawTargetType = computeTargetType(property); // target type before conversion
 		Class<?> targetType = converter.getTypeMapper().getWriteTargetTypeFor(rawTargetType); // conversion target type
 
+		if((rawTargetType.isPrimitive() || ClassUtils.isPrimitiveArray(rawTargetType)) && targetType == Object.class) {
+			targetType = rawTargetType;
+		}
+
 		if (!isCollection(property) && ObjectUtils.nullSafeEquals(rawTargetType, targetType)) {
 			if (property.isEntity() || mergeProperties.containsKey(stringPath)) {
 				List<JsonSchemaProperty> targetProperties = new ArrayList<>();

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java

@@ -27,7 +27,6 @@
 import java.util.Collection;
 import java.util.Currency;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -51,7 +50,6 @@
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalConverter;
-import org.springframework.core.convert.converter.ConditionalGenericConverter;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.data.convert.ReadingConverter;
@@ -61,7 +59,6 @@
 import org.springframework.data.mongodb.core.mapping.MongoVector;
 import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
@@ -121,6 +118,8 @@ static Collection<Object> getConvertersToRegister() {
 		converters.add(reading(BsonUndefined.class, Object.class, it -> null));
 		converters.add(reading(String.class, URI.class, URI::create).andWriting(URI::toString));
 
+		converters.add(ByteArrayConverterFactory.INSTANCE);
+
 		return converters;
 	}
 
@@ -475,35 +474,47 @@ public Vector convert(BinaryVector source) {
 		}
 	}
 
-//	@WritingConverter
-//	enum BytesToBinaryVectorConverter implements ConditionalGenericConverter {
-//		INSTANCE;
-//
-//		@Nullable
-//		public BinaryVector convert(byte[] source) {
-//			return BinaryVector.int8Vector(source);
-//		}
-//
-//		@Override
-//		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-//			return sourceType.getType() == byte[].class && targetType.getType() == BinaryVector.class;
-//		}
-//
-//		@Nullable
-//		@Override
-//		public Set<ConvertiblePair> getConvertibleTypes() {
-//			return Set.of(new ConvertiblePair(byte[].class, BinaryVector.class));
-//		}
-//
-//		@Nullable
-//		@Override
-//		public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
-//			if(!matches(sourceType, targetType)) {
-//				return source;
-//			}
-//			return convert((byte[]) source);
-//		}
-//	}
+	@WritingConverter
+	enum ByteArrayConverterFactory implements ConverterFactory<byte[], Object>, ConditionalConverter {
+
+		INSTANCE;
+
+		@Override
+		public <T> Converter<byte[], T> getConverter(Class<T> targetType) {
+			return new ByteArrayConverter<>(targetType);
+		}
+
+		@Override
+		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+			return targetType.getType() != Object.class && !sourceType.equals(targetType);
+		}
+
+		private final static class ByteArrayConverter<T> implements Converter<byte[], T> {
+
+			private final Class<T> targetType;
+
+			/**
+			 * Creates a new {@link ByteArrayConverter} for the given target type.
+			 *
+			 * @param targetType must not be {@literal null}.
+			 */
+			public ByteArrayConverter(Class<T> targetType) {
+
+				Assert.notNull(targetType, "Target type must not be null");
+
+				this.targetType = targetType;
+			}
+
+			@Override
+			public T convert(byte[] source) {
+
+				if (this.targetType == BinaryVector.class) {
+					return (T) BinaryVector.int8Vector(source);
+				}
+				return (T) source;
+			}
+		}
+	}
 
 	/**
 	 * {@link ConverterFactory} implementation converting {@link AtomicLong} into {@link Long}.

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchTests.java

@@ -46,15 +46,14 @@
 /**
  * @author Christoph Strobl
  */
-@Testcontainers
+@Testcontainers(disabledWithoutDocker = true)
 public class VectorSearchTests {
 
-	static final String COLLECTION_NAME = "movies";
 	public static final String SCORE_FIELD = "vector-search-tests";
-
-	private static @Container AtlasContainer atlasLocal = new AtlasContainer();
+	static final String COLLECTION_NAME = "collection-1";
 	static MongoClient client;
 	static MongoTestTemplate template;
+	private static @Container AtlasContainer atlasLocal = new AtlasContainer();
 
 	@BeforeAll
 	static void beforeAll() throws InterruptedException {
@@ -73,21 +72,6 @@ static void afterAll() {
 		template.dropCollection(WithVectorFields.class);
 	}
 
-	@ParameterizedTest // GH-4706
-	@MethodSource("aggregations")
-	void searchWithScoreTests(VectorSearchOperation searchOperation) {
-
-		VectorSearchOperation $search = searchOperation.withSearchScore(SCORE_FIELD);
-
-		AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
-				WithVectorFields.class, Document.class);
-
-		assertThat(results).hasSize(10);
-		assertScoreIsDecreasing(results);
-		assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
-				.extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
-	}
-
 	private static Stream<Arguments> aggregations() {
 
 		return Stream.of(//
@@ -105,6 +89,21 @@ private static Stream<Arguments> aggregations() {
 						.vector(new double[] { 1.0001d, 2.12345d, 3.23456d, 4.34567d, 5.45678d }) //
 						.limit(10)//
 						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("int8vector") //
+						.vector(BinaryVector.int8Vector(new byte[] { 0, 1, 2, 3, 4 })) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("float32vector") //
+						.vector(BinaryVector.floatVector(new float[] { 0.0001f, 1.12345f, 2.23456f, 3.34567f, 4.45678f })) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("float64vector") //
+						.vector(Vector.of(1.0001d, 2.12345d, 3.23456d, 4.34567d, 5.45678d)) //
+						.limit(10)//
+						.numCandidates(20) //
 						.searchType(SearchType.ANN)));
 	}
 
@@ -145,6 +144,21 @@ private static void assertScoreIsDecreasing(final Iterable<Document> documents)
 		}
 	}
 
+	@ParameterizedTest // GH-4706
+	@MethodSource("aggregations")
+	void searchWithScoreTests(VectorSearchOperation searchOperation) {
+
+		VectorSearchOperation $search = searchOperation.withSearchScore(SCORE_FIELD);
+
+		AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
+				WithVectorFields.class, Document.class);
+
+		assertThat(results).hasSize(10);
+		assertScoreIsDecreasing(results);
+		assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
+				.extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
 	static class WithVectorFields {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

@@ -2260,18 +2260,6 @@ void mapsDateAsObjectIdWhenAnnotatedWithFieldTargetType() {
 				.isEqualTo(new ObjectId(source.dateAsObjectId).getTimestamp());
 	}
 
-	@Test // DATAMONGO-2328
-	void mapsByteArrayAsVectorWhenAnnotatedWithFieldTargetType() {
-
-		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
-		source.asVector = new byte[] { 0, 1, 2 };
-
-		org.bson.Document target = new org.bson.Document();
-		converter.write(source, target);
-
-		assertThatNoException().isThrownBy(() -> target.get("asVector", BinaryVector.class));
-	}
-
 	@Test // DATAMONGO-2328
 	void readsObjectIdAsDateWhenAnnotatedWithFieldTargetType() {
 
@@ -3392,6 +3380,31 @@ void shouldReadVectorValues() {
 		assertThat(withVector.embeddings.toDoubleArray()).contains(1.1d, 2.2d, 3.3d);
 	}
 
+	@Test // GH-4706
+	void mapsByteArrayAsVectorWhenAnnotatedWithFieldTargetType() {
+
+		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
+		source.asVector = new byte[] { 0, 1, 2 };
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThatNoException().isThrownBy(() -> target.get("asVector", BinaryVector.class));
+	}
+
+	@Test // GH-4706
+	void writesByteArrayAsIsIfNoFieldInstructionsGiven() {
+
+		WithArrays source = new WithArrays();
+		source.arrayOfPrimitiveBytes = new byte[] { 0, 1, 2 };
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target.get("arrayOfPrimitiveBytes", byte[].class)).isSameAs(source.arrayOfPrimitiveBytes);
+
+	}
+
 	org.bson.Document write(Object source) {
 
 		org.bson.Document target = new org.bson.Document();
@@ -3935,6 +3948,7 @@ public WithArrayInConstructor(String[] array) {
 
 	static class WithArrays {
 		String[] arrayOfStrings;
+		byte[] arrayOfPrimitiveBytes;
 	}
 
 	// DATAMONGO-1898

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java

@@ -46,7 +46,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@Testcontainers
+@Testcontainers(disabledWithoutDocker = true)
 class VectorIndexIntegrationTests {
 
 	private static @Container AtlasContainer atlasLocal = new AtlasContainer();