From b2ef75e0099797391d89d48f698b4816a6083423 Mon Sep 17 00:00:00 2001
From: Danny Avila <messagedaniel@protonmail.com>
Date: Fri, 1 Mar 2024 13:42:04 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=96=A5=EF=B8=8F=20feat:=20Match=20STDOUT?=
 =?UTF-8?q?=20Logs=20with=20Debug=20File=20Logs=20(#1944)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: improve token balance logging post-request

* feat: match stdout logging with file debug logging when using DEBUG_CONSOLE
---
 api/config/winston.js     | 2 +-
 api/models/Transaction.js | 8 +++++++-
 api/models/spendTokens.js | 6 ++++--
 config/add-balance.js     | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/api/config/winston.js b/api/config/winston.js
index 6cba153f16..0c167b807f 100644
--- a/api/config/winston.js
+++ b/api/config/winston.js
@@ -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 {
diff --git a/api/models/Transaction.js b/api/models/Transaction.js
index e608203592..dcca3315a4 100644
--- a/api/models/Transaction.js
+++ b/api/models/Transaction.js
@@ -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);
diff --git a/api/models/spendTokens.js b/api/models/spendTokens.js
index f52075b13d..3d83581762 100644
--- a/api/models/spendTokens.js
+++ b/api/models/spendTokens.js
@@ -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);
diff --git a/config/add-balance.js b/config/add-balance.js
index 69caab8a0f..2527dad96b 100644
--- a/config/add-balance.js
+++ b/config/add-balance.js
@@ -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);