Merge branch 'develop' into fix/1753-secure-0g-file-upload

Author: odilitime

.env.example

@@ -100,32 +100,32 @@ MEDIUM_HYPERBOLIC_MODEL=        # Default: meta-llama/Meta-Llama-3.1-70B-Instruc
 LARGE_HYPERBOLIC_MODEL=         # Default: meta-llama/Meta-Llama-3.1-405-Instruct
 
 # Infera Configuration
-INFERA_API_KEY=              # visit api.infera.org/docs to obtain an API key under /signup_user
-INFERA_MODEL=                # Default: llama3.2:latest
-INFERA_SERVER_URL=           # Default: https://api.infera.org/
-SMALL_INFERA_MODEL=          #Recommended: llama3.2:latest
-MEDIUM_INFERA_MODEL=         #Recommended: mistral-nemo:latest
-LARGE_INFERA_MODEL=          #Recommended: mistral-small:latest
-
-# Venice Configuration
-VENICE_API_KEY=                 # generate from venice settings
-SMALL_VENICE_MODEL=             # Default: llama-3.3-70b
-MEDIUM_VENICE_MODEL=            # Default: llama-3.3-70b
-LARGE_VENICE_MODEL=             # Default: llama-3.1-405b
-IMAGE_VENICE_MODEL=             # Default: fluently-xl
-
-# Nineteen.ai Configuration
-NINETEEN_AI_API_KEY=      # Get a free api key from https://nineteen.ai/app/api
-SMALL_NINETEEN_AI_MODEL=  # Default: unsloth/Llama-3.2-3B-Instruct
-MEDIUM_NINETEEN_AI_MODEL= # Default: unsloth/Meta-Llama-3.1-8B-Instruct
-LARGE_NINETEEN_AI_MODEL=  # Default: hugging-quants/Meta-Llama-3.1-70B-Instruct-AWQ-INT4
-IMAGE_NINETEEN_AI_MODE=   # Default: dataautogpt3/ProteusV0.4-Lightning
-
-# Akash Chat API Configuration docs: https://chatapi.akash.network/documentation
-AKASH_CHAT_API_KEY= # Get from https://chatapi.akash.network/
-SMALL_AKASH_CHAT_API_MODEL=  # Default: Meta-Llama-3-2-3B-Instruct
-MEDIUM_AKASH_CHAT_API_MODEL= # Default: Meta-Llama-3-3-70B-Instruct
-LARGE_AKASH_CHAT_API_MODEL=  # Default: Meta-Llama-3-1-405B-Instruct-FP8
+ INFERA_API_KEY=              # visit api.infera.org/docs to obtain an API key under /signup_user
+ INFERA_MODEL=                # Default: llama3.2:latest
+ INFERA_SERVER_URL=           # Default: https://api.infera.org/
+ SMALL_INFERA_MODEL=          #Recommended: llama3.2:latest
+ MEDIUM_INFERA_MODEL=         #Recommended: mistral-nemo:latest
+ LARGE_INFERA_MODEL=          #Recommended: mistral-small:latest
+
+ # Venice Configuration
+ VENICE_API_KEY=                 # generate from venice settings
+ SMALL_VENICE_MODEL=             # Default: llama-3.3-70b
+ MEDIUM_VENICE_MODEL=            # Default: llama-3.3-70b
+ LARGE_VENICE_MODEL=             # Default: llama-3.1-405b
+ IMAGE_VENICE_MODEL=             # Default: fluently-xl
+
+ # Nineteen.ai Configuration
+ NINETEEN_AI_API_KEY=      # Get a free api key from https://nineteen.ai/app/api
+ SMALL_NINETEEN_AI_MODEL=  # Default: unsloth/Llama-3.2-3B-Instruct
+ MEDIUM_NINETEEN_AI_MODEL= # Default: unsloth/Meta-Llama-3.1-8B-Instruct
+ LARGE_NINETEEN_AI_MODEL=  # Default: hugging-quants/Meta-Llama-3.1-70B-Instruct-AWQ-INT4
+ IMAGE_NINETEEN_AI_MODE=   # Default: dataautogpt3/ProteusV0.4-Lightning
+
+ # Akash Chat API Configuration docs: https://chatapi.akash.network/documentation
+ AKASH_CHAT_API_KEY= # Get from https://chatapi.akash.network/
+ SMALL_AKASH_CHAT_API_MODEL=  # Default: Meta-Llama-3-2-3B-Instruct
+ MEDIUM_AKASH_CHAT_API_MODEL= # Default: Meta-Llama-3-3-70B-Instruct
+ LARGE_AKASH_CHAT_API_MODEL=  # Default: Meta-Llama-3-1-405B-Instruct-FP8
 
 # Livepeer configuration
 LIVEPEER_GATEWAY_URL=           # Free inference gateways and docs: https://livepeer-eliza.com/
@@ -184,6 +184,12 @@ MEDIUM_GOOGLE_MODEL=            # Default: gemini-1.5-flash-latest
 LARGE_GOOGLE_MODEL=             # Default: gemini-1.5-pro-latest
 EMBEDDING_GOOGLE_MODEL=         # Default: text-embedding-004
 
+# Mistral Configuration
+MISTRAL_MODEL=
+SMALL_MISTRAL_MODEL=            # Default: mistral-small-latest
+MEDIUM_MISTRAL_MODEL=           # Default: mistral-large-latest
+LARGE_MISTRAL_MODEL=            # Default: mistral-large-latest
+
 # Groq Configuration
 GROQ_API_KEY=                   # Starts with gsk_
 SMALL_GROQ_MODEL=               # Default: llama-3.1-8b-instant
@@ -232,6 +238,13 @@ MEDIUM_VOLENGINE_MODEL=         # Default: doubao-pro-128k
 LARGE_VOLENGINE_MODEL=          # Default: doubao-pro-256k
 VOLENGINE_EMBEDDING_MODEL=      # Default: doubao-embedding
 
+# DeepSeek Configuration
+DEEPSEEK_API_URL=              # Default: https://api.deepseek.com
+SMALL_DEEPSEEK_MODEL=          # Default: deepseek-chat
+MEDIUM_DEEPSEEK_MODEL=         # Default: deepseek-chat
+LARGE_DEEPSEEK_MODEL=          # Default: deepseek-chat
+
+
 # fal.ai Configuration
 FAL_API_KEY=
 FAL_AI_LORA_PATH=
@@ -240,17 +253,30 @@ FAL_AI_LORA_PATH=
 LETZAI_API_KEY=                 # LetzAI API Key
 LETZAI_MODELS=                  # list of Letzai models to add to each prompt, e.g.: "@modelname1, @modelname2"
 
+# Galadriel Configuration
+GALADRIEL_API_KEY=gal-*         # Get from https://dashboard.galadriel.com/
+SMALL_GALADRIEL_MODEL=          # Default: gpt-4o-mini
+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
+
 # Remaining Provider Configurations
 GOOGLE_GENERATIVE_AI_API_KEY=   # Gemini API key
 ALI_BAILIAN_API_KEY=            # Ali Bailian API Key
 NANOGPT_API_KEY=                # NanoGPT API Key
-GALADRIEL_API_KEY=gal-*         # Get from https://dashboard.galadriel.com/
 TOGETHER_API_KEY=               # Together API Key
 
 ######################################
 #### Crypto Plugin Configurations ####
 ######################################
 
+# CoinMarketCap / CMC
+COINMARKETCAP_API_KEY=
+
+# CoinGecko
+COINGECKO_API_KEY=
+COINGECKO_PRO_API_KEY=
+
 # EVM
 EVM_PRIVATE_KEY=
 EVM_PROVIDER_URL=
@@ -293,6 +319,10 @@ STARKNET_ADDRESS=
 STARKNET_PRIVATE_KEY=
 STARKNET_RPC_URL=
 
+# Lens Network Configuration
+LENS_ADDRESS=
+LENS_PRIVATE_KEY=
+
 # Coinbase
 COINBASE_COMMERCE_KEY=          # From Coinbase developer portal
 COINBASE_API_KEY=               # From Coinbase developer portal
@@ -334,6 +364,8 @@ ZEROG_FLOW_ADDRESS=
 TEE_MODE=OFF                    # LOCAL | DOCKER | PRODUCTION
 WALLET_SECRET_SALT=             # ONLY define if you want to use TEE Plugin, otherwise it will throw errors
 
+ENABLE_TEE_LOG=false            # Set to true to enable TEE logging, only available when running eliza in TEE
+
 # Flow Blockchain Configuration
 FLOW_ADDRESS=
 FLOW_PRIVATE_KEY=               # Private key for SHA3-256 + P256 ECDSA
@@ -344,6 +376,12 @@ FLOW_ENDPOINT_URL=              # Default: https://mainnet.onflow.org
 INTERNET_COMPUTER_PRIVATE_KEY=
 INTERNET_COMPUTER_ADDRESS=
 
+
+#Cloudflare AI Gateway
+CLOUDFLARE_GW_ENABLED=        # Set to true to enable Cloudflare AI Gateway
+CLOUDFLARE_AI_ACCOUNT_ID=     # Cloudflare AI Account ID - found in the Cloudflare Dashboard under AI Gateway
+CLOUDFLARE_AI_GATEWAY_ID=     # Cloudflare AI Gateway ID - found in the Cloudflare Dashboard under AI Gateway
+
 # Aptos
 APTOS_PRIVATE_KEY=              # Aptos private key
 APTOS_NETWORK=                  # Must be one of mainnet, testnet
@@ -426,6 +464,8 @@ GIPHY_API_KEY=
 # OpenWeather
 OPEN_WEATHER_API_KEY=           # OpenWeather API key
 
+
+
 # EchoChambers Configuration
 ECHOCHAMBERS_API_URL=http://127.0.0.1:3333
 ECHOCHAMBERS_API_KEY=testingkey0011
@@ -459,3 +499,57 @@ TAVILY_API_KEY=
 # Verifiable Inference Configuration
 VERIFIABLE_INFERENCE_ENABLED=false # Set to false to disable verifiable inference
 VERIFIABLE_INFERENCE_PROVIDER=opacity # Options: opacity
+
+
+# Autonome Configuration
+AUTONOME_JWT_TOKEN=
+AUTONOME_RPC=https://wizard-bff-rpc.alt.technology/v1/bff/aaa/apps
+
+####################################
+#### Akash Network Configuration ####
+####################################
+AKASH_ENV=mainnet
+AKASH_NET=https://raw.githubusercontent.com/ovrclk/net/master/mainnet
+RPC_ENDPOINT=https://rpc.akashnet.net:443
+AKASH_GAS_PRICES=0.025uakt
+AKASH_GAS_ADJUSTMENT=1.5
+AKASH_KEYRING_BACKEND=os
+AKASH_FROM=default
+AKASH_FEES=20000uakt
+AKASH_DEPOSIT=500000uakt
+AKASH_MNEMONIC=
+AKASH_WALLET_ADDRESS=
+# Akash Pricing API
+AKASH_PRICING_API_URL=https://console-api.akash.network/v1/pricing
+# Default values # 1 CPU = 1000 1GB = 1000000000 1GB = 1000000000
+AKASH_DEFAULT_CPU=1000
+AKASH_DEFAULT_MEMORY=1000000000
+AKASH_DEFAULT_STORAGE=1000000000
+AKASH_SDL=example.sdl.yml
+# Close deployment
+# Close all deployments = closeAll
+# Close a single deployment = dseq and add the value in AKASH_CLOSE_DSEQ
+AKASH_CLOSE_DEP=closeAll
+AKASH_CLOSE_DSEQ=19729929
+# Provider Info we added one to check you will have to pass this into the action
+AKASH_PROVIDER_INFO=akash1ccktptfkvdc67msasmesuy5m7gpc76z75kukpz
+# Deployment Status
+# AKASH_DEP_STATUS = dseq or param_passed when you are building you wil pass the dseq dinamically to test you
+# you can pass the dseq using AKASH_DEP_DSEQ 19729929 is an example of a dseq we test while build.
+AKASH_DEP_STATUS=dseq
+AKASH_DEP_DSEQ=19729929
+# Gas Estimation Options: close, create, or update
+# qseq is required when operation is "close" 19729929 is an example of a dseq we test while build.
+AKASH_GAS_OPERATION=close
+AKASH_GAS_DSEQ=19729929
+# Manifest
+# Values: "auto" | "manual" | "validate_only" Default: "auto"
+AKASH_MANIFEST_MODE=auto
+# Default: Will use the SDL directory
+AKASH_MANIFEST_PATH=
+# Values: "strict" | "lenient" | "none" - Default: "strict"
+AKASH_MANIFEST_VALIDATION_LEVEL=strict
+
+# Quai Network Ecosystem
+QUAI_PRIVATE_KEY=
+QUAI_RPC_URL=https://rpc.quai.network

.github/workflows/integrationTests.yaml

@@ -3,7 +3,7 @@ on:
     push:
         branches:
             - "*"
-    pull_request_target:
+    pull_request:
         branches:
             - "*"
 
@@ -33,12 +33,9 @@ jobs:
             - name: Build packages
               run: pnpm build
 
-            - name: Check for API key
-              run: |
-                  if [ -z "$OPENAI_API_KEY" ]; then
-                      echo "Error: OPENAI_API_KEY is not set."
-                      exit 1
-                  fi
-
             - name: Run integration tests
-              run: pnpm run integrationTests
+              env:
+                  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+                  COINBASE_COMMERCE_KEY: ${{ secrets.COINBASE_COMMERCE_KEY }}
+              run: |
+                  pnpm run integrationTests

.github/workflows/pnpm-lockfile-check.yml

@@ -2,7 +2,7 @@ name: Pnpm Lockfile Check
 
 on:
     pull_request:
-        branches: ["*"]
+        branches: [main]
 
 jobs:
     check-lockfile:
@@ -38,4 +38,4 @@ jobs:
                           owner: context.repo.owner,
                           repo: context.repo.repo,
                           body: '❌ The pnpm-lockfile is out of date. Please run `pnpm install --no-frozen-lockfile` and commit the updated pnpm-lock.yaml file.'
-                      })
+                      })

.gitignore

@@ -57,3 +57,7 @@ coverage
 .eslintcache
 
 agent/content
+
+eliza.manifest
+eliza.manifest.sgx
+eliza.sig

.vscode/settings.json

@@ -43,5 +43,16 @@
     },
     "[shellscript]": {
         "editor.defaultFormatter": "foxundermoon.shell-format"
+    },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.patterns": {
+        "*.ts": "${capture}.js",
+        "*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
+        "*.jsx": "${capture}.js",
+        "*.tsx": "${capture}.ts",
+        "tsconfig.json": "tsconfig.*.json",
+        "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb,pnpm-workspace.yaml",
+        "README.md": "*.md",
+        "Dockerfile": "docker-compose-docs.yaml,docker-compose.yaml,Dockerfile.docs"
     }
 }

Makefile

@@ -0,0 +1,59 @@
+# Copyright (C) 2024 Gramine contributors
+# SPDX-License-Identifier: BSD-3-Clause
+
+THIS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+NODEJS_DIR ?= /usr/bin
+
+ARCH_LIBDIR ?= /lib/$(shell $(CC) -dumpmachine)
+
+ifeq ($(DEBUG),1)
+GRAMINE_LOG_LEVEL = debug
+else
+GRAMINE_LOG_LEVEL = error
+endif
+
+.PHONY: all
+all: eliza.manifest
+ifeq ($(SGX),1)
+all: eliza.manifest.sgx eliza.sig
+endif
+
+.PHONY: eliza.manifest
+eliza.manifest: eliza.manifest.template
+	gramine-manifest \
+		-Dlog_level=$(GRAMINE_LOG_LEVEL) \
+		-Darch_libdir=$(ARCH_LIBDIR) \
+		-Dnodejs_dir=$(NODEJS_DIR) \
+		$< >$@
+
+# Make on Ubuntu <= 20.04 doesn't support "Rules with Grouped Targets" (`&:`),
+# for details on this workaround see
+# https://github.com/gramineproject/gramine/blob/e8735ea06c/CI-Examples/helloworld/Makefile
+eliza.manifest.sgx eliza.sig: sgx_sign
+	@:
+
+.INTERMEDIATE: sgx_sign
+sgx_sign: eliza.manifest
+	gramine-sgx-sign \
+		--manifest $< \
+		--output $<.sgx
+
+ifeq ($(SGX),)
+GRAMINE = gramine-direct
+else
+GRAMINE = gramine-sgx
+endif
+
+# Start the default character:
+# SGX=1 make start
+# Start a specific character by passing arguments:
+# SGX=1 make start -- --character "character/your_character_file.json"
+.PHONY: start
+start: all
+	$(GRAMINE) ./eliza --loader ts-node/esm src/index.ts --isRoot $(filter-out $@,$(MAKECMDGOALS))
+.PHONY: clean
+clean:
+	$(RM) *.manifest *.manifest.sgx *.sig
+
+.PHONY: distclean
+distclean: clean

README.md

@@ -12,7 +12,7 @@
 
 ## 🌍 README Translations
 
-[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md) | [Arabic](./README_AR.md) | [Hungarian](./README_HU.md) | [Srpski](./README_RS.md) | [Română](./README_RO.md) | [Nederlands](./README_NL.md)
+[中文说明](./README_CN.md) | [日本語の説明](./README_JA.md) | [한국어 설명](./README_KOR.md) | [Persian](./README_FA.md) | [Français](./README_FR.md) | [Português](./README_PTBR.md) | [Türkçe](./README_TR.md) | [Русский](./README_RU.md) | [Español](./README_ES.md) | [Italiano](./README_IT.md) | [ไทย](./README_TH.md) | [Deutsch](./README_DE.md) | [Tiếng Việt](./README_VI.md) | [עִברִית](https://github.com/elizaos/Elisa/blob/main/README_HE.md) | [Tagalog](./README_TG.md) | [Polski](./README_PL.md) | [Arabic](./README_AR.md) | [Hungarian](./README_HU.md) | [Srpski](./README_RS.md) | [Română](./README_RO.md) | [Nederlands](./README_NL.md)
 
 ## 🚩 Overview
 
@@ -80,6 +80,8 @@ git clone https://github.com/elizaos/eliza.git
 # Checkout the latest release
 # This project iterates fast, so we recommend checking out the latest release
 git checkout $(git describe --tags --abbrev=0)
+# If the above doesn't checkout the latest release, this should work:
+# git checkout $(git describe --tags `git rev-list --tags --max-count=1`)
 ```
 
 ### Start Eliza with Gitpod