From 710700ca1a234f2ceebd28a8b0d1b58197326aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CnulLeeKH=E2=80=9D?= Date: Tue, 24 Dec 2024 22:28:04 +0900 Subject: [PATCH 1/6] fix: make twitter search feature works --- agent/src/index.ts | 52 +++++++++++++-------------- packages/client-twitter/src/index.ts | 6 +++- packages/client-twitter/src/search.ts | 8 +++-- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/agent/src/index.ts b/agent/src/index.ts index d4f0448f63a..35820fcf395 100644 --- a/agent/src/index.ts +++ b/agent/src/index.ts @@ -365,12 +365,8 @@ export async function initializeClients( if (clientTypes.includes(Clients.TWITTER)) { const twitterClient = await TwitterClientInterface.start(runtime); - if (twitterClient) { clients.twitter = twitterClient; - (twitterClient as any).enableSearch = !isFalsish( - getSecret(character, "TWITTER_SEARCH_ENABLE") - ); } } @@ -410,30 +406,30 @@ export async function initializeClients( return clients; } -function isFalsish(input: any): boolean { - // If the input is exactly NaN, return true - if (Number.isNaN(input)) { - return true; - } - - // Convert input to a string if it's not null or undefined - const value = input == null ? "" : String(input); - - // List of common falsish string representations - const falsishValues = [ - "false", - "0", - "no", - "n", - "off", - "null", - "undefined", - "", - ]; - - // Check if the value (trimmed and lowercased) is in the falsish list - return falsishValues.includes(value.trim().toLowerCase()); -} +// function isFalsish(input: any): boolean { +// // If the input is exactly NaN, return true +// if (Number.isNaN(input)) { +// return true; +// } +// +// // Convert input to a string if it's not null or undefined +// const value = input == null ? "" : String(input); +// +// // List of common falsish string representations +// const falsishValues = [ +// "false", +// "0", +// "no", +// "n", +// "off", +// "null", +// "undefined", +// "", +// ]; +// +// // Check if the value (trimmed and lowercased) is in the falsish list +// return falsishValues.includes(value.trim().toLowerCase()); +// } function getSecret(character: Character, secret: string) { return character.settings?.secrets?.[secret] || process.env[secret]; diff --git a/packages/client-twitter/src/index.ts b/packages/client-twitter/src/index.ts index b973b84eaed..423ea7176e9 100644 --- a/packages/client-twitter/src/index.ts +++ b/packages/client-twitter/src/index.ts @@ -37,12 +37,16 @@ export const TwitterClientInterface: Client = { // enableSearch is just set previous to this call // so enableSearch can change over time // and changing it won't stop the SearchClient in the existing instance - const manager = new TwitterManager(runtime, this.enableSearch); + + const manager = new TwitterManager(runtime, runtime.getSetting("TWITTER_SEARCH_ENABLE") === "true"); await manager.client.init(); await manager.post.start(); + if (manager.search) + await manager.search.start(); + await manager.interaction.start(); //await manager.search.start(); // don't run the search by default diff --git a/packages/client-twitter/src/search.ts b/packages/client-twitter/src/search.ts index 0e1662fd74f..f1b08777e41 100644 --- a/packages/client-twitter/src/search.ts +++ b/packages/client-twitter/src/search.ts @@ -1,5 +1,5 @@ import { SearchMode } from "agent-twitter-client"; -import { composeContext } from "@ai16z/eliza"; +import {composeContext, elizaLogger} from "@ai16z/eliza"; import { generateMessageResponse, generateText } from "@ai16z/eliza"; import { messageCompletionFooter } from "@ai16z/eliza"; import { @@ -59,10 +59,12 @@ export class TwitterSearchClient { } private engageWithSearchTermsLoop() { - this.engageWithSearchTerms(); + this.engageWithSearchTerms().then(); + const randomMinutes = (Math.floor(Math.random() * (120 - 60 + 1)) + 60); + elizaLogger.log(`Next twitter search scheduled in ${randomMinutes} seconds`); setTimeout( () => this.engageWithSearchTermsLoop(), - (Math.floor(Math.random() * (120 - 60 + 1)) + 60) * 60 * 1000 + randomMinutes * 60 * 1000 ); } From cbd882153d7d36b630412fd8a953156afab0544e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CnulLeeKH=E2=80=9D?= Date: Tue, 24 Dec 2024 22:41:14 +0900 Subject: [PATCH 2/6] doc: add .idea in .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index abc23052720..2c315be472f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ concatenated-output.ts embedding-cache.json packages/plugin-buttplug/intiface-engine +.idea .DS_Store dist/ From b13277f18485f387b61d7c1100400d1139045465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CnulLeeKH=E2=80=9D?= Date: Tue, 24 Dec 2024 22:53:34 +0900 Subject: [PATCH 3/6] doc: modify some comments --- agent/src/index.ts | 2 ++ packages/client-twitter/src/index.ts | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agent/src/index.ts b/agent/src/index.ts index 88f43a4324a..bd3281d9071 100644 --- a/agent/src/index.ts +++ b/agent/src/index.ts @@ -428,6 +428,8 @@ export async function initializeClients( return clients; } +// no needed for now +// // function isFalsish(input: any): boolean { // // If the input is exactly NaN, return true // if (Number.isNaN(input)) { diff --git a/packages/client-twitter/src/index.ts b/packages/client-twitter/src/index.ts index 9009293457e..71850ad788f 100644 --- a/packages/client-twitter/src/index.ts +++ b/packages/client-twitter/src/index.ts @@ -34,10 +34,6 @@ export const TwitterClientInterface: Client = { elizaLogger.log("Twitter client started"); - // enableSearch is just set previous to this call - // so enableSearch can change over time - // and changing it won't stop the SearchClient in the existing instance - const manager = new TwitterManager(runtime, runtime.getSetting("TWITTER_SEARCH_ENABLE") === "true"); await manager.client.init(); From 55805ee7c258a48552270a5f34b4954b1ae30460 Mon Sep 17 00:00:00 2001 From: Blair Lee Date: Wed, 25 Dec 2024 02:22:46 +0900 Subject: [PATCH 4/6] fix: use elizaos package --- packages/client-twitter/src/search.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client-twitter/src/search.ts b/packages/client-twitter/src/search.ts index 2dc90d900d0..89c529c38e3 100644 --- a/packages/client-twitter/src/search.ts +++ b/packages/client-twitter/src/search.ts @@ -1,7 +1,7 @@ import { SearchMode } from "agent-twitter-client"; -import {composeContext, elizaLogger} from "@ai16z/eliza"; -import { generateMessageResponse, generateText } from "@ai16z/eliza"; -import { messageCompletionFooter } from "@ai16z/eliza"; +import {composeContext, elizaLogger} from "@elizaos/core"; +import { generateMessageResponse, generateText } from "@elizaos/core"; +import { messageCompletionFooter } from "@elizaos/core"; import { Content, HandlerCallback, From 0cf3dafe3387dc84c1607f82a17698624aaa5f03 Mon Sep 17 00:00:00 2001 From: Blair Lee Date: Wed, 25 Dec 2024 02:27:12 +0900 Subject: [PATCH 5/6] mod: replace mistypped log in twitter search log --- packages/client-twitter/src/search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client-twitter/src/search.ts b/packages/client-twitter/src/search.ts index 89c529c38e3..8934abf72e3 100644 --- a/packages/client-twitter/src/search.ts +++ b/packages/client-twitter/src/search.ts @@ -61,7 +61,7 @@ export class TwitterSearchClient { private engageWithSearchTermsLoop() { this.engageWithSearchTerms().then(); const randomMinutes = (Math.floor(Math.random() * (120 - 60 + 1)) + 60); - elizaLogger.log(`Next twitter search scheduled in ${randomMinutes} seconds`); + elizaLogger.log(`Next twitter search scheduled in ${randomMinutes} minutes`); setTimeout( () => this.engageWithSearchTermsLoop(), randomMinutes * 60 * 1000 From 510877303f244f2b0c6afdb8e350f8b0fb4606b0 Mon Sep 17 00:00:00 2001 From: Blair Lee Date: Wed, 25 Dec 2024 03:25:58 +0900 Subject: [PATCH 6/6] rfc: accept pr feedback --- agent/src/index.ts | 27 --------------------------- packages/client-twitter/src/index.ts | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/agent/src/index.ts b/agent/src/index.ts index 5fd840479d3..a818b9f2514 100644 --- a/agent/src/index.ts +++ b/agent/src/index.ts @@ -429,33 +429,6 @@ export async function initializeClients( return clients; } -// no needed for now -// -// function isFalsish(input: any): boolean { -// // If the input is exactly NaN, return true -// if (Number.isNaN(input)) { -// return true; -// } -// -// // Convert input to a string if it's not null or undefined -// const value = input == null ? "" : String(input); -// -// // List of common falsish string representations -// const falsishValues = [ -// "false", -// "0", -// "no", -// "n", -// "off", -// "null", -// "undefined", -// "", -// ]; -// -// // Check if the value (trimmed and lowercased) is in the falsish list -// return falsishValues.includes(value.trim().toLowerCase()); -// } - function getSecret(character: Character, secret: string) { return character.settings?.secrets?.[secret] || process.env[secret]; } diff --git a/packages/client-twitter/src/index.ts b/packages/client-twitter/src/index.ts index 71850ad788f..3692525a240 100644 --- a/packages/client-twitter/src/index.ts +++ b/packages/client-twitter/src/index.ts @@ -34,7 +34,7 @@ export const TwitterClientInterface: Client = { elizaLogger.log("Twitter client started"); - const manager = new TwitterManager(runtime, runtime.getSetting("TWITTER_SEARCH_ENABLE") === "true"); + const manager = new TwitterManager(runtime, runtime.getSetting("TWITTER_SEARCH_ENABLE").toLowerCase() === "true"); await manager.client.init();