[lib] Add Conversation tests

maxijonson · Aug 2, 2023 · de986d4 · de986d4
1 parent fd5e3bc
commit de986d4
Show file tree

Hide file tree

Showing 4 changed files with 551 additions and 10 deletions.
diff --git a/gpt-turbo.code-workspace b/gpt-turbo.code-workspace
@@ -0,0 +1,42 @@
+{
+  "folders": [
+    {
+      "name": "lib",
+      "path": "packages/lib"
+    },
+    {
+      "name": "web",
+      "path": "packages/implementations/web"
+    },
+    {
+      "name": "stats",
+      "path": "packages/plugins/gpt-turbo-plugin-stats"
+    },
+    {
+      "name": "discord",
+      "path": "packages/implementations/discord"
+    },
+    {
+      "name": "cli",
+      "path": "packages/implementations/cli"
+    },
+    {
+      "name": "nest",
+      "path": "packages/implementations/nest"
+    },
+    {
+      "name": "root",
+      "path": "."
+    }
+  ],
+  "settings": {
+    "jest.disabledWorkspaceFolders": [
+      "web",
+      "discord",
+      "stats",
+      "nest",
+      "cli",
+      "root"
+    ]
+  }
+}
diff --git a/packages/lib/src/classes/ChatCompletionService.ts b/packages/lib/src/classes/ChatCompletionService.ts
@@ -59,21 +59,24 @@ export class ChatCompletionService {
             options,
             requestOptions
         );
-        await this.moderateMessage(response);
+        await this.moderateMessage(response, requestOptions);
         return this.history.addMessage(response);
     }
 
     /**
      * @internal
      * Should not be used directly by library consumers. Use `moderate` from the `Message` class instead.
      */
-    public async moderateMessage(message: Message) {
+    public async moderateMessage(
+        message: Message,
+        requestOptions?: ConversationRequestOptionsModel
+    ) {
         if (!this.config.isModerationEnabled) return;
 
-        await message.moderate(
-            this.config.apiKey,
-            this.requestOptions.getRequestOptions()
-        );
+        await message.moderate(this.config.apiKey, {
+            ...this.requestOptions.getRequestOptions(),
+            ...requestOptions,
+        });
         await this.pluginService.onModeration(message);
 
         const flags = message.flags ?? [];

diff --git a/packages/lib/src/classes/Conversation.ts b/packages/lib/src/classes/Conversation.ts
@@ -183,7 +183,10 @@ export class Conversation<
 
         try {
             await this.pluginService.onUserPrompt(userMessage);
-            await this.chatCompletionService.moderateMessage(userMessage);
+            await this.chatCompletionService.moderateMessage(
+                userMessage,
+                requestOptions
+            );
             const assistantMessage =
                 await this.chatCompletionService.getAssistantResponse(
                     options,
@@ -246,7 +249,7 @@ export class Conversation<
             if (previousUserMessageIndex < 0) break;
             previousUserMessage = messages[previousUserMessageIndex];
         }
-        if (previousUserMessage?.role !== "user") {
+        if (previousUserMessage.role !== "user") {
             throw new Error(
                 `Could not find a previous user message to reprompt from (${id}).`
             );
@@ -293,7 +296,10 @@ export class Conversation<
 
         try {
             await this.pluginService.onFunctionPrompt(functionMessage);
-            await this.chatCompletionService.moderateMessage(functionMessage);
+            await this.chatCompletionService.moderateMessage(
+                functionMessage,
+                requestOptions
+            );
             const assistantMessage =
                 await this.chatCompletionService.getAssistantResponse(
                     options,