mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-12 20:44:24 +01:00
🤖 feat: OpenAI Assistants v2 (initial support) (#2781)
* 🤖 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
This commit is contained in:
Danny Avila
GitHub
parent
af8bcb08d6
commit
1a452121fa
158 changed files with 4184 additions and 1204 deletions
|
|
@ -1,4 +1,9 @@
|
|||
import { EModelEndpoint, QueryKeys, dataService, defaultOrderQuery } from 'librechat-data-provider';
|
||||
import {
|
||||
QueryKeys,
|
||||
dataService,
|
||||
defaultOrderQuery,
|
||||
defaultAssistantsVersion,
|
||||
} from 'librechat-data-provider';
|
||||
import { useQuery, useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
|
||||
import type {
|
||||
UseInfiniteQueryOptions,
|
||||
|
|
@ -194,43 +199,46 @@ export const useSharedLinksInfiniteQuery = (
|
|||
/**
|
||||
* Hook for getting all available tools for Assistants
|
||||
*/
|
||||
export const useAvailableToolsQuery = (): QueryObserverResult<TPlugin[]> => {
|
||||
export const useAvailableToolsQuery = (
|
||||
endpoint: t.AssistantsEndpoint,
|
||||
): QueryObserverResult<TPlugin[]> => {
|
||||
const queryClient = useQueryClient();
|
||||
const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([
|
||||
QueryKeys.name,
|
||||
EModelEndpoint.assistants,
|
||||
]);
|
||||
const userProvidesKey = !!endpointsConfig?.[EModelEndpoint.assistants]?.userProvide;
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([QueryKeys.name, endpoint]);
|
||||
const userProvidesKey = !!endpointsConfig?.[endpoint]?.userProvide;
|
||||
const keyProvided = userProvidesKey ? !!keyExpiry?.expiresAt : true;
|
||||
const enabled = !!endpointsConfig?.[EModelEndpoint.assistants] && keyProvided;
|
||||
return useQuery<TPlugin[]>([QueryKeys.tools], () => dataService.getAvailableTools(), {
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnMount: false,
|
||||
enabled,
|
||||
});
|
||||
const enabled = !!endpointsConfig?.[endpoint] && keyProvided;
|
||||
const version = endpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint];
|
||||
return useQuery<TPlugin[]>(
|
||||
[QueryKeys.tools],
|
||||
() => dataService.getAvailableTools(version, endpoint),
|
||||
{
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnMount: false,
|
||||
enabled,
|
||||
},
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Hook for listing all assistants, with optional parameters provided for pagination and sorting
|
||||
*/
|
||||
export const useListAssistantsQuery = <TData = AssistantListResponse>(
|
||||
params: AssistantListParams = defaultOrderQuery,
|
||||
endpoint: t.AssistantsEndpoint,
|
||||
params: Omit<AssistantListParams, 'endpoint'> = defaultOrderQuery,
|
||||
config?: UseQueryOptions<AssistantListResponse, unknown, TData>,
|
||||
): QueryObserverResult<TData> => {
|
||||
const queryClient = useQueryClient();
|
||||
const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([
|
||||
QueryKeys.name,
|
||||
EModelEndpoint.assistants,
|
||||
]);
|
||||
const userProvidesKey = !!endpointsConfig?.[EModelEndpoint.assistants]?.userProvide;
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([QueryKeys.name, endpoint]);
|
||||
const userProvidesKey = !!endpointsConfig?.[endpoint]?.userProvide;
|
||||
const keyProvided = userProvidesKey ? !!keyExpiry?.expiresAt : true;
|
||||
const enabled = !!endpointsConfig?.[EModelEndpoint.assistants] && keyProvided;
|
||||
const enabled = !!endpointsConfig?.[endpoint] && keyProvided;
|
||||
const version = endpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint];
|
||||
return useQuery<AssistantListResponse, unknown, TData>(
|
||||
[QueryKeys.assistants, params],
|
||||
() => dataService.listAssistants(params),
|
||||
[QueryKeys.assistants, endpoint, params],
|
||||
() => dataService.listAssistants({ ...params, endpoint }, version),
|
||||
{
|
||||
// Example selector to sort them by created_at
|
||||
// select: (res) => {
|
||||
|
|
@ -246,6 +254,7 @@ export const useListAssistantsQuery = <TData = AssistantListResponse>(
|
|||
);
|
||||
};
|
||||
|
||||
/*
|
||||
export const useListAssistantsInfiniteQuery = (
|
||||
params?: AssistantListParams,
|
||||
config?: UseInfiniteQueryOptions<AssistantListResponse, Error>,
|
||||
|
|
@ -275,26 +284,31 @@ export const useListAssistantsInfiniteQuery = (
|
|||
},
|
||||
);
|
||||
};
|
||||
*/
|
||||
|
||||
/**
|
||||
* Hook for retrieving details about a single assistant
|
||||
*/
|
||||
export const useGetAssistantByIdQuery = (
|
||||
endpoint: t.AssistantsEndpoint,
|
||||
assistant_id: string,
|
||||
config?: UseQueryOptions<Assistant>,
|
||||
): QueryObserverResult<Assistant> => {
|
||||
const queryClient = useQueryClient();
|
||||
const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([
|
||||
QueryKeys.name,
|
||||
EModelEndpoint.assistants,
|
||||
]);
|
||||
const userProvidesKey = !!endpointsConfig?.[EModelEndpoint.assistants]?.userProvide;
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([QueryKeys.name, endpoint]);
|
||||
const userProvidesKey = !!endpointsConfig?.[endpoint]?.userProvide;
|
||||
const keyProvided = userProvidesKey ? !!keyExpiry?.expiresAt : true;
|
||||
const enabled = !!endpointsConfig?.[EModelEndpoint.assistants] && keyProvided;
|
||||
const enabled = !!endpointsConfig?.[endpoint] && keyProvided;
|
||||
const version = endpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint];
|
||||
return useQuery<Assistant>(
|
||||
[QueryKeys.assistant, assistant_id],
|
||||
() => dataService.getAssistantById(assistant_id),
|
||||
() =>
|
||||
dataService.getAssistantById({
|
||||
endpoint,
|
||||
assistant_id,
|
||||
version,
|
||||
}),
|
||||
{
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
|
|
@ -311,43 +325,53 @@ export const useGetAssistantByIdQuery = (
|
|||
* Hook for retrieving user's saved Assistant Actions
|
||||
*/
|
||||
export const useGetActionsQuery = <TData = Action[]>(
|
||||
endpoint: t.AssistantsEndpoint,
|
||||
config?: UseQueryOptions<Action[], unknown, TData>,
|
||||
): QueryObserverResult<TData> => {
|
||||
const queryClient = useQueryClient();
|
||||
const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([
|
||||
QueryKeys.name,
|
||||
EModelEndpoint.assistants,
|
||||
]);
|
||||
const userProvidesKey = !!endpointsConfig?.[EModelEndpoint.assistants]?.userProvide;
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([QueryKeys.name, endpoint]);
|
||||
const userProvidesKey = !!endpointsConfig?.[endpoint]?.userProvide;
|
||||
const keyProvided = userProvidesKey ? !!keyExpiry?.expiresAt : true;
|
||||
const enabled = !!endpointsConfig?.[EModelEndpoint.assistants] && keyProvided;
|
||||
return useQuery<Action[], unknown, TData>([QueryKeys.actions], () => dataService.getActions(), {
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnMount: false,
|
||||
...config,
|
||||
enabled: config?.enabled !== undefined ? config?.enabled && enabled : enabled,
|
||||
});
|
||||
const enabled = !!endpointsConfig?.[endpoint] && keyProvided;
|
||||
const version = endpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint];
|
||||
return useQuery<Action[], unknown, TData>(
|
||||
[QueryKeys.actions],
|
||||
() =>
|
||||
dataService.getActions({
|
||||
endpoint,
|
||||
version,
|
||||
}),
|
||||
{
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnMount: false,
|
||||
...config,
|
||||
enabled: config?.enabled !== undefined ? config?.enabled && enabled : enabled,
|
||||
},
|
||||
);
|
||||
};
|
||||
/**
|
||||
* Hook for retrieving user's saved Assistant Documents (metadata saved to Database)
|
||||
*/
|
||||
export const useGetAssistantDocsQuery = (
|
||||
endpoint: t.AssistantsEndpoint,
|
||||
config?: UseQueryOptions<AssistantDocument[]>,
|
||||
): QueryObserverResult<AssistantDocument[], unknown> => {
|
||||
const queryClient = useQueryClient();
|
||||
const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([
|
||||
QueryKeys.name,
|
||||
EModelEndpoint.assistants,
|
||||
]);
|
||||
const userProvidesKey = !!endpointsConfig?.[EModelEndpoint.assistants]?.userProvide;
|
||||
const keyExpiry = queryClient.getQueryData<TCheckUserKeyResponse>([QueryKeys.name, endpoint]);
|
||||
const userProvidesKey = !!endpointsConfig?.[endpoint]?.userProvide;
|
||||
const keyProvided = userProvidesKey ? !!keyExpiry?.expiresAt : true;
|
||||
const enabled = !!endpointsConfig?.[EModelEndpoint.assistants] && keyProvided;
|
||||
const enabled = !!endpointsConfig?.[endpoint] && keyProvided;
|
||||
const version = endpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint];
|
||||
return useQuery<AssistantDocument[]>(
|
||||
[QueryKeys.assistantDocs],
|
||||
() => dataService.getAssistantDocs(),
|
||||
() =>
|
||||
dataService.getAssistantDocs({
|
||||
endpoint,
|
||||
version,
|
||||
}),
|
||||
{
|
||||
refetchOnWindowFocus: false,
|
||||
refetchOnReconnect: false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue