Merge branch 'elizaOS:main' into main

asianviking · Jan 5, 2025 · 5608339 · 5608339
2 parents c0af371 + 62abe4c
commit 5608339
Show file tree

Hide file tree

Showing 152 changed files with 8,372 additions and 4,173 deletions.
diff --git a/.env.example b/.env.example
@@ -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_
@@ -82,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
@@ -212,9 +213,6 @@ TOGETHER_API_KEY=
 # Server Configuration
 SERVER_PORT=3000
 
-# Web Search Config
-ENABLE_WEBSEARCH=false # boolean value, defaults to false
-
 # Abstract Configuration
 ABSTRACT_ADDRESS=
 ABSTRACT_PRIVATE_KEY=
@@ -356,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
@@ -371,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.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -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 .

diff --git a/.github/workflows/jsdoc-automation.yml b/.github/workflows/jsdoc-automation.yml
@@ -3,22 +3,32 @@ 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
@@ -27,6 +37,11 @@ on:
         required: false
         default: 'develop'
         type: string
+      language:
+        description: 'Documentation language (e.g., English, Spanish, French)'
+        required: true
+        default: 'English'
+        type: string
 
 jobs:
   generate-docs:
@@ -45,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
@@ -71,17 +86,19 @@ jobs:
         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: scripts/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
+        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_BRANCH: ${{ inputs.branch }}
+          INPUT_BRANCH: ${{ inputs.branch }}
+          INPUT_LANGUAGE: ${{ inputs.language }}
+          INPUT_JSDOC: ${{ inputs.jsdoc }}
+          INPUT_README: ${{ inputs.readme }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -35,7 +35,7 @@ jobs:
               run: sudo apt-get install -y protobuf-compiler
 
             - name: Install dependencies
-              run: pnpm install
+              run: pnpm install -r --no-frozen-lockfile
 
             - name: Build packages
               run: pnpm run build