mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +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
241 lines
7.2 KiB
JavaScript
241 lines
7.2 KiB
JavaScript
const axios = require('axios');
|
|
const { HttpsProxyAgent } = require('https-proxy-agent');
|
|
const { EModelEndpoint, defaultModels, CacheKeys } = require('librechat-data-provider');
|
|
const { extractBaseURL, inputSchema, processModelData, logAxiosError } = require('~/utils');
|
|
const { OllamaClient } = require('~/app/clients/OllamaClient');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
|
|
const { openAIApiKey, userProvidedOpenAI } = require('./Config/EndpointService').config;
|
|
|
|
/**
|
|
* Fetches OpenAI models from the specified base API path or Azure, based on the provided configuration.
|
|
*
|
|
* @param {Object} params - The parameters for fetching the models.
|
|
* @param {Object} params.user - The user ID to send to the API.
|
|
* @param {string} params.apiKey - The API key for authentication with the API.
|
|
* @param {string} params.baseURL - The base path URL for the API.
|
|
* @param {string} [params.name='OpenAI'] - The name of the API; defaults to 'OpenAI'.
|
|
* @param {boolean} [params.azure=false] - Whether to fetch models from Azure.
|
|
* @param {boolean} [params.userIdQuery=false] - Whether to send the user ID as a query parameter.
|
|
* @param {boolean} [params.createTokenConfig=true] - Whether to create a token configuration from the API response.
|
|
* @param {string} [params.tokenKey] - The cache key to save the token configuration. Uses `name` if omitted.
|
|
* @returns {Promise<string[]>} A promise that resolves to an array of model identifiers.
|
|
* @async
|
|
*/
|
|
const fetchModels = async ({
|
|
user,
|
|
apiKey,
|
|
baseURL,
|
|
name = 'OpenAI',
|
|
azure = false,
|
|
userIdQuery = false,
|
|
createTokenConfig = true,
|
|
tokenKey,
|
|
}) => {
|
|
let models = [];
|
|
|
|
if (!baseURL && !azure) {
|
|
return models;
|
|
}
|
|
|
|
if (!apiKey) {
|
|
return models;
|
|
}
|
|
|
|
if (name && name.toLowerCase().startsWith('ollama')) {
|
|
return await OllamaClient.fetchModels(baseURL);
|
|
}
|
|
|
|
try {
|
|
const options = {
|
|
headers: {
|
|
Authorization: `Bearer ${apiKey}`,
|
|
},
|
|
};
|
|
|
|
if (process.env.PROXY) {
|
|
options.httpsAgent = new HttpsProxyAgent(process.env.PROXY);
|
|
}
|
|
|
|
if (process.env.OPENAI_ORGANIZATION && baseURL.includes('openai')) {
|
|
options.headers['OpenAI-Organization'] = process.env.OPENAI_ORGANIZATION;
|
|
}
|
|
|
|
const url = new URL(`${baseURL}${azure ? '' : '/models'}`);
|
|
if (user && userIdQuery) {
|
|
url.searchParams.append('user', user);
|
|
}
|
|
const res = await axios.get(url.toString(), options);
|
|
|
|
/** @type {z.infer<typeof inputSchema>} */
|
|
const input = res.data;
|
|
|
|
const validationResult = inputSchema.safeParse(input);
|
|
if (validationResult.success && createTokenConfig) {
|
|
const endpointTokenConfig = processModelData(input);
|
|
const cache = getLogStores(CacheKeys.TOKEN_CONFIG);
|
|
await cache.set(tokenKey ?? name, endpointTokenConfig);
|
|
}
|
|
models = input.data.map((item) => item.id);
|
|
} catch (error) {
|
|
const logMessage = `Failed to fetch models from ${azure ? 'Azure ' : ''}${name} API`;
|
|
logAxiosError({ message: logMessage, error });
|
|
}
|
|
|
|
return models;
|
|
};
|
|
|
|
/**
|
|
* Fetches models from the specified API path or Azure, based on the provided options.
|
|
* @async
|
|
* @function
|
|
* @param {object} opts - The options for fetching the models.
|
|
* @param {string} opts.user - The user ID to send to the API.
|
|
* @param {boolean} [opts.azure=false] - Whether to fetch models from Azure.
|
|
* @param {boolean} [opts.assistants=false] - Whether to fetch models from Azure.
|
|
* @param {boolean} [opts.plugins=false] - Whether to fetch models from the plugins.
|
|
* @param {string[]} [_models=[]] - The models to use as a fallback.
|
|
*/
|
|
const fetchOpenAIModels = async (opts, _models = []) => {
|
|
let models = _models.slice() ?? [];
|
|
let apiKey = openAIApiKey;
|
|
const openaiBaseURL = 'https://api.openai.com/v1';
|
|
let baseURL = openaiBaseURL;
|
|
let reverseProxyUrl = process.env.OPENAI_REVERSE_PROXY;
|
|
|
|
if (opts.assistants && process.env.ASSISTANTS_BASE_URL) {
|
|
reverseProxyUrl = process.env.ASSISTANTS_BASE_URL;
|
|
} else if (opts.azure) {
|
|
return models;
|
|
// const azure = getAzureCredentials();
|
|
// baseURL = (genAzureChatCompletion(azure))
|
|
// .split('/deployments')[0]
|
|
// .concat(`/models?api-version=${azure.azureOpenAIApiVersion}`);
|
|
// apiKey = azureOpenAIApiKey;
|
|
} else if (process.env.OPENROUTER_API_KEY) {
|
|
reverseProxyUrl = 'https://openrouter.ai/api/v1';
|
|
apiKey = process.env.OPENROUTER_API_KEY;
|
|
}
|
|
|
|
if (reverseProxyUrl) {
|
|
baseURL = extractBaseURL(reverseProxyUrl);
|
|
}
|
|
|
|
const modelsCache = getLogStores(CacheKeys.MODEL_QUERIES);
|
|
|
|
const cachedModels = await modelsCache.get(baseURL);
|
|
if (cachedModels) {
|
|
return cachedModels;
|
|
}
|
|
|
|
if (baseURL || opts.azure) {
|
|
models = await fetchModels({
|
|
apiKey,
|
|
baseURL,
|
|
azure: opts.azure,
|
|
user: opts.user,
|
|
});
|
|
}
|
|
|
|
if (models.length === 0) {
|
|
return _models;
|
|
}
|
|
|
|
if (baseURL === openaiBaseURL) {
|
|
const regex = /(text-davinci-003|gpt-)/;
|
|
models = models.filter((model) => regex.test(model));
|
|
const instructModels = models.filter((model) => model.includes('instruct'));
|
|
const otherModels = models.filter((model) => !model.includes('instruct'));
|
|
models = otherModels.concat(instructModels);
|
|
}
|
|
|
|
await modelsCache.set(baseURL, models);
|
|
return models;
|
|
};
|
|
|
|
/**
|
|
* Loads the default models for the application.
|
|
* @async
|
|
* @function
|
|
* @param {object} opts - The options for fetching the models.
|
|
* @param {string} opts.user - The user ID to send to the API.
|
|
* @param {boolean} [opts.azure=false] - Whether to fetch models from Azure.
|
|
* @param {boolean} [opts.plugins=false] - Whether to fetch models from the plugins.
|
|
*/
|
|
const getOpenAIModels = async (opts) => {
|
|
let models = defaultModels[EModelEndpoint.openAI];
|
|
|
|
if (opts.assistants) {
|
|
models = defaultModels[EModelEndpoint.assistants];
|
|
} else if (opts.azure) {
|
|
models = defaultModels[EModelEndpoint.azureAssistants];
|
|
}
|
|
|
|
if (opts.plugins) {
|
|
models = models.filter(
|
|
(model) =>
|
|
!model.includes('text-davinci') &&
|
|
!model.includes('instruct') &&
|
|
!model.includes('0613') &&
|
|
!model.includes('0314') &&
|
|
!model.includes('0301'),
|
|
);
|
|
}
|
|
|
|
let key;
|
|
if (opts.assistants) {
|
|
key = 'ASSISTANTS_MODELS';
|
|
} else if (opts.azure) {
|
|
key = 'AZURE_OPENAI_MODELS';
|
|
} else if (opts.plugins) {
|
|
key = 'PLUGIN_MODELS';
|
|
} else {
|
|
key = 'OPENAI_MODELS';
|
|
}
|
|
|
|
if (process.env[key]) {
|
|
models = String(process.env[key]).split(',');
|
|
return models;
|
|
}
|
|
|
|
if (userProvidedOpenAI && !process.env.OPENROUTER_API_KEY) {
|
|
return models;
|
|
}
|
|
|
|
return await fetchOpenAIModels(opts, models);
|
|
};
|
|
|
|
const getChatGPTBrowserModels = () => {
|
|
let models = ['text-davinci-002-render-sha', 'gpt-4'];
|
|
if (process.env.CHATGPT_MODELS) {
|
|
models = String(process.env.CHATGPT_MODELS).split(',');
|
|
}
|
|
|
|
return models;
|
|
};
|
|
|
|
const getAnthropicModels = () => {
|
|
let models = defaultModels[EModelEndpoint.anthropic];
|
|
if (process.env.ANTHROPIC_MODELS) {
|
|
models = String(process.env.ANTHROPIC_MODELS).split(',');
|
|
}
|
|
|
|
return models;
|
|
};
|
|
|
|
const getGoogleModels = () => {
|
|
let models = defaultModels[EModelEndpoint.google];
|
|
if (process.env.GOOGLE_MODELS) {
|
|
models = String(process.env.GOOGLE_MODELS).split(',');
|
|
}
|
|
|
|
return models;
|
|
};
|
|
|
|
module.exports = {
|
|
fetchModels,
|
|
getOpenAIModels,
|
|
getChatGPTBrowserModels,
|
|
getAnthropicModels,
|
|
getGoogleModels,
|
|
};
|