use underscore for parameters and transform where needed

ProgramComputer · ProgramComputer · commit 55eb348d7cd9 · 2025-05-11T20:00:53.000-05:00
diff --git a/docs/inspector-test-examples.md b/docs/inspector-test-examples.md
@@ -301,7 +301,7 @@ Get fireball data:
 {
   "method": "jpl/fireball",
   "params": {
-    "date-min": "2022-01-01",
+    "date_min": "2022-01-01",
     "limit": 5
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@programcomputer/nasa-mcp-server",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Model Context Protocol (MCP) server for NASA APIs",
   "main": "dist/index.js",
   "files": [
diff --git a/src/handlers/jpl/cad.ts b/src/handlers/jpl/cad.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { addResource } from '../../resources';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 /**
  * Handler for JPL SB Close Approach (CAD) API
@@ -18,8 +19,11 @@ export async function cadHandler(args: Record<string, any>) {
     // Validate parameters if needed
     // Parameters are fairly flexible in this API, so minimal validation is needed
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(args);
+    
     // Make the API request
-    const response = await axios.get(baseUrl, { params: args });
+    const response = await axios.get(baseUrl, { params: transformedParams });
     const data = response.data;
     
     // Create a resource URI that represents this query
@@ -43,8 +47,8 @@ export async function cadHandler(args: Record<string, any>) {
       resourceUri = `jpl://cad/list${constraints ? '?' + constraints : ''}`;
       
       // Create a readable name based on date range and body
-      const dateMin = args['date-min'] || 'now';
-      const dateMax = args['date-max'] || '+60';
+      const dateMin = args['date_min'] || 'now';
+      const dateMax = args['date_max'] || '+60';
       const body = args.body || 'Earth';
       
       resourceName = `Close approaches to ${body} from ${dateMin} to ${dateMax}`;
diff --git a/src/handlers/jpl/fireball.ts b/src/handlers/jpl/fireball.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import axios from 'axios';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 // Schema for validating JPL Fireball request parameters
 export const fireballParamsSchema = z.object({
@@ -33,8 +34,11 @@ export async function jplFireballHandler(params: FireballParams) {
     // Construct the Fireball API URL
     const url = 'https://ssd-api.jpl.nasa.gov/fireball.api';
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(params);
+    
     // Make the request to the Fireball API
-    const response = await axios.get(url, { params });
+    const response = await axios.get(url, { params: transformedParams });
     
     return {
       content: [
diff --git a/src/handlers/jpl/jd_cal.ts b/src/handlers/jpl/jd_cal.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { addResource } from '../../resources';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 /**
  * Handler for JPL Julian Date Calendar Conversion API
@@ -25,8 +26,11 @@ export async function jdCalHandler(args: Record<string, any>) {
       };
     }
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(args);
+    
     // Make the API request
-    const response = await axios.get(baseUrl, { params: args });
+    const response = await axios.get(baseUrl, { params: transformedParams });
     const data = response.data;
     
     // Add response to resources
diff --git a/src/handlers/jpl/nhats.ts b/src/handlers/jpl/nhats.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { addResource } from '../../resources';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 /**
  * Handler for JPL NHATS API (Human-accessible NEOs data)
@@ -18,8 +19,11 @@ export async function nhatsHandler(args: Record<string, any>) {
     // Validate parameters if needed
     // Parameters are fairly flexible in this API, so minimal validation is needed
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(args);
+    
     // Make the API request
-    const response = await axios.get(baseUrl, { params: args });
+    const response = await axios.get(baseUrl, { params: transformedParams });
     const data = response.data;
     
     // Create a resource URI that represents this query
diff --git a/src/handlers/jpl/periodic_orbits.ts b/src/handlers/jpl/periodic_orbits.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { addResource } from '../../resources';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 // Define expected parameters based on documentation
 // Required: sys, family
@@ -36,8 +37,11 @@ export async function periodicOrbitsHandler(args: PeriodicOrbitParams) {
     // Base URL for the Periodic Orbits API
     const baseUrl = 'https://ssd-api.jpl.nasa.gov/periodic_orbits.api';
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(args);
+    
     // Make the API request using GET with parameters
-    const response = await axios.get(baseUrl, { params: args });
+    const response = await axios.get(baseUrl, { params: transformedParams });
     const data = response.data;
     
     // Create a resource URI 
diff --git a/src/handlers/jpl/sbdb.ts b/src/handlers/jpl/sbdb.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import axios from 'axios';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 // Schema for validating JPL Small-Body Database request parameters
 export const sbdbParamsSchema = z.object({
@@ -58,8 +59,11 @@ export async function jplSbdbHandler(params: SbdbParams) {
     if (ca_tbl !== 'approach') queryParams.ca_tbl = ca_tbl;
     if (format !== 'json') queryParams.format = format;
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(queryParams);
+    
     // Make the request to SBDB API
-    const response = await axios.get(url, { params: queryParams });
+    const response = await axios.get(url, { params: transformedParams });
     
     // Return the response
     return {
diff --git a/src/handlers/jpl/sentry.ts b/src/handlers/jpl/sentry.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { addResource } from '../../resources';
+import { transformParamsToHyphenated } from '../../utils/param-transformer';
 
 /**
  * Handler for JPL Sentry API
@@ -14,8 +15,11 @@ export async function sentryHandler(args: Record<string, any>) {
     // Base URL for the Sentry API
     const baseUrl = 'https://ssd-api.jpl.nasa.gov/sentry.api';
     
+    // Transform parameter names from underscore to hyphenated format
+    const transformedParams = transformParamsToHyphenated(args);
+    
     // Make the API request
-    const response = await axios.get(baseUrl, { params: args });
+    const response = await axios.get(baseUrl, { params: transformedParams });
     const data = response.data;
     
     // Create a resource URI that represents this query
diff --git a/src/index.ts b/src/index.ts
@@ -316,17 +316,17 @@ const jplPrompts = [
     description: "Find close approaches of asteroids and comets to Earth or other planets",
     arguments: [
       {
-        name: "dist-max",
+        name: "dist_max",
         description: "Maximum approach distance in lunar distances (LD)",
         required: false
       },
       {
-        name: "date-min",
+        name: "date_min",
         description: "Start date for search (YYYY-MM-DD)",
         required: false
       },
       {
-        name: "date-max",
+        name: "date_max",
         description: "End date for search (YYYY-MM-DD)",
         required: false
       },
@@ -342,17 +342,17 @@ const jplPrompts = [
     description: "Retrieve data about fireballs detected by US Government sensors",
     arguments: [
       {
-        name: "date-min",
+        name: "date_min",
         description: "Start date for fireball data (YYYY-MM-DD)",
         required: false
       },
       {
-        name: "date-max", 
+        name: "date_max", 
         description: "End date for fireball data (YYYY-MM-DD)",
         required: false
       },
       {
-        name: "energy-min",
+        name: "energy_min",
         description: "Minimum energy in kilotons of TNT",
         required: false
       }
@@ -408,7 +408,7 @@ async function startServer() {
       {
         name: "NASA MCP Server",
         description: "Model Context Protocol server for NASA APIs",
-        version: "1.0.11"
+        version: "1.0.12"
       },
       {
         capabilities: {
@@ -1044,11 +1044,11 @@ async function startServer() {
                     type: "number",
                     description: "Maximum number of results to return"
                   },
-                  "date-min": {
+                  "date_min": {
                     type: "string", 
                     description: "Start date (YYYY-MM-DD)"
                   },
-                  "date-max": {
+                  "date_max": {
                     type: "string",
                     description: "End date (YYYY-MM-DD)"
                   }
@@ -1123,19 +1123,19 @@ async function startServer() {
               inputSchema: {
                 type: "object",
                 properties: {
-                  "dist-max": {
+                  "dist_max": {
                     type: "string",
                     description: "Maximum approach distance (e.g., 0.05, 10LD). Default: 0.05 au"
                   },
-                  "dist-min": {
+                  "dist_min": {
                     type: "string",
                     description: "Minimum approach distance. Default: none"
                   },
-                  "date-min": {
+                  "date_min": {
                     type: "string",
                     description: "Start date for search (YYYY-MM-DD). Default: now"
                   },
-                  "date-max": {
+                  "date_max": {
                     type: "string",
                     description: "End date for search (YYYY-MM-DD). Default: +60 days"
                   },
@@ -1176,11 +1176,11 @@ async function startServer() {
                     type: "number",
                     description: "Maximum number of results to return"
                   },
-                  "date-min": {
+                  "date_min": {
                     type: "string",
                     description: "Start date (YYYY-MM-DD)"
                   },
-                  "date-max": {
+                  "date_max": {
                     type: "string",
                     description: "End date (YYYY-MM-DD)"
                   },
@@ -1192,15 +1192,15 @@ async function startServer() {
                     type: "string",
                     description: "Object SPK-ID"
                   },
-                  "h-max": {
+                  "h_max": {
                     type: "number",
                     description: "Maximum absolute magnitude (size filter)"
                   },
-                  "ps-min": {
+                  "ps_min": {
                     type: "string",
                     description: "Minimum Palermo Scale value"
                   },
-                  "ip-min": {
+                  "ip_min": {
                     type: "string",
                     description: "Minimum impact probability"
                   },
diff --git a/src/utils/api-client.ts b/src/utils/api-client.ts
@@ -1,6 +1,7 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import dotenv from 'dotenv';
 import path from 'path';
+import { transformParamsToHyphenated } from './param-transformer';
 
 // Try to load environment variables from .env file with absolute path
 dotenv.config();
@@ -111,7 +112,10 @@ export async function jplApiRequest(
   try {
     // JPL endpoints might use the NASA API key, but check exceptions like Scout
     let apiKey = process.env.NASA_API_KEY;
-    let paramsToSend = { ...params }; // Start with original params
+    
+    // Transform parameter names from underscore to hyphenated format
+    // as the JPL APIs expect hyphenated parameter names
+    let paramsToSend = transformParamsToHyphenated(params);
 
     // Only add api_key if required and available, and not for scout.api
     if (endpoint !== '/scout.api' && apiKey) {
diff --git a/src/utils/param-transformer.ts b/src/utils/param-transformer.ts
@@ -0,0 +1,19 @@
+/**
+ * Transforms parameter names from underscore format to hyphenated format.
+ * This is needed because the MCP API accepts underscore format (typical for JS/Python),
+ * but the external JPL APIs expect hyphenated format.
+ * 
+ * @param params Original parameters with underscore format
+ * @returns Transformed parameters with hyphenated format
+ */
+export function transformParamsToHyphenated(params: Record<string, any>): Record<string, any> {
+  const transformed: Record<string, any> = {};
+  
+  for (const [key, value] of Object.entries(params)) {
+    // Replace underscores with hyphens for parameter names
+    const transformedKey = key.replace(/_/g, '-');
+    transformed[transformedKey] = value;
+  }
+  
+  return transformed;
+} 

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ Get fireball data:`
`301`	`301`	`{`
`302`	`302`	`"method": "jpl/fireball",`
`303`	`303`	`"params": {`
`304`		`- "date-min": "2022-01-01",`
	`304`	`+ "date_min": "2022-01-01",`
`305`	`305`	`"limit": 5`
`306`	`306`	`}`
`307`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@programcomputer/nasa-mcp-server",`
`3`		`- "version": "1.0.11",`
	`3`	`+ "version": "1.0.12",`
`4`	`4`	`"description": "Model Context Protocol (MCP) server for NASA APIs",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"files": [`