@querypanel/node-sdk 1.0.52 → 1.0.54

package/dist/index.cjs

@@ -1,4 +1,3 @@
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1455,21 +1454,33 @@ function anonymizeResults(rows) {
 }
 
 // src/routes/modify.ts
-function buildModifiedQuestion(originalQuestion, modifications) {
+function buildModifiedQuestion(originalQuestion, modifications, pipeline) {
   const hints = [];
   if (modifications.timeGranularity) {
     hints.push(`group results by ${modifications.timeGranularity}`);
   }
   if (modifications.dateRange) {
-    const parts = [];
-    if (modifications.dateRange.from) {
-      parts.push(`from ${modifications.dateRange.from}`);
-    }
-    if (modifications.dateRange.to) {
-      parts.push(`to ${modifications.dateRange.to}`);
-    }
-    if (parts.length > 0) {
-      hints.push(`filter date range ${parts.join(" ")}`);
+    if (pipeline === "v2") {
+      const from = normalizeDateInput(modifications.dateRange.from);
+      const to = normalizeDateInput(modifications.dateRange.to);
+      if (from && to) {
+        hints.push(`change date range to ${from} through ${to}`);
+      } else if (from) {
+        hints.push(`change start date to ${from}`);
+      } else if (to) {
+        hints.push(`change end date to ${to}`);
+      }
+    } else {
+      const parts = [];
+      if (modifications.dateRange.from) {
+        parts.push(`from ${modifications.dateRange.from}`);
+      }
+      if (modifications.dateRange.to) {
+        parts.push(`to ${modifications.dateRange.to}`);
+      }
+      if (parts.length > 0) {
+        hints.push(`filter date range ${parts.join(" ")}`);
+      }
     }
   }
   if (modifications.additionalInstructions) {
@@ -1480,6 +1491,67 @@ function buildModifiedQuestion(originalQuestion, modifications) {
   }
   return `${originalQuestion} (${hints.join(", ")})`;
 }
+var START_PARAM_KEY_REGEX = /(^|_)(start|from)(_|$)/i;
+var END_PARAM_KEY_REGEX = /(^|_)(end|to)(_|$)/i;
+var ISO_DATETIME_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z?$/;
+var SQL_DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+var SQL_DATETIME_RE = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+function normalizeDateInput(value) {
+  if (!value) return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  if (ISO_DATETIME_RE.test(trimmed)) {
+    return trimmed.replace("T", " ").replace(/\.\d+Z?$/, "").replace(/Z$/, "");
+  }
+  return trimmed;
+}
+function keyLooksLikeDateBoundary(key, boundary) {
+  return boundary === "start" ? START_PARAM_KEY_REGEX.test(key) : END_PARAM_KEY_REGEX.test(key);
+}
+function hasTimeComponent(value) {
+  return typeof value === "string" && /\d{2}:\d{2}:\d{2}/.test(value);
+}
+function formatDateOverride(dateValue, boundary, existingValue) {
+  if (SQL_DATE_RE.test(dateValue) && !hasTimeComponent(existingValue)) {
+    return dateValue;
+  }
+  if (SQL_DATE_RE.test(dateValue)) {
+    return `${dateValue} ${boundary === "start" ? "00:00:00" : "23:59:59"}`;
+  }
+  if (SQL_DATETIME_RE.test(dateValue)) {
+    return dateValue;
+  }
+  return dateValue;
+}
+function normalizeGeneratedParamKey(param, index) {
+  const nameCandidate = typeof param.name === "string" && param.name.trim() || typeof param.placeholder === "string" && param.placeholder.trim() || typeof param.position === "number" && String(param.position) || String(index + 1);
+  return nameCandidate.replace(/[{}]/g, "").replace(/(.+):.*$/, "$1").replace(/^[:$]/, "").trim();
+}
+function applyDateRangeOverrides(dateRange, params, paramMetadata) {
+  if (!dateRange) return;
+  const from = normalizeDateInput(dateRange.from);
+  const to = normalizeDateInput(dateRange.to);
+  if (!from && !to) return;
+  for (const [key, value] of Object.entries(params)) {
+    if (from && keyLooksLikeDateBoundary(key, "start")) {
+      params[key] = formatDateOverride(from, "start", value);
+    }
+    if (to && keyLooksLikeDateBoundary(key, "end")) {
+      params[key] = formatDateOverride(to, "end", value);
+    }
+  }
+  for (let i = 0; i < paramMetadata.length; i++) {
+    const param = paramMetadata[i];
+    if (!param) continue;
+    const key = normalizeGeneratedParamKey(param, i);
+    if (from && keyLooksLikeDateBoundary(key, "start")) {
+      param.value = formatDateOverride(from, "start", param.value);
+    }
+    if (to && keyLooksLikeDateBoundary(key, "end")) {
+      param.value = formatDateOverride(to, "end", param.value);
+    }
+  }
+}
 function buildVizHints(modifications) {
   const hints = {};
   if (modifications.kind) {
@@ -1524,6 +1596,7 @@ function resolveTenantId5(client, tenantId) {
 async function modifyChart(client, queryEngine, input, options, signal) {
   const tenantId = resolveTenantId5(client, options?.tenantId);
   const sessionId = import_node_crypto4.default.randomUUID();
+  const querypanelSessionId = options?.querypanelSessionId ?? sessionId;
   const chartType = options?.chartType ?? "vega-lite";
   const hasSqlMods = !!input.sqlModifications;
   const hasVizMods = !!input.vizModifications;
@@ -1535,6 +1608,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
   let rationale;
   let queryId;
   let sqlChanged = false;
+  let finalQuestion = input.question;
   const databaseName = input.database ?? queryEngine.getDefaultDatabase();
   if (!databaseName) {
     throw new Error(
@@ -1558,12 +1632,17 @@ async function modifyChart(client, queryEngine, input, options, signal) {
   } else if (hasSqlMods && !hasCustomSql) {
     const modifiedQuestion = buildModifiedQuestion(
       input.question,
-      input.sqlModifications
+      input.sqlModifications,
+      options?.pipeline
     );
+    if (options?.pipeline === "v2") {
+      finalQuestion = modifiedQuestion;
+    }
     const queryResponse = await client.post(
       queryEndpoint,
       {
         question: modifiedQuestion,
+        session_id: querypanelSessionId,
         previous_sql: input.sql,
         ...options?.maxRetry ? { max_retry: options.maxRetry } : {},
         ...tenantSettings ? { tenant_settings: tenantSettings } : {},
@@ -1579,6 +1658,13 @@ async function modifyChart(client, queryEngine, input, options, signal) {
     finalSql = queryResponse.sql;
     paramMetadata = Array.isArray(queryResponse.params) ? queryResponse.params : [];
     finalParams = queryEngine.mapGeneratedParams(paramMetadata);
+    if (options?.pipeline === "v2") {
+      applyDateRangeOverrides(
+        input.sqlModifications?.dateRange,
+        finalParams,
+        paramMetadata
+      );
+    }
     rationale = queryResponse.rationale;
     queryId = queryResponse.queryId;
     sqlChanged = finalSql !== input.sql;
@@ -1601,7 +1687,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
       const vizspecResponse = await client.post(
         "/vizspec",
         {
-          question: input.question,
+          question: finalQuestion,
           sql: finalSql,
           rationale,
           fields: execution.fields,
@@ -1626,7 +1712,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
       const chartResponse = await client.post(
         "/chart",
         {
-          question: input.question,
+          question: finalQuestion,
           sql: finalSql,
           rationale,
           fields: execution.fields,
@@ -1659,6 +1745,7 @@ async function modifyChart(client, queryEngine, input, options, signal) {
     rationale,
     dialect: metadata?.dialect ?? "unknown",
     queryId,
+    querypanelSessionId,
     rows,
     fields: execution.fields,
     chart,