fix(OpenAIClient.js): remove unnecessary whitespace

fix(OpenAIClient.js): remove unused variables and comments fix(OpenAIClient.test.js): combine getTokenCount and freeAndResetEncoder tests
danny-avila · danny-avila · Jul 3, 2023 · Jun 17, 2023 · Jun 17, 2023 · Jun 17, 2023
commit 9fd7dcfdee5ae651ca6866e2050f8cc93301803f
diff --git a/api/app/clients/classes/OpenAIClient.js b/api/app/clients/classes/OpenAIClient.js
@@ -198,12 +198,12 @@ class OpenAIClient extends BaseClient {
     if (!isChatCompletion) {
       return await this.buildPrompt(messages, parentMessageId, { isChatGptModel: isChatCompletion, promptPrefix });
     }
-  
+
     let payload;
     let instructions;
     let tokenCountMap;
     let orderedMessages = this.constructor.getMessagesForConversation(messages, parentMessageId);
-  
+
     promptPrefix = (promptPrefix || this.options.promptPrefix || '').trim();
     if (promptPrefix) {
       promptPrefix = `Instructions:\n${promptPrefix}`;
@@ -217,7 +217,7 @@ class OpenAIClient extends BaseClient {
         instructions.tokenCount = this.getTokenCountForMessage(instructions);
       }
     }
-  
+
     const formattedMessages = orderedMessages.map((message) => {
       let { role: _role, sender, text } = message;
       const role = _role ?? sender;
@@ -234,14 +234,14 @@ class OpenAIClient extends BaseClient {
       if (this.contextStrategy) {
         formattedMessage.tokenCount = message.tokenCount ?? this.getTokenCountForMessage(formattedMessage);
       }
-  
+
       return formattedMessage;
     });
-  
+
     // TODO: need to handle interleaving instructions better
     if (this.contextStrategy) {
       ({ payload, tokenCountMap } = await this.handleContextStrategy({instructions, orderedMessages, formattedMessages}));
-    }    
+    }
 
     const result = {
       prompt: payload,
@@ -254,7 +254,7 @@ class OpenAIClient extends BaseClient {
 
     return result;
   }
-  
+
   async sendCompletion(payload, opts = {}) {
     let reply = '';
     let result = null;

diff --git a/api/app/clients/classes/OpenAIClient.test.js b/api/app/clients/classes/OpenAIClient.test.js
@@ -34,19 +34,17 @@ describe('OpenAIClient', () => {
     });
   });
 
-  describe('freeAndResetEncoder', () => {
-    it('should reset the encoder', () => {
-      client.freeAndResetEncoder();
-      expect(client.gptEncoder).toBeDefined();
-    });
-  });
-
-  describe('getTokenCount', () => {
+  describe('getTokenCount & freeAndResetEncoder', () => {
     it('should return the correct token count', () => {
       const count = client.getTokenCount('Hello, world!');
       expect(count).toBeGreaterThan(0);
     });
 
+    it('should reset the encoder', () => {
+      client.freeAndResetEncoder();
+      expect(client.gptEncoder).toBeDefined();
+    });
+
     it('should reset the encoder and count when count reaches 25', () => {
       const freeAndResetEncoderSpy = jest.spyOn(client, 'freeAndResetEncoder');