mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* 🤖 Assistants V2 Support: Part 1 - Separated Azure Assistants to its own endpoint - File Search / Vector Store integration is incomplete, but can toggle and use storage from playground - Code Interpreter resource files can be added but not deleted - GPT-4o is supported - Many improvements to the Assistants Endpoint overall data-provider v2 changes copy existing route as v1 chore: rename new endpoint to reduce comparison operations and add new azure filesource api: add azureAssistants part 1 force use of version for assistants/assistantsAzure chore: switch name back to azureAssistants refactor type version: string | number Ensure assistants endpoints have version set fix: isArchived type issue in ConversationListParams refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure chore: FilePreview component ExtendedFile type assertion feat: isAssistantsEndpoint helper chore: remove unused useGenerations chore(buildTree): type issue chore(Advanced): type issue (unused component, maybe in future) first pass for multi-assistant endpoint rewrite fix(listAssistants): pass params correctly feat: list separate assistants by endpoint fix(useTextarea): access assistantMap correctly fix: assistant endpoint switching, resetting ID fix: broken during rewrite, selecting assistant mention fix: set/invalidate assistants endpoint query data correctly feat: Fix issue with assistant ID not being reset correctly getOpenAIClient helper function feat: add toast for assistant deletion fix: assistants delete right after create issue for azure fix: assistant patching refactor: actions to use getOpenAIClient refactor: consolidate logic into helpers file fix: issue where conversation data was not initially available v1 chat support refactor(spendTokens): only early return if completionTokens isNaN fix(OpenAIClient): ensure spendTokens has all necessary params refactor: route/controller logic fix(assistants/initializeClient): use defaultHeaders field fix: sanitize default operation id chore: bump openai package first pass v2 action service feat: retroactive domain parsing for actions added via v1 feat: delete db records of actions/assistants on openai assistant deletion chore: remove vision tools from v2 assistants feat: v2 upload and delete assistant vision images WIP first pass, thread attachments fix: show assistant vision files (save local/firebase copy) v2 image continue fix: annotations fix: refine annotations show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool fix: abort run, undefined endpoint issue refactor: consolidate capabilities logic and anticipate versioning frontend version 2 changes fix: query selection and filter add endpoint to unknown filepath add file ids to resource, deleting in progress enable/disable file search remove version log * 🤖 Assistants V2 Support: Part 2 🎹 fix: Autocompletion Chrome Bug on Action API Key Input chore: remove `useOriginNavigate` chore: set correct OpenAI Storage Source fix: azure file deletions, instantiate clients by source for deletion update code interpret files info feat: deleteResourceFileId chore: increase poll interval as azure easily rate limits fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records file source icons update table file filters chore: file search info and versioning fix: retrieval update with necessary tool_resources if specified fix(useMentions): add optional chaining in case listMap value is undefined fix: force assistant avatar roundedness fix: azure assistants, check correct flag chore: bump data-provider * fix: merge conflict * ci: fix backend tests due to new updates * chore: update .env.example * meilisearch improvements * localization updates * chore: update comparisons * feat: add additional metadata: endpoint, author ID * chore: azureAssistants ENDPOINTS exclusion warning
167 lines
5.9 KiB
TypeScript
167 lines
5.9 KiB
TypeScript
import { useRecoilState } from 'recoil';
|
|
import { useForm } from 'react-hook-form';
|
|
import { memo, useCallback, useRef, useMemo } from 'react';
|
|
import {
|
|
supportsFiles,
|
|
mergeFileConfig,
|
|
isAssistantsEndpoint,
|
|
fileConfig as defaultFileConfig,
|
|
} from 'librechat-data-provider';
|
|
import { useChatContext, useAssistantsMapContext } from '~/Providers';
|
|
import { useRequiresKey, useTextarea } from '~/hooks';
|
|
import { TextareaAutosize } from '~/components/ui';
|
|
import { useGetFileConfig } from '~/data-provider';
|
|
import { cn, removeFocusOutlines } from '~/utils';
|
|
import AttachFile from './Files/AttachFile';
|
|
import { mainTextareaId } from '~/common';
|
|
import StopButton from './StopButton';
|
|
import SendButton from './SendButton';
|
|
import FileRow from './Files/FileRow';
|
|
import Mention from './Mention';
|
|
import store from '~/store';
|
|
|
|
const ChatForm = ({ index = 0 }) => {
|
|
const submitButtonRef = useRef<HTMLButtonElement>(null);
|
|
const textAreaRef = useRef<HTMLTextAreaElement | null>(null);
|
|
const [showStopButton, setShowStopButton] = useRecoilState(store.showStopButtonByIndex(index));
|
|
const [showMentionPopover, setShowMentionPopover] = useRecoilState(
|
|
store.showMentionPopoverFamily(index),
|
|
);
|
|
const { requiresKey } = useRequiresKey();
|
|
|
|
const methods = useForm<{ text: string }>({
|
|
defaultValues: { text: '' },
|
|
});
|
|
|
|
const { handlePaste, handleKeyDown, handleKeyUp, handleCompositionStart, handleCompositionEnd } =
|
|
useTextarea({
|
|
textAreaRef,
|
|
submitButtonRef,
|
|
disabled: !!requiresKey,
|
|
});
|
|
|
|
const {
|
|
ask,
|
|
files,
|
|
setFiles,
|
|
conversation,
|
|
isSubmitting,
|
|
filesLoading,
|
|
setFilesLoading,
|
|
handleStopGenerating,
|
|
} = useChatContext();
|
|
|
|
const assistantMap = useAssistantsMapContext();
|
|
|
|
const submitMessage = useCallback(
|
|
(data?: { text: string }) => {
|
|
if (!data) {
|
|
return console.warn('No data provided to submitMessage');
|
|
}
|
|
ask({ text: data.text });
|
|
methods.reset();
|
|
},
|
|
[ask, methods],
|
|
);
|
|
|
|
const { endpoint: _endpoint, endpointType } = conversation ?? { endpoint: null };
|
|
const endpoint = endpointType ?? _endpoint;
|
|
|
|
const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
|
|
select: (data) => mergeFileConfig(data),
|
|
});
|
|
|
|
const endpointFileConfig = fileConfig.endpoints[endpoint ?? ''];
|
|
const invalidAssistant = useMemo(
|
|
() =>
|
|
isAssistantsEndpoint(conversation?.endpoint) &&
|
|
(!conversation?.assistant_id ||
|
|
!assistantMap?.[conversation?.endpoint ?? '']?.[conversation?.assistant_id ?? '']),
|
|
[conversation?.assistant_id, conversation?.endpoint, assistantMap],
|
|
);
|
|
const disableInputs = useMemo(
|
|
() => !!(requiresKey || invalidAssistant),
|
|
[requiresKey, invalidAssistant],
|
|
);
|
|
|
|
const { ref, ...registerProps } = methods.register('text', {
|
|
required: true,
|
|
onChange: (e) => {
|
|
methods.setValue('text', e.target.value);
|
|
},
|
|
});
|
|
|
|
return (
|
|
<form
|
|
onSubmit={methods.handleSubmit((data) => submitMessage(data))}
|
|
className="stretch mx-2 flex flex-row gap-3 last:mb-2 md:mx-4 md:last:mb-6 lg:mx-auto lg:max-w-2xl xl:max-w-3xl"
|
|
>
|
|
<div className="relative flex h-full flex-1 items-stretch md:flex-col">
|
|
<div className="flex w-full items-center">
|
|
{showMentionPopover && (
|
|
<Mention setShowMentionPopover={setShowMentionPopover} textAreaRef={textAreaRef} />
|
|
)}
|
|
<div className="bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border dark:border-gray-600 dark:text-white [&:has(textarea:focus)]:border-gray-300 [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)] dark:[&:has(textarea:focus)]:border-gray-500">
|
|
<FileRow
|
|
files={files}
|
|
setFiles={setFiles}
|
|
setFilesLoading={setFilesLoading}
|
|
Wrapper={({ children }) => (
|
|
<div className="mx-2 mt-2 flex flex-wrap gap-2 px-2.5 md:pl-0 md:pr-4">
|
|
{children}
|
|
</div>
|
|
)}
|
|
/>
|
|
{endpoint && (
|
|
<TextareaAutosize
|
|
{...registerProps}
|
|
autoFocus
|
|
ref={(e) => {
|
|
ref(e);
|
|
textAreaRef.current = e;
|
|
}}
|
|
disabled={disableInputs}
|
|
onPaste={handlePaste}
|
|
onKeyDown={handleKeyDown}
|
|
onKeyUp={handleKeyUp}
|
|
onCompositionStart={handleCompositionStart}
|
|
onCompositionEnd={handleCompositionEnd}
|
|
id={mainTextareaId}
|
|
tabIndex={0}
|
|
data-testid="text-input"
|
|
style={{ height: 44, overflowY: 'auto' }}
|
|
rows={1}
|
|
className={cn(
|
|
supportsFiles[endpointType ?? endpoint ?? ''] && !endpointFileConfig?.disabled
|
|
? ' pl-10 md:pl-[55px]'
|
|
: 'pl-3 md:pl-4',
|
|
'm-0 w-full resize-none border-0 bg-transparent py-[10px] pr-10 placeholder-black/50 focus:ring-0 focus-visible:ring-0 dark:bg-transparent dark:placeholder-white/50 md:py-3.5 md:pr-12 ',
|
|
removeFocusOutlines,
|
|
'max-h-[65vh] md:max-h-[75vh]',
|
|
)}
|
|
/>
|
|
)}
|
|
<AttachFile
|
|
endpoint={_endpoint ?? ''}
|
|
endpointType={endpointType}
|
|
disabled={disableInputs}
|
|
/>
|
|
{isSubmitting && showStopButton ? (
|
|
<StopButton stop={handleStopGenerating} setShowStopButton={setShowStopButton} />
|
|
) : (
|
|
endpoint && (
|
|
<SendButton
|
|
ref={submitButtonRef}
|
|
control={methods.control}
|
|
disabled={!!(filesLoading || isSubmitting || disableInputs)}
|
|
/>
|
|
)
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default memo(ChatForm);
|