@equationalapplications/core-llm-wiki 4.3.0 → 4.4.0

package/dist/index.js

@@ -1064,14 +1064,14 @@ After running the migration SQL, restart your application.`
               );
             }
           }
-          const entityScope = this._entityInClause(scoredEntityIds);
+          const mismatchScope = this._entityInClause(entityIds);
           const mismatchedCount = await this.db.getFirstAsync(
             `SELECT COUNT(*) AS cnt FROM ${this.prefix}entries
-             WHERE ${entityScope.clause} AND deleted_at IS NULL
+             WHERE ${mismatchScope.clause} AND deleted_at IS NULL
                AND embedding_blob IS NOT NULL
                AND (CAST(length(embedding_blob) AS INTEGER) % 4 = 0)
                AND (CAST(length(embedding_blob) AS INTEGER) / 4) != ?`,
-            [...entityScope.params, queryVec.length]
+            [...mismatchScope.params, queryVec.length]
           );
           if (mismatchedCount && mismatchedCount.cnt > 0) {
             throw new Error(
@@ -1131,16 +1131,16 @@ After running the migration SQL, restart your application.`
             }
           } else {
             if (useRanker) {
-              const entityScope2 = this._entityInClause(scoredEntityIds);
+              const entityScope = this._entityInClause(scoredEntityIds);
               candidateRows = await this.db.getAllAsync(
-                `SELECT id, entity_id, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope2.clause} AND deleted_at IS NULL`,
-                entityScope2.params
+                `SELECT id, entity_id, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope.clause} AND deleted_at IS NULL`,
+                entityScope.params
               );
             } else {
-              const entityScope2 = this._entityInClause(scoredEntityIds);
+              const entityScope = this._entityInClause(scoredEntityIds);
               candidateRows = await this.db.getAllAsync(
-                `SELECT id, entity_id, embedding_blob, embedding, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope2.clause} AND deleted_at IS NULL`,
-                entityScope2.params
+                `SELECT id, entity_id, embedding_blob, embedding, updated_at, access_count FROM ${this.prefix}entries WHERE ${entityScope.clause} AND deleted_at IS NULL`,
+                entityScope.params
               );
             }
             if (weight !== void 0 && weight < 1) {
@@ -1159,32 +1159,42 @@ After running the migration SQL, restart your application.`
             const entityCacheKey = entityIds.length === 1 ? entityIds[0] : entityIds.join("\0");
             let scored;
             if (useRanker) {
-              const candidateIds = entityIds.length > 1 || effectivePreFilterLimit !== void 0 ? candidateRows.map((r) => r.id) : void 0;
+              const candidateRowsByEntity = /* @__PURE__ */ new Map();
+              for (const row of candidateRows) {
+                const rows = candidateRowsByEntity.get(row.entity_id) ?? [];
+                rows.push(row);
+                candidateRowsByEntity.set(row.entity_id, rows);
+              }
               try {
-                const oversampledLimit = Math.max(maxResults * 2, maxResults + 50);
-                scored = await this._rankWithVectorRanker({
-                  entityId: entityCacheKey,
-                  queryVec,
-                  candidateIds,
-                  candidateRows,
-                  weight,
-                  miniSearchScores,
-                  limit: oversampledLimit
-                });
-                if (scored.length > 0) {
-                  const scoredIds2 = new Set(scored.map((s) => s.id));
-                  const metaMap = /* @__PURE__ */ new Map();
-                  for (const r of candidateRows) {
-                    if (scoredIds2.has(r.id)) {
-                      metaMap.set(r.id, { updated_at: r.updated_at, access_count: r.access_count });
-                    }
-                  }
-                  scored = scored.map((s) => {
-                    const meta = metaMap.get(s.id);
-                    return { ...s, updated_at: meta?.updated_at ?? null, access_count: meta?.access_count ?? null };
-                  });
-                }
+                const rankerResultsByEntity = await Promise.all(
+                  scoredEntityIds.filter((id) => (candidateRowsByEntity.get(id)?.length ?? 0) > 0).map(async (scopedEntityId) => {
+                    const rowsForEntity = candidateRowsByEntity.get(scopedEntityId) ?? [];
+                    const candidateIds = effectivePreFilterLimit !== void 0 ? rowsForEntity.map((row) => row.id) : void 0;
+                    const ranked = await this._rankWithVectorRanker({
+                      entityId: scopedEntityId,
+                      queryVec,
+                      candidateIds,
+                      candidateRows: rowsForEntity,
+                      weight,
+                      miniSearchScores,
+                      limit: Math.max(maxResults * 2, maxResults + 50)
+                    });
+                    return ranked.map((row) => ({ ...row, entity_id: scopedEntityId }));
+                  })
+                );
+                scored = rankerResultsByEntity.flat();
                 const scoredIds = new Set(scored.map((s) => s.id));
+                const metadataById = new Map(
+                  candidateRows.filter((row) => scoredIds.has(row.id)).map((row) => [row.id, row])
+                );
+                scored = scored.map((row) => {
+                  const metadata = metadataById.get(row.id);
+                  return {
+                    ...row,
+                    updated_at: metadata?.updated_at ?? null,
+                    access_count: metadata?.access_count ?? null
+                  };
+                });
                 const isHybrid = weight !== void 0 && weight < 1;
                 const maxBackfill = isHybrid ? maxResults : Math.max(0, maxResults - scored.length);
                 if (maxBackfill > 0) {
@@ -1332,21 +1342,17 @@ After running the migration SQL, restart your application.`
                   });
                   const keywordOversampledLimit = Math.max(maxResults * 2, maxResults + 50);
                   const topResults = msResults.slice(0, keywordOversampledLimit);
-                  const resultIds = new Set(topResults.map((r) => r.id));
-                  const candidateMap = /* @__PURE__ */ new Map();
-                  for (const r of candidateRows) {
-                    if (resultIds.has(r.id)) {
-                      candidateMap.set(r.id, { entity_id: r.entity_id, updated_at: r.updated_at, access_count: r.access_count });
-                    }
-                  }
-                  scored = topResults.map((r) => {
-                    const meta = candidateMap.get(r.id);
+                  const topResultIds = new Set(topResults.map((r) => r.id));
+                  const candidateMap = new Map(candidateRows.filter((r) => topResultIds.has(r.id)).map((row) => [row.id, row]));
+                  scored = topResults.map((result) => {
+                    const metadata = candidateMap.get(result.id);
+                    const entityForScore = metadata?.entity_id ?? result.entity_id ?? "";
                     return {
-                      id: r.id,
-                      entity_id: meta?.entity_id ?? r.entity_id,
-                      score: r.score ?? 0,
-                      access_count: meta?.access_count ?? null,
-                      updated_at: meta?.updated_at ?? null
+                      id: result.id,
+                      entity_id: entityForScore,
+                      score: result.score ?? 0,
+                      access_count: metadata?.access_count ?? null,
+                      updated_at: metadata?.updated_at ?? null
                     };
                   });
                 } else {