Make further fixes to BC checks and alter tightly coupled tests

Author: tsmith023

src/collections/query/check.ts

@@ -10,6 +10,8 @@ import {
   BaseNearOptions,
   FetchObjectByIdOptions,
   FetchObjectsOptions,
+  HybridNearTextSubSearch,
+  HybridNearVectorSubSearch,
   HybridOptions,
   NearVectorInputType,
   SearchOptions,
@@ -66,8 +68,11 @@ export class Check<T> {
     return check.supports;
   };
 
-  private checkSupportForMultiVectorSearch = async (vec?: NearVectorInputType) => {
-    if (!Serialize.isMultiVector(vec)) return false;
+  private checkSupportForMultiVectorSearch = async (
+    vec?: NearVectorInputType | HybridNearVectorSubSearch | HybridNearTextSubSearch
+  ) => {
+    if (Serialize.isHybridNearVectorSearch(vec) && !Serialize.isMultiVector(vec.vector)) return false;
+    if (Serialize.isHybridVectorSearch(vec) && !Serialize.isMultiVector(vec)) return false;
     const check = await this.dbVersionSupport.supportsMultiVectorSearch();
     if (!check.supports) throw new WeaviateUnsupportedFeatureError(check.message);
     return check.supports;
@@ -80,8 +85,13 @@ export class Check<T> {
     return check.supports;
   };
 
-  private checkSupportForMultiVectorPerTargetSearch = async (vec?: NearVectorInputType) => {
-    if (!Serialize.isMultiVectorPerTarget(vec)) return false;
+  private checkSupportForMultiVectorPerTargetSearch = async (
+    vec?: NearVectorInputType | HybridNearVectorSubSearch | HybridNearTextSubSearch
+  ) => {
+    if (vec === undefined || Serialize.isHybridNearTextSearch(vec)) return false;
+    if (Serialize.isHybridNearVectorSearch(vec) && !Serialize.isMultiVectorPerTarget(vec.vector))
+      return false;
+    if (Serialize.isHybridVectorSearch(vec) && !Serialize.isMultiVectorPerTarget(vec)) return false;
     const check = await this.dbVersionSupport.supportsMultiVectorPerTargetSearch();
     if (!check.supports) throw new WeaviateUnsupportedFeatureError(check.message);
     return check.supports;
@@ -94,7 +104,9 @@ export class Check<T> {
       this.checkSupportForMultiWeightPerTargetSearch(opts),
       this.checkSupportForNamedVectors(opts),
     ]).then(([search, supportsTargets, supportsWeightsForTargets]) => {
-      return { search, supportsTargets, supportsWeightsForTargets };
+      const is126 = supportsTargets;
+      const is127 = supportsWeightsForTargets;
+      return { search, supportsTargets: is126 || is127, supportsWeightsForTargets: is127 };
     });
   };
 
@@ -110,15 +122,17 @@ export class Check<T> {
       ([
         search,
         supportsMultiTarget,
-        supportMultiVector,
+        supportsMultiVector,
         supportsVectorsForTargets,
         supportsWeightsForTargets,
       ]) => {
+        const is126 = supportsMultiTarget || supportsMultiVector;
+        const is127 = supportsVectorsForTargets || supportsWeightsForTargets;
         return {
           search,
-          supportsTargets: supportsMultiTarget || supportMultiVector,
-          supportsVectorsForTargets,
-          supportsWeightsForTargets,
+          supportsTargets: is126 || is127,
+          supportsVectorsForTargets: is127,
+          supportsWeightsForTargets: is127,
         };
       }
     );
@@ -128,12 +142,8 @@ export class Check<T> {
     return Promise.all([
       this.getSearcher(),
       this.checkSupportForMultiTargetSearch(opts),
-      this.checkSupportForMultiVectorSearch(
-        Serialize.isHybridVectorSearch(opts?.vector) ? opts?.vector : undefined
-      ),
-      this.checkSupportForMultiVectorPerTargetSearch(
-        Serialize.isHybridVectorSearch(opts?.vector) ? opts?.vector : undefined
-      ),
+      this.checkSupportForMultiVectorSearch(opts?.vector),
+      this.checkSupportForMultiVectorPerTargetSearch(opts?.vector),
       this.checkSupportForMultiWeightPerTargetSearch(opts),
       this.checkSupportForNamedVectors(opts),
       this.checkSupportForBm25AndHybridGroupByQueries('Hybrid', opts),
@@ -142,15 +152,17 @@ export class Check<T> {
       ([
         search,
         supportsMultiTarget,
-        supportMultiVector,
+        supportsMultiVector,
         supportsWeightsForTargets,
         supportsVectorsForTargets,
       ]) => {
+        const is126 = supportsMultiTarget || supportsMultiVector;
+        const is127 = supportsVectorsForTargets || supportsWeightsForTargets;
         return {
           search,
-          supportsTargets: supportsMultiTarget || supportMultiVector,
-          supportsWeightsForTargets,
-          supportsVectorsForTargets,
+          supportsTargets: is126 || is127,
+          supportsWeightsForTargets: is127,
+          supportsVectorsForTargets: is127,
         };
       }
     );

src/collections/query/integration.test.ts

@@ -186,7 +186,7 @@ describe('Testing of the collection.query methods with a simple collection', ()
     expect(ret.objects[0].properties.testProp).toEqual('carrot');
   });
 
-  it.skip('should query with nearObject', async () => {
+  it('should query with nearObject', async () => {
     const ret = await collection.query.nearObject(id, { limit: 1 });
     expect(ret.objects.length).toEqual(1);
     expect(ret.objects[0].properties.testProp).toEqual('carrot');
@@ -365,7 +365,7 @@ describe('Testing of the collection.query methods with a collection with a refer
       ).toEqual('test');
     });
 
-    it.skip('should query with nearObject returning the referenced object', async () => {
+    it('should query with nearObject returning the referenced object', async () => {
       const ret = await collection.query.nearObject(id2, {
         returnProperties: ['testProp'],
         returnReferences: [
@@ -1076,7 +1076,7 @@ describe('Testing of the groupBy collection.query methods with a simple collecti
     expect(ret.objects[0].belongsToGroup).toEqual('test');
   });
 
-  it.skip('should groupBy with nearObject', async () => {
+  it('should groupBy with nearObject', async () => {
     const ret = await collection.query.nearObject(id, {
       groupBy: groupByArgs,
     });

src/collections/serialize/index.ts

@@ -338,7 +338,11 @@ export class Serialize {
   };
 
   public static isMultiVector = (vec?: NearVectorInputType): boolean => {
-    return vec !== undefined && !Array.isArray(vec) && Object.values(vec).every(ArrayInputGuards.is1DArray);
+    return (
+      vec !== undefined &&
+      !Array.isArray(vec) &&
+      Object.values(vec).some(ArrayInputGuards.is1DArray || ArrayInputGuards.is2DArray)
+    );
   };
 
   public static isMultiVectorPerTarget = (vec?: NearVectorInputType): boolean => {
@@ -415,13 +419,13 @@ export class Serialize {
     );
   };
 
-  private static isHybridNearTextSearch = <T>(
+  public static isHybridNearTextSearch = <T>(
     vector: BaseHybridOptions<T>['vector']
   ): vector is HybridNearTextSubSearch => {
     return (vector as HybridNearTextSubSearch)?.query !== undefined;
   };
 
-  private static isHybridNearVectorSearch = <T>(
+  public static isHybridNearVectorSearch = <T>(
     vector: BaseHybridOptions<T>['vector']
   ): vector is HybridNearVectorSubSearch => {
     return (vector as HybridNearVectorSubSearch)?.vector !== undefined;
@@ -451,11 +455,7 @@ export class Serialize {
             }),
           };
     } else if (Serialize.isHybridNearTextSearch(vector)) {
-      const { targetVectors, targets } = Serialize.vectors({
-        ...args,
-        argumentName: 'vector',
-        vector: undefined,
-      });
+      const { targetVectors, targets } = Serialize.targetVector(args);
       return {
         targets,
         targetVectors,
@@ -785,17 +785,10 @@ export class Serialize {
               vectorForTargets,
             };
       } else {
-        if (!args.supportsTargets) {
-          throw new WeaviateUnsupportedFeatureError(
-            'Multi-vector search is not supported in this Weaviate version. Please upgrade to at least Weaviate 1.26.0'
-          );
-        }
         const vectorPerTarget: Record<string, Uint8Array> = {};
         Object.entries(args.vector).forEach(([k, v]) => {
           if (ArrayInputGuards.is2DArray(v)) {
-            throw new WeaviateUnsupportedFeatureError(
-              'Multiple vectors per target are not supported in this Weaviate version. Please upgrade to at least Weaviate 1.27.0.'
-            );
+            return;
           }
           vectorPerTarget[k] = Serialize.vectorToBytes(v);
         });

src/collections/serialize/unit.test.ts

@@ -1,4 +1,3 @@
-import { WeaviateUnsupportedFeatureError } from '../../errors.js';
 import {
   SearchBm25Args,
   SearchFetchArgs,
@@ -387,23 +386,6 @@ describe('Unit testing of Serialize', () => {
     });
   });
 
-  it('should throw error for nearVector with two named vectors and supportsTargets (<1.27.0)', () => {
-    expect(() =>
-      Serialize.nearVector({
-        vector: {
-          a: [
-            [1, 2, 3],
-            [4, 5, 6],
-          ],
-          b: [7, 8, 9],
-        },
-        supportsTargets: true,
-        supportsVectorsForTargets: false,
-        supportsWeightsForTargets: false,
-      })
-    ).toThrow(WeaviateUnsupportedFeatureError);
-  });
-
   it('should parse args for nearVector with two named vectors and all supports (==1.27.x)', () => {
     const args = Serialize.nearVector({
       vector: {