Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { useMemo } from "react";
import { useEffect, useState } from "react";
import MiniSearch from "minisearch";
import getDiscourseNodes from "~/utils/getDiscourseNodes";
import {
searchDiscourseNodesWithSemanticFallback,
type DiscourseSearchHit,
} from "~/utils/discourseNodeSemanticSearch";
import {
searchIndexedNodes,
sortSearchResults,
Expand All @@ -23,6 +28,57 @@ type UseAdvancedNodeSearchResultsArgs = {
dockedResults?: SearchResult[];
};

const toKeywordHits = (
scoredHits: ReturnType<typeof searchIndexedNodes>,
): DiscourseSearchHit[] =>
scoredHits.map((hit) => ({
uid: hit.result.uid,
text: hit.result.title,
type: hit.result.type,
nodeTypeLabel: hit.result.nodeTypeLabel,
score: hit.score,
source: "keyword" as const,
}));

const hitsToScoredSearchHits = ({
hits,
resultsByUid,
}: {
hits: DiscourseSearchHit[];
resultsByUid: Map<string, SearchResult>;
}) =>
Comment thread
trangdoan982 marked this conversation as resolved.
Outdated
hits
.map((hit) => {
const indexedResult = resultsByUid.get(hit.uid);
if (indexedResult) {
return { result: indexedResult, score: hit.score, source: hit.source };
}

return {
result: {
uid: hit.uid,
title: hit.text,
type: hit.type || "",
nodeTypeLabel: hit.nodeTypeLabel || "",
excerpt: "",
createdAt: "",
lastModified: "",
authorName: "Unknown",
},
score: hit.score,
source: hit.source,
};
})
.filter(
(
hit,
): hit is {
result: SearchResult;
score: number;
source: DiscourseSearchHit["source"];
} => !!hit,
);

export const useAdvancedNodeSearchResults = ({
debouncedSearchTerm,
selectedNodeTypeIds,
Expand All @@ -32,30 +88,80 @@ export const useAdvancedNodeSearchResults = ({
searchIndex,
dockedQuery,
dockedResults,
}: UseAdvancedNodeSearchResultsArgs): SearchResult[] =>
useMemo(() => {
if (!debouncedSearchTerm) return [];
}: UseAdvancedNodeSearchResultsArgs): SearchResult[] => {
const [results, setResults] = useState<SearchResult[]>([]);

useEffect(() => {
if (!debouncedSearchTerm) {
setResults([]);
return;
Comment thread
trangdoan982 marked this conversation as resolved.
Outdated
}

const isDockedQuery =
dockedQuery !== undefined &&
debouncedSearchTerm.trim() === dockedQuery.trim();

if (isDockedQuery && dockedResults) {
return dockedResults;
setResults(dockedResults);
return;
}
Comment thread
trangdoan982 marked this conversation as resolved.

if (isIndexLoading || indexError || !searchIndex) {
return [];
setResults([]);
return;
}

const scoredHits = searchIndexedNodes({
miniSearch: searchIndex.miniSearch,
allResults: searchIndex.allResults,
searchTerm: debouncedSearchTerm,
typeFilter: selectedNodeTypeIds.length ? selectedNodeTypeIds : undefined,
});
let cancelled = false;
const typeFilter = selectedNodeTypeIds.length
? selectedNodeTypeIds
: undefined;
const discourseNodes = getDiscourseNodes().filter(
(node) =>
node.backedBy === "user" &&
(!typeFilter || typeFilter.includes(node.type)),
);
const resultsByUid = new Map(
searchIndex.allResults.map((result) => [result.uid, result]),
);

return sortSearchResults({ hits: scoredHits, sort });
const runKeywordSearch = (): DiscourseSearchHit[] =>
toKeywordHits(
searchIndexedNodes({
miniSearch: searchIndex.miniSearch,
allResults: searchIndex.allResults,
searchTerm: debouncedSearchTerm,
typeFilter,
}),
);

void searchDiscourseNodesWithSemanticFallback({
nodeTypes: discourseNodes,
query: debouncedSearchTerm,
runKeywordSearch,
})
.then((hits) => {
if (cancelled) return;

const scoredHits = hitsToScoredSearchHits({ hits, resultsByUid });
setResults(sortSearchResults({ hits: scoredHits, sort }));
})
.catch((error) => {
console.error("Advanced node search failed:", error);
if (cancelled) return;
setResults(
sortSearchResults({
hits: hitsToScoredSearchHits({
hits: runKeywordSearch(),
resultsByUid,
}),
sort,
}),
);
});

return () => {
cancelled = true;
};
}, [
debouncedSearchTerm,
dockedQuery,
Expand All @@ -66,3 +172,6 @@ export const useAdvancedNodeSearchResults = ({
selectedNodeTypeIds,
sort,
]);
Comment thread
trangdoan982 marked this conversation as resolved.

return results;
};
12 changes: 12 additions & 0 deletions apps/roam/src/components/AdvancedNodeSearchDialog/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export type DockedSearchState = {
export type ScoredSearchHit = {
result: SearchResult;
score: number;
source?: "semantic" | "keyword";
};

type MiniSearchDocument = SearchResult & {
Expand Down Expand Up @@ -229,6 +230,17 @@ export const sortSearchResults = ({

switch (sort.field) {
case "relevance":
if (aHit.source && bHit.source && aHit.source !== bHit.source) {
comparison =
sort.direction === "desc"
? aHit.source === "semantic"
? -1
: 1
: aHit.source === "semantic"
? 1
: -1;
break;
}
comparison = compareNumbers(aHit.score, bHit.score, sort.direction);
break;
case "alphabetical":
Expand Down
2 changes: 1 addition & 1 deletion apps/roam/src/utils/discourseNodeSearchProviders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export const searchSemanticNodeTitles = async ({
);
};

const runRoamSemanticSearch = async ({
export const runRoamSemanticSearch = async ({
nodeTypes,
query,
}: {
Expand Down
88 changes: 88 additions & 0 deletions apps/roam/src/utils/discourseNodeSemanticSearch.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import type { DiscourseNode } from "~/utils/getDiscourseNodes";
import {
runRoamSemanticSearch,
type AdminSearchResultItem,
} from "~/utils/discourseNodeSearchProviders";

export const SEMANTIC_SEARCH_MIN_DISCOURSE_RESULTS = 5;

export type DiscourseSearchHitSource = "semantic" | "keyword";

export type DiscourseSearchHit = {
uid: string;
text: string;
type?: string;
nodeTypeLabel?: string;
score: number;
source: DiscourseSearchHitSource;
};

export const shouldUseRoamSemanticSearch = (): boolean =>
window.roamAlphaAPI.data.semanticSearchEnabled();

export const combineDiscourseSearchResults = ({
semantic,
keyword,
}: {
semantic: DiscourseSearchHit[];
keyword: DiscourseSearchHit[];
}): DiscourseSearchHit[] => {
const seenUids = new Set(semantic.map((hit) => hit.uid));
const combined = [...semantic];

keyword.forEach((hit) => {
if (seenUids.has(hit.uid)) return;
seenUids.add(hit.uid);
combined.push(hit);
});

return combined;
};

const toSemanticHit = (item: AdminSearchResultItem): DiscourseSearchHit => ({
uid: item.uid,
text: item.text,
type: item.type,
nodeTypeLabel: item.nodeTypeLabel,
score: item.score ?? 0,
source: "semantic",
});

export const searchDiscourseNodesWithSemanticFallback = async ({
nodeTypes,
query,
runKeywordSearch,
}: {
nodeTypes: DiscourseNode[];
query: string;
runKeywordSearch: () => DiscourseSearchHit[];
}): Promise<DiscourseSearchHit[]> => {
const trimmedQuery = query.trim();
if (!trimmedQuery) return [];

if (!shouldUseRoamSemanticSearch()) {
return runKeywordSearch();
}

try {
const providerResult = await runRoamSemanticSearch({
nodeTypes,
query: trimmedQuery,
});
const semanticHits = providerResult.filteredResults.map(toSemanticHit);

if (
providerResult.filteredResultCount >=
SEMANTIC_SEARCH_MIN_DISCOURSE_RESULTS
) {
return semanticHits;
}

return combineDiscourseSearchResults({
semantic: semanticHits,
keyword: runKeywordSearch(),
});
} catch {
return runKeywordSearch();
}
};