mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00
🛜 refactor: Streamline App Config Usage (#9234)
* 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
This commit is contained in:
parent
e1ad235f17
commit
9a210971f5
210 changed files with 4102 additions and 3465 deletions
|
@ -15,7 +15,10 @@
|
|||
|
||||
/**
|
||||
* @exports ServerRequest
|
||||
* @typedef {import('express').Request} ServerRequest
|
||||
* @typedef {import('express').Request & {
|
||||
* user?: IUser;
|
||||
* config?: AppConfig;
|
||||
* }} ServerRequest
|
||||
* @memberof typedefs
|
||||
*/
|
||||
|
||||
|
@ -877,8 +880,8 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @exports MongoUser
|
||||
* @typedef {import('@librechat/data-schemas').IUser} MongoUser
|
||||
* @exports IUser
|
||||
* @typedef {import('@librechat/data-schemas').IUser} IUser
|
||||
* @memberof typedefs
|
||||
*/
|
||||
|
||||
|
@ -917,7 +920,6 @@
|
|||
* @typedef {Object} ImageGenOptions
|
||||
* @property {ServerRequest} req - The request object.
|
||||
* @property {boolean} isAgent - Whether the request is from an agent.
|
||||
* @property {FileSources} fileStrategy - The file strategy to use.
|
||||
* @property {processFileURL} processFileURL - The function to process a file URL.
|
||||
* @property {boolean} returnMetadata - Whether to return metadata.
|
||||
* @property {uploadImageBuffer} uploadImageBuffer - The function to upload an image buffer.
|
||||
|
@ -930,6 +932,7 @@
|
|||
* signal?: AbortSignal,
|
||||
* memory?: ConversationSummaryBufferMemory,
|
||||
* tool_resources?: AgentToolResources,
|
||||
* web_search?: ReturnType<typeof import('~/server/services/Tools/search').createOnSearchResults>,
|
||||
* }} LoadToolOptions
|
||||
* @memberof typedefs
|
||||
*/
|
||||
|
@ -1091,6 +1094,12 @@
|
|||
* @memberof typedefs
|
||||
*/
|
||||
|
||||
/**
|
||||
* @exports AppConfig
|
||||
* @typedef {import('@librechat/api').AppConfig} AppConfig
|
||||
* @memberof typedefs
|
||||
*/
|
||||
|
||||
/**
|
||||
* @exports JsonSchemaType
|
||||
* @typedef {import('@librechat/api').JsonSchemaType} JsonSchemaType
|
||||
|
@ -1669,26 +1678,10 @@
|
|||
* @memberof typedefs
|
||||
*/
|
||||
|
||||
// /**
|
||||
// * @typedef {OpenAI & {
|
||||
// * req: Express.Request,
|
||||
// * res: Express.Response
|
||||
// * getPartialText: () => string,
|
||||
// * processedFileIds: Set<string>,
|
||||
// * mappedOrder: Map<string, number>,
|
||||
// * completeToolCallSteps: Set<string>,
|
||||
// * seenCompletedMessages: Set<string>,
|
||||
// * seenToolCalls: Map<string, StepToolCall>,
|
||||
// * progressCallback: (options: Object) => void,
|
||||
// * addContentData: (data: TContentData) => void,
|
||||
// * responseMessage: ResponseMessage,
|
||||
// * }} OpenAIClient - for reference only
|
||||
// */
|
||||
|
||||
/**
|
||||
* @typedef {Object} RunClient
|
||||
*
|
||||
* @property {Express.Request} req - The Express request object.
|
||||
* @property {ServerRequest} req - The Express request object.
|
||||
* @property {Express.Response} res - The Express response object.
|
||||
* @property {?import('https-proxy-agent').HttpsProxyAgent} httpAgent - An optional HTTP proxy agent for the request.
|
||||
|
||||
|
@ -1789,8 +1782,8 @@
|
|||
* @property {String} conversationId - The ID of the conversation.
|
||||
* @property {String} model - The model name.
|
||||
* @property {String} context - The context in which the transaction is made.
|
||||
* @property {AppConfig['balance']} [balance] - The balance config
|
||||
* @property {EndpointTokenConfig} [endpointTokenConfig] - The current endpoint token config.
|
||||
* @property {object} [cacheUsage] - Cache usage, if any.
|
||||
* @property {String} [valueKey] - The value key (optional).
|
||||
* @memberof typedefs
|
||||
*/
|
||||
|
@ -1835,6 +1828,7 @@
|
|||
* @callback sendCompletion
|
||||
* @param {Array<ChatCompletionMessage> | string} payload - The messages or prompt to send to the model
|
||||
* @param {object} opts - Options for the completion
|
||||
* @param {AppConfig} opts.appConfig - Callback function to handle token progress
|
||||
* @param {onTokenProgress} opts.onProgress - Callback function to handle token progress
|
||||
* @param {AbortController} opts.abortController - AbortController instance
|
||||
* @param {Record<string, Record<string, string>>} [opts.userMCPAuthMap]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue