@sassoftware/sas-score-mcp-serverjs 1.1.1 → 1.1.3

package/src/toolSet/programScore.js

@@ -1,96 +1,96 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _submitCode from '../toolHelpers/_submitCode.js';
-
-function programScore(_appContext) {
-  const isAgent = _appContext && _appContext.agent;
-  let description = isAgent ? `
-program-score — execute a SAS program model.
-PARAMS: src (string, required), folder (string, optional), scenario (string|object, optional), output (string, optional), limit (number, optional)
-RETURNS: log, ODS output, optional output table rows
-` : `
-program-score — execute a SAS program model on SAS Viya server.
-
-USE when: score program, execute SAS code, run .sas file
-DO NOT USE for: macros (use macro-score), jobs (use job-score), jobdefs (use jobdef-score), SQL queries (use sas-query), read data (use read-table)
-
-PARAMETERS
-- src: string — SAS code or .sas filename (required)
-- folder: string (default: '') — server folder path for .sas files
-- scenario: string | object — parameter values. Accepts: "x=1, y=2" or {x:1, y:2}
-- output: string (default: '') — table name to return (case-sensitive)
-- limit: number (default: 100) — max rows from output
-
-ROUTING RULES
-- "score program 'data a; x=1; run;'" → { src: "data a; x=1; run;", folder: "", output: "", limit: 100 }
-- "score sas program sample folder=/Public/models" → { src: "sample", folder: "/Public/models", output: "", limit: 100 }
-- "score program with name=John, age=45" → { src: "<code>", scenario: {name:"John", age:45}, output: "", limit: 100 }
-
-EXAMPLES
-- "score program 'data a; x=1; run;'" → { src: "data a; x=1; run;", folder: "", output: "", limit: 100 }
-- "score sas file sample in /Public" → { src: "sample", folder: "/Public", output: "", limit: 100 }
-
-NEGATIVE EXAMPLES (do not route here)
-- "score macro X" (use macro-score)
-- "score job X" (use job-score)
-- "score jobdef X" (use jobdef-score)
-- "SQL query" (use sas-query)
-- "read table" (use read-table)
-
-ERRORS
-Returns log, ods, tables array, data (if output specified). Error if execution fails.
-  `;
-
-  let spec = {
-    name: 'program-score',
-    description: description,
-    inputSchema: z.object({
-      src: z.string(),
-      scenario: z.string().optional(),
-      output: z.string().optional(),
-      folder: z.string().optional(),
-      limit: z.number().optional()
-    }),
-    handler: async (params) => {
-      let {src, folder, scenario, _appContext} = params;
-      // figure out src
-      let isrc = src;
-      if (folder != null && folder.trim().length > 0) {
-        if (isrc.indexOf('.sas') < 0) {
-          isrc = isrc + '.sas';
-        }
-        isrc = `
-          filename mcptemp filesrvc folderpath="${folder}";
-          %include mcptemp("${isrc}");
-          filename mcptemp clear;
-        `;
-      }
-      // figure out macros
-
-      if (typeof scenario === 'string' && scenario.includes('=')) {
-        scenario = scenario.split(',').reduce((acc, pair) => {
-          const [k, ...rest] = pair.split('=');
-          if (!k) return acc;
-          acc[k.trim()] = rest.join('=').trim();
-          return acc;
-        }, {});
-      }
-      let iparms = {
-        args: scenario,
-        output: params.output,
-        limit: params.limit,
-        src: isrc,
-        _appContext: _appContext
-      }
-      let r = await _submitCode(iparms);
-      return r;
-    }
-  }
-  return spec;
-}
-
-export default programScore;
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _submitCode from '../toolHelpers/_submitCode.js';
+
+function programScore(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+  let description = isAgent ? `
+program-score — execute a SAS program model.
+PARAMS: src (string, required), folder (string, optional), scenario (string|object, optional), output (string, optional), limit (number, optional)
+RETURNS: log, ODS output, optional output table rows
+` : `
+program-score — execute a SAS program model on SAS Viya server.
+
+USE when: score program, execute SAS code, run .sas file
+DO NOT USE for: macros (use macro-score), jobs (use job-score), jobdefs (use jobdef-score), SQL queries (use sas-query), read data (use read-table)
+
+PARAMETERS
+- src: string — SAS code or .sas filename (required)
+- folder: string (default: '') — server folder path for .sas files
+- scenario: string | object — parameter values. Accepts: "x=1, y=2" or {x:1, y:2}
+- output: string (default: '') — table name to return (case-sensitive)
+- limit: number (default: 100) — max rows from output
+
+ROUTING RULES
+- "score program 'data a; x=1; run;'" → { src: "data a; x=1; run;", folder: "", output: "", limit: 100 }
+- "score sas program sample folder=/Public/models" → { src: "sample", folder: "/Public/models", output: "", limit: 100 }
+- "score program with name=John, age=45" → { src: "<code>", scenario: {name:"John", age:45}, output: "", limit: 100 }
+
+EXAMPLES
+- "score program 'data a; x=1; run;'" → { src: "data a; x=1; run;", folder: "", output: "", limit: 100 }
+- "score sas file sample in /Public" → { src: "sample", folder: "/Public", output: "", limit: 100 }
+
+NEGATIVE EXAMPLES (do not route here)
+- "score macro X" (use macro-score)
+- "score job X" (use job-score)
+- "score jobdef X" (use jobdef-score)
+- "SQL query" (use sas-query)
+- "read table" (use read-table)
+
+ERRORS
+Returns log, ods, tables array, data (if output specified). Error if execution fails.
+  `;
+
+  let spec = {
+    name: 'program-score',
+    description: description,
+    inputSchema: z.object({
+      src: z.string(),
+      scenario: z.string().optional(),
+      output: z.string().optional(),
+      folder: z.string().optional(),
+      limit: z.number().optional()
+    }),
+    handler: async (params) => {
+      let {src, folder, scenario, _appContext} = params;
+      // figure out src
+      let isrc = src;
+      if (folder != null && folder.trim().length > 0) {
+        if (isrc.indexOf('.sas') < 0) {
+          isrc = isrc + '.sas';
+        }
+        isrc = `
+          filename mcptemp filesrvc folderpath="${folder}";
+          %include mcptemp("${isrc}");
+          filename mcptemp clear;
+        `;
+      }
+      // figure out macros
+
+      if (typeof scenario === 'string' && scenario.includes('=')) {
+        scenario = scenario.split(',').reduce((acc, pair) => {
+          const [k, ...rest] = pair.split('=');
+          if (!k) return acc;
+          acc[k.trim()] = rest.join('=').trim();
+          return acc;
+        }, {});
+      }
+      let iparms = {
+        args: scenario,
+        output: params.output,
+        limit: params.limit,
+        src: isrc,
+        _appContext: _appContext
+      }
+      let r = await _submitCode(iparms);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default programScore;

package/src/toolSet/readTable.js

@@ -1,80 +1,80 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { z } from 'zod';
-import debug from 'debug';
-
-import _readTable from  '../toolHelpers/_readTable.js';
-function readTable(_appContext) {
-  const isAgent = _appContext && _appContext.agent;
-
-     let describe = isAgent ? `
-read-table — read rows from a CAS or SAS table.
-PARAMS: lib (string, required), table (string, required), server ('cas'|'sas', required), where (string, optional filter), start (number, default 1), limit (number, default 10)
-RETURNS: array of row objects
-` : `
-read-table -  retrieve rows from a table in a CAS or SAS library.
-
-USE when: read table, show rows, read from library, filtered data with WHERE
-DO NOT USE for: list tables, table structure (use table-describe), SQL queries (use sas-query), SAS programs
-
-PARAMETERS
-- table: string — table name (required)
-- lib: string — caslib or libref (required)
-- server: string (default: 'cas') — 'cas' or 'sas'
-- start: number (default: 1) — 1-based row index
-- limit: number (default: 10) — max rows (1-1000)
-- where: string — SQL WHERE clause filter
-- format: boolean (default: true) — formatted or raw values
-
-PARSING ROWS FROM USER INPUT
-"first N rows/records"        → start: 1, limit: N   ("first" = count from beginning, never an offset)
-"top N rows"                  → start: 1, limit: N
-"N rows" / "N records"        → start: 1, limit: N
-"read N rows from lib.table"  → lib: "lib", table: "table", start: 1, limit: N
-"rows N to M"                 → start: N, limit: M-N+1
-"starting from row N"         → start: N, limit: 10 (default)
-(no count specified)          → start: 1, limit: 10 (default)
-
-DOTTED FORMAT: "lib.table" → lib: "lib", table: "table" (split on first dot)
-
-ROUTING RULES
-- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
-- "show 25 rows from customers" → { table: "customers", lib: "<lib>", limit: 25, start: 1 }
-- "read from mylib.orders where status='shipped'" → { table: "orders", lib: "mylib", where: "status='shipped'", start: 1, limit: 10 }
-
-EXAMPLES
-- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
-- "show 25 rows from customers" → { table: "customers", lib: "mylib", limit: 25, start: 1 }
-
-NEGATIVE EXAMPLES (do not route here)
-- "list tables in Samples" (use list-tables)
-- "what columns are in cars" (use table-describe)
-- "execute SQL query" (use sas-query)
-- "run SAS code" (use program-score)
-
-ERRORS
-Returns rows array, total count, filtered_count, columns metadata. Empty array if no matches.
-  `;
-  
-    let  specs = {
-      name: 'read-table',
-      description: describe,
-      inputSchema: z.object({
-        table: z.string().min(1),
-        lib: z.string().min(1).optional(),
-        start: z.number().int().min(1).optional(),
-        limit: z.number().int().min(1).max(1000).optional(),
-        server: z.enum(['cas', 'sas']).optional(),
-        where: z.string().min(1).optional()
-      }),
-    handler: async (params) => {
-        let r = await _readTable(params,'query');
-        return r;
-      }
-    }
-    return specs;
-}
-export default readTable;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import debug from 'debug';
+
+import _readTable from  '../toolHelpers/_readTable.js';
+function readTable(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+     let describe = isAgent ? `
+read-table — read rows from a CAS or SAS table.
+PARAMS: lib (string, required), table (string, required), server ('cas'|'sas', required), where (string, optional filter), start (number, default 1), limit (number, default 10)
+RETURNS: array of row objects
+` : `
+read-table -  retrieve rows from a table in a CAS or SAS library.
+
+USE when: read table, show rows, read from library, filtered data with WHERE
+DO NOT USE for: list tables, table structure (use table-describe), SQL queries (use sas-query), SAS programs
+
+PARAMETERS
+- table: string — table name (required)
+- lib: string — caslib or libref (required)
+- server: string (default: 'cas') — 'cas' or 'sas'
+- start: number (default: 1) — 1-based row index
+- limit: number (default: 10) — max rows (1-1000)
+- where: string — SQL WHERE clause filter
+- format: boolean (default: true) — formatted or raw values
+
+PARSING ROWS FROM USER INPUT
+"first N rows/records"        → start: 1, limit: N   ("first" = count from beginning, never an offset)
+"top N rows"                  → start: 1, limit: N
+"N rows" / "N records"        → start: 1, limit: N
+"read N rows from lib.table"  → lib: "lib", table: "table", start: 1, limit: N
+"rows N to M"                 → start: N, limit: M-N+1
+"starting from row N"         → start: N, limit: 10 (default)
+(no count specified)          → start: 1, limit: 10 (default)
+
+DOTTED FORMAT: "lib.table" → lib: "lib", table: "table" (split on first dot)
+
+ROUTING RULES
+- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
+- "show 25 rows from customers" → { table: "customers", lib: "<lib>", limit: 25, start: 1 }
+- "read from mylib.orders where status='shipped'" → { table: "orders", lib: "mylib", where: "status='shipped'", start: 1, limit: 10 }
+
+EXAMPLES
+- "read table cars in Samples" → { table: "cars", lib: "Samples", start: 1, limit: 10 }
+- "show 25 rows from customers" → { table: "customers", lib: "mylib", limit: 25, start: 1 }
+
+NEGATIVE EXAMPLES (do not route here)
+- "list tables in Samples" (use list-tables)
+- "what columns are in cars" (use table-describe)
+- "execute SQL query" (use sas-query)
+- "run SAS code" (use program-score)
+
+ERRORS
+Returns rows array, total count, filtered_count, columns metadata. Empty array if no matches.
+  `;
+  
+    let  specs = {
+      name: 'read-table',
+      description: describe,
+      inputSchema: z.object({
+        table: z.string().min(1),
+        lib: z.string().min(1).optional(),
+        start: z.number().int().min(1).optional(),
+        limit: z.number().int().min(1).max(1000).optional(),
+        server: z.enum(['cas', 'sas']).optional(),
+        where: z.string().min(1).optional()
+      }),
+    handler: async (params) => {
+        let r = await _readTable(params,'query');
+        return r;
+      }
+    }
+    return specs;
+}
+export default readTable;
+

package/src/toolSet/sasQuery.js

@@ -1,83 +1,83 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import {z} from 'zod';
-import _jobSubmit from '../toolHelpers/_jobSubmit.js';
-
-function sasQuery(_appContext) {
-  const isAgent = _appContext && _appContext.agent;
-
-    let description = isAgent ? `
-sas-query — run a SQL aggregation query against a table.
-PARAMS: table (string as lib.table, required), query (string, SQL WHERE/aggregation clause, required)
-RETURNS: aggregated query result rows
-` : `
-sas-query -  convert natural language questions into SQL queries and execute them.
-
-USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
-DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-describe), SAS programs (use program-score), jobs/jobdefs
-
-PARAMETERS
-- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
-- query: string — natural language question (required)
-- sql: string — pre-generated SQL SELECT (optional, LLM generates)
-- job: string (default: 'program') — job name to execute
-
-ROUTING RULES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
-
-EXAMPLES
-- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
-- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "read table cars" (use read-table)
-- "show 10 rows" (use read-table)
-- "table structure" (use table-describe)
-- "run SAS code" (use program-score)
-- "score job/macro" (use job-score/macro-score)
-
-ERRORS
-Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
-  `;
-
-
-    let spec = {
-    name: 'sas-query',
-    description: description,
-        inputSchema: z.object({
-      query: z.string(),
-      table: z.string(),
-      sql: z.string().optional()
-    }),
-    handler: async (params) => {
-            let {table,query, sql, job, _appContext} = params;
-            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
-            
-            let iparams = {
-                scenario: {
-                    table: table,
-                    prompt: query,
-                    sql: sqlinput
-                },
-                name: (job == null) ? 'program' : job,
-                type: 'job',
-                query: true,
-                _appContext: _appContext
-            };
-            if (sql == null || sql.trim().length === 0) {
-                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
-            }
-         
-            let r = await _jobSubmit(iparams);
-            return r;
-            
-           }
-        }
-    return spec;
-}
-export default sasQuery;
-
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {z} from 'zod';
+import _jobSubmit from '../toolHelpers/_jobSubmit.js';
+
+function sasQuery(_appContext) {
+  const isAgent = _appContext && _appContext.agent;
+
+    let description = isAgent ? `
+sas-query — run a SQL aggregation query against a table.
+PARAMS: table (string as lib.table, required), query (string, SQL WHERE/aggregation clause, required)
+RETURNS: aggregated query result rows
+` : `
+sas-query -  convert natural language questions into SQL queries and execute them.
+
+USE when: how many/count/total/average by, aggregated analytics, complex filtering, statistical summaries
+DO NOT USE for: raw reads without filtering (use read-table), table structure (use table-describe), SAS programs (use program-score), jobs/jobdefs
+
+PARAMETERS
+- table: string — table in lib.table format (required), e.g. "Public.cars" or "sashelp.class"
+- query: string — natural language question (required)
+- sql: string — pre-generated SQL SELECT (optional, LLM generates)
+- job: string (default: 'program') — job name to execute
+
+ROUTING RULES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "average salary by department in Public.employees" → { table: "Public.employees", query: "average salary by department", sql: "SELECT department, AVG(salary) FROM Public.employees GROUP BY department" }
+
+EXAMPLES
+- "how many cars by make in sashelp.cars" → { table: "sashelp.cars", query: "how many cars by make", sql: "SELECT make, COUNT(*) FROM sashelp.cars GROUP BY make" }
+- "total sales by region from mylib.sales" → { table: "mylib.sales", query: "total sales by region", sql: "SELECT region, SUM(amount) FROM mylib.sales GROUP BY region" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "read table cars" (use read-table)
+- "show 10 rows" (use read-table)
+- "table structure" (use table-describe)
+- "run SAS code" (use program-score)
+- "score job/macro" (use job-score/macro-score)
+
+ERRORS
+Returns rows array, columns metadata, log. Returns error if SQL invalid or table not found.
+  `;
+
+
+    let spec = {
+    name: 'sas-query',
+    description: description,
+        inputSchema: z.object({
+      query: z.string(),
+      table: z.string(),
+      sql: z.string().optional()
+    }),
+    handler: async (params) => {
+            let {table,query, sql, job, _appContext} = params;
+            let sqlinput = (sql == null) ? ' ' : sql.replaceAll(';', ' ').replaceAll('\n', ' ').replaceAll('\r', ' ');
+            
+            let iparams = {
+                scenario: {
+                    table: table,
+                    prompt: query,
+                    sql: sqlinput
+                },
+                name: (job == null) ? 'program' : job,
+                type: 'job',
+                query: true,
+                _appContext: _appContext
+            };
+            if (sql == null || sql.trim().length === 0) {
+                return { content: [{ type: 'text', text: 'Error: The SQL statement generated is blank. Please provide a valid natural language query that can be converted to SQL.' }] };
+            }
+         
+            let r = await _jobSubmit(iparams);
+            return r;
+            
+           }
+        }
+    return spec;
+}
+export default sasQuery;
+
+