@neural-technologies-indonesia/nl2sql 0.0.1 → 0.0.2

package/dist/clients/mcpUseClient.d.ts

@@ -1,4 +1,3 @@
-import { MCPClient } from "mcp-use";
 import { MCPQueryExecutor } from "../adapters/mcpExecutor.js";
 import { MCPMilvusRetriever } from "../adapters/mcpRetriever.js";
 import type { MCPMilvusResult } from "../adapters/mcpRetriever.js";
@@ -8,6 +7,8 @@ export type MCPUseClientOptions = {
     command?: string;
     args?: string[];
     env?: Record<string, string>;
+    transportType?: "stdio" | "httpStream";
+    httpStreamUrl?: string;
 };
 export declare const createMcpUseAdapters: (options?: MCPUseClientOptions) => Promise<{
     executor: MCPQueryExecutor;
@@ -33,7 +34,7 @@ export declare const createMcpUseAdapters: (options?: MCPUseClientOptions) => Pr
         tablename?: string;
     }) => Promise<string>;
     close: () => Promise<void>;
-    client: MCPClient;
-    session: import("mcp-use").MCPSession;
+    client: unknown;
+    session: unknown;
 }>;
 //# sourceMappingURL=mcpUseClient.d.ts.map

package/dist/clients/mcpUseClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcpUseClient.d.ts","sourceRoot":"","sources":["../../src/clients/mcpUseClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B,CAAC;AAwEF,eAAO,MAAM,oBAAoB,GAAU,UAAU,mBAAmB;;;qBA2C9D,WAAW,GAAG,mBAAmB,GAAG,cAAc,GAAG,iBAAiB,QACtE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,MAAM,GAAG,eAAe,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;2BAuB5B,MAAM;;;;;;;;;;;;;;;4BAoDL;QACnC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;;;;EA2BF,CAAC"}
+{"version":3,"file":"mcpUseClient.d.ts","sourceRoot":"","sources":["../../src/clients/mcpUseClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAGnE,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAwEF,eAAO,MAAM,oBAAoB,GAAU,UAAU,mBAAmB;;;qBAe9D,WAAW,GACX,mBAAmB,GACnB,cAAc,GACd,iBAAiB,QACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1B,OAAO,CAAC,MAAM,GAAG,eAAe,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;2BAK9B,MAAM;;;;;;;;;;;;;;;4BAmEL;QACnC,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;iBA1EY,OAAO,CAAC,IAAI,CAAC;;;EAoL7B,CAAC"}

package/dist/clients/mcpUseClient.js

@@ -1,6 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { MCPClient } from "mcp-use";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { MCPQueryExecutor } from "../adapters/mcpExecutor.js";
 import { MCPMilvusRetriever } from "../adapters/mcpRetriever.js";
 // Accepts a whitespace-delimited env var and turns it into an args array.
@@ -69,6 +71,102 @@ const parseDurationMs = (text) => {
 // Starts mcp-use against the sibling MCP server and returns MCP-backed adapters.
 export const createMcpUseAdapters = async (options) => {
     const serverName = options?.serverName ?? "query-runner";
+    const transportType = options?.transportType ??
+        (process.env.MCP_SERVER_TRANSPORT === "http-stream"
+            ? "httpStream"
+            : process.env.MCP_SERVER_TRANSPORT);
+    const httpStreamUrl = options?.httpStreamUrl ??
+        process.env.MCP_SERVER_URL ??
+        undefined;
+    const buildAdapters = (callTool, close, client, session) => {
+        const runQueryExplain = async (sql) => {
+            const content = await callTool("run_query_explain", { raw_query: sql });
+            const text = contentToText(content);
+            const durationMs = parseDurationMs(text) ?? Number.NaN;
+            const jsonStart = text.search(/JSON:\s*/i);
+            const explainMarker = text.search(/EXPLAIN ANALYZE:\s*/i);
+            let parsed = null;
+            if (jsonStart !== -1) {
+                const jsonBlock = text
+                    .slice(jsonStart)
+                    .replace(/^JSON:\s*/i, "");
+                const jsonText = explainMarker !== -1
+                    ? jsonBlock.slice(0, explainMarker - jsonStart).trim()
+                    : jsonBlock.trim();
+                try {
+                    parsed = JSON.parse(jsonText);
+                }
+                catch {
+                    parsed = null;
+                }
+            }
+            if (parsed) {
+                const explainLines = Array.isArray(parsed.explainLines)
+                    ? parsed.explainLines.map((line) => String(line))
+                    : undefined;
+                return {
+                    durationMs: typeof parsed.durationMs === "number"
+                        ? parsed.durationMs
+                        : durationMs,
+                    explainLines,
+                    planningMs: typeof parsed.planningMs === "number"
+                        ? parsed.planningMs
+                        : undefined,
+                    executionMs: typeof parsed.executionMs === "number"
+                        ? parsed.executionMs
+                        : undefined,
+                    raw: text,
+                };
+            }
+            const explainSplit = text.split(/EXPLAIN ANALYZE:\s*/i)[1] ??
+                text.split(/EXPLAIN:\s*/i)[1] ??
+                "";
+            return { durationMs, explain: explainSplit.trim(), raw: text };
+        };
+        const executor = new MCPQueryExecutor({
+            runQuery: async (sql) => {
+                const content = await callTool("run_query", { raw_query: sql });
+                const text = contentToText(content);
+                const durationMs = parseDurationMs(text) ?? Number.NaN; // Keep numeric for typing even if parse fails.
+                return { durationMs };
+            },
+            runQueryExplain: async (sql) => runQueryExplain(sql),
+        });
+        const retriever = new MCPMilvusRetriever({
+            milvusRetrieve: async (query, topK) => callTool("milvus_retrieve", { query, top_k: topK ?? 5 }),
+        });
+        const listIndexes = async (options) => {
+            const content = await callTool("list_indexes", {
+                schemaname: options?.schemaname,
+                tablename: options?.tablename,
+            });
+            return contentToText(content);
+        };
+        return {
+            executor,
+            retriever,
+            callTool,
+            runQueryExplain,
+            listIndexes,
+            close,
+            client,
+            session,
+        };
+    };
+    if (transportType === "httpStream" || httpStreamUrl) {
+        const url = httpStreamUrl ?? "http://localhost:8080/mcp";
+        const transport = new StreamableHTTPClientTransport(new URL(url));
+        const client = new Client({ name: serverName, version: "1.0.0" });
+        await client.connect(transport);
+        const callTool = async (name, args) => {
+            const result = await client.callTool({ name, arguments: args });
+            return toolResultPayload(result);
+        };
+        const close = async () => {
+            await transport.close();
+        };
+        return buildAdapters(callTool, close, client, null);
+    }
     console.log("mcp server cwd", process.env.MCP_SERVER_CWD);
     const serverCwd = options?.serverCwd ??
         process.env.MCP_SERVER_CWD ??
@@ -100,83 +198,11 @@ export const createMcpUseAdapters = async (options) => {
         const result = await session.callTool(name, args);
         return toolResultPayload(result);
     };
-    const executor = new MCPQueryExecutor({
-        runQuery: async (sql) => {
-            const content = await callTool("run_query", { raw_query: sql });
-            const text = contentToText(content);
-            const durationMs = parseDurationMs(text) ?? Number.NaN; // Keep numeric for typing even if parse fails.
-            return { durationMs };
-        },
-        runQueryExplain: async (sql) => runQueryExplain(sql),
-    });
-    const retriever = new MCPMilvusRetriever({
-        milvusRetrieve: async (query, topK) => callTool("milvus_retrieve", { query, top_k: topK ?? 5 }),
-    });
-    const runQueryExplain = async (sql) => {
-        const content = await callTool("run_query_explain", { raw_query: sql });
-        const text = contentToText(content);
-        const durationMs = parseDurationMs(text) ?? Number.NaN;
-        const jsonStart = text.search(/JSON:\s*/i);
-        const explainMarker = text.search(/EXPLAIN ANALYZE:\s*/i);
-        let parsed = null;
-        if (jsonStart !== -1) {
-            const jsonBlock = text
-                .slice(jsonStart)
-                .replace(/^JSON:\s*/i, "");
-            const jsonText = explainMarker !== -1
-                ? jsonBlock.slice(0, explainMarker - jsonStart).trim()
-                : jsonBlock.trim();
-            try {
-                parsed = JSON.parse(jsonText);
-            }
-            catch {
-                parsed = null;
-            }
-        }
-        if (parsed) {
-            const explainLines = Array.isArray(parsed.explainLines)
-                ? parsed.explainLines.map((line) => String(line))
-                : undefined;
-            return {
-                durationMs: typeof parsed.durationMs === "number"
-                    ? parsed.durationMs
-                    : durationMs,
-                explainLines,
-                planningMs: typeof parsed.planningMs === "number"
-                    ? parsed.planningMs
-                    : undefined,
-                executionMs: typeof parsed.executionMs === "number"
-                    ? parsed.executionMs
-                    : undefined,
-                raw: text,
-            };
-        }
-        const explainSplit = text.split(/EXPLAIN ANALYZE:\s*/i)[1] ??
-            text.split(/EXPLAIN:\s*/i)[1] ??
-            "";
-        return { durationMs, explain: explainSplit.trim(), raw: text };
-    };
-    const listIndexes = async (options) => {
-        const content = await callTool("list_indexes", {
-            schemaname: options?.schemaname,
-            tablename: options?.tablename,
-        });
-        return contentToText(content);
-    };
     const close = async () => {
         if (typeof client
             .closeAllSessions === "function") {
             await client.closeAllSessions();
         }
     };
-    return {
-        executor,
-        retriever,
-        callTool,
-        runQueryExplain,
-        listIndexes,
-        close,
-        client,
-        session,
-    };
+    return buildAdapters(callTool, close, client, session);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neural-technologies-indonesia/nl2sql",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Core reasoning pipeline for text-to-SQL.",
   "private": false,
   "type": "module",
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "langchain": "^1.2.1",
+    "@modelcontextprotocol/sdk": "^1.25.1",
     "mcp-use": "*",
     "openai": "^6.14.0"
   },