Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

📃 feat: add list-balances, remove-user, and improve User scripts #1418

Merged
merged 2 commits into from
Dec 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions config/add-balance.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
const path = require('path');
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
const { askQuestion, silentExit } = require('./helpers');
const { askQuestion, silentExit, connectWithTimeout } = require('./helpers');
const Transaction = require('~/models/Transaction');
const connectDb = require('~/lib/db/connectDb');
const User = require('~/models/User');

(async () => {
/**
* Connect to the database
* - If it takes a while, we'll warn the user
*/
// Warn the user if this is taking a while
let timeout = setTimeout(() => {
console.orange(
'This is taking a while... You may need to check your connection if this fails.',
);
timeout = setTimeout(() => {
console.orange('Still going... Might as well assume the connection failed...');
timeout = setTimeout(() => {
console.orange('Error incoming in 3... 2... 1...');
}, 13000);
}, 10000);
}, 5000);
// Attempt to connect to the database
try {
console.orange('Warming up the engines...');
await connectDb();
clearTimeout(timeout);
} catch (e) {
console.error(e);
silentExit(1);
}
await connectWithTimeout();

/**
* Show the welcome / help menu
Expand Down
29 changes: 2 additions & 27 deletions config/ban-user.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
const path = require('path');
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
const { askQuestion, silentExit } = require('./helpers');
const { askQuestion, silentExit, connectWithTimeout } = require('./helpers');
const banViolation = require('~/cache/banViolation');
const connectDb = require('~/lib/db/connectDb');
const User = require('~/models/User');

(async () => {
/**
* Connect to the database
* - If it takes a while, we'll warn the user
*/
// Warn the user if this is taking a while
let timeout = setTimeout(() => {
console.orange(
'This is taking a while... You may need to check your connection if this fails.',
);
timeout = setTimeout(() => {
console.orange('Still going... Might as well assume the connection failed...');
timeout = setTimeout(() => {
console.orange('Error incoming in 3... 2... 1...');
}, 13000);
}, 10000);
}, 5000);
// Attempt to connect to the database
try {
console.orange('Warming up the engines...');
await connectDb();
clearTimeout(timeout);
} catch (e) {
console.error(e);
silentExit(1);
}
await connectWithTimeout();

console.purple('---------------------');
console.purple('Ban a user account!');
Expand Down
29 changes: 2 additions & 27 deletions config/create-user.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
const path = require('path');
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
const { registerUser } = require('~/server/services/AuthService');
const { askQuestion, silentExit } = require('./helpers');
const connectDb = require('~/lib/db/connectDb');
const { askQuestion, silentExit, connectWithTimeout } = require('./helpers');
const User = require('~/models/User');

(async () => {
/**
* Connect to the database
* - If it takes a while, we'll warn the user
*/
// Warn the user if this is taking a while
let timeout = setTimeout(() => {
console.orange(
'This is taking a while... You may need to check your connection if this fails.',
);
timeout = setTimeout(() => {
console.orange('Still going... Might as well assume the connection failed...');
timeout = setTimeout(() => {
console.orange('Error incoming in 3... 2... 1...');
}, 13000);
}, 10000);
}, 5000);
// Attempt to connect to the database
try {
console.orange('Warming up the engines...');
await connectDb();
clearTimeout(timeout);
} catch (e) {
console.error(e);
silentExit(1);
}
await connectWithTimeout();

/**
* Show the welcome / help menu
Expand Down
48 changes: 48 additions & 0 deletions config/delete-user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
const path = require('path');
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
const { connectWithTimeout, askQuestion, silentExit } = require('./helpers');
const User = require('~/models/User');

(async () => {
await connectWithTimeout();

/**
* Show the welcome / help menu
*/
console.purple('---------------');
console.purple('Deleting a user');
console.purple('---------------');

let email = '';
if (process.argv.length >= 3) {
email = process.argv[2];
} else {
email = await askQuestion('Email:');
}
let user = await User.findOne({ email: email });
if (user !== null) {
if ((await askQuestion(`Delete user ${user}?`)) === 'y') {
user = await User.findOneAndDelete({ _id: user._id });
if (user !== null) {
console.yellow(`Deleted user ${user}`);
} else {
console.yellow(`Couldn't delete user with email ${email}`);
}
}
} else {
console.yellow(`Didn't find user with email ${email}`);
}

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')) {
process.exit(1);
}
});
29 changes: 29 additions & 0 deletions config/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const fs = require('fs');
const path = require('path');
const readline = require('readline');
const { execSync } = require('child_process');
const { connectDb } = require('@librechat/backend/lib/db');

const askQuestion = (query) => {
const rl = readline.createInterface({
Expand Down Expand Up @@ -43,6 +44,33 @@ const silentExit = (code = 0) => {
process.exit(code);
};

async function connectWithTimeout() {
/**
* Connect to the database
* - If it takes a while, we'll warn the user
*/
let timeout = setTimeout(() => {
console.orange(
'This is taking a while... You may need to check your connection if this fails.',
);
timeout = setTimeout(() => {
console.orange('Still going... Might as well assume the connection failed...');
timeout = setTimeout(() => {
console.orange('Error incoming in 3... 2... 1...');
}, 13000);
}, 10000);
}, 5000);
// Attempt to connect to the database
try {
console.orange('Warming up the engines...');
await connectDb();
clearTimeout(timeout);
} catch (e) {
console.error(e);
silentExit(1);
}
}

// Set the console colours
console.orange = (msg) => console.log('\x1b[33m%s\x1b[0m', msg);
console.green = (msg) => console.log('\x1b[32m%s\x1b[0m', msg);
Expand All @@ -58,5 +86,6 @@ module.exports = {
askQuestion,
silentExit,
isDockerRunning,
connectWithTimeout,
deleteNodeModules,
};
39 changes: 39 additions & 0 deletions config/list-balances.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
const path = require('path');
require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
const { connectWithTimeout, silentExit } = require('./helpers');
const Balance = require('~/models/Balance');
const User = require('~/models/User');

(async () => {
await connectWithTimeout();

/**
* Show the welcome / help menu
*/
console.purple('-----------------------------');
console.purple('Show the balance of all users');
console.purple('-----------------------------');

let users = await User.find({});
for (const user of users) {
let balance = await Balance.findOne({ user: user._id });
if (balance !== null) {
console.green(`User ${user.name} has a balance of ${balance.tokenCredits}`);
} else {
console.yellow(`User ${user.name} has no 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')) {
process.exit(1);
}
});
8 changes: 8 additions & 0 deletions docs/features/token_usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ npm run add-balance danny@librechat.ai 1000

This works well to track your own usage for personal use; 1000 credits = $0.001 (1 mill USD)

## Listing of balances

To see the balances of your users, you can run:

```bash
npm run list-balances
```

## Notes

- With summarization enabled, you will be blocked from making an API request if the cost of the content that you need to summarize + your messages payload exceeds the current balance
Expand Down
2 changes: 2 additions & 0 deletions docs/install/configuration/dotenv.md
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ see: [Token Usage](../../features/token_usage.md)

- To manually add balances, run the following command:`npm run add-balance`
- You can also specify the email and token credit amount to add, e.g.:`npm run add-balance example@example.com 1000`
- To list the balance of every user: `npm run list-balances`

> **Note:** 1000 credits = $0.001 (1 mill USD)

Expand All @@ -600,6 +601,7 @@ see: [User/Auth System](../configuration/user_auth_system.md)
- `ALLOW_SOCIAL_REGISTRATION`: Enable or disable registration of new user using various social network. Set to `true` or `false` to enable or disable.

> **Quick Tip:** Even with registration disabled, add users directly to the database using `npm run create-user`.
> **Quick Tip:** With registration disabled, you can delete a user with `npm run delete-user email@domain.com`.

```bash
ALLOW_EMAIL_LOGIN=true
Expand Down
1 change: 1 addition & 0 deletions docs/install/configuration/user_auth_system.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Here's an overview of the general configuration, located in the `.env` file at t
> **Note:** OpenID does not support the ability to disable only registration.

>> **Quick Tip:** Even with registration disabled, add users directly to the database using `npm run create-user`. If you can't get npm to work, try `sudo docker exec -ti LibreChat sh` first to "ssh" into the container.
>> **Quick Tip:** To delete a user, you can run `docker-compose exec api npm run delete-user email@domain.com`

![image](https://github.com/danny-avila/LibreChat/assets/81851188/52a37d1d-7392-4a9a-a79f-90ed2da7f841)

Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"scripts": {
"update": "node config/update.js",
"add-balance": "node config/add-balance.js",
"list-balances": "node config/list-balances.js",
"rebuild:package-lock": "node config/packages",
"reinstall": "node config/update.js -l -g",
"b:reinstall": "bun config/update.js -b -l -g",
Expand All @@ -25,6 +26,7 @@
"upgrade": "node config/upgrade.js",
"create-user": "node config/create-user.js",
"ban-user": "node config/ban-user.js",
"delete-user": "node config/delete-user.js",
"backend": "cross-env NODE_ENV=production node api/server/index.js",
"backend:dev": "cross-env NODE_ENV=development npx nodemon api/server/index.js",
"backend:stop": "node config/stop-backend.js",
Expand Down Expand Up @@ -53,7 +55,8 @@
"b:client:dev": "cd client && bun run b:dev",
"b:test:client": "cd client && bun run b:test",
"b:test:api": "cd api && bun run b:test",
"b:balance": "bun config/add-balance.js"
"b:balance": "bun config/add-balance.js",
"b:list-balances": "bun config/list-balances.js"
},
"repository": {
"type": "git",
Expand Down