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
158 lines
5.9 KiB
JavaScript
158 lines
5.9 KiB
JavaScript
const { EModelEndpoint, CacheKeys, defaultAssistantsVersion } = require('librechat-data-provider');
|
|
const {
|
|
initializeClient: initAzureClient,
|
|
} = require('~/server/services/Endpoints/azureAssistants');
|
|
const { initializeClient } = require('~/server/services/Endpoints/assistants');
|
|
const { getLogStores } = require('~/cache');
|
|
|
|
/**
|
|
* @param {Express.Request} req
|
|
* @param {string} [endpoint]
|
|
* @returns {Promise<string>}
|
|
*/
|
|
const getCurrentVersion = async (req, endpoint) => {
|
|
const index = req.baseUrl.lastIndexOf('/v');
|
|
let version = index !== -1 ? req.baseUrl.substring(index + 1, index + 3) : null;
|
|
if (!version && req.body.version) {
|
|
version = `v${req.body.version}`;
|
|
}
|
|
if (!version && endpoint) {
|
|
const cache = getLogStores(CacheKeys.CONFIG_STORE);
|
|
const cachedEndpointsConfig = await cache.get(CacheKeys.ENDPOINT_CONFIG);
|
|
version = `v${
|
|
cachedEndpointsConfig?.[endpoint]?.version ?? defaultAssistantsVersion[endpoint]
|
|
}`;
|
|
}
|
|
if (!version?.startsWith('v') && version.length !== 2) {
|
|
throw new Error(`[${req.baseUrl}] Invalid version: ${version}`);
|
|
}
|
|
return version;
|
|
};
|
|
|
|
/**
|
|
* Asynchronously lists assistants based on provided query parameters.
|
|
*
|
|
* Initializes the client with the current request and response objects and lists assistants
|
|
* according to the query parameters. This function abstracts the logic for non-Azure paths.
|
|
*
|
|
* @async
|
|
* @param {object} params - The parameters object.
|
|
* @param {object} params.req - The request object, used for initializing the client.
|
|
* @param {object} params.res - The response object, used for initializing the client.
|
|
* @param {string} params.version - The API version to use.
|
|
* @param {object} params.query - The query parameters to list assistants (e.g., limit, order).
|
|
* @returns {Promise<object>} A promise that resolves to the response from the `openai.beta.assistants.list` method call.
|
|
*/
|
|
const listAssistants = async ({ req, res, version, query }) => {
|
|
const { openai } = await getOpenAIClient({ req, res, version });
|
|
return openai.beta.assistants.list(query);
|
|
};
|
|
|
|
/**
|
|
* Asynchronously lists assistants for Azure configured groups.
|
|
*
|
|
* Iterates through Azure configured assistant groups, initializes the client with the current request and response objects,
|
|
* lists assistants based on the provided query parameters, and merges their data alongside the model information into a single array.
|
|
*
|
|
* @async
|
|
* @param {object} params - The parameters object.
|
|
* @param {object} params.req - The request object, used for initializing the client and manipulating the request body.
|
|
* @param {object} params.res - The response object, used for initializing the client.
|
|
* @param {string} params.version - The API version to use.
|
|
* @param {TAzureConfig} params.azureConfig - The Azure configuration object containing assistantGroups and groupMap.
|
|
* @param {object} params.query - The query parameters to list assistants (e.g., limit, order).
|
|
* @returns {Promise<AssistantListResponse>} A promise that resolves to an array of assistant data merged with their respective model information.
|
|
*/
|
|
const listAssistantsForAzure = async ({ req, res, version, azureConfig = {}, query }) => {
|
|
/** @type {Array<[string, TAzureModelConfig]>} */
|
|
const groupModelTuples = [];
|
|
const promises = [];
|
|
/** @type {Array<TAzureGroup>} */
|
|
const groups = [];
|
|
|
|
const { groupMap, assistantGroups } = azureConfig;
|
|
|
|
for (const groupName of assistantGroups) {
|
|
const group = groupMap[groupName];
|
|
groups.push(group);
|
|
|
|
const currentModelTuples = Object.entries(group?.models);
|
|
groupModelTuples.push(currentModelTuples);
|
|
|
|
/* The specified model is only necessary to
|
|
fetch assistants for the shared instance */
|
|
req.body.model = currentModelTuples[0][0];
|
|
promises.push(listAssistants({ req, res, version, query }));
|
|
}
|
|
|
|
const resolvedQueries = await Promise.all(promises);
|
|
const data = resolvedQueries.flatMap((res, i) =>
|
|
res.data.map((assistant) => {
|
|
const deploymentName = assistant.model;
|
|
const currentGroup = groups[i];
|
|
const currentModelTuples = groupModelTuples[i];
|
|
const firstModel = currentModelTuples[0][0];
|
|
|
|
if (currentGroup.deploymentName === deploymentName) {
|
|
return { ...assistant, model: firstModel };
|
|
}
|
|
|
|
for (const [model, modelConfig] of currentModelTuples) {
|
|
if (modelConfig.deploymentName === deploymentName) {
|
|
return { ...assistant, model };
|
|
}
|
|
}
|
|
|
|
return { ...assistant, model: firstModel };
|
|
}),
|
|
);
|
|
|
|
return {
|
|
first_id: data[0]?.id,
|
|
last_id: data[data.length - 1]?.id,
|
|
object: 'list',
|
|
has_more: false,
|
|
data,
|
|
};
|
|
};
|
|
|
|
async function getOpenAIClient({ req, res, endpointOption, initAppClient, overrideEndpoint }) {
|
|
let endpoint = overrideEndpoint ?? req.body.endpoint ?? req.query.endpoint;
|
|
const version = await getCurrentVersion(req, endpoint);
|
|
if (!endpoint) {
|
|
throw new Error(`[${req.baseUrl}] Endpoint is required`);
|
|
}
|
|
|
|
let result;
|
|
if (endpoint === EModelEndpoint.assistants) {
|
|
result = await initializeClient({ req, res, version, endpointOption, initAppClient });
|
|
} else if (endpoint === EModelEndpoint.azureAssistants) {
|
|
result = await initAzureClient({ req, res, version, endpointOption, initAppClient });
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
const fetchAssistants = async (req, res) => {
|
|
const { limit = 100, order = 'desc', after, before, endpoint } = req.query;
|
|
const version = await getCurrentVersion(req, endpoint);
|
|
const query = { limit, order, after, before };
|
|
|
|
/** @type {AssistantListResponse} */
|
|
let body;
|
|
|
|
if (endpoint === EModelEndpoint.assistants) {
|
|
({ body } = await listAssistants({ req, res, version, query }));
|
|
} else if (endpoint === EModelEndpoint.azureAssistants) {
|
|
const azureConfig = req.app.locals[EModelEndpoint.azureOpenAI];
|
|
body = await listAssistantsForAzure({ req, res, version, azureConfig, query });
|
|
}
|
|
|
|
return body;
|
|
};
|
|
|
|
module.exports = {
|
|
getOpenAIClient,
|
|
fetchAssistants,
|
|
getCurrentVersion,
|
|
};
|