test: write unit tests for marshalling targets / vectors

Author: bevzzz

src/main/java/io/weaviate/client6/v1/api/collections/query/Target.java

@@ -1,6 +1,7 @@
 package io.weaviate.client6.v1.api.collections.query;
 
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -80,14 +81,26 @@ static VectorTarget vector(float[] vector) {
     return new VectorTarget(null, null, vector);
   }
 
+  static VectorTarget vector(float[][] vector) {
+    return new VectorTarget(null, null, vector);
+  }
+
   static VectorTarget vector(String vectorName, float[] vector) {
     return new VectorTarget(vectorName, null, vector);
   }
 
+  static VectorTarget vector(String vectorName, float[][] vector) {
+    return new VectorTarget(vectorName, null, vector);
+  }
+
   static VectorTarget vector(String vectorName, float weight, float[] vector) {
     return new VectorTarget(vectorName, weight, vector);
   }
 
+  static VectorTarget vector(String vectorName, float weight, float[][] vector) {
+    return new VectorTarget(vectorName, weight, vector);
+  }
+
   static Target combine(CombinationMethod combinationMethod, VectorTarget... vectorTargets) {
     return new CombinedVectorTarget(combinationMethod, Arrays.asList(vectorTargets));
   }
@@ -156,16 +169,23 @@ public void appendVectors(WeaviateProtoBaseSearch.NearVector.Builder req) {
         return;
       }
 
+      // We use LinkedHashMap to preserve insertion order.
+      // This has negligble performance penalty, if any,
+      // but allows for a predictable output in tests.
       targets
           .stream()
-          .collect(Collectors.groupingBy(VectorTarget::vectorName, Collectors.toList()))
+          .collect(Collectors.groupingBy(
+              VectorTarget::vectorName,
+              LinkedHashMap::new,
+              Collectors.toList()))
           .entrySet()
           .forEach(target -> {
-            var vectorForTarget = WeaviateProtoBaseSearch.VectorForTarget.newBuilder()
+            var vectorForTargets = WeaviateProtoBaseSearch.VectorForTarget.newBuilder()
                 .setName(target.getKey());
             target.getValue().forEach(vt -> {
-              vectorForTarget.addVectors(vt.encodeVectors());
+              vectorForTargets.addVectors(vt.encodeVectors());
             });
+            req.addVectorForTargets(vectorForTargets);
           });
     }
   }

src/test/java/io/weaviate/client6/v1/api/collections/query/TargetTest.java

@@ -110,6 +110,122 @@ public void test_appendTargets(Target target, String want) {
     assertEqualJson(want, got);
   }
 
+  public static Object[][] appendVectorsTestCases() {
+    return new Object[][] {
+        {
+            Target.vector(new float[] { 1, 2, 3 }),
+            """
+                {
+                  "vectors": [{
+                    "vectorBytes": "AACAPwAAAEAAAEBA",
+                    "type": "VECTOR_TYPE_SINGLE_FP32"
+                  }]
+                }
+                    """,
+        },
+        {
+            Target.vector(new float[][] { { 1, 2, 3 }, { 4, 5, 6 } }),
+            """
+                {
+                  "vectors": [{
+                    "vectorBytes": "AwAAAIA/AAAAQAAAQEAAAIBAAACgQAAAwEA=",
+                    "type": "VECTOR_TYPE_MULTI_FP32"
+                  }]
+                }
+                    """,
+        },
+        {
+            Target.vector("title_vec", new float[] { 1, 2, 3 }),
+            """
+                {
+                  "vectorForTargets": [{
+                    "name": "title_vec",
+                    "vectors": [{
+                      "vectorBytes": "AACAPwAAAEAAAEBA",
+                      "type": "VECTOR_TYPE_SINGLE_FP32"
+                    }]
+                  }]
+                }
+                    """,
+        },
+        {
+            Target.vector("title_vec", new float[][] { { 1, 2, 3 }, { 4, 5, 6 } }),
+            """
+                {
+                  "vectorForTargets": [{
+                    "name": "title_vec",
+                    "vectors": [{
+                      "vectorBytes": "AwAAAIA/AAAAQAAAQEAAAIBAAACgQAAAwEA=",
+                      "type": "VECTOR_TYPE_MULTI_FP32"
+                    }]
+                  }]
+                }
+                    """,
+        },
+        {
+            Target.average(
+                Target.vector("title_vec", new float[] { 1, 2, 3 }),
+                Target.vector("title_vec", new float[] { 4, 5, 6 }),
+                Target.vector("lyrics_vec", new float[] { 7, 8, 9 })),
+            """
+                {
+                  "vectorForTargets": [
+                    {
+                      "name": "title_vec",
+                      "vectors": [
+                        {"vectorBytes": "AACAPwAAAEAAAEBA", "type": "VECTOR_TYPE_SINGLE_FP32" },
+                        {"vectorBytes": "AACAQAAAoEAAAMBA", "type": "VECTOR_TYPE_SINGLE_FP32" }
+                      ]
+                    },
+                    {
+                      "name": "lyrics_vec",
+                      "vectors": [
+                        {"vectorBytes": "AADgQAAAAEEAABBB", "type": "VECTOR_TYPE_SINGLE_FP32" }
+                      ]
+                    }
+                  ]
+                }
+                    """,
+        },
+        {
+            Target.average(
+                Target.vector("title_vec", new float[][] { { 1, 2, 3 }, { 4, 5, 6 } }),
+                Target.vector("title_vec", new float[][] { { 4, 5, 6 }, { 7, 8, 9 } }),
+                Target.vector("lyrics_vec", new float[][] { { 7, 8, 9 }, { 1, 2, 3 } })),
+            """
+                {
+                  "vectorForTargets": [
+                    {
+                      "name": "title_vec",
+                      "vectors": [
+                        {"vectorBytes": "AwAAAIA/AAAAQAAAQEAAAIBAAACgQAAAwEA=", "type": "VECTOR_TYPE_MULTI_FP32" },
+                        {"vectorBytes": "AwAAAIBAAACgQAAAwEAAAOBAAAAAQQAAEEE=", "type": "VECTOR_TYPE_MULTI_FP32" }
+                      ]
+                    },
+                    {
+                      "name": "lyrics_vec",
+                      "vectors": [
+                        {"vectorBytes": "AwAAAOBAAAAAQQAAEEEAAIA/AAAAQAAAQEA=", "type": "VECTOR_TYPE_MULTI_FP32" }
+                      ]
+                    }
+                  ]
+                }
+                    """,
+        },
+    };
+  }
+
+  @Test
+  @DataMethod(source = TargetTest.class, method = "appendVectorsTestCases")
+  public void test_appendVectors(NearVectorTarget target, String want) {
+    var req = WeaviateProtoBaseSearch.NearVector.newBuilder();
+
+    target.appendVectors(req);
+
+    var got = proto2json(req);
+    assertEqualJson(want, got);
+  }
+
   private static final String proto2json(MessageOrBuilder proto) {
     String out;
     try {