refactor(ChatGPTClient.js, OpenAIClient.js): improve code readability…

… and consistency - In ChatGPTClient.js, update the roleLabel and messageString variables to handle cases where the message object does not have an isCreatedByUser property or a role property with a value of 'user'. - In OpenAIClient.js, rename the freeAndInitializeEncoder method to freeAndResetEncoder to better reflect its functionality. Also, update the method calls to reflect the new name. Additionally, update the getTokenCount method to handle errors by calling the freeAndResetEncoder method instead of the now-renamed freeAndInitializeEncoder method.
danny-avila · danny-avila · Jul 3, 2023 · Jun 17, 2023 · Jun 17, 2023 · Jun 17, 2023
commit b9cce41e3a825f747eddb76114cf5dfec7717140
diff --git a/api/app/clients/classes/ChatGPTClient.js b/api/app/clients/classes/ChatGPTClient.js
@@ -473,8 +473,8 @@ ${botMessage.message}
     const buildPromptBody = async () => {
       if (currentTokenCount < maxTokenCount && orderedMessages.length > 0) {
         const message = orderedMessages.pop();
-        const roleLabel = message.isCreatedByUser ? this.userLabel : this.chatGptLabel;
-        const messageString = `${this.startToken}${roleLabel}:\n${message.text}${this.endToken}\n`;
+        const roleLabel = message?.isCreatedByUser || message?.role?.toLowerCase() === 'user' ? this.userLabel : this.chatGptLabel;
+        const messageString = `${this.startToken}${roleLabel}:\n${message?.text ?? message?.message}${this.endToken}\n`;
         let newPromptBody;
         if (promptBody || isChatGptModel) {
           newPromptBody = `${messageString}${promptBody}`;

diff --git a/api/app/clients/classes/OpenAIClient.js b/api/app/clients/classes/OpenAIClient.js
@@ -136,7 +136,7 @@ class OpenAIClient extends BaseClient {
     return tokenizer;
   }
 
-  freeAndInitializeEncoder() {
+  freeAndResetEncoder() {
     try {
       if (!this.gptEncoder) {
         return;
@@ -146,20 +146,20 @@ class OpenAIClient extends BaseClient {
       this.setupTokenizer();
       tokenizersCache.count = 0;
     } catch (error) {
-      console.log('freeAndInitializeEncoder error');
+      console.log('freeAndResetEncoder error');
       console.error(error);
     }
   }
 
   getTokenCount(text) {
     try {
       if (tokenizersCache.count >= 25) {
-        this.freeAndInitializeEncoder();
+        this.freeAndResetEncoder();
       }
       tokenizersCache.count = (tokenizersCache.count || 0) + 1;
       return this.gptEncoder.encode(text, 'all').length;
     } catch (error) {
-      this.freeAndInitializeEncoder();
+      this.freeAndResetEncoder();
       return this.gptEncoder.encode(text, 'all').length;
     }
   }