Merge pull request #1664 from weaviate/fix/multi-vector-with-hybrid

Permit `vector: list[list[float32]]` in `.hybrid`

Author: dirkkul

integration/test_named_vectors.py

@@ -835,6 +835,20 @@ def test_colbert_vectors_byov(collection_factory: CollectionFactory) -> None:
     ).objects
     assert len(objs) == 1
 
+    objs = collection.query.hybrid(
+        None,
+        vector=[1, 2],
+        target_vector="regular",
+    ).objects
+    assert len(objs) == 1
+
+    objs = collection.query.hybrid(
+        None,
+        vector=[[1, 2], [3, 4]],
+        target_vector="colbert",
+    ).objects
+    assert len(objs) == 1
+
     objs = collection.query.hybrid(
         None,
         vector={"colbert": [[1, 2], [3, 4]]},

weaviate/collections/grpc/shared.py

@@ -627,13 +627,21 @@ def _parse_hybrid(
 
         targets, target_vectors = self.__target_vector_to_grpc(target_vector)
 
-        near_text, near_vector, vector_bytes = None, None, None
+        near_text, near_vector, vector_bytes, vectors = None, None, None, None
 
         if vector is None:
             pass
         elif isinstance(vector, list) and len(vector) > 0 and isinstance(vector[0], float):
             # fast path for simple vector
             vector_bytes = struct.pack("{}f".format(len(vector)), *vector)
+        elif _is_2d_vector(vector) and self._weaviate_version.is_at_least(1, 29, 0):
+            # fast path for simple multi-vector
+            vectors = [
+                base_pb2.Vectors(
+                    vector_bytes=_Pack.multi(vector),
+                    type=base_pb2.Vectors.VECTOR_TYPE_MULTI_FP32,
+                )
+            ]
         elif isinstance(vector, _HybridNearText):
             near_text = base_search_pb2.NearTextSearch(
                 query=[vector.text] if isinstance(vector.text, str) else vector.text,
@@ -715,6 +723,7 @@ def _parse_hybrid(
                 near_vector=near_vector,
                 vector_bytes=vector_bytes,
                 vector_distance=distance,
+                vectors=vectors,
             )
             if query is not None or vector is not None
             else None