Update trust stuff, fix generateTrueOrFalse, update some types, handle evaluators with runAlways

lalalune · lalalune · commit 0419766a6828 · 2024-11-09T01:46:28.000-08:00
diff --git a/packages/agent/src/index.ts b/packages/agent/src/index.ts
@@ -1,4 +1,3 @@
-console.log("ok");
 import { PostgresDatabaseAdapter } from "@ai16z/adapter-postgres/src/index.ts";
 import { SqliteDatabaseAdapter } from "@ai16z/adapter-sqlite/src/index.ts";
 import { DirectClientInterface } from "@ai16z/client-direct/src/index.ts";
@@ -15,6 +14,7 @@ import {
     ModelProviderName,
 } from "@ai16z/eliza/src/types.ts";
 import { bootstrapPlugin } from "@ai16z/plugin-bootstrap/src/index.ts";
+import { solanaPlugin } from "@ai16z/plugin-solana/src/index.ts";
 import { nodePlugin } from "@ai16z/plugin-node/src/index.ts";
 import Database from "better-sqlite3";
 import fs from "fs";
@@ -198,7 +198,13 @@ export async function createAgent(
         modelProvider: character.modelProvider,
         evaluators: [],
         character,
-        plugins: [bootstrapPlugin, nodePlugin],
+        plugins: [
+            bootstrapPlugin,
+            nodePlugin,
+            character.settings.secrets.WALLET_PUBLIC_KEY
+                ? solanaPlugin
+                : null
+        ].filter(Boolean),
         providers: [],
         actions: [],
         services: [],
diff --git a/packages/client-direct/src/index.ts b/packages/client-direct/src/index.ts
@@ -218,6 +218,8 @@ export class DirectClient {
 
                 let message = null as Content | null;
 
+                await runtime.evaluate(memory, state);
+
                 const result = await runtime.processActions(
                     memory,
                     [responseMessage],
diff --git a/packages/client-discord/src/messages.ts b/packages/client-discord/src/messages.ts
@@ -463,9 +463,7 @@ export class MessageManager {
                 shouldRespond = await this._shouldRespond(message, state);
             }
 
-            if (!shouldRespond) {
-                return;
-            }
+            if (shouldRespond) {
 
             const context = composeContext({
                 state,
@@ -576,14 +574,15 @@ export class MessageManager {
 
             state = await this.runtime.updateRecentMessageState(state);
 
-            await this.runtime.evaluate(memory, state);
-
             await this.runtime.processActions(
                 memory,
                 responseMessages,
                 state,
                 callback
             );
+        }
+            await this.runtime.evaluate(memory, state, shouldRespond);
+
         } catch (error) {
             console.error("Error handling message:", error);
             if (message.channel.type === ChannelType.GuildVoice) {
diff --git a/packages/core/src/embedding.ts b/packages/core/src/embedding.ts
@@ -85,7 +85,7 @@ export async function embed(runtime: IAgentRuntime, input: string) {
         body: JSON.stringify({
             input,
             model: embeddingModel,
-            length: 768, // we are squashing dimensions to 768 for openai, even thought the model supports 1536
+            length: 384, // we are squashing dimensions to 768 for openai, even thought the model supports 1536
             // -- this is ok for matryoshka embeddings but longterm, we might want to support 1536
         }),
     };
diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -400,9 +400,10 @@ export async function generateTrueOrFalse({
     modelClass: string;
 }): Promise<boolean> {
     let retryDelay = 1000;
+    console.log("modelClass", modelClass)
 
     const stop = Array.from(
-        new Set([...(models[modelClass].settings.stop || []), ["\n"]])
+        new Set([...(models[runtime.modelProvider].settings.stop || []), ["\n"]])
     ) as string[];
 
     while (true) {
diff --git a/packages/core/src/runtime.ts b/packages/core/src/runtime.ts
@@ -494,14 +494,20 @@ export class AgentRuntime implements IAgentRuntime {
      * Evaluate the message and state using the registered evaluators.
      * @param message The message to evaluate.
      * @param state The state of the agent.
+     * @param didRespond Whether the agent responded to the message.
      * @returns The results of the evaluation.
      */
-    async evaluate(message: Memory, state?: State) {
+    async evaluate(message: Memory, state?: State, didRespond?: boolean) {
+        console.log("Evaluate: ", didRespond)
         const evaluatorPromises = this.evaluators.map(
             async (evaluator: Evaluator) => {
+                console.log("Evaluating", evaluator.name)
                 if (!evaluator.handler) {
                     return null;
                 }
+                if(!didRespond && !evaluator.alwaysRun) {
+                    return null;
+                }
                 const result = await evaluator.validate(this, message, state);
                 if (result) {
                     return evaluator;
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -231,6 +231,7 @@ export interface EvaluationExample {
  * Represents an evaluator, which is used to assess and guide the agent's responses based on the current context and state.
  */
 export interface Evaluator {
+    alwaysRun?: boolean;
     description: string; // A detailed description of what the evaluator assesses or guides.
     similes: string[]; // An array of strings representing the similies of the action.
     examples: EvaluationExample[]; // An array of evaluation examples demonstrating the evaluator.
@@ -547,7 +548,7 @@ export interface IAgentRuntime {
         state?: State,
         callback?: HandlerCallback
     ): Promise<void>;
-    evaluate(message: Memory, state?: State): Promise<string[]>;
+    evaluate(message: Memory, state?: State, didRespond?: boolean): Promise<string[]>;
     ensureParticipantExists(userId: UUID, roomId: UUID): Promise<void>;
     ensureUserExists(
         userId: UUID,
diff --git a/packages/plugin-bootstrap/src/providers/facts.ts b/packages/plugin-bootstrap/src/providers/facts.ts
@@ -20,16 +20,17 @@ const factsProvider: Provider = {
 
         const embedding = await embed(runtime, recentMessages);
 
-        console.log("embedding", embedding);
+        console.log('embedding', embedding);
+        console.log('embedding length', embedding.length);
+
 
         const memoryManager = new MemoryManager({
             runtime,
             tableName: "facts",
         });
 
         const relevantFacts = []
-        
-        // await memoryManager.searchMemoriesByEmbedding(
+        //  await memoryManager.searchMemoriesByEmbedding(
         //     embedding,
         //     {
         //         roomId: message.roomId,
diff --git a/packages/plugin-solana/src/actions/swap.ts b/packages/plugin-solana/src/actions/swap.ts
@@ -7,7 +7,7 @@ import {
 } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
 import { v4 as uuidv4 } from "uuid";
-import { TrustScoreDatabase } from "@ai16z/eliza/src/adapters/trustScoreDatabase.ts";
+import { TrustScoreDatabase } from "../adapters/trustScoreDatabase.ts";
 import { composeContext } from "@ai16z/eliza/src/context.ts";
 import { generateObject } from "@ai16z/eliza/src/generation.ts";
 import settings from "@ai16z/eliza/src/settings.ts";
@@ -20,12 +20,12 @@ import {
     State,
     type Action,
 } from "@ai16z/eliza/src/types.ts";
-import { TokenProvider } from "@ai16z/eliza/src/providers/token.ts";
-import { TrustScoreProvider } from "@ai16z/eliza/src/providers/trustScoreProvider.ts";
+import { TokenProvider } from "../providers/token.ts";
+import { TrustScoreManager } from "../providers/trustScoreProvider.ts";
 import {
     walletProvider,
     WalletProvider,
-} from "@ai16z/eliza/src/providers/wallet.ts";
+} from "../providers/wallet.ts";
 import { getTokenDecimals } from "./swapUtils.ts";
 
 async function swapToken(
@@ -408,7 +408,7 @@ export const executeSwap: Action = {
                     solanaPubkey: walletPublicKey.toString(),
                 });
 
-                const trustScoreDatabase = new TrustScoreProvider(
+                const trustScoreDatabase = new TrustScoreManager(
                     tokenProvider,
                     trustScoreDb
                 );
@@ -438,7 +438,7 @@ export const executeSwap: Action = {
                     solanaPubkey: walletPublicKey.toString(),
                 });
 
-                const trustScoreDatabase = new TrustScoreProvider(
+                const trustScoreDatabase = new TrustScoreManager(
                     tokenProvider,
                     trustScoreDb
                 );
diff --git a/packages/plugin-solana/src/adapters/trustScoreDatabase.ts b/packages/plugin-solana/src/adapters/trustScoreDatabase.ts
@@ -2,7 +2,6 @@
 
 import { Database } from "better-sqlite3";
 import { v4 as uuidv4 } from "uuid";
-import { load } from "@ai16z/eliza/src/adapters/sqlite/sqlite_vec.ts";
 
 // Define interfaces
 export interface Recommender {
@@ -132,7 +131,7 @@ export class TrustScoreDatabase {
 
     constructor(db: Database) {
         this.db = db;
-        load(db);
+        // load(db);
         // check if the tables exist, if not create them
         const tables = this.db
             .prepare(
diff --git a/packages/plugin-solana/src/evaluators/trust.ts b/packages/plugin-solana/src/evaluators/trust.ts
diff --git a/packages/plugin-solana/src/index.ts b/packages/plugin-solana/src/index.ts
diff --git a/packages/plugin-solana/src/providers/token.ts b/packages/plugin-solana/src/providers/token.ts
diff --git a/packages/plugin-solana/src/providers/trustScoreProvider.ts b/packages/plugin-solana/src/providers/trustScoreProvider.ts
