WIP: Update UI to match Official Style; Vision and Assistants 👷🏽 (#1190)

* wip: initial client side code

* wip: initial api code

* refactor: export query keys from own module, export assistant hooks

* refactor(SelectDropDown): more customization via props

* feat: create Assistant and render real Assistants

* refactor: major refactor of UI components to allow multi-chat, working alongside CreationPanel

* refactor: move assistant routes to own directory

* fix(CreationHeader): state issue with assistant select

* refactor: style changes for form, fix setSiblingIdx from useChatHelpers to use latestMessageParentId, fix render issue with ChatView and change location

* feat: parseCompactConvo: begin refactor of slimmer JSON payloads between client/api

* refactor(endpoints): add assistant endpoint, also use EModelEndpoint as much as possible

* refactor(useGetConversationsQuery): use object to access query data easily

* fix(MultiMessage): react warning of bad state set, making use of effect during render (instead of useEffect)

* fix(useNewConvo): use correct atom key (index instead of convoId) for reset latestMessageFamily

* refactor: make routing navigation/conversation change simpler

* chore: add removeNullishValues for smaller payloads, remove unused fields, setup frontend pinging of assistant endpoint

* WIP: initial complete assistant run handling

* fix: CreationPanel form correctly setting internal state

* refactor(api/assistants/chat): revise functions to working run handling strategy

* refactor(UI): initial major refactor of ChatForm and options

* feat: textarea hook

* refactor: useAuthRedirect hook and change directory name

* feat: add ChatRoute (/c/), make optionsBar absolute and change on textarea height, add temp header

* feat: match new toggle Nav open button to ChatGPT's

* feat: add OpenAI custom classnames

* feat: useOriginNavigate

* feat: messages loading view

* fix: conversation navigation and effects

* refactor: make toggle change nav opacity

* WIP: new endpoint menu

* feat: NewEndpointsMenu complete

* fix: ensure set key dialog shows on endpoint change, and new conversation resets messages

* WIP: textarea styling fix, add temp footer, create basic file handling component

* feat: image file handling (UI)

* feat: PopOver and ModelSelect in Header, remove GenButtons

* feat: drop file handling

* refactor: bug fixes
use SSE at route level
add opts to useOriginNavigate
delay render of unfinishedMessage to avoid flickering
pass params (convoId) to chatHelpers to set messages query data based on param when the route is new (fixes can't continue convo on /new/)
style(MessagesView): matches height to official
fix(SSE): pass paramId and invalidate convos
style(Message): make bg uniform

* refactor(useSSE): setStorage within setConversation updates

* feat: conversationKeysAtom, allConversationsSelector, update convos query data on created message (if new), correctly handle convo deletion (individual)

* feat: add popover select dropdowns to allow options in header while allowing horizontal scroll for mobile

* style(pluginsSelect): styling changes

* refactor(NewEndpointsMenu): make UI components modular

* feat: Presets complete

* fix: preset editing, make by index

* fix: conversations not setting on inital navigation, fix getMessages() based on query param

* fix: changing preset no longer resets latestMessage

* feat: useOnClickOutside for OptionsPopover and fix bug that causes selection of preset when deleting

* fix: revert /chat/ switchToConvo, also use NewDeleteButton in Convo

* fix: Popover correctly closes on close Popover button using custom condition for useOnClickOutside

* style: new message and nav styling

* style: hover/sibling buttons and preset menu scrolling

* feat: new convo header button

* style(Textarea): minor style changes to textarea buttons

* feat: stop/continue generating and hide hoverbuttons when submitting

* feat: compact AI Provider schemas to make json payloads and db saves smaller

* style: styling changes for consistency on chat route

* fix: created usePresetIndexOptions to prevent bugs between /c/ and /chat/ routes when editing presets, removed redundant code from the new dialog

* chore: make /chat/ route default for now since we still lack full image support

client/src/components/Endpoints/EndpointOptionsPopover.tsx

@@ -1,26 +1,28 @@
-import React from 'react';
 import { Save } from 'lucide-react';
-import { EModelEndpoint } from 'librechat-data-provider';
-import { Button } from '~/components/ui';
-import { CrossIcon } from '~/components/svg';
-import PopoverButtons from './PopoverButtons';
+import type { ReactNode } from 'react';
+// import { EModelEndpoint } from 'librechat-data-provider';
 import { cn, removeFocusOutlines } from '~/utils';
+// import PopoverButtons from './PopoverButtons';
+import { CrossIcon } from '~/components/svg';
+import { Button } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 
 type TEndpointOptionsPopoverProps = {
-  children: React.ReactNode;
+  children: ReactNode;
   visible: boolean;
-  endpoint: EModelEndpoint;
+  // endpoint: EModelEndpoint;
   saveAsPreset: () => void;
   closePopover: () => void;
+  PopoverButtons: ReactNode;
 };
 
 export default function EndpointOptionsPopover({
   children,
-  endpoint,
+  // endpoint,
   visible,
   saveAsPreset,
   closePopover,
+  PopoverButtons,
 }: TEndpointOptionsPopoverProps) {
   const localize = useLocalize();
   const cardStyle =
@@ -49,7 +51,7 @@ export default function EndpointOptionsPopover({
               <Save className="mr-1 w-[14px]" />
               {localize('com_endpoint_save_as_preset')}
             </Button>
-            <PopoverButtons endpoint={endpoint} />
+            {PopoverButtons}
             <Button
               type="button"
               className={cn(

client/src/components/Endpoints/EndpointSettings.tsx

@@ -1,36 +1,25 @@
 import { useRecoilValue } from 'recoil';
-import { OpenAISettings, BingAISettings, AnthropicSettings } from './Settings';
-import { GoogleSettings, PluginsSettings } from './Settings/MultiView';
-import type { TSettingsProps, TModelSelectProps, TBaseSettingsProps, TModels } from '~/common';
+import type { TSettingsProps } from '~/common';
+import { getSettings } from './Settings';
 import { cn } from '~/utils';
 import store from '~/store';
 
-const optionComponents: { [key: string]: React.FC<TModelSelectProps> } = {
-  openAI: OpenAISettings,
-  azureOpenAI: OpenAISettings,
-  bingAI: BingAISettings,
-  anthropic: AnthropicSettings,
-};
-
-const multiViewComponents: { [key: string]: React.FC<TBaseSettingsProps & TModels> } = {
-  google: GoogleSettings,
-  gptPlugins: PluginsSettings,
-};
-
 export default function Settings({
   conversation,
   setOption,
   isPreset = false,
   className = '',
-}: TSettingsProps) {
+  isMultiChat = false,
+}: TSettingsProps & { isMultiChat?: boolean }) {
   const modelsConfig = useRecoilValue(store.modelsConfig);
   if (!conversation?.endpoint) {
     return null;
   }
 
+  const { settings, multiViewSettings } = getSettings(isMultiChat);
   const { endpoint } = conversation;
   const models = modelsConfig?.[endpoint] ?? [];
-  const OptionComponent = optionComponents[endpoint];
+  const OptionComponent = settings[endpoint];
 
   if (OptionComponent) {
     return (
@@ -45,7 +34,7 @@ export default function Settings({
     );
   }
 
-  const MultiViewComponent = multiViewComponents[endpoint];
+  const MultiViewComponent = multiViewSettings[endpoint];
 
   if (!MultiViewComponent) {
     return null;

client/src/components/Endpoints/Icon.tsx

@@ -1,8 +1,8 @@
-import React from 'react';
+import { EModelEndpoint } from 'librechat-data-provider';
 import { Plugin, GPTIcon, AnthropicIcon, AzureMinimalIcon } from '~/components/svg';
 import { useAuthContext } from '~/hooks';
-import { cn } from '~/utils';
 import { IconProps } from '~/common';
+import { cn } from '~/utils';
 
 const Icon: React.FC<IconProps> = (props) => {
   const { size = 30, isCreatedByUser, button, model = true, endpoint, error, jailbreak } = props;
@@ -19,7 +19,7 @@ const Icon: React.FC<IconProps> = (props) => {
           width: size,
           height: size,
         }}
-        className={`relative flex items-center justify-center ${props.className ?? ''}`}
+        className={cn('relative flex items-center justify-center', props.className ?? '')}
       >
         <img
           className="rounded-sm"
@@ -33,12 +33,12 @@ const Icon: React.FC<IconProps> = (props) => {
     );
   } else {
     const endpointIcons = {
-      azureOpenAI: {
+      [EModelEndpoint.azureOpenAI]: {
         icon: <AzureMinimalIcon size={size * 0.5555555555555556} />,
         bg: 'linear-gradient(0.375turn, #61bde2, #4389d0)',
         name: 'ChatGPT',
       },
-      openAI: {
+      [EModelEndpoint.openAI]: {
         icon: <GPTIcon size={size * 0.5555555555555556} />,
         bg:
           typeof model === 'string' && model.toLowerCase().includes('gpt-4')
@@ -46,18 +46,21 @@ const Icon: React.FC<IconProps> = (props) => {
             : '#19C37D',
         name: 'ChatGPT',
       },
-      gptPlugins: {
+      [EModelEndpoint.gptPlugins]: {
         icon: <Plugin size={size * 0.7} />,
         bg: `rgba(69, 89, 164, ${button ? 0.75 : 1})`,
         name: 'Plugins',
       },
-      google: { icon: <img src="/assets/google-palm.svg" alt="Palm Icon" />, name: 'PaLM2' },
-      anthropic: {
+      [EModelEndpoint.google]: {
+        icon: <img src="/assets/google-palm.svg" alt="Palm Icon" />,
+        name: 'PaLM2',
+      },
+      [EModelEndpoint.anthropic]: {
         icon: <AnthropicIcon size={size * 0.5555555555555556} />,
         bg: '#d09a74',
         name: 'Claude',
       },
-      bingAI: {
+      [EModelEndpoint.bingAI]: {
         icon: jailbreak ? (
           <img src="/assets/bingai-jb.png" alt="Bing Icon" />
         ) : (
@@ -65,7 +68,7 @@ const Icon: React.FC<IconProps> = (props) => {
         ),
         name: jailbreak ? 'Sydney' : 'BingAI',
       },
-      chatGPTBrowser: {
+      [EModelEndpoint.chatGPTBrowser]: {
         icon: <GPTIcon size={size * 0.5555555555555556} />,
         bg:
           typeof model === 'string' && model.toLowerCase().includes('gpt-4')

client/src/components/Endpoints/MinimalIcon.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import { EModelEndpoint } from 'librechat-data-provider';
 import {
   AzureMinimalIcon,
   OpenAIMinimalIcon,
@@ -21,13 +21,19 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
   }
 
   const endpointIcons = {
-    azureOpenAI: { icon: <AzureMinimalIcon />, name: props.chatGptLabel || 'ChatGPT' },
-    openAI: { icon: <OpenAIMinimalIcon />, name: props.chatGptLabel || 'ChatGPT' },
-    gptPlugins: { icon: <PluginMinimalIcon />, name: 'Plugins' },
-    google: { icon: <PaLMinimalIcon />, name: props.modelLabel || 'PaLM2' },
-    anthropic: { icon: <AnthropicMinimalIcon />, name: props.modelLabel || 'Claude' },
-    bingAI: { icon: <BingAIMinimalIcon />, name: 'BingAI' },
-    chatGPTBrowser: { icon: <ChatGPTMinimalIcon />, name: 'ChatGPT' },
+    [EModelEndpoint.azureOpenAI]: {
+      icon: <AzureMinimalIcon />,
+      name: props.chatGptLabel || 'ChatGPT',
+    },
+    [EModelEndpoint.openAI]: { icon: <OpenAIMinimalIcon />, name: props.chatGptLabel || 'ChatGPT' },
+    [EModelEndpoint.gptPlugins]: { icon: <PluginMinimalIcon />, name: 'Plugins' },
+    [EModelEndpoint.google]: { icon: <PaLMinimalIcon />, name: props.modelLabel || 'PaLM2' },
+    [EModelEndpoint.anthropic]: {
+      icon: <AnthropicMinimalIcon />,
+      name: props.modelLabel || 'Claude',
+    },
+    [EModelEndpoint.bingAI]: { icon: <BingAIMinimalIcon />, name: 'BingAI' },
+    [EModelEndpoint.chatGPTBrowser]: { icon: <ChatGPTMinimalIcon />, name: 'ChatGPT' },
     default: { icon: <OpenAIMinimalIcon />, name: 'UNKNOWN' },
   };
 

client/src/components/Endpoints/Settings/MultiView/GoogleSettings.tsx

@@ -0,0 +1,27 @@
+import Settings from '../Google';
+import Examples from '../Examples';
+import { useSetIndexOptions } from '~/hooks';
+import { useChatContext } from '~/Providers';
+
+export default function GoogleView({ conversation, models, isPreset = false }) {
+  const { optionSettings } = useChatContext();
+  const { setOption, setExample, addExample, removeExample } = useSetIndexOptions(
+    isPreset ? conversation : null,
+  );
+  if (!conversation) {
+    return null;
+  }
+
+  const { examples } = conversation;
+  const { showExamples, isCodeChat } = optionSettings;
+  return showExamples && !isCodeChat ? (
+    <Examples
+      examples={examples ?? []}
+      setExample={setExample}
+      addExample={addExample}
+      removeExample={removeExample}
+    />
+  ) : (
+    <Settings conversation={conversation} setOption={setOption} models={models} />
+  );
+}

client/src/components/Endpoints/Settings/MultiView/PluginSettings.tsx

@@ -0,0 +1,18 @@
+import Settings from '../Plugins';
+import AgentSettings from '../AgentSettings';
+import { useSetIndexOptions } from '~/hooks';
+import { useChatContext } from '~/Providers';
+
+export default function PluginsView({ conversation, models, isPreset = false }) {
+  const { showAgentSettings } = useChatContext();
+  const { setOption, setAgentOption } = useSetIndexOptions(isPreset ? conversation : null);
+  if (!conversation) {
+    return null;
+  }
+
+  return showAgentSettings ? (
+    <AgentSettings conversation={conversation} setOption={setAgentOption} models={models} />
+  ) : (
+    <Settings conversation={conversation} setOption={setOption} models={models} />
+  );
+}

client/src/components/Endpoints/Settings/MultiView/index.ts

@@ -1,2 +1,4 @@
-export { default as GoogleSettings } from './Google';
-export { default as PluginsSettings } from './Plugins';
+export { default as Google } from './Google';
+export { default as Plugins } from './Plugins';
+export { default as GoogleSettings } from './GoogleSettings';
+export { default as PluginSettings } from './PluginSettings';

client/src/components/Endpoints/Settings/OpenAI.tsx

@@ -67,6 +67,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
                 placeholder={localize('com_endpoint_openai_custom_name_placeholder')}
                 className={cn(
                   defaultTextProps,
+                  'dark:bg-gray-700 dark:hover:bg-gray-700/60 dark:focus:bg-gray-700',
                   'flex h-10 max-h-10 w-full resize-none px-3 py-2',
                   removeFocusOutlines,
                 )}
@@ -85,6 +86,7 @@ export default function Settings({ conversation, setOption, models, readonly }:
                 placeholder={localize('com_endpoint_openai_prompt_prefix_placeholder')}
                 className={cn(
                   defaultTextProps,
+                  'dark:bg-gray-700 dark:hover:bg-gray-700/60 dark:focus:bg-gray-700',
                   'flex max-h-[300px] min-h-[100px] w-full resize-none px-3 py-2 ',
                 )}
               />

client/src/components/Endpoints/Settings/index.ts

@@ -5,3 +5,4 @@ export { default as PluginsSettings } from './Plugins';
 export { default as Examples } from './Examples';
 export { default as AgentSettings } from './AgentSettings';
 export { default as AnthropicSettings } from './Anthropic';
+export * from './settings';

client/src/components/Endpoints/Settings/settings.ts

@@ -0,0 +1,36 @@
+import { EModelEndpoint } from 'librechat-data-provider';
+import OpenAISettings from './OpenAI';
+import BingAISettings from './BingAI';
+import AnthropicSettings from './Anthropic';
+import { Google, Plugins, GoogleSettings, PluginSettings } from './MultiView';
+import type { FC } from 'react';
+import type { TModelSelectProps, TBaseSettingsProps, TModels } from '~/common';
+
+const settings: { [key: string]: FC<TModelSelectProps> } = {
+  [EModelEndpoint.openAI]: OpenAISettings,
+  [EModelEndpoint.azureOpenAI]: OpenAISettings,
+  [EModelEndpoint.bingAI]: BingAISettings,
+  [EModelEndpoint.anthropic]: AnthropicSettings,
+};
+
+const multiViewSettings: { [key: string]: FC<TBaseSettingsProps & TModels> } = {
+  [EModelEndpoint.google]: Google,
+  [EModelEndpoint.gptPlugins]: Plugins,
+};
+
+export const getSettings = (isMultiChat = false) => {
+  if (!isMultiChat) {
+    return {
+      settings,
+      multiViewSettings,
+    };
+  }
+
+  return {
+    settings,
+    multiViewSettings: {
+      [EModelEndpoint.google]: GoogleSettings,
+      [EModelEndpoint.gptPlugins]: PluginSettings,
+    },
+  };
+};

client/src/components/Endpoints/index.ts

@@ -1,5 +1,6 @@
 export { default as Icon } from './Icon';
 export { default as MinimalIcon } from './MinimalIcon';
+export { default as PopoverButtons } from './PopoverButtons';
 export { default as EndpointSettings } from './EndpointSettings';
 export { default as EditPresetDialog } from './EditPresetDialog';
 export { default as SaveAsPresetDialog } from './SaveAsPresetDialog';