Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change plugin-web-search to use google.serper.dev #2113

Draft
wants to merge 64 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
4fdb74f
SRISE
indowebdeveloper Jan 10, 2025
6e0d433
XX
indowebdeveloper Jan 10, 2025
0243dfb
Merge branch 'elizaOS:main' into SRISE
indowebdeveloper Jan 11, 2025
a3b1fe1
OKE BRO
indowebdeveloper Jan 12, 2025
88b1d5f
adding news as its new post source
indowebdeveloper Jan 13, 2025
ca682b3
chainCatcher
indowebdeveloper Jan 13, 2025
3029b6c
goplus capability
indowebdeveloper Jan 13, 2025
e557c08
Merge remote-tracking branch 'upstream/main' into SRISE
indowebdeveloper Jan 14, 2025
975a258
chaincacther API
indowebdeveloper Jan 14, 2025
15287ce
dot bug
indowebdeveloper Jan 14, 2025
f1db0cf
some dot bug
indowebdeveloper Jan 14, 2025
ba0cb49
huhuhu
indowebdeveloper Jan 14, 2025
2d3e953
okok
indowebdeveloper Jan 14, 2025
4fdfd2c
fix attempt media is missing
indowebdeveloper Jan 14, 2025
1dac358
goplus check token only
indowebdeveloper Jan 15, 2025
9e05a59
Merge remote-tracking branch 'upstream/develop' into SRISE
indowebdeveloper Jan 15, 2025
6a14224
DEBUG post
indowebdeveloper Jan 15, 2025
feadcc7
supabase schema
indowebdeveloper Jan 15, 2025
077a829
package.json duplicates fix
indowebdeveloper Jan 15, 2025
7189c8a
dirty fix for json tweet
indowebdeveloper Jan 15, 2025
a9dbc63
prompt optimization
indowebdeveloper Jan 15, 2025
d3e4f50
debug
indowebdeveloper Jan 15, 2025
ed99a14
XX debug
indowebdeveloper Jan 15, 2025
72d50f0
put cache and memory to the news
indowebdeveloper Jan 17, 2025
a511465
trimTweetLength additional fix if the text contains ugly json
indowebdeveloper Jan 17, 2025
ff3396f
add embedding to news
indowebdeveloper Jan 17, 2025
0b11101
add embedding
indowebdeveloper Jan 17, 2025
4260319
realtime knowledge using RAG
indowebdeveloper Jan 17, 2025
90948a2
disable birdeye
indowebdeveloper Jan 17, 2025
6c5dd45
replace goplus with neocortex
indowebdeveloper Jan 17, 2025
658e5d9
Merge remote-tracking branch 'upstream/main' into SRISE
indowebdeveloper Jan 21, 2025
fa28855
heleh
indowebdeveloper Jan 21, 2025
77910be
Merge remote-tracking branch 'upstream/develop' into SRISE
indowebdeveloper Jan 21, 2025
1e14c28
merging
indowebdeveloper Jan 21, 2025
77d51cd
adding knowledge
indowebdeveloper Jan 21, 2025
fd6635a
some fix & update
indowebdeveloper Jan 22, 2025
a11fd43
change imageContext --> image descriptions
indowebdeveloper Jan 23, 2025
ed50006
ketinggalan
indowebdeveloper Jan 23, 2025
cfc997c
timelines fetch to action
indowebdeveloper Jan 23, 2025
150e36c
fix bug
indowebdeveloper Jan 23, 2025
2912c8e
ok
indowebdeveloper Jan 23, 2025
39469b2
mistral sdk version to 1.1.0
indowebdeveloper Jan 23, 2025
472573d
uhuy
indowebdeveloper Jan 24, 2025
f094aab
update lagi
indowebdeveloper Jan 24, 2025
2ea33d7
update
indowebdeveloper Jan 24, 2025
4205e5a
ganti lagi
indowebdeveloper Jan 24, 2025
31852c7
revert modelclass medium for handletweet
indowebdeveloper Jan 24, 2025
dde4bd8
prompt
indowebdeveloper Jan 25, 2025
e7571d4
OKOK
indowebdeveloper Jan 30, 2025
8cd7315
jajaja
indowebdeveloper Jan 30, 2025
f2bf656
ok
indowebdeveloper Jan 30, 2025
15e56cf
Merge remote-tracking branch 'upstream/develop' into SRISE
indowebdeveloper Jan 30, 2025
a915e37
news puller
indowebdeveloper Jan 31, 2025
e308658
asdasd
indowebdeveloper Jan 31, 2025
5c633d3
asdas
indowebdeveloper Jan 31, 2025
028d33a
xx
indowebdeveloper Jan 31, 2025
c9b8d38
tpl
indowebdeveloper Jan 31, 2025
129fbf9
xx
indowebdeveloper Feb 1, 2025
b8bcfb8
xxx
indowebdeveloper Feb 1, 2025
9dfa137
lower the treshold
indowebdeveloper Feb 1, 2025
de4bc84
restore it to 0.85
indowebdeveloper Feb 1, 2025
8f99824
improveee
indowebdeveloper Feb 1, 2025
be1d690
image descriptions
indowebdeveloper Feb 1, 2025
64ace80
fix
indowebdeveloper Feb 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"@elizaos/client-simsai": "workspace:*",
"@elizaos/core": "workspace:*",
"@elizaos/plugin-0g": "workspace:*",
"@elizaos/plugin-abstract": "workspace:*",
"@elizaos/plugin-agentkit": "workspace:*",
"@elizaos/plugin-aptos": "workspace:*",
"@elizaos/plugin-birdeye": "workspace:*",
Expand All @@ -49,7 +48,6 @@
"@elizaos/plugin-bnb": "workspace:*",
"@elizaos/plugin-bootstrap": "workspace:*",
"@elizaos/plugin-di": "workspace:*",
"@elizaos/plugin-intiface": "workspace:*",
"@elizaos/plugin-coinbase": "workspace:*",
"@elizaos/plugin-coingecko": "workspace:*",
"@elizaos/plugin-coinmarketcap": "workspace:*",
Expand Down Expand Up @@ -103,7 +101,6 @@
"@elizaos/plugin-video-generation": "workspace:*",
"@elizaos/plugin-web-search": "workspace:*",
"@elizaos/plugin-dexscreener": "workspace:*",
"@elizaos/plugin-letzai": "workspace:*",
"@elizaos/plugin-thirdweb": "workspace:*",
"@elizaos/plugin-genlayer": "workspace:*",
"@elizaos/plugin-tee-verifiable-log": "workspace:*",
Expand Down Expand Up @@ -152,6 +149,9 @@
"@elizaos/plugin-near": "workspace:*",
"@elizaos/plugin-stargaze": "workspace:*",
"@elizaos/plugin-zksync-era": "workspace:*",
"@srise/plugin-crypto-news": "workspace:*",
"@srise/plugin-neocortex-market": "workspace:*",
"@elizaos/plugin-goplus": "workspace:*",
"readline": "1.3.0",
"ws": "8.18.0",
"yargs": "17.7.2"
Expand Down
127 changes: 70 additions & 57 deletions agent/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
import { MongoDBDatabaseAdapter } from "@elizaos/adapter-mongodb";
import { PGLiteDatabaseAdapter } from "@elizaos/adapter-pglite";
import { PostgresDatabaseAdapter } from "@elizaos/adapter-postgres";
import { QdrantDatabaseAdapter } from "@elizaos/adapter-qdrant";
import { RedisClient } from "@elizaos/adapter-redis";
import { SqliteDatabaseAdapter } from "@elizaos/adapter-sqlite";
import { SupabaseDatabaseAdapter } from "@elizaos/adapter-supabase";
import { AlexaClientInterface } from "@elizaos/client-alexa";
import { AutoClientInterface } from "@elizaos/client-auto";
import { DevaClientInterface } from "@elizaos/client-deva";
import { DirectClient } from "@elizaos/client-direct";
import { DiscordClientInterface } from "@elizaos/client-discord";
import { FarcasterClientInterface } from "@elizaos/client-farcaster";
import { InstagramClientInterface } from "@elizaos/client-instagram";
import { LensAgentClient } from "@elizaos/client-lens";
import { SlackClientInterface } from "@elizaos/client-slack";
import { TelegramClientInterface } from "@elizaos/client-telegram";
import { TelegramAccountClientInterface } from "@elizaos/client-telegram-account";
import { TwitterClientInterface } from "@elizaos/client-twitter";
import { AlexaClientInterface } from "@elizaos/client-alexa";
import { MongoDBDatabaseAdapter } from "@elizaos/adapter-mongodb";
import { DevaClientInterface } from "@elizaos/client-deva";

import { FarcasterClientInterface } from "@elizaos/client-farcaster";
import { OmniflixPlugin } from "@elizaos/plugin-omniflix";
import { JeeterClientInterface } from "@elizaos/client-simsai";
import { XmtpClientInterface } from "@elizaos/client-xmtp";
import { DirectClient } from "@elizaos/client-direct";
import { agentKitPlugin } from "@elizaos/plugin-agentkit";
import { dcapPlugin } from "@elizaos/plugin-dcap";
import { gelatoPlugin } from "@elizaos/plugin-gelato";
import { PrimusAdapter } from "@elizaos/plugin-primus";
import { lightningPlugin } from "@elizaos/plugin-lightning";
import { goplusPlugin } from "@elizaos/plugin-goplus";
import { elizaCodeinPlugin, onchainJson } from "@elizaos/plugin-iq6900";
import { dcapPlugin } from "@elizaos/plugin-dcap";
import { lightningPlugin } from "@elizaos/plugin-lightning";
import { OmniflixPlugin } from "@elizaos/plugin-omniflix";
import { PrimusAdapter } from "@elizaos/plugin-primus";
import { neoCortexMarketPlugin } from "@srise/plugin-neocortex-market";
// import { ReclaimAdapter } from "@elizaos/plugin-reclaim";
import {
AgentRuntime,
CacheManager,
Expand Down Expand Up @@ -58,7 +61,7 @@ import createZilliqaPlugin from "@elizaos/plugin-zilliqa";

// import { intifacePlugin } from "@elizaos/plugin-intiface";
import { ThreeDGenerationPlugin } from "@elizaos/plugin-3d-generation";
import { abstractPlugin } from "@elizaos/plugin-abstract";
//import { abstractPlugin } from "@elizaos/plugin-abstract";
import { akashPlugin } from "@elizaos/plugin-akash";
import { alloraPlugin } from "@elizaos/plugin-allora";
import { aptosPlugin } from "@elizaos/plugin-aptos";
Expand All @@ -68,7 +71,6 @@ import { availPlugin } from "@elizaos/plugin-avail";
import { avalanchePlugin } from "@elizaos/plugin-avalanche";
import { b2Plugin } from "@elizaos/plugin-b2";
import { binancePlugin } from "@elizaos/plugin-binance";
import { birdeyePlugin } from "@elizaos/plugin-birdeye";
import { bittensorPlugin } from "@elizaos/plugin-bittensor";
import { bnbPlugin } from "@elizaos/plugin-bnb";
import {
Expand All @@ -89,24 +91,41 @@ import { flowPlugin } from "@elizaos/plugin-flow";
import { fuelPlugin } from "@elizaos/plugin-fuel";
import { genLayerPlugin } from "@elizaos/plugin-genlayer";
import { gitcoinPassportPlugin } from "@elizaos/plugin-gitcoin-passport";
import { initiaPlugin } from "@elizaos/plugin-initia";
import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
import { initiaPlugin } from "@elizaos/plugin-initia";
import { lensPlugin } from "@elizaos/plugin-lens-network";
import { litPlugin } from "@elizaos/plugin-lit";
import { mindNetworkPlugin } from "@elizaos/plugin-mind-network";
import { multiversxPlugin } from "@elizaos/plugin-multiversx";
import { nearPlugin } from "@elizaos/plugin-near";
//import { nearPlugin } from "@elizaos/plugin-near"; // causing image generation error
import { zxPlugin } from "@elizaos/plugin-0x";
import { chainbasePlugin } from "@elizaos/plugin-chainbase";
import { devinPlugin } from "@elizaos/plugin-devin";
import { dexScreenerPlugin } from "@elizaos/plugin-dexscreener";
import { dkgPlugin } from "@elizaos/plugin-dkg";
import { echoChambersPlugin } from "@elizaos/plugin-echochambers";
import { giphyPlugin } from "@elizaos/plugin-giphy";
import { holdstationPlugin } from "@elizaos/plugin-holdstation";
import { hyperbolicPlugin } from "@elizaos/plugin-hyperbolic";
import { hyperliquidPlugin } from "@elizaos/plugin-hyperliquid";
import { injectivePlugin } from "@elizaos/plugin-injective";
import { letzAIPlugin } from "@elizaos/plugin-letzai";
import { moralisPlugin } from "@elizaos/plugin-moralis";
import createNFTCollectionsPlugin from "@elizaos/plugin-nft-collections";
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
import { createNodePlugin } from "@elizaos/plugin-node";
import { nvidiaNimPlugin } from "@elizaos/plugin-nvidia-nim";
import { obsidianPlugin } from "@elizaos/plugin-obsidian";
import { OpacityAdapter } from "@elizaos/plugin-opacity";
import { openWeatherPlugin } from "@elizaos/plugin-open-weather";
import { openaiPlugin } from "@elizaos/plugin-openai";
import { pythDataPlugin } from "@elizaos/plugin-pyth-data";
import { quaiPlugin } from "@elizaos/plugin-quai";
import nitroPlugin from "@elizaos/plugin-router-nitro";
import { sgxPlugin } from "@elizaos/plugin-sgx";
import { solanaPlugin } from "@elizaos/plugin-solana";
import { solanaPluginV2 } from "@elizaos/plugin-solana-v2";
import { solanaAgentkitPlugin } from "@elizaos/plugin-solana-agent-kit";
import { solanaPluginV2 } from "@elizaos/plugin-solana-v2";
import { squidRouterPlugin } from "@elizaos/plugin-squid-router";
import { stargazePlugin } from "@elizaos/plugin-stargaze";
import { storyPlugin } from "@elizaos/plugin-story";
Expand All @@ -115,50 +134,34 @@ import { TEEMode, teePlugin } from "@elizaos/plugin-tee";
import { teeLogPlugin } from "@elizaos/plugin-tee-log";
import { teeMarlinPlugin } from "@elizaos/plugin-tee-marlin";
import { verifiableLogPlugin } from "@elizaos/plugin-tee-verifiable-log";
import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
import { tonPlugin } from "@elizaos/plugin-ton";
import { webSearchPlugin } from "@elizaos/plugin-web-search";
import { dkgPlugin } from "@elizaos/plugin-dkg";
import { injectivePlugin } from "@elizaos/plugin-injective";
import { giphyPlugin } from "@elizaos/plugin-giphy";
import { letzAIPlugin } from "@elizaos/plugin-letzai";
import { thirdwebPlugin } from "@elizaos/plugin-thirdweb";
import { hyperliquidPlugin } from "@elizaos/plugin-hyperliquid";
import { moralisPlugin } from "@elizaos/plugin-moralis";
import { echoChambersPlugin } from "@elizaos/plugin-echochambers";
import { dexScreenerPlugin } from "@elizaos/plugin-dexscreener";
import { pythDataPlugin } from "@elizaos/plugin-pyth-data";
import { openaiPlugin } from "@elizaos/plugin-openai";
import nitroPlugin from "@elizaos/plugin-router-nitro";
import { devinPlugin } from "@elizaos/plugin-devin";
import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
import { chainbasePlugin } from "@elizaos/plugin-chainbase";
import { holdstationPlugin } from "@elizaos/plugin-holdstation";
import { nvidiaNimPlugin } from "@elizaos/plugin-nvidia-nim";
import { zxPlugin } from "@elizaos/plugin-0x";
import { hyperbolicPlugin } from "@elizaos/plugin-hyperbolic";
import { litPlugin } from "@elizaos/plugin-lit";
import Database from "better-sqlite3";
import fs from "fs";
import net from "net";
import path from "path";
import { fileURLToPath } from "url";
import yargs from "yargs";

import { ankrPlugin } from "@elizaos/plugin-ankr";
import { emailPlugin } from "@elizaos/plugin-email";
import { emailAutomationPlugin } from "@elizaos/plugin-email-automation";
import { ethstoragePlugin } from "@elizaos/plugin-ethstorage";
import { formPlugin } from "@elizaos/plugin-form";
import { imgflipPlugin } from "@elizaos/plugin-imgflip";
import { minaPlugin } from "@elizaos/plugin-mina";
import { quickIntelPlugin } from "@elizaos/plugin-quick-intel";
import { seiPlugin } from "@elizaos/plugin-sei";
import { sunoPlugin } from "@elizaos/plugin-suno";
import { udioPlugin } from "@elizaos/plugin-udio";
import { imgflipPlugin } from "@elizaos/plugin-imgflip";
import { ethstoragePlugin } from "@elizaos/plugin-ethstorage";
import { zerionPlugin } from "@elizaos/plugin-zerion";
import { minaPlugin } from "@elizaos/plugin-mina";
import { ankrPlugin } from "@elizaos/plugin-ankr";
import { formPlugin } from "@elizaos/plugin-form";
import { cryptoNewsPlugin } from "@srise/plugin-crypto-news";
import Database from "better-sqlite3";
import fs from "fs";
import { MongoClient } from "mongodb";
import { quickIntelPlugin } from "@elizaos/plugin-quick-intel";
import net from "net";
import path from "path";
import { fileURLToPath } from "url";
import yargs from "yargs";

import { trikonPlugin } from "@elizaos/plugin-trikon";
import arbitragePlugin from "@elizaos/plugin-arbitrage";
import { trikonPlugin } from "@elizaos/plugin-trikon";
const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
const __dirname = path.dirname(__filename); // get the name of the directory

Expand Down Expand Up @@ -939,7 +942,7 @@ export async function createAgent(
elizaLogger.error(
"A WALLET_SECRET_SALT required when TEE_MODE is enabled"
);
throw new Error("Invalid TEE configuration");
throw new Error("Invalid TEES configuration");
}

let goatPlugin: any | undefined;
Expand Down Expand Up @@ -1048,7 +1051,12 @@ export async function createAgent(
getSecret(character, "ROUTER_NITRO_EVM_ADDRESS")
? nitroPlugin
: null,
getSecret(character, "TAVILY_API_KEY") ? webSearchPlugin : null,
getSecret(character, "TAVILY_API_KEY") ||
getSecret(character, "SERPER_API_KEY")
? webSearchPlugin
: null,
cryptoNewsPlugin,

getSecret(character, "SOLANA_PUBLIC_KEY") ||
(getSecret(character, "WALLET_PUBLIC_KEY") &&
!getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
Expand All @@ -1058,11 +1066,11 @@ export async function createAgent(
? solanaAgentkitPlugin
: null,
getSecret(character, "AUTONOME_JWT_TOKEN") ? autonomePlugin : null,
(getSecret(character, "NEAR_ADDRESS") ||
getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
getSecret(character, "NEAR_WALLET_SECRET_KEY")
? nearPlugin
: null,
// (getSecret(character, "NEAR_ADDRESS") ||
// getSecret(character, "NEAR_WALLET_PUBLIC_KEY")) &&
// getSecret(character, "NEAR_WALLET_SECRET_KEY")
// ? nearPlugin
// : null,
getSecret(character, "EVM_PUBLIC_KEY") ||
(getSecret(character, "WALLET_PUBLIC_KEY") &&
getSecret(character, "WALLET_PUBLIC_KEY")?.startsWith("0x"))
Expand All @@ -1087,6 +1095,7 @@ export async function createAgent(
? nftGenerationPlugin
: null,
getSecret(character, "ZEROG_PRIVATE_KEY") ? zgPlugin : null,
goplusPlugin,
getSecret(character, "COINMARKETCAP_API_KEY")
? coinmarketcapPlugin
: null,
Expand Down Expand Up @@ -1142,9 +1151,9 @@ export async function createAgent(
: null,
getSecret(character, "MORALIS_API_KEY") ? moralisPlugin : null,
getSecret(character, "EVM_PROVIDER_URL") ? goatPlugin : null,
getSecret(character, "ABSTRACT_PRIVATE_KEY")
? abstractPlugin
: null,
// getSecret(character, "ABSTRACT_PRIVATE_KEY")
// ? abstractPlugin
// : null,
getSecret(character, "B2_PRIVATE_KEY") ? b2Plugin : null,
getSecret(character, "BINANCE_API_KEY") &&
getSecret(character, "BINANCE_SECRET_KEY")
Expand Down Expand Up @@ -1183,7 +1192,7 @@ export async function createAgent(
getSecret(character, "AVALANCHE_PRIVATE_KEY")
? avalanchePlugin
: null,
getSecret(character, "BIRDEYE_API_KEY") ? birdeyePlugin : null,
// getSecret(character, "BIRDEYE_API_KEY") ? birdeyePlugin : null,
getSecret(character, "ECHOCHAMBERS_API_URL") &&
getSecret(character, "ECHOCHAMBERS_API_KEY")
? echoChambersPlugin
Expand Down Expand Up @@ -1296,6 +1305,10 @@ export async function createAgent(
getSecret(character, "ARBITRAGE_BUNDLE_EXECUTOR_ADDRESS")
? arbitragePlugin
: null,
getSecret(character, "DEVIN_API_TOKEN") ? devinPlugin : null,
getSecret(character, "INSIDEX_API_KEY")
? neoCortexMarketPlugin
: null,
]
.flat()
.filter(Boolean),
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,4 @@
"packages/*"
]
}

Loading
Loading