mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-27 04:36:12 +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
92 lines
3 KiB
TypeScript
92 lines
3 KiB
TypeScript
import { logger, decrypt } from '@librechat/data-schemas';
|
|
import type { IPluginAuth, PluginAuthMethods } from '@librechat/data-schemas';
|
|
|
|
export interface GetPluginAuthMapParams {
|
|
userId: string;
|
|
pluginKeys: string[];
|
|
throwError?: boolean;
|
|
findPluginAuthsByKeys: PluginAuthMethods['findPluginAuthsByKeys'];
|
|
}
|
|
|
|
export type PluginAuthMap = Record<string, Record<string, string>>;
|
|
|
|
/**
|
|
* Retrieves and decrypts authentication values for multiple plugins
|
|
* @returns A map where keys are pluginKeys and values are objects of authField:decryptedValue pairs
|
|
*/
|
|
export async function getPluginAuthMap({
|
|
userId,
|
|
pluginKeys,
|
|
throwError = true,
|
|
findPluginAuthsByKeys,
|
|
}: GetPluginAuthMapParams): Promise<PluginAuthMap> {
|
|
try {
|
|
/** Early return for empty plugin keys */
|
|
if (!pluginKeys?.length) {
|
|
return {};
|
|
}
|
|
|
|
/** All plugin auths for current user query */
|
|
const pluginAuths = await findPluginAuthsByKeys({ userId, pluginKeys });
|
|
|
|
/** Group auth records by pluginKey for efficient lookup */
|
|
const authsByPlugin = new Map<string, IPluginAuth[]>();
|
|
for (const auth of pluginAuths) {
|
|
if (!auth.pluginKey) {
|
|
logger.warn(`[getPluginAuthMap] Missing pluginKey for userId ${userId}`);
|
|
continue;
|
|
}
|
|
const existing = authsByPlugin.get(auth.pluginKey) || [];
|
|
existing.push(auth);
|
|
authsByPlugin.set(auth.pluginKey, existing);
|
|
}
|
|
|
|
const authMap: PluginAuthMap = {};
|
|
const decryptionPromises: Promise<void>[] = [];
|
|
|
|
/** Single loop through requested pluginKeys */
|
|
for (const pluginKey of pluginKeys) {
|
|
authMap[pluginKey] = {};
|
|
const auths = authsByPlugin.get(pluginKey) || [];
|
|
|
|
for (const auth of auths) {
|
|
decryptionPromises.push(
|
|
(async () => {
|
|
try {
|
|
const decryptedValue = await decrypt(auth.value);
|
|
authMap[pluginKey][auth.authField] = decryptedValue;
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
logger.error(
|
|
`[getPluginAuthMap] Decryption failed for userId ${userId}, plugin ${pluginKey}, field ${auth.authField}: ${message}`,
|
|
);
|
|
|
|
if (throwError) {
|
|
throw new Error(
|
|
`Decryption failed for plugin ${pluginKey}, field ${auth.authField}: ${message}`,
|
|
);
|
|
}
|
|
}
|
|
})(),
|
|
);
|
|
}
|
|
}
|
|
|
|
await Promise.all(decryptionPromises);
|
|
return authMap;
|
|
} catch (error) {
|
|
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
const plugins = pluginKeys?.join(', ') ?? 'all requested';
|
|
logger.warn(
|
|
`[getPluginAuthMap] Failed to fetch auth values for userId ${userId}, plugins: ${plugins}: ${message}`,
|
|
);
|
|
if (!throwError) {
|
|
/** Empty objects for each plugin key on error */
|
|
return pluginKeys.reduce((acc, key) => {
|
|
acc[key] = {};
|
|
return acc;
|
|
}, {} as PluginAuthMap);
|
|
}
|
|
throw error;
|
|
}
|
|
}
|