Merge branch 'ai16z:main' into resolve-conflicts

Author: ai16z-demirix

docs/docs/quickstart.md

@@ -141,11 +141,13 @@ Example for TWITTER_COOKIES
 The TWITTER_COOKIES variable should be a JSON string containing the necessary cookies. You can find these cookies in your web browser's developer tools. Here is an example format:
 
 ```bash
-TWITTER_COOKIES='[{"name":"auth_token","value":"your token","domain":".twitter.com"},
-  {"name":"ct0","value":"your ct0","domain":".twitter.com"},
-  {"name":"guest_id","value":"your guest_id","domain":".twitter.com"}]'
+TWITTER_COOKIES='[{"key":"auth_token","value":"your token","domain":".twitter.com"},
+  {"key":"ct0","value":"your ct0","domain":".twitter.com"},
+  {"key":"guest_id","value":"your guest_id","domain":".twitter.com"}]'
 ```
 
+Using TWITTER_COOKIES makes providing TWITTER_PASSWORD and TWITTER_EMAIL unnecessary. TWITTER_USERNAME is still required.
+
 ### Telegram Bot
 
 1. Create a bot

packages/client-twitter/src/base.ts

@@ -86,7 +86,7 @@ export class ClientBase extends EventEmitter {
     twitterClient: Scraper;
     runtime: IAgentRuntime;
     directions: string;
-    lastCheckedTweetId: number | null = null;
+    lastCheckedTweetId: bigint | null = null;
     imageDescriptionService: IImageDescriptionService;
     temperature: number = 0.5;
 
@@ -588,20 +588,20 @@ export class ClientBase extends EventEmitter {
 
     async loadLatestCheckedTweetId(): Promise<void> {
         const latestCheckedTweetId =
-            await this.runtime.cacheManager.get<number>(
+            await this.runtime.cacheManager.get<string>(
                 `twitter/${this.profile.username}/latest_checked_tweet_id`
             );
 
         if (latestCheckedTweetId) {
-            this.lastCheckedTweetId = latestCheckedTweetId;
+            this.lastCheckedTweetId = BigInt(latestCheckedTweetId);
         }
     }
 
     async cacheLatestCheckedTweetId() {
         if (this.lastCheckedTweetId) {
             await this.runtime.cacheManager.set(
                 `twitter/${this.profile.username}/latest_checked_tweet_id`,
-                this.lastCheckedTweetId
+                this.lastCheckedTweetId.toString()
             );
         }
     }

packages/client-twitter/src/interactions.ts

@@ -127,7 +127,7 @@ export class TwitterInteractionClient {
             for (const tweet of uniqueTweetCandidates) {
                 if (
                     !this.client.lastCheckedTweetId ||
-                    parseInt(tweet.id) > this.client.lastCheckedTweetId
+                    BigInt(tweet.id) > this.client.lastCheckedTweetId
                 ) {
                     elizaLogger.log("New Tweet found", tweet.permanentUrl);
 
@@ -167,7 +167,7 @@ export class TwitterInteractionClient {
                     });
 
                     // Update the last checked tweet ID after processing each tweet
-                    this.client.lastCheckedTweetId = parseInt(tweet.id);
+                    this.client.lastCheckedTweetId = BigInt(tweet.id);
                 }
             }
 

packages/core/src/generation.ts

@@ -113,6 +113,7 @@ export async function generateText({
         );
 
         switch (provider) {
+            // OPENAI & LLAMACLOUD shared same structure.
             case ModelProviderName.OPENAI:
             case ModelProviderName.LLAMACLOUD: {
                 elizaLogger.debug("Initializing OpenAI model.");
@@ -139,7 +140,7 @@ export async function generateText({
             case ModelProviderName.GOOGLE: {
                 const google = createGoogleGenerativeAI();
 
-                const { text: anthropicResponse } = await aiGenerateText({
+                const { text: googleResponse } = await aiGenerateText({
                     model: google(model),
                     prompt: context,
                     system:
@@ -152,7 +153,8 @@ export async function generateText({
                     presencePenalty: presence_penalty,
                 });
 
-                response = anthropicResponse;
+                response = googleResponse;
+                elizaLogger.debug("Received response from Google model.");
                 break;
             }
 
@@ -280,7 +282,7 @@ export async function generateText({
                 const serverUrl = models[provider].endpoint;
                 const openai = createOpenAI({ apiKey, baseURL: serverUrl });
 
-                const { text: openaiResponse } = await aiGenerateText({
+                const { text: redpillResponse } = await aiGenerateText({
                     model: openai.languageModel(model),
                     prompt: context,
                     temperature: temperature,
@@ -293,8 +295,8 @@ export async function generateText({
                     presencePenalty: presence_penalty,
                 });
 
-                response = openaiResponse;
-                elizaLogger.debug("Received response from OpenAI model.");
+                response = redpillResponse;
+                elizaLogger.debug("Received response from redpill model.");
                 break;
             }
 

packages/core/src/runtime.ts

@@ -538,8 +538,12 @@ export class AgentRuntime implements IAgentRuntime {
             return;
         }
 
-        elizaLogger.success(`Executing handler for action: ${action.name}`);
-        await action.handler(this, message, state, {}, callback);
+        try {
+            elizaLogger.info(`Executing handler for action: ${action.name}`);
+            await action.handler(this, message, state, {}, callback);
+        } catch (error) {
+            elizaLogger.error(error);
+        }
     }
 
     /**

packages/plugin-node/package.json

@@ -20,7 +20,7 @@
         "cldr-segmentation": "2.2.1",
         "command-exists": "1.2.9",
         "csv-writer": "1.6.0",
-        "echogarden": "^2.0.5",
+        "echogarden": "^2.0.7",
         "espeak-ng": "1.0.2",
         "ffmpeg-static": "5.2.0",
         "fluent-ffmpeg": "2.1.3",
@@ -80,4 +80,4 @@
         "onnxruntime-node": "^1.20.0",
         "sharp": "^0.33.5"
     }
-}
+}