Skip to content

Commit e154215

Browse files
authored
Merge pull request #1717 from elizaOS/develop
chore: Develop => main for 1.7.0 release
2 parents 76d4f42 + 472eca8 commit e154215

File tree

243 files changed

+18351
-5304
lines changed

Some content is hidden

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

243 files changed

+18351
-5304
lines changed

.env.example

+19-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ IMAGE_OPENAI_MODEL= # Default: dall-e-3
2020
ETERNALAI_URL=
2121
ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Instruct-quantized.w4a16"
2222
ETERNALAI_API_KEY=
23+
ETERNAL_AI_LOG_REQUEST=false #Default: false
2324

2425
GROK_API_KEY= # GROK API Key
2526
GROQ_API_KEY= # Starts with gsk_
@@ -43,6 +44,9 @@ LIVEPEER_IMAGE_MODEL= # Default: ByteDance/SDXL-Lightning
4344
# Speech Synthesis
4445
ELEVENLABS_XI_API_KEY= # API key from elevenlabs
4546

47+
# Transcription Provider
48+
TRANSCRIPTION_PROVIDER= # Default: local (possible values: openai, deepgram, local)
49+
4650
# Direct Client Setting
4751
EXPRESS_MAX_PAYLOAD= # Default: 100kb
4852

@@ -67,6 +71,7 @@ TWITTER_POLL_INTERVAL=120 # How often (in seconds) the bot should check fo
6771
TWITTER_SEARCH_ENABLE=FALSE # Enable timeline search, WARNING this greatly increases your chance of getting banned
6872
TWITTER_TARGET_USERS= # Comma separated list of Twitter user names to interact with
6973
TWITTER_RETRY_LIMIT= # Maximum retry attempts for Twitter login
74+
TWITTER_SPACES_ENABLE=false # Enable or disable Twitter Spaces logic
7075

7176
X_SERVER_URL=
7277
XAI_API_KEY=
@@ -78,7 +83,7 @@ POST_INTERVAL_MAX= # Default: 180
7883
POST_IMMEDIATELY=
7984

8085
# Twitter action processing configuration
81-
ACTION_INTERVAL=300000 # Interval in milliseconds between action processing runs (default: 5 minutes)
86+
ACTION_INTERVAL= # Interval in minutes between action processing runs (default: 5 minutes)
8287
ENABLE_ACTION_PROCESSING=false # Set to true to enable the action processing loop
8388

8489
# Feature Flags
@@ -162,6 +167,14 @@ LARGE_GAIANET_SERVER_URL= # Default: https://qwen72b.gaia.domains/v1
162167
GAIANET_EMBEDDING_MODEL=
163168
USE_GAIANET_EMBEDDING= # Set to TRUE for GAIANET/768, leave blank for local
164169

170+
# Volcengine Configuration
171+
VOLENGINE_API_URL= # Volcengine API Endpoint, Default: https://open.volcengineapi.com/api/v3/
172+
VOLENGINE_MODEL=
173+
SMALL_VOLENGINE_MODEL= # Default: doubao-lite-128k
174+
MEDIUM_VOLENGINE_MODEL= # Default: doubao-pro-128k
175+
LARGE_VOLENGINE_MODEL= # Default: doubao-pro-256k
176+
VOLENGINE_EMBEDDING_MODEL= # Default: doubao-embedding
177+
165178
# EVM
166179
EVM_PRIVATE_KEY=
167180
EVM_PROVIDER_URL=
@@ -341,7 +354,7 @@ AWS_S3_UPLOAD_PATH=
341354
DEEPGRAM_API_KEY=
342355

343356
# Sui
344-
SUI_PRIVATE_KEY= # Sui Mnemonic Seed Phrase (`sui keytool generate ed25519`)
357+
SUI_PRIVATE_KEY= # Sui Mnemonic Seed Phrase (`sui keytool generate ed25519`) , Also support `suiprivatekeyxxxx` (sui keytool export --key-identity 0x63)
345358
SUI_NETWORK= # must be one of mainnet, testnet, devnet, localnet
346359

347360
# Story
@@ -356,3 +369,7 @@ CRONOSZKEVM_PRIVATE_KEY=
356369

357370
# Fuel Ecosystem (FuelVM)
358371
FUEL_WALLET_PRIVATE_KEY=
372+
373+
# Tokenizer Settings
374+
TOKENIZER_MODEL= # Specify the tokenizer model to be used.
375+
TOKENIZER_TYPE= # Options: tiktoken (for OpenAI models) or auto (AutoTokenizer from Hugging Face for non-OpenAI models). Default: tiktoken.

.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/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
cache: "pnpm"
2121

2222
- name: Install dependencies
23-
run: pnpm install
23+
run: pnpm install -r --no-frozen-lockfile
2424

2525
- name: Run Prettier
2626
run: pnpm run prettier --check .

.github/workflows/integrationTests.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ jobs:
2424
node-version: "23"
2525
cache: "pnpm"
2626

27+
- name: Clean up
28+
run: pnpm clean
29+
2730
- name: Install dependencies
28-
run: pnpm install -r
31+
run: pnpm install -r --no-frozen-lockfile
2932

3033
- name: Build packages
3134
run: pnpm build

.github/workflows/jsdoc-automation.yml

+37-14
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,45 @@ name: JSDoc Automation
33
on:
44
workflow_dispatch:
55
inputs:
6+
jsdoc:
7+
description: 'Generate JSDoc comments (T/F)'
8+
required: true
9+
default: 'T'
10+
type: string
11+
readme:
12+
description: 'Generate README documentation (T/F)'
13+
required: true
14+
default: 'T'
15+
type: string
616
pull_number:
7-
description: 'Pull Request Number (if not provided, scans root_directory) - PR must be merged to develop branch'
17+
description: 'Pull Request Number (if not provided, scans root_directory) - PR must be merged to develop branch. DONT provide if `README documentation` is T from above'
818
required: false
919
type: string
1020
root_directory:
1121
description: 'Only scans files in this directory (relative to repository root, e.g., packages/core/src)'
1222
required: true
13-
default: 'packages/core/src/test_resources'
23+
default: 'packages/plugin-near/'
1424
type: string
1525
excluded_directories:
1626
description: 'Directories to exclude from scanning (comma-separated, relative to root_directory)'
1727
required: true
1828
default: 'node_modules,dist,test'
1929
type: string
2030
reviewers:
21-
description: 'Pull Request Reviewers (comma-separated GitHub usernames)'
31+
description: 'Pull Request Reviewers (Must be collaborator on the repository) comma-separated GitHub usernames'
2232
required: true
2333
default: ''
2434
type: string
35+
branch:
36+
description: 'Target branch for PR (defaults to develop)'
37+
required: false
38+
default: 'develop'
39+
type: string
40+
language:
41+
description: 'Documentation language (e.g., English, Spanish, French)'
42+
required: true
43+
default: 'English'
44+
type: string
2545

2646
jobs:
2747
generate-docs:
@@ -40,7 +60,7 @@ jobs:
4060
- name: Setup Node.js
4161
uses: actions/setup-node@v4
4262
with:
43-
node-version: '23'
63+
node-version: '20'
4464

4565
- name: Install pnpm
4666
uses: pnpm/action-setup@v2
@@ -49,7 +69,7 @@ jobs:
4969
run_install: false
5070

5171
- name: Update lockfile
52-
working-directory: packages/jsdoc-automation
72+
working-directory: scripts/jsdoc-automation
5373
run: |
5474
echo "Updating lockfile..."
5575
pnpm install --no-frozen-lockfile
@@ -63,19 +83,22 @@ jobs:
6383
run: pnpm install --no-frozen-lockfile
6484

6585
- name: Install package dependencies
66-
working-directory: packages/jsdoc-automation
86+
working-directory: scripts/jsdoc-automation
6787
run: pnpm install --no-frozen-lockfile
6888

89+
- name: Build TypeScript
90+
working-directory: scripts/jsdoc-automation
91+
run: pnpm build
92+
6993
- name: Run documentation generator
70-
working-directory: packages/jsdoc-automation
71-
run: |
72-
echo "Node version: $(node --version)"
73-
echo "NPM version: $(npm --version)"
74-
echo "Directory contents:"
75-
ls -la
76-
NODE_OPTIONS='--experimental-vm-modules --no-warnings' pnpm start
94+
working-directory: scripts/jsdoc-automation
95+
run: pnpm start
7796
env:
7897
INPUT_ROOT_DIRECTORY: ${{ inputs.root_directory }}
7998
INPUT_PULL_NUMBER: ${{ inputs.pull_number }}
8099
INPUT_EXCLUDED_DIRECTORIES: ${{ inputs.excluded_directories }}
81-
INPUT_REVIEWERS: ${{ inputs.reviewers }}
100+
INPUT_REVIEWERS: ${{ inputs.reviewers }}
101+
INPUT_BRANCH: ${{ inputs.branch }}
102+
INPUT_LANGUAGE: ${{ inputs.language }}
103+
INPUT_JSDOC: ${{ inputs.jsdoc }}
104+
INPUT_README: ${{ inputs.readme }}

.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 }}

0 commit comments

Comments
 (0)