Skip to content

Commit 4181278

Browse files
wtfsayowtfsayo
committed
Merge branch 'develop' into pr/2429
2 parents 21b46c3 + cfd1f48 commit 4181278

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4574
-3135
lines changed

‎.env.example

+10-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@ EMBEDDING_OPENAI_MODEL= # Default: text-embedding-3-small
9191
IMAGE_OPENAI_MODEL= # Default: dall-e-3
9292
USE_OPENAI_EMBEDDING= # Set to TRUE for OpenAI/1536, leave blank for local
9393

94+
# Community Plugin for OpenAI Configuration
95+
ENABLE_OPEN_AI_COMMUNITY_PLUGIN=false
96+
OPENAI_DEFAULT_MODEL=
97+
OPENAI_MAX_TOKENS=
98+
OPENAI_TEMPERATURE=
99+
100+
101+
102+
94103
# Atoma SDK Configuration
95104
ATOMASDK_BEARER_AUTH= # Atoma SDK Bearer Auth token
96105
ATOMA_API_URL= # Default: https://api.atoma.network/v1
@@ -359,9 +368,9 @@ COINBASE_GENERATED_WALLET_HEX_SEED= # Not your address but the wallet hex seed f
359368
COINBASE_NOTIFICATION_URI= # For webhook plugin the uri you want to send the webhook to for dummy ones use https://webhook.site
360369

361370
# Coinbase AgentKit
362-
COINBASE_AGENT_KIT_NETWORK= # defaults to 'base-sepolia'
363371
CDP_API_KEY_NAME=
364372
CDP_API_KEY_PRIVATE_KEY=
373+
CDP_AGENT_KIT_NETWORK=base-sepolia # Optional: Defaults to base-sepolia
365374

366375
# Coinbase Charity Configuration
367376
IS_CHARITABLE=false # Set to true to enable charity donations

‎README.md

+15-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<div align="center">
88

9-
📖 [Documentation](https://elizaos.github.io/eliza/) | 🎯 [Examples](https://github.com/thejoven/awesome-eliza)
9+
📑 [Technical Report](https://arxiv.org/pdf/2501.06781) | 📖 [Documentation](https://elizaos.github.io/eliza/) | 🎯 [Examples](https://github.com/thejoven/awesome-eliza)
1010

1111
</div>
1212

@@ -157,12 +157,25 @@ pnpm install --include=optional sharp
157157
- [GitHub Issues](https://github.com/elizaos/eliza/issues). Best for: bugs you encounter using Eliza, and feature proposals.
158158
- [Discord](https://discord.gg/ai16z). Best for: sharing your applications and hanging out with the community.
159159

160+
## Citation
161+
162+
We now have a [paper](https://arxiv.org/pdf/2501.06781) you can cite for the Eliza OS:
163+
```bibtex
164+
@article{walters2025eliza,
165+
title={Eliza: A Web3 friendly AI Agent Operating System},
166+
author={Walters, Shaw and Gao, Sam and Nerd, Shakker and Da, Feng and Williams, Warren and Meng, Ting-Chien and Han, Hunter and He, Frank and Zhang, Allen and Wu, Ming and others},
167+
journal={arXiv preprint arXiv:2501.06781},
168+
year={2025}
169+
}
170+
```
171+
160172
## Contributors
161173

162174
<a href="https://github.com/elizaos/eliza/graphs/contributors">
163-
<img src="https://contrib.rocks/image?repo=elizaos/eliza" />
175+
<img src="https://contrib.rocks/image?repo=elizaos/eliza" alt="Eliza project contributors" />
164176
</a>
165177

178+
166179
## Star History
167180

168181
[![Star History Chart](https://api.star-history.com/svg?repos=elizaos/eliza&type=Date)](https://star-history.com/#elizaos/eliza&Date)

‎agent/package.json

+118-117
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,121 @@
11
{
2-
"name": "@elizaos/agent",
3-
"version": "0.1.9-alpha.1",
4-
"main": "src/index.ts",
5-
"type": "module",
6-
"scripts": {
7-
"start": "node --loader ts-node/esm src/index.ts",
8-
"dev": "node --loader ts-node/esm src/index.ts",
9-
"check-types": "tsc --noEmit",
10-
"test": "jest"
11-
},
12-
"nodemonConfig": {
13-
"watch": [
14-
"src",
15-
"../core/dist"
16-
],
17-
"ext": "ts,json",
18-
"exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
19-
},
20-
"dependencies": {
21-
"@elizaos/adapter-supabase": "workspace:*",
22-
"@elizaos/adapter-postgres": "workspace:*",
23-
"@elizaos/adapter-redis": "workspace:*",
24-
"@elizaos/adapter-sqlite": "workspace:*",
25-
"@elizaos/adapter-pglite": "workspace:*",
26-
"@elizaos/client-auto": "workspace:*",
27-
"@elizaos/client-direct": "workspace:*",
28-
"@elizaos/client-discord": "workspace:*",
29-
"@elizaos/client-farcaster": "workspace:*",
30-
"@elizaos/client-lens": "workspace:*",
31-
"@elizaos/client-telegram": "workspace:*",
32-
"@elizaos/client-twitter": "workspace:*",
33-
"@elizaos/client-instagram": "workspace:*",
34-
"@elizaos/client-slack": "workspace:*",
35-
"@elizaos/core": "workspace:*",
36-
"@elizaos/plugin-0g": "workspace:*",
37-
"@elizaos/plugin-abstract": "workspace:*",
38-
"@elizaos/plugin-agentkit": "workspace:*",
39-
"@elizaos/plugin-aptos": "workspace:*",
40-
"@elizaos/plugin-birdeye": "workspace:*",
41-
"@elizaos/plugin-coingecko": "workspace:*",
42-
"@elizaos/plugin-coinmarketcap": "workspace:*",
43-
"@elizaos/plugin-binance": "workspace:*",
44-
"@elizaos/plugin-avail": "workspace:*",
45-
"@elizaos/plugin-bootstrap": "workspace:*",
46-
"@elizaos/plugin-di": "workspace:*",
47-
"@elizaos/plugin-cosmos": "workspace:*",
48-
"@elizaos/plugin-intiface": "workspace:*",
49-
"@elizaos/plugin-coinbase": "workspace:*",
50-
"@elizaos/plugin-conflux": "workspace:*",
51-
"@elizaos/plugin-evm": "workspace:*",
52-
"@elizaos/plugin-echochambers": "workspace:*",
53-
"@elizaos/plugin-flow": "workspace:*",
54-
"@elizaos/plugin-gitbook": "workspace:*",
55-
"@elizaos/plugin-story": "workspace:*",
56-
"@elizaos/plugin-gitcoin-passport": "workspace:*",
57-
"@elizaos/plugin-goat": "workspace:*",
58-
"@elizaos/plugin-lensNetwork": "workspace:*",
59-
"@elizaos/plugin-icp": "workspace:*",
60-
"@elizaos/plugin-image-generation": "workspace:*",
61-
"@elizaos/plugin-movement": "workspace:*",
62-
"@elizaos/plugin-massa": "workspace:*",
63-
"@elizaos/plugin-nft-generation": "workspace:*",
64-
"@elizaos/plugin-node": "workspace:*",
65-
"@elizaos/plugin-solana": "workspace:*",
66-
"@elizaos/plugin-injective": "workspace:*",
67-
"@elizaos/plugin-solana-agent-kit": "workspace:*",
68-
"@elizaos/plugin-squid-router": "workspace:*",
69-
"@elizaos/plugin-autonome": "workspace:*",
70-
"@elizaos/plugin-starknet": "workspace:*",
71-
"@elizaos/plugin-stargaze": "workspace:*",
72-
"@elizaos/plugin-giphy": "workspace:*",
73-
"@elizaos/plugin-ton": "workspace:*",
74-
"@elizaos/plugin-sui": "workspace:*",
75-
"@elizaos/plugin-sgx": "workspace:*",
76-
"@elizaos/plugin-iq6900": "workspace:*",
77-
"@elizaos/plugin-tee": "workspace:*",
78-
"@elizaos/plugin-tee-log": "workspace:*",
79-
"@elizaos/plugin-tee-marlin": "workspace:*",
80-
"@elizaos/plugin-multiversx": "workspace:*",
81-
"@elizaos/plugin-near": "workspace:*",
82-
"@elizaos/plugin-zksync-era": "workspace:*",
83-
"@elizaos/plugin-twitter": "workspace:*",
84-
"@elizaos/plugin-primus": "workspace:*",
85-
"@elizaos/plugin-cronoszkevm": "workspace:*",
86-
"@elizaos/plugin-3d-generation": "workspace:*",
87-
"@elizaos/plugin-fuel": "workspace:*",
88-
"@elizaos/plugin-avalanche": "workspace:*",
89-
"@elizaos/plugin-video-generation": "workspace:*",
90-
"@elizaos/plugin-web-search": "workspace:*",
91-
"@elizaos/plugin-dexscreener": "workspace:*",
92-
"@elizaos/plugin-letzai": "workspace:*",
93-
"@elizaos/plugin-thirdweb": "workspace:*",
94-
"@elizaos/plugin-genlayer": "workspace:*",
95-
"@elizaos/plugin-tee-verifiable-log": "workspace:*",
96-
"@elizaos/plugin-depin": "workspace:*",
97-
"@elizaos/plugin-open-weather": "workspace:*",
98-
"@elizaos/plugin-obsidian": "workspace:*",
99-
"@elizaos/plugin-arthera": "workspace:*",
100-
"@elizaos/plugin-allora": "workspace:*",
101-
"@elizaos/plugin-opacity": "workspace:*",
102-
"@elizaos/plugin-hyperliquid": "workspace:*",
103-
"@elizaos/plugin-akash": "workspace:*",
104-
"@elizaos/plugin-quai": "workspace:*",
2+
"name": "@elizaos/agent",
3+
"version": "0.1.9-alpha.1",
4+
"main": "src/index.ts",
5+
"type": "module",
6+
"scripts": {
7+
"start": "node --loader ts-node/esm src/index.ts",
8+
"dev": "node --loader ts-node/esm src/index.ts",
9+
"check-types": "tsc --noEmit",
10+
"test": "jest"
11+
},
12+
"nodemonConfig": {
13+
"watch": [
14+
"src",
15+
"../core/dist"
16+
],
17+
"ext": "ts,json",
18+
"exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
19+
},
20+
"dependencies": {
21+
"@elizaos/adapter-supabase": "workspace:*",
22+
"@elizaos/adapter-postgres": "workspace:*",
23+
"@elizaos/adapter-redis": "workspace:*",
24+
"@elizaos/adapter-sqlite": "workspace:*",
25+
"@elizaos/adapter-pglite": "workspace:*",
26+
"@elizaos/client-auto": "workspace:*",
27+
"@elizaos/client-direct": "workspace:*",
28+
"@elizaos/client-discord": "workspace:*",
29+
"@elizaos/client-farcaster": "workspace:*",
30+
"@elizaos/client-lens": "workspace:*",
31+
"@elizaos/client-telegram": "workspace:*",
32+
"@elizaos/client-twitter": "workspace:*",
33+
"@elizaos/client-instagram": "workspace:*",
34+
"@elizaos/client-slack": "workspace:*",
35+
"@elizaos/core": "workspace:*",
36+
"@elizaos/plugin-0g": "workspace:*",
37+
"@elizaos/plugin-abstract": "workspace:*",
38+
"@elizaos/plugin-agentkit": "workspace:*",
39+
"@elizaos/plugin-aptos": "workspace:*",
40+
"@elizaos/plugin-birdeye": "workspace:*",
41+
"@elizaos/plugin-coingecko": "workspace:*",
42+
"@elizaos/plugin-coinmarketcap": "workspace:*",
43+
"@elizaos/plugin-binance": "workspace:*",
44+
"@elizaos/plugin-avail": "workspace:*",
45+
"@elizaos/plugin-bootstrap": "workspace:*",
46+
"@elizaos/plugin-di": "workspace:*",
47+
"@elizaos/plugin-cosmos": "workspace:*",
48+
"@elizaos/plugin-intiface": "workspace:*",
49+
"@elizaos/plugin-coinbase": "workspace:*",
50+
"@elizaos/plugin-conflux": "workspace:*",
51+
"@elizaos/plugin-evm": "workspace:*",
52+
"@elizaos/plugin-echochambers": "workspace:*",
53+
"@elizaos/plugin-flow": "workspace:*",
54+
"@elizaos/plugin-gitbook": "workspace:*",
55+
"@elizaos/plugin-story": "workspace:*",
56+
"@elizaos/plugin-gitcoin-passport": "workspace:*",
57+
"@elizaos/plugin-goat": "workspace:*",
58+
"@elizaos/plugin-lensNetwork": "workspace:*",
59+
"@elizaos/plugin-icp": "workspace:*",
60+
"@elizaos/plugin-image-generation": "workspace:*",
61+
"@elizaos/plugin-movement": "workspace:*",
62+
"@elizaos/plugin-massa": "workspace:*",
63+
"@elizaos/plugin-nft-generation": "workspace:*",
64+
"@elizaos/plugin-node": "workspace:*",
65+
"@elizaos/plugin-solana": "workspace:*",
66+
"@elizaos/plugin-injective": "workspace:*",
67+
"@elizaos/plugin-solana-agent-kit": "workspace:*",
68+
"@elizaos/plugin-squid-router": "workspace:*",
69+
"@elizaos/plugin-autonome": "workspace:*",
70+
"@elizaos/plugin-starknet": "workspace:*",
71+
"@elizaos/plugin-stargaze": "workspace:*",
72+
"@elizaos/plugin-giphy": "workspace:*",
73+
"@elizaos/plugin-ton": "workspace:*",
74+
"@elizaos/plugin-sui": "workspace:*",
75+
"@elizaos/plugin-sgx": "workspace:*",
76+
"@elizaos/plugin-iq6900": "workspace:*",
77+
"@elizaos/plugin-tee": "workspace:*",
78+
"@elizaos/plugin-tee-log": "workspace:*",
79+
"@elizaos/plugin-tee-marlin": "workspace:*",
80+
"@elizaos/plugin-multiversx": "workspace:*",
81+
"@elizaos/plugin-near": "workspace:*",
82+
"@elizaos/plugin-zksync-era": "workspace:*",
83+
"@elizaos/plugin-twitter": "workspace:*",
84+
"@elizaos/plugin-primus": "workspace:*",
85+
"@elizaos/plugin-cronoszkevm": "workspace:*",
86+
"@elizaos/plugin-3d-generation": "workspace:*",
87+
"@elizaos/plugin-fuel": "workspace:*",
88+
"@elizaos/plugin-avalanche": "workspace:*",
89+
"@elizaos/plugin-video-generation": "workspace:*",
90+
"@elizaos/plugin-web-search": "workspace:*",
91+
"@elizaos/plugin-dexscreener": "workspace:*",
92+
"@elizaos/plugin-letzai": "workspace:*",
93+
"@elizaos/plugin-thirdweb": "workspace:*",
94+
"@elizaos/plugin-genlayer": "workspace:*",
95+
"@elizaos/plugin-tee-verifiable-log": "workspace:*",
96+
"@elizaos/plugin-depin": "workspace:*",
97+
"@elizaos/plugin-open-weather": "workspace:*",
98+
"@elizaos/plugin-obsidian": "workspace:*",
99+
"@elizaos/plugin-arthera": "workspace:*",
100+
"@elizaos/plugin-allora": "workspace:*",
101+
"@elizaos/plugin-opacity": "workspace:*",
102+
"@elizaos/plugin-hyperliquid": "workspace:*",
103+
"@elizaos/plugin-akash": "workspace:*",
104+
"@elizaos/plugin-quai": "workspace:*",
105105
"@elizaos/plugin-lightning": "workspace:*",
106-
"@elizaos/plugin-b2": "workspace:*",
107-
"@elizaos/plugin-nft-collections": "workspace:*",
108-
"@elizaos/plugin-pyth-data": "workspace:*",
109-
"readline": "1.3.0",
110-
"ws": "8.18.0",
111-
"yargs": "17.7.2"
112-
},
113-
"devDependencies": {
114-
"@types/jest": "^29.5.14",
115-
"jest": "^29.7.0",
116-
"ts-jest": "^29.2.5",
117-
"ts-node": "10.9.2",
118-
"tsup": "8.3.5"
119-
}
106+
"@elizaos/plugin-b2": "workspace:*",
107+
"@elizaos/plugin-nft-collections": "workspace:*",
108+
"@elizaos/plugin-pyth-data": "workspace:*",
109+
"@elizaos/plugin-openai": "workspace:*",
110+
"readline": "1.3.0",
111+
"ws": "8.18.0",
112+
"yargs": "17.7.2"
113+
},
114+
"devDependencies": {
115+
"@types/jest": "^29.5.14",
116+
"jest": "^29.7.0",
117+
"ts-jest": "^29.2.5",
118+
"ts-node": "10.9.2",
119+
"tsup": "8.3.5"
120+
}
120121
}

‎agent/src/index.ts

+19-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { TelegramClientInterface } from "@elizaos/client-telegram";
1212
import { TwitterClientInterface } from "@elizaos/client-twitter";
1313
import { FarcasterClientInterface } from "@elizaos/client-farcaster";
1414
import { DirectClient } from "@elizaos/client-direct";
15+
import { agentKitPlugin } from "@elizaos/plugin-agentkit";
1516
// import { ReclaimAdapter } from "@elizaos/plugin-reclaim";
1617
import { PrimusAdapter } from "@elizaos/plugin-primus";
1718
import { lightningPlugin } from "@elizaos/plugin-lightning";
@@ -106,6 +107,7 @@ import { hyperliquidPlugin } from "@elizaos/plugin-hyperliquid";
106107
import { echoChambersPlugin } from "@elizaos/plugin-echochambers";
107108
import { dexScreenerPlugin } from "@elizaos/plugin-dexscreener";
108109
import { pythDataPlugin } from "@elizaos/plugin-pyth-data";
110+
import { openaiPlugin } from '@elizaos/plugin-openai';
109111

110112
import { zksyncEraPlugin } from "@elizaos/plugin-zksync-era";
111113
import Database from "better-sqlite3";
@@ -250,7 +252,6 @@ export async function loadCharacterFromOnchain(): Promise<Character[]> {
250252
}
251253
}
252254

253-
254255
async function loadCharactersFromUrl(url: string): Promise<Character[]> {
255256
try {
256257
const response = await fetch(url);
@@ -547,15 +548,20 @@ export function getTokenForProvider(
547548
character.settings?.secrets?.HYPERBOLIC_API_KEY ||
548549
settings.HYPERBOLIC_API_KEY
549550
);
551+
550552
case ModelProviderName.VENICE:
551553
return (
552554
character.settings?.secrets?.VENICE_API_KEY ||
553555
settings.VENICE_API_KEY
554556
);
555557
case ModelProviderName.ATOMA:
558+
return (
559+
character.settings?.secrets?.ATOMASDK_BEARER_AUTH ||
560+
settings.ATOMASDK_BEARER_AUTH
561+
case ModelProviderName.NVIDIA:
556562
return (
557-
character.settings?.secrets?.ATOMASDK_BEARER_AUTH ||
558-
settings.ATOMASDK_BEARER_AUTH
563+
character.settings?.secrets?.NVIDIA_API_KEY ||
564+
settings.NVIDIA_API_KEY
559565
);
560566
case ModelProviderName.AKASH_CHAT_API:
561567
return (
@@ -864,6 +870,10 @@ export async function createAgent(
864870
? elizaCodeinPlugin
865871
: null,
866872
bootstrapPlugin,
873+
getSecret(character, "CDP_API_KEY_NAME") &&
874+
getSecret(character, "CDP_API_KEY_PRIVATE_KEY")
875+
? agentKitPlugin
876+
: null,
867877
getSecret(character, "DEXSCREENER_API_KEY")
868878
? dexScreenerPlugin
869879
: null,
@@ -919,6 +929,7 @@ export async function createAgent(
919929
getSecret(character, "FAL_API_KEY") ||
920930
getSecret(character, "OPENAI_API_KEY") ||
921931
getSecret(character, "VENICE_API_KEY") ||
932+
getSecret(character, "NVIDIA_API_KEY") ||
922933
getSecret(character, "NINETEEN_AI_API_KEY") ||
923934
getSecret(character, "HEURIST_API_KEY") ||
924935
getSecret(character, "LIVEPEER_GATEWAY_URL")
@@ -1043,7 +1054,10 @@ export async function createAgent(
10431054
getSecret(character, "LND_MACAROON") &&
10441055
getSecret(character, "LND_SOCKET")
10451056
? lightningPlugin
1046-
: null
1057+
: null,
1058+
getSecret(character, "OPENAI_API_KEY") && getSecret(character, "ENABLE_OPEN_AI_COMMUNITY_PLUGIN")
1059+
? openaiPlugin
1060+
: null,
10471061
].filter(Boolean),
10481062
providers: [],
10491063
actions: [],
@@ -1287,3 +1301,4 @@ if (
12871301
console.error("unhandledRejection", err);
12881302
});
12891303
}
1304+

0 commit comments

Comments
 (0)