@querypanel/node-sdk 1.2.6 → 1.2.8

package/dist/index.cjs

@@ -382,10 +382,15 @@ var ClickHouseAdapter = class {
       return;
     }
     const allowedSet = new Set(this.allowedTables);
-    const tablePattern = /(?:FROM|JOIN)\s+(?:FINAL\s+)?(?:(?:[a-zA-Z_][a-zA-Z0-9_]*)\.)?(["'`]?[a-zA-Z_][a-zA-Z0-9_]*["'`]?)/gi;
+    const tablePattern = /\b(FROM|JOIN)\s+(?:FINAL\s+)?(?:(?:[a-zA-Z_][a-zA-Z0-9_]*)\.)?(["'`]?[a-zA-Z_][a-zA-Z0-9_]*["'`]?)/gi;
     const matches = sql.matchAll(tablePattern);
     for (const match of matches) {
-      const table = match[1]?.replace(/["'`]/g, "");
+      const clause = match[1]?.toUpperCase();
+      const matchIndex = match.index ?? -1;
+      if (clause === "JOIN" && matchIndex >= 0 && isArrayJoinClause(sql, matchIndex)) {
+        continue;
+      }
+      const table = match[2]?.replace(/["'`]/g, "");
       if (table) {
         if (!allowedSet.has(table)) {
           throw new Error(
@@ -453,6 +458,11 @@ function normalizeTableFilter2(tables) {
   }
   return normalized;
 }
+function isArrayJoinClause(sql, joinIndex) {
+  const beforeJoin = sql.slice(0, joinIndex);
+  const previousToken = beforeJoin.trim().split(/\s+/).pop()?.toUpperCase();
+  return previousToken === "ARRAY";
+}
 function transformColumnRow(row) {
   const unwrappedType = unwrapTypeModifiers(row.type);
   const column = {
@@ -1832,7 +1842,6 @@ async function ask(client, queryEngine, question, options, signal) {
   let previousSql = options.previousSql;
   const queryEndpoint = options.pipeline === "v2" ? "/v2/query" : "/query";
   while (attempt <= maxRetry) {
-    console.log({ lastError, previousSql });
     const databaseName = options.database ?? queryEngine.getDefaultDatabase();
     const metadata = databaseName ? queryEngine.getDatabaseMetadata(databaseName) : void 0;
     let tenantSettings;
@@ -1855,7 +1864,8 @@ async function ask(client, queryEngine, question, options, signal) {
         ...databaseName ? { database: databaseName } : {},
         ...metadata?.dialect ? { dialect: metadata.dialect } : {},
         ...options.model?.trim() ? { model: options.model.trim() } : {},
-        ...options.pipeline === "v2" && options.systemPrompt?.trim() ? { system_prompt: options.systemPrompt.trim() } : {}
+        ...options.pipeline === "v2" && options.systemPrompt?.trim() ? { system_prompt: options.systemPrompt.trim() } : {},
+        debug: options.debug ?? false
       },
       tenantId,
       options.userId,
@@ -1976,9 +1986,14 @@ async function ask(client, queryEngine, question, options, signal) {
       }
       lastError = error instanceof Error ? error.message : String(error);
       previousSql = queryResponse.data.sql ?? previousSql;
-      console.warn(
-        `SQL execution failed (attempt ${attempt}/${maxRetry + 1}): ${lastError}. Retrying...`
-      );
+      console.warn("SQL execution failed, retrying query generation", {
+        attempt,
+        maxAttempts: maxRetry + 1,
+        error: lastError,
+        sql: queryResponse.data.sql ?? null,
+        paramMetadata,
+        params: paramValues
+      });
     }
   }
   throw new Error("Unexpected error in ask retry loop");
@@ -2204,7 +2219,8 @@ async function modifyChart(client, queryEngine, input, options, signal) {
         ...options?.maxRetry ? { max_retry: options.maxRetry } : {},
         ...tenantSettings ? { tenant_settings: tenantSettings } : {},
         ...databaseName ? { database: databaseName } : {},
-        ...metadata?.dialect ? { dialect: metadata.dialect } : {}
+        ...metadata?.dialect ? { dialect: metadata.dialect } : {},
+        debug: options?.debug ?? false
       },
       tenantId,
       options?.userId,
@@ -2585,7 +2601,7 @@ var QueryPanelSdkAPI = class _QueryPanelSdkAPI {
    * It handles the complete flow: SQL generation → validation → execution → chart generation.
    *
    * @param question - Natural language question (e.g., "Show revenue by country")
-   * @param options - Query options including tenantId, database, and retry settings
+   * @param options - Query options including tenantId, database, retry settings, and optional `debug` for engineer-style rationale
    * @param signal - Optional AbortSignal for cancellation
    * @returns Response with SQL, executed data rows, and generated chart
    * @throws {Error} When SQL generation or execution fails after all retries