Skip to content

Commit

Permalink
🖥️ feat: Match STDOUT Logs with Debug File Logs (danny-avila#1944)
Browse files Browse the repository at this point in the history
* chore: improve token balance logging post-request

* feat: match stdout logging with file debug logging when using DEBUG_CONSOLE
  • Loading branch information
danny-avila authored Mar 1, 2024
1 parent ef86b25 commit b2ef75e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion api/config/winston.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if (
transports.push(
new winston.transports.Console({
level: 'debug',
format: winston.format.combine(consoleFormat, debugTraverse),
format: winston.format.combine(fileFormat, debugTraverse),
}),
);
} else {
Expand Down
8 changes: 7 additions & 1 deletion api/models/Transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,17 @@ transactionSchema.statics.create = async function (transactionData) {
}

// Adjust the user's balance
return await Balance.findOneAndUpdate(
const updatedBalance = await Balance.findOneAndUpdate(
{ user: transaction.user },
{ $inc: { tokenCredits: transaction.tokenValue } },
{ upsert: true, new: true },
).lean();

return {
user: transaction.user.toString(),
[transaction.tokenType]: transaction.tokenValue,
balance: updatedBalance.tokenCredits,
};
};

module.exports = mongoose.model('Transaction', transactionSchema);
6 changes: 4 additions & 2 deletions api/models/spendTokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ const spendTokens = async (txData, tokenUsage) => {
prompt &&
completion &&
logger.debug('[spendTokens] Transaction data record against balance:', {
prompt,
completion,
user: prompt.user,
prompt: prompt.prompt,
completion: completion.completion,
balance: completion.balance,
});
} catch (err) {
logger.error('[spendTokens]', err);
Expand Down
2 changes: 1 addition & 1 deletion config/add-balance.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const connect = require('./connect');
}

// Check the result
if (!result?.tokenCredits) {
if (!result?.balance) {
console.red('Error: Something went wrong while updating the balance!');
console.error(result);
silentExit(1);
Expand Down

0 comments on commit b2ef75e

Please sign in to comment.