Merge branch 'main' of https://github.com/weaviate/typescript-client into 1.29/colbert-multivector-support

Author: tsmith023

src/collections/aggregate/integration.test.ts

@@ -89,7 +89,7 @@ describe('Testing of the collection.aggregate methods', () => {
           //   dataType: [collectionName],
           // },
         ],
-        vectorizers: weaviate.configure.vectorizer.text2VecContextionary({
+        vectorizers: weaviate.configure.vectors.text2VecContextionary({
           vectorizeCollectionName: false,
           vectorIndexConfig: weaviate.configure.vectorIndex.hnsw({ maxConnections: 64 }),
         }),
@@ -318,7 +318,7 @@ describe('Testing of the collection.aggregate methods with named vectors', () =>
           },
         ],
         vectorizers: [
-          weaviate.configure.vectorizer.text2VecContextionary({
+          weaviate.configure.vectors.text2VecContextionary({
             name: 'text',
             sourceProperties: ['text'],
             vectorIndexConfig: weaviate.configure.vectorIndex.hnsw(),
@@ -417,7 +417,7 @@ describe('Testing of collection.aggregate search methods', () => {
             dataType: 'text',
           },
         ],
-        vectorizers: weaviate.configure.vectorizer.text2VecContextionary(),
+        vectorizers: weaviate.configure.vectors.text2VecContextionary(),
       })
       .then(() => {
         const data: Array<any> = [];

src/collections/config/integration.test.ts

@@ -34,7 +34,7 @@ describe('Testing of the collection.config namespace', () => {
           dataType: 'text',
         },
       ],
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     const collection = client.collections.get<TestCollectionConfigGet>(collectionName);
     const config = await collection.config.get();
@@ -90,7 +90,7 @@ describe('Testing of the collection.config namespace', () => {
           dataType: 'text',
         },
       ],
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     const collection = client.collections.get<TestCollectionConfigGet>(collectionName);
     const config = await collection.config.get();
@@ -151,11 +151,11 @@ describe('Testing of the collection.config namespace', () => {
           },
         ],
         vectorizers: [
-          weaviate.configure.vectorizer.text2VecContextionary({
+          weaviate.configure.vectors.text2VecContextionary({
             name: 'title',
             sourceProperties: ['title'],
           }),
-          weaviate.configure.vectorizer.text2VecContextionary({
+          weaviate.configure.vectors.text2VecContextionary({
             name: 'age',
             sourceProperties: ['age'],
           }),
@@ -188,7 +188,7 @@ describe('Testing of the collection.config namespace', () => {
     const collectionName = 'TestCollectionConfigGetHNSWPlusPQ';
     const collection = await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none({
+      vectorizers: weaviate.configure.vectors.none({
         vectorIndexConfig: weaviate.configure.vectorIndex.hnsw({
           quantizer: weaviate.configure.vectorIndex.quantizer.pq(),
         }),
@@ -237,7 +237,7 @@ describe('Testing of the collection.config namespace', () => {
     const query = () =>
       client.collections.create({
         name: collectionName,
-        vectorizers: weaviate.configure.vectorizer.none({
+        vectorizers: weaviate.configure.vectors.none({
           vectorIndexConfig: weaviate.configure.vectorIndex.hnsw({
             quantizer: weaviate.configure.vectorIndex.quantizer.bq(),
           }),
@@ -265,7 +265,7 @@ describe('Testing of the collection.config namespace', () => {
     const collectionName = 'TestCollectionConfigGetHNSWPlusSQ';
     const collection = await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none({
+      vectorizers: weaviate.configure.vectors.none({
         vectorIndexConfig: weaviate.configure.vectorIndex.hnsw({
           quantizer: weaviate.configure.vectorIndex.quantizer.sq(),
         }),
@@ -289,7 +289,7 @@ describe('Testing of the collection.config namespace', () => {
     const collectionName = 'TestCollectionConfigGetFlatPlusBQ';
     const collection = await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none({
+      vectorizers: weaviate.configure.vectors.none({
         vectorIndexConfig: weaviate.configure.vectorIndex.flat({
           quantizer: weaviate.configure.vectorIndex.quantizer.bq(),
         }),
@@ -316,7 +316,7 @@ describe('Testing of the collection.config namespace', () => {
     const query = () =>
       asyncIndexing.collections.create({
         name: collectionName,
-        vectorizers: weaviate.configure.vectorizer.none({
+        vectorizers: weaviate.configure.vectors.none({
           vectorIndexConfig: weaviate.configure.vectorIndex.dynamic({
             hnsw: weaviate.configure.vectorIndex.hnsw({
               quantizer: weaviate.configure.vectorIndex.quantizer.pq(),
@@ -357,7 +357,7 @@ describe('Testing of the collection.config namespace', () => {
     const query = () =>
       asyncIndexing.collections.create({
         name: collectionName,
-        vectorizers: weaviate.configure.vectorizer.none({
+        vectorizers: weaviate.configure.vectors.none({
           vectorIndexConfig: weaviate.configure.vectorIndex.dynamic({
             hnsw: weaviate.configure.vectorIndex.hnsw({
               quantizer: weaviate.configure.vectorIndex.quantizer.pq(),
@@ -395,7 +395,7 @@ describe('Testing of the collection.config namespace', () => {
     const collectionName = 'TestCollectionConfigAddProperty';
     const collection = await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     const config = await collection.config
       .addProperty({
@@ -423,7 +423,7 @@ describe('Testing of the collection.config namespace', () => {
     const collectionName = 'TestCollectionConfigAddReference' as const;
     const collection = await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     const config = await collection.config
       .addReference({
@@ -445,20 +445,20 @@ describe('Testing of the collection.config namespace', () => {
       const collectionName = 'TestCollectionConfigAddVector' as const;
       const collection = await client.collections.create({
         name: collectionName,
-        vectorizers: weaviate.configure.vectorizer.none(),
+        vectorizers: weaviate.configure.vectors.none(),
       });
       // Add a single named vector
-      await collection.config.addVector(weaviate.configure.vectorizer.none({ name: 'vector-a' }));
+      await collection.config.addVector(weaviate.configure.vectors.none({ name: 'vector-a' }));
 
       // Add several named vectors
       await collection.config.addVector([
-        weaviate.configure.vectorizer.none({ name: 'vector-b' }),
-        weaviate.configure.vectorizer.none({ name: 'vector-c' }),
+        weaviate.configure.vectors.none({ name: 'vector-b' }),
+        weaviate.configure.vectors.none({ name: 'vector-c' }),
       ]);
 
       // Trying to update 'default' vector -- should be omitted from request.
       await collection.config.addVector(
-        weaviate.configure.vectorizer.none({
+        weaviate.configure.vectors.none({
           name: 'default',
           vectorIndexConfig: weaviate.configure.vectorIndex.flat(),
         })
@@ -547,7 +547,7 @@ describe('Testing of the collection.config namespace', () => {
           dataType: 'text',
         },
       ],
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     const supportsUpdatingPropertyDescriptions = await client
       .getWeaviateVersion()
@@ -559,7 +559,7 @@ describe('Testing of the collection.config namespace', () => {
               testProp: 'This is a test property',
             }
           : undefined,
-        vectorizers: weaviate.reconfigure.vectorizer.update({
+        vectorizers: weaviate.reconfigure.vectors.update({
           vectorIndexConfig: weaviate.reconfigure.vectorIndex.hnsw({
             quantizer: weaviate.reconfigure.vectorIndex.quantizer.pq(),
             ef: 4,
@@ -695,7 +695,7 @@ describe('Testing of the collection.config namespace', () => {
     const collection = client.collections.use(collectionName);
     const config = await collection.config
       .update({
-        vectorizers: weaviate.reconfigure.vectorizer.update({
+        vectorizers: weaviate.reconfigure.vectors.update({
           vectorIndexConfig: weaviate.reconfigure.vectorIndex.hnsw({
             quantizer: weaviate.reconfigure.vectorIndex.quantizer.pq(),
             ef: 4,
@@ -747,7 +747,7 @@ describe('Testing of the collection.config namespace', () => {
     const collection = client.collections.use(collectionName);
     await client.collections.create({
       name: collectionName,
-      vectorizers: weaviate.configure.vectorizer.none(),
+      vectorizers: weaviate.configure.vectors.none(),
     });
     let config = await collection.config.get();
     expect(config.generative).toBeUndefined();

src/collections/configure/index.ts

@@ -60,7 +60,11 @@ const configure = {
   generative,
   multiVectors,
   reranker,
+  /**
+   * @deprecated Use `vectors` instead.
+   */
   vectorizer,
+  vectors: vectorizer,
   vectorIndex: configureVectorIndex,
   dataType,
   tokenization,
@@ -220,6 +224,9 @@ const reconfigure = {
           : undefined,
     };
   },
+  /**
+   * @deprecated Use `vectors` instead.
+   */
   vectorizer: {
     /**
      * Create a `VectorConfigUpdate` object to be used when updating the named vector configuration of Weaviate.
@@ -236,6 +243,22 @@ const reconfigure = {
       };
     },
   },
+  vectors: {
+    /**
+     * Create a `VectorConfigUpdate` object to be used when updating the named vector configuration of Weaviate.
+     *
+     * @param {string} name The name of the vector.
+     * @param {VectorizerOptions} options The options for the named vector.
+     */
+    update: <N extends string | undefined, I extends VectorIndexType>(
+      options: VectorizerUpdateOptions<N, I>
+    ): VectorConfigUpdate<N, I> => {
+      return {
+        name: options?.name as N,
+        vectorIndex: options.vectorIndexConfig,
+      };
+    },
+  },
   /**
    * Create a `ReplicationConfigUpdate` object to be used when updating the replication configuration of Weaviate.
    *