@moorchehai/mcp 1.3.1 → 1.3.2

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "@moorchehai/mcp",
-  "version": "1.3.1",
-  "description": "Moorcheh MCP Server with completable functionality for AI-powered search and answer operations",
-  "main": "src/server/index.js",
-  "type": "module",
-  "bin": {
-    "moorcheh-mcp": "bin/cli.js",
-    "mcp": "bin/cli.js"
-  },
-  "preferGlobal": true,
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "start": "node src/server/index.js",
-    "dev": "node --watch src/server/index.js",
-    "test": "node src/test/test-mcp.js",
-    "build": "echo 'No build step required'",
-    "lint": "echo \"No linting configured\"",
-    "format": "echo \"No formatting configured\""
-  },
-  "keywords": [
-    "mcp",
-    "moorcheh",
-    "ai",
-    "search",
-    "bedrock",
-    "vector",
-    "semantic",
-    "completable",
-    "model-context-protocol",
-    "knowledge-base",
-    "document-search"
-  ],
-  "author": "Moorcheh Team",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.25.2",
-    "axios": "^1.12.0",
-    "form-data": "^4.0.5",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "node": ">=18.0.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/moorcheh-ai/moorcheh-mcp.git"
-  },
-  "bugs": {
-    "url": "https://github.com/moorcheh-ai/moorcheh-mcp/issues"
-  },
-  "homepage": "https://github.com/moorcheh-ai/moorcheh-mcp#readme",
-  "files": [
-    "src/",
-    "bin/",
-    "assets/",
-    "env.example",
-    "README.md",
-    "LICENSE"
-  ],
-  "directories": {
-    "lib": "src/server"
-  }
-}
+{
+  "name": "@moorchehai/mcp",
+  "version": "1.3.2",
+  "description": "Moorcheh MCP Server with completable functionality for AI-powered search and answer operations",
+  "main": "src/server/index.js",
+  "type": "module",
+  "bin": {
+    "moorcheh-mcp": "bin/cli.js",
+    "mcp": "bin/cli.js"
+  },
+  "preferGlobal": true,
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "start": "node src/server/index.js",
+    "dev": "node --watch src/server/index.js",
+    "test": "node src/test/test-mcp.js",
+    "build": "echo 'No build step required'",
+    "lint": "echo \"No linting configured\"",
+    "format": "echo \"No formatting configured\""
+  },
+  "keywords": [
+    "mcp",
+    "moorcheh",
+    "ai",
+    "search",
+    "bedrock",
+    "vector",
+    "semantic",
+    "completable",
+    "model-context-protocol",
+    "knowledge-base",
+    "document-search"
+  ],
+  "author": "Moorcheh Team",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.25.2",
+    "axios": "^1.12.0",
+    "form-data": "^4.0.5",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "node": ">=18.0.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/moorcheh-ai/moorcheh-mcp.git"
+  },
+  "bugs": {
+    "url": "https://github.com/moorcheh-ai/moorcheh-mcp/issues"
+  },
+  "homepage": "https://github.com/moorcheh-ai/moorcheh-mcp#readme",
+  "files": [
+    "src/",
+    "bin/",
+    "assets/",
+    "env.example",
+    "README.md",
+    "LICENSE"
+  ],
+  "directories": {
+    "lib": "src/server"
+  }
+}

package/src/server/config/api.js

@@ -2,7 +2,6 @@ import axios from 'axios';
 import { readFileSync, createReadStream, statSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join, basename } from 'path';
-import FormData from 'form-data';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -88,42 +87,50 @@ async function makeApiRequest(method, url, data = null) {
   }
 }
 
-// Helper function to upload files (multipart/form-data)
+// Helper function to upload files using pre-signed S3 URL flow
 async function uploadFile(namespace_name, filePath) {
   try {
     // Check if file exists
     const stats = statSync(filePath);
     const fileSizeInMB = stats.size / (1024 * 1024);
     
-    // Check file size (max 10MB)
-    if (fileSizeInMB > 10) {
-      throw new Error(`File size (${fileSizeInMB.toFixed(2)}MB) exceeds maximum allowed size of 10MB`);
-    }
-    
     // Check file extension
     const allowedExtensions = ['.pdf', '.docx', '.xlsx', '.json', '.txt', '.csv', '.md'];
     const fileExtension = filePath.toLowerCase().substring(filePath.lastIndexOf('.'));
     if (!allowedExtensions.includes(fileExtension)) {
       throw new Error(`File type '${fileExtension}' is not supported. Allowed types: ${allowedExtensions.join(', ')}`);
     }
-    
-    // Create FormData
-    const formData = new FormData();
-    const fileName = basename(filePath);
-    formData.append('file', createReadStream(filePath), fileName);
-    
-    // Make the request
-    const url = `${API_ENDPOINTS.namespaces}/${namespace_name}/upload-file`;
-    const response = await axios.post(url, formData, {
+
+    const file_name = basename(filePath);
+    const uploadUrlPayload = await makeApiRequest(
+      'POST',
+      `${API_ENDPOINTS.namespaces}/${namespace_name}/upload-url`,
+      { file_name }
+    );
+
+    if (!uploadUrlPayload?.upload_url || !uploadUrlPayload?.content_type) {
+      throw new Error(`Invalid upload URL response: ${JSON.stringify(uploadUrlPayload)}`);
+    }
+
+    await axios.put(uploadUrlPayload.upload_url, createReadStream(filePath), {
       headers: {
-        'x-api-key': MOORCHEH_API_KEY,
-        ...formData.getHeaders(),
+        'Content-Type': uploadUrlPayload.content_type,
+        'Content-Length': stats.size,
       },
       maxContentLength: Infinity,
       maxBodyLength: Infinity,
     });
-    
-    return response.data;
+
+    return {
+      status: 'success',
+      namespace_name,
+      file_name,
+      file_size_mb: Number(fileSizeInMB.toFixed(2)),
+      key: uploadUrlPayload.key,
+      content_type: uploadUrlPayload.content_type,
+      expires_in: uploadUrlPayload.expires_in,
+      message: 'File uploaded to storage successfully and queued for processing.',
+    };
   } catch (error) {
     if (error.response) {
       const status = error.response.status;

package/src/server/tools/data-tools.js

@@ -10,13 +10,20 @@ export const uploadTextTool = {
     documents: z.array(z.object({
       id: z.string().describe("Unique identifier for the document"),
       text: z.string().describe("Text content of the document"),
-      metadata: z.record(z.string(), z.any()).optional().describe("Optional metadata for the document"),
+      metadata: z.record(z.string(), z.any()).optional().describe("Optional metadata for the document. Will be flattened as top-level fields to match API format."),
     })).describe("Array of documents to upload"),
   },
   handler: async ({ namespace_name, documents }) => {
     try {
+      const normalizedDocuments = documents.map((doc) => {
+        const { metadata, ...rest } = doc;
+        return metadata && typeof metadata === 'object'
+          ? { ...rest, ...metadata }
+          : rest;
+      });
+
       const data = await makeApiRequest('POST', `${API_ENDPOINTS.namespaces}/${namespace_name}/documents`, {
-        documents,
+        documents: normalizedDocuments,
       });
 
       const resultText = `Successfully uploaded ${documents.length} document(s) to namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
@@ -51,13 +58,21 @@ export const uploadVectorsTool = {
     vectors: z.array(z.object({
       id: z.string().describe("Unique identifier for the vector"),
       vector: z.array(z.number()).describe("Vector values"),
-      metadata: z.record(z.string(), z.any()).optional().describe("Optional metadata for the vector"),
+      text: z.string().optional().describe("Optional original text for the vector"),
+      metadata: z.record(z.string(), z.any()).optional().describe("Optional metadata for the vector. Will be flattened as top-level fields to match API format."),
     })).describe("Array of vectors to upload"),
   },
   handler: async ({ namespace_name, vectors }) => {
     try {
+      const normalizedVectors = vectors.map((vectorItem) => {
+        const { metadata, ...rest } = vectorItem;
+        return metadata && typeof metadata === 'object'
+          ? { ...rest, ...metadata }
+          : rest;
+      });
+
       const data = await makeApiRequest('POST', `${API_ENDPOINTS.namespaces}/${namespace_name}/vectors`, {
-        vectors,
+        vectors: normalizedVectors,
       });
 
       const resultText = `Successfully uploaded ${vectors.length} vector(s) to namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
@@ -89,15 +104,16 @@ export const deleteDataTool = {
   description: "Delete specific data items from a namespace in Moorcheh",
   parameters: {
     namespace_name: z.string().describe("Name of the namespace to delete from"),
+    data_type: z.enum(["documents", "vectors"]).optional().describe("Data type to delete from. Use 'documents' for text namespaces and 'vectors' for vector namespaces. Default is 'documents'."),
     ids: z.array(z.string()).describe("Array of document/vector IDs to delete"),
   },
-  handler: async ({ namespace_name, ids }) => {
+  handler: async ({ namespace_name, data_type = "documents", ids }) => {
     try {
-      const data = await makeApiRequest('POST', `${API_ENDPOINTS.namespaces}/${namespace_name}/documents/delete`, {
+      const data = await makeApiRequest('POST', `${API_ENDPOINTS.namespaces}/${namespace_name}/${data_type}/delete`, {
         ids,
       });
 
-      const resultText = `Successfully deleted ${ids.length} item(s) from namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
+      const resultText = `Successfully processed deletion of ${ids.length} ${data_type} item(s) in namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
 
       return {
         content: [
@@ -160,16 +176,17 @@ export const getDataTool = {
 // Upload file tool
 export const uploadFileTool = {
   name: "upload-file",
-  description: "Upload a file directly to a text-type namespace for processing and indexing. Files are queued for ingestion and will be available for search once processed. Supported file types: .pdf, .docx, .xlsx, .json, .txt, .csv, .md (max 10MB)",
+  description: "Upload a file to a text namespace using pre-signed URL flow. The tool requests an upload URL, uploads the file directly to storage, then the file is queued for processing and indexing.",
   parameters: {
     namespace_name: z.string().describe("Name of the text namespace to upload the file to"),
-    file_path: z.string().describe("Path to the file to upload (max 10MB). Must be one of: .pdf, .docx, .xlsx, .json, .txt, .csv, .md"),
+    file_path: z.string().describe("Absolute path to the file to upload. Must be one of: .pdf, .docx, .xlsx, .json, .txt, .csv, .md"),
   },
   handler: async ({ namespace_name, file_path }) => {
     try {
       const data = await uploadFile(namespace_name, file_path);
 
-      const resultText = `Successfully uploaded file "${data.fileName}" to namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
+      const uploaded_file_name = data.file_name || 'uploaded file';
+      const resultText = `Successfully uploaded file "${uploaded_file_name}" to namespace "${namespace_name}":\n${JSON.stringify(data, null, 2)}`;
 
       return {
         content: [

package/src/server/tools/namespace-tools.js

@@ -26,8 +26,8 @@ export const listNamespacesTool = {
           `Namespace: ${ns.namespace_name}`,
           `Type: ${ns.type}`,
           `Vector Dimension: ${ns.vector_dimension || 'N/A'}`,
-          `Created: ${ns.createdAt}`,
-          `Items: ${ns.itemCount}`,
+          `Created: ${ns.created_at || 'N/A'}`,
+          `Items: ${ns.item_count || 'N/A'}`,
           "---",
         ].join("\n")
       );