Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-29 14:48:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: move endpoint up so it doesn't get eclipsed by get route for conversationId

Browse source
This commit is contained in:
Dustin Healy 2025-08-21 01:36:19 -07:00
parent 30e1b421ba
commit 637bbd2e29
1 changed files with 101 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

201
api/server/routes/messages.js
View file

@ -160,6 +160,107 @@ router.post('/artifact/:messageId', async (req, res) => {
}
});
router.get('/:conversationId/costs', validateMessageReq, async (req, res) => {
try {
const user = req.user.id;
const { conversationId } = req.params;
const [transactions, messages] = await Promise.all([
Transaction.find({
conversationId,
user,
tokenType: { $in: ['prompt', 'completion'] },
})
.select('tokenType tokenValue createdAt')
.sort({ createdAt: 1 })
.lean(),
Message.find({ conversationId, user })
.select('messageId isCreatedByUser tokenCount createdAt')
.sort({ createdAt: 1 })
.lean(),
]);
const userMsgs = messages.filter((m) => m.isCreatedByUser);
const aiMsgs = messages.filter((m) => !m.isCreatedByUser);
const perMessageMap = new Map();
for (const msg of messages) {
perMessageMap.set(msg.messageId, {
messageId: msg.messageId,
tokenType: msg.isCreatedByUser ? 'prompt' : 'completion',
tokenCount: msg.tokenCount ?? 0,
tokenValue: 0,
usd: 0,
});
}
let currentPrompt = 0;
let currentCompletion = 0;
let promptTokenValue = 0;
let completionTokenValue = 0;
for (const tx of transactions) {
const value = Math.abs(tx.tokenValue ?? 0);
if (tx.tokenType === 'prompt') {
promptTokenValue += value;
const target = userMsgs[currentPrompt] ?? userMsgs[userMsgs.length - 1];
if (target) {
const entry = perMessageMap.get(target.messageId);
entry.tokenValue += value;
perMessageMap.set(target.messageId, entry);
if (currentPrompt < userMsgs.length - 1) {
currentPrompt++;
}
}
} else if (tx.tokenType === 'completion') {
completionTokenValue += value;
const target = aiMsgs[currentCompletion] ?? aiMsgs[aiMsgs.length - 1];
if (target) {
const entry = perMessageMap.get(target.messageId);
entry.tokenValue += value;
perMessageMap.set(target.messageId, entry);
if (currentCompletion < aiMsgs.length - 1) {
currentCompletion++;
}
}
}
}
const perMessage = Array.from(perMessageMap.values()).map((entry) => ({
messageId: entry.messageId,
tokenType: entry.tokenType,
tokenCount: entry.tokenCount,
usd: entry.tokenValue / 1_000_000,
}));
const promptTokenCount = userMsgs.reduce((sum, m) => sum + (m.tokenCount ?? 0), 0);
const completionTokenCount = aiMsgs.reduce((sum, m) => sum + (m.tokenCount ?? 0), 0);
const totalTokenCount = promptTokenCount + completionTokenCount;
const totals = {
prompt: {
usd: promptTokenValue / 1_000_000,
tokenCount: promptTokenCount,
},
completion: {
usd: completionTokenValue / 1_000_000,
tokenCount: completionTokenCount,
},
total: {
usd: (promptTokenValue + completionTokenValue) / 1_000_000,
tokenCount: totalTokenCount,
},
};
const response = { conversationId, totals, perMessage };
res.status(200).json(response);
} catch (error) {
logger.error('Error fetching conversation costs:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
/* Note: It's necessary to add `validateMessageReq` within route definition for correct params */
router.get('/:conversationId', validateMessageReq, async (req, res) => {
try {
@ -294,104 +395,4 @@ router.delete('/:conversationId/:messageId', validateMessageReq, async (req, res
}
});
router.get('/:conversationId/costs', validateMessageReq, async (req, res) => {
try {
const user = req.user.id;
const { conversationId } = req.params;
const [transactions, messages] = await Promise.all([
Transaction.find({
conversationId,
user,
tokenType: { $in: ['prompt', 'completion'] },
})
.select('tokenType tokenValue createdAt')
.sort({ createdAt: 1 })
.lean(),
Message.find({ conversationId, user })
.select('messageId isCreatedByUser tokenCount createdAt')
.sort({ createdAt: 1 })
.lean(),
]);
const userMsgs = messages.filter((m) => m.isCreatedByUser);
const aiMsgs = messages.filter((m) => !m.isCreatedByUser);
const perMessageMap = new Map();
for (const msg of messages) {
perMessageMap.set(msg.messageId, {
messageId: msg.messageId,
tokenType: msg.isCreatedByUser ? 'prompt' : 'completion',
tokenCount: msg.tokenCount ?? 0,
tokenValue: 0,
usd: 0,
});
}
let currentPrompt = 0;
let currentCompletion = 0;
let promptTokenValue = 0;
let completionTokenValue = 0;
for (const tx of transactions) {
const value = Math.abs(tx.tokenValue ?? 0);
if (tx.tokenType === 'prompt') {
promptTokenValue += value;
const target = userMsgs[currentPrompt] ?? userMsgs[userMsgs.length - 1];
if (target) {
const entry = perMessageMap.get(target.messageId);
entry.tokenValue += value;
perMessageMap.set(target.messageId, entry);
if (currentPrompt < userMsgs.length - 1) {
currentPrompt++;
}
}
} else if (tx.tokenType === 'completion') {
completionTokenValue += value;
const target = aiMsgs[currentCompletion] ?? aiMsgs[aiMsgs.length - 1];
if (target) {
const entry = perMessageMap.get(target.messageId);
entry.tokenValue += value;
perMessageMap.set(target.messageId, entry);
if (currentCompletion < aiMsgs.length - 1) {
currentCompletion++;
}
}
}
}
const perMessage = Array.from(perMessageMap.values()).map((entry) => ({
messageId: entry.messageId,
tokenType: entry.tokenType,
tokenCount: entry.tokenCount,
usd: entry.tokenValue / 1_000_000,
}));
const promptTokenCount = userMsgs.reduce((sum, m) => sum + (m.tokenCount ?? 0), 0);
const completionTokenCount = aiMsgs.reduce((sum, m) => sum + (m.tokenCount ?? 0), 0);
const totalTokenCount = promptTokenCount + completionTokenCount;
const totals = {
prompt: {
usd: promptTokenValue / 1_000_000,
tokenCount: promptTokenCount,
},
completion: {
usd: completionTokenValue / 1_000_000,
tokenCount: completionTokenCount,
},
total: {
usd: (promptTokenValue + completionTokenValue) / 1_000_000,
tokenCount: totalTokenCount,
},
};
res.status(200).json({ conversationId, totals, perMessage });
} catch (error) {
logger.error('Error fetching conversation costs:', error);
res.status(500).json({ error: 'Internal server error' });
}
});
module.exports = router;