Skip to content

Commit

Permalink
Merge pull request #1717 from elizaOS/develop
Browse files Browse the repository at this point in the history
chore: Develop => main for 1.7.0 release
  • Loading branch information
shakkernerd authored Jan 4, 2025
2 parents 76d4f42 + 472eca8 commit e154215
Show file tree
Hide file tree
Showing 243 changed files with 18,351 additions and 5,304 deletions.
21 changes: 19 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ IMAGE_OPENAI_MODEL= # Default: dall-e-3
ETERNALAI_URL=
ETERNALAI_MODEL= # Default: "neuralmagic/Meta-Llama-3.1-405B-Instruct-quantized.w4a16"
ETERNALAI_API_KEY=
ETERNAL_AI_LOG_REQUEST=false #Default: false

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

# Transcription Provider
TRANSCRIPTION_PROVIDER= # Default: local (possible values: openai, deepgram, local)

# Direct Client Setting
EXPRESS_MAX_PAYLOAD= # Default: 100kb

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

X_SERVER_URL=
XAI_API_KEY=
Expand All @@ -78,7 +83,7 @@ POST_INTERVAL_MAX= # Default: 180
POST_IMMEDIATELY=

# Twitter action processing configuration
ACTION_INTERVAL=300000 # Interval in milliseconds between action processing runs (default: 5 minutes)
ACTION_INTERVAL= # Interval in minutes between action processing runs (default: 5 minutes)
ENABLE_ACTION_PROCESSING=false # Set to true to enable the action processing loop

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

# Volcengine Configuration
VOLENGINE_API_URL= # Volcengine API Endpoint, Default: https://open.volcengineapi.com/api/v3/
VOLENGINE_MODEL=
SMALL_VOLENGINE_MODEL= # Default: doubao-lite-128k
MEDIUM_VOLENGINE_MODEL= # Default: doubao-pro-128k
LARGE_VOLENGINE_MODEL= # Default: doubao-pro-256k
VOLENGINE_EMBEDDING_MODEL= # Default: doubao-embedding

# EVM
EVM_PRIVATE_KEY=
EVM_PROVIDER_URL=
Expand Down Expand Up @@ -341,7 +354,7 @@ AWS_S3_UPLOAD_PATH=
DEEPGRAM_API_KEY=

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

# Story
Expand All @@ -356,3 +369,7 @@ CRONOSZKEVM_PRIVATE_KEY=

# Fuel Ecosystem (FuelVM)
FUEL_WALLET_PRIVATE_KEY=

# Tokenizer Settings
TOKENIZER_MODEL= # Specify the tokenizer model to be used.
TOKENIZER_TYPE= # Options: tiktoken (for OpenAI models) or auto (AutoTokenizer from Hugging Face for non-OpenAI models). Default: tiktoken.
24 changes: 12 additions & 12 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!-- Use this template by filling in information and copy and pasting relevant items out of the html comments. -->
<!-- Use this template by filling in information and copying and pasting relevant items out of the HTML comments. -->

# Relates to:
# Relates to

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

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

# Risks

<!--
Low, medium, large. List what kind of risks, and what could be effected.
Low, medium, large. List what kind of risks and what could be affected.
-->

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

<!-- 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. -->
<!-- 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. -->
<!--
## Why are we doing this? Any context or related work?
-->
Expand All @@ -35,10 +35,10 @@ Updates (new versions of included code)
<!--
My changes do not require a change to the project documentation.
My changes require a change to the project documentation.
If a docs change is needed: I have updated the documentation accordingly.
If documentation change is needed: I have updated the documentation accordingly.
-->

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

# Testing

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

<!--
None, automated tests are fine.
None: Automated tests are acceptable.
-->

<!--
Expand All @@ -63,22 +63,22 @@ None, automated tests are fine.
### After
-->

<!-- If there is anything about the deploy, please make a note. -->
<!-- If there is anything about the deployment, please make a note. -->
<!--
# Deploy Notes
-->

<!--  Copy and paste commandline output. -->
<!--  Copy and paste command line output. -->
<!--
## Database changes
-->

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

<!-- 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 -->
<!-- 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 -->
<!--
## Discord username
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cache: "pnpm"

- name: Install dependencies
run: pnpm install
run: pnpm install -r --no-frozen-lockfile

- name: Run Prettier
run: pnpm run prettier --check .
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/integrationTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ jobs:
node-version: "23"
cache: "pnpm"

- name: Clean up
run: pnpm clean

- name: Install dependencies
run: pnpm install -r
run: pnpm install -r --no-frozen-lockfile

- name: Build packages
run: pnpm build
Expand Down
51 changes: 37 additions & 14 deletions .github/workflows/jsdoc-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,45 @@ name: JSDoc Automation
on:
workflow_dispatch:
inputs:
jsdoc:
description: 'Generate JSDoc comments (T/F)'
required: true
default: 'T'
type: string
readme:
description: 'Generate README documentation (T/F)'
required: true
default: 'T'
type: string
pull_number:
description: 'Pull Request Number (if not provided, scans root_directory) - PR must be merged to develop branch'
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'
required: false
type: string
root_directory:
description: 'Only scans files in this directory (relative to repository root, e.g., packages/core/src)'
required: true
default: 'packages/core/src/test_resources'
default: 'packages/plugin-near/'
type: string
excluded_directories:
description: 'Directories to exclude from scanning (comma-separated, relative to root_directory)'
required: true
default: 'node_modules,dist,test'
type: string
reviewers:
description: 'Pull Request Reviewers (comma-separated GitHub usernames)'
description: 'Pull Request Reviewers (Must be collaborator on the repository) comma-separated GitHub usernames'
required: true
default: ''
type: string
branch:
description: 'Target branch for PR (defaults to develop)'
required: false
default: 'develop'
type: string
language:
description: 'Documentation language (e.g., English, Spanish, French)'
required: true
default: 'English'
type: string

jobs:
generate-docs:
Expand All @@ -40,7 +60,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '23'
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v2
Expand All @@ -49,7 +69,7 @@ jobs:
run_install: false

- name: Update lockfile
working-directory: packages/jsdoc-automation
working-directory: scripts/jsdoc-automation
run: |
echo "Updating lockfile..."
pnpm install --no-frozen-lockfile
Expand All @@ -63,19 +83,22 @@ jobs:
run: pnpm install --no-frozen-lockfile

- name: Install package dependencies
working-directory: packages/jsdoc-automation
working-directory: scripts/jsdoc-automation
run: pnpm install --no-frozen-lockfile

- name: Build TypeScript
working-directory: scripts/jsdoc-automation
run: pnpm build

- name: Run documentation generator
working-directory: packages/jsdoc-automation
run: |
echo "Node version: $(node --version)"
echo "NPM version: $(npm --version)"
echo "Directory contents:"
ls -la
NODE_OPTIONS='--experimental-vm-modules --no-warnings' pnpm start
working-directory: scripts/jsdoc-automation
run: pnpm start
env:
INPUT_ROOT_DIRECTORY: ${{ inputs.root_directory }}
INPUT_PULL_NUMBER: ${{ inputs.pull_number }}
INPUT_EXCLUDED_DIRECTORIES: ${{ inputs.excluded_directories }}
INPUT_REVIEWERS: ${{ inputs.reviewers }}
INPUT_REVIEWERS: ${{ inputs.reviewers }}
INPUT_BRANCH: ${{ inputs.branch }}
INPUT_LANGUAGE: ${{ inputs.language }}
INPUT_JSDOC: ${{ inputs.jsdoc }}
INPUT_README: ${{ inputs.readme }}
18 changes: 14 additions & 4 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@ jobs:
issues: write
pull-requests: write

env:
DAYS_BEFORE_STALE: 30 # Define the days-before-stale value
DAYS_BEFORE_CLOSE: 7 # Define the days-before-close value

steps:
- uses: actions/stale@v5
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been automatically marked as stale due to inactivity.'
stale-pr-message: 'This pull request has been automatically marked as stale due to inactivity.'
stale-issue-message: |
This issue has been automatically marked as stale due to ${{
env.DAYS_BEFORE_STALE }} days of inactivity.
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.
stale-pr-message: |
This pull request has been automatically marked as stale due to ${{
env.DAYS_BEFORE_STALE }} days of inactivity.
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.
stale-issue-label: 'no-issue-activity'
stale-pr-label: 'no-pr-activity'
days-before-stale: 30 # Marks issues and PRs as stale after X days of inactivity
days-before-close: 7 # Closes issues and PRs X days after being marked as stale
days-before-stale: ${{ env.DAYS_BEFORE_STALE }}
days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}
Loading

0 comments on commit e154215

Please sign in to comment.