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

* chore: bump openai to 4.29.0 and npm audit fix * chore: remove unnecessary stream field from ContentData * feat: new enum and types for AssistantStreamEvent * refactor(AssistantService): remove stream field and add conversationId to text ContentData > - return `finalMessage` and `text` on run completion > - move `processMessages` to services/Threads to avoid circular dependencies with new stream handling > - refactor(processMessages/retrieveAndProcessFile): add new `client` field to differentiate new RunClient type * WIP: new assistants stream handling * chore: stores messages to StreamRunManager * chore: add additional typedefs * fix: pass req and openai to StreamRunManager * fix(AssistantService): pass openai as client to `retrieveAndProcessFile` * WIP: streaming tool i/o, handle in_progress and completed run steps * feat(assistants): process required actions with streaming enabled * chore: condense early return check for useSSE useEffect * chore: remove unnecessary comments and only handle completed tool calls when not function * feat: add TTL for assistants run abort cacheKey * feat: abort stream runs * fix(assistants): render streaming cursor * fix(assistants): hide edit icon as functionality is not supported * fix(textArea): handle pasting edge cases; first, when onChange events wouldn't fire; second, when textarea wouldn't resize * chore: memoize Conversations * chore(useTextarea): reverse args order * fix: load default capabilities when an azure is configured to support assistants, but `assistants` endpoint is not configured * fix(AssistantSelect): update form assistant model on assistant form select * fix(actions): handle azure strict validation for function names to fix crud for actions * chore: remove content data debug log as it fires in rapid succession * feat: improve UX for assistant errors mid-request * feat: add tool call localizations and replace any domain separators from azure action names * refactor(chat): error out tool calls without outputs during handleError * fix(ToolService): handle domain separators allowing Azure use of actions * refactor(StreamRunManager): types and throw Error if tool submission fails
170 lines
5.6 KiB
JavaScript
170 lines
5.6 KiB
JavaScript
const {
|
|
Constants,
|
|
FileSources,
|
|
Capabilities,
|
|
EModelEndpoint,
|
|
defaultSocialLogins,
|
|
validateAzureGroups,
|
|
mapModelToAzureConfig,
|
|
assistantEndpointSchema,
|
|
deprecatedAzureVariables,
|
|
conflictingAzureVariables,
|
|
} = require('librechat-data-provider');
|
|
const { initializeFirebase } = require('./Files/Firebase/initialize');
|
|
const loadCustomConfig = require('./Config/loadCustomConfig');
|
|
const handleRateLimits = require('./Config/handleRateLimits');
|
|
const { loadAndFormatTools } = require('./ToolService');
|
|
const paths = require('~/config/paths');
|
|
const { logger } = require('~/config');
|
|
|
|
/**
|
|
*
|
|
* Loads custom config and initializes app-wide variables.
|
|
* @function AppService
|
|
* @param {Express.Application} app - The Express application object.
|
|
*/
|
|
const AppService = async (app) => {
|
|
/** @type {TCustomConfig}*/
|
|
const config = (await loadCustomConfig()) ?? {};
|
|
|
|
const fileStrategy = config.fileStrategy ?? FileSources.local;
|
|
process.env.CDN_PROVIDER = fileStrategy;
|
|
|
|
if (fileStrategy === FileSources.firebase) {
|
|
initializeFirebase();
|
|
}
|
|
|
|
/** @type {Record<string, FunctionTool} */
|
|
const availableTools = loadAndFormatTools({
|
|
directory: paths.structuredTools,
|
|
filter: new Set([
|
|
'ChatTool.js',
|
|
'CodeSherpa.js',
|
|
'CodeSherpaTools.js',
|
|
'E2BTools.js',
|
|
'extractionChain.js',
|
|
]),
|
|
});
|
|
|
|
const socialLogins = config?.registration?.socialLogins ?? defaultSocialLogins;
|
|
|
|
if (!Object.keys(config).length) {
|
|
app.locals = {
|
|
availableTools,
|
|
fileStrategy,
|
|
socialLogins,
|
|
paths,
|
|
};
|
|
|
|
return;
|
|
}
|
|
|
|
if (config.version !== Constants.CONFIG_VERSION) {
|
|
logger.info(
|
|
`\nOutdated Config version: ${config.version}. Current version: ${Constants.CONFIG_VERSION}\n\nCheck out the latest config file guide for new options and features.\nhttps://docs.librechat.ai/install/configuration/custom_config.html\n\n`,
|
|
);
|
|
}
|
|
|
|
handleRateLimits(config?.rateLimits);
|
|
|
|
const endpointLocals = {};
|
|
|
|
if (config?.endpoints?.[EModelEndpoint.azureOpenAI]) {
|
|
const { groups, ...azureConfiguration } = config.endpoints[EModelEndpoint.azureOpenAI];
|
|
const { isValid, modelNames, modelGroupMap, groupMap, errors } = validateAzureGroups(groups);
|
|
|
|
if (!isValid) {
|
|
const errorString = errors.join('\n');
|
|
const errorMessage = 'Invalid Azure OpenAI configuration:\n' + errorString;
|
|
logger.error(errorMessage);
|
|
throw new Error(errorMessage);
|
|
}
|
|
|
|
const assistantModels = [];
|
|
const assistantGroups = new Set();
|
|
for (const modelName of modelNames) {
|
|
mapModelToAzureConfig({ modelName, modelGroupMap, groupMap });
|
|
const groupName = modelGroupMap?.[modelName]?.group;
|
|
const modelGroup = groupMap?.[groupName];
|
|
let supportsAssistants = modelGroup?.assistants || modelGroup?.[modelName]?.assistants;
|
|
if (supportsAssistants) {
|
|
assistantModels.push(modelName);
|
|
!assistantGroups.has(groupName) && assistantGroups.add(groupName);
|
|
}
|
|
}
|
|
|
|
if (azureConfiguration.assistants && assistantModels.length === 0) {
|
|
throw new Error(
|
|
'No Azure models are configured to support assistants. Please remove the `assistants` field or configure at least one model to support assistants.',
|
|
);
|
|
}
|
|
|
|
endpointLocals[EModelEndpoint.azureOpenAI] = {
|
|
modelNames,
|
|
modelGroupMap,
|
|
groupMap,
|
|
assistantModels,
|
|
assistantGroups: Array.from(assistantGroups),
|
|
...azureConfiguration,
|
|
};
|
|
|
|
deprecatedAzureVariables.forEach(({ key, description }) => {
|
|
if (process.env[key]) {
|
|
logger.warn(
|
|
`The \`${key}\` environment variable (related to ${description}) should not be used in combination with the \`azureOpenAI\` endpoint configuration, as you will experience conflicts and errors.`,
|
|
);
|
|
}
|
|
});
|
|
|
|
conflictingAzureVariables.forEach(({ key }) => {
|
|
if (process.env[key]) {
|
|
logger.warn(
|
|
`The \`${key}\` environment variable should not be used in combination with the \`azureOpenAI\` endpoint configuration, as you may experience with the defined placeholders for mapping to the current model grouping using the same name.`,
|
|
);
|
|
}
|
|
});
|
|
|
|
if (azureConfiguration.assistants) {
|
|
endpointLocals[EModelEndpoint.assistants] = {
|
|
// Note: may need to add retrieval models here in the future
|
|
capabilities: [Capabilities.tools, Capabilities.actions, Capabilities.code_interpreter],
|
|
};
|
|
}
|
|
}
|
|
|
|
if (config?.endpoints?.[EModelEndpoint.assistants]) {
|
|
const assistantsConfig = config.endpoints[EModelEndpoint.assistants];
|
|
const parsedConfig = assistantEndpointSchema.parse(assistantsConfig);
|
|
if (assistantsConfig.supportedIds?.length && assistantsConfig.excludedIds?.length) {
|
|
logger.warn(
|
|
`Both \`supportedIds\` and \`excludedIds\` are defined for the ${EModelEndpoint.assistants} endpoint; \`excludedIds\` field will be ignored.`,
|
|
);
|
|
}
|
|
|
|
const prevConfig = endpointLocals[EModelEndpoint.assistants] ?? {};
|
|
|
|
/** @type {Partial<TAssistantEndpoint>} */
|
|
endpointLocals[EModelEndpoint.assistants] = {
|
|
...prevConfig,
|
|
retrievalModels: parsedConfig.retrievalModels,
|
|
disableBuilder: parsedConfig.disableBuilder,
|
|
pollIntervalMs: parsedConfig.pollIntervalMs,
|
|
supportedIds: parsedConfig.supportedIds,
|
|
capabilities: parsedConfig.capabilities,
|
|
excludedIds: parsedConfig.excludedIds,
|
|
timeoutMs: parsedConfig.timeoutMs,
|
|
};
|
|
}
|
|
|
|
app.locals = {
|
|
socialLogins,
|
|
availableTools,
|
|
fileStrategy,
|
|
fileConfig: config?.fileConfig,
|
|
interface: config?.interface,
|
|
paths,
|
|
...endpointLocals,
|
|
};
|
|
};
|
|
|
|
module.exports = AppService;
|