@futdevpro/nts-dynamo 1.11.26 → 1.11.27

package/src/_modules/discord-assistant/_services/dias-main.control-service.ts

@@ -9,8 +9,8 @@ import { DyNTS_global_settings } from '../../..';
 
 export abstract class DyNTS_DiAs_Main_ControlService extends DyNTS_DiAs_ServiceBase {
   
-  protected abstract override botIO_CS: DyNTS_DiAs_IO_ControlService;
-  protected abstract override getBotIOControlService(): DyNTS_DiAs_IO_ControlService;
+  /* protected abstract override botIO_CS: DyNTS_DiAs_IO_ControlService;
+  protected abstract override getBotIOControlService(): DyNTS_DiAs_IO_ControlService; */
 
   /* override async start(issuer: string): Promise<void> {
     try {

package/src/_modules/discord-assistant/_services/dias.service-base.ts

@@ -8,6 +8,7 @@ import { DyNTS_global_settings } from '../../../_collections/global-settings.con
 import { DyNTS_OAI_GPT_Message } from '../../open-ai/_models/interfaces/oai-gpt-message.interface';
 import { DyNTS_OAI_GPT_Message_Role } from '../../open-ai/_enums/oai-gpt-message-role.enum';
 import { DyNTS_DiAs_Util } from '../_collections/dias.util';
+import { DyNTS_DiAs_IO_ControlService } from './dias-io.control-service';
 
 
 export abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_ControlService {
@@ -17,10 +18,15 @@ export abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_ControlServ
   }
   readonly llmChat_CS: DyNTS_OAI_LLMChat_ServiceBase = this.getLLMChatControlService();
 
+  protected abstract override botIO_CS: DyNTS_DiAs_IO_ControlService;
+  protected abstract override getBotIOControlService(): DyNTS_DiAs_IO_ControlService;
+
   defaultSystemPrompt: string = DyNTS_DiAs_global_settings.defaultSystemPrompt;
 
-  protected constructor() {
-    super();
+  protected constructor(
+    dontSetupAutomatically?: boolean,
+  ) {
+    super(dontSetupAutomatically);
 
     DyNTS_global_settings.dias_settings ??= DyNTS_DiAs_global_settings;
 
@@ -28,9 +34,10 @@ export abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_ControlServ
   }
 
   async gatherDiscordMessagesForMessage(message: Message, limit: number = 100): Promise<Message[]> {
-    const channel = message.channel;
-    const userId = message.author.id;
+    return this.gatherDiscordMessagesForChannel(message.channel as TextChannel, message.author.id, limit);
+  }
 
+  async gatherDiscordMessagesForChannel(channel: TextChannel, userId: string, limit: number = 100): Promise<Message[]> {
     const messages: Message[] = await channel.messages.fetch({ limit: limit }).then(
       messages => messages.filter(
         msg => !DyNTS_DiAs_global_settings.skipConversationMessagesFlags.some(
@@ -54,13 +61,13 @@ export abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_ControlServ
     message: Message,
     issuer: string,
   ): Promise<DyNTS_OAI_GPT_Message[]> {
-
-    const messages = await this.gatherDiscordMessagesForMessage(message); 
+    const messages: Message[] = await this.gatherDiscordMessagesForMessage(message); 
 
     return DyNTS_DiAs_Util.convertDiscordMessagesToOAIConversation({
       messages: messages,
       botClientId: this.botClientId,
       botDisplayName: this.botDisplayName,
+      issuer: issuer,
     });
   }
 }

package/src/_modules/discord-bot/_collections/dibo-global-settings.conts.ts

@@ -36,7 +36,7 @@ export const DyNTS_DiBo_global_settings: DyNTS_DiBo_Global_Settings = {
   },
 
   channelSettings: {
-    reportChannelName: 'bot-report',
+    reportChannelName: 'bot-reports',
 
     defaultChannels: [
       'bot-help',

package/src/_modules/discord-bot/_collections/dibo-operations.util.ts

@@ -19,7 +19,7 @@ export class DyNTS_DiBo_Operations_Util {
     )
 
     if (!channel) {
-      DyFM_Log.error('No text channel found')
+      DyFM_Log.error(`No text channel found with name "${name}"`)
       return
     }
 
@@ -30,7 +30,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(channels, name)
     
     if (!channel.isTextBased()) {
-      throw new Error('Channel is not text based')
+      throw new Error(`Channel is not text based with name "${name}"`)
     }
 
     return channel as TextChannel
@@ -40,7 +40,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(channels, name)
     
     if (!channel.isVoiceBased()) {
-      throw new Error('Channel is not voice based')
+      throw new Error(`Channel is not voice based with name "${name}"`)
     }
 
     return channel as VoiceChannel
@@ -55,7 +55,7 @@ export class DyNTS_DiBo_Operations_Util {
       const reportMessage = `${client.user?.username} report for duty! ` +
         `(v${DyNTS_global_settings.systemVersion} ${DyNTS_global_settings.env_settings?.environment})`;
 
-      if (lastReportMessage.content === reportMessage) {
+      if (lastReportMessage?.content === reportMessage) {
         await this.deleteMessage(lastReportMessage).catch((error) => {
           DyFM_Log.error('Failed to delete message', error);
         });
@@ -78,7 +78,7 @@ export class DyNTS_DiBo_Operations_Util {
       channel.send(message)
       DyFM_Log.success('Message sent to channel', channel.name)
     } else {
-      DyFM_Log.error('Channel is not text based')
+      DyFM_Log.error(`Channel is not text based "${channelName}"`)
     }
   }
 
@@ -140,7 +140,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(guild.channels, channelName)
 
     if (!channel?.isTextBased()) {
-      DyFM_Log.error('Channel is not text based')
+      DyFM_Log.error(`Channel is not text based "${channelName}"`)
       return
     }
 
@@ -232,7 +232,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(guild.channels, channelName)
 
     if (!channel?.isTextBased()) {
-      DyFM_Log.error('Channel is not text based')
+      DyFM_Log.error(`Channel is not text based "${channelName}"`)
       return []
     }
 
@@ -331,7 +331,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(guild.channels, channelName)
 
     if (!channel?.isTextBased()) {
-      DyFM_Log.error('Channel is not text based')
+      DyFM_Log.error(`Channel is not text based with name "${channelName}"`)
       return
     }
 
@@ -347,7 +347,7 @@ export class DyNTS_DiBo_Operations_Util {
     const channel = this.findChannelByName(guild.channels, channelName)
 
     if (!channel?.isTextBased()) {
-      DyFM_Log.error('Channel is not text based')
+      DyFM_Log.error(`Channel is not text based with name "${channelName}"`)
       return
     }
     
@@ -369,6 +369,6 @@ export class DyNTS_DiBo_Operations_Util {
       DyFM_Log.error('Failed to delete message', error);
     });
 
-    DyFM_Log.success('Message deleted', message.id);
+    DyFM_Log.success('Message deleted:', message.content);
   }
 }

package/src/_modules/discord-bot/_services/dibo-commands.control-service.ts

@@ -16,11 +16,11 @@ export abstract class DyNTS_DiBo_Commands_ControlService extends DyNTS_Singleton
   }
 
   protected abstract getMainDiscordBotControlService(): DyNTS_DiBo_Main_ControlService;
-  protected readonly mainDiscordBot_CS: DyNTS_DiBo_Main_ControlService = 
+  protected readonly diAs_CS: DyNTS_DiBo_Main_ControlService = 
     this.getMainDiscordBotControlService();
 
   get discordServer(): Guild {
-    return this.mainDiscordBot_CS?.discordServer;
+    return this.diAs_CS?.discordServer;
   }
 
   protected constructor() {
@@ -45,7 +45,7 @@ export abstract class DyNTS_DiBo_Commands_ControlService extends DyNTS_Singleton
     try {
       let haveCommandOperator = false;
       let msg = message.content.replace(
-        `<@${this.mainDiscordBot_CS.client.user.id}>`, ''
+        `<@${this.diAs_CS.client.user.id}>`, ''
       ).trim();
 
       if (!DyNTS_DiBo_global_settings.commandSettings.commandOperator) {

package/src/_modules/discord-bot/_services/dibo-io.control-service.ts

@@ -32,6 +32,8 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
   protected abstract getCommandsControlService(): DyNTS_DiBo_Commands_ControlService;
   protected commands_CS: DyNTS_DiBo_Commands_ControlService;
 
+  dontSendErrorReply?: boolean;
+
   /* protected constructor() {
     super();
   }   */
@@ -86,9 +88,9 @@ export abstract class DyNTS_DiBo_IO_ControlService extends DyNTS_SingletonServic
     } catch (error) {
       DyFM_Error.logSimple('❌❌ Error handleNewMessage:', error);
 
-      if (DyNTS_DiBo_global_settings.debugLevel >= 1) {
+      if (!this.dontSendErrorReply && DyNTS_DiBo_global_settings.debugLevel >= 1) {
         await message.reply(
-          `[SYSTEM|ERROR] Error occurred while handling the message:\n` +
+          `[SYSTEM|ERROR|${DyNTS_global_settings.systemShortCodeName}|DyNTS-DiBo-IO-H0] Error occurred while handling the message:\n` +
           DyFM_Error.getAnyMessage(error)
         ).catch(error => {
           DyFM_Error.logSimple('❌❌ Error sending message to report channel:', error);

package/src/_modules/discord-bot/_services/dibo-main.control-service.ts

@@ -102,6 +102,7 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
       intents: DyNTS_global_settings.bot_settings.intents,
       partials: DyNTS_global_settings.bot_settings.partials,
     })
+    DyFM_Log.success('Discord client initialized');
     
     if (!dontSetupAutomatically) {
       this.setup('system-init');
@@ -172,6 +173,11 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
           DyNTS_GlobalService.globalErrorHandler(error);
           reject(error);
         });
+        if (this.debugLog) {
+          DyFM_Log.info('Error event registered\n\n', new Error().stack);
+        } else {
+          DyFM_Log.info('Error event registered');
+        }
 
         this.client.on('ready', async () => {
           if (DyNTS_DiBo_global_settings.debugLevel >= 1) {
@@ -193,6 +199,11 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
           DyFM_Log.success('Discord Bot setup complete')
           resolve();
         });
+        if (this.debugLog) {
+          DyFM_Log.info('Ready event registered\n\n', new Error().stack);
+        } else {
+          DyFM_Log.info('Ready event registered');
+        }
 
         this.client.on('messageCreate', (message: Message) => {
           try {
@@ -201,6 +212,11 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
             DyFM_Log.error('Error handling new message:', error);
           }
         });
+        if (this.debugLog) {
+          DyFM_Log.info('Message create event registered\n\n', new Error().stack);
+        } else {
+          DyFM_Log.info('Message create event registered');
+        }
 
         process.on('exit', () => {
           try {
@@ -214,6 +230,11 @@ export abstract class DyNTS_DiBo_Main_ControlService extends DyNTS_SingletonServ
             DyFM_Log.error('Error sending message to report channel:', error);
           }
         });
+        if (this.debugLog) {
+          DyFM_Log.info('Exit event registered\n\n', new Error().stack);
+        } else {
+          DyFM_Log.info('Exit event registered');
+        }
 
         this.client.login(DyNTS_global_settings.env_settings.discord.token).catch((error) => {
           reject(error);

package/src/_modules/mock/socket-server.mock.spec.ts

@@ -20,7 +20,7 @@ describe('| DyNTS_SocketServer_Mock', () => {
 
     expect(params).toBeInstanceOf(DyNTS_SocketServerService_Params);
     expect(params.name).toBe('test');
-    expect(params.port).toBe(9393);
+    expect(params.port).toBe(19393); // Updated from 9393 to 19393
   });
 
   it('| should return an empty array for incoming events', () => {

package/src/_modules/mock/socket-server.mock.ts

@@ -1,5 +1,6 @@
 import { DyFM_SocketEvent } from '@futdevpro/fsm-dynamo/socket';
 import { Socket } from 'socket.io';
+import * as net from 'net';
 
 import {
   DyNTS_SocketPresence
@@ -9,8 +10,17 @@ import {
 } from '../socket/_models/socket-server-service-params.control-model';
 import { DyNTS_SocketServerService } from '../socket/_services/socket-server.service';
 
-
-
+/**
+ * Utility function to find an available port starting from a base port
+ */
+const findAvailablePort = (basePort: number): number => {
+  return basePort; // For now, return the base port, but this could be enhanced
+};
+
+/**
+ * Mock Socket Server Service for testing purposes
+ * Uses a non-privileged port to avoid EACCES errors on Windows
+ */
 export class DyNTS_SocketServer_Mock extends 
   DyNTS_SocketServerService<DyNTS_SocketPresence> {
   
@@ -21,7 +31,7 @@ export class DyNTS_SocketServer_Mock extends
   getServiceParams(): DyNTS_SocketServerService_Params<any> {
     return new DyNTS_SocketServerService_Params({
       name: 'test',
-      port: 9393,
+      port: findAvailablePort(19393), // Changed from 9393 to 19393 (non-privileged port)
     });
   }
 

package/src/_modules/open-ai/_services/oai-llm-chat.service-base.ts

@@ -1,7 +1,7 @@
 import { OpenAI } from 'openai';
 
 import { DyFM_OpenAI_Settings, DyFM_OpenAIModel, DyFM_GPTCall_Settings } from '@futdevpro/fsm-dynamo/open-ai';
-import { DyFM_AnyError, DyFM_clone, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull } from '@futdevpro/fsm-dynamo';
+import { DyFM_AnyError, DyFM_clone, DyFM_Error, DyFM_Error_Settings, DyFM_getLocalStackLocation, DyFM_Log, DyFM_notNull, DyFM_Shared } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { DyNTS_OAI_GPT_Message } from '../_models/interfaces/oai-gpt-message.interface';
@@ -9,7 +9,7 @@ import { ChatCompletion } from 'openai/resources';
 import { ChatCompletionCreateParamsBase, ChatCompletionMessageParam } from 'openai/resources/chat/completions';
 import { DyNTS_OAI_GPT_Message_Role } from '../_enums/oai-gpt-message-role.enum';
 import { DyNTS_OAI_LLM_Predefined_Requests } from '../_models/interfaces/oai-llm-predefined-requests.interface';
-import { DyFM_safeParseJSON, DyFM_safeParseList, DyNTS_OAI_LLM_ServiceBase } from './oai-llm.service-base';
+import { DyNTS_OAI_LLM_ServiceBase } from './oai-llm.service-base';
 import { DyNTS_OAI_global_settings } from '../_collections/oai-global-settings.const';
 
 
@@ -50,7 +50,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return answer.toUpperCase().includes(this.predefinedRequests.yesNo.upperCaseYes);
   }
-  askYesNoQuestionInConversation = this.yesNoQuestionInConversation;
+  askYesNoQuestionInConversation: typeof this.yesNoQuestionInConversation = this.yesNoQuestionInConversation;
 
   /**
    * Asks the AI to answer a simple question
@@ -72,7 +72,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return await this.getQuestionAnswerInConversation(set);
   }
-  askSimpleQuestionInConversation = this.simpleQuestionInConversation;
+  askSimpleQuestionInConversation: typeof this.simpleQuestionInConversation = this.simpleQuestionInConversation;
 
   /**
    * Asks the AI to answer a percentage question
@@ -107,7 +107,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return +answer;
   }
-  askPercentageQuestionInConversation = this.percentageQuestionInConversation;
+  askPercentageQuestionInConversation: typeof this.percentageQuestionInConversation = this.percentageQuestionInConversation;
   
 
   /**
@@ -146,7 +146,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return null;
   }
-  askSelectQuestionInConversation = this.selectQuestionInConversation;
+  askSelectQuestionInConversation: typeof this.selectQuestionInConversation = this.selectQuestionInConversation;
 
   /**
    * Asks the AI to select one of the options from the list
@@ -177,9 +177,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askRequestSelectInConversation = this.requestSelectInConversation;
+  askRequestSelectInConversation: typeof this.requestSelectInConversation = this.requestSelectInConversation;
 
   /**
    * Asks the AI to select one or more of the options from the list
@@ -218,7 +218,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     return result;
   }
-  askMultipleSelectQuestionWithOptionsInConversation = this.multipleSelectQuestionWithOptionsInConversation;
+  askMultipleSelectQuestionWithOptionsInConversation: typeof this.multipleSelectQuestionWithOptionsInConversation = this.multipleSelectQuestionWithOptionsInConversation;
 
   /**
    * Asks the AI to select one or more of the options from the list
@@ -249,9 +249,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseList<T[]>(answer);
+    return DyFM_Shared.safeParseList<T[]>(answer);
   }
-  askRequestMultipleSelectInConversation = this.requestMultipleSelectInConversation;
+  askRequestMultipleSelectInConversation: typeof this.requestMultipleSelectInConversation = this.requestMultipleSelectInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object
@@ -279,9 +279,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
     
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionInConversation = this.jsonQuestionInConversation;
+  askJsonQuestionInConversation: typeof this.jsonQuestionInConversation = this.jsonQuestionInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object with specific key descriptions
@@ -314,9 +314,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionWithKeysDescriptionInConversation = this.jsonQuestionWithKeysDescriptionInConversation;
+  askJsonQuestionWithKeysDescriptionInConversation: typeof this.jsonQuestionWithKeysDescriptionInConversation = this.jsonQuestionWithKeysDescriptionInConversation;
 
   /**
    * Asks the AI to answer a question that must result a JSON object with specific keys
@@ -349,9 +349,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
-  askJsonQuestionWithExactKeysInConversation = this.jsonQuestionWithExactKeysInConversation;
+  askJsonQuestionWithExactKeysInConversation: typeof this.jsonQuestionWithExactKeysInConversation = this.jsonQuestionWithExactKeysInConversation;
 
   /**
    * Asks the AI to answer a question that must result a list of strings
@@ -379,9 +379,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.getQuestionAnswerInConversation(set);
 
-    return DyFM_safeParseList(answer);
+    return DyFM_Shared.safeParseList(answer);
   }
-  askListQuestionInConversation = this.listQuestionInConversation;
+  askListQuestionInConversation: typeof this.listQuestionInConversation = this.listQuestionInConversation;
 
   /**
    * Asks the AI to answer a question
@@ -412,7 +412,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
   async getQuestionAnswerInConversation(
     set: {
       conversation: DyNTS_OAI_GPT_Message[],
-      question: string, 
+      question?: string, 
       issuer: string,
       settings?: DyFM_GPTCall_Settings,
       debugLog?: boolean,
@@ -426,8 +426,9 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
     });
   }
   /* getQuestionAnswerInConversation = this.getAnswerInConversation; */
-  getQuestionInConversation = this.getQuestionAnswerInConversation;
-  askQuestionInConversation = this.getQuestionAnswerInConversation;
+  getQuestionInConversation: typeof this.getQuestionAnswerInConversation = this.getQuestionAnswerInConversation;
+  askQuestionInConversation: typeof this.getQuestionAnswerInConversation = this.getQuestionAnswerInConversation;
+  getConversationAnswer: typeof this.getAnswerInConversation = this.getAnswerInConversation;
   
   /**
    * Asks the AI to answer a question using the whole conversation
@@ -500,6 +501,8 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
 
       // conversation shortening
       const shortenedConversation = this.shortenConversation(set);
+
+      this.validateConversation(shortenedConversation);
       
       this.logConversation({
         ...set,
@@ -526,7 +529,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
       });
     }
   }
-  resolveSimpleUserMessageInConversation = this.resolveConversation;
+  resolveSimpleUserMessageInConversation: typeof this.resolveConversation = this.resolveConversation;
 
   protected shortenConversation(
     set: {
@@ -599,6 +602,8 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase {
     }
   ) {
     if (set.debugLog || this.debugLog) {
+      DyFM_Log.info('Conversation', DyFM_getLocalStackLocation());
+
       set.conversation.forEach(message => {
         console.log(
           ` - ${message.role}: ${message.content.replace(set.replaceThisInLog, this.defaultLogReplacer)}`

package/src/_modules/open-ai/_services/oai-llm.service-base.ts

@@ -1,7 +1,7 @@
 import { OpenAI } from 'openai';
 
 import { DyFM_OpenAI_Settings, DyFM_OpenAIModel, DyFM_GPTCall_Settings } from '@futdevpro/fsm-dynamo/open-ai';
-import { DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull } from '@futdevpro/fsm-dynamo';
+import { DyFM_AnyError, DyFM_Error, DyFM_Error_Settings, DyFM_Log, DyFM_notNull, DyFM_Shared } from '@futdevpro/fsm-dynamo';
 
 import { DyNTS_global_settings } from '../../../_collections/global-settings.const';
 import { DyNTS_OAI_GPT_Message } from '../_models/interfaces/oai-gpt-message.interface';
@@ -193,7 +193,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link requestSelect} */
   selectRequest = this.requestSelect;
@@ -263,7 +263,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
     
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseList<T[]>(answer);
+    return DyFM_Shared.safeParseList<T[]>(answer);
   }
   /** the exact same as {@link requestMultipleSelect} */
   multipleSelectRequest = this.requestMultipleSelect;
@@ -291,7 +291,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
     
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestion} */
   jsonQuestion = this.askJSONQuestion;
@@ -324,7 +324,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestionWithKeysDescription} */
   jsonQuestionWithKeysDescription = this.askJSONQuestionWithKeysDescription;
@@ -357,7 +357,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseJSON<T>(answer);
+    return DyFM_Shared.safeParseJSON<T>(answer);
   }
   /** the exact same as {@link askJSONQuestionWithExactKeys} */
   jsonQuestionWithExactKeys = this.askJSONQuestionWithExactKeys;
@@ -385,7 +385,7 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
     const answer = await this.askQuestion(set);
 
-    return DyFM_safeParseList(answer);
+    return DyFM_Shared.safeParseList<string[]>(answer);
   }
   /** the exact same as {@link askListQuestion} */
   listQuestion = this.askListQuestion;
@@ -597,6 +597,30 @@ export class DyNTS_OAI_LLM_ServiceBase {
       content: settings?.systemPrompt || this.defaultSystemPrompt,
     };
   }
+
+  protected validateConversation(conversation: DyNTS_OAI_GPT_Message[]): void {
+    conversation.forEach((message: DyNTS_OAI_GPT_Message, index: number) => {
+      if (!message.role) {
+        throw new DyFM_Error({
+          message: `Message has no role at index ${index}`,
+          additionalContent: {
+            invalidMessage: message,
+            conversation: conversation,
+          }
+        });
+      }
+
+      if (!message.content) {
+        throw new DyFM_Error({
+          message: `Message has no content at index ${index}`,
+          additionalContent: {
+            invalidMessage: message,
+            conversation: conversation,
+          }
+        });
+      }
+    });
+  }
   
   protected getDefaultErrorSettings(
     fnName: string, 
@@ -618,92 +642,3 @@ export class DyNTS_OAI_LLM_ServiceBase {
 
   //#endregion
 }
-
-/**
- * parses the JSON list, if it fails, it returns the answer as a single item in an array
- * 
- * (uses {@link DyFM_safeParseJSON})
- * @deprecated use {@link DyFM_Shared.safeParseList} instead
- */
-export function DyFM_safeParseList<T extends Array<any>>(
-  textedJSON: string, 
-  disableErrorLog?: boolean
-): T {
-  const parsed = DyFM_safeParseJSON<T>(textedJSON, true);
-
-  if (Array.isArray(parsed)) {
-    return parsed;
-  } else if (typeof parsed === 'object') {
-    if (!disableErrorLog) {
-      DyFM_Log.warn(
-        'DyFM_safeParseList result is an object, returning its values', 
-        {
-          parsed: parsed,
-        }
-      );
-    }
-
-    return Object.values(parsed) as T;
-  } else {
-
-    if (!disableErrorLog) {
-      DyFM_Log.warn(
-        'DyFM_safeParseList result is not an array or object, returning it as a single item', 
-        {
-          parsed: parsed,
-        }
-      );
-    }
-
-    return [ parsed ] as string[] as T;
-  }
-}
-
-/**
- * parses the JSON, if it fails, it returns { unparsableResult: textedJSON }
- * 
- * (uses {@link DyFM_failableSafeParseJSON})
- * @deprecated use {@link DyFM_Shared.safeParseJSON} instead
- */
-export function DyFM_safeParseJSON<T = any>(
-  textedJSON: string,
-  disableErrorLog?: boolean
-): T | { unparsableResult: string } {
-  try {
-    return DyFM_failableSafeParseJSON(textedJSON);
-  } catch (error) {
-    if (!disableErrorLog) {
-      DyFM_Log.error(
-        'Unable to parse JSON answer:', 
-        {
-          unparsedJSON: textedJSON,
-          error: error,
-        }
-      );
-    }
-
-    return { unparsableResult: textedJSON };
-  }
-}
-
-/**
- * parses the JSON, if it fails, it throws an error
- * (also will extract the JSON from "```json ... ```" wrapper)
- * @deprecated use {@link DyFM_Shared.failableSafeParseJSON} instead
- */
-export function DyFM_failableSafeParseJSON<T = any>(textedJSON: string): T {
-  if (!textedJSON) {
-    throw new Error(`No content provided to JSON parse ("${textedJSON}")`);
-  }
-
-  const match = textedJSON.match(/```json(.*)```/s);
-  textedJSON = textedJSON.replaceAll('\n', '');
-
-  if (match) {
-    return JSON.parse(match[1].replaceAll('\n', ''));
-  } else {
-    return JSON.parse(
-      textedJSON.replaceAll('```json', '').replaceAll('```', '')
-    );
-  }
-}