Merge branch 'main' into feat/add-birdeye-plugin

elizaOS · Jan 3, 2025 · 0f2a027 · 0f2a027
2 parents a7c9554 + cddc9ee
commit 0f2a027
Show file tree

Hide file tree

Showing 70 changed files with 1,474 additions and 583 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_
@@ -368,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/client/vite.config.ts b/client/vite.config.ts
@@ -27,9 +27,10 @@ export default defineConfig({
         },
     },
     server: {
+        host: true,
         proxy: {
             "/api": {
-                target: `http://localhost:${process.env.SERVER_PORT || 3000}`,
+                target: `http://127.0.0.1:${process.env.SERVER_PORT || 3000}`,
                 changeOrigin: true,
                 rewrite: (path) => path.replace(/^\/api/, ""),
             },

diff --git a/packages/adapter-postgres/package.json b/packages/adapter-postgres/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/adapter-postgres",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@types/pg": "8.11.10",

diff --git a/packages/adapter-redis/package.json b/packages/adapter-redis/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/adapter-redis",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "ioredis": "5.4.2"

diff --git a/packages/adapter-sqlite/package.json b/packages/adapter-sqlite/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/adapter-sqlite",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@types/better-sqlite3": "7.6.12",

diff --git a/packages/adapter-sqljs/package.json b/packages/adapter-sqljs/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/adapter-sqljs",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@types/sql.js": "1.4.9",

diff --git a/packages/adapter-supabase/package.json b/packages/adapter-supabase/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/adapter-supabase",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@supabase/supabase-js": "2.46.2"

diff --git a/packages/client-auto/package.json b/packages/client-auto/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/client-auto",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@types/body-parser": "1.19.5",

diff --git a/packages/client-direct/package.json b/packages/client-direct/package.json
@@ -2,8 +2,22 @@
   "name": "@elizaos/client-direct",
   "version": "0.1.7-alpha.2",
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "type": "module",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@elizaos/plugin-image-generation": "workspace:*",

diff --git a/packages/client-discord/package.json b/packages/client-discord/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/client-discord",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@elizaos/plugin-node": "workspace:*",

diff --git a/packages/client-discord/src/actions/chat_with_attachments.ts b/packages/client-discord/src/actions/chat_with_attachments.ts
@@ -191,17 +191,16 @@ const summarizeAction = {
 
         state.attachmentsWithText = attachmentsWithText;
         state.objective = objective;
-
+        const template = await trimTokens(
+            summarizationTemplate,
+            chunkSize + 500,
+            runtime
+        );
         const context = composeContext({
             state,
             // make sure it fits, we can pad the tokens a bit
             // Get the model's tokenizer based on the current model being used
-            template: trimTokens(
-                summarizationTemplate,
-                chunkSize + 500,
-                (model.model[ModelClass.SMALL] ||
-                    "gpt-4o-mini") as TiktokenModel // Use the same model as generation; Fallback if no SMALL model configured
-            ),
+            template,
         });
 
         const summary = await generateText({

diff --git a/packages/client-discord/src/actions/summarize_conversation.ts b/packages/client-discord/src/actions/summarize_conversation.ts
@@ -261,14 +261,15 @@ const summarizeAction = {
             const chunk = chunks[i];
             state.currentSummary = currentSummary;
             state.currentChunk = chunk;
+            const template = await trimTokens(
+                summarizationTemplate,
+                chunkSize + 500,
+                runtime
+            );
             const context = composeContext({
                 state,
                 // make sure it fits, we can pad the tokens a bit
-                template: trimTokens(
-                    summarizationTemplate,
-                    chunkSize + 500,
-                    "gpt-4o-mini"
-                ),
+                template,
             });
 
             const summary = await generateText({

diff --git a/packages/client-discord/src/attachments.ts b/packages/client-discord/src/attachments.ts
@@ -19,7 +19,7 @@ async function generateSummary(
     text: string
 ): Promise<{ title: string; description: string }> {
     // make sure text is under 128k characters
-    text = trimTokens(text, 100000, "gpt-4o-mini"); // TODO: clean this up
+    text = await trimTokens(text, 100000, runtime);
 
     const prompt = `Please generate a concise summary for the following text:
 

diff --git a/packages/client-discord/src/utils.ts b/packages/client-discord/src/utils.ts
@@ -47,7 +47,7 @@ export async function generateSummary(
     text: string
 ): Promise<{ title: string; description: string }> {
     // make sure text is under 128k characters
-    text = trimTokens(text, 100000, "gpt-4o-mini"); // TODO: clean this up
+    text = await trimTokens(text, 100000, runtime);
 
     const prompt = `Please generate a concise summary for the following text:
 

diff --git a/packages/client-farcaster/package.json b/packages/client-farcaster/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/client-farcaster",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@neynar/nodejs-sdk": "^2.0.3"

diff --git a/packages/client-github/package.json b/packages/client-github/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/client-github",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@octokit/rest": "20.1.1",

diff --git a/packages/client-lens/package.json b/packages/client-lens/package.json
@@ -1,9 +1,23 @@
 {
   "name": "@elizaos/client-lens",
   "version": "0.1.7-alpha.2",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "@elizaos/core": "workspace:*",
     "@lens-protocol/client": "2.2.0",

diff --git a/packages/client-slack/package.json b/packages/client-slack/package.json
@@ -2,9 +2,23 @@
   "name": "@elizaos/client-slack",
   "version": "0.1.7-alpha.2",
   "description": "Slack client plugin for Eliza framework",
-  "main": "dist/index.js",
   "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@elizaos/source": "./src/index.ts",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts",
     "test": "jest",