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

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
277 lines
9.7 KiB
JavaScript
277 lines
9.7 KiB
JavaScript
const {
|
|
SystemRoles,
|
|
EModelEndpoint,
|
|
defaultOrderQuery,
|
|
defaultAssistantsVersion,
|
|
} = require('librechat-data-provider');
|
|
const {
|
|
initializeClient: initAzureClient,
|
|
} = require('~/server/services/Endpoints/azureAssistants');
|
|
const { initializeClient } = require('~/server/services/Endpoints/assistants');
|
|
const { getEndpointsConfig } = require('~/server/services/Config');
|
|
|
|
/**
|
|
* @param {ServerRequest} 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 endpointsConfig = await getEndpointsConfig(req);
|
|
version = `v${endpointsConfig?.[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.
|
|
*
|
|
* @deprecated
|
|
* @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);
|
|
};
|
|
|
|
/**
|
|
* Fetches all assistants based on provided query params, until `has_more` is `false`.
|
|
*
|
|
* @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 {Omit<AssistantListParams, 'endpoint'>} params.query - The query parameters to list assistants (e.g., limit, order).
|
|
* @returns {Promise<Array<Assistant>>} A promise that resolves to the response from the `openai.beta.assistants.list` method call.
|
|
*/
|
|
const listAllAssistants = async ({ req, res, version, query }) => {
|
|
/** @type {{ openai: OpenAIClient }} */
|
|
const { openai } = await getOpenAIClient({ req, res, version });
|
|
const allAssistants = [];
|
|
|
|
let first_id;
|
|
let last_id;
|
|
let afterToken = query.after;
|
|
let hasMore = true;
|
|
|
|
while (hasMore) {
|
|
const response = await openai.beta.assistants.list({
|
|
...query,
|
|
after: afterToken,
|
|
});
|
|
|
|
const { body } = response;
|
|
|
|
allAssistants.push(...body.data);
|
|
hasMore = body.has_more;
|
|
|
|
if (!first_id) {
|
|
first_id = body.first_id;
|
|
}
|
|
|
|
if (hasMore) {
|
|
afterToken = body.last_id;
|
|
} else {
|
|
last_id = body.last_id;
|
|
}
|
|
}
|
|
|
|
return {
|
|
data: allAssistants,
|
|
body: {
|
|
data: allAssistants,
|
|
has_more: false,
|
|
first_id,
|
|
last_id,
|
|
},
|
|
};
|
|
};
|
|
|
|
/**
|
|
* 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(listAllAssistants({ 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,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Initializes the OpenAI client.
|
|
* @param {object} params - The parameters object.
|
|
* @param {ServerRequest} params.req - The request object.
|
|
* @param {ServerResponse} params.res - The response object.
|
|
* @param {TEndpointOption} params.endpointOption - The endpoint options.
|
|
* @param {boolean} params.initAppClient - Whether to initialize the app client.
|
|
* @param {string} params.overrideEndpoint - The endpoint to override.
|
|
* @returns {Promise<{ openai: OpenAIClient, openAIApiKey: string; client: import('~/app/clients/OpenAIClient') }>} - The initialized OpenAI client.
|
|
*/
|
|
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;
|
|
}
|
|
|
|
/**
|
|
* Returns a list of assistants.
|
|
* @param {object} params
|
|
* @param {object} params.req - Express Request
|
|
* @param {AssistantListParams} [params.req.query] - The assistant list parameters for pagination and sorting.
|
|
* @param {object} params.res - Express Response
|
|
* @param {string} [params.overrideEndpoint] - The endpoint to override the request endpoint.
|
|
* @returns {Promise<AssistantListResponse>} 200 - success response - application/json
|
|
*/
|
|
const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
|
|
const appConfig = req.config;
|
|
const {
|
|
limit = 100,
|
|
order = 'desc',
|
|
after,
|
|
before,
|
|
endpoint,
|
|
} = req.query ?? {
|
|
endpoint: overrideEndpoint,
|
|
...defaultOrderQuery,
|
|
};
|
|
|
|
const version = await getCurrentVersion(req, endpoint);
|
|
const query = { limit, order, after, before };
|
|
|
|
/** @type {AssistantListResponse} */
|
|
let body;
|
|
|
|
if (endpoint === EModelEndpoint.assistants) {
|
|
({ body } = await listAllAssistants({ req, res, version, query }));
|
|
} else if (endpoint === EModelEndpoint.azureAssistants) {
|
|
const azureConfig = appConfig.endpoints?.[EModelEndpoint.azureOpenAI];
|
|
body = await listAssistantsForAzure({ req, res, version, azureConfig, query });
|
|
}
|
|
|
|
if (req.user.role === SystemRoles.ADMIN) {
|
|
return body;
|
|
} else if (!appConfig.endpoints?.[endpoint]) {
|
|
return body;
|
|
}
|
|
|
|
body.data = filterAssistants({
|
|
userId: req.user.id,
|
|
assistants: body.data,
|
|
assistantsConfig: appConfig.endpoints?.[endpoint],
|
|
});
|
|
return body;
|
|
};
|
|
|
|
/**
|
|
* Filter assistants based on configuration.
|
|
*
|
|
* @param {object} params - The parameters object.
|
|
* @param {string} params.userId - The user ID to filter private assistants.
|
|
* @param {Assistant[]} params.assistants - The list of assistants to filter.
|
|
* @param {Partial<TAssistantEndpoint>} params.assistantsConfig - The assistant configuration.
|
|
* @returns {Assistant[]} - The filtered list of assistants.
|
|
*/
|
|
function filterAssistants({ assistants, userId, assistantsConfig }) {
|
|
const { supportedIds, excludedIds, privateAssistants } = assistantsConfig;
|
|
if (privateAssistants) {
|
|
return assistants.filter((assistant) => userId === assistant.metadata?.author);
|
|
} else if (supportedIds?.length) {
|
|
return assistants.filter((assistant) => supportedIds.includes(assistant.id));
|
|
} else if (excludedIds?.length) {
|
|
return assistants.filter((assistant) => !excludedIds.includes(assistant.id));
|
|
}
|
|
return assistants;
|
|
}
|
|
|
|
module.exports = {
|
|
getOpenAIClient,
|
|
fetchAssistants,
|
|
getCurrentVersion,
|
|
};
|