Fix 400 Can't add messages to thread_X while a run run_X is active and more.

src/discord/commands/global/d.ai.ts

@@ -48,7 +48,7 @@ import {
 import { SlashCommand } from '../../@types/commandDef';
 import { embedTemplate } from '../../utils/embedTemplate';
 import commandContext from '../../utils/context';
-import aiChat, { aiModerate } from '../../../global/commands/g.ai';
+import { aiModerate, handleAiMessageQueue } from '../../../global/commands/g.ai';
 
 /* TODO
 * only direct @ message should trigger a response
@@ -2175,7 +2175,7 @@ export async function aiMessage(
   }, 30000); // Failsafe to stop typing indicator after 30 seconds
 
   try {
-    const chatResponse = await aiChat(aiPersona, messageList, messageData, attachmentInfo);
+    const chatResponse = await handleAiMessageQueue(aiPersona, messageList, messageData, attachmentInfo);
     response = chatResponse.response;
     promptTokens = chatResponse.promptTokens;
     completionTokens = chatResponse.completionTokens;

src/discord/commands/guild/d.admin.ts

@@ -83,11 +83,11 @@
       'Content-Type': 'application/json',
     },
   }).then(() => {
-    console.log('Avatar set successfully');
+    log.info(F, 'Avatar set successfully');
     interaction.editReply('Avatar set successfully');
     return true;
   }).catch((error: Error) => {
-    console.error(`Error setting avatar: ${error.message}`);
+    log.error(F, `Error setting avatar: ${error.message}`);
     interaction.editReply('Error setting avatar');
     return false;
   });
@@ -107,11 +107,11 @@
       'Content-Type': 'application/json',
     },
   }).then(() => {
-    console.log('Banner set successfully');
+    log.info(F, 'Banner set successfully');
     interaction.editReply('Banner set successfully');
     return true;
   }).catch((error: Error) => {
-    console.error(`Error setting banner: ${error.message}`);
+    log.error(F, `Error setting banner: ${error.message}`);
     interaction.editReply('Error setting banner');
     return false;
   });
@@ -191,7 +191,7 @@
   }
 
   const levelPoints = await findXPfromLevel(level);
   log.debug(F, `Overwriting user data for user ${userData.id} in category ${category} type ${type} to level ${level} with ${levelPoints} XP points.`);
 
   try {
     const result = await db.user_experience.updateMany({
@@ -206,12 +206,12 @@
         total_points: levelPoints,
       },
     });
-    console.log(`Update result: ${JSON.stringify(result)}`);
+    log.info(F, `Update result: ${JSON.stringify(result)}`);
   } catch (error) {
-    console.error(`Error updating database: ${(error as Error).message}`);
+    log.error(F, `Error updating database: ${(error as Error).message}`);
   }
 
   await interaction.editReply(`User level and points updated for category ${category} to level ${level} with ${levelPoints} points.`);
 }
 
 export const dAdmin: SlashCommand = {
@@ -287,7 +287,7 @@
     if (!interaction.channel) return false;
     if (!interaction.guild) return false;
     log.info(F, await commandContext(interaction));
     const command = interaction.options.getSubcommand() as 'restart' | 'rebuild' | 'deploy' | 'setstatus' | 'setavatar' | 'setbanner' | 'overwriteuserdata';
     // By default we want to make the reply private
     await interaction.deferReply({ ephemeral: true });
     // eslint-disable-next-line sonarjs/no-small-switch
@@ -313,7 +313,7 @@
         break;
       }
       case 'setstatus': {
         await setStatus(interaction, interaction.options.getString('prefix') as string, interaction.options.getString('status') as string);
         break;
       }
       case 'overwriteuserdata': {

src/global/commands/g.ai.ts

@@ -25,6 +25,26 @@ const openAi = new OpenAI({
 
 const googleAi = new GoogleGenerativeAI(env.GEMINI_KEY);
 
+type UserQueue = {
+  queue: {
+    aiPersona: ai_personas;
+    messages: { role: 'user'; content: string }[];
+    messageData: Message<boolean>;
+    attachmentInfo: {
+      url: string | null;
+      mimeType: string | null;
+    };
+    resolve: (value: {
+      response: string;
+      promptTokens: number;
+      completionTokens: number;
+    }) => void;
+  }[];
+  isProcessing: boolean;
+};
+
+const userQueues = new Map<string, UserQueue>();
+
 type ModerationResult = {
   category: string,
   value: number,
@@ -888,6 +908,90 @@ export default async function aiChat(
   return openAiConversation(aiPersona, messages, messageData);
 }
 
+// Function to process the next message in the user's queue
+async function processNextMessage(userId: string) {
+  const userQueue = userQueues.get(userId);
+
+  // If userQueue is null or undefined, exit the function immediately
+  if (!userQueue) return;
+
+  // If the queue is empty, reset isProcessing to false and exit
+  if (userQueue.queue.length === 0) {
+    userQueue.isProcessing = false;
+    return;
+  }
+
+  userQueue.isProcessing = true; // Mark as processing
+
+  // Ensure the queue has an item before destructuring
+  const nextMessage = userQueue.queue.shift();
+  if (!nextMessage) {
+    // Handle case where there’s no next message in the queue, if needed
+    return;
+  }
+
+  const {
+    aiPersona, messages, messageData, attachmentInfo, resolve,
+  } = nextMessage;
+
+  try {
+    // Call the aiChat function and destructure the needed response data
+    const { response, promptTokens, completionTokens } = await aiChat(
+      aiPersona,
+      messages,
+      messageData,
+      attachmentInfo,
+    );
+
+    resolve({ response, promptTokens, completionTokens });
+  } catch (error) {
+    log.error(F, `Error processing message for user: ${userId} - error: ${error}`);
+    resolve({ response: 'Error', promptTokens: 0, completionTokens: 0 });
+  } finally {
+    // Process the next message after this one is done
+    processNextMessage(userId);
+  }
+}
+
+// Main function for aiChat to handle incoming messages and return a Promise with response data
+export function handleAiMessageQueue(
+  aiPersona: ai_personas,
+  messages: { role: 'user'; content: string }[],
+  messageData: Message<boolean>,
+  attachmentInfo: { url: string | null; mimeType: string | null },
+): Promise<{
+    response: string;
+    promptTokens: number;
+    completionTokens: number;
+  }> {
+  if (!userQueues.has(messageData.author.id)) {
+    userQueues.set(messageData.author.id, { queue: [], isProcessing: false });
+  }
+
+  const userQueue = userQueues.get(messageData.author.id);
+
+  if (!userQueue) {
+    // Return a rejected promise if userQueue is undefined
+    return Promise.reject(new Error(`User queue could not be initialized for user ${messageData.author.id}`));
+  }
+
+  // Push the new message data into the user's queue
+  return new Promise(resolve => {
+    userQueue.queue.push({
+      aiPersona,
+      messages,
+      messageData,
+      attachmentInfo,
+      resolve,
+    });
+
+    // If the user is not currently processing, start processing
+    if (!userQueue.isProcessing) {
+      processNextMessage(messageData.author.id);
+    }
+  });
+}
+
 export async function aiFlairMod(
   aiPersona:ai_personas,
   messages: OpenAI.Chat.ChatCompletionMessageParam [],
@@ -1038,7 +1142,7 @@ export async function aiTranslate(
   let completionTokens = 0;
   if (!env.OPENAI_API_ORG || !env.OPENAI_API_KEY) return { response, promptTokens, completionTokens };
 
-  const model = 'gpt-3.5-turbo-1106';
+  const model = 'gpt-4o-mini';
   const chatCompletionMessages = [{
     role: 'system',
     content: `You will translate whatever the user sends to their desired language. Their desired language or language code is: ${target_language}.`,