@sixb/sqlite 0.1.15 → 0.1.16

package/dist/index.js

@@ -10567,7 +10567,7 @@ var PAGE_TOKEN_PREFIX = "keyset:";
 var DEFAULT_EXPANSION_FANOUT = 1000;
 function compileObjectQuery(projectId, query, options = {}) {
   if (hasVectorProfile(query) && !isVectorProfileQuery(query)) {
-    throw new ObjectQueryExecutionError("unsupported_vector_composition", "Vector search supports one profile with filters before ranking and limit/project after.");
+    throw new ObjectQueryExecutionError("unsupported_vector_composition", "Vector search supports one profile with filters, traversals or sets before ranking and limit/project after.");
   }
   const source = options.source ?? DEFAULT_OBJECT_QUERY_SOURCE;
   const ctx = { probeLimit: options.includeTotal === false, source };
@@ -10640,9 +10640,29 @@ function compileVector(projectId, query, ctx) {
     { kind: "column", column: "_vector_score", direction: "desc" },
     ...identityOrderFields().map((field) => ({ ...field, binary: true }))
   ]);
-  const sql = `SELECT * FROM (SELECT input.*, max(-1, min(1, 1 - vec_distance_cosine(vectors.embedding, ?))) AS _vector_score
-    ${candidates}) AS ranked ORDER BY ${order.sql} LIMIT ?`;
-  const args = [encodeSqliteVector(values), ...candidateArgs, query.k];
+  const rankedOrder = compileOrder(order.fields, "ranked");
+  const sql = `SELECT stored.project_id, stored.object_type_id, stored.primary_id,
+    stored.properties, stored.properties AS _cursor_properties,
+    stored.created_at, stored.updated_at, stored.version, stored.last_commit_id,
+    ranked._vector_candidate_count, ranked._vector_score
+    FROM (
+    WITH _sixb_vector_candidates AS MATERIALIZED (
+      SELECT input.project_id, input.object_type_id, input.primary_id,
+        vectors.embedding AS _vector_embedding ${candidates} LIMIT ?
+    ), _sixb_vector_budget AS (
+      SELECT COUNT(*) AS _vector_candidate_count FROM _sixb_vector_candidates
+    )
+    SELECT input.project_id, input.object_type_id, input.primary_id, budget._vector_candidate_count,
+      CASE WHEN budget._vector_candidate_count <= ?
+        THEN max(-1, min(1, 1 - vec_distance_cosine(input._vector_embedding, ?)))
+      END AS _vector_score
+    FROM _sixb_vector_candidates AS input CROSS JOIN _sixb_vector_budget AS budget
+    ORDER BY ${order.sql} LIMIT ?
+  ) AS ranked CROSS JOIN ${ctx.source.objectsTable} AS stored
+    ON stored.project_id = ranked.project_id AND stored.object_type_id = ranked.object_type_id
+      AND stored.primary_id = ranked.primary_id
+  ORDER BY ${rankedOrder.sql}`;
+  const args = [...candidateArgs, limit + 1, limit, encodeSqliteVector(values), query.k];
   return {
     sql,
     args,
@@ -10652,7 +10672,9 @@ function compileVector(projectId, query, ctx) {
     vectorProbe: {
       sql: `SELECT COUNT(*) AS total FROM (SELECT 1 ${candidates} LIMIT ?) AS candidates`,
       args: [...candidateArgs, limit + 1],
-      limit
+      limit,
+      rowLimit: query.k,
+      totalLimit: query.k
     },
     hasMore: () => false,
     trimRows: identityRows,
@@ -10811,7 +10833,11 @@ function compileLimit(projectId, inputQuery, rawLimit, ctx) {
       FROM (${input.sql}) AS input
     `,
     totalArgs: input.args,
-    vectorProbe: input.vectorProbe,
+    vectorProbe: input.vectorProbe ? {
+      ...input.vectorProbe,
+      rowLimit: Math.min(input.vectorProbe.rowLimit, rowLimit),
+      totalLimit: input.vectorProbe.rowLimit
+    } : undefined,
     order: input.order,
     hasMore: (rowCount, total) => total === undefined ? ctx.probeLimit && rowCount > limit : limit < total,
     trimRows: ctx.probeLimit ? (rows) => rows.slice(0, limit) : identityRows,
@@ -11088,7 +11114,7 @@ function compileProject(projectId, inputQuery, properties, ctx) {
         input.created_at,
         input.updated_at,
         input.version,
-        input.last_commit_id${input.vectorProbe ? ", input._vector_score" : ""}
+        input.last_commit_id${input.vectorProbe ? ", input._vector_score, input._vector_candidate_count" : ""}
       FROM (${input.sql}) AS input
       ORDER BY ${inputOrder.sql}
     `,
@@ -11632,19 +11658,20 @@ class SqliteObjectReader {
     ensureSqliteVectorSearch(this.db);
     const probe = compiled.vectorProbe;
     const row = this.db.query(probe.sql).get(...probe.args);
-    if (Number(row?.total ?? 0) > probe.limit) {
-      throw new ObjectQueryExecutionError3("vector_work_limit_exceeded", `Exact vector search supports at most ${probe.limit} eligible vectors at this dimension. Narrow the query filters.`);
-    }
+    assertVectorCandidateCount(row?.total, probe.limit);
   }
   queryObjects(params) {
-    this.assertVectorSearch(params);
     const source = this.source;
     const compiled = compileObjectQuery(params.projectId, params.query, {
       includeTotal: params.includeTotal,
       source
     });
-    const total = params.includeTotal === false ? undefined : readTotal(this.db, compiled);
+    if (compiled.vectorProbe)
+      ensureSqliteVectorSearch(this.db);
+    const ordinaryTotal = params.includeTotal === false || compiled.vectorProbe ? undefined : readTotal(this.db, compiled);
     const rawRows = this.db.query(compiled.sql).all(...compiled.args);
+    const vectorTotal = this.vectorResultTotal(compiled, rawRows);
+    const total = params.includeTotal === false ? undefined : vectorTotal ?? ordinaryTotal;
     const rows = compiled.trimRows(rawRows);
     const hasMore = total === undefined && compiled.hasMoreProbe ? compiled.hasMoreProbe.hasMore(this.db.query(compiled.hasMoreProbe.sql).all(...compiled.hasMoreProbe.args).length) : compiled.hasMore(rawRows.length, total);
     return {
@@ -11654,6 +11681,17 @@ class SqliteObjectReader {
       ...total === undefined ? {} : { total }
     };
   }
+  vectorResultTotal(compiled, rows) {
+    const probe = compiled.vectorProbe;
+    if (!probe)
+      return;
+    let count = rows[0]?._vector_candidate_count;
+    if (rows.length === 0) {
+      count = probe.rowLimit === 0 ? this.db.query(probe.sql).get(...probe.args)?.total : 0;
+    }
+    assertVectorCandidateCount(count, probe.limit);
+    return Math.min(count, probe.totalLimit);
+  }
   countObjects(params) {
     this.assertVectorSearch(params);
     const source = this.source;
@@ -11967,6 +12005,14 @@ function sqliteFacetValue(valueType, value) {
   }
   return value;
 }
+function assertVectorCandidateCount(count, limit) {
+  if (typeof count !== "number" || !Number.isSafeInteger(count) || count < 0) {
+    throw new ObjectQueryExecutionError3("invalid_vector_candidate_count", "Storage did not return a valid vector candidate count.");
+  }
+  if (count > limit) {
+    throw new ObjectQueryExecutionError3("vector_work_limit_exceeded", `Exact vector search supports at most ${limit} eligible vectors at this dimension. Narrow the query filters.`);
+  }
+}
 function existsProbeQuery(query) {
   return { kind: "limit", limit: 1, input: stripOuterRowShape(query) };
 }
@@ -12058,7 +12104,7 @@ function compileSelectedReadScopeCte(scopeJson, projectId) {
       _sixb_scope_root_facts(project_id, root_id, node_id, object_type_id, primary_id) AS (
         SELECT anchor.project_id, root.root_id, root.node_id, root.object_type_id, root.primary_id
         FROM _sixb_scope_roots AS root
-        JOIN objects AS anchor
+        CROSS JOIN objects AS anchor
           ON anchor.project_id = ?
          AND anchor.object_type_id = root.object_type_id
          AND anchor.primary_id = root.primary_id
@@ -12140,7 +12186,7 @@ function compileSelectedReadScopeCte(scopeJson, projectId) {
         GROUP BY reachable.project_id, reachable.object_type_id, reachable.primary_id
       ),
       _sixb_scope_objects AS (
-        SELECT stored.project_id, stored.object_type_id, stored.primary_id,
+        SELECT grants.project_id, grants.object_type_id, grants.primary_id,
           COALESCE((
             SELECT json_group_object(property.key, ${sqliteJsonEachValue("property")})
             FROM json_each(stored.properties) AS property
@@ -12230,12 +12276,12 @@ function compileSelectedReadScopeCte(scopeJson, projectId) {
       ),
       _sixb_scope_links AS (
         SELECT
-          stored.project_id,
-          stored.source_type_id,
-          stored.source_id,
-          stored.link_id,
-          stored.target_type_id,
-          stored.target_id,
+          visible.project_id,
+          visible.source_type_id,
+          visible.source_id,
+          visible.link_id,
+          visible.target_type_id,
+          visible.target_id,
           CASE
             WHEN stored.properties IS NULL THEN NULL
             ELSE NULLIF(
@@ -18377,4 +18423,4 @@ export {
   migrateSqliteStorage
 };
 
-//# debugId=1D3AEE45CA656B6464756E2164756E21
+//# debugId=A2CEAFAB428734DF64756E2164756E21