@deepagents/text2sql 0.37.0 → 0.38.0

package/dist/lib/adapters/postgres/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/postgres/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,eAAe,EACpB,KAAK,WAAW,EAKhB,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAwEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;;;;;EA0B9D;AAED,qBAAa,QAAS,SAAQ,OAAO;;IAEnC,SAAkB,SAAS,EAAE,WAAW,EAAE,CAAC;IAC3C,SAAkB,aAAa,YAAY;IAC3C,SAAkB,aAAa,WAAwC;IACvE,SAAkB,iBAAiB,gBAAgB;gBAEvC,OAAO,EAAE,sBAAsB;IAY5B,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,YAAY,CAAC,GAAG,EAAE,MAAM;IAcxB,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIhD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7B,oBAAoB,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GACZ,MAAM;CA0cV"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/lib/adapters/postgres/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,eAAe,EACpB,KAAK,WAAW,EAKhB,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAwEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;;;;;EA0B9D;AAED,qBAAa,QAAS,SAAQ,OAAO;;IAEnC,SAAkB,SAAS,EAAE,WAAW,EAAE,CAAC;IAC3C,SAAkB,aAAa,YAAY;IAC3C,SAAkB,aAAa,WAAwC;IACvE,SAAkB,iBAAiB,gBAAgB;gBAEvC,OAAO,EAAE,sBAAsB;IAY5B,WAAW,CAAC,GAAG,EAAE,MAAM;IAIvB,YAAY,CAAC,GAAG,EAAE,MAAM;IAcxB,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIhD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7B,oBAAoB,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GACZ,MAAM;CAgdV"}

package/dist/lib/adapters/spreadsheet/index.js

@@ -148,13 +148,14 @@ function relationship(input) {
 }
 
 // packages/text2sql/src/lib/adapters/groundings/context.ts
-function createGroundingContext() {
+function createGroundingContext(options = {}) {
   return {
     tables: [],
     views: [],
     relationships: [],
     info: void 0,
-    cache: /* @__PURE__ */ new Map()
+    cache: /* @__PURE__ */ new Map(),
+    onProgress: options.onProgress
   };
 }
 
@@ -300,7 +301,24 @@ var Adapter = class {
   async introspect(ctx = createGroundingContext()) {
     for (const fn of this.grounding) {
       const grounding = fn(this);
-      await grounding.execute(ctx);
+      if (grounding.phase) {
+        ctx.onProgress?.({
+          type: "phase:start",
+          phase: grounding.phase,
+          message: `Starting ${grounding.name} introspection...`
+        });
+      }
+      try {
+        await grounding.execute(ctx);
+      } finally {
+        if (grounding.phase) {
+          ctx.onProgress?.({
+            type: "phase:end",
+            phase: grounding.phase,
+            message: `Finished ${grounding.name} introspection.`
+          });
+        }
+      }
     }
     return this.#toSchemaFragments(ctx);
   }
@@ -506,26 +524,33 @@ var Adapter = class {
   async #checkScope(sql, allowedEntities) {
     const dialect = this.formatterLanguage;
     const scopeDialects = {
-      sqlite: "mysql",
-      postgresql: "postgresql",
-      bigquery: "bigquery",
-      transactsql: "transactsql",
-      mysql: "mysql"
+      sqlite: ["sqlite", "mysql"],
+      postgresql: ["postgresql"],
+      bigquery: ["bigquery"],
+      transactsql: ["transactsql"],
+      mysql: ["mysql"]
     };
-    const scopeDialect = scopeDialects[dialect];
-    if (!scopeDialect) {
+    const candidates = scopeDialects[dialect];
+    if (!candidates) {
       throw new TypeError(
         `No scope dialect mapping for formatter language "${dialect}". Add it to the scopeDialects map in Adapter.#checkScope.`
       );
     }
-    let references;
-    try {
-      references = extractBaseEntityReferences(sql, scopeDialect);
-    } catch (error) {
+    let references = null;
+    let lastError;
+    for (const candidate of candidates) {
+      try {
+        references = extractBaseEntityReferences(sql, candidate);
+        break;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    if (references === null) {
       return buildScopeParseErrorPayload(
         sql,
         dialect,
-        error
+        lastError
       );
     }
     if (references.length === 0) return null;
@@ -648,15 +673,17 @@ var AbstractGrounding = class {
    * Grounding identifier for debugging/logging.
    */
   name;
-  constructor(name) {
+  phase;
+  constructor(name, phase) {
     this.name = name;
+    this.phase = phase;
   }
 };
 
 // packages/text2sql/src/lib/adapters/groundings/column-stats.grounding.ts
 var ColumnStatsGrounding = class extends AbstractGrounding {
   constructor(config = {}) {
-    super("columnStats");
+    super("columnStats", "column_stats");
   }
   /**
    * Execute the grounding process.
@@ -664,7 +691,17 @@ var ColumnStatsGrounding = class extends AbstractGrounding {
    */
   async execute(ctx) {
     const allContainers = [...ctx.tables, ...ctx.views];
-    for (const container of allContainers) {
+    const total = allContainers.length;
+    for (let i = 0; i < allContainers.length; i++) {
+      const container = allContainers[i];
+      ctx.onProgress?.({
+        type: "phase:progress",
+        phase: "column_stats",
+        table: container.name,
+        message: `Collecting stats for ${container.name}...`,
+        current: i + 1,
+        total
+      });
       for (const column2 of container.columns) {
         try {
           const stats = await this.collectStats(container.name, column2);
@@ -689,7 +726,7 @@ var ColumnValuesGrounding = class extends AbstractGrounding {
   lowCardinalityLimit;
   maxValueLength;
   constructor(config = {}) {
-    super("columnValues");
+    super("columnValues", "column_values");
     this.lowCardinalityLimit = config.lowCardinalityLimit ?? 20;
     this.maxValueLength = config.maxValueLength ?? 100;
   }
@@ -772,7 +809,17 @@ var ColumnValuesGrounding = class extends AbstractGrounding {
    */
   async execute(ctx) {
     const allContainers = [...ctx.tables, ...ctx.views];
-    for (const container of allContainers) {
+    const total = allContainers.length;
+    for (let i = 0; i < allContainers.length; i++) {
+      const container = allContainers[i];
+      ctx.onProgress?.({
+        type: "phase:progress",
+        phase: "column_values",
+        table: container.name,
+        message: `Collecting column values for ${container.name}...`,
+        current: i + 1,
+        total
+      });
       const table2 = this.getTable(ctx, container.name);
       for (const column2 of container.columns) {
         try {
@@ -826,7 +873,7 @@ var ColumnValuesGrounding = class extends AbstractGrounding {
 // packages/text2sql/src/lib/adapters/groundings/info.grounding.ts
 var InfoGrounding = class extends AbstractGrounding {
   constructor(config = {}) {
-    super("dialectInfo");
+    super("dialectInfo", "info");
   }
   /**
    * Execute the grounding process.
@@ -840,14 +887,24 @@ var InfoGrounding = class extends AbstractGrounding {
 // packages/text2sql/src/lib/adapters/groundings/row-count.grounding.ts
 var RowCountGrounding = class extends AbstractGrounding {
   constructor(config = {}) {
-    super("rowCount");
+    super("rowCount", "row_counts");
   }
   /**
    * Execute the grounding process.
    * Annotates tables in ctx.tables with row counts and size hints.
    */
   async execute(ctx) {
-    for (const table2 of ctx.tables) {
+    const total = ctx.tables.length;
+    for (let i = 0; i < ctx.tables.length; i++) {
+      const table2 = ctx.tables[i];
+      ctx.onProgress?.({
+        type: "phase:progress",
+        phase: "row_counts",
+        table: table2.name,
+        message: `Counting rows in ${table2.name}...`,
+        current: i + 1,
+        total
+      });
       const count = await this.getRowCount(table2.name);
       if (count != null) {
         table2.rowCount = count;
@@ -874,7 +931,7 @@ var TableGrounding = class extends AbstractGrounding {
   #forward;
   #backward;
   constructor(config = {}) {
-    super("table");
+    super("table", "tables");
     this.#filter = config.filter;
     this.#columns = config.columns;
     this.#forward = config.forward;
@@ -890,9 +947,17 @@ var TableGrounding = class extends AbstractGrounding {
     const backward = this.#backward;
     if (!forward && !backward) {
       const tables3 = await Promise.all(
-        seedTables.map(
-          async (name) => applyColumnFilter(await this.getTable(name), this.#columns)
-        )
+        seedTables.map(async (name, index2) => {
+          ctx.onProgress?.({
+            type: "phase:progress",
+            phase: "tables",
+            table: name,
+            message: `Loading table ${name}...`,
+            current: index2 + 1,
+            total: seedTables.length
+          });
+          return applyColumnFilter(await this.getTable(name), this.#columns);
+        })
       );
       ctx.tables.push(...tables3);
       return;
@@ -904,6 +969,7 @@ var TableGrounding = class extends AbstractGrounding {
     const backwardQueue = [];
     const forwardVisited = /* @__PURE__ */ new Set();
     const backwardVisited = /* @__PURE__ */ new Set();
+    let loadedCount = 0;
     for (const name of seedTables) {
       if (forward) forwardQueue.push({ name, depth: 0 });
       if (backward) backwardQueue.push({ name, depth: 0 });
@@ -916,6 +982,14 @@ var TableGrounding = class extends AbstractGrounding {
       if (forwardVisited.has(name)) continue;
       forwardVisited.add(name);
       if (!tables2[name]) {
+        loadedCount++;
+        ctx.onProgress?.({
+          type: "phase:progress",
+          phase: "tables",
+          table: name,
+          message: `Loading table ${name}...`,
+          current: loadedCount
+        });
         tables2[name] = applyColumnFilter(
           await this.getTable(name),
           this.#columns
@@ -940,6 +1014,14 @@ var TableGrounding = class extends AbstractGrounding {
       if (backwardVisited.has(name)) continue;
       backwardVisited.add(name);
       if (!tables2[name]) {
+        loadedCount++;
+        ctx.onProgress?.({
+          type: "phase:progress",
+          phase: "tables",
+          table: name,
+          message: `Loading table ${name}...`,
+          current: loadedCount
+        });
         tables2[name] = applyColumnFilter(
           await this.getTable(name),
           this.#columns