wip

sourcegraph · Dec 25, 2023 · a265d76 · a265d76
1 parent e7dd5d4
commit a265d76
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/provider/docs/src/corpus/corpus.ts b/provider/docs/src/corpus/corpus.ts
@@ -1,6 +1,5 @@
 import { Chunk, chunk } from '../doc/chunker'
-import { embeddingsSearch } from './search/embeddings'
-import { keywordSearch } from './search/keyword'
+import { multiSearch } from './search/multi'
 
 /**
  * A documentation corpus.
@@ -44,8 +43,8 @@ export function createCorpus(docs: Document[]): Corpus {
     const storage = createStoredCorpus(docs)
 
     return {
-        search: (query, keyword) => {
-            return Promise.resolve(keyword ? keywordSearch(storage, query) : embeddingsSearch(storage, query))
+        search: query => {
+            return multiSearch(storage, query)
         },
         get length(): number {
             return docs.length

diff --git a/provider/docs/src/corpus/search/multi.ts b/provider/docs/src/corpus/search/multi.ts
@@ -0,0 +1,16 @@
+import { CorpusSearchResult, StoredCorpus } from '../corpus'
+import { embeddingsSearch } from './embeddings'
+import { keywordSearch } from './keyword'
+
+/**
+ * Search using multiple search methods.
+ */
+export async function multiSearch(storage: StoredCorpus, query: string): Promise<CorpusSearchResult[]> {
+    const allResults = await Promise.all(SEARCH_METHODS.map(method => method(storage, query)))
+    return allResults.flat()
+}
+
+const SEARCH_METHODS: ((
+    storage: StoredCorpus,
+    query: string
+) => CorpusSearchResult[] | Promise<CorpusSearchResult[]>)[] = [keywordSearch, embeddingsSearch]