extract shared vector field creation fn

Author: edgarw19

src/tools/mongodb/create/createVectorIndex.ts

@@ -1,8 +1,8 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
+    buildVectorFields,
     DbOperationArgs,
     MongoDBToolBase,
-    VectorFieldType,
     VectorIndexArgs,
 } from "../mongodbTool.js";
 import { OperationType, ToolArgs } from "../../tool.js";
@@ -29,17 +29,11 @@ export class CreateVectorIndexTool extends MongoDBToolBase {
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();
 
-        const typedVectorField = { ...vectorDefinition, type: VectorFieldType.VECTOR };
-        const typedFilterFields =
-            filterFields?.map((v) => ({
-                ...v,
-                type: VectorFieldType.FILTER,
-            })) || [];
         const indexes = await provider.createSearchIndexes(database, collection, [
             {
                 name,
                 type: VECTOR_INDEX_TYPE,
-                definition: { fields: [typedVectorField, ...typedFilterFields] },
+                definition: { fields: buildVectorFields(vectorDefinition, filterFields) },
             },
         ]);
 

src/tools/mongodb/mongodbTool.ts

@@ -55,6 +55,17 @@ export const VectorIndexArgs = {
         .describe("Additional indexed fields that pre-filter data."),
 };
 
+type VectorDefinitionType = z.infer<typeof VectorIndexArgs.vectorDefinition>;
+type FilterFieldsType = z.infer<typeof VectorIndexArgs.filterFields>;
+export function buildVectorFields(vectorDefinition: VectorDefinitionType, filterFields: FilterFieldsType): object[] {
+    const typedVectorField = { ...vectorDefinition, type: VectorFieldType.VECTOR };
+    const typedFilterFields = (filterFields ?? []).map((f) => ({
+        ...f,
+        type: VectorFieldType.FILTER,
+    }));
+    return [typedVectorField, ...typedFilterFields];
+}
+
 export abstract class MongoDBToolBase extends ToolBase {
     protected category: ToolCategory = "mongodb";
 

src/tools/mongodb/update/updateVectorIndex.ts

@@ -1,8 +1,8 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
+    buildVectorFields,
     DbOperationArgs,
     MongoDBToolBase,
-    VectorFieldType,
     VectorIndexArgs,
 } from "../mongodbTool.js";
 import { OperationType, ToolArgs } from "../../tool.js";
@@ -28,16 +28,10 @@ export class UpdateVectorIndexTool extends MongoDBToolBase {
     }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         const provider = await this.ensureConnected();
 
-        const typedVectorField = { ...vectorDefinition, type: VectorFieldType.VECTOR };
-        const typedFilterFields =
-            filterFields?.map((v) => ({
-                ...v,
-                type: VectorFieldType.FILTER,
-            })) || [];
         // @ts-expect-error: Interface expects a SearchIndexDefinition {definition: {fields}}. However,
         // passing fields at the root level is necessary for the call to succeed.
         await provider.updateSearchIndex(database, collection, name, {
-            fields: [typedVectorField, ...typedFilterFields],
+            fields: buildVectorFields(vectorDefinition, filterFields),
         });
 
         return {