From 872dbb4151bc525260435a5691bcddac81a8ab5a Mon Sep 17 00:00:00 2001 From: Linus Gasser Date: Fri, 28 Nov 2025 17:11:26 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=99=20refactor:=20Remove=20Use=20of=20?= =?UTF-8?q?`CHECK=5FBALANCE`=20in=20Balance=20Scripts=20(#10702)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit config/set_balance.js and config/add_balance.js still use the CHECK_BALANCE variable. This PR makes them use the getBalanceConfig from the api. --- config/add-balance.js | 17 ++++++----------- config/set-balance.js | 13 ++++--------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/config/add-balance.js b/config/add-balance.js index ebf49df44f..0eeaa172dc 100644 --- a/config/add-balance.js +++ b/config/add-balance.js @@ -1,6 +1,6 @@ const path = require('path'); const mongoose = require('mongoose'); -const { isEnabled, getBalanceConfig } = require('@librechat/api'); +const { 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'); @@ -33,15 +33,12 @@ const connect = require('./connect'); // console.purple(`[DEBUG] Args Length: ${process.argv.length}`); } - if (!process.env.CHECK_BALANCE) { + const appConfig = await getAppConfig(); + const balanceConfig = getBalanceConfig(appConfig); + + if (!balanceConfig?.enabled) { 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`', + 'Error: Balance is not enabled. Use librechat.yaml to enable it', ); silentExit(1); } @@ -80,8 +77,6 @@ const connect = require('./connect'); */ let result; try { - const appConfig = await getAppConfig(); - const balanceConfig = getBalanceConfig(appConfig); result = await createTransaction({ user: user._id, tokenType: 'credits', diff --git a/config/set-balance.js b/config/set-balance.js index faa0c1dd16..2eac72af36 100644 --- a/config/set-balance.js +++ b/config/set-balance.js @@ -1,6 +1,6 @@ const path = require('path'); const mongoose = require('mongoose'); -const { isEnabled } = require('@librechat/api'); +const { getBalanceConfig } = require('@librechat/api'); const { User, Balance } = require('@librechat/data-schemas').createModels(mongoose); require('module-alias')({ base: path.resolve(__dirname, '..', 'api') }); const { askQuestion, silentExit } = require('./helpers'); @@ -31,15 +31,10 @@ const connect = require('./connect'); // console.purple(`[DEBUG] Args Length: ${process.argv.length}`); } - if (!process.env.CHECK_BALANCE) { + const balanceConfig = getBalanceConfig(); + if (!balanceConfig?.enabled) { 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`', + 'Error: Balance is not enabled. Use librechat.yaml to enable it', ); silentExit(1); }