Merge branch 'develop' into main

elizaOS · Dec 24, 2024 · 5e35359 · 5e35359
2 parents 681d682 + d4c5419
commit 5e35359
Show file tree

Hide file tree

Showing 73 changed files with 1,949 additions and 1,633 deletions.
diff --git a/.github/workflows/integrationTests.yaml b/.github/workflows/integrationTests.yaml
@@ -1,28 +1,13 @@
-name: integration-test
+name: Integration Tests
 on:
     push:
         branches:
             - "*"
-    pull_request:
+    pull_request_target:
         branches:
             - "*"
-jobs:
-    smoke-tests:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-
-            - uses: pnpm/action-setup@v3
-              with:
-                  version: 9.4.0
 
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: "23"
-                  cache: "pnpm"
-
-            - name: Run smoke tests
-              run: pnpm run smokeTests
+jobs:
     integration-tests:
         runs-on: ubuntu-latest
         env:
@@ -46,20 +31,11 @@ jobs:
               run: pnpm build
 
             - name: Check for API key
-              id: check_api_key
               run: |
                   if [ -z "$OPENAI_API_KEY" ]; then
-                    echo "::set-output name=api_key_present::false"
-                  else
-                    echo "::set-output name=api_key_present::true"
+                      echo "Error: OPENAI_API_KEY is not set."
+                      exit 1
                   fi
 
             - name: Run integration tests
-              if: steps.check_api_key.outputs.api_key_present == 'true'
               run: pnpm run integrationTests
-
-            - name: Skip integration tests
-              if: steps.check_api_key.outputs.api_key_present == 'false'
-              run: |
-                  echo "Skipping integration tests due to missing required API keys"
-                  exit 1
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -10,19 +10,21 @@ jobs:
 
         steps:
             - name: Check out the repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Validate PR title
               id: validate
               run: |
                   PR_TITLE=$(jq -r .pull_request.title "$GITHUB_EVENT_PATH")
                   echo "PR Title: $PR_TITLE"
-                  if [[ ! "$PR_TITLE" =~ ^(feat|fix|docs|style|refactor|test|chore):\ .+ ]]; then
+                  if [[ ! "$PR_TITLE" =~ ^(feat|fix|docs|style|refactor|test|chore)(\([a-zA-Z0-9-]+\))?:\ .+ ]]; then
                     echo "PR title does not match the required pattern."
                     exit 1
                   fi
 
             - name: Set status
               if: failure()
               run: |
-                  gh pr comment ${{ github.event.pull_request.number }} --body "❌ PR title does not match the required pattern. Please use the format: 'type: description' (e.g., 'feat|fix|docs|style|refactor|test|chore: title')."
+                  gh pr comment ${{ github.event.pull_request.number }} --body "❌ PR title does not match the required pattern. Please use one of these formats:
+                  - 'type: description' (e.g., 'feat: add new feature')
+                  - 'type(scope): description' (e.g., 'chore(core): update dependencies')"
diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -0,0 +1,26 @@
+name: smoke-test
+on:
+    push:
+        branches:
+            - "*"
+    pull_request:
+        branches:
+            - "*"
+
+jobs:
+    smoke-tests:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: pnpm/action-setup@v3
+              with:
+                  version: 9.4.0
+
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: "23"
+                  cache: "pnpm"
+
+            - name: Run smoke tests
+              run: pnpm run smokeTests
diff --git a/README.md b/README.md
@@ -55,6 +55,11 @@ cd eliza-starter
 cp .env.example .env
 pnpm i && pnpm build && pnpm start
 ```
+Once the agent is running, You should see the message to run "pnpm start:client" at the end.
+Open another terminal and move to same directory and then run below command and follow the URL to chat to your agent. 
+```bash
+pnpm start:client
+```
 
 Then read the [Documentation](https://elizaos.github.io/eliza/) to learn how to customize your Eliza.
 

diff --git a/agent/package.json b/agent/package.json
@@ -1,62 +1,62 @@
 {
-  "name": "@elizaos/agent",
-  "version": "0.1.7-alpha.1",
-  "main": "src/index.ts",
-  "type": "module",
-  "scripts": {
-    "start": "node --loader ts-node/esm src/index.ts",
-    "dev": "node --loader ts-node/esm src/index.ts",
-    "check-types": "tsc --noEmit"
-  },
-  "nodemonConfig": {
-    "watch": [
-      "src",
-      "../core/dist"
-    ],
-    "ext": "ts,json",
-    "exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
-  },
-  "dependencies": {
-    "@elizaos/adapter-postgres": "workspace:*",
-    "@elizaos/adapter-redis": "workspace:*",
-    "@elizaos/adapter-sqlite": "workspace:*",
-    "@elizaos/client-auto": "workspace:*",
-    "@elizaos/client-direct": "workspace:*",
-    "@elizaos/client-discord": "workspace:*",
-    "@elizaos/client-farcaster": "workspace:*",
-    "@elizaos/client-lens": "workspace:*",
-    "@elizaos/client-telegram": "workspace:*",
-    "@elizaos/client-twitter": "workspace:*",
-    "@elizaos/client-slack": "workspace:*",
-    "@elizaos/core": "workspace:*",
-    "@elizaos/plugin-0g": "workspace:*",
-    "@elizaos/plugin-aptos": "workspace:*",
-    "@elizaos/plugin-bootstrap": "workspace:*",
-    "@elizaos/plugin-intiface": "workspace:*",
-    "@elizaos/plugin-coinbase": "workspace:*",
-    "@elizaos/plugin-conflux": "workspace:*",
-    "@elizaos/plugin-evm": "workspace:*",
-    "@elizaos/plugin-flow": "workspace:*",
-    "@elizaos/plugin-story": "workspace:*",
-    "@elizaos/plugin-goat": "workspace:*",
-    "@elizaos/plugin-icp": "workspace:*",
-    "@elizaos/plugin-image-generation": "workspace:*",
-    "@elizaos/plugin-nft-generation": "workspace:*",
-    "@elizaos/plugin-node": "workspace:*",
-    "@elizaos/plugin-solana": "workspace:*",
-    "@elizaos/plugin-starknet": "workspace:*",
-    "@elizaos/plugin-ton": "workspace:*",
-    "@elizaos/plugin-sui": "workspace:*",
-    "@elizaos/plugin-tee": "workspace:*",
-    "@elizaos/plugin-multiversx": "workspace:*",
-    "@elizaos/plugin-near": "workspace:*",
-    "@elizaos/plugin-zksync-era": "workspace:*",
-    "readline": "1.3.0",
-    "ws": "8.18.0",
-    "yargs": "17.7.2"
-  },
-  "devDependencies": {
-    "ts-node": "10.9.2",
-    "tsup": "8.3.5"
-  }
+    "name": "@elizaos/agent",
+    "version": "0.1.7-alpha.1",
+    "main": "src/index.ts",
+    "type": "module",
+    "scripts": {
+        "start": "node --loader ts-node/esm src/index.ts",
+        "dev": "node --loader ts-node/esm src/index.ts",
+        "check-types": "tsc --noEmit"
+    },
+    "nodemonConfig": {
+        "watch": [
+            "src",
+            "../core/dist"
+        ],
+        "ext": "ts,json",
+        "exec": "node --enable-source-maps --loader ts-node/esm src/index.ts"
+    },
+    "dependencies": {
+        "@elizaos/adapter-postgres": "workspace:*",
+        "@elizaos/adapter-redis": "workspace:*",
+        "@elizaos/adapter-sqlite": "workspace:*",
+        "@elizaos/client-auto": "workspace:*",
+        "@elizaos/client-direct": "workspace:*",
+        "@elizaos/client-discord": "workspace:*",
+        "@elizaos/client-farcaster": "workspace:*",
+        "@elizaos/client-lens": "workspace:*",
+        "@elizaos/client-telegram": "workspace:*",
+        "@elizaos/client-twitter": "workspace:*",
+        "@elizaos/client-slack": "workspace:*",
+        "@elizaos/core": "workspace:*",
+        "@elizaos/plugin-0g": "workspace:*",
+        "@elizaos/plugin-aptos": "workspace:*",
+        "@elizaos/plugin-bootstrap": "workspace:*",
+        "@elizaos/plugin-intiface": "workspace:*",
+        "@elizaos/plugin-coinbase": "workspace:*",
+        "@elizaos/plugin-conflux": "workspace:*",
+        "@elizaos/plugin-evm": "workspace:*",
+        "@elizaos/plugin-flow": "workspace:*",
+        "@elizaos/plugin-story": "workspace:*",
+        "@elizaos/plugin-goat": "workspace:*",
+        "@elizaos/plugin-icp": "workspace:*",
+        "@elizaos/plugin-image-generation": "workspace:*",
+        "@elizaos/plugin-nft-generation": "workspace:*",
+        "@elizaos/plugin-node": "workspace:*",
+        "@elizaos/plugin-solana": "workspace:*",
+        "@elizaos/plugin-starknet": "workspace:*",
+        "@elizaos/plugin-ton": "workspace:*",
+        "@elizaos/plugin-sui": "workspace:*",
+        "@elizaos/plugin-tee": "workspace:*",
+        "@elizaos/plugin-multiversx": "workspace:*",
+        "@elizaos/plugin-near": "workspace:*",
+        "@elizaos/plugin-zksync-era": "workspace:*",
+        "readline": "1.3.0",
+        "ws": "8.18.0",
+        "yargs": "17.7.2"
+    },
+    "devDependencies": {
+        "ts-node": "10.9.2",
+        "tsup": "8.3.5"
+    }
 }
diff --git a/agent/src/index.ts b/agent/src/index.ts
@@ -60,6 +60,7 @@ import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 import yargs from "yargs";
+import net from "net";
 
 const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
 const __dirname = path.dirname(__filename); // get the name of the directory
@@ -489,7 +490,7 @@ export async function createAgent(
     }
 
     let goatPlugin: any | undefined;
-    if (getSecret(character, "ALCHEMY_API_KEY")) {
+    if (getSecret(character, "EVM_PROVIDER_URL")) {
         goatPlugin = await createGoatPlugin((secret) =>
             getSecret(character, secret)
         );
@@ -560,7 +561,7 @@ export async function createAgent(
             getSecret(character, "COINBASE_NOTIFICATION_URI")
                 ? webhookPlugin
                 : null,
-            getSecret(character, "ALCHEMY_API_KEY") ? goatPlugin : null,
+            getSecret(character, "EVM_PROVIDER_URL") ? goatPlugin : null,
             getSecret(character, "FLOW_ADDRESS") &&
             getSecret(character, "FLOW_PRIVATE_KEY")
                 ? flowPlugin
@@ -692,13 +693,30 @@ async function startAgent(
     }
 }
 
+const checkPortAvailable = (port: number): Promise<boolean> => {
+    return new Promise((resolve) => {
+        const server = net.createServer();
+
+        server.once("error", (err: NodeJS.ErrnoException) => {
+            if (err.code === "EADDRINUSE") {
+                resolve(false);
+            }
+        });
+
+        server.once("listening", () => {
+            server.close();
+            resolve(true);
+        });
+
+        server.listen(port);
+    });
+};
+
 const startAgents = async () => {
     const directClient = new DirectClient();
-    const serverPort = parseInt(settings.SERVER_PORT || "3000");
+    let serverPort = parseInt(settings.SERVER_PORT || "3000");
     const args = parseArguments();
-
     let charactersArg = args.characters || args.character;
-
     let characters = [defaultCharacter];
 
     if (charactersArg) {
@@ -713,19 +731,32 @@ const startAgents = async () => {
         elizaLogger.error("Error starting agents:", error);
     }
 
+    // Find available port
+    while (!(await checkPortAvailable(serverPort))) {
+        elizaLogger.warn(
+            `Port ${serverPort} is in use, trying ${serverPort + 1}`
+        );
+        serverPort++;
+    }
+
     // upload some agent functionality into directClient
     directClient.startAgent = async (character: Character) => {
         // wrap it so we don't have to inject directClient later
         return startAgent(character, directClient);
     };
+
     directClient.start(serverPort);
 
+    if (serverPort !== parseInt(settings.SERVER_PORT || "3000")) {
+        elizaLogger.log(`Server started on alternate port ${serverPort}`);
+    }
+
     elizaLogger.log(
-        "Run `pnpm start:client` to start the client and visit the outputted URL (http://localhost:5173) to chat with your agents"
+        "Run `pnpm start:client` to start the client and visit the outputted URL (http://localhost:5173) to chat with your agents. When running multiple agents, use client with different port `SERVER_PORT=3001 pnpm start:client`"
     );
 };
 
 startAgents().catch((error) => {
     elizaLogger.error("Unhandled error in startAgents:", error);
-    process.exit(1); // Exit the process after logging
+    process.exit(1);
 });