Better shouldIndexEmbeddings logic

justyns · Jul 31, 2024 · 9924b54 · 9924b54
1 parent 3113f30
commit 9924b54
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/src/embeddings.test.ts b/src/embeddings.test.ts
@@ -37,6 +37,14 @@ ai:
 \`\`\`
   `;
 
+const settingsPageSampleNoEmbeddings = `
+\`\`\`yaml
+ai:
+  indexEmbeddings: true
+  indexSummaries: true
+\`\`\`
+  `;
+
 const secretsPageSample = `
 \`\`\`yaml
 OPENAI_API_KEY: bar
@@ -113,11 +121,7 @@ Deno.test("shouldIndexSummaries returns false when indexSummary is disabled", as
 });
 
 Deno.test("shouldIndexEmbeddings returns false when no embedding models are configured", async () => {
-    const modifiedSettings = settingsPageSample.replace(
-        /embeddingModels:[\s\S]*?(?=\n\w)/,
-        "embeddingModels: []",
-    );
-    await syscall("mock.setPage", "SETTINGS", modifiedSettings);
+    await syscall("mock.setPage", "SETTINGS", settingsPageSampleNoEmbeddings);
     await syscall("mock.setPage", "SECRETS", secretsPageSample);
     await initializeOpenAI();
     await syscall("mock.setEnv", "server");
@@ -127,11 +131,7 @@ Deno.test("shouldIndexEmbeddings returns false when no embedding models are conf
 });
 
 Deno.test("shouldIndexSummaries returns false when no embedding models are configured", async () => {
-    const modifiedSettings = settingsPageSample.replace(
-        /embeddingModels:[\s\S]*?(?=\n\w)/,
-        "embeddingModels: []",
-    );
-    await syscall("mock.setPage", "SETTINGS", modifiedSettings);
+    await syscall("mock.setPage", "SETTINGS", settingsPageSampleNoEmbeddings);
     await syscall("mock.setPage", "SECRETS", secretsPageSample);
     await initializeOpenAI();
     await syscall("mock.setEnv", "server");

diff --git a/src/embeddings.ts b/src/embeddings.ts
@@ -47,14 +47,20 @@ export function canIndexPage(pageName: string): boolean {
 
 export async function shouldIndexEmbeddings() {
   await initIfNeeded();
-  return aiSettings.indexEmbeddings && currentEmbeddingProvider &&
-    currentEmbeddingModel && (await system.getEnv()) === "server";
+  return aiSettings.indexEmbeddings &&
+    currentEmbeddingProvider !== undefined &&
+    currentEmbeddingModel !== undefined &&
+    aiSettings.embeddingModels.length > 0 &&
+    (await system.getEnv()) === "server";
 }
 
 export async function shouldIndexSummaries() {
   await initIfNeeded();
-  return aiSettings.indexEmbeddings && aiSettings.indexSummary &&
-    currentEmbeddingProvider && currentEmbeddingModel &&
+  return aiSettings.indexEmbeddings &&
+    aiSettings.indexSummary &&
+    currentEmbeddingProvider !== undefined &&
+    currentEmbeddingModel !== undefined &&
+    aiSettings.embeddingModels.length > 0 &&
     (await system.getEnv()) === "server";
 }