Skip to content

Commit 2ade16e

Browse files
committed
Merge branch 'develop' of github.com:elizaOS/eliza into develop
* 'develop' of github.com:elizaOS/eliza: (478 commits) chore: bump version to v.0.1.7 fix: generatioon tests for trimTokens chore: install with no frozen-lockfile flag Revert "fix(postgres): Handle vector extension creation properly (#1561)" chore: remove unused import and var Removed FerePro plugin fix: line break handling in chat fix: handle env using runtime getSetting function feat: add validation to trimTokens feat: add JsDoc to trimTokens function Move encoding into try block to handle potential errors during model encoding. fall back if unsupported type fix(client): improve Windows compatibility for Vite dev server remove tokenizer service clean code restore test clean code move trimTokens to core feat: add Serbian README translation and enhance main README with new features and setup instructions use elizaLogger ...
2 parents 8d92049 + 472eca8 commit 2ade16e

File tree

636 files changed

+32386
-8166
lines changed

Some content is hidden

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

636 files changed

+32386
-8166
lines changed

.env.example

+35-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ DISCORD_VOICE_CHANNEL_ID= # The ID of the voice channel the bot should joi
99

1010
# AI Model API Keys
1111
OPENAI_API_KEY= # OpenAI API key, starting with sk-
12+
OPENAI_API_URL= # OpenAI API Endpoint (optional), Default: https://api.openai.com/v1
1213
SMALL_OPENAI_MODEL= # Default: gpt-4o-mini
1314
MEDIUM_OPENAI_MODEL= # Default: gpt-4o
1415
LARGE_OPENAI_MODEL= # Default: gpt-4o
@@ -19,6 +20,7 @@ IMAGE_OPENAI_MODEL= # Default: dall-e-3
1920
ETERNALAI_URL=
2021
ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Instruct-quantized.w4a16"
2122
ETERNALAI_API_KEY=
23+
ETERNAL_AI_LOG_REQUEST=false #Default: false
2224

2325
GROK_API_KEY= # GROK API Key
2426
GROQ_API_KEY= # Starts with gsk_
@@ -35,9 +37,16 @@ SMALL_HYPERBOLIC_MODEL= # Default: meta-llama/Llama-3.2-3B-Instruct
3537
MEDIUM_HYPERBOLIC_MODEL= # Default: meta-llama/Meta-Llama-3.1-70B-Instruct
3638
LARGE_HYPERBOLIC_MODEL= # Default: meta-llama/Meta-Llama-3.1-405-Instruct
3739

40+
# Livepeer configuration
41+
LIVEPEER_GATEWAY_URL= # Free inference gateways and docs: https://livepeer-eliza.com/
42+
LIVEPEER_IMAGE_MODEL= # Default: ByteDance/SDXL-Lightning
43+
3844
# Speech Synthesis
3945
ELEVENLABS_XI_API_KEY= # API key from elevenlabs
4046

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

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

6676
X_SERVER_URL=
6777
XAI_API_KEY=
@@ -73,7 +83,7 @@ POST_INTERVAL_MAX= # Default: 180
7383
POST_IMMEDIATELY=
7484

7585
# Twitter action processing configuration
76-
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)
7787
ENABLE_ACTION_PROCESSING=false # Set to true to enable the action processing loop
7888

7989
# Feature Flags
@@ -157,10 +167,22 @@ LARGE_GAIANET_SERVER_URL= # Default: https://qwen72b.gaia.domains/v1
157167
GAIANET_EMBEDDING_MODEL=
158168
USE_GAIANET_EMBEDDING= # Set to TRUE for GAIANET/768, leave blank for local
159169

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+
160178
# EVM
161179
EVM_PRIVATE_KEY=
162180
EVM_PROVIDER_URL=
163181

182+
# Avalanche
183+
AVALANCHE_PRIVATE_KEY=
184+
AVALANCHE_PUBLIC_KEY=
185+
164186
# Solana
165187
SOLANA_PRIVATE_KEY=
166188
SOLANA_PUBLIC_KEY=
@@ -332,11 +354,22 @@ AWS_S3_UPLOAD_PATH=
332354
DEEPGRAM_API_KEY=
333355

334356
# Sui
335-
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)
336358
SUI_NETWORK= # must be one of mainnet, testnet, devnet, localnet
337359

338360
# Story
339361
STORY_PRIVATE_KEY= # Story private key
340362
STORY_API_BASE_URL= # Story API base URL
341363
STORY_API_KEY= # Story API key
342364
PINATA_JWT= # Pinata JWT for uploading files to IPFS
365+
366+
# Cronos zkEVM
367+
CRONOSZKEVM_ADDRESS=
368+
CRONOSZKEVM_PRIVATE_KEY=
369+
370+
# Fuel Ecosystem (FuelVM)
371+
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
+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: JSDoc Automation
2+
3+
on:
4+
workflow_dispatch:
5+
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
16+
pull_number:
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'
18+
required: false
19+
type: string
20+
root_directory:
21+
description: 'Only scans files in this directory (relative to repository root, e.g., packages/core/src)'
22+
required: true
23+
default: 'packages/plugin-near/'
24+
type: string
25+
excluded_directories:
26+
description: 'Directories to exclude from scanning (comma-separated, relative to root_directory)'
27+
required: true
28+
default: 'node_modules,dist,test'
29+
type: string
30+
reviewers:
31+
description: 'Pull Request Reviewers (Must be collaborator on the repository) comma-separated GitHub usernames'
32+
required: true
33+
default: ''
34+
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
45+
46+
jobs:
47+
generate-docs:
48+
runs-on: ubuntu-latest
49+
50+
env:
51+
GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PAT }}
52+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
53+
54+
steps:
55+
- name: Checkout repository
56+
uses: actions/checkout@v4
57+
with:
58+
fetch-depth: 0
59+
60+
- name: Setup Node.js
61+
uses: actions/setup-node@v4
62+
with:
63+
node-version: '20'
64+
65+
- name: Install pnpm
66+
uses: pnpm/action-setup@v2
67+
with:
68+
version: 8
69+
run_install: false
70+
71+
- name: Update lockfile
72+
working-directory: scripts/jsdoc-automation
73+
run: |
74+
echo "Updating lockfile..."
75+
pnpm install --no-frozen-lockfile
76+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
77+
git config --global user.name "github-actions[bot]"
78+
git add pnpm-lock.yaml
79+
git commit -m "chore: update pnpm lockfile" || echo "No changes to commit"
80+
git push || echo "No changes to push"
81+
82+
- name: Install root dependencies
83+
run: pnpm install --no-frozen-lockfile
84+
85+
- name: Install package dependencies
86+
working-directory: scripts/jsdoc-automation
87+
run: pnpm install --no-frozen-lockfile
88+
89+
- name: Build TypeScript
90+
working-directory: scripts/jsdoc-automation
91+
run: pnpm build
92+
93+
- name: Run documentation generator
94+
working-directory: scripts/jsdoc-automation
95+
run: pnpm start
96+
env:
97+
INPUT_ROOT_DIRECTORY: ${{ inputs.root_directory }}
98+
INPUT_PULL_NUMBER: ${{ inputs.pull_number }}
99+
INPUT_EXCLUDED_DIRECTORIES: ${{ inputs.excluded_directories }}
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)