Fix parsing and checking logic for old Weaviate versions with vector deprs

Author: tsmith023

src/collections/query/check.ts

@@ -66,16 +66,23 @@ export class Check<T> {
     return check.supports;
   };
 
-  private checkSupportForMultiTargetSearchMultiWeights = async (opts?: BaseNearOptions<T>) => {
-    if (!Serialize.isMultiTargetMultiWeights(opts)) return false;
-    const check = await this.dbVersionSupport.supportsMultiTargetVectorSearchMultiWeights();
+  private checkSupportForMultiVectorSearch = async (vec?: NearVectorInputType) => {
+    if (!Serialize.isMultiVector(vec)) return false;
+    const check = await this.dbVersionSupport.supportsMultiVectorSearch();
     if (!check.supports) throw new WeaviateUnsupportedFeatureError(check.message);
     return check.supports;
   };
 
-  private checkSupportForMultiVectorSearch = async (vec?: BaseHybridOptions<T>['vector']) => {
-    if (!Serialize.isHybridVectorSearch(vec) || !Serialize.isMultiVector(vec)) return false;
-    const check = await this.dbVersionSupport.supportsMultiVectorSearch();
+  private checkSupportForMultiWeightPerTargetSearch = async (opts?: BaseNearOptions<T>) => {
+    if (!Serialize.isMultiWeightPerTarget(opts)) return false;
+    const check = await this.dbVersionSupport.supportsMultiWeightsPerTargetSearch();
+    if (!check.supports) throw new WeaviateUnsupportedFeatureError(check.message);
+    return check.supports;
+  };
+
+  private checkSupportForMultiVectorPerTargetSearch = async (vec?: NearVectorInputType) => {
+    if (!Serialize.isMultiVectorPerTarget(vec)) return false;
+    const check = await this.dbVersionSupport.supportsMultiVectorPerTargetSearch();
     if (!check.supports) throw new WeaviateUnsupportedFeatureError(check.message);
     return check.supports;
   };
@@ -84,7 +91,7 @@ export class Check<T> {
     return Promise.all([
       this.getSearcher(),
       this.checkSupportForMultiTargetSearch(opts),
-      this.checkSupportForMultiTargetSearchMultiWeights(opts),
+      this.checkSupportForMultiWeightPerTargetSearch(opts),
       this.checkSupportForNamedVectors(opts),
     ]).then(([search, supportsTargets, supportsWeightsForTargets]) => {
       return { search, supportsTargets, supportsWeightsForTargets };
@@ -95,26 +102,58 @@ export class Check<T> {
     return Promise.all([
       this.getSearcher(),
       this.checkSupportForMultiTargetSearch(opts),
-      this.checkSupportForMultiTargetSearchMultiWeights(opts),
       this.checkSupportForMultiVectorSearch(vec),
+      this.checkSupportForMultiVectorPerTargetSearch(vec),
+      this.checkSupportForMultiWeightPerTargetSearch(opts),
       this.checkSupportForNamedVectors(opts),
-    ]).then(([search, supportsTargets, supportsWeightsForTargets, supportsVectorsForTargets]) => {
-      return { search, supportsTargets, supportsVectorsForTargets, supportsWeightsForTargets };
-    });
+    ]).then(
+      ([
+        search,
+        supportsMultiTarget,
+        supportMultiVector,
+        supportsVectorsForTargets,
+        supportsWeightsForTargets,
+      ]) => {
+        return {
+          search,
+          supportsTargets: supportsMultiTarget || supportMultiVector,
+          supportsVectorsForTargets,
+          supportsWeightsForTargets,
+        };
+      }
+    );
   };
 
   public hybridSearch = (opts?: BaseHybridOptions<T>) => {
     return Promise.all([
       this.getSearcher(),
       this.checkSupportForMultiTargetSearch(opts),
-      this.checkSupportForMultiTargetSearchMultiWeights(opts),
-      this.checkSupportForMultiVectorSearch(opts?.vector),
+      this.checkSupportForMultiVectorSearch(
+        Serialize.isHybridVectorSearch(opts?.vector) ? opts?.vector : undefined
+      ),
+      this.checkSupportForMultiVectorPerTargetSearch(
+        Serialize.isHybridVectorSearch(opts?.vector) ? opts?.vector : undefined
+      ),
+      this.checkSupportForMultiWeightPerTargetSearch(opts),
       this.checkSupportForNamedVectors(opts),
       this.checkSupportForBm25AndHybridGroupByQueries('Hybrid', opts),
       this.checkSupportForHybridNearTextAndNearVectorSubSearches(opts),
-    ]).then(([search, supportsTargets, supportsWeightsForTargets, supportsVectorsForTargets]) => {
-      return { search, supportsTargets, supportsWeightsForTargets, supportsVectorsForTargets };
-    });
+    ]).then(
+      ([
+        search,
+        supportsMultiTarget,
+        supportMultiVector,
+        supportsWeightsForTargets,
+        supportsVectorsForTargets,
+      ]) => {
+        return {
+          search,
+          supportsTargets: supportsMultiTarget || supportMultiVector,
+          supportsWeightsForTargets,
+          supportsVectorsForTargets,
+        };
+      }
+    );
   };
 
   public fetchObjects = (opts?: FetchObjectsOptions<T>) => {

src/collections/query/integration.test.ts

@@ -860,9 +860,8 @@ describe('Testing of the collection.query methods with a collection with a multi
     expect(ret.objects[1].properties.title).toEqual('test');
   });
 
-  it.only('should perform a nearVector vector search over two named vector spaces', async () => {
+  it('should perform a nearVector vector search over two named vector spaces', async () => {
     const one = await collection.query.fetchObjectById(id1, { includeVector: true });
-    const two = await collection.query.fetchObjectById(id2, { includeVector: true });
 
     const query = () =>
       collection.query.nearVector(
@@ -875,7 +874,7 @@ describe('Testing of the collection.query methods with a collection with a multi
         }
       );
 
-    if (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 27, 0))) {
+    if (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0))) {
       await expect(query()).rejects.toThrow(WeaviateUnsupportedFeatureError);
       return;
     }
@@ -886,7 +885,7 @@ describe('Testing of the collection.query methods with a collection with a multi
     expect(ret.objects[1].properties.title).toEqual('other');
   });
 
-  it('should perform a multi nearVector vector search over one named vector space', async () => {
+  it('should perform a multi-per-target nearVector vector search over one named vector space', async () => {
     const one = await collection.query.fetchObjectById(id1, { includeVector: true });
     const two = await collection.query.fetchObjectById(id2, { includeVector: true });
 
@@ -926,7 +925,7 @@ describe('Testing of the collection.query methods with a collection with a multi
         }
       );
 
-    if (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 27, 0))) {
+    if (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0))) {
       await expect(query()).rejects.toThrow(WeaviateUnsupportedFeatureError);
       return;
     }

src/collections/serialize/index.ts

@@ -328,7 +328,7 @@ export class Serialize {
     return opts?.targetVector !== undefined && !TargetVectorInputGuards.isSingle(opts.targetVector);
   };
 
-  public static isMultiTargetMultiWeights = <T>(opts?: BaseNearOptions<T>): boolean => {
+  public static isMultiWeightPerTarget = <T>(opts?: BaseNearOptions<T>): boolean => {
     return (
       opts?.targetVector !== undefined &&
       TargetVectorInputGuards.isMultiJoin(opts.targetVector) &&
@@ -338,6 +338,10 @@ export class Serialize {
   };
 
   public static isMultiVector = (vec?: NearVectorInputType): boolean => {
+    return vec !== undefined && !Array.isArray(vec) && Object.values(vec).every(ArrayInputGuards.is1DArray);
+  };
+
+  public static isMultiVectorPerTarget = (vec?: NearVectorInputType): boolean => {
     return vec !== undefined && !Array.isArray(vec) && Object.values(vec).some(ArrayInputGuards.is2DArray);
   };
 
@@ -781,6 +785,11 @@ 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)) {
@@ -798,13 +807,17 @@ export class Serialize {
             vectorPerTarget,
           };
         } else {
-          const targets = Targets.fromPartial({
-            targetVectors: Object.keys(vectorPerTarget),
-          });
-          return {
-            targets,
-            vectorPerTarget,
-          };
+          return args.supportsTargets
+            ? {
+                targets: Targets.fromPartial({
+                  targetVectors: Object.keys(vectorPerTarget),
+                }),
+                vectorPerTarget,
+              }
+            : {
+                targetVectors: Object.keys(vectorPerTarget),
+                vectorPerTarget,
+              };
         }
       }
     } else {
@@ -902,13 +915,11 @@ export class Serialize {
       supportsWeightsForTargets: boolean;
     } & NearOptions<T>
   ): SearchNearVectorArgs => {
-    const o = {
+    return {
       ...Serialize.common(args),
       nearVector: Serialize.nearVectorSearch(args),
       autocut: args.autoLimit,
     };
-    console.log(o.nearVector);
-    return o;
   };
 
   public static nearVideo = <T>(

src/utils/dbVersion.ts

@@ -159,16 +159,26 @@ export class DbVersionSupport {
   };
 
   supportsMultiVectorSearch = () => {
+    return this.dbVersionProvider.getVersion().then((version) => {
+      return {
+        version: version,
+        supports: version.isAtLeast(1, 26, 0),
+        message: this.errorMessage('Multi-vector search', version.show(), '1.26.0'),
+      };
+    });
+  };
+
+  supportsMultiVectorPerTargetSearch = () => {
     return this.dbVersionProvider.getVersion().then((version) => {
       return {
         version: version,
         supports: version.isAtLeast(1, 27, 0),
-        message: this.errorMessage('Multi-vector search', version.show(), '1.27.0'),
+        message: this.errorMessage('Multi-vector-per-target search', version.show(), '1.27.0'),
       };
     });
   };
 
-  supportsMultiTargetVectorSearchMultiWeights = () => {
+  supportsMultiWeightsPerTargetSearch = () => {
     return this.dbVersionProvider.getVersion().then((version) => {
       return {
         version: version,