From 26733d6fea142f80cffa6f88bc453565ed103d36 Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Tue, 14 Jan 2025 09:06:26 -0800 Subject: [PATCH] Remove /browse since we have better support --- src/apps/chat/commands/CommandsBrowse.tsx | 16 ---------------- src/apps/chat/commands/commands.registry.ts | 6 ++---- src/apps/chat/components/composer/Composer.tsx | 5 ++--- src/apps/chat/editors/_handleExecuteCommand.ts | 4 ---- src/apps/chat/editors/browse-load.ts | 6 +++++- src/common/components/useCapabilities.ts | 1 - src/modules/browse/BrowseSettings.tsx | 10 ++-------- src/modules/browse/store-module-browsing.tsx | 9 +-------- 8 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 src/apps/chat/commands/CommandsBrowse.tsx diff --git a/src/apps/chat/commands/CommandsBrowse.tsx b/src/apps/chat/commands/CommandsBrowse.tsx deleted file mode 100644 index 8d9e811cc..000000000 --- a/src/apps/chat/commands/CommandsBrowse.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import LanguageIcon from '@mui/icons-material/Language'; - -import type { ICommandsProvider } from './ICommandsProvider'; - -export const CommandsBrowse: ICommandsProvider = { - id: 'cmd-ass-browse', - rank: 20, - - getCommands: () => [{ - primary: '/browse', - arguments: ['URL'], - description: 'Assistant will download the web page', - Icon: LanguageIcon, - }], - -}; diff --git a/src/apps/chat/commands/commands.registry.ts b/src/apps/chat/commands/commands.registry.ts index c4141c384..778a95e91 100644 --- a/src/apps/chat/commands/commands.registry.ts +++ b/src/apps/chat/commands/commands.registry.ts @@ -1,13 +1,12 @@ -import { ChatCommand, ICommandsProvider } from './ICommandsProvider'; +import type { ChatCommand, ICommandsProvider } from './ICommandsProvider'; import { CommandsAlter } from './CommandsAlter'; -import { CommandsBrowse } from './CommandsBrowse'; import { CommandsDraw } from './CommandsDraw'; import { CommandsHelp } from './CommandsHelp'; import { CommandsReact } from './CommandsReact'; -export type CommandsProviderId = 'cmd-ass-browse' | 'cmd-ass-t2i' | 'cmd-chat-alter' | 'cmd-help' | 'cmd-mode-react'; +export type CommandsProviderId = 'cmd-ass-t2i' | 'cmd-chat-alter' | 'cmd-help' | 'cmd-mode-react'; type TextCommandPiece = | { type: 'nocmd'; value: string; } @@ -15,7 +14,6 @@ type TextCommandPiece = const ChatCommandsProviders: Record = { - 'cmd-ass-browse': CommandsBrowse, 'cmd-ass-t2i': CommandsDraw, 'cmd-chat-alter': CommandsAlter, 'cmd-help': CommandsHelp, diff --git a/src/apps/chat/components/composer/Composer.tsx b/src/apps/chat/components/composer/Composer.tsx index e1eef7ddf..a11ea63d3 100644 --- a/src/apps/chat/components/composer/Composer.tsx +++ b/src/apps/chat/components/composer/Composer.tsx @@ -685,13 +685,12 @@ export function Composer(props: { !llmAttachmentDraftsCollection.canAttachAllFragments ? 'warning' : undefined; - // stable randomization of the /verb, between '/draw', '/react', '/browse' + // stable randomization of the /verb, between '/draw', '/react' const placeholderAction = React.useMemo(() => { const actions: string[] = ['/react']; if (props.capabilityHasT2I) actions.push('/draw'); - if (hasComposerBrowseCapability) actions.push('/browse'); return actions[Math.floor(Math.random() * actions.length)]; - }, [hasComposerBrowseCapability, props.capabilityHasT2I]); + }, [props.capabilityHasT2I]); let textPlaceholder: string = isDraw ? 'Describe what you would like to see...' diff --git a/src/apps/chat/editors/_handleExecuteCommand.ts b/src/apps/chat/editors/_handleExecuteCommand.ts index 6e51742b9..dfbe6396b 100644 --- a/src/apps/chat/editors/_handleExecuteCommand.ts +++ b/src/apps/chat/editors/_handleExecuteCommand.ts @@ -4,7 +4,6 @@ import { ConversationHandler } from '~/common/chat-overlay/ConversationHandler'; import { createTextContentFragment, DMessageFragment, isTextContentFragment } from '~/common/stores/chat/chat.fragments'; import { extractChatCommand, helpPrettyChatCommands } from '../commands/commands.registry'; -import { runBrowseGetPageUpdatingState } from './browse-load'; import { runImageGenerationUpdatingState } from './image-generate'; import { runReActUpdatingState } from './react-tangent'; @@ -34,9 +33,6 @@ export async function _handleExecuteCommand(lastMessageId: DMessageId, lastMessa // Valid /commands are intercepted here, and override chat modes, generally for mechanics or sidebars switch (providerId) { - case 'cmd-ass-browse': - return await runBrowseGetPageUpdatingState(cHandler, userText); - case 'cmd-ass-t2i': return await runImageGenerationUpdatingState(cHandler, userText); diff --git a/src/apps/chat/editors/browse-load.ts b/src/apps/chat/editors/browse-load.ts index e366872cd..be65dc90c 100644 --- a/src/apps/chat/editors/browse-load.ts +++ b/src/apps/chat/editors/browse-load.ts @@ -1,3 +1,6 @@ +/* +// NOTE: this is not used anymore and here just as a reference code and to demonstrate alternative conversation modes / editors + import { callBrowseFetchPageOrThrow } from '~/modules/browse/browse.client'; import type { ConversationHandler } from '~/common/chat-overlay/ConversationHandler'; @@ -36,4 +39,5 @@ export const runBrowseGetPageUpdatingState = async (cHandler: ConversationHandle return false; } -}; \ No newline at end of file +}; + */ \ No newline at end of file diff --git a/src/common/components/useCapabilities.ts b/src/common/components/useCapabilities.ts index 2e11990b6..0bdba2628 100644 --- a/src/common/components/useCapabilities.ts +++ b/src/common/components/useCapabilities.ts @@ -65,7 +65,6 @@ export interface CapabilityBrowsing { isServerConfig: boolean; isClientConfig: boolean; isClientValid: boolean; - inCommand: boolean; inComposer: boolean; inReact: boolean; inPersonas: boolean; diff --git a/src/modules/browse/BrowseSettings.tsx b/src/modules/browse/BrowseSettings.tsx index 0d0edc5c6..5f0b49bdf 100644 --- a/src/modules/browse/BrowseSettings.tsx +++ b/src/modules/browse/BrowseSettings.tsx @@ -20,17 +20,16 @@ const _styleHelperText = { export function BrowseSettings() { // external state - const { mayWork, isServerConfig, isClientValid, inCommand, inComposer, inReact, inPersonas } = useBrowseCapability(); + const { mayWork, isServerConfig, isClientValid, inComposer, inReact, inPersonas } = useBrowseCapability(); const { wssEndpoint, setWssEndpoint, pageTransform, setPageTransform, - setEnableCommandBrowse, setEnableComposerAttach, setEnableReactTool, setEnablePersonaTool, + setEnableComposerAttach, setEnableReactTool, setEnablePersonaTool, } = useBrowseStore(useShallow(state => ({ wssEndpoint: state.wssEndpoint, pageTransform: state.pageTransform, setPageTransform: state.setPageTransform, setWssEndpoint: state.setWssEndpoint, - setEnableCommandBrowse: state.setEnableCommandBrowse, setEnableComposerAttach: state.setEnableComposerAttach, setEnableReactTool: state.setEnableReactTool, setEnablePersonaTool: state.setEnablePersonaTool, @@ -80,11 +79,6 @@ export function BrowseSettings() { {platformAwareKeystrokes('Load and attach when pasting a URL')} - - setEnableCommandBrowse(event.target.checked)} /> - {platformAwareKeystrokes('Use /browse to load a web page')} - - setEnableReactTool(event.target.checked)} /> Enables loadURL() in ReAct diff --git a/src/modules/browse/store-module-browsing.tsx b/src/modules/browse/store-module-browsing.tsx index 8a0a2f93d..2dcc1c726 100644 --- a/src/modules/browse/store-module-browsing.tsx +++ b/src/modules/browse/store-module-browsing.tsx @@ -15,9 +15,6 @@ interface BrowseState { pageTransform: BrowsePageTransform; setPageTransform: (transform: BrowsePageTransform) => void; - enableCommandBrowse: boolean; - setEnableCommandBrowse: (value: boolean) => void; - enableComposerAttach: boolean; setEnableComposerAttach: (value: boolean) => void; @@ -39,9 +36,6 @@ export const useBrowseStore = create()( pageTransform: 'text', setPageTransform: (pageTransform: BrowsePageTransform) => set(() => ({ pageTransform })), - enableCommandBrowse: true, - setEnableCommandBrowse: (enableCommandBrowse: boolean) => set(() => ({ enableCommandBrowse })), - enableComposerAttach: true, setEnableComposerAttach: (enableComposerAttach: boolean) => set(() => ({ enableComposerAttach })), @@ -64,7 +58,7 @@ export function useBrowseCapability(): CapabilityBrowsing { const isServerConfig = getBackendCapabilities().hasBrowsing; // external client state - const { wssEndpoint, enableCommandBrowse, enableComposerAttach, enableReactTool, enablePersonaTool } = useBrowseStore(); + const { wssEndpoint, enableComposerAttach, enableReactTool, enablePersonaTool } = useBrowseStore(); // derived state const isClientConfig = !!wssEndpoint; @@ -76,7 +70,6 @@ export function useBrowseCapability(): CapabilityBrowsing { isServerConfig, isClientConfig, isClientValid, - inCommand: mayWork && enableCommandBrowse, inComposer: mayWork && enableComposerAttach, inReact: mayWork && enableReactTool, inPersonas: mayWork && enablePersonaTool,