mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-06 18:48:50 +01: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
210 lines
6.2 KiB
TypeScript
210 lines
6.2 KiB
TypeScript
import { useCallback } from 'react';
|
|
import { useRecoilValue } from 'recoil';
|
|
import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';
|
|
import type {
|
|
TPreset,
|
|
TModelSpec,
|
|
TConversation,
|
|
TAssistantsMap,
|
|
TEndpointsConfig,
|
|
} from 'librechat-data-provider';
|
|
import type { MentionOption } from '~/common';
|
|
import { getConvoSwitchLogic, getModelSpecIconURL, removeUnavailableTools } from '~/utils';
|
|
import { useDefaultConvo, useNewConvo } from '~/hooks';
|
|
import { useChatContext } from '~/Providers';
|
|
import store from '~/store';
|
|
|
|
export default function useSelectMention({
|
|
presets,
|
|
modelSpecs,
|
|
endpointsConfig,
|
|
assistantMap,
|
|
}: {
|
|
presets?: TPreset[];
|
|
modelSpecs: TModelSpec[];
|
|
endpointsConfig: TEndpointsConfig;
|
|
assistantMap: TAssistantsMap;
|
|
}) {
|
|
const { conversation } = useChatContext();
|
|
const { newConversation } = useNewConvo();
|
|
const getDefaultConversation = useDefaultConvo();
|
|
const modularChat = useRecoilValue(store.modularChat);
|
|
const availableTools = useRecoilValue(store.availableTools);
|
|
|
|
const onSelectSpec = useCallback(
|
|
(spec?: TModelSpec) => {
|
|
if (!spec) {
|
|
return;
|
|
}
|
|
const { preset } = spec;
|
|
preset.iconURL = getModelSpecIconURL(spec);
|
|
preset.spec = spec.name;
|
|
const { endpoint: newEndpoint } = preset;
|
|
if (!newEndpoint) {
|
|
return;
|
|
}
|
|
|
|
const {
|
|
shouldSwitch,
|
|
isNewModular,
|
|
isCurrentModular,
|
|
isExistingConversation,
|
|
newEndpointType,
|
|
template,
|
|
} = getConvoSwitchLogic({
|
|
newEndpoint,
|
|
modularChat,
|
|
conversation,
|
|
endpointsConfig,
|
|
});
|
|
|
|
if (isExistingConversation && isCurrentModular && isNewModular && shouldSwitch) {
|
|
template.endpointType = newEndpointType as EModelEndpoint | undefined;
|
|
|
|
const currentConvo = getDefaultConversation({
|
|
/* target endpointType is necessary to avoid endpoint mixing */
|
|
conversation: { ...(conversation ?? {}), endpointType: template.endpointType },
|
|
preset: template,
|
|
});
|
|
|
|
/* We don't reset the latest message, only when changing settings mid-converstion */
|
|
newConversation({ template: currentConvo, preset, keepLatestMessage: true });
|
|
return;
|
|
}
|
|
|
|
newConversation({ template: { ...(template as Partial<TConversation>) }, preset });
|
|
},
|
|
[conversation, getDefaultConversation, modularChat, newConversation, endpointsConfig],
|
|
);
|
|
|
|
type Kwargs = {
|
|
model?: string;
|
|
assistant_id?: string;
|
|
};
|
|
|
|
const onSelectEndpoint = useCallback(
|
|
(newEndpoint?: EModelEndpoint | string | null, kwargs: Kwargs = {}) => {
|
|
if (!newEndpoint) {
|
|
return;
|
|
}
|
|
|
|
const {
|
|
shouldSwitch,
|
|
isNewModular,
|
|
isCurrentModular,
|
|
isExistingConversation,
|
|
newEndpointType,
|
|
template,
|
|
} = getConvoSwitchLogic({
|
|
newEndpoint,
|
|
modularChat,
|
|
conversation,
|
|
endpointsConfig,
|
|
});
|
|
|
|
if (kwargs.model) {
|
|
template.model = kwargs.model;
|
|
}
|
|
|
|
if (kwargs.assistant_id) {
|
|
template.assistant_id = kwargs.assistant_id;
|
|
}
|
|
|
|
if (isExistingConversation && isCurrentModular && isNewModular && shouldSwitch) {
|
|
template.endpointType = newEndpointType;
|
|
|
|
const currentConvo = getDefaultConversation({
|
|
/* target endpointType is necessary to avoid endpoint mixing */
|
|
conversation: { ...(conversation ?? {}), endpointType: template.endpointType },
|
|
preset: template,
|
|
});
|
|
|
|
/* We don't reset the latest message, only when changing settings mid-converstion */
|
|
newConversation({ template: currentConvo, preset: currentConvo, keepLatestMessage: true });
|
|
return;
|
|
}
|
|
|
|
newConversation({
|
|
template: { ...(template as Partial<TConversation>) },
|
|
preset: { ...kwargs, endpoint: newEndpoint },
|
|
});
|
|
},
|
|
[conversation, getDefaultConversation, modularChat, newConversation, endpointsConfig],
|
|
);
|
|
|
|
const onSelectPreset = useCallback(
|
|
(_newPreset?: TPreset) => {
|
|
if (!_newPreset) {
|
|
return;
|
|
}
|
|
|
|
const newPreset = removeUnavailableTools(_newPreset, availableTools);
|
|
const newEndpoint = newPreset.endpoint ?? '';
|
|
|
|
const {
|
|
shouldSwitch,
|
|
isNewModular,
|
|
isCurrentModular,
|
|
isExistingConversation,
|
|
newEndpointType,
|
|
template,
|
|
} = getConvoSwitchLogic({
|
|
newEndpoint,
|
|
modularChat,
|
|
conversation,
|
|
endpointsConfig,
|
|
});
|
|
|
|
if (isExistingConversation && isCurrentModular && isNewModular && shouldSwitch) {
|
|
template.endpointType = newEndpointType as EModelEndpoint | undefined;
|
|
|
|
const currentConvo = getDefaultConversation({
|
|
/* target endpointType is necessary to avoid endpoint mixing */
|
|
conversation: { ...(conversation ?? {}), endpointType: template.endpointType },
|
|
preset: template,
|
|
});
|
|
|
|
/* We don't reset the latest message, only when changing settings mid-converstion */
|
|
newConversation({ template: currentConvo, preset: newPreset, keepLatestMessage: true });
|
|
return;
|
|
}
|
|
|
|
newConversation({ preset: newPreset });
|
|
},
|
|
[
|
|
availableTools,
|
|
conversation,
|
|
getDefaultConversation,
|
|
modularChat,
|
|
newConversation,
|
|
endpointsConfig,
|
|
],
|
|
);
|
|
|
|
const onSelectMention = useCallback(
|
|
(option: MentionOption) => {
|
|
const key = option.value;
|
|
if (option.type === 'preset') {
|
|
const preset = presets?.find((p) => p.presetId === key);
|
|
onSelectPreset(preset);
|
|
} else if (option.type === 'modelSpec') {
|
|
const modelSpec = modelSpecs.find((spec) => spec.name === key);
|
|
onSelectSpec(modelSpec);
|
|
} else if (option.type === 'model') {
|
|
onSelectEndpoint(key, { model: option.label });
|
|
} else if (option.type === 'endpoint') {
|
|
onSelectEndpoint(key);
|
|
} else if (isAssistantsEndpoint(option.type)) {
|
|
onSelectEndpoint(option.type, {
|
|
assistant_id: key,
|
|
model: assistantMap?.[option.type]?.[key]?.model ?? '',
|
|
});
|
|
}
|
|
},
|
|
[modelSpecs, onSelectEndpoint, onSelectPreset, onSelectSpec, presets, assistantMap],
|
|
);
|
|
|
|
return {
|
|
onSelectMention,
|
|
};
|
|
}
|