Skip to content

Commit

Permalink
Merge branch 'develop' into evm-check
Browse files Browse the repository at this point in the history
  • Loading branch information
wtfsayo authored Jan 29, 2025
2 parents 2833663 + 92de500 commit 9bb3d58
Show file tree
Hide file tree
Showing 230 changed files with 8,055 additions and 5,208 deletions.
7 changes: 7 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,13 @@ MEDIUM_GALADRIEL_MODEL= # Default: gpt-4o
LARGE_GALADRIEL_MODEL= # Default: gpt-4o
GALADRIEL_FINE_TUNE_API_KEY= # Use an OpenAI key to use a fine-tuned model with the verified inference endpoint

# LM Studio Configuration
LMSTUDIO_SERVER_URL= # Default: http://localhost:1234/v1
LMSTUDIO_MODEL=
SMALL_LMSTUDIO_MODEL= # Default: hermes-3-llama-3.1-8b
MEDIUM_LMSTUDIO_MODEL= # Default: hermes-3-llama-3.1-8b
LARGE_LMSTUDIO_MODEL= # Default: hermes-3-llama-3.1-8b

# Remaining Provider Configurations
GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
ALI_BAILIAN_API_KEY= # Ali Bailian API Key
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 9.4.0
version: 9.15.0

- uses: actions/setup-node@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrationTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 9.4.0
version: 9.15.0

- uses: actions/setup-node@v4
with:
Expand All @@ -41,4 +41,4 @@ jobs:
fi
- name: Run integration tests
run: pnpm run integrationTests
run: pnpm run integrationTests
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9.15.0

- name: Configure Git
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 9.4.0
version: 9.15.0

- uses: actions/setup-node@v4
with:
Expand Down
26 changes: 13 additions & 13 deletions agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
},
"dependencies": {
"@elizaos/adapter-supabase": "workspace:*",
"@elizaos/adapter-pglite": "workspace:*",
"@elizaos/adapter-postgres": "workspace:*",
"@elizaos/adapter-redis": "workspace:*",
"@elizaos/adapter-sqlite": "workspace:*",
"@elizaos/adapter-pglite": "workspace:*",
"@elizaos/adapter-qdrant": "workspace:*",
"@elizaos/adapter-mongodb": "workspace:*",
"@elizaos/client-auto": "workspace:*",
Expand All @@ -43,26 +43,26 @@
"@elizaos/plugin-agentkit": "workspace:*",
"@elizaos/plugin-aptos": "workspace:*",
"@elizaos/plugin-birdeye": "workspace:*",
"@elizaos/plugin-coingecko": "workspace:*",
"@elizaos/plugin-coinmarketcap": "workspace:*",
"@elizaos/plugin-zerion": "workspace:*",
"@elizaos/plugin-binance": "workspace:*",
"@elizaos/plugin-avail": "workspace:*",
"@elizaos/plugin-bnb": "workspace:*",
"@elizaos/plugin-bootstrap": "workspace:*",
"@elizaos/plugin-di": "workspace:*",
"@elizaos/plugin-cosmos": "workspace:*",
"@elizaos/plugin-intiface": "workspace:*",
"@elizaos/plugin-coinbase": "workspace:*",
"@elizaos/plugin-coingecko": "workspace:*",
"@elizaos/plugin-coinmarketcap": "workspace:*",
"@elizaos/plugin-conflux": "workspace:*",
"@elizaos/plugin-evm": "workspace:*",
"@elizaos/plugin-cosmos": "workspace:*",
"@elizaos/plugin-echochambers": "workspace:*",
"@elizaos/plugin-evm": "workspace:*",
"@elizaos/plugin-flow": "workspace:*",
"@elizaos/plugin-giphy": "workspace:*",
"@elizaos/plugin-gitbook": "workspace:*",
"@elizaos/plugin-story": "workspace:*",
"@elizaos/plugin-gitcoin-passport": "workspace:*",
"@elizaos/plugin-goat": "workspace:*",
"@elizaos/plugin-lensNetwork": "workspace:*",
"@elizaos/plugin-lens-network": "workspace:*",
"@elizaos/plugin-icp": "workspace:*",
"@elizaos/plugin-initia": "workspace:*",
"@elizaos/plugin-image-generation": "workspace:*",
Expand All @@ -83,18 +83,14 @@
"@elizaos/plugin-squid-router": "workspace:*",
"@elizaos/plugin-autonome": "workspace:*",
"@elizaos/plugin-starknet": "workspace:*",
"@elizaos/plugin-stargaze": "workspace:*",
"@elizaos/plugin-giphy": "workspace:*",
"@elizaos/plugin-ton": "workspace:*",
"@elizaos/plugin-story": "workspace:*",
"@elizaos/plugin-sui": "workspace:*",
"@elizaos/plugin-sgx": "workspace:*",
"@elizaos/plugin-iq6900": "workspace:*",
"@elizaos/plugin-tee": "workspace:*",
"@elizaos/plugin-tee-log": "workspace:*",
"@elizaos/plugin-tee-marlin": "workspace:*",
"@elizaos/plugin-multiversx": "workspace:*",
"@elizaos/plugin-near": "workspace:*",
"@elizaos/plugin-zksync-era": "workspace:*",
"@elizaos/plugin-ton": "workspace:*",
"@elizaos/plugin-twitter": "workspace:*",
"@elizaos/plugin-primus": "workspace:*",
"@elizaos/plugin-cronoszkevm": "workspace:*",
Expand Down Expand Up @@ -150,6 +146,10 @@
"@elizaos/plugin-zilliqa": "workspace:*",
"@elizaos/client-deva": "workspace:*",
"@elizaos/plugin-arbitrage": "workspace:*",
"@elizaos/plugin-multiversx": "workspace:*",
"@elizaos/plugin-near": "workspace:*",
"@elizaos/plugin-stargaze": "workspace:*",
"@elizaos/plugin-zksync-era": "workspace:*",
"readline": "1.3.0",
"ws": "8.18.0",
"yargs": "17.7.2"
Expand Down
7 changes: 4 additions & 3 deletions agent/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,10 @@ import { genLayerPlugin } from "@elizaos/plugin-genlayer";
import { gitcoinPassportPlugin } from "@elizaos/plugin-gitcoin-passport";
import { initiaPlugin } from "@elizaos/plugin-initia";
import { imageGenerationPlugin } from "@elizaos/plugin-image-generation";
import { lensPlugin } from "@elizaos/plugin-lensNetwork";
import { lensPlugin } from "@elizaos/plugin-lens-network";
import { mindNetworkPlugin } from "@elizaos/plugin-mind-network";
import { multiversxPlugin } from "@elizaos/plugin-multiversx";
import { nearPlugin } from "@elizaos/plugin-near";
import { newsPlugin } from "@elizaos/plugin-news";
import createNFTCollectionsPlugin from "@elizaos/plugin-nft-collections";
import { nftGenerationPlugin } from "@elizaos/plugin-nft-generation";
import { createNodePlugin } from "@elizaos/plugin-node";
Expand Down Expand Up @@ -523,11 +522,13 @@ export function getTokenForProvider(
character: Character
): string | undefined {
switch (provider) {
// no key needed for llama_local or gaianet
// no key needed for llama_local, ollama, lmstudio, gaianet or bedrock
case ModelProviderName.LLAMALOCAL:
return "";
case ModelProviderName.OLLAMA:
return "";
case ModelProviderName.LMSTUDIO:
return "";
case ModelProviderName.GAIANET:
return "";
case ModelProviderName.BEDROCK:
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/core/actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ interface Action {
}
```

Source: https://github.com/elizaos/eliza/packages/core/src/types.ts
Source: https://github.com/elizaOS/eliza/blob/main/packages/core/src/types.ts

---

Expand Down Expand Up @@ -88,7 +88,7 @@ const take_order: Action = {
};
```

Source: https://github.com/elizaos/eliza/packages/plugin-solana/src/actions/takeOrder.ts
Source: https://github.com/elizaOS/eliza/blob/main/packages/plugin-solana/src/actions/takeOrder.ts

---

Expand Down
112 changes: 56 additions & 56 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
{
"name": "eliza-docs",
"version": "0.1.9",
"private": true,
"packageManager": "[email protected]",
"scripts": {
"docusaurus": "docusaurus",
"start": "docusaurus start --no-open",
"dev": "docusaurus start --port 3002 --no-open",
"build": "docusaurus build",
"swizzle": "docusaurus swizzle",
"deploy": "docusaurus deploy",
"clear": "docusaurus clear",
"serve": "docusaurus serve",
"write-translations": "docusaurus write-translations",
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "3.7.0",
"@docusaurus/plugin-content-blog": "3.7.0",
"@docusaurus/plugin-content-docs": "3.7.0",
"@docusaurus/plugin-ideal-image": "3.7.0",
"@docusaurus/preset-classic": "3.7.0",
"@docusaurus/theme-mermaid": "3.7.0",
"@docusaurus/theme-common": "3.7.0",
"@mdx-js/react": "3.0.1",
"clsx": "2.1.1",
"docusaurus-lunr-search": "3.5.0",
"lunr": "2.3.9",
"dotenv": "^16.4.7",
"prism-react-renderer": "2.3.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.7.0",
"@docusaurus/types": "3.7.0",
"docusaurus-plugin-typedoc": "1.0.5",
"typedoc": "0.26.11",
"typedoc-plugin-markdown": "4.2.10"
},
"browserslist": {
"production": [
">0.5%",
"not dead",
"not op_mini all"
],
"development": [
"last 3 chrome version",
"last 3 firefox version",
"last 5 safari version"
]
},
"engines": {
"node": "23.3.0"
}
"name": "eliza-docs",
"version": "0.1.9",
"private": true,
"packageManager": "[email protected]",
"scripts": {
"docusaurus": "docusaurus",
"start": "docusaurus start --no-open",
"dev": "docusaurus start --port 3002 --no-open",
"build": "docusaurus build",
"swizzle": "docusaurus swizzle",
"deploy": "docusaurus deploy",
"clear": "docusaurus clear",
"serve": "docusaurus serve",
"write-translations": "docusaurus write-translations",
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "3.7.0",
"@docusaurus/plugin-content-blog": "3.7.0",
"@docusaurus/plugin-content-docs": "3.7.0",
"@docusaurus/plugin-ideal-image": "3.7.0",
"@docusaurus/preset-classic": "3.7.0",
"@docusaurus/theme-mermaid": "3.7.0",
"@docusaurus/theme-common": "3.7.0",
"@mdx-js/react": "3.0.1",
"clsx": "2.1.1",
"docusaurus-lunr-search": "3.5.0",
"lunr": "2.3.9",
"dotenv": "^16.4.7",
"prism-react-renderer": "2.3.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.22.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.7.0",
"@docusaurus/types": "3.7.0",
"docusaurus-plugin-typedoc": "1.0.5",
"typedoc": "0.26.11",
"typedoc-plugin-markdown": "4.2.10"
},
"browserslist": {
"production": [
">0.5%",
"not dead",
"not op_mini all"
],
"development": [
"last 3 chrome version",
"last 3 firefox version",
"last 5 safari version"
]
},
"engines": {
"node": "23.3.0"
}
}
19 changes: 10 additions & 9 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"version": "0.1.9",
"packages": [
"packages/*",
"docs",
"agent",
"client",
"!packages/_examples"
],
"npmClient": "pnpm"
"version": "0.1.9",
"packages": ["packages/*", "docs", "agent", "client", "!packages/_examples"],
"npmClient": "pnpm",
"command": {
"publish": {
"registry": "https://registry.npmjs.org/",
"access": "public",
"allowBranch": "main"
}
}
}
6 changes: 6 additions & 0 deletions packages/_examples/plugin-with-di/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*

!dist/**
!package.json
!readme.md
!tsup.config.ts
39 changes: 39 additions & 0 deletions packages/_examples/plugin-with-di/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Sample Plugin for Eliza

The Sample Plugin for Eliza extends the functionality of the Eliza platform by providing additional actions, providers, evaluators, and more. This plugin is designed to be easily extendable and customizable to fit various use cases.

## Description

The Sample Plugin offers a set of features that can be integrated into the Eliza platform to enhance its capabilities. Below is a high-level overview of the different components available in this plugin.

## Actions

- **createResourceAction**: This action enables the creation and management of generic resources. It can be customized to handle different types of resources and integrate with various data sources.

## Providers

- **sampleProvider**: This provider offers a mechanism to supply data or services to the plugin. It can be extended to include additional providers as needed.

## Evaluators

- **sampleEvaluator**: This evaluator provides a way to assess or analyze data within the plugin. It can be extended to include additional evaluators as needed.

## Services

- **[ServiceName]**: Description of the service and its functionality. This can be extended to include additional services as needed.

## Clients

- **[ClientName]**: Description of the client and its functionality. This can be extended to include additional clients as needed.

## How to Extend

To extend the Sample Plugin, you can add new actions, providers, evaluators, services, and clients by following the structure provided in the plugin. Each component can be customized to fit your specific requirements.

1. **Actions**: Add new actions by defining them in the `actions` array.
2. **Providers**: Add new providers by defining them in the `providers` array.
3. **Evaluators**: Add new evaluators by defining them in the `evaluators` array.
4. **Services**: Add new services by defining them in the `services` array.
5. **Clients**: Add new clients by defining them in the `clients` array.

For more detailed information on how to extend the plugin, refer to the documentation provided in the Eliza platform.
19 changes: 19 additions & 0 deletions packages/_examples/plugin-with-di/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "@elizaos/plugin-sample-with-di",
"version": "0.1.9-alpha.1",
"main": "dist/index.js",
"type": "module",
"types": "dist/index.d.ts",
"dependencies": {
"@elizaos/core": "workspace:*",
"@elizaos/plugin-di": "workspace:*"
},
"devDependencies": {
"tsup": "8.3.5",
"@types/node": "^20.0.0"
},
"scripts": {
"build": "tsup --format esm --dts",
"dev": "tsup --format esm --dts --watch"
}
}
Loading

0 comments on commit 9bb3d58

Please sign in to comment.