mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +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
123 lines
3.5 KiB
JavaScript
123 lines
3.5 KiB
JavaScript
const path = require('path');
|
|
const mongoose = require('mongoose');
|
|
const { isEnabled, getBalanceConfig } = require('@librechat/api');
|
|
const { User } = require('@librechat/data-schemas').createModels(mongoose);
|
|
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
|
|
const { createTransaction } = require('~/models/Transaction');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
const { askQuestion, silentExit } = require('./helpers');
|
|
const connect = require('./connect');
|
|
|
|
(async () => {
|
|
await connect();
|
|
|
|
/**
|
|
* Show the welcome / help menu
|
|
*/
|
|
console.purple('--------------------------');
|
|
console.purple('Add balance to a user account!');
|
|
console.purple('--------------------------');
|
|
/**
|
|
* Set up the variables we need and get the arguments if they were passed in
|
|
*/
|
|
let email = '';
|
|
let amount = '';
|
|
// If we have the right number of arguments, lets use them
|
|
if (process.argv.length >= 3) {
|
|
email = process.argv[2];
|
|
amount = process.argv[3];
|
|
} else {
|
|
console.orange('Usage: npm run add-balance <email> <amount>');
|
|
console.orange('Note: if you do not pass in the arguments, you will be prompted for them.');
|
|
console.purple('--------------------------');
|
|
// console.purple(`[DEBUG] Args Length: ${process.argv.length}`);
|
|
}
|
|
|
|
if (!process.env.CHECK_BALANCE) {
|
|
console.red(
|
|
'Error: CHECK_BALANCE environment variable is not set! Configure it to use it: `CHECK_BALANCE=true`',
|
|
);
|
|
silentExit(1);
|
|
}
|
|
if (isEnabled(process.env.CHECK_BALANCE) === false) {
|
|
console.red(
|
|
'Error: CHECK_BALANCE environment variable is set to `false`! Please configure: `CHECK_BALANCE=true`',
|
|
);
|
|
silentExit(1);
|
|
}
|
|
|
|
/**
|
|
* If we don't have the right number of arguments, lets prompt the user for them
|
|
*/
|
|
if (!email) {
|
|
email = await askQuestion('Email:');
|
|
}
|
|
// Validate the email
|
|
if (!email.includes('@')) {
|
|
console.red('Error: Invalid email address!');
|
|
silentExit(1);
|
|
}
|
|
|
|
if (!amount) {
|
|
amount = await askQuestion('amount: (default is 1000 tokens if empty or 0)');
|
|
}
|
|
// Validate the amount
|
|
if (!amount) {
|
|
amount = 1000;
|
|
}
|
|
|
|
// Validate the user
|
|
const user = await User.findOne({ email }).lean();
|
|
if (!user) {
|
|
console.red('Error: No user with that email was found!');
|
|
silentExit(1);
|
|
} else {
|
|
console.purple(`Found user: ${user.email}`);
|
|
}
|
|
|
|
/**
|
|
* Now that we have all the variables we need, lets create the transaction and update the balance
|
|
*/
|
|
let result;
|
|
try {
|
|
const appConfig = await getAppConfig();
|
|
const balanceConfig = getBalanceConfig(appConfig);
|
|
result = await createTransaction({
|
|
user: user._id,
|
|
tokenType: 'credits',
|
|
context: 'admin',
|
|
rawAmount: +amount,
|
|
balance: balanceConfig,
|
|
});
|
|
} catch (error) {
|
|
console.red('Error: ' + error.message);
|
|
console.error(error);
|
|
silentExit(1);
|
|
}
|
|
|
|
// Check the result
|
|
if (!result?.balance) {
|
|
console.red('Error: Something went wrong while updating the balance!');
|
|
console.error(result);
|
|
silentExit(1);
|
|
}
|
|
|
|
// Done!
|
|
console.green('Transaction created successfully!');
|
|
console.purple(`Amount: ${amount}
|
|
New Balance: ${result.balance}`);
|
|
silentExit(0);
|
|
})();
|
|
|
|
process.on('uncaughtException', (err) => {
|
|
if (!err.message.includes('fetch failed')) {
|
|
console.error('There was an uncaught error:');
|
|
console.error(err);
|
|
}
|
|
|
|
if (err.message.includes('fetch failed')) {
|
|
return;
|
|
} else {
|
|
process.exit(1);
|
|
}
|
|
});
|