refactor: move multi2MultivecJinaAI static factory to multiVectors namespace

Author: bevzzz

src/collections/configure/unit.test.ts

@@ -704,7 +704,7 @@ describe('Unit testing of the vectorizer factory class', () => {
   });
 
   requireAtLeast(1, 32, 0).it('should create the correct Multi2MultivecJinaAIConfig with values', () => {
-    const config = configure.vectorizer.multi2MultivecJinaAI({
+    const config = configure.multiVectors.multi2MultivecJinaAI({
       name: 'multi-jina',
       imageFields: ['field1', 'field2'],
       textFields: ['field3', 'field4'],

src/collections/configure/vectorizer.ts

@@ -37,20 +37,20 @@ const makeVectorIndex = (opts?: {
     }
     conf = conf
       ? {
-          ...conf,
-          multiVector: conf.multiVector
-            ? {
-                ...conf.multiVector,
-                encoding: conf.multiVector.encoding
-                  ? { ...conf.multiVector.encoding, ...opts.encoding }
-                  : opts.encoding,
-              }
-            : vectorIndex.multiVector.multiVector({ encoding: opts.encoding }),
-        }
+        ...conf,
+        multiVector: conf.multiVector
+          ? {
+            ...conf.multiVector,
+            encoding: conf.multiVector.encoding
+              ? { ...conf.multiVector.encoding, ...opts.encoding }
+              : opts.encoding,
+          }
+          : vectorIndex.multiVector.multiVector({ encoding: opts.encoding }),
+      }
       : {
-          multiVector: vectorIndex.multiVector.multiVector({ encoding: opts.encoding }),
-          type: 'hnsw',
-        };
+        multiVector: vectorIndex.multiVector.multiVector({ encoding: opts.encoding }),
+        type: 'hnsw',
+      };
   }
   if (opts?.quantizer) {
     if (!conf) {
@@ -184,16 +184,16 @@ export const vectors = {
           Object.keys(config).length === 0
             ? undefined
             : {
-                ...config,
-                audioFields: audioFields?.map((f) => f.name),
-                depthFields: depthFields?.map((f) => f.name),
-                imageFields: imageFields?.map((f) => f.name),
-                IMUFields: IMUFields?.map((f) => f.name),
-                textFields: textFields?.map((f) => f.name),
-                thermalFields: thermalFields?.map((f) => f.name),
-                videoFields: videoFields?.map((f) => f.name),
-                weights: Object.keys(weights).length === 0 ? undefined : weights,
-              },
+              ...config,
+              audioFields: audioFields?.map((f) => f.name),
+              depthFields: depthFields?.map((f) => f.name),
+              imageFields: imageFields?.map((f) => f.name),
+              IMUFields: IMUFields?.map((f) => f.name),
+              textFields: textFields?.map((f) => f.name),
+              thermalFields: thermalFields?.map((f) => f.name),
+              videoFields: videoFields?.map((f) => f.name),
+              weights: Object.keys(weights).length === 0 ? undefined : weights,
+            },
       },
     });
   },
@@ -223,11 +223,11 @@ export const vectors = {
           Object.keys(config).length === 0
             ? undefined
             : {
-                ...config,
-                imageFields: imageFields?.map((f) => f.name),
-                textFields: textFields?.map((f) => f.name),
-                weights: Object.keys(weights).length === 0 ? undefined : weights,
-              },
+              ...config,
+              imageFields: imageFields?.map((f) => f.name),
+              textFields: textFields?.map((f) => f.name),
+              weights: Object.keys(weights).length === 0 ? undefined : weights,
+            },
       },
     });
   },
@@ -257,32 +257,11 @@ export const vectors = {
           Object.keys(config).length === 0
             ? undefined
             : {
-                ...config,
-                imageFields: imageFields?.map((f) => f.name),
-                textFields: textFields?.map((f) => f.name),
-                weights: Object.keys(weights).length === 0 ? undefined : weights,
-              },
-      },
-    });
-  },
-
-  /**
-   * Create a `VectorConfigCreate` object with the vectorizer set to `'multi2vec-jinaai'`.
-   *
-   * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/jinaai/embeddings-multimodal) for detailed usage.
-   *
-   * @param {ConfigureNonTextVectorizerOptions<N, I, 'multi2multivec-jinaai'>} [opts] The configuration options for the `multi2multivec-jinaai` vectorizer.
-   * @returns {VectorConfigCreate<PrimitiveKeys<T>[], N, I, 'multi2multivec-jinaai'>} The configuration object.
-   */
-  multi2MultivecJinaAI: <N extends string | undefined = undefined, I extends VectorIndexType = 'hnsw'>(
-    opts?: ConfigureNonTextVectorizerOptions<N, I, 'multi2multivec-jinaai'>
-  ): VectorConfigCreate<never, N, I, 'multi2multivec-jinaai'> => {
-    const { name, vectorIndexConfig, ...config } = opts || {};
-    return makeVectorizer(name, {
-      vectorIndexConfig,
-      vectorizerConfig: {
-        name: 'multi2multivec-jinaai',
-        config,
+              ...config,
+              imageFields: imageFields?.map((f) => f.name),
+              textFields: textFields?.map((f) => f.name),
+              weights: Object.keys(weights).length === 0 ? undefined : weights,
+            },
       },
     });
   },
@@ -313,11 +292,11 @@ export const vectors = {
           Object.keys(config).length === 0
             ? undefined
             : {
-                ...config,
-                imageFields: imageFields?.map((f) => f.name),
-                textFields: textFields?.map((f) => f.name),
-                weights: Object.keys(weights).length === 0 ? undefined : weights,
-              },
+              ...config,
+              imageFields: imageFields?.map((f) => f.name),
+              textFields: textFields?.map((f) => f.name),
+              weights: Object.keys(weights).length === 0 ? undefined : weights,
+            },
       },
     });
   },
@@ -417,11 +396,11 @@ export const vectors = {
           Object.keys(config).length === 0
             ? undefined
             : {
-                ...config,
-                imageFields: imageFields?.map((f) => f.name),
-                textFields: textFields?.map((f) => f.name),
-                weights: Object.keys(weights).length === 0 ? undefined : weights,
-              },
+              ...config,
+              imageFields: imageFields?.map((f) => f.name),
+              textFields: textFields?.map((f) => f.name),
+              weights: Object.keys(weights).length === 0 ? undefined : weights,
+            },
       },
     });
   },
@@ -870,4 +849,25 @@ export const multiVectors = {
       true
     );
   },
+
+  /**
+   * Create a `VectorConfigCreate` object with the vectorizer set to `'multi2multivec-jinaai'`.
+   *
+   * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/jinaai/embeddings-multimodal) for detailed usage.
+   *
+   * @param {ConfigureNonTextVectorizerOptions<N, I, 'multi2multivec-jinaai'>} [opts] The configuration options for the `multi2multivec-jinaai` vectorizer.
+   * @returns {VectorConfigCreate<PrimitiveKeys<T>[], N, I, 'multi2multivec-jinaai'>} The configuration object.
+   */
+  multi2MultivecJinaAI: <N extends string | undefined = undefined, I extends VectorIndexType = 'hnsw'>(
+    opts?: ConfigureNonTextVectorizerOptions<N, I, 'multi2multivec-jinaai'>
+  ): VectorConfigCreate<never, N, I, 'multi2multivec-jinaai'> => {
+    const { name, vectorIndexConfig, ...config } = opts || {};
+    return makeVectorizer(name, {
+      vectorIndexConfig,
+      vectorizerConfig: {
+        name: 'multi2multivec-jinaai',
+        config,
+      },
+    });
+  },
 };