mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 08:20:14 +01:00
* refactor: move endpoint initialization methods to typescript * refactor: move agent init to packages/api - Introduced `initialize.ts` for agent initialization, including file processing and tool loading. - Updated `resources.ts` to allow optional appConfig parameter. - Enhanced endpoint configuration handling in various initialization files to support model parameters. - Added new artifacts and prompts for React component generation. - Refactored existing code to improve type safety and maintainability. * refactor: streamline endpoint initialization and enhance type safety - Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`. - Simplified request handling by directly extracting keys from the request body. - Improved type safety by ensuring user IDs are safely accessed with optional chaining. - Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability. * refactor: moved ModelService and extractBaseURL to packages/api - Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models. - Updated existing endpoint index to include the new models module. - Enhanced utility functions for URL extraction and model data processing. - Improved type safety and error handling across the models fetching logic. * refactor: consolidate utility functions and remove unused files - Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization. - Removed redundant utility files and their associated tests to streamline the codebase. - Updated imports across various client files to utilize the new consolidated functions. - Enhanced overall maintainability by reducing the number of utility modules. * refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file * refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api` * chore: remove unused 'res' from options in AgentClient * refactor: file model imports and methods - Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'. - Consolidated file-related methods into a new file methods module in the data-schemas package. - Added comprehensive tests for file methods including creation, retrieval, updating, and deletion. - Enhanced the initializeAgent function to accept dependency injection for file-related methods. - Improved error handling and logging in file methods. * refactor: streamline database method references in agent initialization * refactor: enhance file method tests and update type references to IMongoFile * refactor: consolidate database method imports in agent client and initialization * chore: remove redundant import of initializeAgent from @librechat/api * refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints * refactor: move updateUserPlugins logic to user.ts and simplify UserController * refactor: update imports for user key management and remove UserService * refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports * refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas * chore: update file model mock to use unified import from '~/models' * chore: import order * refactor: remove migrated to TS agent.js file and its associated logic from the endpoints * chore: add reusable function to extract imports from source code in unused-packages workflow * chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction * chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output * chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists * chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports * chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
112 lines
3.5 KiB
JavaScript
112 lines
3.5 KiB
JavaScript
const { isUserProvided, fetchModels } = require('@librechat/api');
|
|
const {
|
|
EModelEndpoint,
|
|
extractEnvVariable,
|
|
normalizeEndpointName,
|
|
} = require('librechat-data-provider');
|
|
const { getAppConfig } = require('./app');
|
|
|
|
/**
|
|
* Load config endpoints from the cached configuration object
|
|
* @function loadConfigModels
|
|
* @param {ServerRequest} req - The Express request object.
|
|
*/
|
|
async function loadConfigModels(req) {
|
|
const appConfig = await getAppConfig({ role: req.user?.role });
|
|
if (!appConfig) {
|
|
return {};
|
|
}
|
|
const modelsConfig = {};
|
|
const azureConfig = appConfig.endpoints?.[EModelEndpoint.azureOpenAI];
|
|
const { modelNames } = azureConfig ?? {};
|
|
|
|
if (modelNames && azureConfig) {
|
|
modelsConfig[EModelEndpoint.azureOpenAI] = modelNames;
|
|
}
|
|
|
|
if (azureConfig?.assistants && azureConfig.assistantModels) {
|
|
modelsConfig[EModelEndpoint.azureAssistants] = azureConfig.assistantModels;
|
|
}
|
|
|
|
if (!Array.isArray(appConfig.endpoints?.[EModelEndpoint.custom])) {
|
|
return modelsConfig;
|
|
}
|
|
|
|
const customEndpoints = appConfig.endpoints[EModelEndpoint.custom].filter(
|
|
(endpoint) =>
|
|
endpoint.baseURL &&
|
|
endpoint.apiKey &&
|
|
endpoint.name &&
|
|
endpoint.models &&
|
|
(endpoint.models.fetch || endpoint.models.default),
|
|
);
|
|
|
|
/**
|
|
* @type {Record<string, Promise<string[]>>}
|
|
* Map for promises keyed by unique combination of baseURL and apiKey */
|
|
const fetchPromisesMap = {};
|
|
/**
|
|
* @type {Record<string, string[]>}
|
|
* Map to associate unique keys with endpoint names; note: one key may can correspond to multiple endpoints */
|
|
const uniqueKeyToEndpointsMap = {};
|
|
/**
|
|
* @type {Record<string, Partial<TEndpoint>>}
|
|
* Map to associate endpoint names to their configurations */
|
|
const endpointsMap = {};
|
|
|
|
for (let i = 0; i < customEndpoints.length; i++) {
|
|
const endpoint = customEndpoints[i];
|
|
const { models, name: configName, baseURL, apiKey, headers: endpointHeaders } = endpoint;
|
|
const name = normalizeEndpointName(configName);
|
|
endpointsMap[name] = endpoint;
|
|
|
|
const API_KEY = extractEnvVariable(apiKey);
|
|
const BASE_URL = extractEnvVariable(baseURL);
|
|
|
|
const uniqueKey = `${BASE_URL}__${API_KEY}`;
|
|
|
|
modelsConfig[name] = [];
|
|
|
|
if (models.fetch && !isUserProvided(API_KEY) && !isUserProvided(BASE_URL)) {
|
|
fetchPromisesMap[uniqueKey] =
|
|
fetchPromisesMap[uniqueKey] ||
|
|
fetchModels({
|
|
name,
|
|
apiKey: API_KEY,
|
|
baseURL: BASE_URL,
|
|
user: req.user.id,
|
|
userObject: req.user,
|
|
headers: endpointHeaders,
|
|
direct: endpoint.directEndpoint,
|
|
userIdQuery: models.userIdQuery,
|
|
});
|
|
uniqueKeyToEndpointsMap[uniqueKey] = uniqueKeyToEndpointsMap[uniqueKey] || [];
|
|
uniqueKeyToEndpointsMap[uniqueKey].push(name);
|
|
continue;
|
|
}
|
|
|
|
if (Array.isArray(models.default)) {
|
|
modelsConfig[name] = models.default.map((model) =>
|
|
typeof model === 'string' ? model : model.name,
|
|
);
|
|
}
|
|
}
|
|
|
|
const fetchedData = await Promise.all(Object.values(fetchPromisesMap));
|
|
const uniqueKeys = Object.keys(fetchPromisesMap);
|
|
|
|
for (let i = 0; i < fetchedData.length; i++) {
|
|
const currentKey = uniqueKeys[i];
|
|
const modelData = fetchedData[i];
|
|
const associatedNames = uniqueKeyToEndpointsMap[currentKey];
|
|
|
|
for (const name of associatedNames) {
|
|
const endpoint = endpointsMap[name];
|
|
modelsConfig[name] = !modelData?.length ? (endpoint.models.default ?? []) : modelData;
|
|
}
|
|
}
|
|
|
|
return modelsConfig;
|
|
}
|
|
|
|
module.exports = loadConfigModels;
|