Skip to content

Commit 82dd736

Browse files
committed
Merge branch 'develop' of https://github.com/elizaos/eliza into test-eliza
2 parents 9ad42d1 + 241296e commit 82dd736

File tree

175 files changed

+11988
-2456
lines changed

Some content is hidden

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

175 files changed

+11988
-2456
lines changed

.env.example

+12
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,22 @@ LARGE_GAIANET_SERVER_URL= # Default: https://qwen72b.gaia.domains/v1
162162
GAIANET_EMBEDDING_MODEL=
163163
USE_GAIANET_EMBEDDING= # Set to TRUE for GAIANET/768, leave blank for local
164164

165+
# Volcengine Configuration
166+
VOLENGINE_API_URL= # Volcengine API Endpoint, Default: https://open.volcengineapi.com/api/v3/
167+
VOLENGINE_MODEL=
168+
SMALL_VOLENGINE_MODEL= # Default: doubao-lite-128k
169+
MEDIUM_VOLENGINE_MODEL= # Default: doubao-pro-128k
170+
LARGE_VOLENGINE_MODEL= # Default: doubao-pro-256k
171+
VOLENGINE_EMBEDDING_MODEL= # Default: doubao-embedding
172+
165173
# EVM
166174
EVM_PRIVATE_KEY=
167175
EVM_PROVIDER_URL=
168176

177+
# Avalanche
178+
AVALANCHE_PRIVATE_KEY=
179+
AVALANCHE_PUBLIC_KEY=
180+
169181
# Solana
170182
SOLANA_PRIVATE_KEY=
171183
SOLANA_PUBLIC_KEY=

.github/pull_request_template.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<!-- Use this template by filling in information and copy and pasting relevant items out of the html comments. -->
1+
<!-- Use this template by filling in information and copying and pasting relevant items out of the HTML comments. -->
22

3-
# Relates to:
3+
# Relates to
44

55
<!-- LINK TO ISSUE OR TICKET -->
66

7-
<!-- This risks section is to be filled out before final review and merge. -->
7+
<!-- This risks section must be filled out before the final review and merge. -->
88

99
# Risks
1010

1111
<!--
12-
Low, medium, large. List what kind of risks, and what could be effected.
12+
Low, medium, large. List what kind of risks and what could be affected.
1313
-->
1414

1515
# Background
@@ -25,7 +25,7 @@ Features (non-breaking change which adds functionality)
2525
Updates (new versions of included code)
2626
-->
2727

28-
<!-- This "Why" section is most relevant if there is no linked issue explaining why. If there is a related issue it might make sense to skip this why section. -->
28+
<!-- This "Why" section is most relevant if there are no linked issues explaining why. If there is a related issue, it might make sense to skip this why section. -->
2929
<!--
3030
## Why are we doing this? Any context or related work?
3131
-->
@@ -35,10 +35,10 @@ Updates (new versions of included code)
3535
<!--
3636
My changes do not require a change to the project documentation.
3737
My changes require a change to the project documentation.
38-
If a docs change is needed: I have updated the documentation accordingly.
38+
If documentation change is needed: I have updated the documentation accordingly.
3939
-->
4040

41-
<!-- Please show how you tested the PR. This will really help if the PR needs to be retested, and probably help the PR get merged quicker. -->
41+
<!-- Please show how you tested the PR. This will really help if the PR needs to be retested and probably help the PR get merged quicker. -->
4242

4343
# Testing
4444

@@ -47,7 +47,7 @@ If a docs change is needed: I have updated the documentation accordingly.
4747
## Detailed testing steps
4848

4949
<!--
50-
None, automated tests are fine.
50+
None: Automated tests are acceptable.
5151
-->
5252

5353
<!--
@@ -63,22 +63,22 @@ None, automated tests are fine.
6363
### After
6464
-->
6565

66-
<!-- If there is anything about the deploy, please make a note. -->
66+
<!-- If there is anything about the deployment, please make a note. -->
6767
<!--
6868
# Deploy Notes
6969
-->
7070

71-
<!--  Copy and paste commandline output. -->
71+
<!--  Copy and paste command line output. -->
7272
<!--
7373
## Database changes
7474
-->
7575

76-
<!--  If there is something more than the automated steps, please specifiy deploy instructions. -->
76+
<!--  Please specify deploy instructions if there is something more than the automated steps. -->
7777
<!--
7878
## Deployment instructions
7979
-->
8080

81-
<!-- If you are on Discord, please join https://discord.gg/ai16z and state your Discord username here for contribute role and join us in #development-feed -->
81+
<!-- If you are on Discord, please join https://discord.gg/ai16z and state your Discord username here for the contributor role and join us in #development-feed -->
8282
<!--
8383
## Discord username
8484

.github/workflows/jsdoc-automation.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
required: true
2323
default: ''
2424
type: string
25+
branch:
26+
description: 'Target branch for PR (defaults to develop)'
27+
required: false
28+
default: 'develop'
29+
type: string
2530

2631
jobs:
2732
generate-docs:
@@ -49,7 +54,7 @@ jobs:
4954
run_install: false
5055

5156
- name: Update lockfile
52-
working-directory: packages/jsdoc-automation
57+
working-directory: scripts/jsdoc-automation
5358
run: |
5459
echo "Updating lockfile..."
5560
pnpm install --no-frozen-lockfile
@@ -63,11 +68,11 @@ jobs:
6368
run: pnpm install --no-frozen-lockfile
6469

6570
- name: Install package dependencies
66-
working-directory: packages/jsdoc-automation
71+
working-directory: scripts/jsdoc-automation
6772
run: pnpm install --no-frozen-lockfile
6873

6974
- name: Run documentation generator
70-
working-directory: packages/jsdoc-automation
75+
working-directory: scripts/jsdoc-automation
7176
run: |
7277
echo "Node version: $(node --version)"
7378
echo "NPM version: $(npm --version)"
@@ -78,4 +83,5 @@ jobs:
7883
INPUT_ROOT_DIRECTORY: ${{ inputs.root_directory }}
7984
INPUT_PULL_NUMBER: ${{ inputs.pull_number }}
8085
INPUT_EXCLUDED_DIRECTORIES: ${{ inputs.excluded_directories }}
81-
INPUT_REVIEWERS: ${{ inputs.reviewers }}
86+
INPUT_REVIEWERS: ${{ inputs.reviewers }}
87+
INPUT_BRANCH: ${{ inputs.branch }}

.github/workflows/stale.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,23 @@ jobs:
1212
issues: write
1313
pull-requests: write
1414

15+
env:
16+
DAYS_BEFORE_STALE: 30 # Define the days-before-stale value
17+
DAYS_BEFORE_CLOSE: 7 # Define the days-before-close value
18+
1519
steps:
1620
- uses: actions/stale@v5
1721
with:
1822
repo-token: ${{ secrets.GITHUB_TOKEN }}
19-
stale-issue-message: 'This issue has been automatically marked as stale due to inactivity.'
20-
stale-pr-message: 'This pull request has been automatically marked as stale due to inactivity.'
23+
stale-issue-message: |
24+
This issue has been automatically marked as stale due to ${{
25+
env.DAYS_BEFORE_STALE }} days of inactivity.
26+
If no further activity occurs within ${{ env.DAYS_BEFORE_CLOSE }} days, it will be closed automatically. Please take action if this issue is still relevant.
27+
stale-pr-message: |
28+
This pull request has been automatically marked as stale due to ${{
29+
env.DAYS_BEFORE_STALE }} days of inactivity.
30+
If no further activity occurs within ${{ env.DAYS_BEFORE_CLOSE }} days, it will be closed automatically. Please take action if this pull request is still relevant.
2131
stale-issue-label: 'no-issue-activity'
2232
stale-pr-label: 'no-pr-activity'
23-
days-before-stale: 30 # Marks issues and PRs as stale after X days of inactivity
24-
days-before-close: 7 # Closes issues and PRs X days after being marked as stale
33+
days-before-stale: ${{ env.DAYS_BEFORE_STALE }}
34+
days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ packages/plugin-coinbase/src/plugins/transactions.csv
4949
tsup.config.bundled_*.mjs
5050

5151
.turbo
52+
.cursorrules
5253

5354
coverage
5455
.eslintcache

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1224,4 +1224,4 @@
12241224

12251225

12261226

1227-
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
1227+
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

README.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
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/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.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) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md)
16+
17+
## 🚩 Overview
18+
19+
<div align="center">
20+
<img src="./docs/static/img/eliza_diagram.jpg" alt="Eliza Diagram" width="100%" />
21+
</div>
1622

1723
## ✨ Features
1824

@@ -56,7 +62,7 @@ cp .env.example .env
5662
pnpm i && pnpm build && pnpm start
5763
```
5864
Once the agent is running, You should see the message to run "pnpm start:client" at the end.
59-
Open another terminal and move to same directory and then run below command and follow the URL to chat to your agent.
65+
Open another terminal and move to same directory and then run below command and follow the URL to chat to your agent.
6066
```bash
6167
pnpm start:client
6268
```
@@ -86,11 +92,11 @@ Copy .env.example to .env and fill in the appropriate values.
8692
cp .env.example .env
8793
```
8894

89-
Note: .env is optional. If your planning to run multiple distinct agents, you can pass secrets through the character JSON
95+
Note: .env is optional. If you're planning to run multiple distinct agents, you can pass secrets through the character JSON
9096

9197
### Automatically Start Eliza
9298

93-
This will run everything to setup the project and start the bot with the default character.
99+
This will run everything to set up the project and start the bot with the default character.
94100

95101
```bash
96102
sh scripts/start.sh

README_CN.md

+45-3
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,55 @@ pnpm start
104104

105105
## 配置不同的大模型
106106

107-
### 配置Llama
107+
您可以使用不同的大模型来驱动您的AI Agent,切换不同大模型需要两步:
108108

109-
您可以通过设置 `XAI_MODEL` 环境变量为 `meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo``meta-llama/Meta-Llama-3.1-405B-Instruct` 来运行 Llama 70B 或 405B 模型
109+
1. 确认您在`.env`文件内配置了对应的大模型API Key或对应的访问配置,例如如果您想使用OpenAI,则需要找到`OPENAI_API_KEY`参数,并填入您的OpenAI API Key,并以此类推。
110+
2. 在您的*Character*文件里找到`modelProvider`,并更改这里的内容,例如如果想要切换到Claude,则需要填入`anthropic`,以此来表明您将使用anthropic大模型作为您的对应Agent的Provider.
111+
112+
`.env`文件内您可以找到不同大模型的详细配置,包括设定具体想要使用对应提供商的哪个模型,下方我们给出了两个实例:
110113

111114
### 配置OpenAI
112115

113-
您可以通过设置 `XAI_MODEL` 环境变量为 `gpt-4o-mini``gpt-4o` 来运行 OpenAI 模型
116+
首先您需要在Character文件内指定model provider
117+
118+
```json
119+
"name": "C-3PO",
120+
"clients": [],
121+
"modelProvider": "openai"
122+
...
123+
```
124+
125+
其次请在`env`文件内配置相关参数
126+
127+
```
128+
# AI Model API Keys
129+
OPENAI_API_KEY= # OpenAI API key, starting with sk-
130+
SMALL_OPENAI_MODEL= # Default: gpt-4o-mini
131+
MEDIUM_OPENAI_MODEL= # Default: gpt-4o
132+
LARGE_OPENAI_MODEL= # Default: gpt-4o
133+
EMBEDDING_OPENAI_MODEL= # Default: text-embedding-3-small
134+
IMAGE_OPENAI_MODEL= # Default: dall-e-3
135+
136+
```
137+
138+
### 配置Anthorpic
139+
140+
```json
141+
"name": "C-3PO",
142+
"clients": [],
143+
"modelProvider": "anthropic"
144+
...
145+
```
146+
147+
其次请在`env`文件内配置相关参数
148+
149+
```
150+
# Anthropic Configuration
151+
ANTHROPIC_API_KEY= # For Claude
152+
SMALL_ANTHROPIC_MODEL= # Default: claude-3-haiku-20240307
153+
MEDIUM_ANTHROPIC_MODEL= # Default: claude-3-5-sonnet-20241022
154+
LARGE_ANTHROPIC_MODEL= # Default: claude-3-5-sonnet-20241022
155+
```
114156

115157
## 其他要求
116158

0 commit comments

Comments
 (0)