@sassoftware/sas-score-mcp-serverjs 0.4.1-1 → 0.4.1-15

package/src/toolSet/runMacro.js

@@ -1,81 +1,82 @@
-/*
- * 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 runMacro(_appContext) {
-  let description = `
-run-macro — submit and execute a SAS macro on SAS Viya server.
-
-USE when: run macro, execute macro with parameters
-DO NOT USE for: arbitrary SAS code (use run-sas-program), jobs, jobdefs
-
-PARAMETERS
-- macro: string — macro name without "%" (required)
-- scenario: string — parameters or setup code (optional). Accepts: "x=1, y=abc" or "%let x=1; %let y=abc;"
-
-ROUTING RULES
-- "run macro abc" → { macro: "abc", scenario: "" }
-- "run macro abc with x=1, y=2" → { macro: "abc", scenario: "x=1, y=2" }
-- "run macro xyz with %let a=1; %let b=2;" → { macro: "xyz", scenario: "%let a=1; %let b=2;" }
-
-EXAMPLES
-- "run macro abc" → { macro: "abc", scenario: "" }
-- "run macro summarize with x=1, y=2" → { macro: "summarize", scenario: "x=1, y=2" }
-
-NEGATIVE EXAMPLES (do not route here)
-- "run SAS code" (use run-sas-program)
-- "run job X" (use run-job)
-- "run jobdef X" (use run-jobdef)
-
-ERRORS
-Returns log, ods, tables created by macro. Auto-converts "x=1, y=2" to "%let x=1; %let y=2;" format.
-  `;
-
-  let spec = {
-    name: 'run-macro',
-    description: description,
-    
-     inputSchema: z.object({
-      macro: z.string(),
-      scenario: z.string()
-    }),
-    handler: async (params) => {
-      const scenarioRaw = (params.scenario || '').trim();
-      let setup = '';
-      if (scenarioRaw) {
-        // If the scenario already contains macro syntax, send it through unchanged
-        const hasMacroSyntax = /%let\b|%[a-zA-Z_]\w*\s*\(|%[a-zA-Z_]\w*\s*;/.test(scenarioRaw) || scenarioRaw.includes('%');
-        if (hasMacroSyntax) {
-          setup = scenarioRaw;
-        } else {
-          // Convert "x=1,y=abc" -> "%let x=1; %let y=abc;"
-          setup = scenarioRaw.split(',')
-            .map(p => p.trim())
-            .filter(Boolean)
-            .map(p => {
-              const [k, ...rest] = p.split('=');
-              if (!k) return '';
-              const key = k.trim();
-              const val = rest.join('=').trim();
-              return `%let ${key}=${val};`;
-            })
-            .filter(Boolean)
-            .join(' ');
-        }
-      }
-      const src = `${setup} %${params.macro};`;
-      params.src = src;
-      let r = await _submitCode(params);
-      return r;
-    }
-  }
-  return spec;
-}
-
-export default runMacro;
+/*
+ * 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 runMacro(_appContext) {
+  let description = `
+run-macro — submit and execute a SAS macro on SAS Viya server.
+
+USE when: run macro, execute macro with parameters
+DO NOT USE for: arbitrary SAS code (use run-sas-program), jobs, jobdefs
+
+PARAMETERS
+- macro: string — macro name without "%" (required)
+- scenario: string — parameters or setup code (optional). Accepts: "x=1, y=abc" or "%let x=1; %let y=abc;"
+
+ROUTING RULES
+- "run macro abc" → { macro: "abc", scenario: "" }
+- "run macro abc with x=1, y=2" → { macro: "abc", scenario: "x=1, y=2" }
+- "run macro xyz with %let a=1; %let b=2;" → { macro: "xyz", scenario: "%let a=1; %let b=2;" }
+
+EXAMPLES
+- "run macro abc" → { macro: "abc", scenario: "" }
+- "run macro summarize with x=1, y=2" → { macro: "summarize", scenario: "x=1, y=2" }
+
+NEGATIVE EXAMPLES (do not route here)
+- "run SAS code" (use run-sas-program)
+- "run job X" (use run-job)
+- "run jobdef X" (use run-jobdef)
+
+ERRORS
+Returns log, ods, tables created by macro. Auto-converts "x=1, y=2" to "%let x=1; %let y=2;" format.
+  `;
+
+  let spec = {
+    name: 'run-macro',
+    description: description,
+    
+    inputSchema: z.object({
+      macro: z.string(),
+      scenario: z.string().optional()
+    }),
+     
+    handler: async (params) => {
+      const scenarioRaw = (params.scenario || '').trim();
+      let setup = '';
+      if (scenarioRaw) {
+        // If the scenario already contains macro syntax, send it through unchanged
+        const hasMacroSyntax = /%let\b|%[a-zA-Z_]\w*\s*\(|%[a-zA-Z_]\w*\s*;/.test(scenarioRaw) || scenarioRaw.includes('%');
+        if (hasMacroSyntax) {
+          setup = scenarioRaw;
+        } else {
+          // Convert "x=1,y=abc" -> "%let x=1; %let y=abc;"
+          setup = scenarioRaw.split(',')
+            .map(p => p.trim())
+            .filter(Boolean)
+            .map(p => {
+              const [k, ...rest] = p.split('=');
+              if (!k) return '';
+              const key = k.trim();
+              const val = rest.join('=').trim();
+              return `%let ${key}=${val};`;
+            })
+            .filter(Boolean)
+            .join(' ');
+        }
+      }
+      const src = `${setup} %${params.macro};`;
+      params.src = src;
+      let r = await _submitCode(params);
+      return r;
+    }
+  }
+  return spec;
+}
+
+export default runMacro;
 

package/src/toolSet/runProgram.js

@@ -45,15 +45,11 @@ Returns log, ods, tables array, data (if output specified). Error if execution f
     description: description,
     inputSchema: z.object({
       src: z.string(),
-      scenario: z.any(),
-      output: z.string(),
-      folder: z.string(),
-      limit: z.number()
+      scenario: z.string().optional(),
+      output: z.string().optional(),
+      folder: z.string().optional(),
+      limit: z.number().optional()
     }),
-  // NOTE: Previously 'required' incorrectly listed 'program' which does not
-  // exist in the schema. This prevented execution in some orchestrators that
-  // enforce required parameter presence, causing only descriptions to appear.
-  // Corrected to 'src'.
     handler: async (params) => {
       let {src, folder, scenario, _appContext} = params;
       // figure out src

package/src/toolSet/sasQuery.js

@@ -1,78 +1,77 @@
-/*
- * 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() {
- 
-    let description = `
-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-info), SAS programs (use run-sas-program), 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-info)
-- "run SAS code" (use run-sas-program)
-- "run job/macro" (use run-job/run-macro)
-
-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(),
-            job: z.string()
-        }),
-    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() {
+ 
+    let description = `
+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-info), SAS programs (use run-sas-program), 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-info)
+- "run SAS code" (use run-sas-program)
+- "run job/macro" (use run-job/run-macro)
+
+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;
+

package/src/toolSet/scrInfo.js

@@ -35,7 +35,7 @@ Examples
     name: 'scr-info',
     description: description,
     inputSchema: z.object({
-      url: z.string(),
+      url: z.string()
     }),
     handler: async (params) => {
       let {url, _appContext} = params;

package/src/toolSet/scrScore.js

@@ -1,69 +1,70 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import _scrScore from '../toolHelpers/_scrScore.js';
-
-function scrScore(_appContext) {
-  let description = `
-## scr-score
-
-Purpose
-Score a scenario using a model deployed as a SCR container  in Azure or another host).
-
-Inputs
-- url (string, required): SCR model identifier (URL)
-- scenario (string | object | array, optional): Input values to score. Accepts:
-  - a comma-separated key=value string (e.g. "x=1, y=2"),
-  - a JSON object with field names and values (recommended for typed inputs),
-  - an array of objects for batch scoring. If omitted, the tool will return the model's input variable definitions.
-
-What it returns
-- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
-- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
-
-Usage notes
-- Run \`scr-info\` first to inspect the expected input variables and types.
-- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
-- Ensure network connectivity and any required credentials for the target SCR service.
-
-Examples
-- scrScore with url="loan" and scenario="age=45, income=60000"
-- scrScore with url="https://scr-host/models/loan" and scenario={age:45, income:60000}
-`;
-
-  let spec = {
-    name: 'scr-score',
-    description: description,
-    inputSchema: z.object({
-      url: z.string(),
-      scenario: z.any()
-    }),
-    handler: async (params) => {
-      let {url, scenario,_appContext} = params;
-  
-      if (url === null) {
-        return { status: { statusCode: 2, msg: `SCR model ${url} was not specified` }, results: {} };
-      }
-
-      // Normalize simple string scenarios like "x=1, y=2" into an object
-      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 r = await _scrScore({ url: url, scenario: scenario , _appContext: _appContext});
-      return r;
-    }
-  }
-
-  return spec;
-}
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { z } from 'zod';
+import _scrScore from '../toolHelpers/_scrScore.js';
+
+function scrScore(_appContext) {
+  let description = `
+## scr-score
+
+Purpose
+Score a scenario using a model deployed as a SCR container  in Azure or another host).
+
+Inputs
+- url (string, required): SCR model identifier (URL)
+- scenario (string | object | array, optional): Input values to score. Accepts:
+  - a comma-separated key=value string (e.g. "x=1, y=2"),
+  - a JSON object with field names and values (recommended for typed inputs),
+  - an array of objects for batch scoring. If omitted, the tool will return the model's input variable definitions.
+
+What it returns
+- When scoring: the SCR endpoint response (predictions, probabilities, scores) merged with or alongside the supplied inputs.
+- When \`scenario\` is omitted: metadata describing the model's input variables (names, types, required/optional).
+
+Usage notes
+- Run \`scr-info\` first to inspect the expected input variables and types.
+- Prefer structured objects for numeric/date values to avoid type ambiguity; the simple string parser keeps values as strings.
+- Ensure network connectivity and any required credentials for the target SCR service.
+
+Examples
+- scrScore with url="loan" and scenario="age=45, income=60000"
+- scrScore with url="https://scr-host/models/loan" and scenario={age:45, income:60000}
+`;
+
+  let spec = {
+    name: 'scr-score',
+    description: description,
+    inputSchema: z.object({
+      url: z.string(),
+      scenario: z.string().optional()
+    }),
+    
+    handler: async (params) => {
+      let {url, scenario,_appContext} = params;
+  
+      if (url === null) {
+        return { status: { statusCode: 2, msg: `SCR model ${url} was not specified` }, results: {} };
+      }
+
+      // Normalize simple string scenarios like "x=1, y=2" into an object
+      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 r = await _scrScore({ url: url, scenario: scenario , _appContext: _appContext});
+      return r;
+    }
+  }
+
+  return spec;
+}
+
 export default scrScore;

package/src/toolSet/setContext.js

@@ -1,65 +1,65 @@
-/*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {z} from 'zod';
-
-function setContext(_appContext) {
-    let description = `
-set-context — set the CAS and SAS server contexts for subsequent tool calls.
-
-USE when: switch to CAS server, change compute context, check current context, set both
-DO NOT USE for: get variables (use get-env), read data (use read-table), run programs (use run-sas-program)
-
-PARAMETERS
-- cas: string — CAS server name (optional), e.g. 'cas-shared-default', 'finance-cas-server'
-- sas: string — SAS compute context (optional), e.g. 'SAS Studio Compute Context', 'batch-compute'
-
-ROUTING RULES
-- "use finance-cas-server" → { cas: "finance-cas-server" }
-- "switch to SAS Studio Compute Context" → { sas: "SAS Studio Compute Context" }
-- "use finance-cas for CAS and batch-compute for SAS" → { cas: "finance-cas", sas: "batch-compute" }
-- "what context am I using" → { } (no params, returns current)
-
-EXAMPLES
-- "use finance-cas-server" → { cas: "finance-cas-server" }
-- "switch to batch-compute" → { sas: "batch-compute" }
-- "what's my current context" → { }
-
-NEGATIVE EXAMPLES (do not route here)
-- "read table cars" (use read-table)
-- "what's the value of X" (use get-env)
-- "run program" (use run-sas-program)
-
-ERRORS
-Returns current or updated context values {cas, sas}. Error if server not found or invalid name.
-  `;
-  
-    let spec = {
-    name: 'set-context',
-    description: description,
-        inputSchema: z.object({
-            cas: z.string(),
-            sas: z.string()
-        }),
-    handler: async (params) => {
-            
-            let {cas, sas} = params;
-            if (typeof cas === 'string' && cas.trim().length > 0) {
-                _appContext.contexts.cas = cas.trim();
-            }
-            if (typeof sas === 'string' && sas.trim().length > 0) {
-                _appContext.contexts.sas = sas.trim();
-            }
-            // Return a structured response without extraneous keys
-            return {
-                content: [{ type: 'text', text: JSON.stringify(_appContext.contexts) }],
-                structuredContent: _appContext.contexts
-            };
-        }
-    }
-    return spec;
-}
-export default setContext;
-
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {z} from 'zod';
+
+function setContext(_appContext) {
+    let description = `
+set-context — set the CAS and SAS server contexts for subsequent tool calls.
+
+USE when: switch to CAS server, change compute context, check current context, set both
+DO NOT USE for: get variables (use get-env), read data (use read-table), run programs (use run-sas-program)
+
+PARAMETERS
+- cas: string — CAS server name (optional), e.g. 'cas-shared-default', 'finance-cas-server'
+- sas: string — SAS compute context (optional), e.g. 'SAS Studio Compute Context', 'batch-compute'
+
+ROUTING RULES
+- "use finance-cas-server" → { cas: "finance-cas-server" }
+- "switch to SAS Studio Compute Context" → { sas: "SAS Studio Compute Context" }
+- "use finance-cas for CAS and batch-compute for SAS" → { cas: "finance-cas", sas: "batch-compute" }
+- "what context am I using" → { } (no params, returns current)
+
+EXAMPLES
+- "use finance-cas-server" → { cas: "finance-cas-server" }
+- "switch to batch-compute" → { sas: "batch-compute" }
+- "what's my current context" → { }
+
+NEGATIVE EXAMPLES (do not route here)
+- "read table cars" (use read-table)
+- "what's the value of X" (use get-env)
+- "run program" (use run-sas-program)
+
+ERRORS
+Returns current or updated context values {cas, sas}. Error if server not found or invalid name.
+  `;
+  
+    let spec = {
+    name: 'set-context',
+    description: description,
+        inputSchema: z.object({
+      cas: z.string().optional(),
+      sas: z.string().optional()
+    }),
+    handler: async (params) => {
+            
+            let {cas, sas} = params;
+            if (typeof cas === 'string' && cas.trim().length > 0) {
+                _appContext.contexts.cas = cas.trim();
+            }
+            if (typeof sas === 'string' && sas.trim().length > 0) {
+                _appContext.contexts.sas = sas.trim();
+            }
+            // Return a structured response without extraneous keys
+            return {
+                content: [{ type: 'text', text: JSON.stringify(_appContext.contexts) }],
+                structuredContent: _appContext.contexts
+            };
+        }
+    }
+    return spec;
+}
+export default setContext;
+