@querypanel/node-sdk 1.0.40 → 1.0.42

package/dist/index.js

@@ -309,8 +309,9 @@ var PostgresAdapter = class {
     const allowedSet = new Set(
       this.allowedTables.map((t) => tableKey(t.schema, t.table))
     );
+    const neutralizedSql = sql.replace(/EXTRACT\s*\([^)]*FROM\s+[^)]+\)/gi, "EXTRACT(/*neutralized*/)").replace(/SUBSTRING\s*\([^)]*FROM\s+[^)]+\)/gi, "SUBSTRING(/*neutralized*/)").replace(/TRIM\s*\([^)]*FROM\s+[^)]+\)/gi, "TRIM(/*neutralized*/)").replace(/POSITION\s*\([^)]*FROM\s+[^)]+\)/gi, "POSITION(/*neutralized*/)");
     const tablePattern = /(?:FROM|JOIN)\s+(?:ONLY\s+)?(?:([a-zA-Z_][a-zA-Z0-9_]*)\.)?(["']?[a-zA-Z_][a-zA-Z0-9_]*["']?)/gi;
-    const matches = sql.matchAll(tablePattern);
+    const matches = neutralizedSql.matchAll(tablePattern);
     for (const match of matches) {
       const schema = match[1] ?? this.defaultSchema;
       const table = match[2]?.replace(/['"]/g, "");
@@ -525,6 +526,7 @@ function sanitize2(value) {
 }
 
 // src/core/client.ts
+import crypto from "crypto";
 var ApiClient = class {
   baseUrl;
   privateKey;
@@ -1063,6 +1065,7 @@ function resolveTenantId2(client, tenantId) {
 }
 
 // src/routes/ingest.ts
+import crypto2 from "crypto";
 async function syncSchema(client, queryEngine, databaseName, options, signal) {
   const tenantId = resolveTenantId3(client, options.tenantId);
   const adapter = queryEngine.getDatabase(databaseName);
@@ -1074,7 +1077,7 @@ async function syncSchema(client, queryEngine, databaseName, options, signal) {
   if (options.forceReindex) {
     payload.force_reindex = true;
   }
-  const sessionId = crypto.randomUUID();
+  const sessionId = crypto2.randomUUID();
   const response = await client.post(
     "/ingest",
     payload,
@@ -1123,22 +1126,36 @@ function buildSchemaRequest(databaseName, adapter, introspection, metadata) {
 }
 
 // src/routes/query.ts
+import crypto3 from "crypto";
 async function ask(client, queryEngine, question, options, signal) {
   const tenantId = resolveTenantId4(client, options.tenantId);
-  const sessionId = crypto.randomUUID();
+  const sessionId = crypto3.randomUUID();
   const maxRetry = options.maxRetry ?? 0;
   let attempt = 0;
   let lastError = options.lastError;
   let previousSql = options.previousSql;
   while (attempt <= maxRetry) {
     console.log({ lastError, previousSql });
+    const databaseName = options.database ?? queryEngine.getDefaultDatabase();
+    const metadata = databaseName ? queryEngine.getDatabaseMetadata(databaseName) : void 0;
+    let tenantSettings;
+    if (metadata?.tenantFieldName) {
+      tenantSettings = {
+        tenantFieldName: metadata.tenantFieldName,
+        tenantFieldType: metadata.tenantFieldType,
+        enforceTenantIsolation: metadata.enforceTenantIsolation
+      };
+    }
     const queryResponse = await client.post(
       "/query",
       {
         question,
         ...lastError ? { last_error: lastError } : {},
         ...previousSql ? { previous_sql: previousSql } : {},
-        ...options.maxRetry ? { max_retry: options.maxRetry } : {}
+        ...options.maxRetry ? { max_retry: options.maxRetry } : {},
+        ...tenantSettings ? { tenant_settings: tenantSettings } : {},
+        ...databaseName ? { database: databaseName } : {},
+        ...metadata?.dialect ? { dialect: metadata.dialect } : {}
       },
       tenantId,
       options.userId,
@@ -1146,8 +1163,8 @@ async function ask(client, queryEngine, question, options, signal) {
       signal,
       sessionId
     );
-    const databaseName = queryResponse.database ?? options.database ?? queryEngine.getDefaultDatabase();
-    if (!databaseName) {
+    const dbName = queryResponse.database ?? options.database ?? queryEngine.getDefaultDatabase();
+    if (!dbName) {
       throw new Error(
         "No database attached. Call attachPostgres/attachClickhouse first."
       );
@@ -1158,7 +1175,7 @@ async function ask(client, queryEngine, question, options, signal) {
       const execution = await queryEngine.validateAndExecute(
         queryResponse.sql,
         paramValues,
-        databaseName,
+        dbName,
         tenantId
       );
       const rows = execution.rows ?? [];
@@ -1231,7 +1248,7 @@ async function ask(client, queryEngine, question, options, signal) {
         chart,
         context: queryResponse.context,
         attempts: attempt + 1,
-        target_db: databaseName
+        target_db: dbName
       };
     } catch (error) {
       attempt++;
@@ -1270,9 +1287,10 @@ function anonymizeResults(rows) {
 }
 
 // src/routes/vizspec.ts
+import crypto4 from "crypto";
 async function generateVizSpec(client, input, options, signal) {
   const tenantId = resolveTenantId5(client, options?.tenantId);
-  const sessionId = crypto.randomUUID();
+  const sessionId = crypto4.randomUUID();
   const response = await client.post(
     "/vizspec",
     {
@@ -1332,6 +1350,7 @@ var QueryPanelSdkAPI = class {
       description: options?.description,
       tags: options?.tags,
       tenantFieldName: options?.tenantFieldName,
+      tenantFieldType: options?.tenantFieldType ?? "String",
       enforceTenantIsolation: options?.tenantFieldName ? options?.enforceTenantIsolation ?? true : void 0
     };
     this.queryEngine.attachDatabase(name, adapter, metadata);