0.0.8 - fix continue handling, more tests

JoinTheAlliance · Feb 16, 2024 · 402db99 · 402db99
1 parent 491f3bc
commit 402db99
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 81 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bgent",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "private": false,
   "description": "bgent. because agent was taken.",
   "type": "module",

diff --git a/src/lib/actions.ts b/src/lib/actions.ts
@@ -31,10 +31,6 @@ export const composeActionExamples = (actionsData: Action[], count: number) => {
     }
   }
 
-  console.log("*** message example count: ", randomMessageExamples.length);
-
-
-
   const formattedExamples = randomMessageExamples.map((example) => {
     const exampleNames = Array.from({ length: 5 }, () =>
       uniqueNamesGenerator({ dictionaries: [names] }),

diff --git a/src/lib/actions/__tests__/continue.test.ts b/src/lib/actions/__tests__/continue.test.ts
@@ -38,6 +38,10 @@ describe("User Profile", () => {
     await cleanup();
   });
 
+  beforeEach(async () => {
+    await cleanup();
+  });
+
   async function cleanup() {
     await runtime.summarizationManager.removeAllMemoriesByUserIds([
       user.id as UUID,
@@ -49,6 +53,8 @@ describe("User Profile", () => {
     ]);
   }
 
+  // test validate function response
+
   test("Test repetition check on continue", async () => {
     const message: Message = {
       senderId: zeroUuid as UUID,
@@ -89,10 +95,8 @@ describe("User Profile", () => {
 
     const result = (await handler(runtime, message)) as Content;
 
-    console.log("result", result);
-
     expect(result.action).not.toBe("CONTINUE");
-  }, 60000);
+  }, 20000);
 
   test("Test if not continue", async () => {
     // this is basically the same test as the one in ignore.test.ts
@@ -113,7 +117,7 @@ describe("User Profile", () => {
     console.log("IGNORE result", result);
 
     expect(result.action).toBe("IGNORE");
-  }, 60000);
+  }, 20000);
 
   // test conditions where we would expect a wait or an ignore
 });
diff --git a/src/lib/actions/__tests__/ignore.test.ts b/src/lib/actions/__tests__/ignore.test.ts
@@ -10,7 +10,7 @@ import {
 import { getRelationship } from "../../relationships";
 import { type BgentRuntime } from "../../runtime";
 import { Content, type Message } from "../../types";
-import action from "../continue";
+// import action from "../ignore";
 import { populateMemories } from "../../../test/populateMemories";
 
 dotenv.config();
@@ -42,6 +42,10 @@ describe("User Profile", () => {
     await cleanup();
   });
 
+  beforeEach(async () => {
+    await cleanup();
+  });
+
   async function cleanup() {
     await runtime.summarizationManager.removeAllMemoriesByUserIds([
       user?.id as UUID,
@@ -55,19 +59,21 @@ describe("User Profile", () => {
 
   test("Test ignore action", async () => {
     const message: Message = {
-      senderId: zeroUuid as UUID,
+      senderId: user?.id as UUID,
       agentId: zeroUuid,
       userIds: [user?.id as UUID, zeroUuid],
-      content: { content: "", action: "CONTINUE" },
+      content: { content: "Never talk to me again" },
       room_id: room_id as UUID,
     };
 
-    await populateMemories(runtime, user, room_id, []);
+    await populateMemories(runtime, user, room_id, [
+      GetTellMeAboutYourselfConversationTroll1,
+    ]);
 
-    const handler = action.handler!;
+    const result = await runtime.handleRequest(message);
+    console.log("*** result", result);
 
-    const result = (await handler(runtime, message)) as string[];
-    expect(result).toBe(true);
+    expect(result.action).toBe("IGNORE");
   }, 60000);
 
   test("Action handler test 1: response should be ignore", async () => {
@@ -79,23 +85,16 @@ describe("User Profile", () => {
       room_id: room_id as UUID,
     };
 
-    await populateMemories(runtime, user, room_id, [GetTellMeAboutYourselfConversationTroll1]);
+    await populateMemories(runtime, user, room_id, [
+      GetTellMeAboutYourselfConversationTroll1,
+    ]);
 
-    const response = await runtime.handleRequest(message);
+    await runtime.handleRequest(message);
 
     const state = await runtime.composeState(message);
 
-    console.log(
-      "*** recentMessagesData",
-      state.recentMessagesData.map((m) => m.content),
-    );
-
-    console.log("*** response", response);
-
     const lastMessage = state.recentMessagesData[0];
 
-    console.log("*** lastMessage", lastMessage.content);
-
     expect((lastMessage.content as Content).action).toBe("IGNORE");
   }, 60000);
 
@@ -108,23 +107,16 @@ describe("User Profile", () => {
       room_id: room_id as UUID,
     };
 
-    await populateMemories(runtime, user, room_id, [GetTellMeAboutYourselfConversationTroll2]);
+    await populateMemories(runtime, user, room_id, [
+      GetTellMeAboutYourselfConversationTroll2,
+    ]);
 
-    const response = await runtime.handleRequest(message);
+    await runtime.handleRequest(message);
 
     const state = await runtime.composeState(message);
 
-    console.log(
-      "*** recentMessagesData",
-      state.recentMessagesData.map((m) => m.content),
-    );
-
-    console.log("*** response", response);
-
     const lastMessage = state.recentMessagesData[0];
 
-    console.log("*** lastMessage", lastMessage.content);
-
     expect((lastMessage.content as Content).action).toBe("IGNORE");
   }, 60000);
 

diff --git a/src/lib/actions/__tests__/wait.test.ts b/src/lib/actions/__tests__/wait.test.ts
@@ -1,7 +1,6 @@
 import { type User } from "@supabase/supabase-js";
 import { type UUID } from "crypto";
 import dotenv from "dotenv";
-import { getCachedEmbedding, writeCachedEmbedding } from "../../../test/cache";
 import { createRuntime } from "../../../test/createRuntime";
 import { GetTellMeAboutYourselfConversation1 } from "../../../test/data";
 import { getRelationship } from "../../relationships";
@@ -23,6 +22,10 @@ describe("Wait Action Behavior", () => {
     await cleanup();
   });
 
+  beforeEach(async () => {
+    await cleanup();
+  });
+
   beforeAll(async () => {
     const setup = await createRuntime();
     user = setup.session.user;
@@ -64,7 +67,9 @@ describe("Wait Action Behavior", () => {
 
     const handler = action.handler!;
 
-    await populateMemories(runtime, user, room_id, [GetTellMeAboutYourselfConversation1]);
+    await populateMemories(runtime, user, room_id, [
+      GetTellMeAboutYourselfConversation1,
+    ]);
 
     const result = (await handler(runtime, message)) as string[];
     // Expectation depends on the implementation of the wait action.

diff --git a/src/lib/actions/continue.ts b/src/lib/actions/continue.ts
@@ -11,22 +11,25 @@ export default {
   name: "CONTINUE",
   description:
     "Respond with this message, then write another immediately after. If the thought is done or you're waiting for a response, don't use this.",
-  validate: async (runtime: BgentRuntime, message: Message, state: State) => {
-    if (!state) state = await runtime.composeState(message);
-    // get all of the messages that were from message.agentId from recentMessagesData in state
-    const { recentMessagesData } = state;
-
-    const agentMessages = recentMessagesData
-      .filter((m) => m.user_id === message.agentId)
-      .map((m) => (m as Content).action);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  validate: async (runtime: BgentRuntime, message: Message, _state: State) => {
+    const recentMessagesData = await runtime.messageManager.getMemoriesByIds({
+      userIds: message.userIds!,
+      count: 10,
+      unique: false,
+    });
+    const agentMessages = recentMessagesData.filter(
+      (m) => m.user_id === message.agentId,
+    );
 
     // check if the last messages were all continues
     if (agentMessages) {
-      const lastMessages = agentMessages.slice(-maxContinuesInARow);
-      if (lastMessages.length === maxContinuesInARow) {
-        const allContinues = lastMessages.every((m) => m === "CONTINUE");
+      const lastMessages = agentMessages.slice(maxContinuesInARow);
+      if (lastMessages.length >= maxContinuesInARow) {
+        const allContinues = lastMessages.every(
+          (m) => (m.content as Content).action === "CONTINUE",
+        );
         if (allContinues) {
-          console.log("****** all continues", allContinues);
           return false;
         }
       }
@@ -35,15 +38,16 @@ export default {
     return true;
   },
   handler: async (runtime: BgentRuntime, message: Message, state: State) => {
-    if (!state) {
-      state = (await runtime.composeState(message)) as State;
-    }
+    state = (await runtime.composeState(message)) as State;
 
     const context = composeContext({
       state,
       template: requestHandlerTemplate,
     });
 
+    console.log("*** context");
+    console.log(context);
+
     if (runtime.debugMode) {
       logger.log(context, {
         title: "Continued Response Context",
@@ -61,6 +65,8 @@ export default {
         stop: [],
       });
 
+      console.log("response:", triesLeft, "\n", response);
+
       runtime.supabase
         .from("logs")
         .insert({
@@ -98,7 +104,7 @@ export default {
     // prevent repetition
     const messageExists = state.recentMessagesData
       .filter((m) => m.user_id === message.agentId)
-      .slice(-maxContinuesInARow)
+      .slice(0, maxContinuesInARow)
       .some((m) => m.content === message.content);
 
     if (messageExists) {
@@ -107,6 +113,7 @@ export default {
           color: "red",
         });
       }
+      console.log("*** messageExists", messageExists);
       return responseContent;
     }
 
@@ -115,15 +122,11 @@ export default {
     // if the action is CONTINUE, check if we are over maxContinuesInARow
     // if so, then we should change the action to WAIT
     if (responseContent.action === "CONTINUE") {
-      console.log("***** state.recentMessagesData", state.recentMessagesData);
       const agentMessages = state.recentMessagesData
         .filter((m) => m.user_id === message.agentId)
         .map((m) => (m.content as Content).action);
 
-      console.log("***** agentMessages", agentMessages);
-
-      const lastMessages = agentMessages.slice(-maxContinuesInARow);
-      console.log("**** lastMessages");
+      const lastMessages = agentMessages.slice(maxContinuesInARow);
       if (lastMessages.length >= maxContinuesInARow) {
         const allContinues = lastMessages.every((m) => m === "CONTINUE");
         if (allContinues) {
@@ -137,7 +140,7 @@ export default {
     return responseContent;
   },
   condition:
-    "The agent wants to continue speaking and say something else as a continuation of the last thought",
+    "The agent wants to continue speaking and say something else as a continuation of the last thought. If the conversation is done, the agent is waiting for the user to respond, or the user does not want to continue, do not use the continue action.",
   examples: [
     [
       {
@@ -173,11 +176,11 @@ export default {
         content: "Challenging, but rewarding.",
         action: "CONTINUE",
       },
-      {
-        user: "{{user1}}",
-        content: "My fingers hurt though.",
-        action: "CONTINUE",
-      },
+      // {
+      //   user: "{{user1}}",
+      //   content: "My fingers hurt though.",
+      //   action: "CONTINUE",
+      // },
       {
         user: "{{user1}}",
         content: "Seriously lol it hurts to type",
@@ -227,6 +230,11 @@ export default {
           "But the pieces are just so insane looking. Once sec, let me grab a link.",
         action: "CONTINUE",
       },
+      {
+        user: "{{user1}}",
+        content: "DMed it to you",
+        action: "WAIT",
+      },
     ],
 
     [

diff --git a/src/lib/actions/ignore.ts b/src/lib/actions/ignore.ts
@@ -14,7 +14,7 @@ export default {
     return true;
   },
   description:
-    "Ignore the user and do not respond, use this if your role involves being sassy, or mad at user",
+    "Ignore the user and do not respond, use this if your role involves being sassy, or mad at user. If the user is mean, aggressive, creepy or is simply done with the conversation, use the ignore action.",
   handler: async (
     runtime: BgentRuntime,
     message: Message,

diff --git a/src/lib/evaluators/__tests__/summarization.test.ts b/src/lib/evaluators/__tests__/summarization.test.ts
@@ -103,7 +103,7 @@ describe("Factual Summarization", () => {
 
     //
 
-    await populateMemories([
+    await populateMemories(runtime, user, room_id, [
       GetTellMeAboutYourselfConversation2,
       GetTellMeAboutYourselfConversation3,
     ]);

diff --git a/src/lib/messages.ts b/src/lib/messages.ts
@@ -55,7 +55,7 @@ export const formatMessages = ({
       const sender = actors.find(
         (actor: Actor) => actor.id === message.user_id,
       )!;
-      return `${sender.name}: ${(message.content as Content).content || (message.content as string)} ${(message.content as Content).action && (message.content as Content).action !== 'null' ? `(${(message.content as Content).action})` : ""}`;
+      return `${sender.name}: ${(message.content as Content).content || (message.content as string)} ${(message.content as Content).action && (message.content as Content).action !== "null" ? `(${(message.content as Content).action})` : ""}`;
     })
     .join("\n");
   return messageStrings;