Skip to content

Commit 7a3acdf

Browse files
authored
Merge pull request #1356 from elizaOS/develop
chore: Merge Develop into Main
2 parents e185e6a + d3f8e8b commit 7a3acdf

File tree

739 files changed

+13313
-12114
lines changed

Some content is hidden

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

739 files changed

+13313
-12114
lines changed

.env.example

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ TWITTER_PASSWORD= # Account password
5858
TWITTER_EMAIL= # Account email
5959
TWITTER_2FA_SECRET=
6060

61-
TWITTER_COOKIES= # Account cookies
6261
TWITTER_POLL_INTERVAL=120 # How often (in seconds) the bot should check for interactions
6362
TWITTER_SEARCH_ENABLE=FALSE # Enable timeline search, WARNING this greatly increases your chance of getting banned
6463
TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to interact with

CHANGELOG.md

+993-993
Large diffs are not rendered by default.

CONTRIBUTING.md

+31-31
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ By contributing to Eliza, you agree that your contributions will be licensed und
1515

1616
We believe in the power of the OODA Loop - a decision-making framework that emphasizes speed and adaptability. OODA stands for:
1717

18-
- **Observe**: Gather information and insights about the project, the community, and the broader AI ecosystem.
19-
- **Orient**: Analyze your observations to identify opportunities for contribution and improvement.
20-
- **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
21-
- **Act**: Execute your decision and share your work with the community.
18+
- **Observe**: Gather information and insights about the project, the community, and the broader AI ecosystem.
19+
- **Orient**: Analyze your observations to identify opportunities for contribution and improvement.
20+
- **Decide**: Choose a course of action based on your analysis. This could be proposing a new feature, fixing a bug, or creating content.
21+
- **Act**: Execute your decision and share your work with the community.
2222

2323
## How to Contribute
2424

@@ -48,45 +48,45 @@ We believe in the power of the OODA Loop - a decision-making framework that emph
4848

4949
### Git Commit Messages
5050

51-
- Use the present tense ("Add feature" not "Added feature")
52-
- Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
53-
- Limit the first line to 72 characters or less
54-
- Reference issues and pull requests liberally after the first line
51+
- Use the present tense ("Add feature" not "Added feature")
52+
- Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
53+
- Limit the first line to 72 characters or less
54+
- Reference issues and pull requests liberally after the first line
5555

5656
### JavaScript Styleguide
5757

58-
- All JavaScript must adhere to [JavaScript Standard Style](https://standardjs.com/).
58+
- All JavaScript must adhere to [JavaScript Standard Style](https://standardjs.com/).
5959

6060
### TypeScript Styleguide
6161

62-
- All TypeScript must adhere to [TypeScript Standard Style](https://github.com/standard/ts-standard).
62+
- All TypeScript must adhere to [TypeScript Standard Style](https://github.com/standard/ts-standard).
6363

6464
### Documentation Styleguide
6565

66-
- Use [Markdown](https://daringfireball.net/projects/markdown/) for documentation.
66+
- Use [Markdown](https://daringfireball.net/projects/markdown/) for documentation.
6767

6868
## Additional Notes
6969

7070
### Issue and Pull Request Labels
7171

7272
This section lists the labels we use to help us track and manage issues and pull requests.
7373

74-
- `bug` - Issues that are bugs.
75-
- `enhancement` - Issues that are feature requests.
76-
- `documentation` - Issues or pull requests related to documentation.
77-
- `good first issue` - Good for newcomers.
74+
- `bug` - Issues that are bugs.
75+
- `enhancement` - Issues that are feature requests.
76+
- `documentation` - Issues or pull requests related to documentation.
77+
- `good first issue` - Good for newcomers.
7878

7979
## Getting Help
8080

81-
- Join [Discord](https://discord.gg/ai16z)
82-
- Check [FAQ](docs/community/faq.md)
83-
- Create GitHub issues
81+
- Join [Discord](https://discord.gg/ai16z)
82+
- Check [FAQ](docs/community/faq.md)
83+
- Create GitHub issues
8484

8585
## Additional Resources
8686

87-
- [Local Development Guide](docs/guides/local-development.md)
88-
- [Configuration Guide](docs/guides/configuration.md)
89-
- [API Documentation](docs/api)
87+
- [Local Development Guide](docs/guides/local-development.md)
88+
- [Configuration Guide](docs/guides/configuration.md)
89+
- [API Documentation](docs/api)
9090

9191
## Contributor Guide
9292

@@ -102,19 +102,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
102102

103103
Examples of behavior that contributes to creating a positive environment include:
104104

105-
- Using welcoming and inclusive language
106-
- Being respectful of differing viewpoints and experiences
107-
- Gracefully accepting constructive criticism
108-
- Focusing on what is best for the community
109-
- Showing empathy towards other community members
105+
- Using welcoming and inclusive language
106+
- Being respectful of differing viewpoints and experiences
107+
- Gracefully accepting constructive criticism
108+
- Focusing on what is best for the community
109+
- Showing empathy towards other community members
110110

111111
Examples of unacceptable behavior include:
112112

113-
- The use of sexualized language or imagery and unwelcome sexual attention or advances
114-
- Trolling, insulting/derogatory comments, and personal or political attacks
115-
- Public or private harassment
116-
- Publishing others' private information without explicit permission
117-
- Other conduct which could reasonably be considered inappropriate in a professional setting
113+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
114+
- Trolling, insulting/derogatory comments, and personal or political attacks
115+
- Public or private harassment
116+
- Publishing others' private information without explicit permission
117+
- Other conduct which could reasonably be considered inappropriate in a professional setting
118118

119119
#### Our Responsibilities
120120

README.md

+28-27
Original file line numberDiff line numberDiff line change
@@ -6,62 +6,63 @@
66

77
<div align="center">
88

9-
📖 [Documentation](https://ai16z.github.io/eliza/) | 🎯 [Examples](https://github.com/thejoven/awesome-eliza)
9+
📖 [Documentation](https://elizaos.github.io/eliza/) | 🎯 [Examples](https://github.com/thejoven/awesome-eliza)
1010

1111
</div>
1212

1313
## 🌍 README Translations
1414

15-
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/ai16z/Elisa/blob/main/README_HE.md)
15+
[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md)
1616

1717
## ✨ Features
1818

19-
- 🛠️ Full-featured Discord, Twitter and Telegram connectors
20-
- 🔗 Support for every model (Llama, Grok, OpenAI, Anthropic, etc.)
21-
- 👥 Multi-agent and room support
22-
- 📚 Easily ingest and interact with your documents
23-
- 💾 Retrievable memory and document store
24-
- 🚀 Highly extensible - create your own actions and clients
25-
- ☁️ Supports many models (local Llama, OpenAI, Anthropic, Groq, etc.)
26-
- 📦 Just works!
19+
- 🛠️ Full-featured Discord, Twitter and Telegram connectors
20+
- 🔗 Support for every model (Llama, Grok, OpenAI, Anthropic, etc.)
21+
- 👥 Multi-agent and room support
22+
- 📚 Easily ingest and interact with your documents
23+
- 💾 Retrievable memory and document store
24+
- 🚀 Highly extensible - create your own actions and clients
25+
- ☁️ Supports many models (local Llama, OpenAI, Anthropic, Groq, etc.)
26+
- 📦 Just works!
2727

2828
## Video Tutorials
29+
2930
[AI Agent Dev School](https://www.youtube.com/watch?v=ArptLpQiKfI&list=PLx5pnFXdPTRzWla0RaOxALTSTnVq53fKL)
3031

3132
## 🎯 Use Cases
3233

33-
- 🤖 Chatbots
34-
- 🕵️ Autonomous Agents
35-
- 📈 Business Process Handling
36-
- 🎮 Video Game NPCs
37-
- 🧠 Trading
34+
- 🤖 Chatbots
35+
- 🕵️ Autonomous Agents
36+
- 📈 Business Process Handling
37+
- 🎮 Video Game NPCs
38+
- 🧠 Trading
3839

3940
## 🚀 Quick Start
4041

4142
### Prerequisites
4243

43-
- [Python 2.7+](https://www.python.org/downloads/)
44-
- [Node.js 23+](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
45-
- [pnpm](https://pnpm.io/installation)
44+
- [Python 2.7+](https://www.python.org/downloads/)
45+
- [Node.js 23+](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
46+
- [pnpm](https://pnpm.io/installation)
4647

4748
> **Note for Windows Users:** [WSL 2](https://learn.microsoft.com/en-us/windows/wsl/install-manual) is required.
4849
4950
### Use the Starter (Recommended)
5051

5152
```bash
52-
git clone https://github.com/ai16z/eliza-starter.git
53+
git clone https://github.com/elizaos/eliza-starter.git
5354
cd eliza-starter
5455
cp .env.example .env
5556
pnpm i && pnpm build && pnpm start
5657
```
5758

58-
Then read the [Documentation](https://ai16z.github.io/eliza/) to learn how to customize your Eliza.
59+
Then read the [Documentation](https://elizaos.github.io/eliza/) to learn how to customize your Eliza.
5960

6061
### Manually Start Eliza (Only recommended if you know what you are doing)
6162

6263
```bash
6364
# Clone the repository
64-
git clone https://github.com/ai16z/eliza.git
65+
git clone https://github.com/elizaos/eliza.git
6566

6667
# Checkout the latest release
6768
# This project iterates fast, so we recommend checking out the latest release
@@ -70,7 +71,7 @@ git checkout $(git describe --tags --abbrev=0)
7071

7172
### Start Eliza with Gitpod
7273

73-
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ai16z/eliza/tree/main)
74+
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/elizaos/eliza/tree/main)
7475

7576
### Edit the .env file
7677

@@ -121,15 +122,15 @@ pnpm install --include=optional sharp
121122

122123
### Community & contact
123124

124-
- [GitHub Issues](https://github.com/ai16z/eliza/issues). Best for: bugs you encounter using Eliza, and feature proposals.
125-
- [Discord](https://discord.gg/ai16z). Best for: sharing your applications and hanging out with the community.
125+
- [GitHub Issues](https://github.com/elizaos/eliza/issues). Best for: bugs you encounter using Eliza, and feature proposals.
126+
- [Discord](https://discord.gg/ai16z). Best for: sharing your applications and hanging out with the community.
126127

127128
## Contributors
128129

129-
<a href="https://github.com/ai16z/eliza/graphs/contributors">
130-
<img src="https://contrib.rocks/image?repo=ai16z/eliza" />
130+
<a href="https://github.com/elizaos/eliza/graphs/contributors">
131+
<img src="https://contrib.rocks/image?repo=elizaos/eliza" />
131132
</a>
132133

133134
## Star History
134135

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

README_CN.md

+29-30
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@
44

55
## 功能
66

7-
- 🛠 支持discord/推特/telegram连接
8-
- 👥 支持多模态agent
9-
- 📚 简单的导入文档并与文档交互
10-
- 💾 可检索的内存和文档存储
11-
- 🚀 高可拓展性,你可以自定义客户端和行为来进行功能拓展
12-
- ☁️ 多模型支持,包括Llama、OpenAI、Grok、Anthropic等
13-
- 📦 简单好用
7+
- 🛠 支持discord/推特/telegram连接
8+
- 👥 支持多模态agent
9+
- 📚 简单的导入文档并与文档交互
10+
- 💾 可检索的内存和文档存储
11+
- 🚀 高可拓展性,你可以自定义客户端和行为来进行功能拓展
12+
- ☁️ 多模型支持,包括Llama、OpenAI、Grok、Anthropic等
13+
- 📦 简单好用
1414

1515
你可以用Eliza做什么?
1616

17-
- 🤖 聊天机器人
18-
- 🕵️ 自主Agents
19-
- 📈 业务流程自动化处理
20-
- 🎮 游戏NPC
17+
- 🤖 聊天机器人
18+
- 🕵️ 自主Agents
19+
- 📈 业务流程自动化处理
20+
- 🎮 游戏NPC
2121

2222
# 开始使用
2323

2424
**前置要求(必须):**
2525

26-
- [Python 2.7+](https://www.python.org/downloads/)
27-
- [Node.js 23+](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
28-
- [pnpm](https://pnpm.io/installation)
26+
- [Python 2.7+](https://www.python.org/downloads/)
27+
- [Node.js 23+](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
28+
- [pnpm](https://pnpm.io/installation)
2929

3030
以下是两种基础的Eliza下载方案, 请根据情况自行选择。
3131

3232
## (A) 使用启动器(Starter): 推荐
3333

3434
```
35-
git clone https://github.com/ai16z/eliza-starter.git
35+
git clone https://github.com/elizaos/eliza-starter.git
3636
cd eliza-starter
3737
cp .env.example .env
3838
```
3939

4040
## (B) 手动启动Eliza: 仅在您知道自己在做什么时才推荐
4141

4242
```
43-
git clone https://github.com/ai16z/eliza.git
43+
git clone https://github.com/elizaos/eliza.git
4444
cd eliza
4545
# 切换最新发布的版本(Checkout the latest release)
4646
# Eliza的迭代速度非常快, 所以我们建议经常性的切换到最新的发布版本以免出现问题(This project iterates fast, so we recommend checking out the latest release)
@@ -51,10 +51,11 @@ git checkout $(git describe --tags --abbrev=0)
5151

5252
### 1. 编辑.env文件(环境变量)
5353

54-
-`.env.example` 复制为 `.env` 并在其中填写适当的值
55-
- 编辑推特环境并输入你的推特账号和密码
54+
-`.env.example` 复制为 `.env` 并在其中填写适当的值
55+
- 编辑推特环境并输入你的推特账号和密码
56+
57+
**最简化配置方案**:
5658

57-
**最简化配置方案**:
5859
```
5960
OPENAI_API_KEY=sk-xxx # 配置OpenAI 的API, sk-开头, 注意, 目前不支持AzureOpenAI!
6061
@@ -70,15 +71,15 @@ TWITTER_2FA_SECRET= # Two-factor authentication
7071

7172
### 2. 编辑角色文件
7273

73-
- 标准的角色个性定义在文件 `characters/*.character.json`中, 您可以修改它或者直接使用它。
74-
- 您也可以使用 `node --loader ts-node/esm src/index.ts --characters="path/to/your/character.json"` 加载角色并同时运行多个机器人。
75-
- 需要说明的是, 在`characters/*.character.json`中, `clients字段对应**服务**, 默认可选`"twitter", "discord", "telegram"`等, 如果在`clients`中填入了如"twitter"等内容, 则需要在
76-
上面的`env`配置对应的环境变量。对`discord``telegram`同理。
74+
- 标准的角色个性定义在文件 `characters/*.character.json`中, 您可以修改它或者直接使用它。
75+
- 您也可以使用 `node --loader ts-node/esm src/index.ts --characters="path/to/your/character.json"` 加载角色并同时运行多个机器人。
76+
- 需要说明的是, 在`characters/*.character.json`中, `clients字段对应**服务**, 默认可选`"twitter", "discord", "telegram"`等, 如果在`clients`中填入了如"twitter"等内容, 则需要在
77+
上面的`env`配置对应的环境变量。对`discord``telegram`同理。
7778

7879
```
7980
{
8081
"name": "trump",
81-
"clients": ["twitter"],
82+
"clients": ["twitter"],
8283
"modelProvider": "openai",
8384
```
8485

@@ -95,7 +96,6 @@ pnpm build
9596
pnpm start
9697
```
9798

98-
9999
# 自定义Eliza
100100

101101
### 添加常规行为
@@ -145,7 +145,6 @@ TWITTER_DRY_RUN=false
145145
TWITTER_USERNAME= # Account username
146146
TWITTER_PASSWORD= # Account password
147147
TWITTER_EMAIL= # Account email
148-
TWITTER_COOKIES= # Account cookies
149148
150149
X_SERVER_URL=
151150
XAI_API_KEY=
@@ -222,9 +221,9 @@ pnpm test:sqljs # Run tests with SQL.js
222221

223222
测试使用 Jest 编写,位于 src/\*_/_.test.ts 文件中。测试环境配置如下:
224223

225-
- 从 .env.test 加载环境变量
226-
- 使用 2 分钟的超时时间来运行长时间运行的测试
227-
- 支持 ESM 模块
228-
- 按顺序运行测试 (--runInBand)
224+
- 从 .env.test 加载环境变量
225+
- 使用 2 分钟的超时时间来运行长时间运行的测试
226+
- 支持 ESM 模块
227+
- 按顺序运行测试 (--runInBand)
229228

230229
要创建新测试,请在要测试的代码旁边添加一个 .test.ts 文件。

0 commit comments

Comments
 (0)