Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
feat(llm_chat): give every web search choice in the Tools menu an icon
Elian Doran1fa366f389a3
diff --git a/apps/client/src/widgets/type_widgets/llm_chat/ChatInputBar.tsx b/apps/client/src/widgets/type_widgets/llm_chat/ChatInputBar.tsxindex a6c491795d..7377fa77b4 100644--- a/apps/client/src/widgets/type_widgets/llm_chat/ChatInputBar.tsx+++ b/apps/client/src/widgets/type_widgets/llm_chat/ChatInputBar.tsx@@ -478,6 +478,7 @@ export default function ChatInputBar({<ChatToolsDropdownenableNoteTools={chat.enableNoteTools}onNoteToolsChange={handleNoteToolsToggle}+ modelProvider={currentModel?.provider}webSearch={webSearch}searchProviders={searchProviders}onWebSearchChoose={handleWebSearchChoose}diff --git a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.css b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.cssindex efb94b4722..e4741b541e 100644--- a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.css+++ b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.css@@ -12,9 +12,10 @@white-space: normal;}- .llm-chat-tools-provider-icon {+ .llm-chat-tools-choice-icon {--masked-icon-size: 1em;+ font-size: 1em;margin-inline-end: 0.4em;opacity: 0.8;}diff --git a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.spec.tsx b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.spec.tsxindex 796f983c15..2a6aadd28e 100644--- a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.spec.tsx+++ b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.spec.tsx@@ -35,8 +35,9 @@ afterEach(() => {const TAVILY = { id: "s1", name: "Tavily", provider: "tavily" };-function renderMenu({ enableNoteTools = false, webSearch = { choice: "disabled", enableWebSearch: false } }: {+function renderMenu({ enableNoteTools = false, modelProvider, webSearch = { choice: "disabled", enableWebSearch: false } }: {enableNoteTools?: boolean;+ modelProvider?: string;webSearch?: WebSearchState;} = {}) {const onNoteToolsChange = vi.fn();@@ -47,6 +48,7 @@ function renderMenu({ enableNoteTools = false, webSearch = { choice: "disabled",<ChatToolsDropdownenableNoteTools={enableNoteTools}onNoteToolsChange={onNoteToolsChange}+ modelProvider={modelProvider}webSearch={webSearch}searchProviders={[ TAVILY ]}onWebSearchChoose={onWebSearchChoose}@@ -107,6 +109,19 @@ describe("ChatToolsDropdown", () => {expect(mocks.triggerCommand).toHaveBeenCalledExactlyOnceWith("showOptions", { section: "_optionsLlm" });});+ it("gives every web search choice an icon, the model's own mark standing for its built-in search", () => {+ const icons = (menu: ReturnType<typeof renderMenu>) => [ "llm_chat.web_search_disabled", "llm_chat.web_search_builtin", "Tavily" ]+ .map((text) => menu.row(text)?.querySelector(".llm-chat-tools-choice-icon"));++ const [ disabled, builtIn, tavily ] = icons(renderMenu({ modelProvider: "anthropic" }));+ expect(disabled?.classList.contains("bx-block")).toBe(true);+ expect(builtIn?.classList.contains("masked-icon")).toBe(true);+ expect(tavily?.classList.contains("masked-icon")).toBe(true);++ // No model picked yet: nobody's mark to show.+ expect(icons(renderMenu())[1]?.classList.contains("bx-globe")).toBe(true);+ });+it("keeps a choice the model can't use listed, disabled, with the reason on an info icon", async () => {const menu = renderMenu({ webSearch: {choice: "builtin", enableWebSearch: false,diff --git a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.tsx b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.tsxindex 5a3b520caf..e77b50474c 100644--- a/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.tsx+++ b/apps/client/src/widgets/type_widgets/llm_chat/ChatToolsDropdown.tsx@@ -10,15 +10,17 @@ import Dropdown from "../../react/Dropdown.js";import { FormDropdownDivider, FormListHeader, FormListItem, FormListToggleableItem } from "../../react/FormList.js";import Icon from "../../react/Icon.js";import MaskedIcon from "../../react/MaskedIcon.js";-import { SEARCH_PROVIDER_ICON } from "../options/llm/provider_icons.js";+import { providerIconUrl, SEARCH_PROVIDER_ICON } from "../options/llm/provider_icons.js";/*** The Tools menu of the chat input bar: what the model can reach this turn, one section per group* of tools. Its rows leave the menu open, so several can be changed in one visit. Its toggle* shares the compact combo box styling of the model picker beside it.*/-export default function ChatToolsDropdown({ enableNoteTools, onNoteToolsChange, webSearch, searchProviders, onWebSearchChoose, disabled }: {+export default function ChatToolsDropdown({ enableNoteTools, onNoteToolsChange, modelProvider, webSearch, searchProviders, onWebSearchChoose, disabled }: {enableNoteTools: boolean;+ /** The provider type of the current model, whose mark stands for its built-in search. */+ modelProvider: string | undefined;onNoteToolsChange: (newValue: boolean) => void;webSearch: WebSearchState;searchProviders: SearchProviderOption[];@@ -50,6 +52,7 @@ export default function ChatToolsDropdown({ enableNoteTools, onNoteToolsChange,<FormDropdownDivider /><FormListHeader text={t("llm_chat.web_search")} /><WebSearchChoice choice="disabled" webSearch={webSearch} onChoose={onWebSearchChoose}>+ <Icon icon="bx bx-block" className="llm-chat-tools-choice-icon" />{t("llm_chat.web_search_disabled")}</WebSearchChoice><WebSearchChoice@@ -58,6 +61,9 @@ export default function ChatToolsDropdown({ enableNoteTools, onNoteToolsChange,onChoose={onWebSearchChoose}unavailableReason={webSearch.builtInUnavailableKey && t(webSearch.builtInUnavailableKey)}>+ {modelProvider+ ? <MaskedIcon url={providerIconUrl(modelProvider)} className="llm-chat-tools-choice-icon" />+ : <Icon icon="bx bx-globe" className="llm-chat-tools-choice-icon" />}{t("llm_chat.web_search_builtin")}</WebSearchChoice>{searchProviders.map(provider => (@@ -68,7 +74,7 @@ export default function ChatToolsDropdown({ enableNoteTools, onNoteToolsChange,onChoose={onWebSearchChoose}unavailableReason={searchProviderUnavailable}>- <MaskedIcon url={SEARCH_PROVIDER_ICON} className="llm-chat-tools-provider-icon" />+ <MaskedIcon url={SEARCH_PROVIDER_ICON} className="llm-chat-tools-choice-icon" />{provider.name}</WebSearchChoice>))}